fixing forge being dumb yet again

ImplementsLegend · Oct 13, 2024 · e6c1019 · e6c1019
1 parent a3803ce
commit e6c1019
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/implementslegend/mod/vaultfaster/fixatedBlockIDs.kt b/src/main/java/implementslegend/mod/vaultfaster/fixatedBlockIDs.kt
@@ -17,9 +17,9 @@ import net.minecraftforge.registries.ForgeRegistry
 val BLOCKS by lazy {
     val data = (ForgeRegistries.BLOCKS as ForgeRegistry<Block>).values
 
-    val result = IdMapper<Block>(data.maxOf { (it as IndexedBlock).registryIndex }+1)
-    data.forEach {
-        result.addMapping(it,(it as IndexedBlock).registryIndex)
+    val result = IdMapper<Block>(data.count()/*data.maxOf { (it as IndexedBlock).registryIndex }+1*/)
+    data.forEachIndexed { index, it ->
+        result.addMapping(it,index)
     }
     result
 }

diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinBlockRegistryIndex.java b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinBlockRegistryIndex.java
@@ -1,6 +1,8 @@
 package implementslegend.mod.vaultfaster.mixin;
 
+import implementslegend.mod.vaultfaster.FixatedBlockIDsKt;
 import implementslegend.mod.vaultfaster.interfaces.IndexedBlock;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.ForgeRegistry;
@@ -16,10 +18,13 @@ public class MixinBlockRegistryIndex implements IndexedBlock {
     private int registryIndex = -1;
     @Override
     public int getRegistryIndex() {
+        /*
         if(registryIndex<0){
             registryIndex= ((ForgeRegistry)ForgeRegistries.BLOCKS).getID((BlockBehaviour) (Object)this);
         }
         return registryIndex;
+        */
+        return FixatedBlockIDsKt.getIdForBlock((Block)(Object) this);
     }
 
     @Override