diff --git a/dependencies.gradle b/dependencies.gradle index a3042d2709..4a2531d3fc 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.40:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.58:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") @@ -9,21 +9,21 @@ dependencies { compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.0:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Avaritia:1.59:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:twilightforest:2.7.1:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.10:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Mantle:0.4.2:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.1-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:twilightforest:2.7.2:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.16: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("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.0-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Chisel:2.16.1-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Botania:1.12.3-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.0:dev") { transitive = false } compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384") compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false } - compileOnly("com.github.GTNewHorizons:amunra:0.7.1:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Galacticraft:3.2.8-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.0:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:amunra:0.8.0:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.1-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.1:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.0-GTNH:dev") runtimeOnlyNonPublishable rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612") diff --git a/src/main/java/com/dreammaster/amazingtrophies/AchievementHandler.java b/src/main/java/com/dreammaster/amazingtrophies/AchievementHandler.java index 72e7b1452a..46e0a77e1d 100644 --- a/src/main/java/com/dreammaster/amazingtrophies/AchievementHandler.java +++ b/src/main/java/com/dreammaster/amazingtrophies/AchievementHandler.java @@ -27,7 +27,7 @@ public class AchievementHandler { private static final Map LAST_DEATHCOUNT = new HashMap<>(); - private static final HashMap LAST_DAMAGE = new HashMap<>(); + private static final Map LAST_DAMAGE = new HashMap<>(); private static StatBase infinityArmorAchievement; private static StatBase omegaArmorAchievement; diff --git a/src/main/java/com/dreammaster/creativetab/ModTabList.java b/src/main/java/com/dreammaster/creativetab/ModTabList.java index 8286e62e9f..7dc106cc47 100644 --- a/src/main/java/com/dreammaster/creativetab/ModTabList.java +++ b/src/main/java/com/dreammaster/creativetab/ModTabList.java @@ -1,13 +1,10 @@ package com.dreammaster.creativetab; -import static com.dreammaster.gthandler.casings.GT_Container_CasingsNH.sBlockCasingsNH; - import java.util.List; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import com.dreammaster.gthandler.CustomItemList; import com.dreammaster.item.ItemList; @@ -59,13 +56,6 @@ public static void InitModTabs(CreativeTabsManager pTabManager, ModItemManager p @Override public void displayAllReleventItems(List stuffToShow) { - // casing adder - for (int i = 0; i < 16; ++i) { - ItemStack aStack = new ItemStack(sBlockCasingsNH, 1, i); - if (!aStack.getDisplayName().contains(".name")) { - stuffToShow.add(aStack); - } - } // te adder for (CustomItemList item : CustomItemList.values()) { if (item.hasBeenSet() && item.getBlock() == GregTechAPI.sBlockMachines) { diff --git a/src/main/java/com/dreammaster/gthandler/CustomItemList.java b/src/main/java/com/dreammaster/gthandler/CustomItemList.java index e5616b60c0..77c67a583d 100644 --- a/src/main/java/com/dreammaster/gthandler/CustomItemList.java +++ b/src/main/java/com/dreammaster/gthandler/CustomItemList.java @@ -13,27 +13,9 @@ public enum CustomItemList implements IItemContainer { - Casing_Pyrolyse, Machine_Multi_AirFilterT1, Machine_Multi_AirFilterT2, Machine_Multi_AirFilterT3, - Casing_AirFilter_Vent_T1, - Casing_AirFilter_Turbine_T1, - Casing_AirFilter_Vent_T2, - Casing_AirFilter_Turbine_T2, - Casing_AirFilter_Vent_T3, - Casing_AirFilter_Turbine_T3, - // todo: remap them to GT5U namespace - @Deprecated - Casing_UEV, - @Deprecated - Casing_UIV, - @Deprecated - Casing_UMV, - @Deprecated - Casing_UXV, - @Deprecated - Casing_MAXV, // CoreModItems EtchedLowVoltageWiring, diff --git a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java index f5dd001ac5..773ea0e065 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java +++ b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java @@ -103,20 +103,20 @@ private static boolean addRollingMachineRecipe(ItemStack aResult, Object[] aReci public void run() { // UEV, UIV, UMV, UXV casings GTModHandler.addCraftingRecipe( - CustomItemList.Casing_UEV.get(1L), + ItemList.Casing_UEV.get(1L), bits, new Object[] { "PPP", "PwP", "PPP", 'P', OrePrefixes.plate.get(Materials.Bedrockium) }); GTModHandler.addCraftingRecipe( - CustomItemList.Casing_UIV.get(1L), + ItemList.Casing_UIV.get(1L), bits, new Object[] { "PPP", "PwP", "PPP", 'P', OrePrefixes.plate.get(Materials.BlackPlutonium) }); GTModHandler.addCraftingRecipe( - CustomItemList.Casing_UMV.get(1L), + ItemList.Casing_UMV.get(1L), bits, new Object[] { "PPP", "PwP", "PPP", 'P', OrePrefixes.plate.get(MaterialsUEVplus.SpaceTime) }); GTModHandler.addCraftingRecipe( - CustomItemList.Casing_UXV.get(1L), + ItemList.Casing_UXV.get(1L), bits, new Object[] { "PSP", "SwS", "PSP", 'P', OrePrefixes.plate.get(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter), 'S', @@ -125,25 +125,25 @@ public void run() { // Hull recycling placed here after the casing recipes for proper item data GTOreDictUnificator.addItemDataFromInputs( ItemList.Hull_UEV.get(1L), - CustomItemList.Casing_UEV.get(1L), + ItemList.Casing_UEV.get(1L), OrePrefixes.cableGt08.get(Materials.Draconium), OrePrefixes.cableGt08.get(Materials.Draconium)); GTOreDictUnificator.addItemDataFromInputs( ItemList.Hull_UIV.get(1L), - CustomItemList.Casing_UIV.get(1L), + ItemList.Casing_UIV.get(1L), OrePrefixes.cableGt08.get(Materials.NetherStar), OrePrefixes.cableGt08.get(Materials.NetherStar)); GTOreDictUnificator.addItemDataFromInputs( ItemList.Hull_UMV.get(1L), - CustomItemList.Casing_UMV.get(1L), + ItemList.Casing_UMV.get(1L), OrePrefixes.wireGt12.get(Materials.Quantium), OrePrefixes.wireGt12.get(Materials.Quantium)); GTOreDictUnificator.addItemDataFromInputs( ItemList.Hull_UXV.get(1L), - CustomItemList.Casing_UXV.get(1L), + ItemList.Casing_UXV.get(1L), OrePrefixes.wireGt16.get(Materials.BlackPlutonium), OrePrefixes.wireGt16.get(Materials.BlackPlutonium)); @@ -600,14 +600,14 @@ public void run() { // Air filter multi blocks GTModHandler.addCraftingRecipe( - CustomItemList.Casing_AirFilter_Vent_T1.get(1L), + ItemList.Casing_AirFilter_Vent_T1.get(1L), bits, new Object[] { "ThT", "TFT", "TwT", 'T', CustomItemList.SteelBars, 'F', OrePrefixes.frameGt.get(Materials.Steel) }); GTModHandler.addCraftingRecipe( - CustomItemList.Casing_AirFilter_Turbine_T1.get(1L), + ItemList.Casing_AirFilter_Turbine_T1.get(1L), bits, - new Object[] { "SSS", "RVR", "MSM", 'V', CustomItemList.Casing_AirFilter_Vent_T1, 'S', + new Object[] { "SSS", "RVR", "MSM", 'V', ItemList.Casing_AirFilter_Vent_T1, 'S', OrePrefixes.stickLong.get(Materials.Steel), 'R', OrePrefixes.rotor.get(Materials.Steel), 'M', ItemList.Electric_Motor_LV, 'R', OrePrefixes.screw.get(Materials.Steel) }); GTModHandler.addCraftingRecipe( @@ -617,14 +617,14 @@ public void run() { 'P', ItemList.Electric_Pump_LV, 'M', ItemList.Electric_Motor_LV, 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'G', ItemList.Casing_Turbine }); GTModHandler.addCraftingRecipe( - CustomItemList.Casing_AirFilter_Vent_T2.get(1L), + ItemList.Casing_AirFilter_Vent_T2.get(1L), bits, new Object[] { "ThT", "TFT", "TwT", 'T', CustomItemList.TitaniumBars, 'F', OrePrefixes.frameGt.get(Materials.Titanium) }); GTModHandler.addCraftingRecipe( - CustomItemList.Casing_AirFilter_Turbine_T2.get(1L), + ItemList.Casing_AirFilter_Turbine_T2.get(1L), bits, - new Object[] { "SSS", "RVR", "MSM", 'V', CustomItemList.Casing_AirFilter_Vent_T2, 'S', + new Object[] { "SSS", "RVR", "MSM", 'V', ItemList.Casing_AirFilter_Vent_T2, 'S', OrePrefixes.stickLong.get(Materials.Titanium), 'R', OrePrefixes.rotor.get(Materials.Titanium), 'M', ItemList.Electric_Motor_HV, 'R', OrePrefixes.screw.get(Materials.Titanium) }); GTModHandler.addCraftingRecipe( @@ -635,14 +635,14 @@ public void run() { ItemList.Electric_Motor_HV, 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'G', ItemList.Casing_Turbine2 }); GTModHandler.addCraftingRecipe( - CustomItemList.Casing_AirFilter_Vent_T3.get(1L), + ItemList.Casing_AirFilter_Vent_T3.get(1L), bits, new Object[] { "ThT", "TFT", "TwT", 'T', CustomItemList.TungstenSteelBars, 'F', OrePrefixes.frameGt.get(Materials.TungstenSteel) }); GTModHandler.addCraftingRecipe( - CustomItemList.Casing_AirFilter_Turbine_T3.get(1L), + ItemList.Casing_AirFilter_Turbine_T3.get(1L), bits, - new Object[] { "SSS", "RVR", "MSM", 'V', CustomItemList.Casing_AirFilter_Vent_T3, 'S', + new Object[] { "SSS", "RVR", "MSM", 'V', ItemList.Casing_AirFilter_Vent_T3, 'S', OrePrefixes.stickLong.get(Materials.TungstenSteel), 'R', OrePrefixes.rotor.get(Materials.TungstenSteel), 'M', ItemList.Electric_Motor_IV, 'R', OrePrefixes.screw.get(Materials.TungstenSteel) }); @@ -655,7 +655,7 @@ public void run() { ItemList.Casing_Turbine3 }); GTModHandler.addCraftingRecipe( - CustomItemList.Casing_Pyrolyse.get(1L), + ItemList.Casing_Pyrolyse.get(1L), bits, new Object[] { "PhP", "SFS", "PwP", 'P', OrePrefixes.plate.get(Materials.Steel), 'S', OrePrefixes.plate.get(Materials.Iron), 'F', ItemList.Casing_BronzePlatedBricks }); @@ -2183,311 +2183,261 @@ public void run() { // Bus and Hatch Conversion // Input bus to Output bus - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_Bus_ULV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_Bus_ULV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_Bus_ULV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_Bus_LV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_Bus_LV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_Bus_LV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_Bus_MV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_Bus_MV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_Bus_MV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_Bus_HV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_Bus_HV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_Bus_HV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_Bus_EV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_Bus_EV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_Bus_EV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_Bus_IV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_Bus_IV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_Bus_IV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_Bus_LuV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_Bus_LuV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_Bus_LuV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_Bus_ZPM.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_Bus_ZPM, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_Bus_ZPM, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_Bus_UV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_Bus_UV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_Bus_UV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_Bus_MAX.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_Bus_MAX, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_Bus_MAX, ToolDictNames.craftingToolScrewdriver, }); // Output bus to Input bus - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_Bus_ULV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_Bus_ULV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_Bus_ULV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_Bus_LV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_Bus_LV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_Bus_LV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_Bus_MV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_Bus_MV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_Bus_MV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_Bus_HV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_Bus_HV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_Bus_HV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_Bus_EV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_Bus_EV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_Bus_EV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_Bus_IV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_Bus_IV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_Bus_IV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_Bus_LuV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_Bus_LuV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_Bus_LuV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_Bus_ZPM.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_Bus_ZPM, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_Bus_ZPM, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_Bus_UV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_Bus_UV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_Bus_UV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_Bus_MAX.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_Bus_MAX, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_Bus_MAX, ToolDictNames.craftingToolScrewdriver, }); // Input hatch to Output Hatch - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_ULV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_ULV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_ULV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_LV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_LV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_LV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_MV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_MV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_MV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_HV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_HV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_HV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_EV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_EV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_EV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_IV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_IV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_IV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_LuV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_LuV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_LuV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_ZPM.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_ZPM, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_ZPM, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_UV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_UV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_UV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_UHV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_UHV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_UHV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_UEV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_UEV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_UEV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_UIV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_UIV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_UIV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_UMV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_UMV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_UMV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_UXV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_UXV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_UXV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Output_MAX.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_MAX, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Input_MAX, ToolDictNames.craftingToolScrewdriver, }); // Output hatch to Input Hatch - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_ULV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_ULV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_ULV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_LV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_LV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_LV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_MV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_MV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_MV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_HV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_HV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_HV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_EV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_EV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_EV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_IV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_IV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_IV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_LuV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_LuV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_LuV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_ZPM.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_ZPM, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_ZPM, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_UV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_UV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_UV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_UHV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_UHV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_UHV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_UEV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_UEV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_UEV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_UIV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_UIV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_UIV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_UMV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_UMV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_UMV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_UXV.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_UXV, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_UXV, ToolDictNames.craftingToolScrewdriver, }); - GTModHandler.addCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( ItemList.Hatch_Input_MAX.get(1), bits, - new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_MAX, 'S', - ToolDictNames.craftingToolScrewdriver, }); + new Object[] { ItemList.Hatch_Output_MAX, ToolDictNames.craftingToolScrewdriver, }); } private Consumer shapelessUnremovableGtRecipes() { diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_CasingNH.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_CasingNH.java deleted file mode 100644 index 4f3b261500..0000000000 --- a/src/main/java/com/dreammaster/gthandler/GT_Loader_CasingNH.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.dreammaster.gthandler; - -import com.dreammaster.gthandler.casings.GT_Block_CasingsNH; -import com.dreammaster.gthandler.casings.GT_Container_CasingsNH; - -/** - * ALERT: This class, unlike all other Loaders in this package, is called from MainRegistry at INIT stage directly - */ -public class GT_Loader_CasingNH { - - public static void load() { - GT_Container_CasingsNH.sBlockCasingsNH = new GT_Block_CasingsNH(); - } -} diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java index 3543772d45..b49b16bd23 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java +++ b/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java @@ -84,7 +84,7 @@ public void recipes() { GTModHandler.addCraftingRecipe( ItemList.Hull_UEV.get(1L), GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "PHP", "WMW", 'M', CustomItemList.Casing_UEV, 'W', + new Object[] { "PHP", "WMW", 'M', ItemList.Casing_UEV, 'W', OrePrefixes.cableGt08.get(Materials.Draconium), 'H', OrePrefixes.plate.get(Materials.Bedrockium), 'P', OrePrefixes.plateDouble.get(Materials.Polybenzimidazole) }); @@ -92,7 +92,7 @@ public void recipes() { GTModHandler.addCraftingRecipe( ItemList.Hull_UIV.get(1L), GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "PHP", "WMW", 'M', CustomItemList.Casing_UIV, 'W', + new Object[] { "PHP", "WMW", 'M', ItemList.Casing_UIV, 'W', OrePrefixes.cableGt08.get(Materials.NetherStar), 'H', OrePrefixes.plate.get(Materials.BlackPlutonium), 'P', OrePrefixes.plateDouble.get(Materials.Polybenzimidazole) }); @@ -100,7 +100,7 @@ public void recipes() { GTModHandler.addCraftingRecipe( ItemList.Hull_UMV.get(1L), GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "PHP", "WMW", 'M', CustomItemList.Casing_UMV, 'W', + new Object[] { "PHP", "WMW", 'M', ItemList.Casing_UMV, 'W', OrePrefixes.wireGt12.get(Materials.Quantium), 'H', OrePrefixes.plate.get(MaterialsUEVplus.SpaceTime), 'P', OrePrefixes.plateDouble.get(Materials.Polybenzimidazole) }); @@ -108,7 +108,7 @@ public void recipes() { GTModHandler.addCraftingRecipe( ItemList.Hull_UXV.get(1L), GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "PHP", "WMW", 'M', CustomItemList.Casing_UXV, 'W', + new Object[] { "PHP", "WMW", 'M', ItemList.Casing_UXV, 'W', OrePrefixes.wireGt16.get(Materials.BlackPlutonium), 'H', OrePrefixes.plate.get(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter), 'P', OrePrefixes.plateDense.get(MaterialsKevlar.Kevlar) }); diff --git a/src/main/java/com/dreammaster/gthandler/GT_Recipe_Remover.java b/src/main/java/com/dreammaster/gthandler/GT_Recipe_Remover.java index d94deb6e1a..5d7d1f3775 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_Recipe_Remover.java +++ b/src/main/java/com/dreammaster/gthandler/GT_Recipe_Remover.java @@ -5,7 +5,6 @@ import static gregtech.api.enums.Mods.DraconicEvolution; import static gregtech.api.enums.Mods.EnderIO; import static gregtech.api.enums.Mods.Forestry; -import static gregtech.api.enums.Mods.GalacticraftCore; import static gregtech.api.enums.Mods.GalacticraftMars; import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.enums.Mods.MineAndBladeBattleGear2; @@ -24,10 +23,7 @@ import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GTModHandler; -import gregtech.api.util.GTOreDictUnificator; public class GT_Recipe_Remover implements Runnable { @@ -493,582 +489,6 @@ public void run() { // Galacticraft - // --- Rocket Launch Pad - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.landingPad", 1L, 0), - true, - false, - true); - - // --- Buggy Fueling Pad - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.landingPad", 1L, 1), - true, - false, - true); - - // --- Oxygen Collector - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.oxygenCollector", 1L, 0), - true, - false, - true); - - // --- Oxygen Compressor - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.oxygenCompressor", 1L, 0), - true, - false, - true); - - // --- Oxygen Decompressor - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.oxygenCompressor", 1L, 4), - true, - false, - true); - - // --- Oxygen Storage Module - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.machine2", 1L, 8), - true, - false, - true); - - // --- Oxygen Bubble Distributor - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.distributor", 1L, 0), - true, - false, - true); - - // --- Oxygen Sealer - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "tile.sealer", 1L, 0), true, false, true); - - // --- Oxygen Detector - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.oxygenDetector", 1L, 0), - true, - false, - true); - - // --- Oxygen Pipe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.oxygenPipe", 1L, 0), - true, - false, - true); - - // --- Refinery - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.refinery", 1L, 0), - true, - false, - true); - - // --- Fuel Loader - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.fuelLoader", 1L, 0), - true, - false, - true); - - // --- Sealeable Oxygen Pipe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 1), - true, - false, - true); - - // --- Sealeable Copper Cable - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 2), - true, - false, - true); - - // --- Sealeable Gold Cable - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 3), - true, - false, - true); - - // --- Sealeable HV Cable - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 4), - true, - false, - true); - - // --- Sealeable Glass Fibre Cable - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 5), - true, - false, - true); - - // --- Sealeable Tin Cable - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 6), - true, - false, - true); - - // --- Fuel Loader - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.fuelLoader", 1L, 0), - true, - false, - true); - - // --- Cargo Loader - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "tile.cargo", 1L, 0), true, false, true); - - // --- Cargo Unloader - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "tile.cargo", 1L, 4), true, false, true); - - // --- Tin Decoration Block - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.gcBlockCore", 1L, 3), - true, - false, - true); - // - - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.gcBlockCore", 1L, 4), - true, - false, - true); - - // --- Copper Block - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.gcBlockCore", 1L, 9), - true, - false, - true); - - // --- Tin Block - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.gcBlockCore", 1L, 10), - true, - false, - true); - - // --- Aluminum Block - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.gcBlockCore", 1L, 11), - true, - false, - true); - - // --- Meteoric Iron Ingot - GTModHandler.removeRecipeByOutputDelayed( - GTOreDictUnificator.get(OrePrefixes.ingot, Materials.MeteoricIron, 1L), - true, - false, - true); - - // --- Solid Meteoric Iron - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.gcBlockCore", 1L, 12), - true, - false, - true); - - // --- Air Lock Frame - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.airLockFrame", 1L, 0), - true, - false, - true); - - // --- Air Lock Controller - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.airLockFrame", 1L, 1), - true, - false, - true); - - // --- Sealable Oxygen Pipe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 1), - true, - false, - true); - - // --- Sealable Aluminium Wire - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 14), - true, - false, - true); - - // --- Sealable ME Wire - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 13), - true, - false, - true); - - // --- Sealable heavy Aluminium Wire - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 15), - true, - false, - true); - - // --- Aluminium Wire - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.aluminumWire", 1L, 0), - true, - false, - true); - - // --- Heavy Aluminium Wire - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.aluminumWire", 1L, 1), - true, - false, - true); - - // --- Basic Solar Panel - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "tile.solar", 1L, 0), true, false, true); - - // --- Advanced Solar Panel - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "tile.solar", 1L, 4), true, false, true); - - // --- Wafer Solar - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.basicItem", 1L, 12), - true, - false, - true); - - // --- Single Solar Modul - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.basicItem", 1L, 0), - true, - false, - true); - - // --- Full Solar Panel - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.basicItem", 1L, 1), - true, - false, - true); - - // --- Coal Generator - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "tile.machine", 1L, 0), true, false, true); - - // --- Compressor - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.machine", 1L, 12), - true, - false, - true); - - // --- Electric Compressor - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.machine2", 1L, 0), - true, - false, - true); - - // --- Circuit Fabricator - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.machine2", 1L, 4), - true, - false, - true); - - // --- Energy Storage Module - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.machineTiered", 1L, 0), - true, - false, - true); - - // --- Electric Furnace - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.machineTiered", 1L, 4), - true, - false, - true); - - // --- Energy Storage Cluster - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.machineTiered", 1L, 8), - true, - false, - true); - - // --- Electric Arc Furnace - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.machineTiered", 1L, 12), - true, - false, - true); - - // --- Glowstone Torch - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.glowstoneTorch", 1L, 0), - true, - false, - true); - - // --- Spin Truster - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.spinThruster", 1L, 0), - true, - false, - true); - - // --- Display Screen - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.viewScreen", 1L, 0), - true, - false, - true); - - // --- Telemetry Unit - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.telemetry", 1L, 0), - true, - false, - true); - - // --- Arc Lamp - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "tile.arclamp", 1L, 0), true, false, true); - - // --- Oxygen Mask - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.oxygenMask", 1L, 0), - true, - false, - true); - - // --- Oxygen Gear - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.oxygenGear", 1L, 0), - true, - false, - true); - - // --- Sensor Lens - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.sensorLens", 1L, 0), - true, - false, - true); - - // --- Sensor Glasses - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.sensorGlasses", 1L, 0), - true, - false, - true); - - // --- Heavy Duty Pickaxe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.steel_pickaxe", 1L, 0), - true, - false, - true); - - // --- Heavy Duty Axe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.steel_axe", 1L, 0), - true, - false, - true); - - // --- Heavy Duty Hoe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.steel_hoe", 1L, 0), - true, - false, - true); - - // --- Heavy Duty Shovel - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.steel_shovel", 1L, 0), - true, - false, - true); - - // --- Heavy Duty Sword - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.steel_sword", 1L, 0), - true, - false, - true); - - // --- Heavy Duty Helmet - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.steel_helmet", 1L, 0), - true, - false, - true); - - // --- Heavy Duty Chest Plate - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.steel_chestplate", 1L, 0), - true, - false, - true); - - // --- Heavy Duty Leggings - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.steel_leggings", 1L, 0), - true, - false, - true); - - // --- Heavy Duty Boots - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.steel_boots", 1L, 0), - true, - false, - true); - - // --- Tin Canister - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.canister", 1L, 0), - true, - false, - true); - - // --- Copper Canister - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.canister", 1L, 1), - true, - false, - true); - - // --- Oxygen Vent - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "item.airVent", 1L, 0), true, false, true); - - // --- Oxygen Fan - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "item.airFan", 1L, 0), true, false, true); - - // --- Oxygen Concentrator - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.oxygenConcentrator", 1L, 0), - true, - false, - true); - - // --- Tier 1 Rocket Engine - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "item.engine", 1L, 0), true, false, true); - - // --- Tier 1 Booster - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "item.engine", 1L, 1), true, false, true); - - // --- Nose Cone - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.noseCone", 1L, 0), - true, - false, - true); - - // --- Steel Pole - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.steelPole", 1L, 0), - true, - false, - true); - - // --- Canister - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.oilCanisterPartial", 1L, 1001), - true, - false, - true); - - // --- Oil Extractor - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.oilExtractor", 1L, 0), - true, - false, - true); - - // --- Buggy Wheel - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.buggymat", 1L, 0), - true, - false, - true); - - // --- Buggy Seat - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.buggymat", 1L, 1), - true, - false, - true); - - // --- Buggy Storage Box - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.buggymat", 1L, 2), - true, - false, - true); - - // --- Standard Wrench - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.standardWrench", 1L, 0), - true, - false, - true); - - // --- Can of Food - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.basicItem", 1L, 15), - true, - false, - true); - // - - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.basicItem", 1L, 16), - true, - false, - true); - // - - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.basicItem", 1L, 17), - true, - false, - true); - // - - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.basicItem", 1L, 18), - true, - false, - true); - - // --- Frequency Module - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.basicItem", 1L, 19), - true, - false, - true); - - // --- Battery - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "item.battery", 1L, 0), true, false, true); - // --- Titanium Pickaxe GTModHandler.removeRecipeByOutputDelayed( getModItem(GalacticraftMars.ID, "item.titanium_pickaxe", 1L, 0), @@ -1197,13 +617,6 @@ public void run() { false, true); - // --- Rocket Fins - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.rocketFins", 1L, 0), - true, - false, - true); - // --- Heavy Rocket Fins GTModHandler.removeRecipeByOutputDelayed( getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 1L, 2), @@ -1381,48 +794,6 @@ public void run() { false, true); - // --- Sealable Cobblestone Transport Pipe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 8), - true, - false, - true); - - // --- Sealable Stone Transport Pipe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 7), - true, - false, - true); - - // --- Sealable Cobblestone Fluid Pipe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 10), - true, - false, - true); - - // --- Sealable Stone Fluid Pipe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 9), - true, - false, - true); - - // --- Sealable Stone Kinesis Pipe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 11), - true, - false, - true); - - // --- Sealable Gold Kinesis Pipe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 12), - true, - false, - true); - // --- Astro Miner Base GTModHandler.removeRecipeByOutputDelayed( getModItem(GalacticraftMars.ID, "tile.minerBase", 1L, 0), @@ -1437,23 +808,5 @@ public void run() { false, true); - // --- Canvas - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "item.canvas", 1L, 0), true, false, true); - - // --- Ambient Thermal Controller - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.basicItem", 1L, 20), - true, - false, - true); - - // --- Parachute - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.parachute", 1L, 0), - true, - false, - true); - } } diff --git a/src/main/java/com/dreammaster/gthandler/casings/GT_Block_CasingsNH.java b/src/main/java/com/dreammaster/gthandler/casings/GT_Block_CasingsNH.java deleted file mode 100644 index 00ee96588a..0000000000 --- a/src/main/java/com/dreammaster/gthandler/casings/GT_Block_CasingsNH.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.dreammaster.gthandler.casings; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; - -import com.dreammaster.gthandler.CustomItemList; - -import gregtech.api.enums.Dyes; -import gregtech.api.enums.Textures; -import gregtech.api.render.TextureFactory; -import gregtech.api.util.GTLanguageManager; -import gregtech.common.blocks.BlockCasingsAbstract; -import gregtech.common.blocks.MaterialCasings; - -/** - * Created by danie_000 on 03.10.2016. - */ -public class GT_Block_CasingsNH extends BlockCasingsAbstract { - - public GT_Block_CasingsNH() { - super(GT_Item_CasingsNH.class, "gt.blockcasingsNH", MaterialCasings.INSTANCE); - for (byte b = 0; b < 16; b = (byte) (b + 1)) { - Textures.BlockIcons.casingTexturePages[8][b + 64] = TextureFactory.of(this, b); - /* IMPORTANT for block recoloring */ - } - GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Air Filter Turbine Casing"); // adding - GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Air Filter Vent Casing"); // adding - GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Pyrolyse Oven Casing"); // adding - GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Advanced Air Filter Turbine Casing"); // adding - GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Advanced Air Filter Vent Casing"); // adding - GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Super Air Filter Turbine Casing"); // adding - GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Super Air Filter Vent Casing"); // adding - - GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "UEV Machine Casing"); // adding - GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "UIV Machine Casing"); // adding - GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "UMV Machine Casing"); // adding - GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "UXV Machine Casing"); // adding - GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "MAX Machine Casing"); // adding - - CustomItemList.Casing_AirFilter_Turbine_T1.set(new ItemStack(this, 1, 0)); // adding - CustomItemList.Casing_AirFilter_Vent_T1.set(new ItemStack(this, 1, 1)); // adding - CustomItemList.Casing_Pyrolyse.set(new ItemStack(this, 1, 2)); // adding - CustomItemList.Casing_AirFilter_Turbine_T2.set(new ItemStack(this, 1, 3)); // adding - CustomItemList.Casing_AirFilter_Vent_T2.set(new ItemStack(this, 1, 4)); // adding - CustomItemList.Casing_AirFilter_Turbine_T3.set(new ItemStack(this, 1, 5)); // adding - CustomItemList.Casing_AirFilter_Vent_T3.set(new ItemStack(this, 1, 6)); // adding - - CustomItemList.Casing_UEV.set(new ItemStack(this, 1, 10)); - CustomItemList.Casing_UIV.set(new ItemStack(this, 1, 11)); - CustomItemList.Casing_UMV.set(new ItemStack(this, 1, 12)); - CustomItemList.Casing_UXV.set(new ItemStack(this, 1, 13)); - CustomItemList.Casing_MAXV.set(new ItemStack(this, 1, 14)); - } - - @Override - public void registerBlockIcons(IIconRegister aIconRegister) {} - - @Override - public IIcon getIcon(int aSide, int aMeta) { - switch (aMeta) { - case 0: - return Textures.BlockIcons.MACHINE_CASING_TURBINE_STEEL.getIcon(); - case 1: - return Textures.BlockIcons.MACHINE_CASING_PIPE_STEEL.getIcon(); - case 2: - return Textures.BlockIcons.MACHINE_8V_SIDE.getIcon(); - case 3: - return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); - case 4: - return Textures.BlockIcons.MACHINE_CASING_PIPE_TITANIUM.getIcon(); - case 5: - return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); - case 6: - return Textures.BlockIcons.MACHINE_CASING_PIPE_TUNGSTENSTEEL.getIcon(); - default: - if (aSide == 0) { - return Textures.BlockIcons.MACHINECASINGS_BOTTOM[aMeta].getIcon(); - } - if (aSide == 1) { - return Textures.BlockIcons.MACHINECASINGS_TOP[aMeta].getIcon(); - } - return Textures.BlockIcons.MACHINECASINGS_SIDE[aMeta].getIcon(); - } - } - - @Override - public int colorMultiplier(IBlockAccess aWorld, int aX, int aY, int aZ) { - return aWorld.getBlockMetadata(aX, aY, aZ) <= 9 ? super.colorMultiplier(aWorld, aX, aY, aZ) - : Dyes.MACHINE_METAL.mRGBa[0] << 16 | Dyes.MACHINE_METAL.mRGBa[1] << 8 | Dyes.MACHINE_METAL.mRGBa[2]; - } -} diff --git a/src/main/java/com/dreammaster/gthandler/casings/GT_Container_CasingsNH.java b/src/main/java/com/dreammaster/gthandler/casings/GT_Container_CasingsNH.java deleted file mode 100644 index f47bcec1e4..0000000000 --- a/src/main/java/com/dreammaster/gthandler/casings/GT_Container_CasingsNH.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.dreammaster.gthandler.casings; - -import net.minecraft.block.Block; - -/** - * Created by danie_000 on 03.10.2016. - */ -public final class GT_Container_CasingsNH { - - public static Block sBlockCasingsNH; - - private GT_Container_CasingsNH() {} -} diff --git a/src/main/java/com/dreammaster/gthandler/casings/GT_Item_CasingsNH.java b/src/main/java/com/dreammaster/gthandler/casings/GT_Item_CasingsNH.java deleted file mode 100644 index d343eda5c4..0000000000 --- a/src/main/java/com/dreammaster/gthandler/casings/GT_Item_CasingsNH.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.dreammaster.gthandler.casings; - -import net.minecraft.block.Block; - -import gregtech.common.blocks.ItemCasingsAbstract; - -/** - * Created by danie_000 on 03.10.2016. - */ -public class GT_Item_CasingsNH extends ItemCasingsAbstract { - - public GT_Item_CasingsNH(Block par1) { - super(par1); - } -} diff --git a/src/main/java/com/dreammaster/gthandler/multiAirFilter/GT_MetaTileEntity_AirFilterBase.java b/src/main/java/com/dreammaster/gthandler/multiAirFilter/GT_MetaTileEntity_AirFilterBase.java index 9235a15562..574119e4bc 100644 --- a/src/main/java/com/dreammaster/gthandler/multiAirFilter/GT_MetaTileEntity_AirFilterBase.java +++ b/src/main/java/com/dreammaster/gthandler/multiAirFilter/GT_MetaTileEntity_AirFilterBase.java @@ -1,6 +1,5 @@ package com.dreammaster.gthandler.multiAirFilter; -import static com.dreammaster.gthandler.casings.GT_Container_CasingsNH.sBlockCasingsNH; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static gregtech.api.enums.GTValues.VN; import static gregtech.api.enums.Textures.BlockIcons.TURBINE_NEW; @@ -35,6 +34,7 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import eu.usrv.yamcore.auxiliary.PlayerChatHelper; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; @@ -83,7 +83,7 @@ protected IStructureDefinition computeValue(Cla 'c', lazy( x -> ofChain( - ofBlock(sBlockCasingsNH, x.getCasingMeta()), + ofBlock(GregTechAPI.sBlockCasingsNH, x.getCasingMeta()), ofHatchAdder( GT_MetaTileEntity_AirFilterBase::addMaintenanceToMachineList, x.getCasingIndex(), @@ -100,8 +100,8 @@ protected IStructureDefinition computeValue(Cla GT_MetaTileEntity_AirFilterBase::addEnergyInputToMachineList, x.getCasingIndex(), 1)))) - .addElement('x', lazy(x -> ofBlock(sBlockCasingsNH, x.getCasingMeta()))) - .addElement('v', lazy(x -> ofBlock(sBlockCasingsNH, x.getPipeMeta()))) + .addElement('x', lazy(x -> ofBlock(GregTechAPI.sBlockCasingsNH, x.getCasingMeta()))) + .addElement('v', lazy(x -> ofBlock(GregTechAPI.sBlockCasingsNH, x.getPipeMeta()))) .addElement( 'm', lazy( @@ -109,7 +109,7 @@ protected IStructureDefinition computeValue(Cla GT_MetaTileEntity_AirFilterBase::addMufflerToMachineList, x.getCasingIndex(), 2, - sBlockCasingsNH, + GregTechAPI.sBlockCasingsNH, x.getCasingMeta()))) .build(); } @@ -492,7 +492,7 @@ public boolean renderInWorld(IBlockAccess aWorld, int aX, int aY, int aZ, Block xyz[2] + aZ, aRenderer, direction, - sBlockCasingsNH, + GregTechAPI.sBlockCasingsNH, tTextures); return false; } diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index 5ec4dd0ec7..390e4e5d4b 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -781,14 +781,6 @@ public void run() { .getToolWithStats(170, 1, Materials.WroughtIron, Materials.Steel, null)) .duration(16 * SECONDS).eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.turbineBlade, Materials.Bronze, 4L), - GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 1L)) - .itemOutputs( - MetaGeneratedTool01.INSTANCE.getToolWithStats(170, 1, Materials.Bronze, Materials.Steel, null)) - .duration(16 * SECONDS).eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); - GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.turbineBlade, Materials.Steel, 4L), @@ -811,55 +803,55 @@ public void run() { .itemInputs( GTOreDictUnificator.get(OrePrefixes.plate, Materials.Bedrockium, 8), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(CustomItemList.Casing_UEV.get(1L)).duration(2 * SECONDS + 10 * TICKS).eut(16) + .itemOutputs(ItemList.Casing_UEV.get(1L)).duration(2 * SECONDS + 10 * TICKS).eut(16) .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.plate, Materials.BlackPlutonium, 8L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(CustomItemList.Casing_UIV.get(1L)).duration(2 * SECONDS + 10 * TICKS).eut(16) + .itemOutputs(ItemList.Casing_UIV.get(1L)).duration(2 * SECONDS + 10 * TICKS).eut(16) .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 8L), GTUtility.getIntegratedCircuit(8)) - .itemOutputs(CustomItemList.Casing_UMV.get(1L)).duration(2 * SECONDS + 10 * TICKS).eut(16) + .itemOutputs(ItemList.Casing_UMV.get(1L)).duration(2 * SECONDS + 10 * TICKS).eut(16) .addTo(assemblerRecipes); GTValues.RA.stdBuilder().itemInputs( GTOreDictUnificator .get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 4L), GTOreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.MagMatter, 4L), - GTUtility.getIntegratedCircuit(8)).itemOutputs(CustomItemList.Casing_UXV.get(1L)) + GTUtility.getIntegratedCircuit(8)).itemOutputs(ItemList.Casing_UXV.get(1L)) .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.cableGt08, Materials.Draconium, 2L), - CustomItemList.Casing_UEV.get(1L)) + ItemList.Casing_UEV.get(1L)) .itemOutputs(ItemList.Hull_UEV.get(1L)).fluidInputs(Materials.Polybenzimidazole.getMolten(576L)) .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.cableGt08, Materials.NetherStar, 2L), - CustomItemList.Casing_UIV.get(1L)) + ItemList.Casing_UIV.get(1L)) .itemOutputs(ItemList.Hull_UIV.get(1L)).fluidInputs(Materials.Polybenzimidazole.getMolten(576L)) .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.wireGt12, Materials.Quantium, 2L), - CustomItemList.Casing_UMV.get(1L)) + ItemList.Casing_UMV.get(1L)) .itemOutputs(ItemList.Hull_UMV.get(1L)).fluidInputs(Materials.Polybenzimidazole.getMolten(576L)) .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.BlackPlutonium, 2L), - CustomItemList.Casing_UXV.get(1L)) + ItemList.Casing_UXV.get(1L)) .itemOutputs(ItemList.Hull_UXV.get(1L)).fluidInputs(MaterialsKevlar.Kevlar.getMolten(576L)) .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(assemblerRecipes); @@ -978,7 +970,7 @@ public void run() { Materials.Steel.getPlates(4), Materials.Iron.getPlates(2), ItemList.Casing_BronzePlatedBricks.get(1L)) - .itemOutputs(CustomItemList.Casing_Pyrolyse.get(1L)).duration(10 * SECONDS).eut(TierEU.RECIPE_LV) + .itemOutputs(ItemList.Casing_Pyrolyse.get(1L)).duration(10 * SECONDS).eut(TierEU.RECIPE_LV) .addTo(assemblerRecipes); // Extreme Engine Intake Casing @@ -3987,7 +3979,7 @@ private void makeAirFilterRecipes() { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1L), GTUtility.getIntegratedCircuit(1), CustomItemList.SteelBars.get(2)) - .itemOutputs(CustomItemList.Casing_AirFilter_Vent_T1.get(1L)) + .itemOutputs(ItemList.Casing_AirFilter_Vent_T1.get(1L)) .fluidInputs(Materials.SolderingAlloy.getMolten(72)).duration(5 * SECONDS).eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); @@ -3996,7 +3988,7 @@ private void makeAirFilterRecipes() { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1L), GTUtility.getIntegratedCircuit(1), CustomItemList.SteelBars.get(2)) - .itemOutputs(CustomItemList.Casing_AirFilter_Vent_T1.get(1L)).fluidInputs(Materials.Tin.getMolten(144)) + .itemOutputs(ItemList.Casing_AirFilter_Vent_T1.get(1L)).fluidInputs(Materials.Tin.getMolten(144)) .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() @@ -4004,38 +3996,36 @@ private void makeAirFilterRecipes() { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1L), GTUtility.getIntegratedCircuit(1), CustomItemList.SteelBars.get(2)) - .itemOutputs(CustomItemList.Casing_AirFilter_Vent_T1.get(1L)).fluidInputs(Materials.Lead.getMolten(288)) + .itemOutputs(ItemList.Casing_AirFilter_Vent_T1.get(1L)).fluidInputs(Materials.Lead.getMolten(288)) .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - CustomItemList.Casing_AirFilter_Vent_T1.get(1L), + ItemList.Casing_AirFilter_Vent_T1.get(1L), GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 2L), ItemList.Electric_Motor_LV.get(2L), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(CustomItemList.Casing_AirFilter_Turbine_T1.get(1L)) + .itemOutputs(ItemList.Casing_AirFilter_Turbine_T1.get(1L)) .fluidInputs(Materials.SolderingAlloy.getMolten(72)).duration(5 * SECONDS).eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - CustomItemList.Casing_AirFilter_Vent_T1.get(1L), + ItemList.Casing_AirFilter_Vent_T1.get(1L), GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 2L), ItemList.Electric_Motor_LV.get(2L), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(CustomItemList.Casing_AirFilter_Turbine_T1.get(1L)) - .fluidInputs(Materials.Tin.getMolten(144)).duration(5 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(assemblerRecipes); + .itemOutputs(ItemList.Casing_AirFilter_Turbine_T1.get(1L)).fluidInputs(Materials.Tin.getMolten(144)) + .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - CustomItemList.Casing_AirFilter_Vent_T1.get(1L), + ItemList.Casing_AirFilter_Vent_T1.get(1L), GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 2L), ItemList.Electric_Motor_LV.get(2L), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(CustomItemList.Casing_AirFilter_Turbine_T1.get(1L)) - .fluidInputs(Materials.Lead.getMolten(288)).duration(5 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(assemblerRecipes); + .itemOutputs(ItemList.Casing_AirFilter_Turbine_T1.get(1L)).fluidInputs(Materials.Lead.getMolten(288)) + .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -4080,7 +4070,7 @@ private void makeAirFilterRecipes() { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1L), GTUtility.getIntegratedCircuit(1), CustomItemList.TitaniumBars.get(2)) - .itemOutputs(CustomItemList.Casing_AirFilter_Vent_T2.get(1L)) + .itemOutputs(ItemList.Casing_AirFilter_Vent_T2.get(1L)) .fluidInputs(Materials.SolderingAlloy.getMolten(72)).duration(5 * SECONDS).eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); @@ -4089,7 +4079,7 @@ private void makeAirFilterRecipes() { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1L), GTUtility.getIntegratedCircuit(1), CustomItemList.TitaniumBars.get(2)) - .itemOutputs(CustomItemList.Casing_AirFilter_Vent_T2.get(1L)).fluidInputs(Materials.Tin.getMolten(144)) + .itemOutputs(ItemList.Casing_AirFilter_Vent_T2.get(1L)).fluidInputs(Materials.Tin.getMolten(144)) .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() @@ -4097,38 +4087,36 @@ private void makeAirFilterRecipes() { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1L), GTUtility.getIntegratedCircuit(1), CustomItemList.TitaniumBars.get(2)) - .itemOutputs(CustomItemList.Casing_AirFilter_Vent_T2.get(1L)).fluidInputs(Materials.Lead.getMolten(288)) + .itemOutputs(ItemList.Casing_AirFilter_Vent_T2.get(1L)).fluidInputs(Materials.Lead.getMolten(288)) .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - CustomItemList.Casing_AirFilter_Vent_T2.get(1L), + ItemList.Casing_AirFilter_Vent_T2.get(1L), GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Titanium, 2L), ItemList.Electric_Motor_HV.get(2L), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(CustomItemList.Casing_AirFilter_Turbine_T2.get(1L)) + .itemOutputs(ItemList.Casing_AirFilter_Turbine_T2.get(1L)) .fluidInputs(Materials.SolderingAlloy.getMolten(72)).duration(5 * SECONDS).eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - CustomItemList.Casing_AirFilter_Vent_T2.get(1L), + ItemList.Casing_AirFilter_Vent_T2.get(1L), GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Titanium, 2L), ItemList.Electric_Motor_HV.get(2L), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(CustomItemList.Casing_AirFilter_Turbine_T2.get(1L)) - .fluidInputs(Materials.Tin.getMolten(144)).duration(5 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(assemblerRecipes); + .itemOutputs(ItemList.Casing_AirFilter_Turbine_T2.get(1L)).fluidInputs(Materials.Tin.getMolten(144)) + .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - CustomItemList.Casing_AirFilter_Vent_T2.get(1L), + ItemList.Casing_AirFilter_Vent_T2.get(1L), GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Titanium, 2L), ItemList.Electric_Motor_HV.get(2L), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(CustomItemList.Casing_AirFilter_Turbine_T2.get(1L)) - .fluidInputs(Materials.Lead.getMolten(288)).duration(5 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(assemblerRecipes); + .itemOutputs(ItemList.Casing_AirFilter_Turbine_T2.get(1L)).fluidInputs(Materials.Lead.getMolten(288)) + .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -4173,7 +4161,7 @@ private void makeAirFilterRecipes() { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1L), GTUtility.getIntegratedCircuit(1), CustomItemList.TungstenSteelBars.get(2)) - .itemOutputs(CustomItemList.Casing_AirFilter_Vent_T3.get(1L)) + .itemOutputs(ItemList.Casing_AirFilter_Vent_T3.get(1L)) .fluidInputs(Materials.SolderingAlloy.getMolten(72)).duration(5 * SECONDS).eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); @@ -4182,7 +4170,7 @@ private void makeAirFilterRecipes() { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1L), GTUtility.getIntegratedCircuit(1), CustomItemList.TungstenSteelBars.get(2)) - .itemOutputs(CustomItemList.Casing_AirFilter_Vent_T3.get(1L)).fluidInputs(Materials.Tin.getMolten(144)) + .itemOutputs(ItemList.Casing_AirFilter_Vent_T3.get(1L)).fluidInputs(Materials.Tin.getMolten(144)) .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() @@ -4190,38 +4178,36 @@ private void makeAirFilterRecipes() { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1L), GTUtility.getIntegratedCircuit(1), CustomItemList.TungstenSteelBars.get(2)) - .itemOutputs(CustomItemList.Casing_AirFilter_Vent_T3.get(1L)).fluidInputs(Materials.Lead.getMolten(288)) + .itemOutputs(ItemList.Casing_AirFilter_Vent_T3.get(1L)).fluidInputs(Materials.Lead.getMolten(288)) .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - CustomItemList.Casing_AirFilter_Vent_T3.get(1L), + ItemList.Casing_AirFilter_Vent_T3.get(1L), GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 2L), ItemList.Electric_Motor_IV.get(2L), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(CustomItemList.Casing_AirFilter_Turbine_T3.get(1L)) + .itemOutputs(ItemList.Casing_AirFilter_Turbine_T3.get(1L)) .fluidInputs(Materials.SolderingAlloy.getMolten(72)).duration(5 * SECONDS).eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - CustomItemList.Casing_AirFilter_Vent_T3.get(1L), + ItemList.Casing_AirFilter_Vent_T3.get(1L), GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 2L), ItemList.Electric_Motor_IV.get(2L), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(CustomItemList.Casing_AirFilter_Turbine_T3.get(1L)) - .fluidInputs(Materials.Tin.getMolten(144)).duration(5 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(assemblerRecipes); + .itemOutputs(ItemList.Casing_AirFilter_Turbine_T3.get(1L)).fluidInputs(Materials.Tin.getMolten(144)) + .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - CustomItemList.Casing_AirFilter_Vent_T3.get(1L), + ItemList.Casing_AirFilter_Vent_T3.get(1L), GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 2L), ItemList.Electric_Motor_IV.get(2L), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(CustomItemList.Casing_AirFilter_Turbine_T3.get(1L)) - .fluidInputs(Materials.Lead.getMolten(288)).duration(5 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(assemblerRecipes); + .itemOutputs(ItemList.Casing_AirFilter_Turbine_T3.get(1L)).fluidInputs(Materials.Lead.getMolten(288)) + .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -4782,6 +4768,18 @@ private void makeAE2Recipes() { GTUtility.getIntegratedCircuit(2)) .itemOutputs(getModItem(AE2FluidCraft.ID, "fluid_interface", 1, 0)).duration(5 * SECONDS) .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + + // Dual Interface (flat version) + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 4L), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Lapis, 2L), + getModItem(AppliedEnergistics2.ID, "tile.BlockInterface", 1), + com.dreammaster.item.ItemList.EngineeringProcessorFluidDiamondCore.getIS(2), + GTUtility.getIntegratedCircuit(3)) + .itemOutputs(getModItem(AE2FluidCraft.ID, "part_fluid_interface", 1, 0)).duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + // Fluid Storage Housing GTValues.RA.stdBuilder() .itemInputs( diff --git a/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java index 70770be017..403a43804f 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java @@ -133,16 +133,6 @@ public void run() { Materials.Ardite.getDust(1)) .outputChances(10000, 1000).duration(20 * SECONDS).eut(2).addTo(maceratorRecipes); - GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "GravelOre", 1L, 4)) - .itemOutputs( - GTOreDictUnificator.get(OrePrefixes.crushed, Materials.Aluminium, 2L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Bauxite, 1L)) - .outputChances(10000, 1000).duration(20 * SECONDS).eut(2).addTo(maceratorRecipes); - - GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "GravelOre", 1L, 0)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushed, Materials.Iron, 2L)) - .duration(15 * SECONDS).eut(2).addTo(maceratorRecipes); - GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "materials", 1L, 12)) .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1L)) .outputChances(10000).duration(15 * SECONDS).eut(2).addTo(maceratorRecipes); diff --git a/src/main/java/com/dreammaster/gthandler/recipes/VacuumFurnaceRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/VacuumFurnaceRecipes.java index 7c2a36443d..8f905eb893 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/VacuumFurnaceRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/VacuumFurnaceRecipes.java @@ -27,7 +27,7 @@ public void run() { if (Forestry.isModLoaded()) { GTValues.RA.stdBuilder() .itemInputs( - GTUtility.getIntegratedCircuit(12), + GTUtility.getIntegratedCircuit(2), GTBees.combs.getStackForType(CombType.INDIUM, 64), GTBees.combs.getStackForType(CombType.INDIUM, 64), GTBees.combs.getStackForType(CombType.INDIUM, 64), @@ -48,7 +48,7 @@ public void run() { .addTo(vacuumFurnaceRecipes); GTValues.RA.stdBuilder() - .itemInputs(GTUtility.getIntegratedCircuit(13), GTBees.combs.getStackForType(CombType.INDIUM, 40)) + .itemInputs(GTUtility.getIntegratedCircuit(2), GTBees.combs.getStackForType(CombType.INDIUM, 40)) .itemOutputs( GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 64L), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 64L), diff --git a/src/main/java/com/dreammaster/lib/Refstrings.java b/src/main/java/com/dreammaster/lib/Refstrings.java index b7b8d05a36..8618ccc9b7 100644 --- a/src/main/java/com/dreammaster/lib/Refstrings.java +++ b/src/main/java/com/dreammaster/lib/Refstrings.java @@ -7,7 +7,7 @@ public final class Refstrings { public static final String MODID = Mods.Names.NEW_HORIZONS_CORE_MOD; public static final String NAME = "GT: New Horizons"; public static final String VERSION = BuildVersion.VERSION; - public static final String MODPACKPACK_VERSION = "2.7.1"; + public static final String MODPACKPACK_VERSION = "2.7.2"; public static final String CLIENTSIDE = "com.dreammaster.main.ClientProxy"; public static final String SERVERSIDE = "com.dreammaster.main.CommonProxy"; public static final String COLLECTIONID = "GTNewHorizons"; diff --git a/src/main/java/com/dreammaster/main/MainRegistry.java b/src/main/java/com/dreammaster/main/MainRegistry.java index 8b1a300024..eba40f921e 100644 --- a/src/main/java/com/dreammaster/main/MainRegistry.java +++ b/src/main/java/com/dreammaster/main/MainRegistry.java @@ -50,7 +50,6 @@ import com.dreammaster.gthandler.CoreMod_PCBFactory_MaterialLoader; import com.dreammaster.gthandler.GT_CoreModSupport; import com.dreammaster.gthandler.GT_CustomLoader; -import com.dreammaster.gthandler.GT_Loader_CasingNH; import com.dreammaster.gthandler.GT_Loader_ItemPipes; import com.dreammaster.gthandler.recipes.DTPFRecipes; import com.dreammaster.item.CustomPatterns; @@ -393,7 +392,6 @@ private void InitAdditionalBlocks() { NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler()); proxy.registerRenderInfo(); - GT_Loader_CasingNH.load(); } private void RegisterModuleEvents() { diff --git a/src/main/java/com/dreammaster/recipes/RecipeRemover.java b/src/main/java/com/dreammaster/recipes/RecipeRemover.java index 61edbd1820..c059443e3b 100644 --- a/src/main/java/com/dreammaster/recipes/RecipeRemover.java +++ b/src/main/java/com/dreammaster/recipes/RecipeRemover.java @@ -31,7 +31,6 @@ import static gregtech.api.enums.Mods.FloodLights; import static gregtech.api.enums.Mods.ForbiddenMagic; import static gregtech.api.enums.Mods.Forestry; -import static gregtech.api.enums.Mods.GalacticraftCore; import static gregtech.api.enums.Mods.GalacticraftMars; import static gregtech.api.enums.Mods.Gendustry; import static gregtech.api.enums.Mods.Genetics; @@ -357,8 +356,6 @@ public static void run() { GTModHandler.removeFurnaceSmelting(getModItem(FloodLights.ID, "rawFilament", 1, 0, missing)); GTModHandler.removeFurnaceSmelting(getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 1, 4, missing)); GTModHandler.removeFurnaceSmelting(getModItem(GalacticraftMars.ID, "tile.asteroidsBlock", 1, 4, missing)); - GTModHandler - .removeFurnaceSmelting(getModItem(GalacticraftCore.ID, "item.meteoricIronRaw", 1, wildcard, missing)); GTModHandler.removeFurnaceSmelting(getModItem(GalacticraftMars.ID, "item.null", 1, 0, missing)); GTModHandler.removeFurnaceSmelting(getModItem(Minecraft.ID, "chainmail_boots", 1, 0, missing)); GTModHandler.removeFurnaceSmelting(getModItem(IndustrialCraft2.ID, "blockRubWood", 1, 0, missing)); @@ -1187,7 +1184,6 @@ public static void run() { removeRecipeByOutputDelayed(new ItemStack(ModItems.itemBoilerChassis, 1, 1)); removeRecipeByOutputDelayed(GregtechItemList.Boiler_Advanced_HV.get(1)); removeRecipeByOutputDelayed(new ItemStack(ModItems.itemBoilerChassis, 1, 2)); - removeRecipeByOutputDelayed(GregtechItemList.GTFluidTank_HV.get(1)); removeRecipeByOutputDelayed(new ItemStack(ModBlocks.blockCompressedObsidian, 1, 5)); removeRecipeByOutputDelayed(getModItem(Gendustry.ID, "IndustrialApiary", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(Gendustry.ID, "MutagenProducer", 1, 0, missing)); diff --git a/src/main/java/com/dreammaster/scripts/ScriptGalaxySpace.java b/src/main/java/com/dreammaster/scripts/ScriptGalaxySpace.java index 1c79990b71..18dea90546 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptGalaxySpace.java +++ b/src/main/java/com/dreammaster/scripts/ScriptGalaxySpace.java @@ -275,7 +275,7 @@ public void loadRecipes() { .itemInputs( BlockList.NeutroniumPlatedReinforcedStone.getIS(), WerkstoffLoader.HDCS.get(OrePrefixes.plate, 8)) - .itemOutputs(new ItemStack(IGItems.DysonSwarmItems, 1, 9)) + .itemOutputs(getIGItem("dysonswarmparts", 1, 9)) .fluidInputs(FluidRegistry.getFluidStack("molten.adamantium alloy", 144)).duration(25 * SECONDS) .eut(TierEU.RECIPE_LuV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() diff --git a/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java b/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java index ad5ed35535..173b83d034 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java +++ b/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java @@ -180,17 +180,6 @@ public void loadRecipes() { "plateDoubleTitanium", GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Titanium, 1L), "plateDoubleTitanium"); - addShapedRecipe( - GregtechItemList.GTFluidTank_HV.get(1), - "circuitPrimitive", - "plateAluminium", - "circuitPrimitive", - "plateDarkSteel", - "pipeMediumSteel", - "plateDarkSteel", - "circuitPrimitive", - ItemList.Electric_Pump_MV.get(1L), - "circuitPrimitive"); // Shirabon and Eternity GTValues.RA.stdBuilder()