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

Content class reorganization, beginning work on unit factory

Browse Source
This commit is contained in:
Anuken
2018-03-25 13:12:32 -04:00
parent 59530909d6
commit 3418979f4d
106 changed files with 1772 additions and 1662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/io/anuke/mindustry/net/NetworkIO.java
View File

@@ -2,14 +2,14 @@ package io.anuke.mindustry.net;
import com.badlogic.gdx.utils.ByteArray;
import com.badlogic.gdx.utils.TimeUtils;
import io.anuke.mindustry.content.Weapons;
import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.game.GameMode;
import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.io.Version;
import io.anuke.mindustry.resource.Upgrade;
import io.anuke.mindustry.resource.Weapon;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.Blocks;
import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.world.blocks.types.BlockPart;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.entities.Entities;
@@ -128,7 +128,7 @@ public class NetworkIO {
ui.hudfrag.updateItems();
control.upgrades().getWeapons().clear();
control.upgrades().getWeapons().add(Weapon.blaster);
control.upgrades().getWeapons().add(Weapons.blaster);
byte weapons = stream.readByte();

2
core/src/io/anuke/mindustry/net/TraceInfo.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.net;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.blocks.Blocks;
import io.anuke.mindustry.content.blocks.Blocks;
public class TraceInfo {
public int playerid;