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

ctrl-shift-f

Browse Source
This commit is contained in:
Anuken
2018-12-21 21:33:05 -05:00
parent 94908bc599
commit 3abfaf1bca
244 changed files with 976 additions and 999 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/io/anuke/mindustry/net/Administration.java
View File

@@ -1,10 +1,10 @@
package io.anuke.mindustry.net;
import io.anuke.arc.utils.Array;
import io.anuke.arc.utils.ObjectMap;
import io.anuke.arc.utils.ObjectSet;
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.core.Settings;
import io.anuke.arc.Settings;
import static io.anuke.mindustry.Vars.headless;

15
core/src/io/anuke/mindustry/net/Interpolator.java
View File

@@ -1,9 +1,8 @@
package io.anuke.mindustry.net;
import io.anuke.arc.math.Vector2;
import io.anuke.arc.utils.TimeUtils;
import io.anuke.arc.util.Mathf;
import io.anuke.arc.math.Mathf;
import io.anuke.arc.math.geom.Vector2;
import io.anuke.arc.util.Time;
public class Interpolator{
//used for movement
@@ -17,9 +16,9 @@ public class Interpolator{
public float[] values = {};
public void read(float cx, float cy, float x, float y, long sent, float... target1ds){
if(lastUpdated != 0) updateSpacing = TimeUtils.timeSinceMillis(lastUpdated);
if(lastUpdated != 0) updateSpacing = Time.timeSinceMillis(lastUpdated);
lastUpdated = TimeUtils.millis();
lastUpdated = Time.millis();
targets = target1ds;
last.set(cx, cy);
@@ -46,10 +45,10 @@ public class Interpolator{
}*/
if(lastUpdated != 0 && updateSpacing != 0){
float timeSinceUpdate = TimeUtils.timeSinceMillis(lastUpdated);
float timeSinceUpdate = Time.timeSinceMillis(lastUpdated);
float alpha = Math.min(timeSinceUpdate / updateSpacing, 2f);
Mathf.lerp2(pos.set(last), target, alpha);
pos.set(last).lerpPast(target, alpha);
if(values.length != targets.length){
values = new float[targets.length];

8
core/src/io/anuke/mindustry/net/Net.java
View File

@@ -5,16 +5,16 @@ import io.anuke.arc.Net.HttpRequest;
import io.anuke.arc.Net.HttpResponse;
import io.anuke.arc.Net.HttpResponseListener;
import io.anuke.arc.net.HttpRequestBuilder;
import io.anuke.arc.utils.Array;
import io.anuke.arc.utils.IntMap;
import io.anuke.arc.utils.ObjectMap;
import io.anuke.arc.collection.Array;
import io.anuke.arc.util.IntMap;
import io.anuke.arc.collection.ObjectMap;
import io.anuke.mindustry.core.Platform;
import io.anuke.mindustry.gen.Call;
import io.anuke.mindustry.net.Packets.KickReason;
import io.anuke.mindustry.net.Packets.StreamBegin;
import io.anuke.mindustry.net.Packets.StreamChunk;
import io.anuke.mindustry.net.Streamable.StreamBuilder;
import io.anuke.arc.core.Timers;
import io.anuke.arc.Timers;
import io.anuke.arc.function.BiConsumer;
import io.anuke.arc.function.Consumer;
import io.anuke.arc.util.Bundles;

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

@@ -1,8 +1,8 @@
package io.anuke.mindustry.net;
import io.anuke.arc.utils.ObjectMap;
import io.anuke.arc.utils.ObjectMap.Entry;
import io.anuke.arc.utils.TimeUtils;
import io.anuke.arc.collection.ObjectMap;
import io.anuke.arc.util.ObjectMap.Entry;
import io.anuke.arc.util.Time;
import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.game.GameMode;
@@ -14,8 +14,8 @@ 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.Core;
import io.anuke.arc.core.Timers;
import io.anuke.arc.Core;
import io.anuke.arc.Timers;
import io.anuke.arc.entities.Entities;
import io.anuke.arc.util.Bits;
@@ -186,7 +186,7 @@ public class NetworkIO{
Entities.clear();
int id = stream.readInt();
player.resetNoAdd();
player.read(stream, TimeUtils.millis());
player.read(stream, Time.millis());
player.resetID(id);
player.add();

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

@@ -1,6 +1,6 @@
package io.anuke.mindustry.net;
import io.anuke.arc.utils.Pool.Poolable;
import io.anuke.arc.util.Pool.Poolable;
import java.nio.ByteBuffer;

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

@@ -1,6 +1,6 @@
package io.anuke.mindustry.net;
import io.anuke.arc.utils.Base64Coder;
import io.anuke.arc.util.Base64Coder;
import io.anuke.mindustry.game.Version;
import io.anuke.mindustry.io.TypeIO;
import io.anuke.arc.util.Bundles;

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

@@ -1,6 +1,6 @@
package io.anuke.mindustry.net;
import io.anuke.arc.utils.ObjectIntMap;
import io.anuke.arc.util.ObjectIntMap;
import io.anuke.mindustry.net.Packets.*;
import io.anuke.arc.function.Supplier;