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

hhhhhhh

Browse Source
This commit is contained in:
Anuken
2018-12-26 13:22:31 -05:00
parent 22b7086bea
commit 8879593381
164 changed files with 1151 additions and 1426 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/net/Administration.java
+5 -5
View File
@@ -1,10 +1,10 @@
package io.anuke.mindustry.net;
import io.anuke.annotations.Annotations.Serialize;
import io.anuke.arc.Core;
import io.anuke.arc.collection.Array;
import io.anuke.arc.collection.ObjectMap;
import io.anuke.arc.collection.ObjectSet;
import io.anuke.annotations.Annotations.Serialize;
import io.anuke.arc.Settings;
import static io.anuke.mindustry.Vars.headless;
@@ -15,7 +15,7 @@ public class Administration{
private Array<String> bannedIPs = new Array<>();
public Administration(){
Core.settings.defaultList(
Core.settings.defaults(
"strict", true
);
@@ -23,7 +23,7 @@ public class Administration{
}
public void setStrict(boolean on){
Core.settings.putBool("strict", on);
Core.settings.put("strict", on);
Core.settings.save();
}
@@ -36,7 +36,7 @@ public class Administration{
}
public void setCustomClients(boolean allowed){
Core.settings.putBool("allow-custom", allowed);
Core.settings.put("allow-custom", allowed);
Core.settings.save();
}
core/src/io/anuke/mindustry/net/NetworkIO.java
+9 -10
View File
@@ -1,7 +1,10 @@
package io.anuke.mindustry.net;
import io.anuke.arc.Core;
import io.anuke.arc.collection.ObjectMap;
import io.anuke.arc.util.ObjectMap.Entry;
import io.anuke.arc.collection.ObjectMap.Entry;
import io.anuke.arc.entities.Entities;
import io.anuke.arc.util.Pack;
import io.anuke.arc.util.Time;
import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.entities.Player;
@@ -14,10 +17,6 @@ import io.anuke.mindustry.maps.Map;
import io.anuke.mindustry.maps.MapMeta;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.BlockPart;
import io.anuke.arc.Core;
import io.anuke.arc.util.Time;
import io.anuke.arc.entities.Entities;
import io.anuke.arc.util.Bits;
import java.io.*;
import java.nio.ByteBuffer;
@@ -66,7 +65,7 @@ public class NetworkIO{
if(tile.block() instanceof BlockPart){
stream.writeByte(tile.link);
}else if(tile.entity != null){
stream.writeByte(Bits.packByte(tile.getTeamID(), tile.getRotation())); //team + rotation
stream.writeByte(Pack.byteByte(tile.getTeamID(), tile.getRotation())); //team + rotation
stream.writeShort((short) tile.entity.health); //health
if(tile.entity.items != null) tile.entity.items.write(stream);
@@ -160,7 +159,7 @@ public class NetworkIO{
int missions = stream.readInt();
if(sector != invalidSector){
world.sectors.createSector(Bits.getLeftShort(sector), Bits.getRightShort(sector));
world.sectors.createSector(Pack.leftShort(sector), Pack.rightShort(sector));
world.setSector(world.sectors.get(sector));
world.getSector().completedMissions = missions;
}else{
@@ -218,8 +217,8 @@ public class NetworkIO{
byte tr = stream.readByte();
short health = stream.readShort();
byte team = Bits.getLeftByte(tr);
byte rotation = Bits.getRightByte(tr);
byte team = Pack.leftByte(tr);
byte rotation = Pack.rightByte(tr);
tile.setTeam(Team.all[team]);
tile.entity.health = health;
@@ -281,7 +280,7 @@ public class NetworkIO{
}
if(team == players[0].getTeam() && cores > 0){
Core.camera.position.set(state.teams.get(team).cores.first().drawx(), state.teams.get(team).cores.first().drawy(), 0);
Core.camera.position.set(state.teams.get(team).cores.first().drawx(), state.teams.get(team).cores.first().drawy());
}
}
core/src/io/anuke/mindustry/net/Packet.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.anuke.mindustry.net;
import io.anuke.arc.util.Pool.Poolable;
import io.anuke.arc.util.pooling.Pool.Poolable;
import java.nio.ByteBuffer;
core/src/io/anuke/mindustry/net/Packets.java
+2 -2
View File
@@ -1,9 +1,9 @@
package io.anuke.mindustry.net;
import io.anuke.arc.util.Base64Coder;
import io.anuke.arc.Core;
import io.anuke.arc.util.serialization.Base64Coder;
import io.anuke.mindustry.game.Version;
import io.anuke.mindustry.io.TypeIO;
import io.anuke.arc.util.Bundles;
import java.nio.ByteBuffer;
core/src/io/anuke/mindustry/net/Registrator.java
+2 -2
View File
@@ -1,8 +1,8 @@
package io.anuke.mindustry.net;
import io.anuke.arc.util.ObjectIntMap;
import io.anuke.mindustry.net.Packets.*;
import io.anuke.arc.collection.ObjectIntMap;
import io.anuke.arc.function.Supplier;
import io.anuke.mindustry.net.Packets.*;
public class Registrator{
private static ClassEntry[] classes = {