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

Moved entity package from Arc / Entity code cleanup

Browse Source
This commit is contained in:
Anuken
2019-02-02 15:53:35 -05:00
parent 6b2f2d0664
commit 0dd9d2b460
177 changed files with 1872 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/io/anuke/mindustry/ui/ContentDisplay.java
View File

@@ -5,7 +5,7 @@ import io.anuke.arc.collection.OrderedMap;
import io.anuke.arc.graphics.Color;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.util.Strings;
import io.anuke.mindustry.entities.units.UnitType;
import io.anuke.mindustry.type.UnitType;
import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.type.Liquid;
@@ -159,7 +159,7 @@ public class ContentDisplay{
table.add(Core.bundle.format("mech.ability", Core.bundle.get("mech." + mech.name + ".ability")));
table.row();
}
table.add(Core.bundle.format("mech.armor", mech.armor));
table.add(Core.bundle.format("mech.health", (int)mech.health));
table.row();
table.add(Core.bundle.format("mech.itemcapacity", mech.itemCapacity));
table.row();

2
core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java
View File

@@ -6,7 +6,7 @@ import io.anuke.arc.scene.ui.ImageButton;
import io.anuke.arc.util.Strings;
import io.anuke.arc.util.Time;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.entities.type.Player;
import io.anuke.mindustry.net.Net;
import java.io.IOException;

2
core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
View File

@@ -14,7 +14,7 @@ import io.anuke.arc.util.Strings;
import io.anuke.arc.util.Time;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.Platform;
import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.entities.type.Player;
import io.anuke.mindustry.game.Version;
import io.anuke.mindustry.net.Host;
import io.anuke.mindustry.net.Net;

2
core/src/io/anuke/mindustry/ui/dialogs/LocalPlayerDialog.java
View File

@@ -5,7 +5,7 @@ import io.anuke.arc.scene.ui.Image;
import io.anuke.arc.scene.ui.layout.Stack;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.util.Scaling;
import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.entities.type.Player;
import static io.anuke.mindustry.Vars.control;
import static io.anuke.mindustry.Vars.players;

10
core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java
View File

@@ -20,7 +20,7 @@ import io.anuke.arc.util.Align;
import io.anuke.arc.util.Strings;
import io.anuke.arc.util.Time;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.entities.type.Player;
import io.anuke.mindustry.gen.Call;
import io.anuke.mindustry.input.InputHandler;
import io.anuke.mindustry.type.Item;
@@ -49,7 +49,7 @@ public class BlockInventoryFragment extends Fragment{
int removed = tile.block().removeStack(tile, item, amount);
player.inventory.addItem(item, removed);
player.addItem(item, removed);
for(int j = 0; j < Mathf.clamp(removed / 3, 1, 8); j++){
Time.run(j * 3f, () -> Call.transferItemEffect(item, tile.drawx(), tile.drawy(), player));
}
@@ -97,7 +97,7 @@ public class BlockInventoryFragment extends Fragment{
holdTime += Time.delta();
if(holdTime >= holdWithdraw){
int amount = Math.min(tile.entity.items.get(lastItem), player.inventory.itemCapacityUsed(lastItem));
int amount = Math.min(tile.entity.items.get(lastItem), player.maxAccepted(lastItem));
Call.requestItem(player, tile, lastItem, amount);
holding = false;
holdTime = 0f;
@@ -130,7 +130,7 @@ public class BlockInventoryFragment extends Fragment{
container.add(i);
BooleanProvider canPick = () -> player.inventory.canAcceptItem(item);
BooleanProvider canPick = () -> player.acceptsItem(item);
HandCursorListener l = new HandCursorListener();
l.setEnabled(canPick);
@@ -147,7 +147,7 @@ public class BlockInventoryFragment extends Fragment{
@Override
public boolean touchDown(InputEvent event, float x, float y, int pointer, KeyCode button){
if(!canPick.get() || !tile.entity.items.has(item)) return false;
int amount = Math.min(1, player.inventory.itemCapacityUsed(item));
int amount = Math.min(1, player.maxAccepted(item));
Call.requestItem(player, tile, item, amount);
lastItem = item;
holding = true;

2
core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
View File

@@ -15,7 +15,7 @@ import io.anuke.arc.scene.ui.Image;
import io.anuke.arc.scene.ui.ImageButton;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.entities.TileEntity;
import io.anuke.mindustry.entities.type.TileEntity;
import io.anuke.mindustry.game.EventType.WorldLoadEvent;
import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.input.Binding;