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

Merge branch '16bititemtest'

Browse Source
This commit is contained in:
Anuken
2020-08-27 11:12:44 -04:00
parent a5b27dc339 58182fe040
commit 89c007fcdb
10 changed files with 62 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java
View File

@@ -138,13 +138,18 @@ public class ItemTurret extends Turret{
return ammoTypes.get(item) != null && totalAmmo + ammoTypes.get(item).ammoMultiplier <= maxAmmo;
}
@Override
public byte version(){
return 2;
}
@Override
public void write(Writes write){
super.write(write);
write.b(ammo.size);
for(AmmoEntry entry : ammo){
ItemEntry i = (ItemEntry)entry;
write.b(i.item.id);
write.s(i.item.id);
write.s(i.amount);
}
}
@@ -154,7 +159,7 @@ public class ItemTurret extends Turret{
super.read(read, revision);
int amount = read.ub();
for(int i = 0; i < amount; i++){
Item item = Vars.content.item(read.ub());
Item item = Vars.content.item(revision < 2 ? read.ub() : read.s());
short a = read.s();
totalAmmo += a;
ammo.add(new ItemEntry(item, a));

2
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -436,7 +436,7 @@ public abstract class Turret extends Block{
public void read(Reads read, byte revision){
super.read(read, revision);
if(revision == 1){
if(revision >= 1){
reload = read.f();
rotation = read.f();
}

9
core/src/mindustry/world/blocks/sandbox/LiquidSource.java
View File

@@ -87,16 +87,21 @@ public class LiquidSource extends Block{
return source;
}
@Override
public byte version(){
return 1;
}
@Override
public void write(Writes write){
super.write(write);
write.b(source == null ? -1 : source.id);
write.s(source == null ? -1 : source.id);
}
@Override
public void read(Reads read, byte revision){
super.read(read, revision);
byte id = read.b();
int id = revision == 1 ? read.s() : read.b();
source = id == -1 ? null : content.liquid(id);
}
}

9
core/src/mindustry/world/blocks/storage/Unloader.java
View File

@@ -107,16 +107,21 @@ public class Unloader extends Block{
return sortItem;
}
@Override
public byte version(){
return 1;
}
@Override
public void write(Writes write){
super.write(write);
write.b(sortItem == null ? -1 : sortItem.id);
write.s(sortItem == null ? -1 : sortItem.id);
}
@Override
public void read(Reads read, byte revision){
super.read(read, revision);
byte id = read.b();
int id = revision == 1 ? read.s() : read.b();
sortItem = id == -1 ? null : content.items().get(id);
}
}