Ellpeck/PrettyPipes
1
0
Fork 0
mirror of https://github.com/Ellpeck/PrettyPipes.git synced 2024-12-26 16:49:23 +01:00
Code Issues Projects Releases Wiki Activity

fixed stuff not saving in block entities

Browse source 
Closes #101
This commit is contained in:
Ell 2021-12-04 13:07:18 +01:00
parent c1695f7b78
commit c06097f287
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/de/ellpeck/prettypipes/Utility.java
View file

@ -113,7 +113,7 @@ public final class Utility {
public static void sendBlockEntityToClients(BlockEntity tile) {
var world = (ServerLevel) tile.getLevel();
var entities = world.getChunkSource().chunkMap.getPlayers(new ChunkPos(tile.getBlockPos()), false);
var packet = ClientboundBlockEntityDataPacket.create(tile, t -> t.save(new CompoundTag()));
var packet = ClientboundBlockEntityDataPacket.create(tile, BlockEntity::saveWithoutMetadata);
for (var e : entities)
e.connection.send(packet);
}

6
src/main/java/de/ellpeck/prettypipes/pipe/PipeBlockEntity.java
View file

@ -88,7 +88,8 @@ public class PipeBlockEntity extends BlockEntity implements MenuProvider, IPipeC
}
@Override
public CompoundTag save(CompoundTag compound) {
public void saveAdditional(CompoundTag compound) {
super.saveAdditional(compound);
compound.put("modules", this.modules.serializeNBT());
compound.putInt("module_drop_check", this.moduleDropCheck);
compound.put("requests", Utility.serializeAll(this.craftIngredientRequests));
@ -102,7 +103,6 @@ public class PipeBlockEntity extends BlockEntity implements MenuProvider, IPipeC
results.add(nbt);
}
compound.put("craft_results", results);
return super.save(compound);
}
@Override
@ -126,7 +126,7 @@ public class PipeBlockEntity extends BlockEntity implements MenuProvider, IPipeC
@Override
public CompoundTag getUpdateTag() {
// sync pipe items on load
var nbt = this.save(new CompoundTag());
var nbt = this.saveWithoutMetadata();
nbt.put("items", Utility.serializeAll(this.getItems()));
return nbt;
}

6
src/main/java/de/ellpeck/prettypipes/pressurizer/PressurizerBlockEntity.java
View file

@ -58,9 +58,9 @@ public class PressurizerBlockEntity extends BlockEntity implements MenuProvider,
}
@Override
public CompoundTag save(CompoundTag compound) {
public void saveAdditional(CompoundTag compound) {
super.saveAdditional(compound);
compound.putInt("energy", this.getEnergy());
return super.save(compound);
}
@Override
@ -71,7 +71,7 @@ public class PressurizerBlockEntity extends BlockEntity implements MenuProvider,
@Override
public CompoundTag getUpdateTag() {
return this.save(new CompoundTag());
return this.saveWithoutMetadata();
}
@Override

4
src/main/java/de/ellpeck/prettypipes/terminal/CraftingTerminalBlockEntity.java
View file

@ -135,9 +135,9 @@ public class CraftingTerminalBlockEntity extends ItemTerminalBlockEntity {
}
@Override
public CompoundTag save(CompoundTag compound) {
public void saveAdditional(CompoundTag compound) {
super.saveAdditional(compound);
compound.put("craft_items", this.craftItems.serializeNBT());
return super.save(compound);
}
@Override

4
src/main/java/de/ellpeck/prettypipes/terminal/ItemTerminalBlockEntity.java
View file

@ -224,10 +224,10 @@ public class ItemTerminalBlockEntity extends BlockEntity implements IPipeConnect
}
@Override
public CompoundTag save(CompoundTag compound) {
public void saveAdditional(CompoundTag compound) {
super.saveAdditional(compound);
compound.put("items", this.items.serializeNBT());
compound.put("requests", Utility.serializeAll(this.existingRequests));
return super.save(compound);
}
@Override