Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry

Browse Source
This commit is contained in:
Anuken
2021-07-12 12:36:48 -04:00
parent 4f98bc95a2 ec3dc867c1
commit f36d47c13f
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ui/Fonts.java
View File

@@ -203,7 +203,7 @@ public class Fonts{
/** Merges the UI and font atlas together for better performance. */ /** Merges the UI and font atlas together for better performance. */
public static void mergeFontAtlas(TextureAtlas atlas){ public static void mergeFontAtlas(TextureAtlas atlas){
//grab all textures from the ui page, remove all the regions assigned to it, then copy them over to Fonts.packer and replace the texture in this atlas. //grab all textures from the ui page, remove all the regions assigned to it, then copy them over to UI.packer and replace the texture in this atlas.
//grab old UI texture and regions... //grab old UI texture and regions...
Texture texture = atlas.find("logo").texture; Texture texture = atlas.find("logo").texture;

4
core/src/mindustry/ui/fragments/PlayerListFragment.java
View File

@@ -83,13 +83,15 @@ public class PlayerListFragment extends Fragment{
Groups.player.copy(players); Groups.player.copy(players);
players.sort(Structs.comps(Structs.comparing(Player::team), Structs.comparingBool(p -> !p.admin))); players.sort(Structs.comps(Structs.comparing(Player::team), Structs.comparingBool(p -> !p.admin)));
if(sField.getText().length() > 0){
players.filter(p -> Strings.stripColors(p.name().toLowerCase()).contains(sField.getText().toLowerCase()));
}
for(var user : players){ for(var user : players){
found = true; found = true;
NetConnection connection = user.con; NetConnection connection = user.con;
if(connection == null && net.server() && !user.isLocal()) return; if(connection == null && net.server() && !user.isLocal()) return;
if(sField.getText().length() > 0 && !user.name().toLowerCase().contains(sField.getText().toLowerCase()) && !Strings.stripColors(user.name().toLowerCase()).contains(sField.getText().toLowerCase())) return;
Table button = new Table(); Table button = new Table();
button.left(); button.left();

4
core/src/mindustry/world/blocks/campaign/LaunchPad.java
View File

@@ -133,8 +133,8 @@ public class LaunchPad extends Block{
public void updateTile(){ public void updateTile(){
if(!state.isCampaign()) return; if(!state.isCampaign()) return;
//launch when full and base conditions are met //increment launchCounter then launch when full and base conditions are met
if(items.total() >= itemCapacity && efficiency() >= 1f && (launchCounter += edelta()) >= launchTime){ if((launchCounter += edelta()) >= launchTime && items.total() >= itemCapacity){
launchSound.at(x, y); launchSound.at(x, y);
LaunchPayload entity = LaunchPayload.create(); LaunchPayload entity = LaunchPayload.create();
items.each((item, amount) -> entity.stacks.add(new ItemStack(item, amount))); items.each((item, amount) -> entity.stacks.add(new ItemStack(item, amount)));

1
core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java
View File

@@ -456,6 +456,7 @@ public class PayloadMassDriver extends PayloadBlock{
@Override @Override
public Point2 config(){ public Point2 config(){
if(tile == null) return null;
return Point2.unpack(link).sub(tile.x, tile.y); return Point2.unpack(link).sub(tile.x, tile.y);
} }