Merge branch 'master' into TG-Removal

GTNewHorizons · Jan 12, 2025 · 673fa83 · 673fa83
2 parents 6c9a852 + 24a9507
commit 673fa83
Show file tree

Hide file tree

Showing 51 changed files with 1,201 additions and 1,499 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,7 +1,7 @@
 // Add your dependencies here
 
 dependencies {
-    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.63:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.67:dev")
     api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
     api("com.github.GTNewHorizons:Baubles:1.0.4:dev")
 
@@ -13,7 +13,7 @@ dependencies {
     compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.18:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.3-GTNH:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.2.3:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.3.0:dev") { transitive = false }
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
     compileOnly rfg.deobf("curse.maven:witchery-69673:2234410")
     compileOnly("com.github.GTNewHorizons:Chisel:2.16.1-GTNH:dev") { transitive = false }

diff --git a/src/main/java/com/dreammaster/bartworksHandler/BW_Recipe_Loader.java b/src/main/java/com/dreammaster/bartworksHandler/BW_Recipe_Loader.java
@@ -9,6 +9,7 @@
 import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 import static gregtech.api.util.GTRecipeConstants.AssemblyLine;
 import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM;
+import static gregtech.api.util.GTRecipeConstants.SCANNING;
 
 import net.minecraftforge.fluids.FluidRegistry;
 

diff --git a/src/main/java/com/dreammaster/creativetab/ModTabList.java b/src/main/java/com/dreammaster/creativetab/ModTabList.java
@@ -7,7 +7,7 @@
 import net.minecraft.item.Item;
 
 import com.dreammaster.gthandler.CustomItemList;
-import com.dreammaster.item.ItemList;
+import com.dreammaster.item.NHItemList;
 
 import eu.usrv.yamcore.creativetabs.CreativeTabsManager;
 import eu.usrv.yamcore.creativetabs.ModCreativeTab;
@@ -32,27 +32,27 @@ private ModTabList() {}
 
     public static void InitModTabs(CreativeTabsManager pTabManager, ModItemManager pItemManager) {
         pTabManager.AddCreativeTab(
-                new ModCreativeTab(ModGenericTab, ItemList.AsteroidsStoneDust.Item.getConstructedItem()));
-        pTabManager.AddCreativeTab(new ModCreativeTab(ModShapesTab, ItemList.ShapeBlock.Item.getConstructedItem()));
-        pTabManager.AddCreativeTab(new ModCreativeTab(ModMoldsTab, ItemList.MoldFormAnvil.Item.getConstructedItem()));
+                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, ItemList.ChargedVoidWandCap.Item.getConstructedItem()));
-        pTabManager
-                .AddCreativeTab(new ModCreativeTab(ModCircuitsTab, ItemList.QuantumCircuit.Item.getConstructedItem()));
+                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, ItemList.HeavyDutyNoseConeTier3.Item.getConstructedItem()));
+                new ModCreativeTab(ModSpaceTab, NHItemList.HeavyDutyNoseConeTier3.Item.getConstructedItem()));
         pTabManager.AddCreativeTab(
                 new ModCreativeTab(
                         ModSolarTab,
-                        ItemList.EnrichedNaquadriaNeutroniumSunnariumAlloy.Item.getConstructedItem()));
+                        NHItemList.EnrichedNaquadriaNeutroniumSunnariumAlloy.Item.getConstructedItem()));
         pTabManager.AddCreativeTab(
-                new ModCreativeTab(ModBarsAndCasingsTab, ItemList.ChromeBars.Item.getConstructedItem()));
+                new ModCreativeTab(ModBarsAndCasingsTab, NHItemList.ChromeBars.Item.getConstructedItem()));
         pTabManager.AddCreativeTab(
                 new ModCreativeTab(
                         ModAdditionsToGregTechTab,
-                        ItemList.EtchedLudicrousVoltageWiring.Item.getConstructedItem()) {
+                        NHItemList.EtchedLudicrousVoltageWiring.Item.getConstructedItem()) {
 
                     @Override
                     public void displayAllReleventItems(List stuffToShow) {