Simplify Item Registration & Improve Items #1557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

boubou19 merged 14 commits into master from de-yamcl-items

Jan 17, 2026

dependencies.gradle

-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
     // Add your dependencies here
     dependencies {
-        api("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.195:dev")
+        api("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.215:dev")
         api("com.github.GTNewHorizons:Yamcl:0.7.3:dev")
         api("com.github.GTNewHorizons:Baubles-Expanded:2.2.6-GTNH:dev")
@@ Expand Down @@

src/main/java/com/dreammaster/auxiliary/NEIGTNewHorizonsConfig.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ @@
     import net.minecraft.nbt.NBTTagInt;
     import net.minecraft.nbt.NBTTagString;
-    import com.dreammaster.item.food.QuantumBread;
     import com.dreammaster.lib.Refstrings;
     import com.dreammaster.main.MainRegistry;
@@ Expand All @@
         @Override
         public void loadConfig() {
-            API.hideItem(new ItemStack(QuantumBread.Instance()));
             API.hideItem(new ItemStack(Loaders.antimatterRenderBlock));
             API.hideItem(new ItemStack(GregTechAPI.sDroneRender));
             API.hideItem(new ItemStack(GregTechAPI.sWormholeRender));
@@ Expand Down @@

src/main/java/com/dreammaster/baubles/WitherProtectionRing.java

This file was deleted.

src/main/java/com/dreammaster/creativetab/ModTabList.java

-Original file line number
+Diff line change
@@ -1,69 +1,88 @@
     package com.dreammaster.creativetab;
-    import java.util.List;
+    import net.minecraft.creativetab.CreativeTabs;
     import net.minecraft.init.Blocks;
     import net.minecraft.init.Items;
     import net.minecraft.item.Item;
-    import com.dreammaster.gthandler.CustomItemList;
     import com.dreammaster.item.NHItemList;
     import eu.usrv.yamcore.creativetabs.CreativeTabsManager;
     import eu.usrv.yamcore.creativetabs.ModCreativeTab;
-    import eu.usrv.yamcore.items.ModItemManager;
-    import gregtech.api.GregTechAPI;
     public final class ModTabList {
-        public static String ModGenericTab = "tabDreamCraftItems_Generic";
-        public static String ModShapesTab = "tabDreamCraftItems_Shapes";
-        public static String ModMoldsTab = "tabDreamCraftItems_Molds";
-        public static String ModThaumcraftTab = "tabDreamCraftItems_Thaum";
-        public static String ModCircuitsTab = "tabDreamCraftItems_Circuit";
         public static String ModFluidsTab = "tabDreamCraftFluids";
         public static String ModBlocksTab = "tabDreamCraftBlocks";
-        public static String ModSpaceTab = "tabDreamCraftSpace";
-        public static String ModSolarTab = "tabDreamCraftSolar";
-        public static String ModBarsAndCasingsTab = "tabDreamCraftBars_Casings";
-        public static String ModAdditionsToGregTechTab = "tabDreamGregTechAdditions";
+        public static final CreativeTabs GENERIC = new CreativeTabs("tabDreamCraftItems_Generic") {
+            @Override
+            public Item getTabIconItem() {
+                return NHItemList.AsteroidsStoneDust.item;
+            }
+        };
+        public static final CreativeTabs SHAPES = new CreativeTabs("tabDreamCraftItems_Shapes") {
+            @Override
+            public Item getTabIconItem() {
+                return NHItemList.ShapeBlock.item;
+            }
+        };
+        public static final CreativeTabs MOLDS = new CreativeTabs("tabDreamCraftItems_Molds") {
+            @Override
+            public Item getTabIconItem() {
+                return NHItemList.MoldFormAnvil.item;
+            }
+        };
+        public static final CreativeTabs THAUMCRAFT = new CreativeTabs("tabDreamCraftItems_Thaum") {
+            @Override
+            public Item getTabIconItem() {
+                return NHItemList.ChargedVoidWandCap.item;
+            }
+        };
+        public static final CreativeTabs CIRCUITS = new CreativeTabs("tabDreamCraftItems_Circuit") {
+            @Override
+            public Item getTabIconItem() {
+                return NHItemList.QuantumCircuit.item;
+            }
+        };
+        public static final CreativeTabs SPACE = new CreativeTabs("tabDreamCraftSpace") {
+            @Override
+            public Item getTabIconItem() {
+                return NHItemList.HeavyDutyNoseConeTier3.item;
+            }
+        };
+        public static final CreativeTabs SOLAR = new CreativeTabs("tabDreamCraftSolar") {
+            @Override
+            public Item getTabIconItem() {
+                return NHItemList.EnrichedNaquadriaNeutroniumSunnariumAlloy.item;
+            }
+        };
+        public static final CreativeTabs BARS_AND_CASINGS = new CreativeTabs("tabDreamCraftBars_Casings") {
+            @Override
+            public Item getTabIconItem() {
+                return NHItemList.ChromeBars.item;
+            }
+        };
         private ModTabList() {}
-        public static void InitModTabs(CreativeTabsManager pTabManager, ModItemManager pItemManager) {
-            pTabManager.AddCreativeTab(
-                    new ModCreativeTab(ModGenericTab, NHItemList.AsteroidsStoneDust.Item.getConstructedItem()));
-            pTabManager.AddCreativeTab(new ModCreativeTab(ModShapesTab, NHItemList.ShapeBlock.Item.getConstructedItem()));
-            pTabManager.AddCreativeTab(new ModCreativeTab(ModMoldsTab, NHItemList.MoldFormAnvil.Item.getConstructedItem()));
-            pTabManager.AddCreativeTab(
-                    new ModCreativeTab(ModThaumcraftTab, NHItemList.ChargedVoidWandCap.Item.getConstructedItem()));
-            pTabManager.AddCreativeTab(
-                    new ModCreativeTab(ModCircuitsTab, NHItemList.QuantumCircuit.Item.getConstructedItem()));
-            pTabManager.AddCreativeTab(new ModCreativeTab(ModFluidsTab, Items.bucket));
-            pTabManager.AddCreativeTab(new ModCreativeTab(ModBlocksTab, Item.getItemFromBlock(Blocks.stone)));
-            pTabManager.AddCreativeTab(
-                    new ModCreativeTab(ModSpaceTab, NHItemList.HeavyDutyNoseConeTier3.Item.getConstructedItem()));
-            pTabManager.AddCreativeTab(
-                    new ModCreativeTab(
-                            ModSolarTab,
-                            NHItemList.EnrichedNaquadriaNeutroniumSunnariumAlloy.Item.getConstructedItem()));
-            pTabManager.AddCreativeTab(
-                    new ModCreativeTab(ModBarsAndCasingsTab, NHItemList.ChromeBars.Item.getConstructedItem()));
-            pTabManager.AddCreativeTab(
-                    new ModCreativeTab(
-                            ModAdditionsToGregTechTab,
-                            NHItemList.EtchedLudicrousVoltageWiring.Item.getConstructedItem()) {
-                        @Override
-                        public void displayAllReleventItems(List stuffToShow) {
-                            // te adder
-                            for (CustomItemList item : CustomItemList.values()) {
-                                if (item.hasBeenSet() && item.getBlock() == GregTechAPI.sBlockMachines) {
-                                    stuffToShow.add(item.get(1));
-                                }
-                            }
-                            super.displayAllReleventItems(stuffToShow);
-                        }
-                    });
+        public static void InitModTabs(CreativeTabsManager tabManager) {
+            tabManager.AddCreativeTab(new ModCreativeTab(ModFluidsTab, Items.bucket));
+            tabManager.AddCreativeTab(new ModCreativeTab(ModBlocksTab, Item.getItemFromBlock(Blocks.stone)));
         }
     }

src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -45,7 +45,6 @@
  
    import com.dreammaster.iguana.IguanaProxy;

    import com.dreammaster.item.ItemBucketList;

    import com.dreammaster.item.NHItemList;

    import com.dreammaster.main.NHItems;

    import com.dreammaster.mantle.MantleManualRecipeRegistry;

    import com.dreammaster.recipes.Recipe;

    @@ -1084,15 +1083,15 @@ public void run() {
  
                    CustomItemList.UnfiredClayBrick.get(8L),

                    GTModHandler.RecipeBits.NOT_REMOVABLE,

                    new Object[] { "CCC", "CFC", "CCC", 'C', new ItemStack(Items.clay_ball, 1, 0), 'F',

                            new ItemStack(NHItems.WOODEN_BRICK_FORM.get(), 1, GTValues.W) });

                            new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W) });

            GTModHandler.addShapelessCraftingRecipe(

                    CustomItemList.UnfiredClayBrick.get(1L),

                    GTModHandler.RecipeBits.NOT_REMOVABLE,

                    new Object[] { new ItemStack(Items.clay_ball, 1, 0),

                            new ItemStack(NHItems.WOODEN_BRICK_FORM.get(), 1, GTValues.W) });

                            new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W) });

            if (TinkerConstruct.isModLoaded()) {

                Recipe.of(

                        new ItemStack(NHItems.WOODEN_BRICK_FORM.get(), 1, GTValues.W),

                        new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W),

                        ToolDictNames.craftingToolKnife,

                        GTModHandler.getModItem(aTextTConstruct, "blankPattern", 1L, 0))

                        .provideTo(shapelessUnremovableGtRecipes())

    @@ -1102,31 +1101,31 @@ public void run() {
  
                        GTModHandler.RecipeBits.NOT_REMOVABLE,

                        new Object[] { "GGG", "GFG", "GGG", 'G',

                                GTModHandler.getModItem(aTextTConstruct, "CraftedSoil", 1L, 1), 'F',

                                new ItemStack(NHItems.WOODEN_BRICK_FORM.get(), 1, GTValues.W) });

                                new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W) });

                Recipe.of(

                        CustomItemList.UnfiredSearedBrick.get(1L),

                        GTModHandler.getModItem(aTextTConstruct, "CraftedSoil", 1L, 1),

                        new ItemStack(NHItems.WOODEN_BRICK_FORM.get(), 1, GTValues.W))

                        new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W))

                        .provideTo(shapelessUnremovableGtRecipes())

                        .provideTo(MANTLE.manualShapedCraftingRecipeNamed("unfiredsearedbrick"));

                GTModHandler.addCraftingRecipe(

                        CustomItemList.UnfiredSlimeSoilBrick.get(8L),

                        GTModHandler.RecipeBits.NOT_REMOVABLE,

                        new Object[] { "SSS", "SFS", "SSS", 'S',

                                GTModHandler.getModItem(aTextTConstruct, "CraftedSoil", 1L, 6), 'F',

                                new ItemStack(NHItems.WOODEN_BRICK_FORM.get(), 1, GTValues.W) });

                                new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W) });

                GTModHandler.addShapelessCraftingRecipe(

                        CustomItemList.UnfiredSlimeSoilBrick.get(1L),

                        GTModHandler.RecipeBits.NOT_REMOVABLE,

                        new Object[] { GTModHandler.getModItem(aTextTConstruct, "CraftedSoil", 1L, 6),

                                new ItemStack(NHItems.WOODEN_BRICK_FORM.get(), 1, GTValues.W) });

                                new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W) });

            }

            GTModHandler.addCraftingRecipe(

                    CustomItemList.UnfiredCokeOvenBrick.get(3L),

                    GTModHandler.RecipeBits.NOT_REMOVABLE,

                    new Object[] { "CCC", "SFS", "SSS", 'C', new ItemStack(Items.clay_ball, 1, 0), 'S',

                            GTOreDictUnificator.get("sand", 1L), 'F',

                            new ItemStack(NHItems.WOODEN_BRICK_FORM.get(), 1, GTValues.W) });

                            new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W) });

            GTModHandler.addCraftingRecipe(

                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 1L),

