From 7213b9b84d111ff67779710aba622009b2b5d6e4 Mon Sep 17 00:00:00 2001 From: George Paton Date: Fri, 8 Aug 2025 16:53:13 +1000 Subject: [PATCH] move jiggy map --- src/main/java/com/hbm/world/gen/nbt/JigsawPiece.java | 8 ++++++-- src/main/java/com/hbm/world/gen/nbt/NBTStructure.java | 5 +---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/hbm/world/gen/nbt/JigsawPiece.java b/src/main/java/com/hbm/world/gen/nbt/JigsawPiece.java index d58a5dcfa..039f8d154 100644 --- a/src/main/java/com/hbm/world/gen/nbt/JigsawPiece.java +++ b/src/main/java/com/hbm/world/gen/nbt/JigsawPiece.java @@ -1,5 +1,6 @@ package com.hbm.world.gen.nbt; +import java.util.HashMap; import java.util.Map; import net.minecraft.block.Block; @@ -8,6 +9,9 @@ import net.minecraft.world.gen.structure.StructureComponent.BlockSelector; // Assigned to a Component to build public class JigsawPiece { + // Translates a given name into a jigsaw piece, for serialization + protected static Map jigsawMap = new HashMap<>(); + public final String name; public final NBTStructure structure; @@ -23,11 +27,11 @@ public class JigsawPiece { public JigsawPiece(String name, NBTStructure structure, int heightOffset) { if(name == null) throw new IllegalStateException("A severe error has occurred in NBTStructure! A jigsaw piece has been registered without a valid name!"); - if(NBTStructure.jigsawMap.containsKey(name)) throw new IllegalStateException("A severe error has occurred in NBTStructure! A jigsaw piece has been registered with the same name as another: " + name); + if(jigsawMap.containsKey(name)) throw new IllegalStateException("A severe error has occurred in NBTStructure! A jigsaw piece has been registered with the same name as another: " + name); this.name = name; this.structure = structure; - NBTStructure.jigsawMap.put(name, this); + jigsawMap.put(name, this); this.heightOffset = heightOffset; } diff --git a/src/main/java/com/hbm/world/gen/nbt/NBTStructure.java b/src/main/java/com/hbm/world/gen/nbt/NBTStructure.java index ed1632ee1..385644257 100644 --- a/src/main/java/com/hbm/world/gen/nbt/NBTStructure.java +++ b/src/main/java/com/hbm/world/gen/nbt/NBTStructure.java @@ -59,9 +59,6 @@ public class NBTStructure { protected static Map> weightedMap = new HashMap<>(); protected static Map> customSpawnMap = new HashMap<>(); - // serialization data - protected static Map jigsawMap = new HashMap<>(); - private String name; private boolean isLoaded; @@ -761,7 +758,7 @@ public class NBTStructure { // Load from NBT @Override protected void func_143011_b(NBTTagCompound nbt) { - piece = jigsawMap.get(nbt.getString("piece")); + piece = JigsawPiece.jigsawMap.get(nbt.getString("piece")); minHeight = nbt.getInteger("min"); maxHeight = nbt.getInteger("max"); heightUpdated = nbt.getBoolean("hasHeight");