Don't store tileId when saving structures.

Author: noobanidus

src/main/java/noobanidus/mods/lootr/api/ILootrAPI.java

@@ -52,4 +52,6 @@ default boolean clearPlayerLoot(ServerPlayer entity) {
    */
   @Nullable
   MenuProvider getModdedMenu(Level level, UUID id, BlockPos pos, ServerPlayer player, IntSupplier sizeSupplier, Supplier<Component> displaySupplier, LootFiller filler, Supplier<ResourceLocation> tableSupplier, LongSupplier seedSupplier);
+
+  boolean isSavingStructure ();
 }

src/main/java/noobanidus/mods/lootr/api/LootrAPI.java

@@ -22,6 +22,8 @@ public class LootrAPI {
 
   public static ILootrAPI INSTANCE;
 
+  public static boolean isSavingStructure;
+
   public static boolean clearPlayerLoot(ServerPlayer entity) {
     return INSTANCE.clearPlayerLoot(entity);
   }
@@ -37,4 +39,7 @@ public static MenuProvider getModdedMenu(Level level, UUID id, BlockPos pos, Ser
   public static MenuProvider getModdedMenu(Level level, UUID id, BlockPos pos, ServerPlayer player, IntSupplier sizeSupplier, Supplier<Component> displaySupplier, LootFiller filler, Supplier<ResourceLocation> tableSupplier, LongSupplier seedSupplier) {
     return INSTANCE.getModdedMenu(level, id, pos, player, sizeSupplier, displaySupplier, filler, tableSupplier, seedSupplier);
   }
+  public static boolean isSavingStructure() {
+    return INSTANCE.isSavingStructure();
+  }
 }

src/main/java/noobanidus/mods/lootr/block/entities/LootrBarrelBlockEntity.java

@@ -237,12 +237,14 @@ protected void saveAdditional(CompoundTag compound) {
       compound.putLong("specialLootBarrel_seed", seed);
       compound.putLong("LootTableSeed", seed);
     }
-    compound.putUUID("tileId", getTileId());
-    ListTag list = new ListTag();
-    for (UUID opener : this.openers) {
-      list.add(NbtUtils.createUUID(opener));
+    if (!LootrAPI.isSavingStructure()) {
+      compound.putUUID("tileId", getTileId());
+      ListTag list = new ListTag();
+      for (UUID opener : this.openers) {
+        list.add(NbtUtils.createUUID(opener));
+      }
+      compound.put("LootrOpeners", list);
     }
-    compound.put("LootrOpeners", list);
   }
 
   @Override

src/main/java/noobanidus/mods/lootr/block/entities/LootrChestBlockEntity.java

@@ -143,12 +143,14 @@ protected void saveAdditional(CompoundTag compound) {
       compound.putLong("specialLootChest_seed", seed);
       compound.putLong("LootTableSeed", seed);
     }
-    compound.putUUID("tileId", getTileId());
-    ListTag list = new ListTag();
-    for (UUID opener : this.openers) {
-      list.add(NbtUtils.createUUID(opener));
+    if (!LootrAPI.isSavingStructure()) {
+      compound.putUUID("tileId", getTileId());
+      ListTag list = new ListTag();
+      for (UUID opener : this.openers) {
+        list.add(NbtUtils.createUUID(opener));
+      }
+      compound.put("LootrOpeners", list);
     }
-    compound.put("LootrOpeners", list);
   }
 
   public static <T extends BlockEntity> void lootrLidAnimateTick(Level pLevel, BlockPos pPos, BlockState pState, T pBlockEntity) {

src/main/java/noobanidus/mods/lootr/block/entities/LootrShulkerBlockEntity.java

@@ -257,12 +257,14 @@ protected void saveAdditional(CompoundTag compound) {
       compound.putLong("specialLootChest_seed", seed);
       compound.putLong("LootTableSeed", seed);
     }
-    compound.putUUID("tileId", getTileId());
-    ListTag list = new ListTag();
-    for (UUID opener : this.openers) {
-      list.add(NbtUtils.createUUID(opener));
+    if (!LootrAPI.isSavingStructure()) {
+      compound.putUUID("tileId", getTileId());
+      ListTag list = new ListTag();
+      for (UUID opener : this.openers) {
+        list.add(NbtUtils.createUUID(opener));
+      }
+      compound.put("LootrOpeners", list);
     }
-    compound.put("LootrOpeners", list);
   }
 
   @Override

src/main/java/noobanidus/mods/lootr/impl/LootrAPIImpl.java

@@ -10,6 +10,9 @@
 import net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity;
 import noobanidus.mods.lootr.api.ILootrAPI;
 import noobanidus.mods.lootr.api.LootFiller;
+import noobanidus.mods.lootr.api.LootrAPI;
+import noobanidus.mods.lootr.api.MenuBuilder;
+import noobanidus.mods.lootr.config.ConfigManager;
 import noobanidus.mods.lootr.data.DataStorage;
 import org.jetbrains.annotations.Nullable;
 
@@ -19,6 +22,7 @@
 import java.util.function.Supplier;
 
 public class LootrAPIImpl implements ILootrAPI {
+
   @Override
   public boolean clearPlayerLoot(UUID id) {
     return DataStorage.clearInventories(id);
@@ -34,4 +38,9 @@ public MenuProvider getModdedMenu(Level level, UUID id, BlockPos pos, ServerPlay
   public MenuProvider getModdedMenu(Level level, UUID id, BlockPos pos, ServerPlayer player, IntSupplier sizeSupplier, Supplier<Component> displaySupplier, LootFiller filler, Supplier<ResourceLocation> tableSupplier, LongSupplier seedSupplier) {
     return DataStorage.getInventory(level, id, pos, player, sizeSupplier, displaySupplier, filler, tableSupplier, seedSupplier);
   }
+
+  @Override
+  public boolean isSavingStructure() {
+    return LootrAPI.isSavingStructure;
+  }
 }

src/main/java/noobanidus/mods/lootr/mixins/MixinStructureTemplate.java

@@ -0,0 +1,24 @@
+package noobanidus.mods.lootr.mixins;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
+import noobanidus.mods.lootr.api.LootrAPI;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(StructureTemplate.class)
+public class MixinStructureTemplate {
+  @Inject(method="fillFromWorld", at=@At(value="INVOKE", target="Lnet/minecraft/world/level/block/entity/BlockEntity;saveWithId()Lnet/minecraft/nbt/CompoundTag;", shift=At.Shift.BEFORE))
+  private void LootrInjectStructureSavingStart(Level p_163803_, BlockPos p_163804_, Vec3i p_163805_, boolean p_163806_, Block p_163807_, CallbackInfo ci) {
+    LootrAPI.isSavingStructure = true;
+  }
+  @Inject(method="fillFromWorld", at=@At(value="INVOKE", target="Lnet/minecraft/world/level/block/entity/BlockEntity;saveWithId()Lnet/minecraft/nbt/CompoundTag;", shift=At.Shift.AFTER))
+  private void LootrInjectStructureSavingStop (Level p_163803_, BlockPos p_163804_, Vec3i p_163805_, boolean p_163806_, Block p_163807_, CallbackInfo ci) {
+    LootrAPI.isSavingStructure = false;
+  }
+}

src/main/resources/lootr.mixins.json

@@ -7,7 +7,8 @@
     "MixinBlockStateBase",
     "MixinCatSitOnBlockGoal",
     "MixinEndCityPieces$EndCityPiece",
-    "MixinLevelChunk"
+    "MixinLevelChunk",
+    "MixinStructureTemplate"
   ],
   "client": [
   ],