diff --git a/src/main/java/com/dreammaster/creativetab/ModTabList.java b/src/main/java/com/dreammaster/creativetab/ModTabList.java index 7dc106cc4..da8f97a75 100644 --- 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) { diff --git a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java index 4da9e593b..4af8a0c5d 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java +++ b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java @@ -37,6 +37,7 @@ import net.minecraftforge.oredict.ShapedOreRecipe; 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; @@ -1766,261 +1767,261 @@ public void run() { // Add Casting Forms for Molds GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormPlate.getIS(), + NHItemList.MoldFormPlate.getIS(), new Object[] { " HF", " C ", " ", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormCasing.getIS(), + NHItemList.MoldFormCasing.getIS(), new Object[] { " H ", " CF", " ", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormGear.getIS(), + NHItemList.MoldFormGear.getIS(), new Object[] { " H ", " C ", " F", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormBottle.getIS(), + NHItemList.MoldFormBottle.getIS(), new Object[] { " H ", " C ", " F ", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormIngot.getIS(), + NHItemList.MoldFormIngot.getIS(), new Object[] { " H ", " C ", "F ", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormBall.getIS(), + NHItemList.MoldFormBall.getIS(), new Object[] { " H ", "FC ", " ", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormBlock.getIS(), + NHItemList.MoldFormBlock.getIS(), new Object[] { "FH ", " C ", " ", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormNuggets.getIS(), + NHItemList.MoldFormNuggets.getIS(), new Object[] { " H", " CF", " ", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormBuns.getIS(), + NHItemList.MoldFormBuns.getIS(), new Object[] { " H", " C ", " F", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormBread.getIS(), + NHItemList.MoldFormBread.getIS(), new Object[] { " H", " C ", " F ", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormBaguette.getIS(), + NHItemList.MoldFormBaguette.getIS(), new Object[] { " H", " C ", "F ", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormCylinder.getIS(), + NHItemList.MoldFormCylinder.getIS(), new Object[] { " H", "FC ", " ", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormAnvil.getIS(), + NHItemList.MoldFormAnvil.getIS(), new Object[] { "F H", " C ", " ", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormName.getIS(), + NHItemList.MoldFormName.getIS(), new Object[] { " FH", " C ", " ", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormArrowHead.getIS(), + NHItemList.MoldFormArrowHead.getIS(), new Object[] { " ", " CH", " F", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormSmallGear.getIS(), + NHItemList.MoldFormSmallGear.getIS(), new Object[] { " ", " CH", " F ", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormStick.getIS(), + NHItemList.MoldFormStick.getIS(), new Object[] { " ", " CH", "F ", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormBolt.getIS(), + NHItemList.MoldFormBolt.getIS(), new Object[] { " ", "FCH", " ", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormRound.getIS(), + NHItemList.MoldFormRound.getIS(), new Object[] { "F ", " CH", " ", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormScrew.getIS(), + NHItemList.MoldFormScrew.getIS(), new Object[] { " F ", " CH", " ", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormRing.getIS(), + NHItemList.MoldFormRing.getIS(), new Object[] { " F", " CH", " ", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormStickLong.getIS(), + NHItemList.MoldFormStickLong.getIS(), new Object[] { " ", " C ", " FH", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormRotor.getIS(), + NHItemList.MoldFormRotor.getIS(), new Object[] { " ", " C ", "F H", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormTurbineBlade.getIS(), + NHItemList.MoldFormTurbineBlade.getIS(), new Object[] { " ", "FC ", " H", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormBoots.getIS(), + NHItemList.MoldFormBoots.getIS(), new Object[] { "F ", " C ", " H", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormChestplate.getIS(), + NHItemList.MoldFormChestplate.getIS(), new Object[] { " F ", " C ", " H", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormHelmet.getIS(), + NHItemList.MoldFormHelmet.getIS(), new Object[] { " F", " C ", " H", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormLeggings.getIS(), + NHItemList.MoldFormLeggings.getIS(), new Object[] { " ", " CF", " H", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MarshmallowFormMold.getIS(), + NHItemList.MarshmallowFormMold.getIS(), new Object[] { " ", " C ", "FH ", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormPipeTiny.getIS(), + NHItemList.MoldFormPipeTiny.getIS(), new Object[] { " ", "FC ", " H ", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormPipeSmall.getIS(), + NHItemList.MoldFormPipeSmall.getIS(), new Object[] { "F ", " C ", " H ", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormPipeMedium.getIS(), + NHItemList.MoldFormPipeMedium.getIS(), new Object[] { " F ", " C ", " H ", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormPipeLarge.getIS(), + NHItemList.MoldFormPipeLarge.getIS(), new Object[] { " F", " C ", " H ", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormPipeHuge.getIS(), + NHItemList.MoldFormPipeHuge.getIS(), new Object[] { " ", " CF", " H ", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.MoldFormDrillHead.getIS(), + NHItemList.MoldFormDrillHead.getIS(), new Object[] { " ", " C ", " HF", 'H', ToolDictNames.craftingToolHardHammer, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); // Add Casting Forms for Shapes GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapePlate.getIS(), + NHItemList.ShapePlate.getIS(), new Object[] { " WF", " C ", " ", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeRod.getIS(), + NHItemList.ShapeRod.getIS(), new Object[] { " W ", " CF", " ", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeBolt.getIS(), + NHItemList.ShapeBolt.getIS(), new Object[] { " W ", " C ", " F", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeCell.getIS(), + NHItemList.ShapeCell.getIS(), new Object[] { " W ", " C ", " F ", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeRing.getIS(), + NHItemList.ShapeRing.getIS(), new Object[] { " W ", " C ", "F ", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeIngot.getIS(), + NHItemList.ShapeIngot.getIS(), new Object[] { " W ", "FC ", " ", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeWire.getIS(), + NHItemList.ShapeWire.getIS(), new Object[] { "FW ", " C ", " ", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeCasing.getIS(), + NHItemList.ShapeCasing.getIS(), new Object[] { " W", " CF", " ", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeTinyPipe.getIS(), + NHItemList.ShapeTinyPipe.getIS(), new Object[] { " W", " C ", " F", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeSmallPipe.getIS(), + NHItemList.ShapeSmallPipe.getIS(), new Object[] { " W", " C ", " F ", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeNormalPipe.getIS(), + NHItemList.ShapeNormalPipe.getIS(), new Object[] { " W", " C ", "F ", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeLargePipe.getIS(), + NHItemList.ShapeLargePipe.getIS(), new Object[] { " W", "FC ", " ", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeHugePipe.getIS(), + NHItemList.ShapeHugePipe.getIS(), new Object[] { "F W", " C ", " ", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeBlock.getIS(), + NHItemList.ShapeBlock.getIS(), new Object[] { " FW", " C ", " ", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeSwordBlade.getIS(), + NHItemList.ShapeSwordBlade.getIS(), new Object[] { " ", " CW", " F", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapePickaxeHead.getIS(), + NHItemList.ShapePickaxeHead.getIS(), new Object[] { " ", " CW", " F ", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeShovelHead.getIS(), + NHItemList.ShapeShovelHead.getIS(), new Object[] { " ", " CW", "F ", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeAxeHead.getIS(), + NHItemList.ShapeAxeHead.getIS(), new Object[] { " ", "FCW", " ", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeHoeHead.getIS(), + NHItemList.ShapeHoeHead.getIS(), new Object[] { "F ", " CW", " ", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeHammerHead.getIS(), + NHItemList.ShapeHammerHead.getIS(), new Object[] { " F ", " CW", " ", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeFileHead.getIS(), + NHItemList.ShapeFileHead.getIS(), new Object[] { " F", " CW", " ", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeSawBlade.getIS(), + NHItemList.ShapeSawBlade.getIS(), new Object[] { " ", " C ", " FW", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeGear.getIS(), + NHItemList.ShapeGear.getIS(), new Object[] { " ", " C ", "F W", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeBottle.getIS(), + NHItemList.ShapeBottle.getIS(), new Object[] { " ", "FC ", " W", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeBoat.getIS(), + NHItemList.ShapeBoat.getIS(), new Object[] { "F ", " C ", " W", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeRotor.getIS(), + NHItemList.ShapeRotor.getIS(), new Object[] { " F ", " C ", " W", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeTurbineBlade.getIS(), + NHItemList.ShapeTurbineBlade.getIS(), new Object[] { " F", " C ", " W", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeSmallGear.getIS(), + NHItemList.ShapeSmallGear.getIS(), new Object[] { " ", " CF", " W", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); GTModHandler.addCraftingRecipe( - com.dreammaster.item.ItemList.ShapeDrillHead.getIS(), + NHItemList.ShapeDrillHead.getIS(), new Object[] { " F ", " C ", " W ", 'W', ToolDictNames.craftingToolWireCutter, 'F', ToolDictNames.craftingToolFile, 'C', aBlankCast }); diff --git a/src/main/java/com/dreammaster/gthandler/GT_CustomLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CustomLoader.java index 1fa3057ad..61a3a13c2 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_CustomLoader.java +++ b/src/main/java/com/dreammaster/gthandler/GT_CustomLoader.java @@ -5,7 +5,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import com.dreammaster.item.ItemList; +import com.dreammaster.item.NHItemList; import com.dreammaster.item.food.QuantumBread; import com.dreammaster.modfixes.biomesoplenty.BlockHarvestToolFix; import com.dreammaster.modfixes.enderIO.FrankenskullFix; @@ -29,7 +29,7 @@ public enum AdvancedGTMaterials { ZPM(OrePrefixes.circuit.get(Materials.ZPM), OrePrefixes.wireGt04.get(Materials.YttriumBariumCuprate), Materials.Naquadah, OrePrefixes.wireGt02.get(Materials.Naquadah), - OrePrefixes.gemExquisite.get(Materials.GarnetYellow), ItemList.MysteriousCrystal.getIS(), + OrePrefixes.gemExquisite.get(Materials.GarnetYellow), NHItemList.MysteriousCrystal.getIS(), "blockGlassZPM", Materials.Iridium, Materials.Naquadah), UV(OrePrefixes.circuit.get(Materials.UV), OrePrefixes.wireGt08.get(Materials.YttriumBariumCuprate), diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java index 0cf7e6d47..96ecf4e51 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java +++ b/src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java @@ -11,7 +11,7 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import com.dreammaster.item.ItemList; +import com.dreammaster.item.NHItemList; import gregtech.api.enums.SubTag; import gregtech.common.items.MetaGeneratedItem01; @@ -42,438 +42,438 @@ private void registerItems() { // 690 - 699 Sensors // CoreMod Items - CustomItemList.EtchedLowVoltageWiring.set(ItemList.EtchedLowVoltageWiring.getIS()); - CustomItemList.EtchedInsaneVoltageWiring.set(ItemList.EtchedInsaneVoltageWiring.getIS()); - CustomItemList.EtchedLudicrousVoltageWiring.set(ItemList.EtchedLudicrousVoltageWiring.getIS()); - CustomItemList.SteelBars.set(ItemList.SteelBars.getIS()); - CustomItemList.AluminiumBars.set(ItemList.AluminiumBars.getIS()); - CustomItemList.StainlessSteelBars.set(ItemList.StainlessSteelBars.getIS()); - CustomItemList.TungstenBars.set(ItemList.TungstenBars.getIS()); - CustomItemList.TungstenSteelBars.set(ItemList.TungstenSteelBars.getIS()); - CustomItemList.IridiumBars.set(ItemList.IridiumBars.getIS()); - CustomItemList.OsmiumBars.set(ItemList.OsmiumBars.getIS()); - CustomItemList.ChromeBars.set(ItemList.ChromeBars.getIS()); - CustomItemList.TitaniumBars.set(ItemList.TitaniumBars.getIS()); - CustomItemList.NeutroniumBars.set(ItemList.NeutroniumBars.getIS()); - CustomItemList.RedstoneAlloyBars.set(ItemList.RedstoneAlloyBars.getIS()); - CustomItemList.ElectricalSteelBars.set(ItemList.ElectricalSteelBars.getIS()); - CustomItemList.ConductiveIronBars.set(ItemList.ConductiveIronBars.getIS()); - CustomItemList.EnergeticAlloyBars.set(ItemList.EnergeticAlloyBars.getIS()); - CustomItemList.VibrantAlloyBars.set(ItemList.VibrantAlloyBars.getIS()); - CustomItemList.PulsatingIronBars.set(ItemList.PulsatingIronBars.getIS()); - CustomItemList.SoulariumBars.set(ItemList.SoulariumBars.getIS()); - CustomItemList.EnderiumBaseBars.set(ItemList.EnderiumBaseBars.getIS()); - CustomItemList.EnderiumBars.set(ItemList.EnderiumBars.getIS()); - CustomItemList.NagaScaleChip.set(ItemList.NagaScaleChip.getIS()); - CustomItemList.NagaScaleFragment.set(ItemList.NagaScaleFragment.getIS()); - CustomItemList.LichBoneChip.set(ItemList.LichBoneChip.getIS()); - CustomItemList.LichBoneFragment.set(ItemList.LichBoneFragment.getIS()); - CustomItemList.LichBone.set(ItemList.LichBone.getIS()); - CustomItemList.FieryBloodDrop.set(ItemList.FieryBloodDrop.getIS()); - CustomItemList.CarminiteChip.set(ItemList.CarminiteChip.getIS()); - CustomItemList.CarminiteFragment.set(ItemList.CarminiteFragment.getIS()); - CustomItemList.SnowQueenBloodDrop.set(ItemList.SnowQueenBloodDrop.getIS()); - CustomItemList.SnowQueenBlood.set(ItemList.SnowQueenBlood.getIS()); - CustomItemList.AdvancedBoard.set(ItemList.AdvancedBoard.getIS()); - CustomItemList.AdvancedProcessorBoard.set(ItemList.AdvancedProcessorBoard.getIS()); - CustomItemList.HighEnergyFlowCircuit.set(ItemList.HighEnergyFlowCircuit.getIS()); - CustomItemList.NanoCircuit.set(ItemList.NanoCircuit.getIS()); - CustomItemList.PikoCircuit.set(ItemList.PikoCircuit.getIS()); - CustomItemList.QuantumCircuit.set(ItemList.QuantumCircuit.getIS()); - CustomItemList.CarbonPartBoots.set(ItemList.CarbonPartBoots.getIS()); - CustomItemList.CarbonPartChestplate.set(ItemList.CarbonPartChestplate.getIS()); - CustomItemList.CarbonPartHelmet.set(ItemList.CarbonPartHelmet.getIS()); - CustomItemList.CarbonPartHelmetNightVision.set(ItemList.CarbonPartHelmetNightVision.getIS()); - CustomItemList.CarbonPartLeggings.set(ItemList.CarbonPartLeggings.getIS()); - CustomItemList.NanoRubberBoots.set(ItemList.NanoRubberBoots.getIS()); - CustomItemList.NanoChestJetPack.set(ItemList.NanoChestJetPack.getIS()); - CustomItemList.NanoPlatedLeggings.set(ItemList.NanoPlatedLeggings.getIS()); - CustomItemList.NanoScubaHelmet.set(ItemList.NanoScubaHelmet.getIS()); - CustomItemList.QuantumPartBoots.set(ItemList.QuantumPartBoots.getIS()); - CustomItemList.QuantumPartChestplate.set(ItemList.QuantumPartChestplate.getIS()); - CustomItemList.QuantumPartHelmetEmpty.set(ItemList.QuantumPartHelmetEmpty.getIS()); - CustomItemList.QuantumPartHelmet.set(ItemList.QuantumPartHelmet.getIS()); - CustomItemList.QuantumPartLeggings.set(ItemList.QuantumPartLeggings.getIS()); - CustomItemList.HeavyDutyAlloyIngotT4.set(ItemList.HeavyDutyAlloyIngotT4.getIS()); - CustomItemList.HeavyDutyAlloyIngotT5.set(ItemList.HeavyDutyAlloyIngotT5.getIS()); - CustomItemList.HeavyDutyAlloyIngotT6.set(ItemList.HeavyDutyAlloyIngotT6.getIS()); - CustomItemList.HeavyDutyAlloyIngotT7.set(ItemList.HeavyDutyAlloyIngotT7.getIS()); - CustomItemList.HeavyDutyAlloyIngotT8.set(ItemList.HeavyDutyAlloyIngotT8.getIS()); - CustomItemList.HeavyDutyAlloyIngotT9.set(ItemList.HeavyDutyAlloyIngotT9.getIS()); - CustomItemList.HighEnergyCircuitParts.set(ItemList.HighEnergyCircuitParts.getIS()); - CustomItemList.EngravedDiamondCrystalChip.set(ItemList.EngravedDiamondCrystalChip.getIS()); - CustomItemList.EngravedEnergyChip.set(ItemList.EngravedEnergyChip.getIS()); - CustomItemList.NanoBoard.set(ItemList.NanoBoard.getIS()); - CustomItemList.NanoCrystal.set(ItemList.NanoCrystal.getIS()); - CustomItemList.NanoProcessorBoard.set(ItemList.NanoProcessorBoard.getIS()); - CustomItemList.QuantumBoard.set(ItemList.QuantumBoard.getIS()); - CustomItemList.QuantumProcessorBoard.set(ItemList.QuantumProcessorBoard.getIS()); - CustomItemList.EngravedQuantumChip.set(ItemList.EngravedQuantumChip.getIS()); - CustomItemList.IridiumAlloyItemCasing.set(ItemList.IridiumAlloyItemCasing.getIS()); - CustomItemList.ReinforcedGlassPLate.set(ItemList.ReinforcedGlassPlate.getIS()); - CustomItemList.ReinforcedGlassLense.set(ItemList.ReinforcedGlassLense.getIS()); - CustomItemList.MarshmallowForm.set(ItemList.MarshmallowForm.getIS()); - CustomItemList.MarshmallowFormMold.set(ItemList.MarshmallowFormMold.getIS()); - CustomItemList.UncookedSlush.set(ItemList.UncookedSlush.getIS()); - CustomItemList.MalformedSlush.set(ItemList.MalformedSlush.getIS()); - CustomItemList.GlowingMarshmallow.set(ItemList.GlowingMarshmallow.getIS()); - CustomItemList.Marshmallow.set(ItemList.Marshmallow.getIS()); - CustomItemList.MoldHelmet.set(ItemList.MoldHelmet.getIS()); - CustomItemList.MoldChestplate.set(ItemList.MoldChestplate.getIS()); - CustomItemList.MoldLeggings.set(ItemList.MoldLeggings.getIS()); - CustomItemList.MoldBoots.set(ItemList.MoldBoots.getIS()); - CustomItemList.IchoriumCap.set(ItemList.IchoriumCap.getIS()); - CustomItemList.CoinDarkWizard.set(ItemList.CoinDarkWizard.getIS()); - CustomItemList.CoinDarkWizardI.set(ItemList.CoinDarkWizardI.getIS()); - CustomItemList.CoinDarkWizardII.set(ItemList.CoinDarkWizardII.getIS()); - CustomItemList.CoinDarkWizardIII.set(ItemList.CoinDarkWizardIII.getIS()); - CustomItemList.CoinDarkWizardIV.set(ItemList.CoinDarkWizardIV.getIS()); - CustomItemList.CoinTechnician.set(ItemList.CoinTechnician.getIS()); - CustomItemList.CoinTechnicianI.set(ItemList.CoinTechnicianI.getIS()); - CustomItemList.CoinTechnicianII.set(ItemList.CoinTechnicianII.getIS()); - CustomItemList.CoinTechnicianIII.set(ItemList.CoinTechnicianIII.getIS()); - CustomItemList.CoinTechnicianIV.set(ItemList.CoinTechnicianIV.getIS()); - CustomItemList.CoinAdventure.set(ItemList.CoinAdventure.getIS()); - CustomItemList.CoinAdventureI.set(ItemList.CoinAdventureI.getIS()); - CustomItemList.CoinAdventureII.set(ItemList.CoinAdventureII.getIS()); - CustomItemList.CoinAdventureIII.set(ItemList.CoinAdventureIII.getIS()); - CustomItemList.CoinAdventureIV.set(ItemList.CoinAdventureIV.getIS()); - CustomItemList.CoinBees.set(ItemList.CoinBees.getIS()); - CustomItemList.CoinBeesI.set(ItemList.CoinBeesI.getIS()); - CustomItemList.CoinBeesII.set(ItemList.CoinBeesII.getIS()); - CustomItemList.CoinBeesIII.set(ItemList.CoinBeesIII.getIS()); - CustomItemList.CoinBeesIV.set(ItemList.CoinBeesIV.getIS()); - CustomItemList.CoinBlood.set(ItemList.CoinBlood.getIS()); - CustomItemList.CoinBloodI.set(ItemList.CoinBloodI.getIS()); - CustomItemList.CoinBloodII.set(ItemList.CoinBloodII.getIS()); - CustomItemList.CoinBloodIII.set(ItemList.CoinBloodIII.getIS()); - CustomItemList.CoinBloodIV.set(ItemList.CoinBloodIV.getIS()); - CustomItemList.CoinFarmer.set(ItemList.CoinFarmer.getIS()); - CustomItemList.CoinFarmerI.set(ItemList.CoinFarmerI.getIS()); - CustomItemList.CoinFarmerII.set(ItemList.CoinFarmerII.getIS()); - CustomItemList.CoinFarmerIII.set(ItemList.CoinFarmerIII.getIS()); - CustomItemList.CoinFarmerIV.set(ItemList.CoinFarmerIV.getIS()); - CustomItemList.CoinForestry.set(ItemList.CoinForestry.getIS()); - CustomItemList.CoinForestryI.set(ItemList.CoinForestryI.getIS()); - CustomItemList.CoinForestryII.set(ItemList.CoinForestryII.getIS()); - CustomItemList.CoinForestryIII.set(ItemList.CoinForestryIII.getIS()); - CustomItemList.CoinForestryIV.set(ItemList.CoinForestryIV.getIS()); - CustomItemList.CoinSurvivor.set(ItemList.CoinSurvivor.getIS()); - CustomItemList.CoinSurvivorI.set(ItemList.CoinSurvivorI.getIS()); - CustomItemList.CoinSurvivorII.set(ItemList.CoinSurvivorII.getIS()); - CustomItemList.CoinSurvivorIII.set(ItemList.CoinSurvivorIII.getIS()); - CustomItemList.CoinSurvivorIV.set(ItemList.CoinSurvivorIV.getIS()); - CustomItemList.CoinSpace.set(ItemList.CoinSpace.getIS()); - CustomItemList.CoinSpaceI.set(ItemList.CoinSpaceI.getIS()); - CustomItemList.CoinSpaceII.set(ItemList.CoinSpaceII.getIS()); - CustomItemList.CoinSpaceIII.set(ItemList.CoinSpaceIII.getIS()); - CustomItemList.CoinSpaceIV.set(ItemList.CoinSpaceIV.getIS()); - CustomItemList.CoinChunkloaderTierI.set(ItemList.CoinChunkloaderTierI.getIS()); + CustomItemList.EtchedLowVoltageWiring.set(NHItemList.EtchedLowVoltageWiring.getIS()); + CustomItemList.EtchedInsaneVoltageWiring.set(NHItemList.EtchedInsaneVoltageWiring.getIS()); + CustomItemList.EtchedLudicrousVoltageWiring.set(NHItemList.EtchedLudicrousVoltageWiring.getIS()); + CustomItemList.SteelBars.set(NHItemList.SteelBars.getIS()); + CustomItemList.AluminiumBars.set(NHItemList.AluminiumBars.getIS()); + CustomItemList.StainlessSteelBars.set(NHItemList.StainlessSteelBars.getIS()); + CustomItemList.TungstenBars.set(NHItemList.TungstenBars.getIS()); + CustomItemList.TungstenSteelBars.set(NHItemList.TungstenSteelBars.getIS()); + CustomItemList.IridiumBars.set(NHItemList.IridiumBars.getIS()); + CustomItemList.OsmiumBars.set(NHItemList.OsmiumBars.getIS()); + CustomItemList.ChromeBars.set(NHItemList.ChromeBars.getIS()); + CustomItemList.TitaniumBars.set(NHItemList.TitaniumBars.getIS()); + CustomItemList.NeutroniumBars.set(NHItemList.NeutroniumBars.getIS()); + CustomItemList.RedstoneAlloyBars.set(NHItemList.RedstoneAlloyBars.getIS()); + CustomItemList.ElectricalSteelBars.set(NHItemList.ElectricalSteelBars.getIS()); + CustomItemList.ConductiveIronBars.set(NHItemList.ConductiveIronBars.getIS()); + CustomItemList.EnergeticAlloyBars.set(NHItemList.EnergeticAlloyBars.getIS()); + CustomItemList.VibrantAlloyBars.set(NHItemList.VibrantAlloyBars.getIS()); + CustomItemList.PulsatingIronBars.set(NHItemList.PulsatingIronBars.getIS()); + CustomItemList.SoulariumBars.set(NHItemList.SoulariumBars.getIS()); + CustomItemList.EnderiumBaseBars.set(NHItemList.EnderiumBaseBars.getIS()); + CustomItemList.EnderiumBars.set(NHItemList.EnderiumBars.getIS()); + CustomItemList.NagaScaleChip.set(NHItemList.NagaScaleChip.getIS()); + CustomItemList.NagaScaleFragment.set(NHItemList.NagaScaleFragment.getIS()); + CustomItemList.LichBoneChip.set(NHItemList.LichBoneChip.getIS()); + CustomItemList.LichBoneFragment.set(NHItemList.LichBoneFragment.getIS()); + CustomItemList.LichBone.set(NHItemList.LichBone.getIS()); + CustomItemList.FieryBloodDrop.set(NHItemList.FieryBloodDrop.getIS()); + CustomItemList.CarminiteChip.set(NHItemList.CarminiteChip.getIS()); + CustomItemList.CarminiteFragment.set(NHItemList.CarminiteFragment.getIS()); + CustomItemList.SnowQueenBloodDrop.set(NHItemList.SnowQueenBloodDrop.getIS()); + CustomItemList.SnowQueenBlood.set(NHItemList.SnowQueenBlood.getIS()); + CustomItemList.AdvancedBoard.set(NHItemList.AdvancedBoard.getIS()); + CustomItemList.AdvancedProcessorBoard.set(NHItemList.AdvancedProcessorBoard.getIS()); + CustomItemList.HighEnergyFlowCircuit.set(NHItemList.HighEnergyFlowCircuit.getIS()); + CustomItemList.NanoCircuit.set(NHItemList.NanoCircuit.getIS()); + CustomItemList.PikoCircuit.set(NHItemList.PikoCircuit.getIS()); + CustomItemList.QuantumCircuit.set(NHItemList.QuantumCircuit.getIS()); + CustomItemList.CarbonPartBoots.set(NHItemList.CarbonPartBoots.getIS()); + CustomItemList.CarbonPartChestplate.set(NHItemList.CarbonPartChestplate.getIS()); + CustomItemList.CarbonPartHelmet.set(NHItemList.CarbonPartHelmet.getIS()); + CustomItemList.CarbonPartHelmetNightVision.set(NHItemList.CarbonPartHelmetNightVision.getIS()); + CustomItemList.CarbonPartLeggings.set(NHItemList.CarbonPartLeggings.getIS()); + CustomItemList.NanoRubberBoots.set(NHItemList.NanoRubberBoots.getIS()); + CustomItemList.NanoChestJetPack.set(NHItemList.NanoChestJetPack.getIS()); + CustomItemList.NanoPlatedLeggings.set(NHItemList.NanoPlatedLeggings.getIS()); + CustomItemList.NanoScubaHelmet.set(NHItemList.NanoScubaHelmet.getIS()); + CustomItemList.QuantumPartBoots.set(NHItemList.QuantumPartBoots.getIS()); + CustomItemList.QuantumPartChestplate.set(NHItemList.QuantumPartChestplate.getIS()); + CustomItemList.QuantumPartHelmetEmpty.set(NHItemList.QuantumPartHelmetEmpty.getIS()); + CustomItemList.QuantumPartHelmet.set(NHItemList.QuantumPartHelmet.getIS()); + CustomItemList.QuantumPartLeggings.set(NHItemList.QuantumPartLeggings.getIS()); + CustomItemList.HeavyDutyAlloyIngotT4.set(NHItemList.HeavyDutyAlloyIngotT4.getIS()); + CustomItemList.HeavyDutyAlloyIngotT5.set(NHItemList.HeavyDutyAlloyIngotT5.getIS()); + CustomItemList.HeavyDutyAlloyIngotT6.set(NHItemList.HeavyDutyAlloyIngotT6.getIS()); + CustomItemList.HeavyDutyAlloyIngotT7.set(NHItemList.HeavyDutyAlloyIngotT7.getIS()); + CustomItemList.HeavyDutyAlloyIngotT8.set(NHItemList.HeavyDutyAlloyIngotT8.getIS()); + CustomItemList.HeavyDutyAlloyIngotT9.set(NHItemList.HeavyDutyAlloyIngotT9.getIS()); + CustomItemList.HighEnergyCircuitParts.set(NHItemList.HighEnergyCircuitParts.getIS()); + CustomItemList.EngravedDiamondCrystalChip.set(NHItemList.EngravedDiamondCrystalChip.getIS()); + CustomItemList.EngravedEnergyChip.set(NHItemList.EngravedEnergyChip.getIS()); + CustomItemList.NanoBoard.set(NHItemList.NanoBoard.getIS()); + CustomItemList.NanoCrystal.set(NHItemList.NanoCrystal.getIS()); + CustomItemList.NanoProcessorBoard.set(NHItemList.NanoProcessorBoard.getIS()); + CustomItemList.QuantumBoard.set(NHItemList.QuantumBoard.getIS()); + CustomItemList.QuantumProcessorBoard.set(NHItemList.QuantumProcessorBoard.getIS()); + CustomItemList.EngravedQuantumChip.set(NHItemList.EngravedQuantumChip.getIS()); + CustomItemList.IridiumAlloyItemCasing.set(NHItemList.IridiumAlloyItemCasing.getIS()); + CustomItemList.ReinforcedGlassPLate.set(NHItemList.ReinforcedGlassPlate.getIS()); + CustomItemList.ReinforcedGlassLense.set(NHItemList.ReinforcedGlassLense.getIS()); + CustomItemList.MarshmallowForm.set(NHItemList.MarshmallowForm.getIS()); + CustomItemList.MarshmallowFormMold.set(NHItemList.MarshmallowFormMold.getIS()); + CustomItemList.UncookedSlush.set(NHItemList.UncookedSlush.getIS()); + CustomItemList.MalformedSlush.set(NHItemList.MalformedSlush.getIS()); + CustomItemList.GlowingMarshmallow.set(NHItemList.GlowingMarshmallow.getIS()); + CustomItemList.Marshmallow.set(NHItemList.Marshmallow.getIS()); + CustomItemList.MoldHelmet.set(NHItemList.MoldHelmet.getIS()); + CustomItemList.MoldChestplate.set(NHItemList.MoldChestplate.getIS()); + CustomItemList.MoldLeggings.set(NHItemList.MoldLeggings.getIS()); + CustomItemList.MoldBoots.set(NHItemList.MoldBoots.getIS()); + CustomItemList.IchoriumCap.set(NHItemList.IchoriumCap.getIS()); + CustomItemList.CoinDarkWizard.set(NHItemList.CoinDarkWizard.getIS()); + CustomItemList.CoinDarkWizardI.set(NHItemList.CoinDarkWizardI.getIS()); + CustomItemList.CoinDarkWizardII.set(NHItemList.CoinDarkWizardII.getIS()); + CustomItemList.CoinDarkWizardIII.set(NHItemList.CoinDarkWizardIII.getIS()); + CustomItemList.CoinDarkWizardIV.set(NHItemList.CoinDarkWizardIV.getIS()); + CustomItemList.CoinTechnician.set(NHItemList.CoinTechnician.getIS()); + CustomItemList.CoinTechnicianI.set(NHItemList.CoinTechnicianI.getIS()); + CustomItemList.CoinTechnicianII.set(NHItemList.CoinTechnicianII.getIS()); + CustomItemList.CoinTechnicianIII.set(NHItemList.CoinTechnicianIII.getIS()); + CustomItemList.CoinTechnicianIV.set(NHItemList.CoinTechnicianIV.getIS()); + CustomItemList.CoinAdventure.set(NHItemList.CoinAdventure.getIS()); + CustomItemList.CoinAdventureI.set(NHItemList.CoinAdventureI.getIS()); + CustomItemList.CoinAdventureII.set(NHItemList.CoinAdventureII.getIS()); + CustomItemList.CoinAdventureIII.set(NHItemList.CoinAdventureIII.getIS()); + CustomItemList.CoinAdventureIV.set(NHItemList.CoinAdventureIV.getIS()); + CustomItemList.CoinBees.set(NHItemList.CoinBees.getIS()); + CustomItemList.CoinBeesI.set(NHItemList.CoinBeesI.getIS()); + CustomItemList.CoinBeesII.set(NHItemList.CoinBeesII.getIS()); + CustomItemList.CoinBeesIII.set(NHItemList.CoinBeesIII.getIS()); + CustomItemList.CoinBeesIV.set(NHItemList.CoinBeesIV.getIS()); + CustomItemList.CoinBlood.set(NHItemList.CoinBlood.getIS()); + CustomItemList.CoinBloodI.set(NHItemList.CoinBloodI.getIS()); + CustomItemList.CoinBloodII.set(NHItemList.CoinBloodII.getIS()); + CustomItemList.CoinBloodIII.set(NHItemList.CoinBloodIII.getIS()); + CustomItemList.CoinBloodIV.set(NHItemList.CoinBloodIV.getIS()); + CustomItemList.CoinFarmer.set(NHItemList.CoinFarmer.getIS()); + CustomItemList.CoinFarmerI.set(NHItemList.CoinFarmerI.getIS()); + CustomItemList.CoinFarmerII.set(NHItemList.CoinFarmerII.getIS()); + CustomItemList.CoinFarmerIII.set(NHItemList.CoinFarmerIII.getIS()); + CustomItemList.CoinFarmerIV.set(NHItemList.CoinFarmerIV.getIS()); + CustomItemList.CoinForestry.set(NHItemList.CoinForestry.getIS()); + CustomItemList.CoinForestryI.set(NHItemList.CoinForestryI.getIS()); + CustomItemList.CoinForestryII.set(NHItemList.CoinForestryII.getIS()); + CustomItemList.CoinForestryIII.set(NHItemList.CoinForestryIII.getIS()); + CustomItemList.CoinForestryIV.set(NHItemList.CoinForestryIV.getIS()); + CustomItemList.CoinSurvivor.set(NHItemList.CoinSurvivor.getIS()); + CustomItemList.CoinSurvivorI.set(NHItemList.CoinSurvivorI.getIS()); + CustomItemList.CoinSurvivorII.set(NHItemList.CoinSurvivorII.getIS()); + CustomItemList.CoinSurvivorIII.set(NHItemList.CoinSurvivorIII.getIS()); + CustomItemList.CoinSurvivorIV.set(NHItemList.CoinSurvivorIV.getIS()); + CustomItemList.CoinSpace.set(NHItemList.CoinSpace.getIS()); + CustomItemList.CoinSpaceI.set(NHItemList.CoinSpaceI.getIS()); + CustomItemList.CoinSpaceII.set(NHItemList.CoinSpaceII.getIS()); + CustomItemList.CoinSpaceIII.set(NHItemList.CoinSpaceIII.getIS()); + CustomItemList.CoinSpaceIV.set(NHItemList.CoinSpaceIV.getIS()); + CustomItemList.CoinChunkloaderTierI.set(NHItemList.CoinChunkloaderTierI.getIS()); CustomItemList.CoinChunkloaderTierI.getItem().setMaxStackSize(4); - CustomItemList.CoinChunkloaderTierII.set(ItemList.CoinChunkloaderTierII.getIS()); + CustomItemList.CoinChunkloaderTierII.set(NHItemList.CoinChunkloaderTierII.getIS()); CustomItemList.CoinChunkloaderTierII.getItem().setMaxStackSize(4); - CustomItemList.CoinChunkloaderTierIII.set(ItemList.CoinChunkloaderTierIII.getIS()); + CustomItemList.CoinChunkloaderTierIII.set(NHItemList.CoinChunkloaderTierIII.getIS()); CustomItemList.CoinChunkloaderTierIII.getItem().setMaxStackSize(4); - CustomItemList.CoinChunkloaderTierIV.set(ItemList.CoinChunkloaderTierIV.getIS()); + CustomItemList.CoinChunkloaderTierIV.set(NHItemList.CoinChunkloaderTierIV.getIS()); CustomItemList.CoinChunkloaderTierIV.getItem().setMaxStackSize(4); - CustomItemList.CoinChunkloaderTierV.set(ItemList.CoinChunkloaderTierV.getIS()); + CustomItemList.CoinChunkloaderTierV.set(NHItemList.CoinChunkloaderTierV.getIS()); CustomItemList.CoinChunkloaderTierV.getItem().setMaxStackSize(4); - CustomItemList.CoinChemist.set(ItemList.CoinChemist.getIS()); - CustomItemList.CoinChemistI.set(ItemList.CoinChemistI.getIS()); - CustomItemList.CoinChemistII.set(ItemList.CoinChemistII.getIS()); - CustomItemList.CoinChemistIII.set(ItemList.CoinChemistIII.getIS()); - CustomItemList.CoinChemistIV.set(ItemList.CoinChemistIV.getIS()); - CustomItemList.CoinCook.set(ItemList.CoinCook.getIS()); - CustomItemList.CoinCookI.set(ItemList.CoinCookI.getIS()); - CustomItemList.CoinCookII.set(ItemList.CoinCookII.getIS()); - CustomItemList.CoinCookIII.set(ItemList.CoinCookIII.getIS()); - CustomItemList.CoinCookIV.set(ItemList.CoinCookIV.getIS()); - CustomItemList.CoinBlank.set(ItemList.CoinBlank.getIS()); - CustomItemList.CoinBlankI.set(ItemList.CoinBlankI.getIS()); - CustomItemList.CoinBlankII.set(ItemList.CoinBlankII.getIS()); - CustomItemList.CoinBlankIII.set(ItemList.CoinBlankIII.getIS()); - CustomItemList.CoinBlankIV.set(ItemList.CoinBlankIV.getIS()); - CustomItemList.CoinSmith.set(ItemList.CoinSmith.getIS()); - CustomItemList.CoinSmithI.set(ItemList.CoinSmithI.getIS()); - CustomItemList.CoinSmithII.set(ItemList.CoinSmithII.getIS()); - CustomItemList.CoinSmithIII.set(ItemList.CoinSmithIII.getIS()); - CustomItemList.CoinSmithIV.set(ItemList.CoinSmithIV.getIS()); - CustomItemList.CoinWitch.set(ItemList.CoinWitch.getIS()); - CustomItemList.CoinWitchI.set(ItemList.CoinWitchI.getIS()); - CustomItemList.CoinWitchII.set(ItemList.CoinWitchII.getIS()); - CustomItemList.CoinWitchIII.set(ItemList.CoinWitchIII.getIS()); - CustomItemList.CoinWitchIV.set(ItemList.CoinWitchIV.getIS()); - CustomItemList.CoinFlower.set(ItemList.CoinFlower.getIS()); - CustomItemList.CoinFlowerI.set(ItemList.CoinFlowerI.getIS()); - CustomItemList.CoinFlowerII.set(ItemList.CoinFlowerII.getIS()); - CustomItemList.CoinFlowerIII.set(ItemList.CoinFlowerIII.getIS()); - CustomItemList.CoinFlowerIV.set(ItemList.CoinFlowerIV.getIS()); - CustomItemList.CoinDonation.set(ItemList.CoinDonation.getIS()); - CustomItemList.WetTofu.set(ItemList.WetTofu.getIS()); - CustomItemList.NetherStarFragment.set(ItemList.NetherStarFragment.getIS()); - CustomItemList.WeakOrb.set(ItemList.WeakOrb.getIS()); - CustomItemList.ApprenticeOrb.set(ItemList.ApprenticeOrb.getIS()); - CustomItemList.MasterOrb.set(ItemList.MasterOrb.getIS()); - CustomItemList.MagicianOrb.set(ItemList.MagicianOrb.getIS()); - CustomItemList.ArchmageOrb.set(ItemList.ArchmageOrb.getIS()); - CustomItemList.TranscendentOrb.set(ItemList.TranscendentOrb.getIS()); - CustomItemList.ArcaneSlate.set(ItemList.ArcaneSlate.getIS()); - CustomItemList.RawOrbTier1.set(ItemList.RawOrbTier1.getIS()); - CustomItemList.RawOrbTier2.set(ItemList.RawOrbTier2.getIS()); - CustomItemList.RawOrbTier3.set(ItemList.RawOrbTier3.getIS()); - CustomItemList.RawOrbTier4.set(ItemList.RawOrbTier4.getIS()); - CustomItemList.RawOrbTier5.set(ItemList.RawOrbTier5.getIS()); - CustomItemList.RawOrbTier6.set(ItemList.RawOrbTier6.getIS()); - CustomItemList.TeleposerFrame.set(ItemList.TeleposerFrame.getIS()); - CustomItemList.MysteriousCrystal.set(ItemList.MysteriousCrystal.getIS()); - CustomItemList.WoodenCasing.set(ItemList.WoodenCasing.getIS()); - CustomItemList.EssentiaCircuit.set(ItemList.EssentiaCircuit.getIS()); + CustomItemList.CoinChemist.set(NHItemList.CoinChemist.getIS()); + CustomItemList.CoinChemistI.set(NHItemList.CoinChemistI.getIS()); + CustomItemList.CoinChemistII.set(NHItemList.CoinChemistII.getIS()); + CustomItemList.CoinChemistIII.set(NHItemList.CoinChemistIII.getIS()); + CustomItemList.CoinChemistIV.set(NHItemList.CoinChemistIV.getIS()); + CustomItemList.CoinCook.set(NHItemList.CoinCook.getIS()); + CustomItemList.CoinCookI.set(NHItemList.CoinCookI.getIS()); + CustomItemList.CoinCookII.set(NHItemList.CoinCookII.getIS()); + CustomItemList.CoinCookIII.set(NHItemList.CoinCookIII.getIS()); + CustomItemList.CoinCookIV.set(NHItemList.CoinCookIV.getIS()); + CustomItemList.CoinBlank.set(NHItemList.CoinBlank.getIS()); + CustomItemList.CoinBlankI.set(NHItemList.CoinBlankI.getIS()); + CustomItemList.CoinBlankII.set(NHItemList.CoinBlankII.getIS()); + CustomItemList.CoinBlankIII.set(NHItemList.CoinBlankIII.getIS()); + CustomItemList.CoinBlankIV.set(NHItemList.CoinBlankIV.getIS()); + CustomItemList.CoinSmith.set(NHItemList.CoinSmith.getIS()); + CustomItemList.CoinSmithI.set(NHItemList.CoinSmithI.getIS()); + CustomItemList.CoinSmithII.set(NHItemList.CoinSmithII.getIS()); + CustomItemList.CoinSmithIII.set(NHItemList.CoinSmithIII.getIS()); + CustomItemList.CoinSmithIV.set(NHItemList.CoinSmithIV.getIS()); + CustomItemList.CoinWitch.set(NHItemList.CoinWitch.getIS()); + CustomItemList.CoinWitchI.set(NHItemList.CoinWitchI.getIS()); + CustomItemList.CoinWitchII.set(NHItemList.CoinWitchII.getIS()); + CustomItemList.CoinWitchIII.set(NHItemList.CoinWitchIII.getIS()); + CustomItemList.CoinWitchIV.set(NHItemList.CoinWitchIV.getIS()); + CustomItemList.CoinFlower.set(NHItemList.CoinFlower.getIS()); + CustomItemList.CoinFlowerI.set(NHItemList.CoinFlowerI.getIS()); + CustomItemList.CoinFlowerII.set(NHItemList.CoinFlowerII.getIS()); + CustomItemList.CoinFlowerIII.set(NHItemList.CoinFlowerIII.getIS()); + CustomItemList.CoinFlowerIV.set(NHItemList.CoinFlowerIV.getIS()); + CustomItemList.CoinDonation.set(NHItemList.CoinDonation.getIS()); + CustomItemList.WetTofu.set(NHItemList.WetTofu.getIS()); + CustomItemList.NetherStarFragment.set(NHItemList.NetherStarFragment.getIS()); + CustomItemList.WeakOrb.set(NHItemList.WeakOrb.getIS()); + CustomItemList.ApprenticeOrb.set(NHItemList.ApprenticeOrb.getIS()); + CustomItemList.MasterOrb.set(NHItemList.MasterOrb.getIS()); + CustomItemList.MagicianOrb.set(NHItemList.MagicianOrb.getIS()); + CustomItemList.ArchmageOrb.set(NHItemList.ArchmageOrb.getIS()); + CustomItemList.TranscendentOrb.set(NHItemList.TranscendentOrb.getIS()); + CustomItemList.ArcaneSlate.set(NHItemList.ArcaneSlate.getIS()); + CustomItemList.RawOrbTier1.set(NHItemList.RawOrbTier1.getIS()); + CustomItemList.RawOrbTier2.set(NHItemList.RawOrbTier2.getIS()); + CustomItemList.RawOrbTier3.set(NHItemList.RawOrbTier3.getIS()); + CustomItemList.RawOrbTier4.set(NHItemList.RawOrbTier4.getIS()); + CustomItemList.RawOrbTier5.set(NHItemList.RawOrbTier5.getIS()); + CustomItemList.RawOrbTier6.set(NHItemList.RawOrbTier6.getIS()); + CustomItemList.TeleposerFrame.set(NHItemList.TeleposerFrame.getIS()); + CustomItemList.MysteriousCrystal.set(NHItemList.MysteriousCrystal.getIS()); + CustomItemList.WoodenCasing.set(NHItemList.WoodenCasing.getIS()); + CustomItemList.EssentiaCircuit.set(NHItemList.EssentiaCircuit.getIS()); CustomItemList.EngineeringProcessorEssentiaPulsatingCore - .set(ItemList.EngineeringProcessorEssentiaPulsatingCore.getIS()); - CustomItemList.ManyullynCrystal.set(ItemList.ManyullynCrystal.getIS()); - CustomItemList.SchematicsAstroMiner.set(ItemList.SchematicsAstroMiner.getIS()); - CustomItemList.SchematicsCargoRocket.set(ItemList.SchematicsCargoRocket.getIS()); - CustomItemList.SchematicsMoonBuggy.set(ItemList.SchematicsMoonBuggy.getIS()); - CustomItemList.SchematicsTier1.set(ItemList.SchematicsTier1.getIS()); - CustomItemList.SchematicsTier2.set(ItemList.SchematicsTier2.getIS()); - CustomItemList.SchematicsTier3.set(ItemList.SchematicsTier3.getIS()); - CustomItemList.SchematicsTier4.set(ItemList.SchematicsTier4.getIS()); - CustomItemList.SchematicsTier5.set(ItemList.SchematicsTier5.getIS()); - CustomItemList.SchematicsTier6.set(ItemList.SchematicsTier6.getIS()); - CustomItemList.SchematicsTier7.set(ItemList.SchematicsTier7.getIS()); - CustomItemList.SchematicsTier8.set(ItemList.SchematicsTier8.getIS()); - CustomItemList.RawSDHCAlloy.set(ItemList.RawSDHCAlloy.getIS()); - CustomItemList.TungstenString.set(ItemList.TungstenString.getIS()); - CustomItemList.MeteoricIronString.set(ItemList.MeteoricIronString.getIS()); - CustomItemList.BlackPlutoniumCompressedPlate.set(ItemList.BlackPlutoniumCompressedPlate.getIS()); - CustomItemList.DeshDualCompressedPlates.set(ItemList.DeshDualCompressedPlates.getIS()); - CustomItemList.TitaniumDualCompressedPlates.set(ItemList.TitaniumDualCompressedPlates.getIS()); - CustomItemList.IceCompressedPlate.set(ItemList.IceCompressedPlate.getIS()); - CustomItemList.LedoxCompressedPlate.set(ItemList.LedoxCompressedPlate.getIS()); - CustomItemList.IceDualCompressedPlates.set(ItemList.IceDualCompressedPlates.getIS()); - CustomItemList.QuantinumCompressedPlate.set(ItemList.QuantinumCompressedPlate.getIS()); - CustomItemList.QuantinumDualCompressedPlates.set(ItemList.QuantinumDualCompressedPlates.getIS()); - CustomItemList.MytrylCompressedPlate.set(ItemList.MytrylCompressedPlate.getIS()); - CustomItemList.MytrylDualCompressedPlates.set(ItemList.MytrylDualCompressedPlates.getIS()); - CustomItemList.MysteriousCrystalCompressedPlate.set(ItemList.MysteriousCrystalCompressedPlate.getIS()); + .set(NHItemList.EngineeringProcessorEssentiaPulsatingCore.getIS()); + CustomItemList.ManyullynCrystal.set(NHItemList.ManyullynCrystal.getIS()); + CustomItemList.SchematicsAstroMiner.set(NHItemList.SchematicsAstroMiner.getIS()); + CustomItemList.SchematicsCargoRocket.set(NHItemList.SchematicsCargoRocket.getIS()); + CustomItemList.SchematicsMoonBuggy.set(NHItemList.SchematicsMoonBuggy.getIS()); + CustomItemList.SchematicsTier1.set(NHItemList.SchematicsTier1.getIS()); + CustomItemList.SchematicsTier2.set(NHItemList.SchematicsTier2.getIS()); + CustomItemList.SchematicsTier3.set(NHItemList.SchematicsTier3.getIS()); + CustomItemList.SchematicsTier4.set(NHItemList.SchematicsTier4.getIS()); + CustomItemList.SchematicsTier5.set(NHItemList.SchematicsTier5.getIS()); + CustomItemList.SchematicsTier6.set(NHItemList.SchematicsTier6.getIS()); + CustomItemList.SchematicsTier7.set(NHItemList.SchematicsTier7.getIS()); + CustomItemList.SchematicsTier8.set(NHItemList.SchematicsTier8.getIS()); + CustomItemList.RawSDHCAlloy.set(NHItemList.RawSDHCAlloy.getIS()); + CustomItemList.TungstenString.set(NHItemList.TungstenString.getIS()); + CustomItemList.MeteoricIronString.set(NHItemList.MeteoricIronString.getIS()); + CustomItemList.BlackPlutoniumCompressedPlate.set(NHItemList.BlackPlutoniumCompressedPlate.getIS()); + CustomItemList.DeshDualCompressedPlates.set(NHItemList.DeshDualCompressedPlates.getIS()); + CustomItemList.TitaniumDualCompressedPlates.set(NHItemList.TitaniumDualCompressedPlates.getIS()); + CustomItemList.IceCompressedPlate.set(NHItemList.IceCompressedPlate.getIS()); + CustomItemList.LedoxCompressedPlate.set(NHItemList.LedoxCompressedPlate.getIS()); + CustomItemList.IceDualCompressedPlates.set(NHItemList.IceDualCompressedPlates.getIS()); + CustomItemList.QuantinumCompressedPlate.set(NHItemList.QuantinumCompressedPlate.getIS()); + CustomItemList.QuantinumDualCompressedPlates.set(NHItemList.QuantinumDualCompressedPlates.getIS()); + CustomItemList.MytrylCompressedPlate.set(NHItemList.MytrylCompressedPlate.getIS()); + CustomItemList.MytrylDualCompressedPlates.set(NHItemList.MytrylDualCompressedPlates.getIS()); + CustomItemList.MysteriousCrystalCompressedPlate.set(NHItemList.MysteriousCrystalCompressedPlate.getIS()); CustomItemList.MysteriousCrystalDualCompressedPlates - .set(ItemList.MysteriousCrystalDualCompressedPlates.getIS()); - CustomItemList.SteelDualCompressedPlates.set(ItemList.SteelDualCompressedPlates.getIS()); - CustomItemList.TinDualCompressedPlates.set(ItemList.TinDualCompressedPlates.getIS()); - CustomItemList.CopperDualCompressedPlates.set(ItemList.CopperDualCompressedPlates.getIS()); - CustomItemList.IronDualCompressedPlates.set(ItemList.IronDualCompressedPlates.getIS()); - CustomItemList.MeteoricIronDualCompressedPlates.set(ItemList.MeteoricIronDualCompressedPlates.getIS()); - CustomItemList.MediumFuelCanister.set(ItemList.MediumFuelCanister.getIS()); - CustomItemList.LargeFuelCanister.set(ItemList.LargeFuelCanister.getIS()); - CustomItemList.ExtraLargeFuelCanister.set(ItemList.ExtraLargeFuelCanister.getIS()); - CustomItemList.MytrylCrystal.set(ItemList.MytrylCrystal.getIS()); - CustomItemList.CallistoIceCompressedPlate.set(ItemList.CallistoIceCompressedPlate.getIS()); - CustomItemList.HeavyDutyRocketEngineTier3.set(ItemList.HeavyDutyRocketEngineTier3.getIS()); - CustomItemList.HeavyDutyRocketEngineTier4.set(ItemList.HeavyDutyRocketEngineTier4.getIS()); - CustomItemList.HeavyDutyNoseConeTier3.set(ItemList.HeavyDutyNoseConeTier3.getIS()); - CustomItemList.HeavyDutyNoseConeTier4.set(ItemList.HeavyDutyNoseConeTier4.getIS()); - CustomItemList.HeavyDutyRocketFinsTier3.set(ItemList.HeavyDutyRocketFinsTier3.getIS()); - CustomItemList.HeavyDutyRocketFinsTier4.set(ItemList.HeavyDutyRocketFinsTier4.getIS()); - CustomItemList.Tier2Booster.set(ItemList.Tier2Booster.getIS()); - CustomItemList.Tier3Booster.set(ItemList.Tier3Booster.getIS()); - CustomItemList.Tier4Booster.set(ItemList.Tier4Booster.getIS()); - CustomItemList.HeavyDutyPlateTier4.set(ItemList.HeavyDutyPlateTier4.getIS()); - CustomItemList.HeavyDutyPlateTier5.set(ItemList.HeavyDutyPlateTier5.getIS()); - CustomItemList.HeavyDutyPlateTier6.set(ItemList.HeavyDutyPlateTier6.getIS()); - CustomItemList.HeavyDutyPlateTier7.set(ItemList.HeavyDutyPlateTier7.getIS()); - CustomItemList.HeavyDutyPlateTier8.set(ItemList.HeavyDutyPlateTier8.getIS()); - CustomItemList.LeadNickelPlate.set(ItemList.LeadNickelPlate.getIS()); - CustomItemList.LeadOriharukonPlate.set(ItemList.LeadOriharukonPlate.getIS()); - CustomItemList.MoonStoneDust.set(ItemList.MoonStoneDust.getIS()); - CustomItemList.MarsStoneDust.set(ItemList.MarsStoneDust.getIS()); - CustomItemList.AsteroidsStoneDust.set(ItemList.AsteroidsStoneDust.getIS()); - CustomItemList.PhobosStoneDust.set(ItemList.PhobosStoneDust.getIS()); - CustomItemList.DeimosStoneDust.set(ItemList.DeimosStoneDust.getIS()); - CustomItemList.CeresStoneDust.set(ItemList.CeresStoneDust.getIS()); - CustomItemList.EuropaIceDust.set(ItemList.EuropaIceDust.getIS()); - CustomItemList.EuropaStoneDust.set(ItemList.EuropaStoneDust.getIS()); - CustomItemList.GanymedeStoneDust.set(ItemList.GanymedeStoneDust.getIS()); - CustomItemList.CallistoStoneDust.set(ItemList.CallistoStoneDust.getIS()); - CustomItemList.IoStoneDust.set(ItemList.IoStoneDust.getIS()); - CustomItemList.VenusStoneDust.set(ItemList.VenusStoneDust.getIS()); - CustomItemList.MercuryStoneDust.set(ItemList.MercuryStoneDust.getIS()); - CustomItemList.EnceladusIceDust.set(ItemList.EnceladusIceDust.getIS()); - CustomItemList.EnceladusStoneDust.set(ItemList.EnceladusStoneDust.getIS()); - CustomItemList.TitanStoneDust.set(ItemList.TitanStoneDust.getIS()); - CustomItemList.OberonStoneDust.set(ItemList.OberonStoneDust.getIS()); - CustomItemList.ProteusStoneDust.set(ItemList.ProteusStoneDust.getIS()); - CustomItemList.TritonStoneDust.set(ItemList.TritonStoneDust.getIS()); - CustomItemList.PlutoIceDust.set(ItemList.PlutoIceDust.getIS()); - CustomItemList.PlutoStoneDust.set(ItemList.PlutoStoneDust.getIS()); - CustomItemList.HaumeaStoneDust.set(ItemList.HaumeaStoneDust.getIS()); - CustomItemList.MakeMakeStoneDust.set(ItemList.MakeMakeStoneDust.getIS()); - CustomItemList.MercuryCoreDust.set(ItemList.MercuryCoreDust.getIS()); - CustomItemList.CentauriAStoneDust.set(ItemList.CentauriAStoneDust.getIS()); - CustomItemList.CentauriASurfaceDust.set(ItemList.CentauriASurfaceDust.getIS()); - CustomItemList.VegaBStoneDust.set(ItemList.VegaBStoneDust.getIS()); - CustomItemList.BarnardaEStoneDust.set(ItemList.BarnardaEStoneDust.getIS()); - CustomItemList.BarnardaFStoneDust.set(ItemList.BarnardaFStoneDust.getIS()); - CustomItemList.IndustryFrame.set(ItemList.IndustryFrame.getIS()); - CustomItemList.TCetiEStoneDust.set(ItemList.TCetiEStoneDust.getIS()); - CustomItemList.AdsorptionFilterCasing.set(ItemList.AdsorptionFilterCasing.getIS()); - CustomItemList.AdsorptionFilter.set(ItemList.AdsorptionFilter.getIS()); - CustomItemList.AdsorptionFilterDirty.set(ItemList.AdsorptionFilterDirty.getIS()); - CustomItemList.VoidSeed.set(ItemList.VoidSeed.getIS()); - CustomItemList.WaferTier3.set(ItemList.WaferTier3.getIS()); - CustomItemList.MirandaStoneDust.set(ItemList.MirandaStoneDust.getIS()); - CustomItemList.MicaBasedPulp.set(ItemList.MicaBasedPulp.getIS()); - CustomItemList.MicaBasedSheet.set(ItemList.MicaBasedSheet.getIS()); - CustomItemList.MicaInsulatorSheet.set(ItemList.MicaInsulatorSheet.getIS()); - CustomItemList.MicaInsulatorFoil.set(ItemList.MicaInsulatorFoil.getIS()); - CustomItemList.HotNetherrackBrick.set(ItemList.HotNetherrackBrick.getIS()); - CustomItemList.InfernalBrick.set(ItemList.InfernalBrick.getIS()); - CustomItemList.AdvancedCokeOvenBrick.set(ItemList.AdvancedCokeOvenBrick.getIS()); - CustomItemList.AdvancedCokeOvenBrickDust.set(ItemList.AdvancedCokeOvenBrickDust.getIS()); - CustomItemList.CokeOvenBrick.set(ItemList.CokeOvenBrick.getIS()); - CustomItemList.CokeOvenBrickDust.set(ItemList.CokeOvenBrickDust.getIS()); - CustomItemList.MedalDerp.set(ItemList.MedalDerp.getIS()); + .set(NHItemList.MysteriousCrystalDualCompressedPlates.getIS()); + CustomItemList.SteelDualCompressedPlates.set(NHItemList.SteelDualCompressedPlates.getIS()); + CustomItemList.TinDualCompressedPlates.set(NHItemList.TinDualCompressedPlates.getIS()); + CustomItemList.CopperDualCompressedPlates.set(NHItemList.CopperDualCompressedPlates.getIS()); + CustomItemList.IronDualCompressedPlates.set(NHItemList.IronDualCompressedPlates.getIS()); + CustomItemList.MeteoricIronDualCompressedPlates.set(NHItemList.MeteoricIronDualCompressedPlates.getIS()); + CustomItemList.MediumFuelCanister.set(NHItemList.MediumFuelCanister.getIS()); + CustomItemList.LargeFuelCanister.set(NHItemList.LargeFuelCanister.getIS()); + CustomItemList.ExtraLargeFuelCanister.set(NHItemList.ExtraLargeFuelCanister.getIS()); + CustomItemList.MytrylCrystal.set(NHItemList.MytrylCrystal.getIS()); + CustomItemList.CallistoIceCompressedPlate.set(NHItemList.CallistoIceCompressedPlate.getIS()); + CustomItemList.HeavyDutyRocketEngineTier3.set(NHItemList.HeavyDutyRocketEngineTier3.getIS()); + CustomItemList.HeavyDutyRocketEngineTier4.set(NHItemList.HeavyDutyRocketEngineTier4.getIS()); + CustomItemList.HeavyDutyNoseConeTier3.set(NHItemList.HeavyDutyNoseConeTier3.getIS()); + CustomItemList.HeavyDutyNoseConeTier4.set(NHItemList.HeavyDutyNoseConeTier4.getIS()); + CustomItemList.HeavyDutyRocketFinsTier3.set(NHItemList.HeavyDutyRocketFinsTier3.getIS()); + CustomItemList.HeavyDutyRocketFinsTier4.set(NHItemList.HeavyDutyRocketFinsTier4.getIS()); + CustomItemList.Tier2Booster.set(NHItemList.Tier2Booster.getIS()); + CustomItemList.Tier3Booster.set(NHItemList.Tier3Booster.getIS()); + CustomItemList.Tier4Booster.set(NHItemList.Tier4Booster.getIS()); + CustomItemList.HeavyDutyPlateTier4.set(NHItemList.HeavyDutyPlateTier4.getIS()); + CustomItemList.HeavyDutyPlateTier5.set(NHItemList.HeavyDutyPlateTier5.getIS()); + CustomItemList.HeavyDutyPlateTier6.set(NHItemList.HeavyDutyPlateTier6.getIS()); + CustomItemList.HeavyDutyPlateTier7.set(NHItemList.HeavyDutyPlateTier7.getIS()); + CustomItemList.HeavyDutyPlateTier8.set(NHItemList.HeavyDutyPlateTier8.getIS()); + CustomItemList.LeadNickelPlate.set(NHItemList.LeadNickelPlate.getIS()); + CustomItemList.LeadOriharukonPlate.set(NHItemList.LeadOriharukonPlate.getIS()); + CustomItemList.MoonStoneDust.set(NHItemList.MoonStoneDust.getIS()); + CustomItemList.MarsStoneDust.set(NHItemList.MarsStoneDust.getIS()); + CustomItemList.AsteroidsStoneDust.set(NHItemList.AsteroidsStoneDust.getIS()); + CustomItemList.PhobosStoneDust.set(NHItemList.PhobosStoneDust.getIS()); + CustomItemList.DeimosStoneDust.set(NHItemList.DeimosStoneDust.getIS()); + CustomItemList.CeresStoneDust.set(NHItemList.CeresStoneDust.getIS()); + CustomItemList.EuropaIceDust.set(NHItemList.EuropaIceDust.getIS()); + CustomItemList.EuropaStoneDust.set(NHItemList.EuropaStoneDust.getIS()); + CustomItemList.GanymedeStoneDust.set(NHItemList.GanymedeStoneDust.getIS()); + CustomItemList.CallistoStoneDust.set(NHItemList.CallistoStoneDust.getIS()); + CustomItemList.IoStoneDust.set(NHItemList.IoStoneDust.getIS()); + CustomItemList.VenusStoneDust.set(NHItemList.VenusStoneDust.getIS()); + CustomItemList.MercuryStoneDust.set(NHItemList.MercuryStoneDust.getIS()); + CustomItemList.EnceladusIceDust.set(NHItemList.EnceladusIceDust.getIS()); + CustomItemList.EnceladusStoneDust.set(NHItemList.EnceladusStoneDust.getIS()); + CustomItemList.TitanStoneDust.set(NHItemList.TitanStoneDust.getIS()); + CustomItemList.OberonStoneDust.set(NHItemList.OberonStoneDust.getIS()); + CustomItemList.ProteusStoneDust.set(NHItemList.ProteusStoneDust.getIS()); + CustomItemList.TritonStoneDust.set(NHItemList.TritonStoneDust.getIS()); + CustomItemList.PlutoIceDust.set(NHItemList.PlutoIceDust.getIS()); + CustomItemList.PlutoStoneDust.set(NHItemList.PlutoStoneDust.getIS()); + CustomItemList.HaumeaStoneDust.set(NHItemList.HaumeaStoneDust.getIS()); + CustomItemList.MakeMakeStoneDust.set(NHItemList.MakeMakeStoneDust.getIS()); + CustomItemList.MercuryCoreDust.set(NHItemList.MercuryCoreDust.getIS()); + CustomItemList.CentauriAStoneDust.set(NHItemList.CentauriAStoneDust.getIS()); + CustomItemList.CentauriASurfaceDust.set(NHItemList.CentauriASurfaceDust.getIS()); + CustomItemList.VegaBStoneDust.set(NHItemList.VegaBStoneDust.getIS()); + CustomItemList.BarnardaEStoneDust.set(NHItemList.BarnardaEStoneDust.getIS()); + CustomItemList.BarnardaFStoneDust.set(NHItemList.BarnardaFStoneDust.getIS()); + CustomItemList.IndustryFrame.set(NHItemList.IndustryFrame.getIS()); + CustomItemList.TCetiEStoneDust.set(NHItemList.TCetiEStoneDust.getIS()); + CustomItemList.AdsorptionFilterCasing.set(NHItemList.AdsorptionFilterCasing.getIS()); + CustomItemList.AdsorptionFilter.set(NHItemList.AdsorptionFilter.getIS()); + CustomItemList.AdsorptionFilterDirty.set(NHItemList.AdsorptionFilterDirty.getIS()); + CustomItemList.VoidSeed.set(NHItemList.VoidSeed.getIS()); + CustomItemList.WaferTier3.set(NHItemList.WaferTier3.getIS()); + CustomItemList.MirandaStoneDust.set(NHItemList.MirandaStoneDust.getIS()); + CustomItemList.MicaBasedPulp.set(NHItemList.MicaBasedPulp.getIS()); + CustomItemList.MicaBasedSheet.set(NHItemList.MicaBasedSheet.getIS()); + CustomItemList.MicaInsulatorSheet.set(NHItemList.MicaInsulatorSheet.getIS()); + CustomItemList.MicaInsulatorFoil.set(NHItemList.MicaInsulatorFoil.getIS()); + CustomItemList.HotNetherrackBrick.set(NHItemList.HotNetherrackBrick.getIS()); + CustomItemList.InfernalBrick.set(NHItemList.InfernalBrick.getIS()); + CustomItemList.AdvancedCokeOvenBrick.set(NHItemList.AdvancedCokeOvenBrick.getIS()); + CustomItemList.AdvancedCokeOvenBrickDust.set(NHItemList.AdvancedCokeOvenBrickDust.getIS()); + CustomItemList.CokeOvenBrick.set(NHItemList.CokeOvenBrick.getIS()); + CustomItemList.CokeOvenBrickDust.set(NHItemList.CokeOvenBrickDust.getIS()); + CustomItemList.MedalDerp.set(NHItemList.MedalDerp.getIS()); CustomItemList.MedalDerp.getItem().setMaxStackSize(1); - CustomItemList.MedalGTExplosion.set(ItemList.MedalGTExplosion.getIS()); + CustomItemList.MedalGTExplosion.set(NHItemList.MedalGTExplosion.getIS()); CustomItemList.MedalGTExplosion.getItem().setMaxStackSize(1); - CustomItemList.MedalBuilder.set(ItemList.MedalBuilder.getIS()); + CustomItemList.MedalBuilder.set(NHItemList.MedalBuilder.getIS()); CustomItemList.MedalBuilder.getItem().setMaxStackSize(1); - CustomItemList.MedalEngineer.set(ItemList.MedalEngineer.getIS()); + CustomItemList.MedalEngineer.set(NHItemList.MedalEngineer.getIS()); CustomItemList.MedalEngineer.getItem().setMaxStackSize(1); - CustomItemList.MedalWarp.set(ItemList.MedalWarp.getIS()); + CustomItemList.MedalWarp.set(NHItemList.MedalWarp.getIS()); CustomItemList.MedalWarp.getItem().setMaxStackSize(1); - CustomItemList.AluminoSilicateWool.set(ItemList.AluminoSilicateWool.getIS()); - CustomItemList.MaceratedPlantmass.set(ItemList.MaceratedPlantmass.getIS()); - CustomItemList.EngineCore.set(ItemList.EngineCore.getIS()); - CustomItemList.TwilightCrystal.set(ItemList.TwilightCrystal.getIS()); - CustomItemList.UnfiredClayBrick.set(ItemList.UnfiredClayBrick.getIS()); - CustomItemList.UnfiredSearedBrick.set(ItemList.UnfiredSearedBrick.getIS()); - CustomItemList.UnfiredCokeOvenBrick.set(ItemList.UnfiredCokeOvenBrick.getIS()); - CustomItemList.UnfiredSlimeSoulBrick.set(ItemList.UnfiredSlimeSoulBrick.getIS()); - CustomItemList.RawLapotronCrystal.set(ItemList.RawLapotronCrystal.getIS()); - CustomItemList.LapotronDust.set(ItemList.LapotronDust.getIS()); - CustomItemList.AluminiumIronPlate.set(ItemList.AluminiumIronPlate.getIS()); - CustomItemList.ReinforcedAluminiumIronPlate.set(ItemList.ReinforcedAluminiumIronPlate.getIS()); - CustomItemList.IrradiantReinforcedAluminiumPlate.set(ItemList.IrradiantReinforcedAluminiumPlate.getIS()); - CustomItemList.IrradiantReinforcedTitaniumPlate.set(ItemList.IrradiantReinforcedTitaniumPlate.getIS()); - CustomItemList.IrradiantReinforcedTungstenPlate.set(ItemList.IrradiantReinforcedTungstenPlate.getIS()); + CustomItemList.AluminoSilicateWool.set(NHItemList.AluminoSilicateWool.getIS()); + CustomItemList.MaceratedPlantmass.set(NHItemList.MaceratedPlantmass.getIS()); + CustomItemList.EngineCore.set(NHItemList.EngineCore.getIS()); + CustomItemList.TwilightCrystal.set(NHItemList.TwilightCrystal.getIS()); + CustomItemList.UnfiredClayBrick.set(NHItemList.UnfiredClayBrick.getIS()); + CustomItemList.UnfiredSearedBrick.set(NHItemList.UnfiredSearedBrick.getIS()); + CustomItemList.UnfiredCokeOvenBrick.set(NHItemList.UnfiredCokeOvenBrick.getIS()); + CustomItemList.UnfiredSlimeSoulBrick.set(NHItemList.UnfiredSlimeSoulBrick.getIS()); + CustomItemList.RawLapotronCrystal.set(NHItemList.RawLapotronCrystal.getIS()); + CustomItemList.LapotronDust.set(NHItemList.LapotronDust.getIS()); + CustomItemList.AluminiumIronPlate.set(NHItemList.AluminiumIronPlate.getIS()); + CustomItemList.ReinforcedAluminiumIronPlate.set(NHItemList.ReinforcedAluminiumIronPlate.getIS()); + CustomItemList.IrradiantReinforcedAluminiumPlate.set(NHItemList.IrradiantReinforcedAluminiumPlate.getIS()); + CustomItemList.IrradiantReinforcedTitaniumPlate.set(NHItemList.IrradiantReinforcedTitaniumPlate.getIS()); + CustomItemList.IrradiantReinforcedTungstenPlate.set(NHItemList.IrradiantReinforcedTungstenPlate.getIS()); CustomItemList.IrradiantReinforcedTungstenSteelPlate - .set(ItemList.IrradiantReinforcedTungstenSteelPlate.getIS()); - CustomItemList.IrradiantReinforcedChromePlate.set(ItemList.IrradiantReinforcedChromePlate.getIS()); - CustomItemList.IrradiantReinforcedNaquadriaPlate.set(ItemList.IrradiantReinforcedNaquadriaPlate.getIS()); - CustomItemList.IrradiantReinforcedNeutroniumPlate.set(ItemList.IrradiantReinforcedNeutroniumPlate.getIS()); - CustomItemList.IrradiantReinforcedBedrockiumPlate.set(ItemList.IrradiantReinforcedBedrockiumPlate.getIS()); - CustomItemList.QuantumCrystal.set(ItemList.QuantumCrystal.getIS()); - CustomItemList.MysteriousCrystalLens.set(ItemList.MysteriousCrystalLens.getIS()); - CustomItemList.MysteriousCrystalGemFlawless.set(ItemList.MysteriousCrystalGemFlawless.getIS()); - CustomItemList.MysteriousCrystalGemExquisite.set(ItemList.MysteriousCrystalGemExquisite.getIS()); - CustomItemList.PrimordialPearlFragment.set(ItemList.PrimordialPearlFragment.getIS()); - CustomItemList.SandStoneRod.set(ItemList.SandStoneRod.getIS()); - CustomItemList.TheBigEgg.set(ItemList.TheBigEgg.getIS()); - CustomItemList.MutatedEgg.set(ItemList.MutatedEgg.getIS()); - CustomItemList.DraconiumEgg.set(ItemList.DraconiumEgg.getIS()); - CustomItemList.EnderEgg.set(ItemList.EnderEgg.getIS()); - CustomItemList.ChargedCertusQuartzDust.set(ItemList.ChargedCertusQuartzDust.getIS()); - CustomItemList.RawPicoWafer.set(ItemList.RawPicoWafer.getIS()); - CustomItemList.PicoWafer.set(ItemList.PicoWafer.getIS()); - CustomItemList.StargateFramePart.set(ItemList.StargateFramePart.getIS()); - CustomItemList.StargateChevron.set(ItemList.StargateChevron.getIS()); - CustomItemList.StargateShieldingFoil.set(ItemList.StargateShieldingFoil.getIS()); - CustomItemList.StargateCrystalDust.set(ItemList.StargateCrystalDust.getIS()); - CustomItemList.TCetiESeaweedExtract.set(ItemList.TCetiESeaweedExtract.getIS()); - CustomItemList.RawNeutronium.set(ItemList.RawNeutronium.getIS()); - CustomItemList.NeutronReflectorSmallParts.set(ItemList.NeutronReflectorSmallParts.getIS()); - CustomItemList.NeutronReflectorParts.set(ItemList.NeutronReflectorParts.getIS()); - CustomItemList.Empty180SpCell.set(ItemList.Empty180SpCell.getIS()); - CustomItemList.Empty360SpCell.set(ItemList.Empty360SpCell.getIS()); - CustomItemList.Empty540SpCell.set(ItemList.Empty540SpCell.getIS()); - CustomItemList.Empty1080SpCell.set(ItemList.Empty1080SpCell.getIS()); - CustomItemList.TenKCell.set(ItemList.TenKCell.getIS()); - CustomItemList.ThirtyKCell.set(ItemList.ThirtyKCell.getIS()); - CustomItemList.SixtyKCell.set(ItemList.SixtyKCell.getIS()); - CustomItemList.ArtificialLeather.set(ItemList.ArtificialLeather.getIS()); - CustomItemList.EctoplasmaChip.set(ItemList.EctoplasmaChip.getIS()); - CustomItemList.EctoplasmaFragment.set(ItemList.EctoplasmaFragment.getIS()); - CustomItemList.ArcaneShardChip.set(ItemList.ArcaneShardChip.getIS()); - CustomItemList.ArcaneShardFragment.set(ItemList.ArcaneShardFragment.getIS()); - CustomItemList.RuneOfPowerFragment.set(ItemList.RuneOfPowerFragment.getIS()); - CustomItemList.RuneOfAgilityFragment.set(ItemList.RuneOfAgilityFragment.getIS()); - CustomItemList.RuneOfVigorFragment.set(ItemList.RuneOfVigorFragment.getIS()); - CustomItemList.RuneOfDefenseFragment.set(ItemList.RuneOfDefenseFragment.getIS()); - CustomItemList.RuneOfMagicFragment.set(ItemList.RuneOfMagicFragment.getIS()); - CustomItemList.RuneOfVoidFragment.set(ItemList.RuneOfVoidFragment.getIS()); + .set(NHItemList.IrradiantReinforcedTungstenSteelPlate.getIS()); + CustomItemList.IrradiantReinforcedChromePlate.set(NHItemList.IrradiantReinforcedChromePlate.getIS()); + CustomItemList.IrradiantReinforcedNaquadriaPlate.set(NHItemList.IrradiantReinforcedNaquadriaPlate.getIS()); + CustomItemList.IrradiantReinforcedNeutroniumPlate.set(NHItemList.IrradiantReinforcedNeutroniumPlate.getIS()); + CustomItemList.IrradiantReinforcedBedrockiumPlate.set(NHItemList.IrradiantReinforcedBedrockiumPlate.getIS()); + CustomItemList.QuantumCrystal.set(NHItemList.QuantumCrystal.getIS()); + CustomItemList.MysteriousCrystalLens.set(NHItemList.MysteriousCrystalLens.getIS()); + CustomItemList.MysteriousCrystalGemFlawless.set(NHItemList.MysteriousCrystalGemFlawless.getIS()); + CustomItemList.MysteriousCrystalGemExquisite.set(NHItemList.MysteriousCrystalGemExquisite.getIS()); + CustomItemList.PrimordialPearlFragment.set(NHItemList.PrimordialPearlFragment.getIS()); + CustomItemList.SandStoneRod.set(NHItemList.SandStoneRod.getIS()); + CustomItemList.TheBigEgg.set(NHItemList.TheBigEgg.getIS()); + CustomItemList.MutatedEgg.set(NHItemList.MutatedEgg.getIS()); + CustomItemList.DraconiumEgg.set(NHItemList.DraconiumEgg.getIS()); + CustomItemList.EnderEgg.set(NHItemList.EnderEgg.getIS()); + CustomItemList.ChargedCertusQuartzDust.set(NHItemList.ChargedCertusQuartzDust.getIS()); + CustomItemList.RawPicoWafer.set(NHItemList.RawPicoWafer.getIS()); + CustomItemList.PicoWafer.set(NHItemList.PicoWafer.getIS()); + CustomItemList.StargateFramePart.set(NHItemList.StargateFramePart.getIS()); + CustomItemList.StargateChevron.set(NHItemList.StargateChevron.getIS()); + CustomItemList.StargateShieldingFoil.set(NHItemList.StargateShieldingFoil.getIS()); + CustomItemList.StargateCrystalDust.set(NHItemList.StargateCrystalDust.getIS()); + CustomItemList.TCetiESeaweedExtract.set(NHItemList.TCetiESeaweedExtract.getIS()); + CustomItemList.RawNeutronium.set(NHItemList.RawNeutronium.getIS()); + CustomItemList.NeutronReflectorSmallParts.set(NHItemList.NeutronReflectorSmallParts.getIS()); + CustomItemList.NeutronReflectorParts.set(NHItemList.NeutronReflectorParts.getIS()); + CustomItemList.Empty180SpCell.set(NHItemList.Empty180SpCell.getIS()); + CustomItemList.Empty360SpCell.set(NHItemList.Empty360SpCell.getIS()); + CustomItemList.Empty540SpCell.set(NHItemList.Empty540SpCell.getIS()); + CustomItemList.Empty1080SpCell.set(NHItemList.Empty1080SpCell.getIS()); + CustomItemList.TenKCell.set(NHItemList.TenKCell.getIS()); + CustomItemList.ThirtyKCell.set(NHItemList.ThirtyKCell.getIS()); + CustomItemList.SixtyKCell.set(NHItemList.SixtyKCell.getIS()); + CustomItemList.ArtificialLeather.set(NHItemList.ArtificialLeather.getIS()); + CustomItemList.EctoplasmaChip.set(NHItemList.EctoplasmaChip.getIS()); + CustomItemList.EctoplasmaFragment.set(NHItemList.EctoplasmaFragment.getIS()); + CustomItemList.ArcaneShardChip.set(NHItemList.ArcaneShardChip.getIS()); + CustomItemList.ArcaneShardFragment.set(NHItemList.ArcaneShardFragment.getIS()); + CustomItemList.RuneOfPowerFragment.set(NHItemList.RuneOfPowerFragment.getIS()); + CustomItemList.RuneOfAgilityFragment.set(NHItemList.RuneOfAgilityFragment.getIS()); + CustomItemList.RuneOfVigorFragment.set(NHItemList.RuneOfVigorFragment.getIS()); + CustomItemList.RuneOfDefenseFragment.set(NHItemList.RuneOfDefenseFragment.getIS()); + CustomItemList.RuneOfMagicFragment.set(NHItemList.RuneOfMagicFragment.getIS()); + CustomItemList.RuneOfVoidFragment.set(NHItemList.RuneOfVoidFragment.getIS()); CustomItemList.NandChipBoard.set( GT.addItem(81, "NAND Chip Array", "Chips on Board", "circuitPrimitiveArray", SubTag.NO_UNIFICATION)); - CustomItemList.LogicProcessorItemGoldCore.set(ItemList.LogicProcessorItemGoldCore.getIS()); - CustomItemList.EngineeringProcessorItemDiamondCore.set(ItemList.EngineeringProcessorItemDiamondCore.getIS()); - CustomItemList.EngineeringProcessorItemEmeraldCore.set(ItemList.EngineeringProcessorItemEmeraldCore.getIS()); + CustomItemList.LogicProcessorItemGoldCore.set(NHItemList.LogicProcessorItemGoldCore.getIS()); + CustomItemList.EngineeringProcessorItemDiamondCore.set(NHItemList.EngineeringProcessorItemDiamondCore.getIS()); + CustomItemList.EngineeringProcessorItemEmeraldCore.set(NHItemList.EngineeringProcessorItemEmeraldCore.getIS()); CustomItemList.EngineeringProcessorItemAdvEmeraldCore - .set(ItemList.EngineeringProcessorItemAdvEmeraldCore.getIS()); - CustomItemList.Display.set(ItemList.Display.getIS()); - CustomItemList.TitaniumIronPlate.set(ItemList.TitaniumIronPlate.getIS()); - CustomItemList.ReinforcedTitaniumIronPlate.set(ItemList.ReinforcedTitaniumIronPlate.getIS()); - CustomItemList.TungstenIronPlate.set(ItemList.TungstenIronPlate.getIS()); - CustomItemList.ReinforcedTungstenIronPlate.set(ItemList.ReinforcedTungstenIronPlate.getIS()); - CustomItemList.TungstenSteelIronPlate.set(ItemList.TungstenSteeLIronPlate.getIS()); - CustomItemList.ReinforcedTungstenSteelIronPlate.set(ItemList.ReinforcedTungstenSteelIronPlate.getIS()); - CustomItemList.ChromeIronPlate.set(ItemList.ChromeIronPlate.getIS()); - CustomItemList.ReinforcedChromeIronPlate.set(ItemList.ReinforcedChromeIronPlate.getIS()); - CustomItemList.NaquadriaIronPlate.set(ItemList.NaquadriaIronPlate.getIS()); - CustomItemList.ReinforcedNaquadriaIronPlate.set(ItemList.ReinforcedNaquadriaIronPlate.getIS()); - CustomItemList.NeutroniumIronPlate.set(ItemList.NeutroniumIronPlate.getIS()); - CustomItemList.ReinforcedNeutroniumIronPlate.set(ItemList.ReinforcedNeutroniumIronPlate.getIS()); - CustomItemList.BedrockiumIronPlate.set(ItemList.BedrockiumIronPlate.getIS()); - CustomItemList.ReinforcedBedrockiumIronPlate.set(ItemList.ReinforcedBedrockiumIronPlate.getIS()); - CustomItemList.BioBall.set(ItemList.BioBall.getIS()); - CustomItemList.PotassiumHydroxideDust.set(ItemList.PotassiumHydroxideDust.getIS()); - CustomItemList.RadoxPolymerLens.set(ItemList.RadoxPolymerLens.getIS()); - CustomItemList.ChromaticLens.set(ItemList.ChromaticLens.getIS()); - CustomItemList.NanoCircuitOrigin.set(ItemList.NanoCircuitOrigin.getIS()); - CustomItemList.ChevronOrigin.set(ItemList.ChevronOrigin.getIS()); - CustomItemList.FramePartOrigin.set(ItemList.FramePartOrigin.getIS()); - CustomItemList.GatePlateOrigin.set(ItemList.GatePlateOrigin.getIS()); - CustomItemList.PikoCircuitPolychrome.set(ItemList.PikoCircuitPolychrome.getIS()); - CustomItemList.QuantumCircuitPolychrome.set(ItemList.QuantumCircuitPolychrome.getIS()); - CustomItemList.GatePlatePolychrome.set(ItemList.GatePlatePolychrome.getIS()); - CustomItemList.ChevronPolychrome.set(ItemList.ChevronPolychrome.getIS()); - CustomItemList.FramePartPolychrome.set(ItemList.FramePartPolychrome.getIS()); - CustomItemList.PikoCircuitDimensional.set(ItemList.PikoCircuitDimensional.getIS()); - CustomItemList.QuantumCircuitDimensional.set(ItemList.QuantumCircuitDimensional.getIS()); - CustomItemList.GatePlateDimensional.set(ItemList.GatePlateDimensional.getIS()); - CustomItemList.ChevronDimensional.set(ItemList.ChevronDimensional.getIS()); - CustomItemList.FramePartDimensional.set(ItemList.FramePartDimensional.getIS()); - CustomItemList.GatePlateHarmonic.set(ItemList.GatePlateHarmonic.getIS()); - CustomItemList.ChevronHarmonic.set(ItemList.ChevronHarmonic.getIS()); - CustomItemList.FramePartHarmonic.set(ItemList.FramePartHarmonic.getIS()); - CustomItemList.StargateDustAncients.set(ItemList.StargateDustAncients.getIS()); - CustomItemList.StargateCrystalAncients.set(ItemList.StargateCrystalAncients.getIS()); + .set(NHItemList.EngineeringProcessorItemAdvEmeraldCore.getIS()); + CustomItemList.Display.set(NHItemList.Display.getIS()); + CustomItemList.TitaniumIronPlate.set(NHItemList.TitaniumIronPlate.getIS()); + 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.ReinforcedTungstenSteelIronPlate.set(NHItemList.ReinforcedTungstenSteelIronPlate.getIS()); + CustomItemList.ChromeIronPlate.set(NHItemList.ChromeIronPlate.getIS()); + CustomItemList.ReinforcedChromeIronPlate.set(NHItemList.ReinforcedChromeIronPlate.getIS()); + CustomItemList.NaquadriaIronPlate.set(NHItemList.NaquadriaIronPlate.getIS()); + CustomItemList.ReinforcedNaquadriaIronPlate.set(NHItemList.ReinforcedNaquadriaIronPlate.getIS()); + CustomItemList.NeutroniumIronPlate.set(NHItemList.NeutroniumIronPlate.getIS()); + CustomItemList.ReinforcedNeutroniumIronPlate.set(NHItemList.ReinforcedNeutroniumIronPlate.getIS()); + CustomItemList.BedrockiumIronPlate.set(NHItemList.BedrockiumIronPlate.getIS()); + CustomItemList.ReinforcedBedrockiumIronPlate.set(NHItemList.ReinforcedBedrockiumIronPlate.getIS()); + CustomItemList.BioBall.set(NHItemList.BioBall.getIS()); + CustomItemList.PotassiumHydroxideDust.set(NHItemList.PotassiumHydroxideDust.getIS()); + CustomItemList.RadoxPolymerLens.set(NHItemList.RadoxPolymerLens.getIS()); + CustomItemList.ChromaticLens.set(NHItemList.ChromaticLens.getIS()); + CustomItemList.NanoCircuitOrigin.set(NHItemList.NanoCircuitOrigin.getIS()); + CustomItemList.ChevronOrigin.set(NHItemList.ChevronOrigin.getIS()); + CustomItemList.FramePartOrigin.set(NHItemList.FramePartOrigin.getIS()); + CustomItemList.GatePlateOrigin.set(NHItemList.GatePlateOrigin.getIS()); + CustomItemList.PikoCircuitPolychrome.set(NHItemList.PikoCircuitPolychrome.getIS()); + CustomItemList.QuantumCircuitPolychrome.set(NHItemList.QuantumCircuitPolychrome.getIS()); + CustomItemList.GatePlatePolychrome.set(NHItemList.GatePlatePolychrome.getIS()); + CustomItemList.ChevronPolychrome.set(NHItemList.ChevronPolychrome.getIS()); + CustomItemList.FramePartPolychrome.set(NHItemList.FramePartPolychrome.getIS()); + CustomItemList.PikoCircuitDimensional.set(NHItemList.PikoCircuitDimensional.getIS()); + CustomItemList.QuantumCircuitDimensional.set(NHItemList.QuantumCircuitDimensional.getIS()); + CustomItemList.GatePlateDimensional.set(NHItemList.GatePlateDimensional.getIS()); + CustomItemList.ChevronDimensional.set(NHItemList.ChevronDimensional.getIS()); + CustomItemList.FramePartDimensional.set(NHItemList.FramePartDimensional.getIS()); + CustomItemList.GatePlateHarmonic.set(NHItemList.GatePlateHarmonic.getIS()); + CustomItemList.ChevronHarmonic.set(NHItemList.ChevronHarmonic.getIS()); + CustomItemList.FramePartHarmonic.set(NHItemList.FramePartHarmonic.getIS()); + CustomItemList.StargateDustAncients.set(NHItemList.StargateDustAncients.getIS()); + CustomItemList.StargateCrystalAncients.set(NHItemList.StargateCrystalAncients.getIS()); } private void registerTooltips() { registerTieredTooltip(CustomItemList.PikoCircuit.get(1), UMV); registerTieredTooltip(CustomItemList.QuantumCircuit.get(1), UXV); List origin = Arrays.asList( - ItemList.ChevronOrigin.getIS(), - ItemList.FramePartOrigin.getIS(), - ItemList.GatePlateOrigin.getIS(), - ItemList.NanoCircuitOrigin.getIS(), - ItemList.StargateDustAncients.getIS(), - ItemList.StargateCrystalAncients.getIS()); + NHItemList.ChevronOrigin.getIS(), + NHItemList.FramePartOrigin.getIS(), + NHItemList.GatePlateOrigin.getIS(), + NHItemList.NanoCircuitOrigin.getIS(), + NHItemList.StargateDustAncients.getIS(), + NHItemList.StargateCrystalAncients.getIS()); List polychrome = Arrays.asList( - ItemList.PikoCircuitPolychrome.getIS(), - ItemList.QuantumCircuitPolychrome.getIS(), - ItemList.GatePlatePolychrome.getIS(), - ItemList.ChevronPolychrome.getIS(), - ItemList.FramePartPolychrome.getIS()); + NHItemList.PikoCircuitPolychrome.getIS(), + NHItemList.QuantumCircuitPolychrome.getIS(), + NHItemList.GatePlatePolychrome.getIS(), + NHItemList.ChevronPolychrome.getIS(), + NHItemList.FramePartPolychrome.getIS()); List dimensional = Arrays.asList( - ItemList.PikoCircuitDimensional.getIS(), - ItemList.QuantumCircuitDimensional.getIS(), - ItemList.GatePlateDimensional.getIS(), - ItemList.ChevronDimensional.getIS(), - ItemList.FramePartDimensional.getIS()); + NHItemList.PikoCircuitDimensional.getIS(), + NHItemList.QuantumCircuitDimensional.getIS(), + NHItemList.GatePlateDimensional.getIS(), + NHItemList.ChevronDimensional.getIS(), + NHItemList.FramePartDimensional.getIS()); List harmonic = Arrays.asList( - ItemList.GatePlateHarmonic.getIS(), - ItemList.ChevronHarmonic.getIS(), - ItemList.FramePartHarmonic.getIS()); + NHItemList.GatePlateHarmonic.getIS(), + NHItemList.ChevronHarmonic.getIS(), + NHItemList.FramePartHarmonic.getIS()); for (ItemStack itemStack : origin) { addItemTooltip( itemStack, diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_OreDictionary.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_OreDictionary.java index 841a053cb..fc8e5a34f 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_Loader_OreDictionary.java +++ b/src/main/java/com/dreammaster/gthandler/GT_Loader_OreDictionary.java @@ -28,7 +28,7 @@ import net.minecraft.item.ItemStack; import com.dreammaster.block.BlockList; -import com.dreammaster.item.ItemList; +import com.dreammaster.item.NHItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -57,42 +57,43 @@ public void run() { GTOreDictUnificator.registerOre("cropCarrot", GTModHandler.getModItem(BiomesOPlenty.ID, "food", 1L, 2)); GTOreDictUnificator - .registerOre(OrePrefixes.compressed, Materials.Mytryl, ItemList.MytrylCompressedPlate.getIS()); + .registerOre(OrePrefixes.compressed, Materials.Mytryl, NHItemList.MytrylCompressedPlate.getIS()); GTOreDictUnificator.registerOre(OrePrefixes.block, Materials.Mytryl, BlockList.Mytryl.getIS()); GTOreDictUnificator.registerOre("blockCallistoIce", BlockList.CallistoColdIce.getIS()); GTOreDictUnificator.registerOre( OrePrefixes.compressed, Materials.CallistoIce, - ItemList.CallistoIceCompressedPlate.getIS()); + NHItemList.CallistoIceCompressedPlate.getIS()); GTOreDictUnificator.registerOre("blockLedox", BlockList.Ledox.getIS()); - GTOreDictUnificator.registerOre(OrePrefixes.compressed, Materials.Ledox, ItemList.LedoxCompressedPlate.getIS()); - GTOreDictUnificator.registerOre(OrePrefixes.stick, Materials.Stone, ItemList.CobbleStoneRod.getIS()); - GTOreDictUnificator.registerOre(OrePrefixes.plate, Materials.Stone, ItemList.StonePlate.getIS()); - GTOreDictUnificator.registerOre("stickSandstone", ItemList.SandStoneRod.getIS()); - GTOreDictUnificator.registerOre("lensReinforcedGlass", ItemList.ReinforcedGlassLense.getIS()); - GTOreDictUnificator.registerOre("plateReinforcedGlass", ItemList.ReinforcedGlassPlate.getIS()); + GTOreDictUnificator + .registerOre(OrePrefixes.compressed, Materials.Ledox, NHItemList.LedoxCompressedPlate.getIS()); + GTOreDictUnificator.registerOre(OrePrefixes.stick, Materials.Stone, NHItemList.CobbleStoneRod.getIS()); + GTOreDictUnificator.registerOre(OrePrefixes.plate, Materials.Stone, NHItemList.StonePlate.getIS()); + GTOreDictUnificator.registerOre("stickSandstone", NHItemList.SandStoneRod.getIS()); + GTOreDictUnificator.registerOre("lensReinforcedGlass", NHItemList.ReinforcedGlassLense.getIS()); + GTOreDictUnificator.registerOre("plateReinforcedGlass", NHItemList.ReinforcedGlassPlate.getIS()); GTOreDictUnificator.registerOre("blockQuantium", BlockList.Quantinum.getIS()); GTOreDictUnificator - .registerOre(OrePrefixes.compressed, Materials.Quantium, ItemList.QuantinumCompressedPlate.getIS()); + .registerOre(OrePrefixes.compressed, Materials.Quantium, NHItemList.QuantinumCompressedPlate.getIS()); GTOreDictUnificator .registerOre(OrePrefixes.block, Materials.MysteriousCrystal, BlockList.MysteriousCrystal.getIS()); GTOreDictUnificator.registerOre( OrePrefixes.compressed, Materials.MysteriousCrystal, - ItemList.MysteriousCrystalCompressedPlate.getIS()); + NHItemList.MysteriousCrystalCompressedPlate.getIS()); GTOreDictUnificator.registerOre(OrePrefixes.block, Materials.BlackPlutonium, BlockList.BlackPlutonium.getIS()); GTOreDictUnificator.registerOre( OrePrefixes.dust, Materials.CertusQuartzCharged, - com.dreammaster.item.ItemList.ChargedCertusQuartzDust.getIS(1)); + NHItemList.ChargedCertusQuartzDust.getIS(1)); GTOreDictUnificator.registerOre( OrePrefixes.plate, Materials.CertusQuartzCharged, - com.dreammaster.item.ItemList.ChargedCertusQuartzPlate.getIS(1)); + NHItemList.ChargedCertusQuartzPlate.getIS(1)); GTOreDictUnificator.registerOre( OrePrefixes.stick, Materials.CertusQuartzCharged, - com.dreammaster.item.ItemList.ChargedCertusQuartzRod.getIS(1)); + NHItemList.ChargedCertusQuartzRod.getIS(1)); GTOreDictUnificator.registerOre( OrePrefixes.crystal, Materials.CertusQuartzCharged, @@ -101,41 +102,43 @@ public void run() { OrePrefixes.gem, Materials.CertusQuartzCharged, getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 1)); - GTOreDictUnificator.registerOre("dustCokeOvenBrick", com.dreammaster.item.ItemList.CokeOvenBrickDust.getIS(1)); - GTOreDictUnificator.registerOre("ingotCokeOvenBrick", com.dreammaster.item.ItemList.CokeOvenBrick.getIS(1)); - GTOreDictUnificator.registerOre("leather", com.dreammaster.item.ItemList.ArtificialLeather.getIS(1)); - GTOreDictUnificator.registerOre("itemLeather", com.dreammaster.item.ItemList.ArtificialLeather.getIS(1)); - GTOreDictUnificator - .registerOre("dustPotassiumHydroxide", com.dreammaster.item.ItemList.PotassiumHydroxideDust.getIS(1)); + GTOreDictUnificator.registerOre("dustCokeOvenBrick", NHItemList.CokeOvenBrickDust.getIS(1)); + GTOreDictUnificator.registerOre("ingotCokeOvenBrick", NHItemList.CokeOvenBrick.getIS(1)); + GTOreDictUnificator.registerOre("leather", NHItemList.ArtificialLeather.getIS(1)); + GTOreDictUnificator.registerOre("itemLeather", NHItemList.ArtificialLeather.getIS(1)); + GTOreDictUnificator.registerOre("dustPotassiumHydroxide", NHItemList.PotassiumHydroxideDust.getIS(1)); - GTOreDictUnificator.registerOre(OrePrefixes.stickLong, Materials.Obsidian, ItemList.LongObsidianRod.getIS()); + GTOreDictUnificator.registerOre(OrePrefixes.stickLong, Materials.Obsidian, NHItemList.LongObsidianRod.getIS()); - GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Aluminium, ItemList.AluminiumBars.getIS()); - GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Chrome, ItemList.ChromeBars.getIS()); + GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Aluminium, NHItemList.AluminiumBars.getIS()); + GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Chrome, NHItemList.ChromeBars.getIS()); + GTOreDictUnificator + .registerOre(OrePrefixes.bars, Materials.ConductiveIron, NHItemList.ConductiveIronBars.getIS()); GTOreDictUnificator - .registerOre(OrePrefixes.bars, Materials.ConductiveIron, ItemList.ConductiveIronBars.getIS()); + .registerOre(OrePrefixes.bars, Materials.ElectricalSteel, NHItemList.ElectricalSteelBars.getIS()); GTOreDictUnificator - .registerOre(OrePrefixes.bars, Materials.ElectricalSteel, ItemList.ElectricalSteelBars.getIS()); + .registerOre(OrePrefixes.bars, Materials.EnergeticAlloy, NHItemList.EnergeticAlloyBars.getIS()); + GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Enderium, NHItemList.EnderiumBars.getIS()); + GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.EnderiumBase, NHItemList.EnderiumBaseBars.getIS()); + GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Iridium, NHItemList.IridiumBars.getIS()); + GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Neutronium, NHItemList.NeutroniumBars.getIS()); + GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Osmium, NHItemList.OsmiumBars.getIS()); GTOreDictUnificator - .registerOre(OrePrefixes.bars, Materials.EnergeticAlloy, ItemList.EnergeticAlloyBars.getIS()); - GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Enderium, ItemList.EnderiumBars.getIS()); - GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.EnderiumBase, ItemList.EnderiumBaseBars.getIS()); - GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Iridium, ItemList.IridiumBars.getIS()); - GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Neutronium, ItemList.NeutroniumBars.getIS()); - GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Osmium, ItemList.OsmiumBars.getIS()); - GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.PulsatingIron, ItemList.PulsatingIronBars.getIS()); - GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.RedstoneAlloy, ItemList.RedstoneAlloyBars.getIS()); - GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Soularium, ItemList.SoulariumBars.getIS()); + .registerOre(OrePrefixes.bars, Materials.PulsatingIron, NHItemList.PulsatingIronBars.getIS()); + GTOreDictUnificator + .registerOre(OrePrefixes.bars, Materials.RedstoneAlloy, NHItemList.RedstoneAlloyBars.getIS()); + GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Soularium, NHItemList.SoulariumBars.getIS()); GTOreDictUnificator.registerOre( OrePrefixes.bars, Materials.Soularium, GTModHandler.getModItem(EnderIO.ID, "blockSoulariumBars", 1L, 0)); GTOreDictUnificator - .registerOre(OrePrefixes.bars, Materials.StainlessSteel, ItemList.StainlessSteelBars.getIS()); - GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Steel, ItemList.SteelBars.getIS()); - GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Titanium, ItemList.TitaniumBars.getIS()); - GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Tungsten, ItemList.TungstenBars.getIS()); - GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.TungstenSteel, ItemList.TungstenSteelBars.getIS()); + .registerOre(OrePrefixes.bars, Materials.StainlessSteel, NHItemList.StainlessSteelBars.getIS()); + GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Steel, NHItemList.SteelBars.getIS()); + GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Titanium, NHItemList.TitaniumBars.getIS()); + GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Tungsten, NHItemList.TungstenBars.getIS()); + GTOreDictUnificator + .registerOre(OrePrefixes.bars, Materials.TungstenSteel, NHItemList.TungstenSteelBars.getIS()); GTOreDictUnificator.registerOre( OrePrefixes.ore, @@ -320,10 +323,10 @@ public void run() { GTModHandler.getModItem(IndustrialCraft2.ID, "blockRubWood", 1L, 0)); // oreDict UMV and UXV circuits - GTOreDictUnificator.registerOre(OrePrefixes.circuit, Materials.UMV, ItemList.PikoCircuit.getIS()); - GTOreDictUnificator.registerOre(OrePrefixes.circuit, Materials.UXV, ItemList.QuantumCircuit.getIS()); - GTOreDictUnificator.addToBlacklist(ItemList.PikoCircuit.getIS()); - GTOreDictUnificator.addToBlacklist(ItemList.QuantumCircuit.getIS()); + GTOreDictUnificator.registerOre(OrePrefixes.circuit, Materials.UMV, NHItemList.PikoCircuit.getIS()); + GTOreDictUnificator.registerOre(OrePrefixes.circuit, Materials.UXV, NHItemList.QuantumCircuit.getIS()); + GTOreDictUnificator.addToBlacklist(NHItemList.PikoCircuit.getIS()); + GTOreDictUnificator.addToBlacklist(NHItemList.QuantumCircuit.getIS()); // Add ore dictionary entries for sand and red sand to craft unfired coke oven bricks. GTOreDictUnificator.registerOre("sand", new ItemStack(Blocks.sand, 1, 0)); diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AlloySmelterRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AlloySmelterRecipes.java index 2f7d24cd5..46d52e5e8 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AlloySmelterRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AlloySmelterRecipes.java @@ -13,6 +13,7 @@ import net.minecraftforge.oredict.OreDictionary; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; @@ -151,12 +152,12 @@ public void run() { .itemInputs( GTModHandler.getModItem(IndustrialCraft2.ID, "itemPartIridium", 2L), ItemList.Shape_Mold_Casing.get(0)) - .itemOutputs(com.dreammaster.item.ItemList.IridiumAlloyItemCasing.getIS().splitStack(3)) - .duration(60 * SECONDS).eut(256).addTo(alloySmelterRecipes); + .itemOutputs(NHItemList.IridiumAlloyItemCasing.getIS().splitStack(3)).duration(60 * SECONDS).eut(256) + .addTo(alloySmelterRecipes); GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.sand, 1, wildcard), new ItemStack(Items.clay_ball)) - .itemOutputs(com.dreammaster.item.ItemList.CokeOvenBrick.getIS().splitStack(2)).duration(10 * SECONDS) - .eut(8).addTo(alloySmelterRecipes); + .itemOutputs(NHItemList.CokeOvenBrick.getIS().splitStack(2)).duration(10 * SECONDS).eut(8) + .addTo(alloySmelterRecipes); if (EnderIO.isModLoaded()) { // EnderIO Fused Quartz and Glass diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index 184554c8f..9d5f11733 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -40,6 +40,7 @@ import com.dreammaster.block.BlockList; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import bartworks.common.loaders.ItemRegistry; import bartworks.system.material.WerkstoffLoader; @@ -4795,7 +4796,7 @@ private void makeAE2Recipes() { 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), + NHItemList.EngineeringProcessorFluidDiamondCore.getIS(2), GTUtility.getIntegratedCircuit(2)) .itemOutputs(getModItem(AE2FluidCraft.ID, "fluid_interface", 1, 0)).duration(5 * SECONDS) .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); @@ -4806,7 +4807,7 @@ private void makeAE2Recipes() { 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), + NHItemList.EngineeringProcessorFluidDiamondCore.getIS(2), GTUtility.getIntegratedCircuit(3)) .itemOutputs(getModItem(AE2FluidCraft.ID, "part_fluid_interface", 1, 0)).duration(5 * SECONDS) .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); @@ -5093,7 +5094,7 @@ private void makeForestryRecipes() { .itemInputs( alveary, GTModHandler.getModItem(Forestry.ID, "thermionicTubes", 4L, 4), - com.dreammaster.item.ItemList.ChargedCertusQuartzPlate.getIS(2), + NHItemList.ChargedCertusQuartzPlate.getIS(2), ItemList.Component_Filter.get(2L), GTModHandler.getModItem(Forestry.ID, "royalJelly", 1L, 0)) .itemOutputs(GTModHandler.getModItem(Forestry.ID, "alveary", 1L, 6)) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java index 600f8f8db..344716439 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java @@ -43,6 +43,7 @@ import net.minecraftforge.fluids.FluidStack; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import com.gtnewhorizons.gtnhintergalactic.item.IGItems; import appeng.api.AEApi; @@ -561,7 +562,7 @@ public void run() { new FluidStack[] { Materials.SolderingAlloy.getMolten(3_744L), Materials.Naquadria.getMolten(4_032L), new FluidStack(FluidRegistry.getFluid("ic2coolant"), 20_000) }, - com.dreammaster.item.ItemList.NanoCircuitOrigin.getIS(1), + NHItemList.NanoCircuitOrigin.getIS(1), 400 * SECONDS, (int) TierEU.RECIPE_UEV); @@ -578,11 +579,11 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 64L), GTOreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 64L), GTOreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 64L), - com.dreammaster.item.ItemList.NanoCircuitOrigin.getIS(16) }, + NHItemList.NanoCircuitOrigin.getIS(16) }, new FluidStack[] { Materials.Neutronium.getMolten(36_864L), Materials.Tritanium.getMolten(36_864L), Materials.Tetranaquadahdiindiumhexaplatiumosminid.getMolten(36_864L), Materials.Silver.getPlasma(36_864L) }, - com.dreammaster.item.ItemList.GatePlateOrigin.getIS(1), + NHItemList.GatePlateOrigin.getIS(1), 1 * HOURS, (int) TierEU.RECIPE_UHV); @@ -601,11 +602,11 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Ardite, 8L), GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Ruby, 64L), GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Jasper, 64L), - com.dreammaster.item.ItemList.NanoCircuitOrigin.getIS(32) }, + NHItemList.NanoCircuitOrigin.getIS(32) }, new FluidStack[] { Materials.Neutronium.getMolten(9_216L), Materials.Tritanium.getMolten(9_216L), Materials.Tetranaquadahdiindiumhexaplatiumosminid.getMolten(9_216L), Materials.Silver.getPlasma(9_216L) }, - com.dreammaster.item.ItemList.ChevronOrigin.getIS(1), + NHItemList.ChevronOrigin.getIS(1), 1 * HOURS, (int) TierEU.RECIPE_UHV); @@ -622,21 +623,19 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Osmiridium, 64L) }, new FluidStack[] { Materials.Neutronium.getMolten(73728L), Materials.Tritanium.getMolten(73_728L), Materials.Concrete.getMolten(73_728L) }, - com.dreammaster.item.ItemList.FramePartOrigin.getIS(1), + NHItemList.FramePartOrigin.getIS(1), 1 * HOURS, (int) TierEU.RECIPE_UHV); // UEV Gate TTRecipeAdder.addResearchableAssemblylineRecipe( - com.dreammaster.item.ItemList.NanoCircuitOrigin.getIS(1), + NHItemList.NanoCircuitOrigin.getIS(1), 192000 * 2, 512 * 2, 4_000_000, 32 * 2, - new Object[] { ItemList.Circuit_Board_Bio_Ultra.get(1L), - com.dreammaster.item.ItemList.PicoWafer.getIS(4), - com.dreammaster.item.ItemList.NanoCircuitOrigin.getIS(2), - ItemList.Circuit_Parts_TransistorXSMD.get(48L), + new Object[] { ItemList.Circuit_Board_Bio_Ultra.get(1L), NHItemList.PicoWafer.getIS(4), + NHItemList.NanoCircuitOrigin.getIS(2), ItemList.Circuit_Parts_TransistorXSMD.get(48L), ItemList.Circuit_Parts_ResistorXSMD.get(48L), ItemList.Circuit_Parts_CapacitorXSMD.get(48L), ItemList.Circuit_Parts_DiodeXSMD.get(48L), ItemList.Circuit_Chip_PPIC.get(64L), GTOreDictUnificator.get(OrePrefixes.foil, Materials.NiobiumTitanium, 16), @@ -645,20 +644,19 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Lanthanum, 64) }, new FluidStack[] { Materials.SolderingAlloy.getMolten(3744L), Materials.UUMatter.getFluid(8_000L), Materials.Osmium.getMolten(1_152L) }, - com.dreammaster.item.ItemList.PikoCircuitPolychrome.getIS(1), + NHItemList.PikoCircuitPolychrome.getIS(1), 500 * SECONDS, (int) TierEU.RECIPE_UEV); TTRecipeAdder.addResearchableAssemblylineRecipe( - com.dreammaster.item.ItemList.PikoCircuitPolychrome.getIS(1), + NHItemList.PikoCircuitPolychrome.getIS(1), 192000 * 4, 512 * 4, (int) TierEU.RECIPE_UEV, 32 * 4, new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 16), - com.dreammaster.item.ItemList.PikoCircuitPolychrome.getIS(2), - ItemList.Circuit_Parts_CapacitorXSMD.get(64L), ItemList.Circuit_Parts_DiodeXSMD.get(64L), - ItemList.Circuit_Parts_TransistorXSMD.get(64L), + NHItemList.PikoCircuitPolychrome.getIS(2), ItemList.Circuit_Parts_CapacitorXSMD.get(64L), + ItemList.Circuit_Parts_DiodeXSMD.get(64L), ItemList.Circuit_Parts_TransistorXSMD.get(64L), ItemList.Circuit_Parts_ResistorXSMD.get(64L), ItemList.Circuit_Chip_QPIC.get(64L), GTOreDictUnificator.get(OrePrefixes.foil, Materials.NiobiumTitanium, 64), GTOreDictUnificator.get(OrePrefixes.bolt, Materials.Indium, 64), @@ -666,12 +664,12 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Lanthanum, 64) }, new FluidStack[] { Materials.SolderingAlloy.getMolten(3744L), Materials.UUMatter.getFluid(24_000L), Materials.Osmium.getMolten(2_304L) }, - com.dreammaster.item.ItemList.QuantumCircuitPolychrome.getIS(1), + NHItemList.QuantumCircuitPolychrome.getIS(1), 1000 * SECONDS, (int) TierEU.RECIPE_UIV); TTRecipeAdder.addResearchableAssemblylineRecipe( - com.dreammaster.item.ItemList.GatePlateOrigin.getIS(1), + NHItemList.GatePlateOrigin.getIS(1), 32_000_000 * 12, 8192, (int) TierEU.RECIPE_UIV, @@ -683,16 +681,16 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 64L), GTOreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 64L), GTOreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 64L), - com.dreammaster.item.ItemList.QuantumCircuitPolychrome.getIS(16) }, + NHItemList.QuantumCircuitPolychrome.getIS(16) }, new FluidStack[] { Materials.Neutronium.getMolten(36_864L), Materials.Tritanium.getMolten(36_864L), Materials.Longasssuperconductornameforuhvwire.getMolten(36_864L), Materials.Silver.getPlasma(36_864L) }, - com.dreammaster.item.ItemList.GatePlatePolychrome.getIS(1), + NHItemList.GatePlatePolychrome.getIS(1), 1 * HOURS, (int) TierEU.RECIPE_UIV); TTRecipeAdder.addResearchableAssemblylineRecipe( - com.dreammaster.item.ItemList.ChevronOrigin.getIS(1), + NHItemList.ChevronOrigin.getIS(1), 32_000_000 * 12, 8192, (int) TierEU.RECIPE_UIV, @@ -706,16 +704,16 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Ardite, 8L), GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Ruby, 64L), GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Jasper, 64L), - com.dreammaster.item.ItemList.QuantumCircuitPolychrome.getIS(32) }, + NHItemList.QuantumCircuitPolychrome.getIS(32) }, new FluidStack[] { Materials.Neutronium.getMolten(9_216L), Materials.Tritanium.getMolten(9_216L), Materials.Longasssuperconductornameforuhvwire.getMolten(9_216L), Materials.Silver.getPlasma(9_216L) }, - com.dreammaster.item.ItemList.ChevronPolychrome.getIS(1), + NHItemList.ChevronPolychrome.getIS(1), 1 * HOURS, (int) TierEU.RECIPE_UIV); TTRecipeAdder.addResearchableAssemblylineRecipe( - com.dreammaster.item.ItemList.FramePartOrigin.getIS(1), + NHItemList.FramePartOrigin.getIS(1), 32_000_000 * 12, 8192, (int) TierEU.RECIPE_UIV, @@ -727,7 +725,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Osmiridium, 64L) }, new FluidStack[] { Materials.Neutronium.getMolten(73_728L), Materials.Tritanium.getMolten(73_728L), Materials.Concrete.getMolten(73_728L) }, - com.dreammaster.item.ItemList.FramePartPolychrome.getIS(1), + NHItemList.FramePartPolychrome.getIS(1), 1 * HOURS, (int) TierEU.RECIPE_UIV); @@ -750,20 +748,18 @@ public void run() { new FluidStack[] { new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 3_744), Materials.Naquadria.getMolten(4_032L), new FluidStack(FluidRegistry.getFluid("ic2coolant"), 20_000) }, - com.dreammaster.item.ItemList.NanoCircuit.getIS(1), + NHItemList.NanoCircuit.getIS(1), 400 * SECONDS, (int) TierEU.RECIPE_UIV); TTRecipeAdder.addResearchableAssemblylineRecipe( - com.dreammaster.item.ItemList.NanoCircuit.getIS(1), + NHItemList.NanoCircuit.getIS(1), 384_000, 1_024, 4_000_000, 64, - new Object[] { ItemList.Circuit_Board_Bio_Ultra.get(1L), - com.dreammaster.item.ItemList.PicoWafer.getIS(4), - com.dreammaster.item.ItemList.NanoCircuit.getIS(2), - ItemList.Circuit_Parts_TransistorXSMD.get(48L), + new Object[] { ItemList.Circuit_Board_Bio_Ultra.get(1L), NHItemList.PicoWafer.getIS(4), + NHItemList.NanoCircuit.getIS(2), ItemList.Circuit_Parts_TransistorXSMD.get(48L), ItemList.Circuit_Parts_ResistorXSMD.get(48L), ItemList.Circuit_Parts_CapacitorXSMD.get(48L), ItemList.Circuit_Parts_DiodeXSMD.get(48L), ItemList.Circuit_Chip_PPIC.get(64L), GTOreDictUnificator.get(OrePrefixes.foil, Materials.NiobiumTitanium, 16), @@ -772,20 +768,19 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Lanthanum, 64) }, new FluidStack[] { new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 3_744), Materials.UUMatter.getFluid(8000L), Materials.Osmium.getMolten(1152L) }, - com.dreammaster.item.ItemList.PikoCircuitDimensional.getIS(1), + NHItemList.PikoCircuitDimensional.getIS(1), 500 * SECONDS, (int) TierEU.RECIPE_UMV); TTRecipeAdder.addResearchableAssemblylineRecipe( - com.dreammaster.item.ItemList.PikoCircuitDimensional.getIS(1), + NHItemList.PikoCircuitDimensional.getIS(1), 720_000, 2_048, (int) TierEU.RECIPE_UEV, 128, new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 16), - com.dreammaster.item.ItemList.PikoCircuitDimensional.getIS(2), - ItemList.Circuit_Parts_CapacitorXSMD.get(64L), ItemList.Circuit_Parts_DiodeXSMD.get(64L), - ItemList.Circuit_Parts_TransistorXSMD.get(64L), + NHItemList.PikoCircuitDimensional.getIS(2), ItemList.Circuit_Parts_CapacitorXSMD.get(64L), + ItemList.Circuit_Parts_DiodeXSMD.get(64L), ItemList.Circuit_Parts_TransistorXSMD.get(64L), ItemList.Circuit_Parts_ResistorXSMD.get(64L), ItemList.Circuit_Chip_QPIC.get(64L), GTOreDictUnificator.get(OrePrefixes.foil, Materials.NiobiumTitanium, 64), GTOreDictUnificator.get(OrePrefixes.bolt, Materials.Indium, 64), @@ -793,12 +788,12 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Lanthanum, 64) }, new FluidStack[] { new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 3_744), Materials.UUMatter.getFluid(24_000L), Materials.Osmium.getMolten(2_304L) }, - com.dreammaster.item.ItemList.QuantumCircuitDimensional.getIS(1), + NHItemList.QuantumCircuitDimensional.getIS(1), 1000 * SECONDS, (int) TierEU.RECIPE_UXV); TTRecipeAdder.addResearchableAssemblylineRecipe( - com.dreammaster.item.ItemList.GatePlatePolychrome.getIS(1), + NHItemList.GatePlatePolychrome.getIS(1), 2_000_000_000, 32_768, (int) TierEU.RECIPE_UXV, @@ -808,7 +803,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), GTOreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), GTOreDictUnificator.get(OrePrefixes.block, MaterialsUEVplus.SpaceTime, 16L), - com.dreammaster.item.ItemList.QuantumCircuitDimensional.getIS(16), + NHItemList.QuantumCircuitDimensional.getIS(16), GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 8L), GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 8L), GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 8L), @@ -819,12 +814,12 @@ public void run() { MaterialsUEVplus.SpaceTime.getMolten(4 * 36864L), Materials.SuperconductorUMVBase.getMolten(4 * 36864L), MaterialsUEVplus.ExcitedDTEC.getFluid(4 * 36864L) }, - com.dreammaster.item.ItemList.GatePlateDimensional.getIS(1), + NHItemList.GatePlateDimensional.getIS(1), 1 * HOURS, (int) TierEU.RECIPE_UXV); TTRecipeAdder.addResearchableAssemblylineRecipe( - com.dreammaster.item.ItemList.ChevronPolychrome.getIS(1), + NHItemList.ChevronPolychrome.getIS(1), 2_000_000_000, 32_768, (int) TierEU.RECIPE_UXV, @@ -841,18 +836,17 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 8L), GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 8L), ItemList.Electric_Motor_UMV.get(64L), ItemList.Electric_Piston_UMV.get(64L), - ItemList.Field_Generator_UMV.get(16L), - com.dreammaster.item.ItemList.QuantumCircuitDimensional.getIS(32), }, + ItemList.Field_Generator_UMV.get(16L), NHItemList.QuantumCircuitDimensional.getIS(32), }, new FluidStack[] { Materials.Neutronium.getMolten(32_768_000L), MaterialsUEVplus.SpaceTime.getMolten(4 * 36864L), Materials.SuperconductorUMVBase.getMolten(4 * 36864L), MaterialsUEVplus.ExcitedDTEC.getFluid(4 * 36864L) }, - com.dreammaster.item.ItemList.ChevronDimensional.getIS(1), + NHItemList.ChevronDimensional.getIS(1), 1 * HOURS, (int) TierEU.RECIPE_UXV); TTRecipeAdder.addResearchableAssemblylineRecipe( - com.dreammaster.item.ItemList.FramePartPolychrome.getIS(1), + NHItemList.FramePartPolychrome.getIS(1), 2_000_000_000, 32_768, (int) TierEU.RECIPE_UXV, @@ -876,13 +870,13 @@ public void run() { MaterialsUEVplus.SpaceTime.getMolten(4 * 36864L), Materials.SuperconductorUMVBase.getMolten(4 * 36864L), MaterialsUEVplus.ExcitedDTEC.getFluid(4 * 36864L) }, - com.dreammaster.item.ItemList.FramePartDimensional.getIS(1), + NHItemList.FramePartDimensional.getIS(1), 1 * HOURS, (int) TierEU.RECIPE_UXV); // EOH Gate TTRecipeAdder.addResearchableAssemblylineRecipe( - com.dreammaster.item.ItemList.GatePlateDimensional.getIS(1), + NHItemList.GatePlateDimensional.getIS(1), (int) TierEU.RECIPE_MAX, 32768, (int) TierEU.RECIPE_UXV, @@ -905,12 +899,12 @@ public void run() { MaterialsUEVplus.SpaceTime.getMolten(4 * 36864L), Materials.SuperconductorUMVBase.getMolten(4 * 36864L), MaterialsUEVplus.ExcitedDTEC.getFluid(4 * 36864L) }, - com.dreammaster.item.ItemList.GatePlateHarmonic.getIS(1), + NHItemList.GatePlateHarmonic.getIS(1), 125_000 * SECONDS, (int) TierEU.RECIPE_UMV); TTRecipeAdder.addResearchableAssemblylineRecipe( - com.dreammaster.item.ItemList.ChevronDimensional.getIS(1), + NHItemList.ChevronDimensional.getIS(1), (int) TierEU.RECIPE_MAX, 32_768, (int) TierEU.RECIPE_UXV, @@ -939,12 +933,12 @@ public void run() { MaterialsUEVplus.SpaceTime.getMolten(4 * 36864L), MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter.getMolten(36864L), MaterialsUEVplus.ExcitedDTEC.getFluid(4 * 36864L) }, - com.dreammaster.item.ItemList.ChevronHarmonic.getIS(1), + NHItemList.ChevronHarmonic.getIS(1), 125_000 * SECONDS, (int) TierEU.RECIPE_UMV); TTRecipeAdder.addResearchableAssemblylineRecipe( - com.dreammaster.item.ItemList.FramePartDimensional.getIS(1), + NHItemList.FramePartDimensional.getIS(1), (int) TierEU.RECIPE_MAX, 32_768, (int) TierEU.RECIPE_UXV, @@ -973,7 +967,7 @@ public void run() { MaterialsUEVplus.SpaceTime.getMolten(4 * 36864L), MaterialsUEVplus.Universium.getMolten(4 * 36864L), MaterialsUEVplus.ExcitedDTEC.getFluid(4 * 36864L) }, - com.dreammaster.item.ItemList.FramePartHarmonic.getIS(1), + NHItemList.FramePartHarmonic.getIS(1), 125_000 * SECONDS, (int) TierEU.RECIPE_UMV); } @@ -1588,7 +1582,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Lanthanum, 64) }, new FluidStack[] { new FluidStack(solderUEV, 3744), Materials.UUMatter.getFluid(8000L), Materials.Osmium.getMolten(1152L) }, - com.dreammaster.item.ItemList.PikoCircuit.getIS(1), + NHItemList.PikoCircuit.getIS(1), 10000, (int) TierEU.RECIPE_UMV); @@ -1609,7 +1603,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Lanthanum, 16) }, new FluidStack[] { new FluidStack(solderUEV, 3744), Materials.UUMatter.getFluid(24000L), Materials.Osmium.getMolten(2304L) }, - com.dreammaster.item.ItemList.QuantumCircuit.getIS(1), + NHItemList.QuantumCircuit.getIS(1), 20000, (int) TierEU.RECIPE_UMV); diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AutoclaveRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AutoclaveRecipes.java index f2147d6eb..c6d5688f8 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AutoclaveRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AutoclaveRecipes.java @@ -1,6 +1,8 @@ package com.dreammaster.gthandler.recipes; -import static gregtech.api.enums.Mods.*; +import static gregtech.api.enums.Mods.EnderZoo; +import static gregtech.api.enums.Mods.GalacticraftMars; +import static gregtech.api.enums.Mods.Gendustry; import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes; import static gregtech.api.util.GTRecipeBuilder.MINUTES; import static gregtech.api.util.GTRecipeBuilder.SECONDS; @@ -10,6 +12,7 @@ import net.minecraftforge.fluids.FluidRegistry; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; @@ -151,8 +154,8 @@ public static void spaceRecipes() { .fluidInputs(Materials.UUMatter.getFluid(250L)).requiresCleanRoom().requiresLowGravity() .duration(10 * MINUTES).eut(TierEU.RECIPE_EV).addTo(autoclaveRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.StargateDustAncients.getIS().splitStack(64)) - .itemOutputs(com.dreammaster.item.ItemList.StargateCrystalAncients.getIS()).outputChances(10000) + GTValues.RA.stdBuilder().itemInputs(NHItemList.StargateDustAncients.getIS().splitStack(64)) + .itemOutputs(NHItemList.StargateCrystalAncients.getIS()).outputChances(10000) .fluidInputs(Materials.Silver.getPlasma(8000L)).requiresCleanRoom().requiresLowGravity() .duration(3 * MINUTES).eut(TierEU.RECIPE_ZPM).addTo(autoclaveRecipes); } diff --git a/src/main/java/com/dreammaster/gthandler/recipes/BlastFurnaceRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/BlastFurnaceRecipes.java index becfc3e6c..eeea07f4e 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/BlastFurnaceRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/BlastFurnaceRecipes.java @@ -14,6 +14,7 @@ import net.minecraft.item.ItemStack; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; @@ -1191,7 +1192,7 @@ public void run() { .itemInputs( GTOreDictUnificator.get(OrePrefixes.dust, Materials.Pentacadmiummagnesiumhexaoxid, 1L), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.Pentacadmiummagnesiumhexaoxid, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Pentacadmiummagnesiumhexaoxid, 1L)) .duration(2 * MINUTES).eut(TierEU.RECIPE_HV).metadata(COIL_HEAT, 2500).addTo(blastFurnaceRecipes); GTValues.RA.stdBuilder() @@ -1611,14 +1612,12 @@ public void run() { if (SGCraft.isModLoaded()) { - GTValues.RA.stdBuilder() - .itemInputs(com.dreammaster.item.ItemList.StargateCrystalDust.getIS().splitStack(64)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.StargateCrystalDust.getIS().splitStack(64)) .fluidInputs(MaterialsUEVplus.StargateCrystalSlurry.getFluid(128_000_000L)) .itemOutputs(GTModHandler.getModItem(SGCraft.ID, "sgCoreCrystal", 1L)).duration(7 * 24 * HOURS * 2) .eut(TierEU.RECIPE_MAX).metadata(COIL_HEAT, 100_000).addTo(blastFurnaceRecipes); // ^ 2 weeks - GTValues.RA.stdBuilder() - .itemInputs(com.dreammaster.item.ItemList.StargateCrystalDust.getIS().splitStack(64)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.StargateCrystalDust.getIS().splitStack(64)) .fluidInputs(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter.getMolten(128_000_000L)) .itemOutputs(GTModHandler.getModItem(SGCraft.ID, "sgControllerCrystal", 1L)) .duration(7 * 24 * HOURS * 2).eut(TierEU.RECIPE_MAX).metadata(COIL_HEAT, 100_000) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/ChemicalReactorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/ChemicalReactorRecipes.java index 35e3c3060..fcf27d64b 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/ChemicalReactorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/ChemicalReactorRecipes.java @@ -25,6 +25,7 @@ import net.minecraftforge.fluids.FluidStack; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; @@ -60,15 +61,13 @@ public void run() { .itemInputs( GTOreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 1L), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(com.dreammaster.item.ItemList.PotassiumHydroxideDust.getIS(3)) - .fluidInputs(Materials.Water.getFluid(3000)).fluidOutputs(Materials.Hydrogen.getGas(1000)) - .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemOutputs(NHItemList.PotassiumHydroxideDust.getIS(3)).fluidInputs(Materials.Water.getFluid(3000)) + .fluidOutputs(Materials.Hydrogen.getGas(1000)).duration(60 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // Rock Salt GTValues.RA.stdBuilder() - .itemInputs( - com.dreammaster.item.ItemList.PotassiumHydroxideDust.getIS(), - GTUtility.getIntegratedCircuit(2)) + .itemInputs(NHItemList.PotassiumHydroxideDust.getIS(), GTUtility.getIntegratedCircuit(2)) .itemOutputs(Materials.RockSalt.getDust(1)).fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) .fluidOutputs(Materials.Water.getFluid(1000)).duration(5 * SECONDS).eut(TierEU.RECIPE_LV) .addTo(UniversalChemical); @@ -561,14 +560,14 @@ public static void multiBlockOnly() { GTValues.RA.stdBuilder() .itemInputs( - com.dreammaster.item.ItemList.RawPicoWafer.getIS(), + NHItemList.RawPicoWafer.getIS(), Materials.MysteriousCrystal.getDust(2), GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.InfinityCatalyst, 1L).copy() .splitStack(0), - com.dreammaster.item.ItemList.TCetiESeaweedExtract.getIS(1)) - .itemOutputs(com.dreammaster.item.ItemList.PicoWafer.getIS()) - .fluidInputs(Materials.Neutronium.getMolten(144L)).duration(2 * MINUTES + 30 * SECONDS) - .eut((GTValues.V[9] - (GTValues.V[9] / 10))).addTo(multiblockChemicalReactorRecipes); + NHItemList.TCetiESeaweedExtract.getIS(1)) + .itemOutputs(NHItemList.PicoWafer.getIS()).fluidInputs(Materials.Neutronium.getMolten(144L)) + .duration(2 * MINUTES + 30 * SECONDS).eut((GTValues.V[9] - (GTValues.V[9] / 10))) + .addTo(multiblockChemicalReactorRecipes); GTValues.RA.stdBuilder() .itemInputs( diff --git a/src/main/java/com/dreammaster/gthandler/recipes/CompressorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/CompressorRecipes.java index 00483c176..eed34fd7e 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/CompressorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/CompressorRecipes.java @@ -33,6 +33,7 @@ import com.dreammaster.block.BlockList; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; @@ -152,11 +153,10 @@ public void run() { .addTo(compressorRecipes); GTValues.RA.stdBuilder().itemInputs(CustomItemList.BioBall.get(1L)) - .itemOutputs(com.dreammaster.item.ItemList.CompressedBioBall.getIS(1)).duration(15 * SECONDS).eut(2) - .addTo(compressorRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.BioOrganicMesh.getIS(1)) - .itemOutputs(com.dreammaster.item.ItemList.BioCarbonPlate.getIS(1)).duration(15 * SECONDS).eut(2) + .itemOutputs(NHItemList.CompressedBioBall.getIS(1)).duration(15 * SECONDS).eut(2) .addTo(compressorRecipes); + GTValues.RA.stdBuilder().itemInputs(NHItemList.BioOrganicMesh.getIS(1)) + .itemOutputs(NHItemList.BioCarbonPlate.getIS(1)).duration(15 * SECONDS).eut(2).addTo(compressorRecipes); GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "reeds", 8, 0, missing)) .itemOutputs(getModItem(IndustrialCraft2.ID, "itemFuelPlantBall", 1, 0, missing)).duration(15 * SECONDS) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/ExtractorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/ExtractorRecipes.java index a5893ea76..766b830d4 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/ExtractorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/ExtractorRecipes.java @@ -15,6 +15,8 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import com.dreammaster.item.NHItemList; + import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -37,8 +39,8 @@ public void run() { for (int i = 0; i < 6; ++i) { GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(GalaxySpace.ID, "tcetiedandelions", 64L, i)) - .itemOutputs(com.dreammaster.item.ItemList.TCetiESeaweedExtract.getIS()).duration(3 * MINUTES) - .eut(262144).addTo(extractorRecipes); + .itemOutputs(NHItemList.TCetiESeaweedExtract.getIS()).duration(3 * MINUTES).eut(262144) + .addTo(extractorRecipes); } } diff --git a/src/main/java/com/dreammaster/gthandler/recipes/FluidSolidifierRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/FluidSolidifierRecipes.java index 9e2336312..54ad5fc01 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/FluidSolidifierRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/FluidSolidifierRecipes.java @@ -14,6 +14,7 @@ import com.dreammaster.gthandler.CustomItemList; import com.dreammaster.gthandler.GT_CustomLoader; +import com.dreammaster.item.NHItemList; import bartworks.common.loaders.ItemRegistry; import gregtech.api.enums.GTValues; @@ -160,59 +161,59 @@ public void run() { } // Making molds - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormAnvil.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormAnvil.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Anvil.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormArrowHead.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormArrowHead.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Arrow.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormBaguette.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormBaguette.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Baguette.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormBall.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormBall.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Ball.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormBlock.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormBlock.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Block.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormBolt.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormBolt.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Bolt.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormBottle.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormBottle.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Bottle.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormBread.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormBread.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Bread.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormBuns.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormBuns.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Bun.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormCasing.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormCasing.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Casing.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormCoinage.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormCoinage.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Credit.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormCylinder.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormCylinder.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Cylinder.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormGear.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormGear.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Gear.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormIngot.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormIngot.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Ingot.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); @@ -220,210 +221,209 @@ public void run() { .itemOutputs(CustomItemList.MarshmallowForm.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormName.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormName.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Name.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormNuggets.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormNuggets.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Nugget.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormPlate.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormPlate.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Plate.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormRing.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormRing.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Ring.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormRound.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormRound.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Round.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormRotor.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormRotor.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Rotor.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormScrew.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormScrew.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Screw.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormSmallGear.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormSmallGear.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Gear_Small.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormStick.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormStick.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Rod.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormStickLong.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormStickLong.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Rod_Long.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormPipeTiny.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormPipeTiny.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Pipe_Tiny.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormPipeSmall.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormPipeSmall.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Pipe_Small.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormPipeMedium.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormPipeMedium.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Pipe_Medium.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormPipeLarge.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormPipeLarge.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Pipe_Large.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormPipeHuge.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormPipeHuge.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Pipe_Huge.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormTurbineBlade.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormTurbineBlade.getIS(1)) .itemOutputs(ItemList.Shape_Mold_Turbine_Blade.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormBoots.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormBoots.getIS(1)) .itemOutputs(CustomItemList.MoldBoots.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormChestplate.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormChestplate.getIS(1)) .itemOutputs(CustomItemList.MoldChestplate.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormLeggings.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormLeggings.getIS(1)) .itemOutputs(CustomItemList.MoldLeggings.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormHelmet.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormHelmet.getIS(1)) .itemOutputs(CustomItemList.MoldHelmet.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.MoldFormDrillHead.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.MoldFormDrillHead.getIS(1)) .itemOutputs(ItemList.Shape_Mold_ToolHeadDrill.get(1)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); // Making shapes - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeBolt.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeBolt.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Bolt.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeHoeHead.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeHoeHead.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Hoe.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeRing.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeRing.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Ring.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeTurbineBlade.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeTurbineBlade.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Turbine_Blade.get(1L)) .fluidInputs(Materials.Steel.getMolten(576L)).duration(20 * TICKS).eut(TierEU.RECIPE_MV) .addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeGear.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeGear.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Gear.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeLargePipe.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeLargePipe.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Pipe_Large.get(1L)) .fluidInputs(Materials.Steel.getMolten(576L)).duration(20 * TICKS).eut(TierEU.RECIPE_MV) .addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeShovelHead.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeShovelHead.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Shovel.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeCell.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeCell.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Cell.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeAxeHead.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeAxeHead.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Axe.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeBlock.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeBlock.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Block.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeSwordBlade.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeSwordBlade.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Sword.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapePlate.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapePlate.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Plate.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeBoat.getIS(1)) - .itemOutputs(com.dreammaster.item.ItemList.ExtruderShapeBoat.getIS(1)) - .fluidInputs(Materials.Steel.getMolten(576L)).duration(20 * TICKS).eut(TierEU.RECIPE_MV) - .addTo(fluidSolidifierRecipes); + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeBoat.getIS(1)) + .itemOutputs(NHItemList.ExtruderShapeBoat.getIS(1)).fluidInputs(Materials.Steel.getMolten(576L)) + .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeCasing.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeCasing.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Casing.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeHugePipe.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeHugePipe.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Pipe_Huge.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeRod.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeRod.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Rod.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeWire.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeWire.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Wire.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeTinyPipe.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeTinyPipe.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Pipe_Tiny.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeHammerHead.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeHammerHead.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Hammer.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeNormalPipe.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeNormalPipe.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Pipe_Medium.get(1L)) .fluidInputs(Materials.Steel.getMolten(576L)).duration(20 * TICKS).eut(TierEU.RECIPE_MV) .addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeFileHead.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeFileHead.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_File.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeBottle.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeBottle.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Bottle.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeSmallGear.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeSmallGear.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Small_Gear.get(1L)) .fluidInputs(Materials.Steel.getMolten(576L)).duration(20 * TICKS).eut(TierEU.RECIPE_MV) .addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeSawBlade.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeSawBlade.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Saw.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeSmallPipe.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeSmallPipe.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Pipe_Small.get(1L)) .fluidInputs(Materials.Steel.getMolten(576L)).duration(20 * TICKS).eut(TierEU.RECIPE_MV) .addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeRotor.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeRotor.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Rotor.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapePickaxeHead.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapePickaxeHead.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Pickaxe.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeIngot.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeIngot.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_Ingot.get(1L)).fluidInputs(Materials.Steel.getMolten(576L)) .duration(20 * TICKS).eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ShapeDrillHead.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ShapeDrillHead.getIS(1)) .itemOutputs(ItemList.Shape_Extruder_ToolHeadDrill.get(1)) .fluidInputs(Materials.Steel.getMolten(576L)).duration(20 * TICKS).eut(TierEU.RECIPE_MV) .addTo(fluidSolidifierRecipes); diff --git a/src/main/java/com/dreammaster/gthandler/recipes/FormingPressRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/FormingPressRecipes.java index 5c7ba9212..5bb8c8fee 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/FormingPressRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/FormingPressRecipes.java @@ -11,6 +11,7 @@ import net.minecraft.item.ItemStack; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; @@ -298,9 +299,8 @@ public void run() { .itemOutputs(ItemList.Shape_Extruder_Turbine_Blade.get(1L)).duration(10 * SECONDS).eut(256) .addTo(formingPressRecipes); - GTValues.RA.stdBuilder() - .itemInputs(ItemList.Shape_Empty.get(1L), com.dreammaster.item.ItemList.ExtruderShapeBoat.getIS(0)) - .itemOutputs(com.dreammaster.item.ItemList.ExtruderShapeBoat.getIS(1)).duration(10 * SECONDS).eut(256) + GTValues.RA.stdBuilder().itemInputs(ItemList.Shape_Empty.get(1L), NHItemList.ExtruderShapeBoat.getIS(0)) + .itemOutputs(NHItemList.ExtruderShapeBoat.getIS(1)).duration(10 * SECONDS).eut(256) .addTo(formingPressRecipes); GTValues.RA.stdBuilder().itemInputs(ItemList.Shape_Empty.get(1L), ItemList.Shape_Extruder_ToolHeadDrill.get(0)) @@ -333,92 +333,92 @@ public void run() { .itemInputs( GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 1), GTUtility.getIntegratedCircuit(24)) - .itemOutputs(com.dreammaster.item.ItemList.CircuitULV.getIS(1)).duration(1 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(formingPressRecipes); + .itemOutputs(NHItemList.CircuitULV.getIS(1)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1), GTUtility.getIntegratedCircuit(24)) - .itemOutputs(com.dreammaster.item.ItemList.CircuitLV.getIS(1)).duration(1 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(formingPressRecipes); + .itemOutputs(NHItemList.CircuitLV.getIS(1)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1), GTUtility.getIntegratedCircuit(24)) - .itemOutputs(com.dreammaster.item.ItemList.CircuitMV.getIS(1)).duration(1 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(formingPressRecipes); + .itemOutputs(NHItemList.CircuitMV.getIS(1)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1), GTUtility.getIntegratedCircuit(24)) - .itemOutputs(com.dreammaster.item.ItemList.CircuitHV.getIS(1)).duration(1 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(formingPressRecipes); + .itemOutputs(NHItemList.CircuitHV.getIS(1)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1), GTUtility.getIntegratedCircuit(24)) - .itemOutputs(com.dreammaster.item.ItemList.CircuitEV.getIS(1)).duration(1 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(formingPressRecipes); + .itemOutputs(NHItemList.CircuitEV.getIS(1)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1), GTUtility.getIntegratedCircuit(24)) - .itemOutputs(com.dreammaster.item.ItemList.CircuitIV.getIS(1)).duration(1 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(formingPressRecipes); + .itemOutputs(NHItemList.CircuitIV.getIS(1)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 1), GTUtility.getIntegratedCircuit(24)) - .itemOutputs(com.dreammaster.item.ItemList.CircuitLuV.getIS(1)).duration(1 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(formingPressRecipes); + .itemOutputs(NHItemList.CircuitLuV.getIS(1)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 1), GTUtility.getIntegratedCircuit(24)) - .itemOutputs(com.dreammaster.item.ItemList.CircuitZPM.getIS(1)).duration(1 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(formingPressRecipes); + .itemOutputs(NHItemList.CircuitZPM.getIS(1)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 1), GTUtility.getIntegratedCircuit(24)) - .itemOutputs(com.dreammaster.item.ItemList.CircuitUV.getIS(1)).duration(1 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(formingPressRecipes); + .itemOutputs(NHItemList.CircuitUV.getIS(1)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 1), GTUtility.getIntegratedCircuit(24)) - .itemOutputs(com.dreammaster.item.ItemList.CircuitUHV.getIS(1)).duration(1 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(formingPressRecipes); + .itemOutputs(NHItemList.CircuitUHV.getIS(1)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UEV, 1), GTUtility.getIntegratedCircuit(24)) - .itemOutputs(com.dreammaster.item.ItemList.CircuitUEV.getIS(1)).duration(1 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(formingPressRecipes); + .itemOutputs(NHItemList.CircuitUEV.getIS(1)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UIV, 1), GTUtility.getIntegratedCircuit(24)) - .itemOutputs(com.dreammaster.item.ItemList.CircuitUIV.getIS(1)).duration(1 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(formingPressRecipes); + .itemOutputs(NHItemList.CircuitUIV.getIS(1)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UMV, 1), GTUtility.getIntegratedCircuit(24)) - .itemOutputs(com.dreammaster.item.ItemList.CircuitUMV.getIS(1)).duration(1 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(formingPressRecipes); + .itemOutputs(NHItemList.CircuitUMV.getIS(1)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, 1), GTUtility.getIntegratedCircuit(24)) - .itemOutputs(com.dreammaster.item.ItemList.CircuitUXV.getIS(1)).duration(1 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(formingPressRecipes); + .itemOutputs(NHItemList.CircuitUXV.getIS(1)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MAX, 1), GTUtility.getIntegratedCircuit(24)) - .itemOutputs(com.dreammaster.item.ItemList.CircuitMAX.getIS(1)).duration(1 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(formingPressRecipes); + .itemOutputs(NHItemList.CircuitMAX.getIS(1)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(formingPressRecipes); if (BloodArsenal.isModLoaded()) { diff --git a/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java index 169263ac6..8a3d12afb 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java @@ -15,6 +15,7 @@ import net.minecraftforge.fluids.FluidStack; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import bartworks.system.material.WerkstoffLoader; import gregtech.api.enums.GTValues; @@ -161,8 +162,8 @@ public void run() { .itemInputs( ItemList.Circuit_Wafer_SoC2.get(1L), GTUtility.copyAmount(0, GTOreDictUnificator.get(OrePrefixes.lens, Materials.NetherStar, 1))) - .itemOutputs(com.dreammaster.item.ItemList.RawPicoWafer.getIS()).requiresCleanRoom() - .duration(5 * MINUTES).eut((GTValues.V[8] - (GTValues.V[8] / 10))).addTo(laserEngraverRecipes); + .itemOutputs(NHItemList.RawPicoWafer.getIS()).requiresCleanRoom().duration(5 * MINUTES) + .eut((GTValues.V[8] - (GTValues.V[8] / 10))).addTo(laserEngraverRecipes); // Optical Boule GTValues.RA.stdBuilder().itemInputs( diff --git a/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java index e4c36f71d..488176ab0 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java @@ -31,6 +31,7 @@ import net.minecraftforge.fluids.FluidStack; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import goodgenerator.items.GGMaterial; import gregtech.api.enums.GTValues; @@ -974,20 +975,20 @@ public void run() { GTUtility.copyAmount(64, Particle.getBaseParticle(Particle.OMEGA)), GTOreDictUnificator.get(OrePrefixes.gem, MaterialsUEVplus.GravitonShard, 4)) .fluidInputs(Materials.Grade8PurifiedWater.getFluid(1_000_000_000L)) - .itemOutputs(com.dreammaster.item.ItemList.StargateCrystalDust.getIS()).duration(3 * MINUTES) - .eut(TierEU.RECIPE_UXV).addTo(mixerRecipes); + .itemOutputs(NHItemList.StargateCrystalDust.getIS()).duration(3 * MINUTES).eut(TierEU.RECIPE_UXV) + .addTo(mixerRecipes); // Legacy Stargate Crystal Dust GTValues.RA.stdBuilder() .itemInputs( - com.dreammaster.item.ItemList.TCetiESeaweedExtract.getIS().splitStack(64), + NHItemList.TCetiESeaweedExtract.getIS().splitStack(64), Materials.Dolomite.getDust(64), Materials.SamariumMagnetic.getDust(21), Materials.ChromiumDioxide.getDust(64), GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Jasper, 54L), GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Opal, 47L)) - .itemOutputs(com.dreammaster.item.ItemList.StargateDustAncients.getIS()).duration(3 * MINUTES) - .eut(262144).addTo(mixerRecipes); + .itemOutputs(NHItemList.StargateDustAncients.getIS()).duration(3 * MINUTES).eut(262144) + .addTo(mixerRecipes); // Astral Silver & Soldering Alloy + reverse diff --git a/src/main/java/com/dreammaster/item/ItemList.java b/src/main/java/com/dreammaster/item/NHItemList.java similarity index 99% rename from src/main/java/com/dreammaster/item/ItemList.java rename to src/main/java/com/dreammaster/item/NHItemList.java index d2c3ec7f4..bf95c2575 100644 --- a/src/main/java/com/dreammaster/item/ItemList.java +++ b/src/main/java/com/dreammaster/item/NHItemList.java @@ -9,7 +9,7 @@ import eu.usrv.yamcore.items.ModItemManager; import eu.usrv.yamcore.items.ModSimpleBaseItem; -public enum ItemList { +public enum NHItemList { MicaBasedPulp(new ModSimpleBaseItem("MicaBasedPulp", ModTabList.ModGenericTab)), MicaBasedSheet(new ModSimpleBaseItem("MicaBasedSheet", ModTabList.ModGenericTab)), @@ -580,7 +580,7 @@ public enum ItemList { // ################################################################################ public ModSimpleBaseItem Item; - ItemList(ModSimpleBaseItem pItem) { + NHItemList(ModSimpleBaseItem pItem) { Item = pItem; if (Item != null) { Item.setModIDName(Refstrings.MODID); @@ -589,7 +589,7 @@ public enum ItemList { public static boolean AddToItemManager(ModItemManager pItemManager) { boolean tResult = true; - for (ItemList il : ItemList.values()) { + for (NHItemList il : NHItemList.values()) { if (il.Item != null) { if (!pItemManager.AddItemToManagedRegistry(il.Item)) { MainRegistry.Logger.error(String.format("Item [%s] failed to register", il.toString())); diff --git a/src/main/java/com/dreammaster/main/MainRegistry.java b/src/main/java/com/dreammaster/main/MainRegistry.java index ae418bd35..ee91bbe69 100644 --- a/src/main/java/com/dreammaster/main/MainRegistry.java +++ b/src/main/java/com/dreammaster/main/MainRegistry.java @@ -52,7 +52,7 @@ import com.dreammaster.gthandler.recipes.DTPFRecipes; import com.dreammaster.item.CustomPatterns; import com.dreammaster.item.ItemBucketList; -import com.dreammaster.item.ItemList; +import com.dreammaster.item.NHItemList; import com.dreammaster.item.WoodenBrickForm; import com.dreammaster.lib.Refstrings; import com.dreammaster.loginhandler.LoginHandler; @@ -216,7 +216,7 @@ public void PreLoad(FMLPreInitializationEvent PreEvent) { // ------------------------------------------------------------ Logger.debug("PRELOAD Create Items"); - if (!ItemList.AddToItemManager(ItemManager) + if (!NHItemList.AddToItemManager(ItemManager) | !(!TinkerConstruct.isModLoaded() || CustomPatterns.RegisterPatterns(TabManager)) | !(BioItemLoader.preInit())) { Logger.warn("Some items failed to register. Check the logfile for details"); diff --git a/src/main/java/com/dreammaster/oredict/OreDictHandler.java b/src/main/java/com/dreammaster/oredict/OreDictHandler.java index 5d29c4ba2..27bd1e495 100644 --- a/src/main/java/com/dreammaster/oredict/OreDictHandler.java +++ b/src/main/java/com/dreammaster/oredict/OreDictHandler.java @@ -15,7 +15,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import com.dreammaster.item.ItemList; +import com.dreammaster.item.NHItemList; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.util.GTModHandler; @@ -28,37 +28,37 @@ public class OreDictHandler { public static void register_space_dust() { - reg_dust(OreDictTypes.Asteroids.name(), ItemList.AsteroidsStoneDust.getIS()); - reg_dust(OreDictTypes.BarnardaE.name(), ItemList.BarnardaEStoneDust.getIS()); - reg_dust(OreDictTypes.BarnardaF.name(), ItemList.BarnardaFStoneDust.getIS()); - reg_dust(OreDictTypes.Callisto.name(), ItemList.CallistoStoneDust.getIS()); - reg_dust(OreDictTypes.CentauriA.name(), ItemList.CentauriAStoneDust.getIS()); - reg_dust(OreDictTypes.CentauriA.name(), ItemList.CentauriASurfaceDust.getIS()); - reg_dust(OreDictTypes.Ceres.name(), ItemList.CeresStoneDust.getIS()); - reg_dust(OreDictTypes.Deimos.name(), ItemList.DeimosStoneDust.getIS()); - reg_dust(OreDictTypes.Enceladus.name(), ItemList.EnceladusStoneDust.getIS()); - reg_dust(OreDictTypes.Enceladus.name(), ItemList.EnceladusIceDust.getIS()); - reg_dust(OreDictTypes.Europa.name(), ItemList.EuropaIceDust.getIS()); - reg_dust(OreDictTypes.Europa.name(), ItemList.EuropaStoneDust.getIS()); - reg_dust(OreDictTypes.Ganymede.name(), ItemList.GanymedeStoneDust.getIS()); - reg_dust(OreDictTypes.Haumea.name(), ItemList.HaumeaStoneDust.getIS()); - reg_dust(OreDictTypes.Io.name(), ItemList.IoStoneDust.getIS()); - reg_dust(OreDictTypes.MakeMake.name(), ItemList.MakeMakeStoneDust.getIS()); - reg_dust(OreDictTypes.Mars.name(), ItemList.MarsStoneDust.getIS()); - reg_dust(OreDictTypes.PlanetMercury.name(), ItemList.MercuryStoneDust.getIS()); - reg_dust(OreDictTypes.PlanetMercury.name(), ItemList.MercuryCoreDust.getIS()); - reg_dust(OreDictTypes.Miranda.name(), ItemList.MirandaStoneDust.getIS()); - reg_dust(OreDictTypes.Moon.name(), ItemList.MoonStoneDust.getIS()); - reg_dust(OreDictTypes.Oberon.name(), ItemList.OberonStoneDust.getIS()); - reg_dust(OreDictTypes.Phobos.name(), ItemList.PhobosStoneDust.getIS()); - reg_dust(OreDictTypes.Pluto.name(), ItemList.PlutoIceDust.getIS()); - reg_dust(OreDictTypes.Pluto.name(), ItemList.PlutoStoneDust.getIS()); - reg_dust(OreDictTypes.Proteus.name(), ItemList.ProteusStoneDust.getIS()); - reg_dust(OreDictTypes.TcetiE.name(), ItemList.TCetiEStoneDust.getIS()); - reg_dust(OreDictTypes.Titan.name(), ItemList.TitanStoneDust.getIS()); - reg_dust(OreDictTypes.Triton.name(), ItemList.TritonStoneDust.getIS()); - reg_dust(OreDictTypes.VegaB.name(), ItemList.VegaBStoneDust.getIS()); - reg_dust(OreDictTypes.Venus.name(), ItemList.VenusStoneDust.getIS()); + reg_dust(OreDictTypes.Asteroids.name(), NHItemList.AsteroidsStoneDust.getIS()); + reg_dust(OreDictTypes.BarnardaE.name(), NHItemList.BarnardaEStoneDust.getIS()); + reg_dust(OreDictTypes.BarnardaF.name(), NHItemList.BarnardaFStoneDust.getIS()); + reg_dust(OreDictTypes.Callisto.name(), NHItemList.CallistoStoneDust.getIS()); + reg_dust(OreDictTypes.CentauriA.name(), NHItemList.CentauriAStoneDust.getIS()); + reg_dust(OreDictTypes.CentauriA.name(), NHItemList.CentauriASurfaceDust.getIS()); + reg_dust(OreDictTypes.Ceres.name(), NHItemList.CeresStoneDust.getIS()); + reg_dust(OreDictTypes.Deimos.name(), NHItemList.DeimosStoneDust.getIS()); + reg_dust(OreDictTypes.Enceladus.name(), NHItemList.EnceladusStoneDust.getIS()); + reg_dust(OreDictTypes.Enceladus.name(), NHItemList.EnceladusIceDust.getIS()); + reg_dust(OreDictTypes.Europa.name(), NHItemList.EuropaIceDust.getIS()); + reg_dust(OreDictTypes.Europa.name(), NHItemList.EuropaStoneDust.getIS()); + reg_dust(OreDictTypes.Ganymede.name(), NHItemList.GanymedeStoneDust.getIS()); + reg_dust(OreDictTypes.Haumea.name(), NHItemList.HaumeaStoneDust.getIS()); + reg_dust(OreDictTypes.Io.name(), NHItemList.IoStoneDust.getIS()); + reg_dust(OreDictTypes.MakeMake.name(), NHItemList.MakeMakeStoneDust.getIS()); + reg_dust(OreDictTypes.Mars.name(), NHItemList.MarsStoneDust.getIS()); + reg_dust(OreDictTypes.PlanetMercury.name(), NHItemList.MercuryStoneDust.getIS()); + reg_dust(OreDictTypes.PlanetMercury.name(), NHItemList.MercuryCoreDust.getIS()); + reg_dust(OreDictTypes.Miranda.name(), NHItemList.MirandaStoneDust.getIS()); + reg_dust(OreDictTypes.Moon.name(), NHItemList.MoonStoneDust.getIS()); + reg_dust(OreDictTypes.Oberon.name(), NHItemList.OberonStoneDust.getIS()); + reg_dust(OreDictTypes.Phobos.name(), NHItemList.PhobosStoneDust.getIS()); + reg_dust(OreDictTypes.Pluto.name(), NHItemList.PlutoIceDust.getIS()); + reg_dust(OreDictTypes.Pluto.name(), NHItemList.PlutoStoneDust.getIS()); + reg_dust(OreDictTypes.Proteus.name(), NHItemList.ProteusStoneDust.getIS()); + reg_dust(OreDictTypes.TcetiE.name(), NHItemList.TCetiEStoneDust.getIS()); + reg_dust(OreDictTypes.Titan.name(), NHItemList.TitanStoneDust.getIS()); + reg_dust(OreDictTypes.Triton.name(), NHItemList.TritonStoneDust.getIS()); + reg_dust(OreDictTypes.VegaB.name(), NHItemList.VegaBStoneDust.getIS()); + reg_dust(OreDictTypes.Venus.name(), NHItemList.VenusStoneDust.getIS()); if (GalaxySpace.isModLoaded()) { Item glowstoneDusts = GameRegistry.findItem(GalaxySpace.ID, "item.GlowstoneDusts"); @@ -174,9 +174,9 @@ public static void reg_additional() { OreDictionary.registerOre("logWood", GameRegistry.findBlock(PamsHarvestTheNether.ID, "netherLog")); } - OreDictionary.registerOre("foodSalt", ItemList.EdibleSalt.getIS()); + OreDictionary.registerOre("foodSalt", NHItemList.EdibleSalt.getIS()); - OreDictionary.registerOre("ingotHotBrickNether", ItemList.HotNetherrackBrick.getIS()); + OreDictionary.registerOre("ingotHotBrickNether", NHItemList.HotNetherrackBrick.getIS()); // Olivine = Peridot for (ItemStack stack : OreDictionary.getOres("blockOlivine")) { diff --git a/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java b/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java index 188a348a4..0c6098b09 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java @@ -27,6 +27,7 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import cpw.mods.fml.common.registry.GameRegistry; import fox.spiteful.avaritia.crafting.ExtremeCraftingManager; @@ -480,7 +481,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 2), CustomItemList.ChargedCertusQuartzDust.get(2), ItemList.Electric_Pump_LV.get(1), - com.dreammaster.item.ItemList.EngineeringProcessorFluidDiamondCore.getIS(1), + NHItemList.EngineeringProcessorFluidDiamondCore.getIS(1), ItemList.Circuit_Board_Basic.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(COMPONENT_1).fluidInputs(Materials.Lead.getMolten(288)).duration(10 * SECONDS) @@ -491,7 +492,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 2), CustomItemList.ChargedCertusQuartzDust.get(2), ItemList.Electric_Pump_LV.get(1), - com.dreammaster.item.ItemList.EngineeringProcessorFluidDiamondCore.getIS(1), + NHItemList.EngineeringProcessorFluidDiamondCore.getIS(1), ItemList.Circuit_Board_Basic.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(COMPONENT_1).fluidInputs(Materials.Tin.getMolten(144)).duration(10 * SECONDS) @@ -502,7 +503,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 2), CustomItemList.ChargedCertusQuartzDust.get(2), ItemList.Electric_Pump_LV.get(1), - com.dreammaster.item.ItemList.EngineeringProcessorFluidDiamondCore.getIS(1), + NHItemList.EngineeringProcessorFluidDiamondCore.getIS(1), ItemList.Circuit_Board_Basic.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(COMPONENT_1).fluidInputs(Materials.SolderingAlloy.getMolten(72)).duration(10 * SECONDS) @@ -514,7 +515,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 4), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 16), ItemList.Electric_Pump_LV.get(2), - com.dreammaster.item.ItemList.EngineeringProcessorFluidDiamondCore.getIS(1), + NHItemList.EngineeringProcessorFluidDiamondCore.getIS(1), ItemList.Circuit_Board_Coated_Basic.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(COMPONENT_4).fluidInputs(Materials.Lead.getMolten(288)).requiresCleanRoom() @@ -525,7 +526,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 4), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 16), ItemList.Electric_Pump_LV.get(2), - com.dreammaster.item.ItemList.EngineeringProcessorFluidDiamondCore.getIS(1), + NHItemList.EngineeringProcessorFluidDiamondCore.getIS(1), ItemList.Circuit_Board_Coated_Basic.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(COMPONENT_4).fluidInputs(Materials.Tin.getMolten(144)).requiresCleanRoom() @@ -536,7 +537,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 4), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 16), ItemList.Electric_Pump_LV.get(2), - com.dreammaster.item.ItemList.EngineeringProcessorFluidDiamondCore.getIS(1), + NHItemList.EngineeringProcessorFluidDiamondCore.getIS(1), ItemList.Circuit_Board_Coated_Basic.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(COMPONENT_4).fluidInputs(Materials.SolderingAlloy.getMolten(72)).requiresCleanRoom() @@ -548,7 +549,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 4), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 16), ItemList.Electric_Pump_MV.get(1), - com.dreammaster.item.ItemList.EngineeringProcessorFluidDiamondCore.getIS(2), + NHItemList.EngineeringProcessorFluidDiamondCore.getIS(2), ItemList.Circuit_Board_Phenolic_Good.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(COMPONENT_16).fluidInputs(Materials.Lead.getMolten(288)).requiresCleanRoom() @@ -559,7 +560,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 4), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 16), ItemList.Electric_Pump_MV.get(1), - com.dreammaster.item.ItemList.EngineeringProcessorFluidDiamondCore.getIS(2), + NHItemList.EngineeringProcessorFluidDiamondCore.getIS(2), ItemList.Circuit_Board_Phenolic_Good.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(COMPONENT_16).fluidInputs(Materials.Tin.getMolten(144)).requiresCleanRoom() @@ -570,7 +571,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 4), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 16), ItemList.Electric_Pump_MV.get(1), - com.dreammaster.item.ItemList.EngineeringProcessorFluidDiamondCore.getIS(2), + NHItemList.EngineeringProcessorFluidDiamondCore.getIS(2), ItemList.Circuit_Board_Phenolic_Good.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(COMPONENT_16).fluidInputs(Materials.SolderingAlloy.getMolten(72)).requiresCleanRoom() @@ -582,7 +583,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 4), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 16), ItemList.Electric_Pump_MV.get(2), - com.dreammaster.item.ItemList.EngineeringProcessorFluidDiamondCore.getIS(4), + NHItemList.EngineeringProcessorFluidDiamondCore.getIS(4), ItemList.Circuit_Board_Epoxy_Advanced.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(COMPONENT_64).fluidInputs(Materials.Lead.getMolten(288)).requiresCleanRoom() @@ -593,7 +594,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 4), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 16), ItemList.Electric_Pump_MV.get(2), - com.dreammaster.item.ItemList.EngineeringProcessorFluidDiamondCore.getIS(4), + NHItemList.EngineeringProcessorFluidDiamondCore.getIS(4), ItemList.Circuit_Board_Epoxy_Advanced.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(COMPONENT_64).fluidInputs(Materials.Tin.getMolten(144)).requiresCleanRoom() @@ -604,7 +605,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 4), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 16), ItemList.Electric_Pump_MV.get(2), - com.dreammaster.item.ItemList.EngineeringProcessorFluidDiamondCore.getIS(4), + NHItemList.EngineeringProcessorFluidDiamondCore.getIS(4), ItemList.Circuit_Board_Epoxy_Advanced.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(COMPONENT_64).fluidInputs(Materials.SolderingAlloy.getMolten(72)).requiresCleanRoom() @@ -616,7 +617,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 4), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 16), ItemList.Electric_Pump_HV.get(1), - com.dreammaster.item.ItemList.EngineeringProcessorFluidEmeraldCore.getIS(1), + NHItemList.EngineeringProcessorFluidEmeraldCore.getIS(1), ItemList.Circuit_Board_Fiberglass_Advanced.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(COMPONENT_256).fluidInputs(Materials.Lead.getMolten(288)).requiresCleanRoom() @@ -627,7 +628,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 4), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 16), ItemList.Electric_Pump_HV.get(1), - com.dreammaster.item.ItemList.EngineeringProcessorFluidEmeraldCore.getIS(1), + NHItemList.EngineeringProcessorFluidEmeraldCore.getIS(1), ItemList.Circuit_Board_Fiberglass_Advanced.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(COMPONENT_256).fluidInputs(Materials.Tin.getMolten(144)).requiresCleanRoom() @@ -638,7 +639,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 4), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 16), ItemList.Electric_Pump_HV.get(1), - com.dreammaster.item.ItemList.EngineeringProcessorFluidEmeraldCore.getIS(1), + NHItemList.EngineeringProcessorFluidEmeraldCore.getIS(1), ItemList.Circuit_Board_Fiberglass_Advanced.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(COMPONENT_256).fluidInputs(Materials.SolderingAlloy.getMolten(72)).requiresCleanRoom() @@ -650,7 +651,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 4), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 16), ItemList.Electric_Pump_HV.get(2), - com.dreammaster.item.ItemList.EngineeringProcessorFluidEmeraldCore.getIS(2), + NHItemList.EngineeringProcessorFluidEmeraldCore.getIS(2), ItemList.Circuit_Board_Multifiberglass_Elite.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(COMPONENT_1024).fluidInputs(Materials.Lead.getMolten(288)).requiresCleanRoom() @@ -661,7 +662,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 4), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 16), ItemList.Electric_Pump_HV.get(2), - com.dreammaster.item.ItemList.EngineeringProcessorFluidEmeraldCore.getIS(2), + NHItemList.EngineeringProcessorFluidEmeraldCore.getIS(2), ItemList.Circuit_Board_Multifiberglass_Elite.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(COMPONENT_1024).fluidInputs(Materials.Tin.getMolten(144)).requiresCleanRoom() @@ -672,7 +673,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 4), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 16), ItemList.Electric_Pump_HV.get(2), - com.dreammaster.item.ItemList.EngineeringProcessorFluidEmeraldCore.getIS(2), + NHItemList.EngineeringProcessorFluidEmeraldCore.getIS(2), ItemList.Circuit_Board_Multifiberglass_Elite.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(COMPONENT_1024).fluidInputs(Materials.SolderingAlloy.getMolten(72)).requiresCleanRoom() @@ -684,7 +685,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 4), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 16), ItemList.Electric_Pump_EV.get(1), - com.dreammaster.item.ItemList.EngineeringProcessorFluidEmeraldCore.getIS(4), + NHItemList.EngineeringProcessorFluidEmeraldCore.getIS(4), ItemList.Circuit_Board_Wetware_Extreme.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(COMPONENT_4096).fluidInputs(Materials.Lead.getMolten(288)).requiresCleanRoom() @@ -695,7 +696,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 4), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 16), ItemList.Electric_Pump_EV.get(1), - com.dreammaster.item.ItemList.EngineeringProcessorFluidEmeraldCore.getIS(4), + NHItemList.EngineeringProcessorFluidEmeraldCore.getIS(4), ItemList.Circuit_Board_Wetware_Extreme.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(COMPONENT_4096).fluidInputs(Materials.Tin.getMolten(144)).requiresCleanRoom() @@ -706,7 +707,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 4), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 16), ItemList.Electric_Pump_EV.get(1), - com.dreammaster.item.ItemList.EngineeringProcessorFluidEmeraldCore.getIS(4), + NHItemList.EngineeringProcessorFluidEmeraldCore.getIS(4), ItemList.Circuit_Board_Wetware_Extreme.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(COMPONENT_4096).fluidInputs(Materials.SolderingAlloy.getMolten(72)).requiresCleanRoom() @@ -718,7 +719,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 4), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 16), ItemList.Electric_Pump_EV.get(2), - com.dreammaster.item.ItemList.EngineeringProcessorFluidEmeraldCore.getIS(8), + NHItemList.EngineeringProcessorFluidEmeraldCore.getIS(8), ItemList.Circuit_Board_Bio_Ultra.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(COMPONENT_16384).fluidInputs(Materials.Lead.getMolten(288)).requiresCleanRoom() @@ -729,7 +730,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 4), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 16), ItemList.Electric_Pump_EV.get(2), - com.dreammaster.item.ItemList.EngineeringProcessorFluidEmeraldCore.getIS(8), + NHItemList.EngineeringProcessorFluidEmeraldCore.getIS(8), ItemList.Circuit_Board_Bio_Ultra.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(COMPONENT_16384).fluidInputs(Materials.Tin.getMolten(144)).requiresCleanRoom() @@ -740,7 +741,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 4), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 16), ItemList.Electric_Pump_EV.get(2), - com.dreammaster.item.ItemList.EngineeringProcessorFluidEmeraldCore.getIS(8), + NHItemList.EngineeringProcessorFluidEmeraldCore.getIS(8), ItemList.Circuit_Board_Bio_Ultra.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(COMPONENT_16384).fluidInputs(Materials.SolderingAlloy.getMolten(72)).requiresCleanRoom() diff --git a/src/main/java/com/dreammaster/scripts/ScriptAmunRa.java b/src/main/java/com/dreammaster/scripts/ScriptAmunRa.java index 753cdef1b..ac4ee15c2 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAmunRa.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAmunRa.java @@ -39,6 +39,7 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; +import com.dreammaster.item.NHItemList; import com.gtnewhorizons.gtnhintergalactic.item.IGItems; import cpw.mods.fml.common.Optional; @@ -167,7 +168,7 @@ public void loadRecipes() { 'P', "plateCosmicNeutronium", 'D', - com.dreammaster.item.ItemList.Display.getIS(), + NHItemList.Display.getIS(), 'C', "circuitInfinite", 'F', @@ -188,7 +189,7 @@ public void loadRecipes() { 'W', "springTungstenSteel", 'D', - com.dreammaster.item.ItemList.Display.getIS(), + NHItemList.Display.getIS(), 'T', "craftingToolScrewdriver", 'P', @@ -235,13 +236,13 @@ public void loadRecipes() { 'H', "craftingToolHardHammer", '8', - com.dreammaster.item.ItemList.HeavyDutyPlateTier8.getIS(), + NHItemList.HeavyDutyPlateTier8.getIS(), 'F', "craftingToolFile", 'L', new ItemStack(baseItem, 1, 15), '4', - com.dreammaster.item.ItemList.HeavyDutyRocketFinsTier4.getIS()); + NHItemList.HeavyDutyRocketFinsTier4.getIS()); addShapedOredictRecipe( new ItemStack(baseItem, 1, 16), "DCH", @@ -250,7 +251,7 @@ public void loadRecipes() { 'D', "craftingToolScrewdriver", 'C', - com.dreammaster.item.ItemList.HeavyDutyNoseConeTier4.getIS(), + NHItemList.HeavyDutyNoseConeTier4.getIS(), 'H', "craftingToolHardHammer", 'S', @@ -313,15 +314,15 @@ public void loadRecipes() { .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - com.dreammaster.item.ItemList.HeavyDutyPlateTier8.getIS(2), + NHItemList.HeavyDutyPlateTier8.getIS(2), new ItemStack(baseItem, 4, 15), - com.dreammaster.item.ItemList.HeavyDutyRocketFinsTier4.getIS(), + NHItemList.HeavyDutyRocketFinsTier4.getIS(), getIntegratedCircuit(5)) .itemOutputs(new ItemStack(baseItem, 1, 14)).duration(2 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - com.dreammaster.item.ItemList.HeavyDutyNoseConeTier4.getIS(), + NHItemList.HeavyDutyNoseConeTier4.getIS(), new ItemStack(baseItem, 4, 15), getIntegratedCircuit(4)) .fluidInputs(Materials.Neutronium.getMolten(QUARTER_INGOT)).itemOutputs(new ItemStack(baseItem, 1, 16)) @@ -359,7 +360,7 @@ public void loadRecipes() { * Implosion Compressor * ************************/ - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.HeavyDutyAlloyIngotT9.getIS()) + GTValues.RA.stdBuilder().itemInputs(NHItemList.HeavyDutyAlloyIngotT9.getIS()) .itemOutputs(new ItemStack(baseItem, 1, 15), Materials.Neutronium.getDustTiny(8)) .metadata(GTRecipeConstants.ADDITIVE_AMOUNT, 64).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); @@ -383,7 +384,7 @@ public void loadRecipes() { (int) TierEU.RECIPE_UHV, 8, new Object[] { ItemList.Hull_MAX.get(1), new ItemStack(baseItem, 32, 28), - com.dreammaster.item.ItemList.IrradiantReinforcedNeutroniumPlate.getIS(64), + NHItemList.IrradiantReinforcedNeutroniumPlate.getIS(64), new ItemStack(GameRegistry.findItem(GalaxySpace.ID, "item.RocketControlComputer"), 4, 8), new Object[] { OrePrefixes.circuit.get(Materials.UHV), 16 }, ItemList.Sensor_UHV.get(8), ItemList.Emitter_UHV.get(8) }, @@ -394,14 +395,14 @@ public void loadRecipes() { 15 * MINUTES, (int) TierEU.RECIPE_UHV); TTRecipeAdder.addResearchableAssemblylineRecipe( - com.dreammaster.item.ItemList.HeavyDutyRocketEngineTier4.getIS(), + NHItemList.HeavyDutyRocketEngineTier4.getIS(), 64000, 64, (int) TierEU.RECIPE_UHV, 8, new Object[] { new ItemStack(dysonSwarmParts, 64, 3), new ItemStack(dysonSwarmParts, 64, 3), new ItemStack(dysonSwarmParts, 64, 3), new ItemStack(dysonSwarmParts, 64, 3), - com.dreammaster.item.ItemList.HeavyDutyRocketEngineTier4.getIS(64), + NHItemList.HeavyDutyRocketEngineTier4.getIS(64), new Object[] { OrePrefixes.pipeHuge.get(Materials.Infinity), 8 }, ItemList.Electric_Pump_UHV.get(16), new Object[] { OrePrefixes.circuit.get(Materials.UHV), 8 }, new ItemStack(baseItem, 4, 27) }, @@ -432,7 +433,7 @@ public void loadRecipes() { 10 * MINUTES, 2500000); TTRecipeAdder.addResearchableAssemblylineRecipe( - com.dreammaster.item.ItemList.Tier4Booster.getIS(), + NHItemList.Tier4Booster.getIS(), 64000, 64, (int) TierEU.RECIPE_UHV, @@ -495,13 +496,13 @@ public void loadRecipes() { // Lightweight Alloy Ingot GTValues.RA.stdBuilder() .itemInputs( - com.dreammaster.item.ItemList.HeavyDutyPlateTier8.getIS(), + NHItemList.HeavyDutyPlateTier8.getIS(), MaterialsKevlar.Kevlar.getPlates(7), MaterialsKevlar.Kevlar.getPlates(7), new Object[] { OrePrefixes.screw.get(Materials.Neutronium), 12 }) .fluidInputs(Materials.RadoxPolymer.getMolten(4 * INGOTS)) - .itemOutputs(com.dreammaster.item.ItemList.HeavyDutyAlloyIngotT9.getIS()) - .metadata(GTRecipeConstants.RESEARCH_ITEM, com.dreammaster.item.ItemList.HeavyDutyPlateTier8.getIS()) + .itemOutputs(NHItemList.HeavyDutyAlloyIngotT9.getIS()) + .metadata(GTRecipeConstants.RESEARCH_ITEM, NHItemList.HeavyDutyPlateTier8.getIS()) .metadata(SCANNING, new Scanning(2 * MINUTES + 20 * SECONDS, TierEU.RECIPE_UV)).duration(15 * SECONDS) .eut(TierEU.RECIPE_UEV).addTo(GTRecipeConstants.AssemblyLine); } diff --git a/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java b/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java index 0c64796e8..7777b11cd 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java @@ -36,6 +36,7 @@ import com.dreammaster.avaritia.AvaritiaHelper; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import fox.spiteful.avaritia.crafting.ExtremeCraftingManager; import gregtech.api.enums.GTValues; @@ -1781,7 +1782,7 @@ public void loadRecipes() { getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 9, missing), "plateGlowstone", getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 9, missing), - com.dreammaster.item.ItemList.EngineeringProcessorSpatialPulsatingCore.getIS(1), + NHItemList.EngineeringProcessorSpatialPulsatingCore.getIS(1), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 9, missing), "plateGlowstone", getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 9, missing), @@ -1792,7 +1793,7 @@ public void loadRecipes() { getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 32, missing), "plateEnderPearl", getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 32, missing), - com.dreammaster.item.ItemList.EngineeringProcessorSpatialPulsatingCore.getIS(1), + NHItemList.EngineeringProcessorSpatialPulsatingCore.getIS(1), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 32, missing), "plateEnderPearl", getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 32, missing), @@ -1803,7 +1804,7 @@ public void loadRecipes() { getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 33, missing), "plateEnderEye", getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 33, missing), - com.dreammaster.item.ItemList.EngineeringProcessorSpatialPulsatingCore.getIS(1), + NHItemList.EngineeringProcessorSpatialPulsatingCore.getIS(1), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 33, missing), "plateEnderEye", getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 33, missing), diff --git a/src/main/java/com/dreammaster/scripts/ScriptBloodMagic.java b/src/main/java/com/dreammaster/scripts/ScriptBloodMagic.java index 41f0199a6..8d0436186 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptBloodMagic.java +++ b/src/main/java/com/dreammaster/scripts/ScriptBloodMagic.java @@ -44,6 +44,7 @@ import com.dreammaster.block.BlockList; import com.dreammaster.bloodmagic.BloodMagicHelper; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import com.dreammaster.thaumcraft.TCHelper; import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; @@ -3693,7 +3694,7 @@ private void orbRecipes() { getModItem(BloodMagic.ID, "transcendentBloodOrb", 1, 0, missing))); GameRegistry.addRecipe( new ShapedBloodOrbRecipe( - com.dreammaster.item.ItemList.Blaster.getIS(1), + NHItemList.Blaster.getIS(1), "abc", "def", "ghi", @@ -4678,9 +4679,8 @@ private void altarAlchemyRecipes() { BindingRegistry.registerRecipe( getModItem(BloodMagic.ID, "boundShovel", 1, 0, missing), getModItem(Thaumcraft.ID, "ItemShovelElemental", 1, 0, missing)); - BindingRegistry.registerRecipe( - getModItem(BloodMagic.ID, "energyBlaster", 1, 0, missing), - com.dreammaster.item.ItemList.Blaster.getIS(1)); + BindingRegistry + .registerRecipe(getModItem(BloodMagic.ID, "energyBlaster", 1, 0, missing), NHItemList.Blaster.getIS(1)); BindingRegistry.registerRecipe( getModItem(BloodMagic.ID, "bloodMagicBaseItems", 1, 0, missing), GTOreDictUnificator.get(OrePrefixes.stick, Materials.NetherQuartz, 1L)); @@ -4949,8 +4949,7 @@ private void altarAlchemyRecipes() { new ItemStack[] { getModItem(BloodMagic.ID, "blankSpell", 1, 0, missing), getModItem(BloodMagic.ID, "weakBloodShard", 1, 0, missing), getModItem(BloodMagic.ID, "weakBloodShard", 1, 0, missing), - com.dreammaster.item.ItemList.EngravedGoldChip.getIS(1), - CustomItemList.EngravedDiamondCrystalChip.get(1L) }, + NHItemList.EngravedGoldChip.getIS(1), CustomItemList.EngravedDiamondCrystalChip.get(1L) }, 3); AlchemyRecipeRegistry.registerRecipe( getModItem(BloodMagic.ID, "bloodMagicBaseItems", 2, 15, missing), diff --git a/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java b/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java index 755177291..d3bbdec45 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java +++ b/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java @@ -48,6 +48,7 @@ import com.dreammaster.block.BlockList; import com.dreammaster.gthandler.CustomItemList; import com.dreammaster.item.CustomPatterns; +import com.dreammaster.item.NHItemList; import com.dreammaster.main.NHItems; import cpw.mods.fml.common.registry.GameRegistry; @@ -104,18 +105,10 @@ public void loadRecipes() { "craftingToolFile", "cobblestone", "craftingToolSaw"); + addShapedRecipe(NHItemList.LongObsidianRod.getIS(2), "craftingToolSaw", "stoneObsidian", "craftingToolFile"); + addShapedRecipe(NHItemList.LongStoneRod.getIS(2), "craftingToolSaw", "stone", "craftingToolFile"); addShapedRecipe( - com.dreammaster.item.ItemList.LongObsidianRod.getIS(2), - "craftingToolSaw", - "stoneObsidian", - "craftingToolFile"); - addShapedRecipe( - com.dreammaster.item.ItemList.LongStoneRod.getIS(2), - "craftingToolSaw", - "stone", - "craftingToolFile"); - addShapedRecipe( - com.dreammaster.item.ItemList.MushroomPowder.getIS(1), + NHItemList.MushroomPowder.getIS(1), "listAllmushroom", null, null, @@ -137,7 +130,7 @@ public void loadRecipes() { "craftingToolScrewdriver", "screwIron"); addShapedRecipe( - com.dreammaster.item.ItemList.LaserEmitter.getIS(1), + NHItemList.LaserEmitter.getIS(1), "itemCasingTitanium", "lensRuby", "itemCasingTitanium", @@ -148,7 +141,7 @@ public void loadRecipes() { "plateAlloyAdvanced", "plateAlloyAdvanced"); addShapedRecipe( - com.dreammaster.item.ItemList.DiamondDrillTip.getIS(1), + NHItemList.DiamondDrillTip.getIS(1), "plateDiamond", "plateSteel", "plateDiamond", @@ -159,7 +152,7 @@ public void loadRecipes() { "craftingToolHardHammer", "plateSteel"); addShapedRecipe( - com.dreammaster.item.ItemList.ReinforcedIridiumDrillTip.getIS(1), + NHItemList.ReinforcedIridiumDrillTip.getIS(1), "plateAlloyIridium", "plateSteel", "plateAlloyIridium", @@ -170,7 +163,7 @@ public void loadRecipes() { "craftingToolHardHammer", "plateSteel"); addShapedRecipe( - com.dreammaster.item.ItemList.SawBladeDiamond.getIS(1), + NHItemList.SawBladeDiamond.getIS(1), "plateDiamond", "plateDiamond", null, @@ -178,7 +171,7 @@ public void loadRecipes() { "craftingToolHardHammer", null); addShapedRecipe( - com.dreammaster.item.ItemList.SawBladeStone.getIS(1), + NHItemList.SawBladeStone.getIS(1), "plateStone", "plateStone", null, @@ -186,7 +179,7 @@ public void loadRecipes() { "craftingToolHardHammer", null); addShapedRecipe( - com.dreammaster.item.ItemList.SawBladeArdite.getIS(1), + NHItemList.SawBladeArdite.getIS(1), "plateArdite", "plateArdite", null, @@ -194,7 +187,7 @@ public void loadRecipes() { "craftingToolHardHammer", null); addShapedRecipe( - com.dreammaster.item.ItemList.SawBladeManyullyn.getIS(1), + NHItemList.SawBladeManyullyn.getIS(1), "plateManyullyn", "plateManyullyn", null, @@ -202,7 +195,7 @@ public void loadRecipes() { "craftingToolHardHammer", null); addShapedRecipe( - com.dreammaster.item.ItemList.SawBladeRuby.getIS(1), + NHItemList.SawBladeRuby.getIS(1), "plateRuby", "plateRuby", null, @@ -210,7 +203,7 @@ public void loadRecipes() { "craftingToolHardHammer", null); addShapedRecipe( - com.dreammaster.item.ItemList.SawBladeSapphire.getIS(1), + NHItemList.SawBladeSapphire.getIS(1), "plateSapphire", "plateSapphire", null, @@ -218,7 +211,7 @@ public void loadRecipes() { "craftingToolHardHammer", null); addShapedRecipe( - com.dreammaster.item.ItemList.SawBladePeridot.getIS(1), + NHItemList.SawBladePeridot.getIS(1), "plateOlivine", "plateOlivine", null, @@ -578,7 +571,7 @@ public void loadRecipes() { "stickDiamond", "stickDiamond"); addShapedRecipe( - com.dreammaster.item.ItemList.MoldFormCoinage.getIS(1), + NHItemList.MoldFormCoinage.getIS(1), null, null, null, @@ -593,301 +586,301 @@ public void loadRecipes() { .addSmeltingRecipe(CustomItemList.UnfiredCokeOvenBrick.get(1L), CustomItemList.CokeOvenBrick.get(1L)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeBolt.getIS(), + NHItemList.ShapeBolt.getIS(), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeHoeHead.getIS(), + NHItemList.ShapeHoeHead.getIS(), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeGear.getIS(), + NHItemList.ShapeGear.getIS(), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapePlate.getIS(), + NHItemList.ShapePlate.getIS(), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormAnvil.getIS(), + NHItemList.MoldFormAnvil.getIS(), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormPlate.getIS(), + NHItemList.MoldFormPlate.getIS(), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormLeggings.getIS(), + NHItemList.MoldFormLeggings.getIS(), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormBaguette.getIS(), + NHItemList.MoldFormBaguette.getIS(), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormGear.getIS(), + NHItemList.MoldFormGear.getIS(), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormRotor.getIS(), + NHItemList.MoldFormRotor.getIS(), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeBottle.getIS(), + NHItemList.ShapeBottle.getIS(), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeRotor.getIS(), + NHItemList.ShapeRotor.getIS(), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeTurbineBlade.getIS(), + NHItemList.ShapeTurbineBlade.getIS(), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeSmallGear.getIS(), + NHItemList.ShapeSmallGear.getIS(), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormBoots.getIS(), + NHItemList.MoldFormBoots.getIS(), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeLargePipe.getIS(), + NHItemList.ShapeLargePipe.getIS(), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormSmallGear.getIS(1), + NHItemList.MoldFormSmallGear.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormCasing.getIS(1), + NHItemList.MoldFormCasing.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeWire.getIS(1), + NHItemList.ShapeWire.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormChestplate.getIS(1), + NHItemList.MoldFormChestplate.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeShovelHead.getIS(1), + NHItemList.ShapeShovelHead.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormBread.getIS(1), + NHItemList.MoldFormBread.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeIngot.getIS(1), + NHItemList.ShapeIngot.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormIngot.getIS(1), + NHItemList.MoldFormIngot.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeFileHead.getIS(1), + NHItemList.ShapeFileHead.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeRod.getIS(1), + NHItemList.ShapeRod.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeHugePipe.getIS(1), + NHItemList.ShapeHugePipe.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeSwordBlade.getIS(1), + NHItemList.ShapeSwordBlade.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeRing.getIS(1), + NHItemList.ShapeRing.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeCasing.getIS(1), + NHItemList.ShapeCasing.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormNuggets.getIS(1), + NHItemList.MoldFormNuggets.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeSmallPipe.getIS(1), + NHItemList.ShapeSmallPipe.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormName.getIS(1), + NHItemList.MoldFormName.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeHammerHead.getIS(1), + NHItemList.ShapeHammerHead.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeTinyPipe.getIS(1), + NHItemList.ShapeTinyPipe.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormCylinder.getIS(1), + NHItemList.MoldFormCylinder.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormBottle.getIS(1), + NHItemList.MoldFormBottle.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeAxeHead.getIS(1), + NHItemList.ShapeAxeHead.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeSawBlade.getIS(1), + NHItemList.ShapeSawBlade.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormBlock.getIS(1), + NHItemList.MoldFormBlock.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeCell.getIS(1), + NHItemList.ShapeCell.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormArrowHead.getIS(1), + NHItemList.MoldFormArrowHead.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeBoat.getIS(1), + NHItemList.ShapeBoat.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormCoinage.getIS(1), + NHItemList.MoldFormCoinage.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormBall.getIS(1), + NHItemList.MoldFormBall.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeBlock.getIS(1), + NHItemList.ShapeBlock.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormHelmet.getIS(1), + NHItemList.MoldFormHelmet.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapePickaxeHead.getIS(1), + NHItemList.ShapePickaxeHead.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormBuns.getIS(1), + NHItemList.MoldFormBuns.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ShapeNormalPipe.getIS(1), + NHItemList.ShapeNormalPipe.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, @@ -899,73 +892,73 @@ public void loadRecipes() { 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormStick.getIS(1), + NHItemList.MoldFormStick.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormStickLong.getIS(1), + NHItemList.MoldFormStickLong.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormScrew.getIS(1), + NHItemList.MoldFormScrew.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormRing.getIS(1), + NHItemList.MoldFormRing.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormBolt.getIS(1), + NHItemList.MoldFormBolt.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormRound.getIS(1), + NHItemList.MoldFormRound.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormTurbineBlade.getIS(1), + NHItemList.MoldFormTurbineBlade.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormPipeTiny.getIS(1), + NHItemList.MoldFormPipeTiny.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormPipeSmall.getIS(1), + NHItemList.MoldFormPipeSmall.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormPipeMedium.getIS(1), + NHItemList.MoldFormPipeMedium.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormPipeLarge.getIS(1), + NHItemList.MoldFormPipeLarge.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); Smeltery.addMelting( - com.dreammaster.item.ItemList.MoldFormPipeHuge.getIS(1), + NHItemList.MoldFormPipeHuge.getIS(1), GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, @@ -990,33 +983,33 @@ public void loadRecipes() { 'e', getModItem(Minecraft.ID, "piston", 1, 0, missing)); TConstructRegistry.getTableCasting().addCastingRecipe( - com.dreammaster.item.ItemList.ExtruderShapeBoat.getIS(1), + NHItemList.ExtruderShapeBoat.getIS(1), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeBoat.getIS(1), + NHItemList.ShapeBoat.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( CustomItemList.MoldBoots.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormBoots.getIS(1), + NHItemList.MoldFormBoots.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( CustomItemList.MoldChestplate.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormChestplate.getIS(1), + NHItemList.MoldFormChestplate.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( CustomItemList.MoldHelmet.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormHelmet.getIS(1), + NHItemList.MoldFormHelmet.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( CustomItemList.MoldLeggings.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormLeggings.getIS(1), + NHItemList.MoldFormLeggings.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( @@ -1042,11 +1035,11 @@ public void loadRecipes() { .itemInputs( getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1, 4, missing), GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Naquadria, 1L)) - .itemOutputs(com.dreammaster.item.ItemList.EnrichedNaquadriaSunnariumAlloy.getIS(1)) - .duration(1 * MINUTES + 40 * SECONDS).eut(TierEU.RECIPE_UV).addTo(assemblerRecipes); + .itemOutputs(NHItemList.EnrichedNaquadriaSunnariumAlloy.getIS(1)).duration(1 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_UV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - com.dreammaster.item.ItemList.EnrichedNaquadriaSunnariumAlloy.getIS(1), + NHItemList.EnrichedNaquadriaSunnariumAlloy.getIS(1), GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 1L)) .itemOutputs( getModItem( @@ -1058,10 +1051,10 @@ public void loadRecipes() { .duration(2 * MINUTES).eut(TierEU.RECIPE_UHV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - com.dreammaster.item.ItemList.EnrichedNaquadriaNeutroniumSunnariumAlloy.getIS(1), + NHItemList.EnrichedNaquadriaNeutroniumSunnariumAlloy.getIS(1), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Bedrockium, 18)) - .itemOutputs(com.dreammaster.item.ItemList.EnrichedXSunnariumAlloy.getIS(1)) - .duration(2 * MINUTES + 20 * SECONDS).eut(TierEU.RECIPE_UEV).addTo(assemblerRecipes); + .itemOutputs(NHItemList.EnrichedXSunnariumAlloy.getIS(1)).duration(2 * MINUTES + 20 * SECONDS) + .eut(TierEU.RECIPE_UEV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -1150,18 +1143,14 @@ public void loadRecipes() { .itemInputs( getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 2, 6, missing), getModItem(GalacticraftCore.ID, "item.basicItem", 2, 14, missing)) - .itemOutputs(com.dreammaster.item.ItemList.LightBinding.getIS(1)).duration(30 * SECONDS).eut(480) - .addTo(assemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs(com.dreammaster.item.ItemList.RawBioFiber.getIS(2), GTUtility.getIntegratedCircuit(2)) - .itemOutputs(com.dreammaster.item.ItemList.BioOrganicMesh.getIS(1)).duration(40 * SECONDS).eut(2) - .addTo(assemblerRecipes); + .itemOutputs(NHItemList.LightBinding.getIS(1)).duration(30 * SECONDS).eut(480).addTo(assemblerRecipes); + GTValues.RA.stdBuilder().itemInputs(NHItemList.RawBioFiber.getIS(2), GTUtility.getIntegratedCircuit(2)) + .itemOutputs(NHItemList.BioOrganicMesh.getIS(1)).duration(40 * SECONDS).eut(2).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1L), - com.dreammaster.item.ItemList.CompressedBioBall.getIS(8)) - .itemOutputs(com.dreammaster.item.ItemList.BioChunk.getIS(1)).duration(1 * MINUTES).eut(64) - .addTo(assemblerRecipes); + NHItemList.CompressedBioBall.getIS(8)) + .itemOutputs(NHItemList.BioChunk.getIS(1)).duration(1 * MINUTES).eut(64).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.stick, Materials.Diamond, 4L), @@ -1178,12 +1167,12 @@ public void loadRecipes() { .itemInputs( getModItem(RemoteIO.ID, "item.chip.location", 1, 0, missing), getModItem(RemoteIO.ID, "item.blank_plate", 1, 0, missing)) - .itemOutputs(com.dreammaster.item.ItemList.BlankPlatedChip.getIS(1)).duration(5 * SECONDS).eut(480) + .itemOutputs(NHItemList.BlankPlatedChip.getIS(1)).duration(5 * SECONDS).eut(480) .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24, missing), - com.dreammaster.item.ItemList.PulsatingSpatialCoreChip.getIS(1)) + NHItemList.PulsatingSpatialCoreChip.getIS(1)) .itemOutputs( getModItem( NewHorizonsCoreMod.ID, @@ -1195,37 +1184,37 @@ public void loadRecipes() { GTValues.RA.stdBuilder() .itemInputs( getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24, missing), - com.dreammaster.item.ItemList.DiamondFluidCoreChip.getIS(1)) - .itemOutputs(com.dreammaster.item.ItemList.EngineeringProcessorFluidDiamondCore.getIS(1)) - .duration(5 * SECONDS).eut(1920).addTo(assemblerRecipes); + NHItemList.DiamondFluidCoreChip.getIS(1)) + .itemOutputs(NHItemList.EngineeringProcessorFluidDiamondCore.getIS(1)).duration(5 * SECONDS).eut(1920) + .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24, missing), - com.dreammaster.item.ItemList.EmeraldAdvancedFluidCoreChip.getIS(1)) - .itemOutputs(com.dreammaster.item.ItemList.EngineeringProcessorFluidEmeraldCore.getIS(1)) - .duration(5 * SECONDS).eut(7680).addTo(assemblerRecipes); + NHItemList.EmeraldAdvancedFluidCoreChip.getIS(1)) + .itemOutputs(NHItemList.EngineeringProcessorFluidEmeraldCore.getIS(1)).duration(5 * SECONDS).eut(7680) + .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 22, missing), - com.dreammaster.item.ItemList.GoldCoreChip.getIS(1)) + NHItemList.GoldCoreChip.getIS(1)) .itemOutputs(CustomItemList.LogicProcessorItemGoldCore.get(1L)).duration(5 * SECONDS).eut(480) .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24, missing), - com.dreammaster.item.ItemList.DiamondCoreChip.getIS(1)) + NHItemList.DiamondCoreChip.getIS(1)) .itemOutputs(CustomItemList.EngineeringProcessorItemDiamondCore.get(1L)).duration(5 * SECONDS).eut(1920) .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24, missing), - com.dreammaster.item.ItemList.EmeraldAdvancedCoreChip.getIS(1)) + NHItemList.EmeraldAdvancedCoreChip.getIS(1)) .itemOutputs(CustomItemList.EngineeringProcessorItemEmeraldCore.get(1L)).duration(5 * SECONDS).eut(7680) .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24, missing), - com.dreammaster.item.ItemList.EmeraldHighAdvancedCoreChip.getIS(1)) + NHItemList.EmeraldHighAdvancedCoreChip.getIS(1)) .itemOutputs(CustomItemList.EngineeringProcessorItemAdvEmeraldCore.get(1L)).duration(5 * SECONDS) .eut(30720).addTo(assemblerRecipes); GTValues.RA.stdBuilder() @@ -1298,7 +1287,7 @@ public void loadRecipes() { GTValues.RA.stdBuilder() .itemInputs( CustomItemList.ReinforcedNaquadriaIronPlate.get(1L), - com.dreammaster.item.ItemList.EnrichedNaquadriaSunnariumAlloy.getIS(1), + NHItemList.EnrichedNaquadriaSunnariumAlloy.getIS(1), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Quantium, 1L), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 2L), GTOreDictUnificator.get(OrePrefixes.screw, Materials.RedAlloy, 4L)) @@ -1308,7 +1297,7 @@ public void loadRecipes() { GTValues.RA.stdBuilder() .itemInputs( CustomItemList.ReinforcedNeutroniumIronPlate.get(1L), - com.dreammaster.item.ItemList.EnrichedNaquadriaNeutroniumSunnariumAlloy.getIS(1), + NHItemList.EnrichedNaquadriaNeutroniumSunnariumAlloy.getIS(1), GTOreDictUnificator.get(OrePrefixes.plate, Materials.MysteriousCrystal, 1L), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 2L), GTOreDictUnificator.get(OrePrefixes.screw, Materials.RedAlloy, 4L)) @@ -1318,7 +1307,7 @@ public void loadRecipes() { GTValues.RA.stdBuilder() .itemInputs( CustomItemList.ReinforcedBedrockiumIronPlate.get(1L), - com.dreammaster.item.ItemList.EnrichedXSunnariumAlloy.getIS(1), + NHItemList.EnrichedXSunnariumAlloy.getIS(1), GTOreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 1L), GTOreDictUnificator.get(OrePrefixes.plate, Materials.InfinityCatalyst, 2L), GTOreDictUnificator.get(OrePrefixes.screw, Materials.RedAlloy, 4L)) @@ -1330,19 +1319,19 @@ public void loadRecipes() { .fluidInputs(FluidRegistry.getFluidStack("molten.void", 288)).duration(1 * MINUTES).eut(480) .addTo(autoclaveRecipes); GTValues.RA.stdBuilder().itemInputs(getModItem(IndustrialCraft2.ID, "itemFuelPlantBall", 16, 0, missing)) - .itemOutputs(com.dreammaster.item.ItemList.RawBioFiber.getIS(1)).outputChances(3300) + .itemOutputs(NHItemList.RawBioFiber.getIS(1)).outputChances(3300) .fluidInputs(FluidRegistry.getFluidStack("ic2biomass", 8)).duration(10 * SECONDS).eut(20) .addTo(autoclaveRecipes); GTValues.RA.stdBuilder().itemInputs(getModItem(IndustrialCraft2.ID, "itemFuelPlantBall", 16, 0, missing)) - .itemOutputs(com.dreammaster.item.ItemList.RawBioFiber.getIS(1)).outputChances(5000) + .itemOutputs(NHItemList.RawBioFiber.getIS(1)).outputChances(5000) .fluidInputs(FluidRegistry.getFluidStack("methanol", 8)).duration(7 * SECONDS + 10 * TICKS).eut(20) .addTo(autoclaveRecipes); GTValues.RA.stdBuilder().itemInputs(getModItem(IndustrialCraft2.ID, "itemFuelPlantBall", 16, 0, missing)) - .itemOutputs(com.dreammaster.item.ItemList.RawBioFiber.getIS(1)).outputChances(9000) + .itemOutputs(NHItemList.RawBioFiber.getIS(1)).outputChances(9000) .fluidInputs(FluidRegistry.getFluidStack("fuel", 8)).duration(5 * SECONDS).eut(20) .addTo(autoclaveRecipes); GTValues.RA.stdBuilder().itemInputs(getModItem(IndustrialCraft2.ID, "itemFuelPlantBall", 16, 0, missing)) - .itemOutputs(com.dreammaster.item.ItemList.RawBioFiber.getIS(1)).outputChances(10000) + .itemOutputs(NHItemList.RawBioFiber.getIS(1)).outputChances(10000) .fluidInputs(FluidRegistry.getFluidStack("nitrofuel", 8)).duration(2 * SECONDS + 10 * TICKS).eut(20) .addTo(autoclaveRecipes); GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1L)) @@ -1462,43 +1451,43 @@ public void loadRecipes() { .itemInputs( GTUtility.copyAmount(0L, GTOreDictUnificator.get(OrePrefixes.lens, Materials.Tanzanite, 1L)), CustomItemList.ManyullynCrystal.get(1L)) - .itemOutputs(com.dreammaster.item.ItemList.EngravedManyullynCrystalChip.getIS(1)).duration(45 * SECONDS) - .eut(7680).addTo(laserEngraverRecipes); + .itemOutputs(NHItemList.EngravedManyullynCrystalChip.getIS(1)).duration(45 * SECONDS).eut(7680) + .addTo(laserEngraverRecipes); GTValues.RA.stdBuilder() .itemInputs( GTUtility.copyAmount(0L, GTOreDictUnificator.get(OrePrefixes.lens, Materials.Amethyst, 1L)), CustomItemList.ManyullynCrystal.get(1L)) - .itemOutputs(com.dreammaster.item.ItemList.EngravedManyullynCrystalChip.getIS(1)).duration(45 * SECONDS) - .eut(7680).addTo(laserEngraverRecipes); + .itemOutputs(NHItemList.EngravedManyullynCrystalChip.getIS(1)).duration(45 * SECONDS).eut(7680) + .addTo(laserEngraverRecipes); GTValues.RA.stdBuilder() .itemInputs( GTUtility.copyAmount(0L, GTOreDictUnificator.get(OrePrefixes.lens, Materials.NetherStar, 1L)), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L)) - .itemOutputs(com.dreammaster.item.ItemList.EngravedGoldChip.getIS(1)).duration(5 * SECONDS).eut(120) + .itemOutputs(NHItemList.EngravedGoldChip.getIS(1)).duration(5 * SECONDS).eut(120) .addTo(laserEngraverRecipes); GTValues.RA.stdBuilder() .itemInputs( GTUtility.copyAmount(0L, GTOreDictUnificator.get(OrePrefixes.lens, Materials.Dilithium, 1L)), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L)) - .itemOutputs(com.dreammaster.item.ItemList.EngravedGoldChip.getIS(1)).duration(5 * SECONDS).eut(120) + .itemOutputs(NHItemList.EngravedGoldChip.getIS(1)).duration(5 * SECONDS).eut(120) .addTo(laserEngraverRecipes); GTValues.RA.stdBuilder() .itemInputs( GTUtility.copyAmount(0L, GTOreDictUnificator.get(OrePrefixes.lens, Materials.InfusedOrder, 1L)), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L)) - .itemOutputs(com.dreammaster.item.ItemList.EngravedGoldChip.getIS(1)).duration(5 * SECONDS).eut(120) + .itemOutputs(NHItemList.EngravedGoldChip.getIS(1)).duration(5 * SECONDS).eut(120) .addTo(laserEngraverRecipes); GTValues.RA.stdBuilder() .itemInputs( GTUtility.copyAmount(0L, GTOreDictUnificator.get(OrePrefixes.lens, Materials.Glass, 1L)), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L)) - .itemOutputs(com.dreammaster.item.ItemList.EngravedGoldChip.getIS(1)).duration(5 * SECONDS).eut(120) + .itemOutputs(NHItemList.EngravedGoldChip.getIS(1)).duration(5 * SECONDS).eut(120) .addTo(laserEngraverRecipes); GTValues.RA.stdBuilder() .itemInputs( GTUtility.copyAmount(0L, GTOreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1L)), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L)) - .itemOutputs(com.dreammaster.item.ItemList.EngravedGoldChip.getIS(1)).duration(5 * SECONDS).eut(120) + .itemOutputs(NHItemList.EngravedGoldChip.getIS(1)).duration(5 * SECONDS).eut(120) .addTo(laserEngraverRecipes); GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(3)) .fluidInputs(FluidRegistry.getFluidStack("fermentedbacterialsludge", 100)) @@ -1514,13 +1503,12 @@ public void loadRecipes() { .itemInputs( getModItem(TinkerConstruct.ID, "materials", 2, 4, missing), ItemList.Shape_Extruder_Saw.get(0L)) - .itemOutputs(com.dreammaster.item.ItemList.SawBladeArdite.getIS(1)).duration(20 * SECONDS).eut(120) - .addTo(extruderRecipes); + .itemOutputs(NHItemList.SawBladeArdite.getIS(1)).duration(20 * SECONDS).eut(120).addTo(extruderRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(TinkerConstruct.ID, "materials", 2, 5, missing), ItemList.Shape_Extruder_Saw.get(0L)) - .itemOutputs(com.dreammaster.item.ItemList.SawBladeManyullyn.getIS(1)).duration(30 * SECONDS).eut(120) + .itemOutputs(NHItemList.SawBladeManyullyn.getIS(1)).duration(30 * SECONDS).eut(120) .addTo(extruderRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -1578,58 +1566,58 @@ public void loadRecipes() { .addTo(extruderRecipes); GTValues.RA.stdBuilder() .itemInputs( - com.dreammaster.item.ItemList.EngravedManyullynCrystalChip.getIS(1), + NHItemList.EngravedManyullynCrystalChip.getIS(1), getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1, 4, missing)) - .itemOutputs(com.dreammaster.item.ItemList.PulsatingSpatialCoreChip.getIS(1)).duration(15 * SECONDS) - .eut(7680).addTo(formingPressRecipes); + .itemOutputs(NHItemList.PulsatingSpatialCoreChip.getIS(1)).duration(15 * SECONDS).eut(7680) + .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( ItemList.Circuit_Parts_Crystal_Chip_Master.get(1L), getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1, 3, missing)) - .itemOutputs(com.dreammaster.item.ItemList.DiamondFluidCoreChip.getIS(1)).duration(15 * SECONDS) - .eut(480).addTo(formingPressRecipes); + .itemOutputs(NHItemList.DiamondFluidCoreChip.getIS(1)).duration(15 * SECONDS).eut(480) + .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( ItemList.Circuit_Parts_Crystal_Chip_Master.get(1L), getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1, 7, missing)) - .itemOutputs(com.dreammaster.item.ItemList.EmeraldAdvancedFluidCoreChip.getIS(1)).duration(15 * SECONDS) - .eut(1024).addTo(formingPressRecipes); + .itemOutputs(NHItemList.EmeraldAdvancedFluidCoreChip.getIS(1)).duration(15 * SECONDS).eut(1024) + .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( - com.dreammaster.item.ItemList.EngravedGoldChip.getIS(1), + NHItemList.EngravedGoldChip.getIS(1), getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1, 2, missing)) - .itemOutputs(com.dreammaster.item.ItemList.GoldCoreChip.getIS(1)).duration(15 * SECONDS).eut(256) + .itemOutputs(NHItemList.GoldCoreChip.getIS(1)).duration(15 * SECONDS).eut(256) .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( CustomItemList.EngravedDiamondCrystalChip.get(1L), getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1, 3, missing)) - .itemOutputs(com.dreammaster.item.ItemList.DiamondCoreChip.getIS(1)).duration(15 * SECONDS).eut(480) + .itemOutputs(NHItemList.DiamondCoreChip.getIS(1)).duration(15 * SECONDS).eut(480) .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( CustomItemList.EngravedEnergyChip.get(1L), getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1, 7, missing)) - .itemOutputs(com.dreammaster.item.ItemList.EmeraldAdvancedCoreChip.getIS(1)).duration(15 * SECONDS) - .eut(1024).addTo(formingPressRecipes); + .itemOutputs(NHItemList.EmeraldAdvancedCoreChip.getIS(1)).duration(15 * SECONDS).eut(1024) + .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( CustomItemList.EngravedQuantumChip.get(1L), getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1, 7, missing)) - .itemOutputs(com.dreammaster.item.ItemList.EmeraldHighAdvancedCoreChip.getIS(1)).duration(15 * SECONDS) - .eut(4096).addTo(formingPressRecipes); + .itemOutputs(NHItemList.EmeraldHighAdvancedCoreChip.getIS(1)).duration(15 * SECONDS).eut(4096) + .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( ItemList.Circuit_Parts_Crystal_Chip_Elite.get(1L), getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1, 4, missing)) - .itemOutputs(com.dreammaster.item.ItemList.GeneticCircuit.getIS(1)).duration(15 * SECONDS).eut(480) + .itemOutputs(NHItemList.GeneticCircuit.getIS(1)).duration(15 * SECONDS).eut(480) .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( ItemList.Circuit_Parts_Crystal_Chip_Elite.get(1L), getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1, 3, missing)) - .itemOutputs(com.dreammaster.item.ItemList.EnvironmentalCircuit.getIS(1)).duration(15 * SECONDS) - .eut(480).addTo(formingPressRecipes); + .itemOutputs(NHItemList.EnvironmentalCircuit.getIS(1)).duration(15 * SECONDS).eut(480) + .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2L), @@ -1685,11 +1673,9 @@ public void loadRecipes() { .itemOutputs(CustomItemList.BedrockiumIronPlate.get(1L)).duration(30 * SECONDS).eut(TierEU.RECIPE_UEV) .addTo(formingPressRecipes); GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "obsidian", 1, 0, missing)) - .itemOutputs(com.dreammaster.item.ItemList.LongObsidianRod.getIS(4)).duration(32 * SECONDS).eut(16) - .addTo(latheRecipes); + .itemOutputs(NHItemList.LongObsidianRod.getIS(4)).duration(32 * SECONDS).eut(16).addTo(latheRecipes); GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "stone", 1, 0, missing)) - .itemOutputs(com.dreammaster.item.ItemList.LongStoneRod.getIS(4)).duration(16 * SECONDS).eut(16) - .addTo(latheRecipes); + .itemOutputs(NHItemList.LongStoneRod.getIS(4)).duration(16 * SECONDS).eut(16).addTo(latheRecipes); GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "sandstone", 1, wildcard, missing)) .itemOutputs(CustomItemList.SandStoneRod.get(1L)).duration(8 * SECONDS).eut(16).addTo(latheRecipes); GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "cobblestone", 1, 0, missing)) @@ -1698,21 +1684,21 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Stone, 2L)) .duration(8 * SECONDS).eut(16).addTo(latheRecipes); GTValues.RA.stdBuilder().itemInputs(getModItem(Forestry.ID, "mushroom", 1, wildcard, missing)) - .itemOutputs(com.dreammaster.item.ItemList.MushroomPowder.getIS(2)).outputChances(10000) - .duration(15 * SECONDS).eut(2).addTo(maceratorRecipes); + .itemOutputs(NHItemList.MushroomPowder.getIS(2)).outputChances(10000).duration(15 * SECONDS).eut(2) + .addTo(maceratorRecipes); GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "brown_mushroom", 1, 0, missing)) - .itemOutputs(com.dreammaster.item.ItemList.MushroomPowder.getIS(2)).outputChances(10000) - .duration(15 * SECONDS).eut(2).addTo(maceratorRecipes); + .itemOutputs(NHItemList.MushroomPowder.getIS(2)).outputChances(10000).duration(15 * SECONDS).eut(2) + .addTo(maceratorRecipes); GTValues.RA.stdBuilder().itemInputs(getModItem(BiomesOPlenty.ID, "mushrooms", 1, wildcard, missing)) - .itemOutputs(com.dreammaster.item.ItemList.MushroomPowder.getIS(2)).outputChances(10000) - .duration(15 * SECONDS).eut(2).addTo(maceratorRecipes); + .itemOutputs(NHItemList.MushroomPowder.getIS(2)).outputChances(10000).duration(15 * SECONDS).eut(2) + .addTo(maceratorRecipes); GTValues.RA.stdBuilder().itemInputs(getModItem(PamsHarvestCraft.ID, "whitemushroomItem", 1, 0, missing)) - .itemOutputs(com.dreammaster.item.ItemList.MushroomPowder.getIS(2)).outputChances(10000) - .duration(15 * SECONDS).eut(2).addTo(maceratorRecipes); + .itemOutputs(NHItemList.MushroomPowder.getIS(2)).outputChances(10000).duration(15 * SECONDS).eut(2) + .addTo(maceratorRecipes); GTValues.RA.stdBuilder().itemInputs(CustomItemList.MoldHelmet.get(1L)) .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 4L)).outputChances(10000) .duration(15 * SECONDS).eut(2).addTo(maceratorRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.ExtruderShapeBoat.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.ExtruderShapeBoat.getIS(1)) .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 4L)).outputChances(10000) .duration(15 * SECONDS).eut(2).addTo(maceratorRecipes); GTValues.RA.stdBuilder().itemInputs(CustomItemList.MoldLeggings.get(1L)) @@ -1736,11 +1722,10 @@ public void loadRecipes() { GTValues.RA.stdBuilder().itemInputs(CustomItemList.MysteriousCrystal.get(1L)) .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.MysteriousCrystal, 9L)) .outputChances(10000).duration(15 * SECONDS).eut(2).addTo(maceratorRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.RawMytryl.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.RawMytryl.getIS(1)) .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Mytryl, 1)).outputChances(10000) .duration(15 * SECONDS).eut(2).addTo(maceratorRecipes); GTValues.RA.stdBuilder().itemInputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 1, 55, missing)) - .itemOutputs(com.dreammaster.item.ItemList.ElectrotineWire.getIS(2)).duration(5 * SECONDS).eut(4) - .addTo(wiremillRecipes); + .itemOutputs(NHItemList.ElectrotineWire.getIS(2)).duration(5 * SECONDS).eut(4).addTo(wiremillRecipes); } } diff --git a/src/main/java/com/dreammaster/scripts/ScriptDraconicEvolution.java b/src/main/java/com/dreammaster/scripts/ScriptDraconicEvolution.java index 48c7af9c3..c5167d81b 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptDraconicEvolution.java +++ b/src/main/java/com/dreammaster/scripts/ScriptDraconicEvolution.java @@ -30,6 +30,7 @@ import net.minecraftforge.fluids.FluidRegistry; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import fox.spiteful.avaritia.compat.ticon.Tonkers; import fox.spiteful.avaritia.crafting.ExtremeCraftingManager; @@ -366,7 +367,7 @@ public void loadRecipes() { 'c', getModItem(DraconicEvolution.ID, "awakenedCore", 1, 0, missing), 'd', - com.dreammaster.item.ItemList.EnrichedNaquadriaSunnariumAlloy.getIS(1), + NHItemList.EnrichedNaquadriaSunnariumAlloy.getIS(1), 'e', getModItem(DraconicEvolution.ID, "draconiumEnergyCore", 1, 1, missing), 'f', @@ -786,7 +787,7 @@ public void loadRecipes() { 'b', "plateDraconiumAwakened", 'c', - com.dreammaster.item.ItemList.EngravedManyullynCrystalChip.getIS(1), + NHItemList.EngravedManyullynCrystalChip.getIS(1), 'd', getModItem(DraconicEvolution.ID, "draconiumFluxCapacitor", 1, 1, missing), 'e', diff --git a/src/main/java/com/dreammaster/scripts/ScriptEMT.java b/src/main/java/com/dreammaster/scripts/ScriptEMT.java index 311823db4..8bebe08be 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEMT.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEMT.java @@ -28,6 +28,7 @@ import net.minecraftforge.fluids.FluidRegistry; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import com.dreammaster.thaumcraft.TCHelper; import gregtech.api.enums.GTValues; @@ -216,7 +217,7 @@ public void loadRecipes() { 0, 0, 1, - com.dreammaster.item.ItemList.EMT.getIS()).setAutoUnlock().setSpecial() + NHItemList.EMT.getIS()).setAutoUnlock().setSpecial() .setPages(new ResearchPage("tc.research_page.ElectricMagicTools")).registerResearchItem(); TCHelper.removeResearch("Diamond Chainsaw"); new ResearchItem( diff --git a/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java b/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java index d71c0de7e..b0c9fecc8 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java +++ b/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java @@ -41,6 +41,7 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import com.dreammaster.recipes.CustomItem; import com.dreammaster.thaumcraft.TCHelper; import com.dreammaster.tinkersConstruct.TConstructHelper; @@ -1428,7 +1429,7 @@ public void loadRecipes() { missing), new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.ring, Materials.Iridium, 1L), GTOreDictUnificator.get(OrePrefixes.screw, Materials.Tritanium, 1L), - com.dreammaster.item.ItemList.EngravedGoldChip.getIS(1), + NHItemList.EngravedGoldChip.getIS(1), getModItem(ExtraUtilities.ID, "angelBlock", 1, 0, missing), getModItem(Thaumcraft.ID, "ItemResource", 1, 15, missing), new ItemStack(ModItems.itemMagicFeather), @@ -1438,7 +1439,7 @@ public void loadRecipes() { new ItemStack(ModItems.itemMagicFeather), getModItem(Thaumcraft.ID, "ItemResource", 1, 15, missing), getModItem(ExtraUtilities.ID, "angelBlock", 1, 0, missing), - com.dreammaster.item.ItemList.EngravedGoldChip.getIS(1), + NHItemList.EngravedGoldChip.getIS(1), GTOreDictUnificator.get(OrePrefixes.screw, Materials.Tritanium, 1L), }); ThaumcraftApi.addInfusionCraftingRecipe( "EXURINGS_CRAFTING", diff --git a/src/main/java/com/dreammaster/scripts/ScriptForestry.java b/src/main/java/com/dreammaster/scripts/ScriptForestry.java index 72e760b26..4aa9e3cab 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptForestry.java +++ b/src/main/java/com/dreammaster/scripts/ScriptForestry.java @@ -36,6 +36,7 @@ import com.dreammaster.forestry.ForestryHelper; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import com.dreammaster.thaumcraft.TCHelper; import forestry.api.recipes.RecipeManagers; @@ -2919,7 +2920,7 @@ private void recipes1() { 'a', getModItem(Forestry.ID, "thermionicTubes", 1, 4, missing), 'b', - com.dreammaster.item.ItemList.ChargedCertusQuartzPlate.getIS(1), + NHItemList.ChargedCertusQuartzPlate.getIS(1), 'c', getModItem(Forestry.ID, "thermionicTubes", 1, 4, missing), 'd', @@ -2931,7 +2932,7 @@ private void recipes1() { 'g', getModItem(Forestry.ID, "thermionicTubes", 1, 4, missing), 'h', - com.dreammaster.item.ItemList.ChargedCertusQuartzPlate.getIS(1), + NHItemList.ChargedCertusQuartzPlate.getIS(1), 'i', getModItem(Forestry.ID, "thermionicTubes", 1, 4, missing)); RecipeManagers.carpenterManager.addRecipe( @@ -5129,9 +5130,9 @@ private void recipes2() { null, FluidRegistry.getFluidStack("glass", 2000), getModItem(Forestry.ID, "thermionicTubes", 2, 6, missing), - new Object[] { "abc", "def", "ghi", 'b', com.dreammaster.item.ItemList.LongObsidianRod.getIS(1), 'd', + new Object[] { "abc", "def", "ghi", 'b', NHItemList.LongObsidianRod.getIS(1), 'd', GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 1L), 'e', - com.dreammaster.item.ItemList.LongObsidianRod.getIS(1), 'f', + NHItemList.LongObsidianRod.getIS(1), 'f', GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 1L), 'g', GTOreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 1L), 'h', GTOreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), 'i', diff --git a/src/main/java/com/dreammaster/scripts/ScriptForgeMultipart.java b/src/main/java/com/dreammaster/scripts/ScriptForgeMultipart.java index b24046ecd..d84b3bfa0 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptForgeMultipart.java +++ b/src/main/java/com/dreammaster/scripts/ScriptForgeMultipart.java @@ -6,6 +6,8 @@ import java.util.Collections; import java.util.List; +import com.dreammaster.item.NHItemList; + public class ScriptForgeMultipart implements IScriptLoader { @Override @@ -26,7 +28,7 @@ public void loadRecipes() { "stickStone", "stickStone", "stickWood", - com.dreammaster.item.ItemList.SawBladeStone.getIS(1), + NHItemList.SawBladeStone.getIS(1), "stickStone", null, null, @@ -50,7 +52,7 @@ public void loadRecipes() { "stickSteel", "stickSteel", "stickWood", - com.dreammaster.item.ItemList.SawBladeDiamond.getIS(1), + NHItemList.SawBladeDiamond.getIS(1), "stickSteel", null, null, diff --git a/src/main/java/com/dreammaster/scripts/ScriptGalacticraft.java b/src/main/java/com/dreammaster/scripts/ScriptGalacticraft.java index 06eb16358..8fe96e3f3 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptGalacticraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptGalacticraft.java @@ -43,6 +43,7 @@ import net.minecraftforge.fluids.FluidRegistry; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import codechicken.nei.PositionedStack; import cpw.mods.fml.common.Optional; @@ -2741,35 +2742,35 @@ private void dungeonBlockRecipes() { GTValues.RA.stdBuilder() .itemInputs( new ItemStack(Items.glowstone_dust, 2), - com.dreammaster.item.ItemList.CeresStoneDust.getIS(2), + NHItemList.CeresStoneDust.getIS(2), GTUtility.getIntegratedCircuit(8)) .itemOutputs(GTModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1, 0)).duration(4 * SECONDS) .eut(TierEU.RECIPE_HV).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( new ItemStack(Items.glowstone_dust, 2), - com.dreammaster.item.ItemList.IoStoneDust.getIS(2), + NHItemList.IoStoneDust.getIS(2), GTUtility.getIntegratedCircuit(8)) .itemOutputs(GTModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1, 1)).duration(4 * SECONDS) .eut(TierEU.RECIPE_HV).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( new ItemStack(Items.glowstone_dust, 2), - com.dreammaster.item.ItemList.EnceladusStoneDust.getIS(2), + NHItemList.EnceladusStoneDust.getIS(2), GTUtility.getIntegratedCircuit(8)) .itemOutputs(GTModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1, 2)).duration(4 * SECONDS) .eut(TierEU.RECIPE_HV).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( new ItemStack(Items.glowstone_dust, 2), - com.dreammaster.item.ItemList.ProteusStoneDust.getIS(2), + NHItemList.ProteusStoneDust.getIS(2), GTUtility.getIntegratedCircuit(8)) .itemOutputs(GTModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1, 3)).duration(4 * SECONDS) .eut(TierEU.RECIPE_HV).addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( new ItemStack(Items.glowstone_dust, 2), - com.dreammaster.item.ItemList.PlutoStoneDust.getIS(2), + NHItemList.PlutoStoneDust.getIS(2), GTUtility.getIntegratedCircuit(8)) .itemOutputs(GTModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1, 4)).duration(4 * SECONDS) .eut(TierEU.RECIPE_HV).addTo(mixerRecipes); diff --git a/src/main/java/com/dreammaster/scripts/ScriptGendustry.java b/src/main/java/com/dreammaster/scripts/ScriptGendustry.java index a33796972..4ba983af2 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptGendustry.java +++ b/src/main/java/com/dreammaster/scripts/ScriptGendustry.java @@ -16,6 +16,7 @@ import net.minecraftforge.fluids.FluidRegistry; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import fox.spiteful.avaritia.crafting.ExtremeCraftingManager; import gregtech.api.enums.GTValues; @@ -300,13 +301,13 @@ public void loadRecipes() { .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - com.dreammaster.item.ItemList.GeneticCircuit.getIS(1), + NHItemList.GeneticCircuit.getIS(1), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1)) .itemOutputs(getModItem(Gendustry.ID, "GeneticsProcessor", 1, 0, missing)).duration(20 * SECONDS) .eut(1920).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - com.dreammaster.item.ItemList.EnvironmentalCircuit.getIS(1), + NHItemList.EnvironmentalCircuit.getIS(1), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1)) .itemOutputs(getModItem(Gendustry.ID, "EnvProcessor", 1, 0, missing)) .fluidInputs(FluidRegistry.getFluidStack("liquiddna", 500)).duration(20 * SECONDS).eut(1920) diff --git a/src/main/java/com/dreammaster/scripts/ScriptGraviSuite.java b/src/main/java/com/dreammaster/scripts/ScriptGraviSuite.java index def9ee193..bdcbbcfa7 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptGraviSuite.java +++ b/src/main/java/com/dreammaster/scripts/ScriptGraviSuite.java @@ -9,6 +9,7 @@ import java.util.List; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -153,7 +154,7 @@ public void loadRecipes() { addShapedRecipe( createItemStack(GraviSuite.ID, "advDDrill", 1, 27, "{toolXP:0.0d,charge:0,toolMode:0}", missing), "screwIridium", - com.dreammaster.item.ItemList.ReinforcedIridiumDrillTip.getIS(1), + NHItemList.ReinforcedIridiumDrillTip.getIS(1), "craftingToolScrewdriver", "gearGtSmallIridium", ItemList.Electric_Motor_EV.get(1L), diff --git a/src/main/java/com/dreammaster/scripts/ScriptGregtech.java b/src/main/java/com/dreammaster/scripts/ScriptGregtech.java index d246231de..50cc4b673 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptGregtech.java +++ b/src/main/java/com/dreammaster/scripts/ScriptGregtech.java @@ -41,6 +41,7 @@ import net.minecraftforge.fluids.FluidRegistry; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import fox.spiteful.avaritia.crafting.ExtremeCraftingManager; import gregtech.api.GregTechAPI; @@ -884,356 +885,356 @@ public void loadRecipes() { TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Plate.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormPlate.getIS(1), + NHItemList.MoldFormPlate.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Casing.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormCasing.getIS(1), + NHItemList.MoldFormCasing.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Gear.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormGear.getIS(1), + NHItemList.MoldFormGear.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Credit.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormCoinage.getIS(1), + NHItemList.MoldFormCoinage.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Bottle.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormBottle.getIS(1), + NHItemList.MoldFormBottle.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Ingot.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormIngot.getIS(1), + NHItemList.MoldFormIngot.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Ball.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormBall.getIS(1), + NHItemList.MoldFormBall.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Block.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormBlock.getIS(1), + NHItemList.MoldFormBlock.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Nugget.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormNuggets.getIS(1), + NHItemList.MoldFormNuggets.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Bun.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormBuns.getIS(1), + NHItemList.MoldFormBuns.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Bread.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormBread.getIS(1), + NHItemList.MoldFormBread.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Baguette.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormBaguette.getIS(1), + NHItemList.MoldFormBaguette.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Cylinder.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormCylinder.getIS(1), + NHItemList.MoldFormCylinder.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Anvil.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormAnvil.getIS(1), + NHItemList.MoldFormAnvil.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Name.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormName.getIS(1), + NHItemList.MoldFormName.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Arrow.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormArrowHead.getIS(1), + NHItemList.MoldFormArrowHead.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Gear_Small.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormSmallGear.getIS(1), + NHItemList.MoldFormSmallGear.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Rod.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormStick.getIS(1), + NHItemList.MoldFormStick.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Bolt.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormBolt.getIS(1), + NHItemList.MoldFormBolt.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Round.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormRound.getIS(1), + NHItemList.MoldFormRound.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Screw.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormScrew.getIS(1), + NHItemList.MoldFormScrew.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Ring.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormRing.getIS(1), + NHItemList.MoldFormRing.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Rod_Long.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormStickLong.getIS(1), + NHItemList.MoldFormStickLong.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Turbine_Blade.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormTurbineBlade.getIS(1), + NHItemList.MoldFormTurbineBlade.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Rotor.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormRotor.getIS(1), + NHItemList.MoldFormRotor.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Pipe_Tiny.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormPipeTiny.getIS(1), + NHItemList.MoldFormPipeTiny.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Pipe_Small.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormPipeSmall.getIS(1), + NHItemList.MoldFormPipeSmall.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Pipe_Medium.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormPipeMedium.getIS(1), + NHItemList.MoldFormPipeMedium.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Pipe_Large.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormPipeLarge.getIS(1), + NHItemList.MoldFormPipeLarge.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_Pipe_Huge.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormPipeHuge.getIS(1), + NHItemList.MoldFormPipeHuge.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Mold_ToolHeadDrill.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.MoldFormDrillHead.getIS(1), + NHItemList.MoldFormDrillHead.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Plate.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapePlate.getIS(1), + NHItemList.ShapePlate.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Rod.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeRod.getIS(1), + NHItemList.ShapeRod.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Bolt.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeBolt.getIS(1), + NHItemList.ShapeBolt.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Cell.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeCell.getIS(1), + NHItemList.ShapeCell.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Ring.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeRing.getIS(1), + NHItemList.ShapeRing.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Ingot.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeIngot.getIS(1), + NHItemList.ShapeIngot.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Wire.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeWire.getIS(1), + NHItemList.ShapeWire.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Casing.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeCasing.getIS(1), + NHItemList.ShapeCasing.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Pipe_Tiny.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeTinyPipe.getIS(1), + NHItemList.ShapeTinyPipe.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Pipe_Small.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeSmallPipe.getIS(1), + NHItemList.ShapeSmallPipe.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Pipe_Medium.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeNormalPipe.getIS(1), + NHItemList.ShapeNormalPipe.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Pipe_Large.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeLargePipe.getIS(1), + NHItemList.ShapeLargePipe.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Pipe_Huge.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeHugePipe.getIS(1), + NHItemList.ShapeHugePipe.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Block.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeBlock.getIS(1), + NHItemList.ShapeBlock.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Sword.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeSwordBlade.getIS(1), + NHItemList.ShapeSwordBlade.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Pickaxe.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapePickaxeHead.getIS(1), + NHItemList.ShapePickaxeHead.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Shovel.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeShovelHead.getIS(1), + NHItemList.ShapeShovelHead.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Axe.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeAxeHead.getIS(1), + NHItemList.ShapeAxeHead.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Hoe.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeHoeHead.getIS(1), + NHItemList.ShapeHoeHead.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Hammer.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeHammerHead.getIS(1), + NHItemList.ShapeHammerHead.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_File.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeFileHead.getIS(1), + NHItemList.ShapeFileHead.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Saw.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeSawBlade.getIS(1), + NHItemList.ShapeSawBlade.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Gear.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeGear.getIS(1), + NHItemList.ShapeGear.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Bottle.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeBottle.getIS(1), + NHItemList.ShapeBottle.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Rotor.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeRotor.getIS(1), + NHItemList.ShapeRotor.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Turbine_Blade.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeTurbineBlade.getIS(1), + NHItemList.ShapeTurbineBlade.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_Small_Gear.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeSmallGear.getIS(1), + NHItemList.ShapeSmallGear.getIS(1), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( ItemList.Shape_Extruder_ToolHeadDrill.get(1), FluidRegistry.getFluidStack("steel.molten", 576), - com.dreammaster.item.ItemList.ShapeDrillHead.getIS(1), + NHItemList.ShapeDrillHead.getIS(1), true, 100); diff --git a/src/main/java/com/dreammaster/scripts/ScriptHarvestcraft.java b/src/main/java/com/dreammaster/scripts/ScriptHarvestcraft.java index 375dba696..e62951420 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptHarvestcraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptHarvestcraft.java @@ -28,6 +28,7 @@ import net.minecraftforge.oredict.OreDictionary; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; @@ -635,7 +636,7 @@ public void loadRecipes() { null, null, null); - addShapelessRecipe(com.dreammaster.item.ItemList.EdibleSalt.getIS(1), "toolPot", "listAllwater"); + addShapelessRecipe(NHItemList.EdibleSalt.getIS(1), "toolPot", "listAllwater"); addShapelessRecipe( getModItem(PamsHarvestCraft.ID, "soymilkItem", 1, 0, missing), "craftingToolHardHammer", diff --git a/src/main/java/com/dreammaster/scripts/ScriptIguanaTweaks.java b/src/main/java/com/dreammaster/scripts/ScriptIguanaTweaks.java index 691393a8b..27e723b7c 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptIguanaTweaks.java +++ b/src/main/java/com/dreammaster/scripts/ScriptIguanaTweaks.java @@ -7,7 +7,7 @@ import java.util.Arrays; import java.util.List; -import com.dreammaster.item.ItemList; +import com.dreammaster.item.NHItemList; import gregtech.api.util.GTOreDictUnificator; @@ -55,7 +55,7 @@ public void loadRecipes() { /* * oredict so the recipes modified in iguanatweaks will work those are exceptionnally in iguanatweaks because * the items in the recipes are registered at PostInit= - */ GTOreDictUnificator.registerOre("toolHeadSawArdite", ItemList.SawBladeArdite.getIS()); - GTOreDictUnificator.registerOre("toolHeadSawManyullyn", ItemList.SawBladeManyullyn.getIS()); + */ GTOreDictUnificator.registerOre("toolHeadSawArdite", NHItemList.SawBladeArdite.getIS()); + GTOreDictUnificator.registerOre("toolHeadSawManyullyn", NHItemList.SawBladeManyullyn.getIS()); } } diff --git a/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java b/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java index 15eee6895..b79eeaddc 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java @@ -39,6 +39,7 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import com.dreammaster.oredict.OreDictHelper; import cpw.mods.fml.common.registry.GameRegistry; @@ -189,7 +190,7 @@ public void loadRecipes() { addShapedRecipe( getModItem(IndustrialCraft2.ID, "itemToolMiningLaser", 1, 0, missing), "plateTitanium", - com.dreammaster.item.ItemList.LaserEmitter.getIS(1), + NHItemList.LaserEmitter.getIS(1), "plateTitanium", "circuitMaster", ItemList.Battery_RE_MV_Cadmium.get(1L), @@ -551,7 +552,7 @@ public void loadRecipes() { "plateSteel", "screwSteel", "craftingToolWrench", - com.dreammaster.item.ItemList.ElectricBoatHull.getIS(1), + NHItemList.ElectricBoatHull.getIS(1), "craftingToolScrewdriver", ItemList.Rotor_LV.get(1L), ItemList.Electric_Motor_LV.get(1L), @@ -1618,33 +1619,32 @@ public void loadRecipes() { GTUtility.getIntegratedCircuit(3)) .itemOutputs(getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 5, missing)).duration(30 * SECONDS) .eut(30).addTo(assemblerRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.BioChunk.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.BioChunk.getIS(1)) .itemOutputs(getModItem(IndustrialCraft2.ID, "itemPartCoalChunk", 1, 0, missing)).duration(1 * MINUTES) .eut(120).specialValue(1000).addTo(blastFurnaceRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.BioOrganicMesh.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.BioOrganicMesh.getIS(1)) .itemOutputs(getModItem(IndustrialCraft2.ID, "itemPartCarbonMesh", 1, 0, missing)) .duration(30 * SECONDS).eut(120).specialValue(1000).addTo(blastFurnaceRecipes); - GTValues.RA.stdBuilder().itemInputs(com.dreammaster.item.ItemList.BioCarbonPlate.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.BioCarbonPlate.getIS(1)) .itemOutputs(getModItem(IndustrialCraft2.ID, "itemPartCarbonPlate", 1, 0, missing)) .duration(30 * SECONDS).eut(120).specialValue(1000).addTo(blastFurnaceRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(IndustrialCraft2.ID, "itemPartCarbonMesh", 8, 0, missing), - com.dreammaster.item.ItemList.ExtruderShapeBoat.getIS(0)) + NHItemList.ExtruderShapeBoat.getIS(0)) .itemOutputs(getModItem(IndustrialCraft2.ID, "itemBoat", 1, 0, missing)).duration(30 * SECONDS).eut(30) .addTo(extruderRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 4L), - com.dreammaster.item.ItemList.ExtruderShapeBoat.getIS(0)) + NHItemList.ExtruderShapeBoat.getIS(0)) .itemOutputs(getModItem(IndustrialCraft2.ID, "itemBoat", 1, 1, missing)).duration(10 * SECONDS).eut(16) .addTo(extruderRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(Minecraft.ID, "iron_ingot", 8, 0, missing), - com.dreammaster.item.ItemList.ExtruderShapeBoat.getIS(0)) - .itemOutputs(com.dreammaster.item.ItemList.ElectricBoatHull.getIS(1)).duration(1 * MINUTES).eut(30) - .addTo(extruderRecipes); + NHItemList.ExtruderShapeBoat.getIS(0)) + .itemOutputs(NHItemList.ElectricBoatHull.getIS(1)).duration(1 * MINUTES).eut(30).addTo(extruderRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Steel, 1L), diff --git a/src/main/java/com/dreammaster/scripts/ScriptLogisticPipes.java b/src/main/java/com/dreammaster/scripts/ScriptLogisticPipes.java index a2a3b8b90..4ed8d451b 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptLogisticPipes.java +++ b/src/main/java/com/dreammaster/scripts/ScriptLogisticPipes.java @@ -28,6 +28,7 @@ import net.minecraftforge.fluids.FluidStack; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import bartworks.common.loaders.ItemRegistry; import gregtech.api.enums.GTValues; @@ -1304,7 +1305,7 @@ private void loadMiscRecipes() { GTValues.RA.stdBuilder() .itemInputs( getModItem(LogisticsPipes.ID, "item.logisticsParts", 1, 5, missing), - com.dreammaster.item.ItemList.GoldCoreChip.getIS(1), + NHItemList.GoldCoreChip.getIS(1), ItemList.Robot_Arm_MV.get(2L), getModItem(IndustrialCraft2.ID, "upgradeModule", 2, 0, missing), GTOreDictUnificator.get(OrePrefixes.bolt, Materials.RedSteel, 16L), @@ -1317,7 +1318,7 @@ private void loadMiscRecipes() { GTValues.RA.stdBuilder() .itemInputs( getModItem(LogisticsPipes.ID, "item.logisticsParts", 1, 7, missing), - com.dreammaster.item.ItemList.DiamondCoreChip.getIS(1), + NHItemList.DiamondCoreChip.getIS(1), ItemList.Robot_Arm_HV.get(1L), getModItem(IndustrialCraft2.ID, "upgradeModule", 4, 0, missing), GTOreDictUnificator.get(OrePrefixes.bolt, Materials.RedSteel, 32L), @@ -1365,15 +1366,15 @@ private void loadMiscRecipes() { // Logistics Disk addShapedRecipe( getModItem(LogisticsPipes.ID, "item.itemDisk", 1, 0, missing), - "plateCarbon", - "plateCarbon", - "plateCarbon", - "plateCarbon", + "platePlastic", + "platePlastic", + "platePlastic", + "platePlastic", getModItem(OpenComputers.ID, "item", 1, 19, missing), - "plateCarbon", - "plateCarbon", - "circuitULV", - "plateCarbon"); + "platePlastic", + "platePlastic", + "circuitPrimitive", + "platePlastic"); // Logistics HUD Glasses addShapedRecipe( diff --git a/src/main/java/com/dreammaster/scripts/ScriptNatura.java b/src/main/java/com/dreammaster/scripts/ScriptNatura.java index e2d249b96..b42adb999 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptNatura.java +++ b/src/main/java/com/dreammaster/scripts/ScriptNatura.java @@ -12,7 +12,6 @@ import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; -import static gregtech.common.items.IDMetaTool01.SAW; import java.util.Arrays; import java.util.List; @@ -28,7 +27,6 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; -import gregtech.common.items.MetaGeneratedTool01; public class ScriptNatura implements IScriptLoader { @@ -64,7 +62,7 @@ public void loadRecipes() { getModItem(Minecraft.ID, "string", 1, 0, missing)); addShapelessRecipe( getModItem(Natura.ID, "planks", 4, 0, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", getModItem(Natura.ID, "tree", 1, 0, missing)); addShapelessRecipe( getModItem(Natura.ID, "planks", 2, 0, missing), @@ -75,7 +73,7 @@ public void loadRecipes() { getModItem(Natura.ID, "planks", 1, 0, missing)); addShapedRecipe( getModItem(Natura.ID, "natura.stick", 4, 0, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", null, null, null, @@ -212,7 +210,7 @@ public void loadRecipes() { null); addShapelessRecipe( getModItem(Natura.ID, "planks", 4, 1, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", getModItem(Natura.ID, "tree", 1, 1, missing)); addShapelessRecipe( getModItem(Natura.ID, "planks", 2, 1, missing), @@ -223,7 +221,7 @@ public void loadRecipes() { getModItem(Natura.ID, "planks", 1, 1, missing)); addShapedRecipe( getModItem(Natura.ID, "natura.stick", 4, 1, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", null, null, null, @@ -375,7 +373,7 @@ public void loadRecipes() { "craftingToolKnife"); addShapelessRecipe( getModItem(Natura.ID, "planks", 4, 2, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", getModItem(Natura.ID, "tree", 1, 2, missing)); addShapelessRecipe( getModItem(Natura.ID, "planks", 2, 2, missing), @@ -386,7 +384,7 @@ public void loadRecipes() { getModItem(Natura.ID, "planks", 1, 2, missing)); addShapedRecipe( getModItem(Natura.ID, "natura.stick", 4, 2, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", null, null, null, @@ -534,7 +532,7 @@ public void loadRecipes() { null); addShapelessRecipe( getModItem(Natura.ID, "planks", 4, 3, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", getModItem(Natura.ID, "redwood", 1, 1, missing)); addShapelessRecipe( getModItem(Natura.ID, "planks", 2, 3, missing), @@ -545,7 +543,7 @@ public void loadRecipes() { getModItem(Natura.ID, "planks", 1, 3, missing)); addShapedRecipe( getModItem(Natura.ID, "natura.stick", 4, 3, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", null, null, null, @@ -693,21 +691,21 @@ public void loadRecipes() { null); addShapelessRecipe( getModItem(Natura.ID, "planks", 4, 4, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", getModItem(Natura.ID, "bloodwood", 1, 0, missing)); addShapelessRecipe( getModItem(Natura.ID, "planks", 2, 4, missing), getModItem(Natura.ID, "bloodwood", 1, 0, missing)); addShapelessRecipe( getModItem(Natura.ID, "planks", 4, 4, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", getModItem(Natura.ID, "bloodwood", 1, 15, missing)); addShapelessRecipe( getModItem(Natura.ID, "planks", 2, 4, missing), getModItem(Natura.ID, "bloodwood", 1, 15, missing)); addShapelessRecipe( getModItem(Natura.ID, "planks", 4, 4, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", getModItem(Natura.ID, "bloodwood", 1, 1, missing)); addShapelessRecipe( getModItem(Natura.ID, "natura.stick", 2, 4, missing), @@ -715,7 +713,7 @@ public void loadRecipes() { getModItem(Natura.ID, "planks", 1, 4, missing)); addShapedRecipe( getModItem(Natura.ID, "natura.stick", 4, 4, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", null, null, null, @@ -873,7 +871,7 @@ public void loadRecipes() { "craftingToolKnife"); addShapelessRecipe( getModItem(Natura.ID, "planks", 4, 5, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", getModItem(Natura.ID, "tree", 1, 3, missing)); addShapelessRecipe( getModItem(Natura.ID, "planks", 2, 5, missing), @@ -884,7 +882,7 @@ public void loadRecipes() { getModItem(Natura.ID, "planks", 1, 5, missing)); addShapedRecipe( getModItem(Natura.ID, "natura.stick", 4, 5, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", null, null, null, @@ -1032,7 +1030,7 @@ public void loadRecipes() { null); addShapelessRecipe( getModItem(Natura.ID, "planks", 4, 6, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", getModItem(Natura.ID, "Rare Tree", 1, 0, missing)); addShapelessRecipe( getModItem(Natura.ID, "planks", 2, 6, missing), @@ -1043,7 +1041,7 @@ public void loadRecipes() { getModItem(Natura.ID, "planks", 1, 6, missing)); addShapedRecipe( getModItem(Natura.ID, "natura.stick", 4, 6, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", null, null, null, @@ -1191,7 +1189,7 @@ public void loadRecipes() { null); addShapelessRecipe( getModItem(Natura.ID, "planks", 4, 7, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", getModItem(Natura.ID, "Rare Tree", 1, 1, missing)); addShapelessRecipe( getModItem(Natura.ID, "planks", 2, 7, missing), @@ -1202,7 +1200,7 @@ public void loadRecipes() { getModItem(Natura.ID, "planks", 1, 7, missing)); addShapedRecipe( getModItem(Natura.ID, "natura.stick", 4, 7, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", null, null, null, @@ -1350,7 +1348,7 @@ public void loadRecipes() { null); addShapelessRecipe( getModItem(Natura.ID, "planks", 4, 8, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", getModItem(Natura.ID, "Rare Tree", 1, 2, missing)); addShapelessRecipe( getModItem(Natura.ID, "planks", 2, 8, missing), @@ -1361,7 +1359,7 @@ public void loadRecipes() { getModItem(Natura.ID, "planks", 1, 8, missing)); addShapedRecipe( getModItem(Natura.ID, "natura.stick", 4, 8, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", null, null, null, @@ -1509,7 +1507,7 @@ public void loadRecipes() { null); addShapelessRecipe( getModItem(Natura.ID, "planks", 4, 9, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", getModItem(Natura.ID, "Rare Tree", 1, 3, missing)); addShapelessRecipe( getModItem(Natura.ID, "planks", 2, 9, missing), @@ -1520,7 +1518,7 @@ public void loadRecipes() { getModItem(Natura.ID, "planks", 1, 9, missing)); addShapedRecipe( getModItem(Natura.ID, "natura.stick", 4, 9, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", null, null, null, @@ -1668,7 +1666,7 @@ public void loadRecipes() { null); addShapelessRecipe( getModItem(Natura.ID, "planks", 4, 10, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", getModItem(Natura.ID, "willow", 1, 0, missing)); addShapelessRecipe( getModItem(Natura.ID, "planks", 2, 10, missing), @@ -1679,7 +1677,7 @@ public void loadRecipes() { getModItem(Natura.ID, "planks", 1, 10, missing)); addShapedRecipe( getModItem(Natura.ID, "natura.stick", 4, 10, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", null, null, null, @@ -1827,7 +1825,7 @@ public void loadRecipes() { null); addShapelessRecipe( getModItem(Natura.ID, "planks", 4, 11, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", getModItem(Natura.ID, "Dark Tree", 1, 0, missing)); addShapelessRecipe( getModItem(Natura.ID, "planks", 2, 11, missing), @@ -1838,7 +1836,7 @@ public void loadRecipes() { getModItem(Natura.ID, "planks", 1, 11, missing)); addShapedRecipe( getModItem(Natura.ID, "natura.stick", 4, 11, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", null, null, null, @@ -1990,7 +1988,7 @@ public void loadRecipes() { "craftingToolKnife"); addShapelessRecipe( getModItem(Natura.ID, "planks", 4, 12, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", getModItem(Natura.ID, "Dark Tree", 1, 1, missing)); addShapelessRecipe( getModItem(Natura.ID, "planks", 2, 12, missing), @@ -2001,7 +1999,7 @@ public void loadRecipes() { getModItem(Natura.ID, "planks", 1, 12, missing)); addShapedRecipe( getModItem(Natura.ID, "natura.stick", 4, 12, missing), - MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null), + "craftingToolSaw", null, null, null, diff --git a/src/main/java/com/dreammaster/scripts/ScriptProjectRed.java b/src/main/java/com/dreammaster/scripts/ScriptProjectRed.java index 32cd7a353..1e48f9828 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptProjectRed.java +++ b/src/main/java/com/dreammaster/scripts/ScriptProjectRed.java @@ -52,6 +52,7 @@ import net.minecraftforge.oredict.OreDictionary; import com.dreammaster.chisel.ChiselHelper; +import com.dreammaster.item.NHItemList; import fox.spiteful.avaritia.crafting.ExtremeCraftingManager; import gregtech.api.GregTechAPI; @@ -194,7 +195,7 @@ private void craftingRecipes() { "itemCasingSteel", ItemList.Electric_Motor_LV.get(1L), "itemCasingSteel", - com.dreammaster.item.ItemList.DiamondDrillTip.getIS(1), + NHItemList.DiamondDrillTip.getIS(1), getModItem(IndustrialCraft2.ID, "blockMiningPipe", 1, 0, missing), "circuitBasic", "itemCasingSteel", @@ -284,7 +285,7 @@ private void craftingRecipes() { "stickSteel", "stickSteel", "stickWood", - com.dreammaster.item.ItemList.SawBladeRuby.getIS(1), + NHItemList.SawBladeRuby.getIS(1), "stickSteel", null, null, @@ -295,7 +296,7 @@ private void craftingRecipes() { "stickSteel", "stickSteel", "stickWood", - com.dreammaster.item.ItemList.SawBladeSapphire.getIS(1), + NHItemList.SawBladeSapphire.getIS(1), "stickSteel", null, null, @@ -306,7 +307,7 @@ private void craftingRecipes() { "stickSteel", "stickSteel", "stickWood", - com.dreammaster.item.ItemList.SawBladePeridot.getIS(1), + NHItemList.SawBladePeridot.getIS(1), "stickSteel", null, null, @@ -3766,19 +3767,19 @@ private void recipes2() { .duration(5 * SECONDS).eut(8).addTo(packagerRecipes); GTValues.RA.stdBuilder() .itemInputs( - com.dreammaster.item.ItemList.ElectrotineWire.getIS(1), + NHItemList.ElectrotineWire.getIS(1), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Rubber, 1)) .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 34, missing)) .duration(5 * SECONDS).eut(8).addTo(packagerRecipes); GTValues.RA.stdBuilder() .itemInputs( - com.dreammaster.item.ItemList.ElectrotineWire.getIS(1), + NHItemList.ElectrotineWire.getIS(1), GTOreDictUnificator.get(OrePrefixes.plate, Materials.StyreneButadieneRubber, 1L)) .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 34, missing)) .duration(5 * SECONDS).eut(8).addTo(packagerRecipes); GTValues.RA.stdBuilder() .itemInputs( - com.dreammaster.item.ItemList.ElectrotineWire.getIS(1), + NHItemList.ElectrotineWire.getIS(1), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Silicone, 1L)) .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 34, missing)) .duration(5 * SECONDS).eut(8).addTo(packagerRecipes); @@ -3791,7 +3792,7 @@ private void recipes2() { GTValues.RA.stdBuilder() .itemInputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 34, missing)) .itemOutputs( - com.dreammaster.item.ItemList.ElectrotineWire.getIS(1), + NHItemList.ElectrotineWire.getIS(1), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Rubber, 1)) .duration(5 * SECONDS).eut(8).addTo(unpackagerRecipes); GTValues.RA.stdBuilder() diff --git a/src/main/java/com/dreammaster/scripts/ScriptRemoteIO.java b/src/main/java/com/dreammaster/scripts/ScriptRemoteIO.java index f4e4c88e8..b4169f549 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptRemoteIO.java +++ b/src/main/java/com/dreammaster/scripts/ScriptRemoteIO.java @@ -21,6 +21,7 @@ import net.minecraftforge.fluids.FluidRegistry; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; @@ -181,55 +182,53 @@ public void loadRecipes() { .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - com.dreammaster.item.ItemList.BlankPlatedChip.getIS(1), + NHItemList.BlankPlatedChip.getIS(1), getModItem(EnderStorage.ID, "enderChest", 1, 0, missing)) .itemOutputs(getModItem(RemoteIO.ID, "item.chip.transfer", 1, 0, missing)).duration(10 * SECONDS) .eut(480).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - com.dreammaster.item.ItemList.BlankPlatedChip.getIS(1), + NHItemList.BlankPlatedChip.getIS(1), getModItem(EnderStorage.ID, "enderChest", 1, 4096, missing)) .itemOutputs(getModItem(RemoteIO.ID, "item.chip.transfer", 1, 1, missing)).duration(10 * SECONDS) .eut(480).addTo(assemblerRecipes); GTValues.RA.stdBuilder() - .itemInputs( - com.dreammaster.item.ItemList.BlankPlatedChip.getIS(1), - getModItem(Thaumcraft.ID, "blockJar", 2, 0, missing)) + .itemInputs(NHItemList.BlankPlatedChip.getIS(1), getModItem(Thaumcraft.ID, "blockJar", 2, 0, missing)) .itemOutputs(getModItem(RemoteIO.ID, "item.chip.transfer", 1, 2, missing)).duration(10 * SECONDS) .eut(480).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - com.dreammaster.item.ItemList.BlankPlatedChip.getIS(1), + NHItemList.BlankPlatedChip.getIS(1), GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.BlackSteel, 2L)) .itemOutputs(getModItem(RemoteIO.ID, "item.chip.transfer", 1, 10, missing)).duration(10 * SECONDS) .eut(480).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - com.dreammaster.item.ItemList.BlankPlatedChip.getIS(1), + NHItemList.BlankPlatedChip.getIS(1), getModItem(ExtraUtilities.ID, "extractor_base", 2, 12, missing)) .itemOutputs(getModItem(RemoteIO.ID, "item.chip.transfer", 1, 12, missing)).duration(10 * SECONDS) .eut(480).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - com.dreammaster.item.ItemList.BlankPlatedChip.getIS(1), + NHItemList.BlankPlatedChip.getIS(1), getModItem(AppliedEnergistics2.ID, "tile.BlockController", 1, 0, missing)) .itemOutputs(getModItem(RemoteIO.ID, "item.chip.transfer", 1, 20, missing)).duration(10 * SECONDS) .eut(480).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - com.dreammaster.item.ItemList.BlankPlatedChip.getIS(1), + NHItemList.BlankPlatedChip.getIS(1), GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.RedAlloy, 2L)) .itemOutputs(getModItem(RemoteIO.ID, "item.chip.transfer", 1, 21, missing)).duration(10 * SECONDS) .eut(480).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - com.dreammaster.item.ItemList.BlankPlatedChip.getIS(1), + NHItemList.BlankPlatedChip.getIS(1), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Enderium, 4L)) .itemOutputs(getModItem(RemoteIO.ID, "item.chip.upgrade", 1, 0, missing)).duration(10 * SECONDS) .eut(480).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - com.dreammaster.item.ItemList.BlankPlatedChip.getIS(1), + NHItemList.BlankPlatedChip.getIS(1), getModItem(RemoteIO.ID, "item.wireless_transmitter", 1, 0, missing)) .itemOutputs(getModItem(RemoteIO.ID, "item.chip.upgrade", 1, 1, missing)).duration(10 * SECONDS) .eut(480).addTo(assemblerRecipes); diff --git a/src/main/java/com/dreammaster/scripts/ScriptStevesCarts.java b/src/main/java/com/dreammaster/scripts/ScriptStevesCarts.java index e9eb25a5f..b8c43d264 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptStevesCarts.java +++ b/src/main/java/com/dreammaster/scripts/ScriptStevesCarts.java @@ -39,6 +39,7 @@ import net.minecraftforge.fluids.FluidRegistry; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import fox.spiteful.avaritia.crafting.ExtremeCraftingManager; import gregtech.api.enums.GTValues; @@ -283,7 +284,7 @@ public void loadRecipes() { "craftingToolScrewdriver", "blockSteel", getModItem(StevesCarts2.ID, "CartModule", 1, 42, missing), - com.dreammaster.item.ItemList.DiamondDrillTip.getIS(1), + NHItemList.DiamondDrillTip.getIS(1), CustomItemList.SteelBars.get(1L), "screwSteel", "craftingToolHardHammer"); diff --git a/src/main/java/com/dreammaster/scripts/ScriptTaintedMagic.java b/src/main/java/com/dreammaster/scripts/ScriptTaintedMagic.java index 12792e8ed..16483326d 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptTaintedMagic.java +++ b/src/main/java/com/dreammaster/scripts/ScriptTaintedMagic.java @@ -14,6 +14,7 @@ import net.minecraft.item.ItemStack; +import com.dreammaster.item.NHItemList; import com.dreammaster.thaumcraft.TCHelper; import gregtech.api.enums.Materials; @@ -537,13 +538,13 @@ public void loadRecipes() { .setConcealed().setPages(new ResearchPage("tm.text.CREATIONSHARD.1")).registerResearchItem(); ThaumcraftApi.addCrucibleRecipe( "CreationShardGTNH", - com.dreammaster.item.ItemList.VoidEssence.getIS(2), + NHItemList.VoidEssence.getIS(2), getModItem(Thaumcraft.ID, "ItemResource", 1, 16, missing), new AspectList().add(Aspect.getAspect("alienis"), 16).add(Aspect.getAspect("vacuos"), 16) .add(Aspect.getAspect("tenebrae"), 16)); TCHelper.addResearchPage( "CreationShardGTNH", - new ResearchPage(TCHelper.findCrucibleRecipe(com.dreammaster.item.ItemList.VoidEssence.getIS(1)))); + new ResearchPage(TCHelper.findCrucibleRecipe(NHItemList.VoidEssence.getIS(1)))); ThaumcraftApi.addInfusionCraftingRecipe( "CreationShardGTNH", getModItem(TaintedMagic.ID, "ItemMaterial", 2, 5, missing), @@ -554,14 +555,12 @@ public void loadRecipes() { getModItem(Minecraft.ID, "nether_star", 1, 0, missing), new ItemStack[] { getModItem(Thaumcraft.ID, "ItemEldritchObject", 1, 3, missing), getModItem(Thaumcraft.ID, "blockCrystal", 1, 0, missing), - getModItem(Thaumcraft.ID, "blockCrystal", 1, 1, missing), - com.dreammaster.item.ItemList.VoidEssence.getIS(1), + getModItem(Thaumcraft.ID, "blockCrystal", 1, 1, missing), NHItemList.VoidEssence.getIS(1), getModItem(Thaumcraft.ID, "blockCrystal", 1, 2, missing), getModItem(Thaumcraft.ID, "blockCrystal", 1, 3, missing), getModItem(Thaumcraft.ID, "ItemEldritchObject", 1, 3, missing), getModItem(Thaumcraft.ID, "blockCrystal", 1, 4, missing), - getModItem(Thaumcraft.ID, "blockCrystal", 1, 5, missing), - com.dreammaster.item.ItemList.VoidEssence.getIS(1), + getModItem(Thaumcraft.ID, "blockCrystal", 1, 5, missing), NHItemList.VoidEssence.getIS(1), getModItem(Thaumcraft.ID, "blockCrystal", 1, 6, missing), getModItem(Thaumcraft.ID, "blockCrystal", 1, 6, missing), }); TCHelper.addResearchPage( @@ -1847,16 +1846,12 @@ public void loadRecipes() { .add(Aspect.getAspect("permutatio"), 16), getModItem(TaintedMagic.ID, "ItemMaterial", 1, 5, missing), new ItemStack[] { getModItem(Thaumcraft.ID, "FocusPortableHole", 1, 0, missing), - getModItem(Thaumcraft.ID, "blockCrystal", 1, 0, missing), - com.dreammaster.item.ItemList.VoidEssence.getIS(1), - getModItem(Minecraft.ID, "clock", 1, 0, missing), - com.dreammaster.item.ItemList.VoidEssence.getIS(1), + getModItem(Thaumcraft.ID, "blockCrystal", 1, 0, missing), NHItemList.VoidEssence.getIS(1), + getModItem(Minecraft.ID, "clock", 1, 0, missing), NHItemList.VoidEssence.getIS(1), getModItem(Thaumcraft.ID, "blockCrystal", 1, 0, missing), getModItem(Thaumcraft.ID, "blockCrystal", 1, 6, missing), - getModItem(Thaumcraft.ID, "blockCrystal", 1, 0, missing), - com.dreammaster.item.ItemList.VoidEssence.getIS(1), - getModItem(Minecraft.ID, "clock", 1, 0, missing), - com.dreammaster.item.ItemList.VoidEssence.getIS(1), + getModItem(Thaumcraft.ID, "blockCrystal", 1, 0, missing), NHItemList.VoidEssence.getIS(1), + getModItem(Minecraft.ID, "clock", 1, 0, missing), NHItemList.VoidEssence.getIS(1), getModItem(Thaumcraft.ID, "blockCrystal", 1, 0, missing), }); TCHelper.addResearchPage( "FocusTimeGTNH", @@ -1889,16 +1884,12 @@ public void loadRecipes() { .add(Aspect.getAspect("perditio"), 16), getModItem(TaintedMagic.ID, "ItemMaterial", 1, 5, missing), new ItemStack[] { getModItem(Thaumcraft.ID, "FocusShock", 1, 0, missing), - getModItem(Thaumcraft.ID, "blockCrystal", 1, 2, missing), - com.dreammaster.item.ItemList.VoidEssence.getIS(1), - getModItem(Thaumcraft.ID, "ItemResource", 1, 14, missing), - com.dreammaster.item.ItemList.VoidEssence.getIS(1), + getModItem(Thaumcraft.ID, "blockCrystal", 1, 2, missing), NHItemList.VoidEssence.getIS(1), + getModItem(Thaumcraft.ID, "ItemResource", 1, 14, missing), NHItemList.VoidEssence.getIS(1), getModItem(Thaumcraft.ID, "blockCrystal", 1, 2, missing), getModItem(Thaumcraft.ID, "FocusFrost", 1, 0, missing), - getModItem(Thaumcraft.ID, "blockCrystal", 1, 2, missing), - com.dreammaster.item.ItemList.VoidEssence.getIS(1), - getModItem(Thaumcraft.ID, "ItemResource", 1, 14, missing), - com.dreammaster.item.ItemList.VoidEssence.getIS(1), + getModItem(Thaumcraft.ID, "blockCrystal", 1, 2, missing), NHItemList.VoidEssence.getIS(1), + getModItem(Thaumcraft.ID, "ItemResource", 1, 14, missing), NHItemList.VoidEssence.getIS(1), getModItem(Thaumcraft.ID, "blockCrystal", 1, 2, missing), }); TCHelper.addResearchPage( "FocusWeatherGTNH", @@ -1940,9 +1931,9 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1L), getModItem(Thaumcraft.ID, "blockCrystal", 1, 3, missing), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Shadow, 1L), - com.dreammaster.item.ItemList.VoidEssence.getIS(1), + NHItemList.VoidEssence.getIS(1), getModItem(TaintedMagic.ID, "ItemCrystalDagger", 1, 0, missing), - com.dreammaster.item.ItemList.VoidEssence.getIS(1), + NHItemList.VoidEssence.getIS(1), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Shadow, 1L), getModItem(Thaumcraft.ID, "blockCrystal", 1, 2, missing), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1L), diff --git a/src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java b/src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java index 8f0b2c67e..49631c14e 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java @@ -48,6 +48,7 @@ import com.dreammaster.chisel.ChiselHelper; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import com.dreammaster.thaumcraft.TCHelper; import goodgenerator.items.GGMaterial; @@ -820,7 +821,7 @@ private void thaumaturgy() { 2, new AspectList().add(Aspect.getAspect("ordo"), 24).add(Aspect.getAspect("praecantatio"), 12) .add(Aspect.getAspect("potentia"), 12).add(Aspect.getAspect("vitreus"), 6), - com.dreammaster.item.ItemList.ChargedCertusQuartzRod.getIS(1), + NHItemList.ChargedCertusQuartzRod.getIS(1), new ItemStack[] { getModItem(Thaumcraft.ID, "ItemShard", 1, 6, missing), getModItem(Thaumcraft.ID, "blockCrystal", 1, 4, missing), getModItem(Thaumcraft.ID, "ItemShard", 1, 6, missing), diff --git a/src/main/java/com/dreammaster/scripts/ScriptTinkersConstruct.java b/src/main/java/com/dreammaster/scripts/ScriptTinkersConstruct.java index b2c2b1a81..824f4461c 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptTinkersConstruct.java +++ b/src/main/java/com/dreammaster/scripts/ScriptTinkersConstruct.java @@ -37,6 +37,7 @@ import net.minecraftforge.oredict.OreDictionary; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import com.dreammaster.mantle.MantleManualRecipeRegistry; import com.dreammaster.oredict.OreDictHelper; import com.dreammaster.recipes.Recipe; @@ -3290,7 +3291,7 @@ public void loadRecipes() { 800, FluidRegistry.getFluidStack("steel.molten", 576)); Smeltery.addMelting( - com.dreammaster.item.ItemList.ExtruderShapeBoat.getIS(1), + NHItemList.ExtruderShapeBoat.getIS(1), GameRegistry.findBlock("IC2", "blockMetal"), 5, 800, diff --git a/src/main/java/com/dreammaster/witchery/WitcheryPlugin.java b/src/main/java/com/dreammaster/witchery/WitcheryPlugin.java index 436ff1b84..45895fab6 100644 --- a/src/main/java/com/dreammaster/witchery/WitcheryPlugin.java +++ b/src/main/java/com/dreammaster/witchery/WitcheryPlugin.java @@ -12,6 +12,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import com.dreammaster.item.NHItemList; import com.emoniph.witchery.Witchery; import com.emoniph.witchery.brewing.AltarPower; import com.emoniph.witchery.brewing.BrewItemKey; @@ -243,7 +244,7 @@ public boolean init() { GTOreDictUnificator.get(OrePrefixes.dust, Materials.EnderEye, 1L), GTModHandler.getModItem(HardcoreEnderExpansion.ID, "end_powder", 1L), Witchery.Items.GENERIC.itemTearOfTheGoddess.createStack(), - com.dreammaster.item.ItemList.ManyullynCrystal.getIS(1)); + NHItemList.ManyullynCrystal.getIS(1)); } // rites // TODO write doc