src/main/java/com/dreammaster/gthandler/GT_CustomLoader.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,11 +6,9 @@ @@
     import net.minecraft.item.ItemStack;
     import com.dreammaster.item.NHItemList;
-    import com.dreammaster.item.food.QuantumBread;
     import com.dreammaster.modfixes.biomesoplenty.BlockHarvestToolFix;
     import com.dreammaster.modfixes.enderIO.FrankenskullFix;
-    import cpw.mods.fml.common.registry.GameRegistry;
     import gregtech.api.enums.Materials;
     import gregtech.api.enums.OrePrefixes;
@@ Expand Down Expand Up / @@ -140,7 +138,6 @@ public Object getPipeL() { @@
         private static final GT_Recipe_Remover Remover = new GT_Recipe_Remover();
         public void run() {
-            GameRegistry.registerItem(QuantumBread.Instance(), "itemQuantumToast");
             if (EnderIO.isModLoaded()) {
                 FrankenskullFix.fixEnderIO();
             }
@@ Expand Down @@

src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -413,7 +413,7 @@ private void registerItems() { @@
             CustomItemList.ReinforcedTitaniumIronPlate.set(NHItemList.ReinforcedTitaniumIronPlate.getIS());
             CustomItemList.TungstenIronPlate.set(NHItemList.TungstenIronPlate.getIS());
             CustomItemList.ReinforcedTungstenIronPlate.set(NHItemList.ReinforcedTungstenIronPlate.getIS());
-            CustomItemList.TungstenSteelIronPlate.set(NHItemList.TungstenSteeLIronPlate.getIS());
+            CustomItemList.TungstenSteelIronPlate.set(NHItemList.TungstenSteelIronPlate.getIS());
             CustomItemList.ReinforcedTungstenSteelIronPlate.set(NHItemList.ReinforcedTungstenSteelIronPlate.getIS());
             CustomItemList.ChromeIronPlate.set(NHItemList.ChromeIronPlate.getIS());
             CustomItemList.ReinforcedChromeIronPlate.set(NHItemList.ReinforcedChromeIronPlate.getIS());
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Simplify Item Registration & Improve Items #1557

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!