diff options
| author | Jason Mitchell <mitchej@gmail.com> | 2022-08-13 18:46:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-14 02:46:06 +0100 |
| commit | 971e8dd33307eb28be26a86646a8f252e02f6acc (patch) | |
| tree | 6937cbd7d0f86209088fbd9b9ca502a98258ae8e | |
| parent | b60c4c7073b79ba46e27905f87a7be617d5019ce (diff) | |
| download | GT5-Unofficial-971e8dd33307eb28be26a86646a8f252e02f6acc.tar.gz GT5-Unofficial-971e8dd33307eb28be26a86646a8f252e02f6acc.tar.bz2 GT5-Unofficial-971e8dd33307eb28be26a86646a8f252e02f6acc.zip | |
Switch to GTNHLib for ItemStackMap instead of Hodgepodge (#1251)
| -rw-r--r-- | dependencies.gradle | 2 | ||||
| -rw-r--r-- | gradle.properties | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index a51aa1a909..379864b439 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -9,7 +9,7 @@ dependencies { compile("com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev") compile("com.github.GTNewHorizons:waila:1.5.18:dev") - compile("com.github.GTNewHorizons:Hodgepodge:1.6.23:dev") + compile("com.github.GTNewHorizons:GTNHLib:0.0.1:dev") compile("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") diff --git a/gradle.properties b/gradle.properties index 028ed36c1c..3d32b29421 100644 --- a/gradle.properties +++ b/gradle.properties @@ -60,4 +60,4 @@ containsMixinsAndOrCoreModOnly = false usesShadowedDependencies = false # Enables Mixins even if this mod doesn't use them, useful if one of the dependencies uses mixins. -forceEnableMixins = true +forceEnableMixins = diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java index 732a0459b0..d015a3a274 100644 --- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java +++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java @@ -1,7 +1,7 @@ package gregtech.api.multitileentity; import appeng.core.CreativeTab; -import com.mitchej123.hodgepodge.core.util.ItemStackMap; +import com.gtnewhorizon.gtnhlib.util.map.ItemStackMap; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; @@ -29,7 +29,9 @@ import static gregtech.GT_Mod.GT_FML_LOGGER; public class MultiTileEntityRegistry { private static final HashMap<String, MultiTileEntityRegistry> NAMED_REGISTRIES = new HashMap<>(); - private static final ItemStackMap<MultiTileEntityRegistry> REGISTRIES = new ItemStackMap<>(); + + // TODO: NBT sensitive or not? Starting with not for now + private static final ItemStackMap<MultiTileEntityRegistry> REGISTRIES = new ItemStackMap<>(false); private static final HashSet<Class<?>> sRegisteredTileEntities = new HashSet<>(); public HashMap<Short, CreativeTab> mCreativeTabs = new HashMap<>(); |