Fix to work with newer Storage Drawers versions (#2)

Co-authored-by: Maya <[email protected]>

Author: TheNoiselessNoise

gradle.properties

@@ -13,8 +13,3 @@ mod_license = MIT License
 mod_url = https://github.com/GregTechCEu/GregTechStorageDrawers/
 mod_issue_tracker = https://github.com/GregTechCEu/GregTechStorageDrawers/issues/
 maven_group = com.gregtechceu.gtstoragedrawers
-
-# Mod dependency versions
-emi_version=1.1.13+1.20.1
-storagedrawers_projid=223852
-storagedrawers_fileid=5631332

gradle/forge.versions.toml

@@ -7,7 +7,7 @@ emi = "1.1.13+1.20.1"
 jade = "11.12.3+forge"
 
 ## cursemaven ##
-storagedrawers = "6549483" # 12.9.14
+storagedrawers = "6839539" # 12.11.1
 
 [libraries]
 ldlib                     = { module = "com.lowdragmc.ldlib:ldlib-forge-1.20.1", version.ref = "ldlib" }

src/main/java/com/gregtechceu/gtstoragedrawers/DrawerTypes.java

@@ -5,10 +5,10 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
-import net.minecraftforge.registries.DeferredRegister;
 
 import com.jaquadro.minecraft.storagedrawers.core.ModBlockVariants;
 import com.jaquadro.minecraft.storagedrawers.core.ModBlockVariants.VariantData;
+import com.texelsaurus.minecraft.chameleon.registry.ChameleonRegistry;
 import lombok.Getter;
 
 public enum DrawerTypes {
@@ -56,11 +56,11 @@ public String getTextureName(String textureVariant) {
         return "block/" + GTCEu.MOD_ID + "/drawers_" + name + "_" + textureVariant;
     }
 
-    public void registerBlocks(DeferredRegister<Block> register) {
+    public void registerBlocks(ChameleonRegistry<Block> register) {
         ModBlockVariants.registerVariant(register, data);
     }
 
-    public void registerItems(DeferredRegister<Item> register) {
+    public void registerItems(ChameleonRegistry<Item> register) {
         ModBlockVariants.registerVariantItem(register, data);
     }
 }

src/main/java/com/gregtechceu/gtstoragedrawers/GregTechStorageDrawers.java

@@ -1,5 +1,6 @@
 package com.gregtechceu.gtstoragedrawers;
 
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceKey;
@@ -11,10 +12,11 @@
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.registries.DeferredRegister;
-import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.RegisterEvent;
 
+import com.texelsaurus.minecraft.chameleon.ChameleonServices;
+import com.texelsaurus.minecraft.chameleon.registry.ChameleonRegistry;
+import com.texelsaurus.minecraft.chameleon.registry.ForgeRegistryContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -25,23 +27,26 @@ public class GregTechStorageDrawers {
     public static final String MOD_NAME = "GregTech Storage Drawers";
     public static final Logger LOGGER = LoggerFactory.getLogger(MOD_NAME);
 
-    public static final DeferredRegister<Block> BLOCK_REGISTER = DeferredRegister.create(ForgeRegistries.BLOCKS, MODID);
-    public static final DeferredRegister<Item> ITEM_REGISTER = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
+    public static final ChameleonRegistry<Block> BLOCK_REGISTER = ChameleonServices.REGISTRY
+            .create(BuiltInRegistries.BLOCK, MODID);
+    public static final ChameleonRegistry<Item> ITEM_REGISTER = ChameleonServices.REGISTRY
+            .create(BuiltInRegistries.ITEM, MODID);
 
     private static final ResourceKey<CreativeModeTab> TAB = ResourceKey.create(
             Registries.CREATIVE_MODE_TAB,
             new ResourceLocation(MODID, MODID));
 
     public GregTechStorageDrawers() {
         IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus();
+        ForgeRegistryContext context = new ForgeRegistryContext(bus);
 
         for (DrawerTypes type : DrawerTypes.values()) {
             type.registerBlocks(BLOCK_REGISTER);
             type.registerItems(ITEM_REGISTER);
         }
 
-        BLOCK_REGISTER.register(bus);
-        ITEM_REGISTER.register(bus);
+        BLOCK_REGISTER.init(context);
+        ITEM_REGISTER.init(context);
 
         bus.addListener(GregTechStorageDrawers::registerCreativeTab);
     }