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

Removed NumberUtils

Browse Source
This commit is contained in:
Anuken
2019-04-19 11:39:47 -04:00
parent 5035559b08
commit f283709e62
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/io/anuke/mindustry/world/ItemBuffer.java
View File

@@ -22,7 +22,7 @@ public class ItemBuffer{
public void accept(Item item, short data){ public void accept(Item item, short data){
//if(!accepts()) return; //if(!accepts()) return;
buffer[index++] = Pack.longInt(NumberUtils.floatToIntBits(Time.time()), Pack.shortInt((short)item.id, data)); buffer[index++] = Pack.longInt(Float.floatToIntBits(Time.time()), Pack.shortInt((short)item.id, data));
} }
public void accept(Item item){ public void accept(Item item){
@@ -32,7 +32,7 @@ public class ItemBuffer{
public Item poll(){ public Item poll(){
if(index > 0){ if(index > 0){
long l = buffer[0]; long l = buffer[0];
float time = NumberUtils.intBitsToFloat(Pack.leftInt(l)); float time = Float.intBitsToFloat(Pack.leftInt(l));
if(Time.time() >= time + speed || Time.time() < time){ if(Time.time() >= time + speed || Time.time() < time){
return content.item(Pack.leftShort(Pack.rightInt(l))); return content.item(Pack.leftShort(Pack.rightInt(l)));
@@ -44,7 +44,7 @@ public class ItemBuffer{
public short pollData(){ public short pollData(){
if(index > 0){ if(index > 0){
long l = buffer[0]; long l = buffer[0];
float time = NumberUtils.intBitsToFloat(Pack.leftInt(l)); float time = Float.intBitsToFloat(Pack.leftInt(l));
if(Time.time() >= time + speed || Time.time() < time){ if(Time.time() >= time + speed || Time.time() < time){
return Pack.rightShort(Pack.rightInt(l)); return Pack.rightShort(Pack.rightInt(l));

4
core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java
View File

@@ -36,7 +36,7 @@ public class Junction extends Block{
if(buffer.index > 0){ if(buffer.index > 0){
if(buffer.index > buffer.items.length) buffer.index = buffer.items.length; if(buffer.index > buffer.items.length) buffer.index = buffer.items.length;
long l = buffer.items[0]; long l = buffer.items[0];
float time = NumberUtils.intBitsToFloat(Pack.leftInt(l)); float time = Float.intBitsToFloat(Pack.leftInt(l));
if(Time.time() >= time + speed || Time.time() < time){ if(Time.time() >= time + speed || Time.time() < time){
@@ -59,7 +59,7 @@ public class Junction extends Block{
@Override @Override
public void handleItem(Item item, Tile tile, Tile source){ public void handleItem(Item item, Tile tile, Tile source){
JunctionEntity entity = tile.entity(); JunctionEntity entity = tile.entity();
long value = Pack.longInt(NumberUtils.floatToIntBits(Time.time()), item.id); long value = Pack.longInt(Float.floatToIntBits(Time.time()), item.id);
int relative = source.relativeTo(tile.x, tile.y); int relative = source.relativeTo(tile.x, tile.y);
entity.buffers[relative].add(value); entity.buffers[relative].add(value);
} }