Move POI collection optimization to fabric only package

Fixes incompatibility with NeoForge POI Type registration logic #594
CaffeineMC · Nov 28, 2024 · b5c0bbf · b5c0bbf
1 parent b7262b7
commit b5c0bbf
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 39 deletions.
diff --git a/...a/net/caffeinemc/mods/lithium/common/world/interests/types/PointOfInterestTypeHelper.java b/...a/net/caffeinemc/mods/lithium/common/world/interests/types/PointOfInterestTypeHelper.java
diff --git a/common/src/main/resources/lithium.mixins.json b/common/src/main/resources/lithium.mixins.json
@@ -16,7 +16,6 @@
     "ai.pathing.WalkNodeEvaluatorMixin",
     "ai.poi.PoiManagerMixin",
     "ai.poi.PoiSectionMixin",
-    "ai.poi.PoiTypesMixin",
     "ai.poi.SectionStorageMixin",
     "ai.poi.fast_portals.PoiManagerMixin",
     "ai.poi.fast_portals.PortalForcerMixin",

diff --git a/...s/lithium/mixin/ai/poi/PoiTypesMixin.java → .../collections/poi_types/PoiTypesMixin.java b/...s/lithium/mixin/ai/poi/PoiTypesMixin.java → .../collections/poi_types/PoiTypesMixin.java
@@ -1,7 +1,6 @@
-package net.caffeinemc.mods.lithium.mixin.ai.poi;
+package net.caffeinemc.mods.lithium.fabric.mixin.collections.poi_types;
 
 import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap;
-import net.caffeinemc.mods.lithium.common.world.interests.types.PointOfInterestTypeHelper;
 import net.minecraft.world.entity.ai.village.poi.PoiType;
 import net.minecraft.world.entity.ai.village.poi.PoiTypes;
 import net.minecraft.world.level.block.state.BlockState;
@@ -24,7 +23,5 @@ public class PoiTypesMixin {
 
     static {
         TYPE_BY_STATE = new Reference2ReferenceOpenHashMap<>(TYPE_BY_STATE);
-
-        PointOfInterestTypeHelper.init(TYPE_BY_STATE.keySet());
     }
 }
diff --git a/...ain/java/net/caffeinemc/mods/lithium/fabric/mixin/collections/poi_types/package-info.java b/...ain/java/net/caffeinemc/mods/lithium/fabric/mixin/collections/poi_types/package-info.java
@@ -0,0 +1,5 @@
+@MixinConfigOption(description = "Uses fastutil hashmap for POI Types")
+package net.caffeinemc.mods.lithium.fabric.mixin.collections.poi_types;
+
+import net.caffeinemc.gradle.MixinConfigOption;
+//Not on NeoForge, as it also replaces the map
diff --git a/fabric/src/main/resources/lithium-fabric.mixins.json b/fabric/src/main/resources/lithium-fabric.mixins.json
@@ -1,24 +1,25 @@
 {
-  "package" : "net.caffeinemc.mods.lithium.fabric.mixin",
-  "required" : true,
-  "compatibilityLevel" : "JAVA_21",
-  "plugin" : "net.caffeinemc.mods.lithium.mixin.LithiumMixinPlugin",
-  "refmap" : "lithium-fabric.refmap.json",
-  "injectors" : {
-    "defaultRequire" : 1
+  "package": "net.caffeinemc.mods.lithium.fabric.mixin",
+  "required": true,
+  "compatibilityLevel": "JAVA_21",
+  "plugin": "net.caffeinemc.mods.lithium.mixin.LithiumMixinPlugin",
+  "refmap": "lithium-fabric.refmap.json",
+  "injectors": {
+    "defaultRequire": 1
   },
-  "overwrites" : {
-    "conformVisibility" : true
+  "overwrites": {
+    "conformVisibility": true
   },
-  "mixins" : [
+  "mixins": [
     "block.hopper.LevelMixin",
+    "collections.poi_types.PoiTypesMixin",
     "compat.transfer_api.TransferApiHelperMixin",
     "compat.worldedit.LevelChunkMixin",
     "entity.collisions.fluid.EntityMixin",
     "experimental.entity.block_caching.fluid_pushing.EntityMixin",
     "util.inventory_change_listening.BlockEntityMixin",
     "util.inventory_change_listening.ChestBlockEntityMixin"
   ],
-  "client" : [
+  "client": [
   ]
 }