diff --git a/dependencies.gradle b/dependencies.gradle index c06d39b61b..6860ca8923 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.195:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.215:dev") api("com.github.GTNewHorizons:Yamcl:0.7.3:dev") api("com.github.GTNewHorizons:Baubles-Expanded:2.2.6-GTNH:dev") diff --git a/src/main/java/com/dreammaster/auxiliary/NEIGTNewHorizonsConfig.java b/src/main/java/com/dreammaster/auxiliary/NEIGTNewHorizonsConfig.java index 3c92e30ae3..fb7f82cfa0 100644 --- a/src/main/java/com/dreammaster/auxiliary/NEIGTNewHorizonsConfig.java +++ b/src/main/java/com/dreammaster/auxiliary/NEIGTNewHorizonsConfig.java @@ -9,7 +9,6 @@ import net.minecraft.nbt.NBTTagInt; import net.minecraft.nbt.NBTTagString; -import com.dreammaster.item.food.QuantumBread; import com.dreammaster.lib.Refstrings; import com.dreammaster.main.MainRegistry; @@ -25,8 +24,6 @@ public class NEIGTNewHorizonsConfig implements IConfigureNEI { @Override public void loadConfig() { - API.hideItem(new ItemStack(QuantumBread.Instance())); - API.hideItem(new ItemStack(Loaders.antimatterRenderBlock)); API.hideItem(new ItemStack(GregTechAPI.sDroneRender)); API.hideItem(new ItemStack(GregTechAPI.sWormholeRender)); diff --git a/src/main/java/com/dreammaster/baubles/WitherProtectionRing.java b/src/main/java/com/dreammaster/baubles/WitherProtectionRing.java deleted file mode 100644 index 57d7e40c45..0000000000 --- a/src/main/java/com/dreammaster/baubles/WitherProtectionRing.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.dreammaster.baubles; - -import java.util.List; -import java.util.Random; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; - -import com.dreammaster.lib.Refstrings; -import com.dreammaster.main.NHItems; - -import baubles.api.BaubleType; -import baubles.api.IBauble; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; -import eu.usrv.yamcore.iface.IExtendedModItem; - -public final class WitherProtectionRing extends Item implements IBauble, IExtendedModItem { - - Random _mRnd = new Random(); - - private final String _mItemName; - private final String _mCreativeTab; - - @Override - public WitherProtectionRing getConstructedItem() { - return NHItems.WITHER_PROTECTION_RING.get(); - } - - @Override - public String getCreativeTabName() { - return _mCreativeTab; - } - - @Override - public String getUnlocalizedNameForRegistration() { - return super.getUnlocalizedName(); - } - - public WitherProtectionRing(String pItemName, String pCreativeTab) { - _mItemName = pItemName; - _mCreativeTab = pCreativeTab; - - super.setTextureName(String.format("%s:item%s", Refstrings.MODID, _mItemName)); - super.setUnlocalizedName(_mItemName); - super.setMaxDamage(0); - super.setHasSubtypes(false); - } - - private static final long prevTime = Long.MIN_VALUE; - private static final int curRand = -1; - - @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack); - } - - public IIcon icon; - - @Override - public void registerIcons(IIconRegister reg) { - icon = reg.registerIcon(String.format("%s:item%s", Refstrings.MODID, _mItemName)); - } - - @Override - public IIcon getIconFromDamage(int meta) { - return icon; - } - - @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { - list.add(new ItemStack(item, 1, 0)); - } - - @Override - public boolean canEquip(ItemStack arg0, EntityLivingBase arg1) { - return true; - } - - @Override - public boolean canUnequip(ItemStack arg0, EntityLivingBase arg1) { - return true; - } - - @Override - public BaubleType getBaubleType(ItemStack arg0) { - return BaubleType.RING; - } - - @Override - public void onEquipped(ItemStack arg0, EntityLivingBase arg1) {} - - @Override - public void onUnequipped(ItemStack arg0, EntityLivingBase pEntityBase) {} - - // ------------------ NBT Start - @Override - public void addInformation(ItemStack pItemStack, EntityPlayer pWorld, List list, boolean par4) { - list.add( - String.format( - "%s%sFinally, a way to get rid of the nasty withering effect.", - EnumChatFormatting.GREEN, - EnumChatFormatting.ITALIC)); - list.add( - String.format( - "%s%sNow it's time to get some Stars!", - EnumChatFormatting.GREEN, - EnumChatFormatting.ITALIC)); - } - - @Override - public void onWornTick(ItemStack arg0, EntityLivingBase pEntity) { - if (!(pEntity instanceof EntityPlayer)) { - return; - } - - if (_mRnd.nextInt(20) == 0) { - EntityPlayer tPlayer = (EntityPlayer) pEntity; - InventoryBaubles tBaubles = PlayerHandler.getPlayerBaubles(tPlayer); - - Potion tPot = Potion.wither; - if (tPlayer.isPotionActive(tPot)) { - tPlayer.removePotionEffect(tPot.id); - } - } - } -} diff --git a/src/main/java/com/dreammaster/creativetab/ModTabList.java b/src/main/java/com/dreammaster/creativetab/ModTabList.java index da8f97a750..aaef3c244d 100644 --- a/src/main/java/com/dreammaster/creativetab/ModTabList.java +++ b/src/main/java/com/dreammaster/creativetab/ModTabList.java @@ -1,69 +1,88 @@ package com.dreammaster.creativetab; -import java.util.List; - +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; -import com.dreammaster.gthandler.CustomItemList; import com.dreammaster.item.NHItemList; import eu.usrv.yamcore.creativetabs.CreativeTabsManager; import eu.usrv.yamcore.creativetabs.ModCreativeTab; -import eu.usrv.yamcore.items.ModItemManager; -import gregtech.api.GregTechAPI; public final class ModTabList { - public static String ModGenericTab = "tabDreamCraftItems_Generic"; - public static String ModShapesTab = "tabDreamCraftItems_Shapes"; - public static String ModMoldsTab = "tabDreamCraftItems_Molds"; - public static String ModThaumcraftTab = "tabDreamCraftItems_Thaum"; - public static String ModCircuitsTab = "tabDreamCraftItems_Circuit"; public static String ModFluidsTab = "tabDreamCraftFluids"; public static String ModBlocksTab = "tabDreamCraftBlocks"; - public static String ModSpaceTab = "tabDreamCraftSpace"; - public static String ModSolarTab = "tabDreamCraftSolar"; - public static String ModBarsAndCasingsTab = "tabDreamCraftBars_Casings"; - public static String ModAdditionsToGregTechTab = "tabDreamGregTechAdditions"; + + public static final CreativeTabs GENERIC = new CreativeTabs("tabDreamCraftItems_Generic") { + + @Override + public Item getTabIconItem() { + return NHItemList.AsteroidsStoneDust.item; + } + }; + + public static final CreativeTabs SHAPES = new CreativeTabs("tabDreamCraftItems_Shapes") { + + @Override + public Item getTabIconItem() { + return NHItemList.ShapeBlock.item; + } + }; + + public static final CreativeTabs MOLDS = new CreativeTabs("tabDreamCraftItems_Molds") { + + @Override + public Item getTabIconItem() { + return NHItemList.MoldFormAnvil.item; + } + }; + + public static final CreativeTabs THAUMCRAFT = new CreativeTabs("tabDreamCraftItems_Thaum") { + + @Override + public Item getTabIconItem() { + return NHItemList.ChargedVoidWandCap.item; + } + }; + + public static final CreativeTabs CIRCUITS = new CreativeTabs("tabDreamCraftItems_Circuit") { + + @Override + public Item getTabIconItem() { + return NHItemList.QuantumCircuit.item; + } + }; + + public static final CreativeTabs SPACE = new CreativeTabs("tabDreamCraftSpace") { + + @Override + public Item getTabIconItem() { + return NHItemList.HeavyDutyNoseConeTier3.item; + } + }; + + public static final CreativeTabs SOLAR = new CreativeTabs("tabDreamCraftSolar") { + + @Override + public Item getTabIconItem() { + return NHItemList.EnrichedNaquadriaNeutroniumSunnariumAlloy.item; + } + }; + + public static final CreativeTabs BARS_AND_CASINGS = new CreativeTabs("tabDreamCraftBars_Casings") { + + @Override + public Item getTabIconItem() { + return NHItemList.ChromeBars.item; + } + }; private ModTabList() {} - public static void InitModTabs(CreativeTabsManager pTabManager, ModItemManager pItemManager) { - pTabManager.AddCreativeTab( - new ModCreativeTab(ModGenericTab, NHItemList.AsteroidsStoneDust.Item.getConstructedItem())); - pTabManager.AddCreativeTab(new ModCreativeTab(ModShapesTab, NHItemList.ShapeBlock.Item.getConstructedItem())); - pTabManager.AddCreativeTab(new ModCreativeTab(ModMoldsTab, NHItemList.MoldFormAnvil.Item.getConstructedItem())); - pTabManager.AddCreativeTab( - new ModCreativeTab(ModThaumcraftTab, NHItemList.ChargedVoidWandCap.Item.getConstructedItem())); - pTabManager.AddCreativeTab( - new ModCreativeTab(ModCircuitsTab, NHItemList.QuantumCircuit.Item.getConstructedItem())); - pTabManager.AddCreativeTab(new ModCreativeTab(ModFluidsTab, Items.bucket)); - pTabManager.AddCreativeTab(new ModCreativeTab(ModBlocksTab, Item.getItemFromBlock(Blocks.stone))); - pTabManager.AddCreativeTab( - new ModCreativeTab(ModSpaceTab, NHItemList.HeavyDutyNoseConeTier3.Item.getConstructedItem())); - pTabManager.AddCreativeTab( - new ModCreativeTab( - ModSolarTab, - NHItemList.EnrichedNaquadriaNeutroniumSunnariumAlloy.Item.getConstructedItem())); - pTabManager.AddCreativeTab( - new ModCreativeTab(ModBarsAndCasingsTab, NHItemList.ChromeBars.Item.getConstructedItem())); - pTabManager.AddCreativeTab( - new ModCreativeTab( - ModAdditionsToGregTechTab, - NHItemList.EtchedLudicrousVoltageWiring.Item.getConstructedItem()) { - - @Override - public void displayAllReleventItems(List stuffToShow) { - // te adder - for (CustomItemList item : CustomItemList.values()) { - if (item.hasBeenSet() && item.getBlock() == GregTechAPI.sBlockMachines) { - stuffToShow.add(item.get(1)); - } - } - super.displayAllReleventItems(stuffToShow); - } - }); + public static void InitModTabs(CreativeTabsManager tabManager) { + tabManager.AddCreativeTab(new ModCreativeTab(ModFluidsTab, Items.bucket)); + tabManager.AddCreativeTab(new ModCreativeTab(ModBlocksTab, Item.getItemFromBlock(Blocks.stone))); } } diff --git a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java index 03c5029d67..ba774803dd 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java +++ b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java @@ -45,7 +45,6 @@ import com.dreammaster.iguana.IguanaProxy; import com.dreammaster.item.ItemBucketList; import com.dreammaster.item.NHItemList; -import com.dreammaster.main.NHItems; import com.dreammaster.mantle.MantleManualRecipeRegistry; import com.dreammaster.recipes.Recipe; @@ -1084,15 +1083,15 @@ public void run() { CustomItemList.UnfiredClayBrick.get(8L), GTModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "CCC", "CFC", "CCC", 'C', new ItemStack(Items.clay_ball, 1, 0), 'F', - new ItemStack(NHItems.WOODEN_BRICK_FORM.get(), 1, GTValues.W) }); + new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W) }); GTModHandler.addShapelessCraftingRecipe( CustomItemList.UnfiredClayBrick.get(1L), GTModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { new ItemStack(Items.clay_ball, 1, 0), - new ItemStack(NHItems.WOODEN_BRICK_FORM.get(), 1, GTValues.W) }); + new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W) }); if (TinkerConstruct.isModLoaded()) { Recipe.of( - new ItemStack(NHItems.WOODEN_BRICK_FORM.get(), 1, GTValues.W), + new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W), ToolDictNames.craftingToolKnife, GTModHandler.getModItem(aTextTConstruct, "blankPattern", 1L, 0)) .provideTo(shapelessUnremovableGtRecipes()) @@ -1102,11 +1101,11 @@ public void run() { GTModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "GGG", "GFG", "GGG", 'G', GTModHandler.getModItem(aTextTConstruct, "CraftedSoil", 1L, 1), 'F', - new ItemStack(NHItems.WOODEN_BRICK_FORM.get(), 1, GTValues.W) }); + new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W) }); Recipe.of( CustomItemList.UnfiredSearedBrick.get(1L), GTModHandler.getModItem(aTextTConstruct, "CraftedSoil", 1L, 1), - new ItemStack(NHItems.WOODEN_BRICK_FORM.get(), 1, GTValues.W)) + new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W)) .provideTo(shapelessUnremovableGtRecipes()) .provideTo(MANTLE.manualShapedCraftingRecipeNamed("unfiredsearedbrick")); GTModHandler.addCraftingRecipe( @@ -1114,19 +1113,19 @@ public void run() { GTModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "SSS", "SFS", "SSS", 'S', GTModHandler.getModItem(aTextTConstruct, "CraftedSoil", 1L, 6), 'F', - new ItemStack(NHItems.WOODEN_BRICK_FORM.get(), 1, GTValues.W) }); + new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W) }); GTModHandler.addShapelessCraftingRecipe( CustomItemList.UnfiredSlimeSoilBrick.get(1L), GTModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { GTModHandler.getModItem(aTextTConstruct, "CraftedSoil", 1L, 6), - new ItemStack(NHItems.WOODEN_BRICK_FORM.get(), 1, GTValues.W) }); + new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W) }); } GTModHandler.addCraftingRecipe( CustomItemList.UnfiredCokeOvenBrick.get(3L), GTModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "CCC", "SFS", "SSS", 'C', new ItemStack(Items.clay_ball, 1, 0), 'S', GTOreDictUnificator.get("sand", 1L), 'F', - new ItemStack(NHItems.WOODEN_BRICK_FORM.get(), 1, GTValues.W) }); + new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W) }); GTModHandler.addCraftingRecipe( GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 1L), diff --git a/src/main/java/com/dreammaster/gthandler/GT_CustomLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CustomLoader.java index a33510e000..1d55156e2b 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_CustomLoader.java +++ b/src/main/java/com/dreammaster/gthandler/GT_CustomLoader.java @@ -6,11 +6,9 @@ import net.minecraft.item.ItemStack; import com.dreammaster.item.NHItemList; -import com.dreammaster.item.food.QuantumBread; import com.dreammaster.modfixes.biomesoplenty.BlockHarvestToolFix; import com.dreammaster.modfixes.enderIO.FrankenskullFix; -import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -140,7 +138,6 @@ public Object getPipeL() { private static final GT_Recipe_Remover Remover = new GT_Recipe_Remover(); public void run() { - GameRegistry.registerItem(QuantumBread.Instance(), "itemQuantumToast"); if (EnderIO.isModLoaded()) { FrankenskullFix.fixEnderIO(); } 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 1f45aebe2c..c2ff2ec9e7 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java +++ b/src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java @@ -413,7 +413,7 @@ private void registerItems() { CustomItemList.ReinforcedTitaniumIronPlate.set(NHItemList.ReinforcedTitaniumIronPlate.getIS()); CustomItemList.TungstenIronPlate.set(NHItemList.TungstenIronPlate.getIS()); CustomItemList.ReinforcedTungstenIronPlate.set(NHItemList.ReinforcedTungstenIronPlate.getIS()); - CustomItemList.TungstenSteelIronPlate.set(NHItemList.TungstenSteeLIronPlate.getIS()); + CustomItemList.TungstenSteelIronPlate.set(NHItemList.TungstenSteelIronPlate.getIS()); CustomItemList.ReinforcedTungstenSteelIronPlate.set(NHItemList.ReinforcedTungstenSteelIronPlate.getIS()); CustomItemList.ChromeIronPlate.set(NHItemList.ChromeIronPlate.getIS()); CustomItemList.ReinforcedChromeIronPlate.set(NHItemList.ReinforcedChromeIronPlate.getIS()); diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java index 1bf060bdf8..6afd3504f1 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java +++ b/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java @@ -12,7 +12,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import com.dreammaster.item.food.QuantumBread; +import com.dreammaster.item.NHItemList; import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; @@ -982,7 +982,7 @@ public void recipes() { GT_CustomLoader.AdvancedGTMaterials.UMV.getCable(), 'M', ItemList.Hull_UMV }); GTValues.RA.stdBuilder().itemInputs(ItemList.Food_Sliced_Breads.get(1L), ItemList.Shape_Slicer_Flat.get(0L)) - .itemOutputs(new ItemStack(QuantumBread.Instance(), 1)).duration(20 * TICKS).eut(TierEU.RECIPE_UV) + .itemOutputs(NHItemList.QuantumBread.getIS()).duration(20 * TICKS).eut(TierEU.RECIPE_UV) .addTo(cutterRecipes); if (CookingForBlockheads.isModLoaded() && PamsHarvestCraft.isModLoaded()) { GTValues.RA.stdBuilder() diff --git a/src/main/java/com/dreammaster/item/CustomPattern.java b/src/main/java/com/dreammaster/item/CustomPattern.java new file mode 100644 index 0000000000..9272056737 --- /dev/null +++ b/src/main/java/com/dreammaster/item/CustomPattern.java @@ -0,0 +1,26 @@ +package com.dreammaster.item; + +import static gregtech.api.enums.Mods.ModIDs.TINKER_CONSTRUCT; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import cpw.mods.fml.common.Optional; +import tconstruct.library.crafting.PatternBuilder; +import tconstruct.library.util.IPattern; + +@Optional.Interface(modid = TINKER_CONSTRUCT, iface = "tconstruct.library.util.IPattern") +public class CustomPattern extends Item implements IPattern { + + @Override + @Optional.Method(modid = TINKER_CONSTRUCT) + public int getPatternCost(ItemStack pattern) { + return 0; + } + + @Override + @Optional.Method(modid = TINKER_CONSTRUCT) + public ItemStack getPatternOutput(ItemStack pattern, ItemStack input, PatternBuilder.MaterialSet set) { + return null; + } +} diff --git a/src/main/java/com/dreammaster/item/CustomPatterns.java b/src/main/java/com/dreammaster/item/CustomPatterns.java deleted file mode 100644 index 36cbd9f343..0000000000 --- a/src/main/java/com/dreammaster/item/CustomPatterns.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.dreammaster.item; - -import net.minecraft.creativetab.CreativeTabs; - -import com.dreammaster.creativetab.ModTabList; -import com.dreammaster.main.MainRegistry; - -import cpw.mods.fml.common.registry.GameRegistry; -import eu.usrv.yamcore.creativetabs.CreativeTabsManager; - -public class CustomPatterns { - - public static Pattern BowFletchingCast; - public static Pattern BowStringCast; - - public static boolean RegisterPatterns(CreativeTabsManager tabManager) { - boolean tResult = true; - CreativeTabs tab = tabManager.GetCreativeTabInstance(ModTabList.ModMoldsTab); - try { - BowFletchingCast = new Pattern( - new String[] { "BowFletchingCast" }, - new String[] { "itemBowFletchingCast" }, - tab); - BowFletchingCast.setUnlocalizedName("Cast"); - GameRegistry.registerItem(BowFletchingCast, "item.BowFletchingCast"); - } catch (Exception E) { - MainRegistry.Logger.warn("Unable to register BowFletchingCast, skipping"); - tResult = false; - } - try { - BowStringCast = new Pattern(new String[] { "BowStringCast" }, new String[] { "itemBowStringCast" }, tab); - BowStringCast.setUnlocalizedName("Cast"); - GameRegistry.registerItem(BowStringCast, "item.BowStringCast"); - } catch (Exception E) { - tResult = false; - } - return tResult; - } -} diff --git a/src/main/java/com/dreammaster/item/NHItemList.java b/src/main/java/com/dreammaster/item/NHItemList.java index 4adb25d399..df3995fb55 100644 --- a/src/main/java/com/dreammaster/item/NHItemList.java +++ b/src/main/java/com/dreammaster/item/NHItemList.java @@ -1,617 +1,619 @@ package com.dreammaster.item; +import static com.dreammaster.creativetab.ModTabList.BARS_AND_CASINGS; +import static com.dreammaster.creativetab.ModTabList.CIRCUITS; +import static com.dreammaster.creativetab.ModTabList.GENERIC; +import static com.dreammaster.creativetab.ModTabList.MOLDS; +import static com.dreammaster.creativetab.ModTabList.SHAPES; +import static com.dreammaster.creativetab.ModTabList.SOLAR; +import static com.dreammaster.creativetab.ModTabList.SPACE; +import static com.dreammaster.creativetab.ModTabList.THAUMCRAFT; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import com.dreammaster.creativetab.ModTabList; +import com.dreammaster.item.baubles.OvenGlove; +import com.dreammaster.item.baubles.WitherProtectionRing; +import com.dreammaster.item.food.QuantumBread; import com.dreammaster.lib.Refstrings; -import com.dreammaster.main.MainRegistry; -import eu.usrv.yamcore.items.ModItemManager; -import eu.usrv.yamcore.items.ModSimpleBaseItem; +import cpw.mods.fml.common.registry.GameRegistry; public enum NHItemList { - MicaBasedPulp(new ModSimpleBaseItem("MicaBasedPulp", ModTabList.ModGenericTab)), - MicaBasedSheet(new ModSimpleBaseItem("MicaBasedSheet", ModTabList.ModGenericTab)), - MicaInsulatorSheet(new ModSimpleBaseItem("MicaInsulatorSheet", ModTabList.ModGenericTab)), - MicaInsulatorFoil(new ModSimpleBaseItem("MicaInsulatorFoil", ModTabList.ModGenericTab)), - TenKCell(new ModSimpleBaseItem("TenKCell", ModTabList.ModGenericTab)), - ThirtyKCell(new ModSimpleBaseItem("ThirtyKCell", ModTabList.ModGenericTab)), - SixtyKCell(new ModSimpleBaseItem("SixtyKCell", ModTabList.ModGenericTab)), - Empty180SpCell(new ModSimpleBaseItem("Empty180SpCell", ModTabList.ModGenericTab)), - Empty360SpCell(new ModSimpleBaseItem("Empty360SpCell", ModTabList.ModGenericTab)), - Empty540SpCell(new ModSimpleBaseItem("Empty540SpCell", ModTabList.ModGenericTab)), - Empty1080SpCell(new ModSimpleBaseItem("Empty1080SpCell", ModTabList.ModGenericTab)), - AdsorptionFilterCasing(new ModSimpleBaseItem("AdsorptionFilterCasing", ModTabList.ModGenericTab)), - AdsorptionFilter(new ModSimpleBaseItem("AdsorptionFilter", ModTabList.ModGenericTab)), - AdsorptionFilterDirty(new ModSimpleBaseItem("AdsorptionFilterDirty", ModTabList.ModGenericTab)), - AluminiumBars(new ModSimpleBaseItem("AluminiumBars", ModTabList.ModBarsAndCasingsTab)), - AluminiumIronPlate(new ModSimpleBaseItem("AluminiumIronPlate", ModTabList.ModSolarTab)), - AdvancedCokeOvenBrick(new ModSimpleBaseItem("AdvancedCokeOvenBrick", ModTabList.ModGenericTab)), - AdvancedCokeOvenBrickDust(new ModSimpleBaseItem("AdvancedCokeOvenBrickDust", ModTabList.ModGenericTab)), - AdvancedBoard(new ModSimpleBaseItem("AdvancedBoard", ModTabList.ModCircuitsTab)), - AdvancedProcessorBoard(new ModSimpleBaseItem("AdvancedProcessorBoard", ModTabList.ModCircuitsTab)), - ApprenticeOrb(new ModSimpleBaseItem("ApprenticeOrb", ModTabList.ModThaumcraftTab)), - ArcaneSlate(new ModSimpleBaseItem("ArcaneSlate", ModTabList.ModThaumcraftTab)), - ArchmageOrb(new ModSimpleBaseItem("ArchmageOrb", ModTabList.ModThaumcraftTab)), - ArcaneShardChip(new ModSimpleBaseItem("ArcaneShardChip", ModTabList.ModGenericTab)), - ArcaneShardFragment(new ModSimpleBaseItem("ArcaneShardFragment", ModTabList.ModGenericTab)), - ArtificialLeather(new ModSimpleBaseItem("ArtificialLeather", ModTabList.ModGenericTab)), - AsteroidsStoneDust(new ModSimpleBaseItem("AsteroidsStoneDust", ModTabList.ModGenericTab)), - BarnardaEStoneDust(new ModSimpleBaseItem("BarnardaEStoneDust", ModTabList.ModSpaceTab)), - BarnardaFStoneDust(new ModSimpleBaseItem("BarnardaFStoneDust", ModTabList.ModSpaceTab)), - BioCarbonPlate(new ModSimpleBaseItem("BioCarbonPlate", ModTabList.ModGenericTab)), - BedrockiumIronPlate(new ModSimpleBaseItem("BedrockiumIronPlate", ModTabList.ModSolarTab)), - BioBall(new ModSimpleBaseItem("BioBall", ModTabList.ModGenericTab)), - BioOrganicMesh(new ModSimpleBaseItem("BioOrganicMesh", ModTabList.ModGenericTab)), - BioChunk(new ModSimpleBaseItem("BioChunk", ModTabList.ModGenericTab)), - Blaster(new ModSimpleBaseItem("Blaster", ModTabList.ModThaumcraftTab)), - BloodVial(new ModSimpleBaseItem("BloodVial", ModTabList.ModThaumcraftTab)), - CompressedBioBall(new ModSimpleBaseItem("CompressedBioBall", ModTabList.ModGenericTab)), - BlackPlutoniumCompressedPlate(new ModSimpleBaseItem("BlackPlutoniumCompressedPlate", ModTabList.ModSpaceTab)), - BlankPlatedChip(new ModSimpleBaseItem("BlankPlatedChip", ModTabList.ModCircuitsTab)), - CallistoIceCompressedPlate(new ModSimpleBaseItem("CallistoIceCompressedPlate", ModTabList.ModSpaceTab)), - CallistoStoneDust(new ModSimpleBaseItem("CallistoStoneDust", ModTabList.ModSpaceTab)), - CarbonPartBoots(new ModSimpleBaseItem("CarbonPartBoots", ModTabList.ModGenericTab)), - CarbonPartChestplate(new ModSimpleBaseItem("CarbonPartChestplate", ModTabList.ModGenericTab)), - CarbonPartHelmet(new ModSimpleBaseItem("CarbonPartHelmet", ModTabList.ModGenericTab)), - CarbonPartHelmetNightVision(new ModSimpleBaseItem("CarbonPartHelmetNightVision", ModTabList.ModGenericTab)), - CarbonPartLeggings(new ModSimpleBaseItem("CarbonPartLeggings", ModTabList.ModGenericTab)), - CarminiteChip(new ModSimpleBaseItem("CarminiteChip", ModTabList.ModThaumcraftTab)), - CarminiteFragment(new ModSimpleBaseItem("CarminiteFragment", ModTabList.ModThaumcraftTab)), - CentauriASurfaceDust(new ModSimpleBaseItem("CentauriASurfaceDust", ModTabList.ModSpaceTab)), - CentauriAStoneDust(new ModSimpleBaseItem("CentauriAStoneDust", ModTabList.ModSpaceTab)), - CeresStoneDust(new ModSimpleBaseItem("CeresStoneDust", ModTabList.ModSpaceTab)), - ChargedMechanistWandCap(new ModSimpleBaseItem("ChargedMechanistWandCap", ModTabList.ModThaumcraftTab)), - ChargedSilverWandCap(new ModSimpleBaseItem("ChargedSilverWandCap", ModTabList.ModThaumcraftTab)), - ChargedSojournerWandCap(new ModSimpleBaseItem("ChargedSojournerWandCap", ModTabList.ModThaumcraftTab)), - ChargedThaumiumWandCap(new ModSimpleBaseItem("ChargedThaumiumWandCap", ModTabList.ModThaumcraftTab)), - ChargedVoidWandCap(new ModSimpleBaseItem("ChargedVoidWandCap", ModTabList.ModThaumcraftTab)), - ChargedCertusQuartzDust(new ModSimpleBaseItem("ChargedCertusQuartzDust", ModTabList.ModGenericTab)), - ChargedCertusQuartzPlate(new ModSimpleBaseItem("ChargedCertusQuartzPlate", ModTabList.ModGenericTab)), - ChargedCertusQuartzRod(new ModSimpleBaseItem("ChargedCertusQuartzRod", ModTabList.ModGenericTab)), - CoinChunkloaderTierI(new ModSimpleBaseItem("CoinChunkloaderTierI", ModTabList.ModGenericTab)), - CoinChunkloaderTierII(new ModSimpleBaseItem("CoinChunkloaderTierII", ModTabList.ModGenericTab)), - CoinChunkloaderTierIII(new ModSimpleBaseItem("CoinChunkloaderTierIII", ModTabList.ModGenericTab)), - CoinChunkloaderTierIV(new ModSimpleBaseItem("CoinChunkloaderTierIV", ModTabList.ModGenericTab)), - CoinChunkloaderTierV(new ModSimpleBaseItem("CoinChunkloaderTierV", ModTabList.ModGenericTab)), - CoinAdventure(new ModSimpleBaseItem("CoinAdventure", ModTabList.ModGenericTab)), - CoinAdventureI(new ModSimpleBaseItem("CoinAdventureI", ModTabList.ModGenericTab)), - CoinAdventureII(new ModSimpleBaseItem("CoinAdventureII", ModTabList.ModGenericTab)), - CoinAdventureIII(new ModSimpleBaseItem("CoinAdventureIII", ModTabList.ModGenericTab)), - CoinAdventureIV(new ModSimpleBaseItem("CoinAdventureIV", ModTabList.ModGenericTab)), - CoinBees(new ModSimpleBaseItem("CoinBees", ModTabList.ModGenericTab)), - CoinBeesI(new ModSimpleBaseItem("CoinBeesI", ModTabList.ModGenericTab)), - CoinBeesII(new ModSimpleBaseItem("CoinBeesII", ModTabList.ModGenericTab)), - CoinBeesIII(new ModSimpleBaseItem("CoinBeesIII", ModTabList.ModGenericTab)), - CoinBeesIV(new ModSimpleBaseItem("CoinBeesIV", ModTabList.ModGenericTab)), - CoinBlank(new ModSimpleBaseItem("CoinBlank", ModTabList.ModGenericTab)), - CoinBlankI(new ModSimpleBaseItem("CoinBlankI", ModTabList.ModGenericTab)), - CoinBlankII(new ModSimpleBaseItem("CoinBlankII", ModTabList.ModGenericTab)), - CoinBlankIII(new ModSimpleBaseItem("CoinBlankIII", ModTabList.ModGenericTab)), - CoinBlankIV(new ModSimpleBaseItem("CoinBlankIV", ModTabList.ModGenericTab)), - CoinBlood(new ModSimpleBaseItem("CoinBlood", ModTabList.ModGenericTab)), - CoinBloodI(new ModSimpleBaseItem("CoinBloodI", ModTabList.ModGenericTab)), - CoinBloodII(new ModSimpleBaseItem("CoinBloodII", ModTabList.ModGenericTab)), - CoinBloodIII(new ModSimpleBaseItem("CoinBloodIII", ModTabList.ModGenericTab)), - CoinBloodIV(new ModSimpleBaseItem("CoinBloodIV", ModTabList.ModGenericTab)), - CoinChemist(new ModSimpleBaseItem("CoinChemist", ModTabList.ModGenericTab)), - CoinChemistI(new ModSimpleBaseItem("CoinChemistI", ModTabList.ModGenericTab)), - CoinChemistII(new ModSimpleBaseItem("CoinChemistII", ModTabList.ModGenericTab)), - CoinChemistIII(new ModSimpleBaseItem("CoinChemistIII", ModTabList.ModGenericTab)), - CoinChemistIV(new ModSimpleBaseItem("CoinChemistIV", ModTabList.ModGenericTab)), - CoinCook(new ModSimpleBaseItem("CoinCook", ModTabList.ModGenericTab)), - CoinCookI(new ModSimpleBaseItem("CoinCookI", ModTabList.ModGenericTab)), - CoinCookII(new ModSimpleBaseItem("CoinCookII", ModTabList.ModGenericTab)), - CoinCookIII(new ModSimpleBaseItem("CoinCookIII", ModTabList.ModGenericTab)), - CoinCookIV(new ModSimpleBaseItem("CoinCookIV", ModTabList.ModGenericTab)), - CoinDarkWizard(new ModSimpleBaseItem("CoinDarkWizard", ModTabList.ModGenericTab)), - CoinDarkWizardI(new ModSimpleBaseItem("CoinDarkWizardI", ModTabList.ModGenericTab)), - CoinDarkWizardII(new ModSimpleBaseItem("CoinDarkWizardII", ModTabList.ModGenericTab)), - CoinDarkWizardIII(new ModSimpleBaseItem("CoinDarkWizardIII", ModTabList.ModGenericTab)), - CoinDarkWizardIV(new ModSimpleBaseItem("CoinDarkWizardIV", ModTabList.ModGenericTab)), - CoinFarmer(new ModSimpleBaseItem("CoinFarmer", ModTabList.ModGenericTab)), - CoinFarmerI(new ModSimpleBaseItem("CoinFarmerI", ModTabList.ModGenericTab)), - CoinFarmerII(new ModSimpleBaseItem("CoinFarmerII", ModTabList.ModGenericTab)), - CoinFarmerIII(new ModSimpleBaseItem("CoinFarmerIII", ModTabList.ModGenericTab)), - CoinFarmerIV(new ModSimpleBaseItem("CoinFarmerIV", ModTabList.ModGenericTab)), - CoinFlower(new ModSimpleBaseItem("CoinFlower", ModTabList.ModGenericTab)), - CoinFlowerI(new ModSimpleBaseItem("CoinFlowerI", ModTabList.ModGenericTab)), - CoinFlowerII(new ModSimpleBaseItem("CoinFlowerII", ModTabList.ModGenericTab)), - CoinFlowerIII(new ModSimpleBaseItem("CoinFlowerIII", ModTabList.ModGenericTab)), - CoinFlowerIV(new ModSimpleBaseItem("CoinFlowerIV", ModTabList.ModGenericTab)), - CoinForestry(new ModSimpleBaseItem("CoinForestry", ModTabList.ModGenericTab)), - CoinForestryI(new ModSimpleBaseItem("CoinForestryI", ModTabList.ModGenericTab)), - CoinForestryII(new ModSimpleBaseItem("CoinForestryII", ModTabList.ModGenericTab)), - CoinForestryIII(new ModSimpleBaseItem("CoinForestryIII", ModTabList.ModGenericTab)), - CoinForestryIV(new ModSimpleBaseItem("CoinForestryIV", ModTabList.ModGenericTab)), - CoinSmith(new ModSimpleBaseItem("CoinSmith", ModTabList.ModGenericTab)), - CoinSmithI(new ModSimpleBaseItem("CoinSmithI", ModTabList.ModGenericTab)), - CoinSmithII(new ModSimpleBaseItem("CoinSmithII", ModTabList.ModGenericTab)), - CoinSmithIII(new ModSimpleBaseItem("CoinSmithIII", ModTabList.ModGenericTab)), - CoinSmithIV(new ModSimpleBaseItem("CoinSmithIV", ModTabList.ModGenericTab)), - CoinWitch(new ModSimpleBaseItem("CoinWitch", ModTabList.ModGenericTab)), - CoinWitchI(new ModSimpleBaseItem("CoinWitchI", ModTabList.ModGenericTab)), - CoinWitchII(new ModSimpleBaseItem("CoinWitchII", ModTabList.ModGenericTab)), - CoinWitchIII(new ModSimpleBaseItem("CoinWitchIII", ModTabList.ModGenericTab)), - CoinWitchIV(new ModSimpleBaseItem("CoinWitchIV", ModTabList.ModGenericTab)), - CoinSpace(new ModSimpleBaseItem("CoinSpace", ModTabList.ModGenericTab)), - CoinSpaceI(new ModSimpleBaseItem("CoinSpaceI", ModTabList.ModGenericTab)), - CoinSpaceII(new ModSimpleBaseItem("CoinSpaceII", ModTabList.ModGenericTab)), - CoinSpaceIII(new ModSimpleBaseItem("CoinSpaceIII", ModTabList.ModGenericTab)), - CoinSpaceIV(new ModSimpleBaseItem("CoinSpaceIV", ModTabList.ModGenericTab)), - CoinSurvivor(new ModSimpleBaseItem("CoinSurvivor", ModTabList.ModGenericTab)), - CoinSurvivorI(new ModSimpleBaseItem("CoinSurvivorI", ModTabList.ModGenericTab)), - CoinSurvivorII(new ModSimpleBaseItem("CoinSurvivorII", ModTabList.ModGenericTab)), - CoinSurvivorIII(new ModSimpleBaseItem("CoinSurvivorIII", ModTabList.ModGenericTab)), - CoinSurvivorIV(new ModSimpleBaseItem("CoinSurvivorIV", ModTabList.ModGenericTab)), - CoinTechnician(new ModSimpleBaseItem("CoinTechnician", ModTabList.ModGenericTab)), - CoinTechnicianI(new ModSimpleBaseItem("CoinTechnicianI", ModTabList.ModGenericTab)), - CoinTechnicianII(new ModSimpleBaseItem("CoinTechnicianII", ModTabList.ModGenericTab)), - CoinTechnicianIII(new ModSimpleBaseItem("CoinTechnicianIII", ModTabList.ModGenericTab)), - CoinTechnicianIV(new ModSimpleBaseItem("CoinTechnicianIV", ModTabList.ModGenericTab)), - CoinDonation(new ModSimpleBaseItem("CoinDonation", ModTabList.ModGenericTab)), - CokeOvenBrick(new ModSimpleBaseItem("CokeOvenBrick", ModTabList.ModGenericTab)), - CokeOvenBrickDust(new ModSimpleBaseItem("CokeOvenBrickDust", ModTabList.ModGenericTab)), - ConductiveIronBars(new ModSimpleBaseItem("ConductiveIronBars", ModTabList.ModBarsAndCasingsTab)), - CopperDualCompressedPlates(new ModSimpleBaseItem("CopperDualCompressedPlates", ModTabList.ModSpaceTab)), - ChromeBars(new ModSimpleBaseItem("ChromeBars", ModTabList.ModBarsAndCasingsTab)), - ChromeIronPlate(new ModSimpleBaseItem("ChromeIronPlate", ModTabList.ModSolarTab)), - CobbleStoneRod(new ModSimpleBaseItem("CobbleStoneRod", ModTabList.ModGenericTab)), - CopperWandCap(new ModSimpleBaseItem("CopperWandCap", ModTabList.ModThaumcraftTab)), - CrimsonStainedClothCap(new ModSimpleBaseItem("CrimsonStainedClothCap", ModTabList.ModThaumcraftTab)), - DraconiumEgg(new ModSimpleBaseItem("DraconiumEgg", ModTabList.ModGenericTab)), - DeimosStoneDust(new ModSimpleBaseItem("DeimosStoneDust", ModTabList.ModSpaceTab)), - DeshDualCompressedPlates(new ModSimpleBaseItem("DeshDualCompressedPlates", ModTabList.ModSpaceTab)), - Display(new ModSimpleBaseItem("Display", ModTabList.ModCircuitsTab)), - DiamondCoreChip(new ModSimpleBaseItem("DiamondCoreChip", ModTabList.ModCircuitsTab)), - DiamondDrillTip(new ModSimpleBaseItem("DiamondDrillTip", ModTabList.ModGenericTab)), - DiamondFluidCoreChip(new ModSimpleBaseItem("DiamondFluidCoreChip", ModTabList.ModCircuitsTab)), - EctoplasmaChip(new ModSimpleBaseItem("EctoplasmaChip", ModTabList.ModGenericTab)), - EctoplasmaFragment(new ModSimpleBaseItem("EctoplasmaFragment", ModTabList.ModGenericTab)), - ElectricalSteelBars(new ModSimpleBaseItem("ElectricalSteelBars", ModTabList.ModBarsAndCasingsTab)), - ElectricBoatHull(new ModSimpleBaseItem("ElectricBoatHull", ModTabList.ModGenericTab)), - ElectrotineWire(new ModSimpleBaseItem("ElectrotineWire", ModTabList.ModGenericTab)), - EmeraldAdvancedCoreChip(new ModSimpleBaseItem("EmeraldAdvancedCoreChip", ModTabList.ModCircuitsTab)), - EmeraldAdvancedFluidCoreChip(new ModSimpleBaseItem("EmeraldAdvancedFluidCoreChip", ModTabList.ModCircuitsTab)), - EmeraldHighAdvancedCoreChip(new ModSimpleBaseItem("EmeraldHighAdvancedCoreChip", ModTabList.ModCircuitsTab)), - EMT(new ModSimpleBaseItem("EMT", ModTabList.ModGenericTab)), - EnceladusIceDust(new ModSimpleBaseItem("EnceladusIceDust", ModTabList.ModSpaceTab)), - EnceladusStoneDust(new ModSimpleBaseItem("EnceladusStoneDust", ModTabList.ModSpaceTab)), - EnchantedClothCap(new ModSimpleBaseItem("EnchantedClothCap", ModTabList.ModThaumcraftTab)), - EnderiumBaseBars(new ModSimpleBaseItem("EnderiumBaseBars", ModTabList.ModBarsAndCasingsTab)), - EnderiumBars(new ModSimpleBaseItem("EnderiumBars", ModTabList.ModBarsAndCasingsTab)), - EnergeticAlloyBars(new ModSimpleBaseItem("EnergeticAlloyBars", ModTabList.ModBarsAndCasingsTab)), - EnderEgg(new ModSimpleBaseItem("EnderEgg", ModTabList.ModGenericTab)), - EngineeringProcessorEssentiaPulsatingCore( - new ModSimpleBaseItem("EngineeringProcessorEssentiaPulsatingCore", ModTabList.ModCircuitsTab)), - EngineeringProcessorFluidDiamondCore( - new ModSimpleBaseItem("EngineeringProcessorFluidDiamondCore", ModTabList.ModCircuitsTab)), - EngineeringProcessorFluidEmeraldCore( - new ModSimpleBaseItem("EngineeringProcessorFluidEmeraldCore", ModTabList.ModCircuitsTab)), - EngineeringProcessorItemAdvEmeraldCore( - new ModSimpleBaseItem("EngineeringProcessorItemAdvEmeraldCore", ModTabList.ModCircuitsTab)), - EngineeringProcessorItemEmeraldCore( - new ModSimpleBaseItem("EngineeringProcessorItemEmeraldCore", ModTabList.ModCircuitsTab)), - EngineeringProcessorItemDiamondCore( - new ModSimpleBaseItem("EngineeringProcessorItemDiamondCore", ModTabList.ModCircuitsTab)), - EngineeringProcessorSpatialPulsatingCore( - new ModSimpleBaseItem("EngineeringProcessorSpatialPulsatingCore", ModTabList.ModCircuitsTab)), - EngineCore(new ModSimpleBaseItem("EngineCore", ModTabList.ModGenericTab)), - EngravedEnergyChip(new ModSimpleBaseItem("EngravedEnergyChip", ModTabList.ModCircuitsTab)), - EngravedDiamondCrystalChip(new ModSimpleBaseItem("EngravedDiamondCrystalChip", ModTabList.ModCircuitsTab)), - EngravedGoldChip(new ModSimpleBaseItem("EngravedGoldChip", ModTabList.ModCircuitsTab)), - EngravedManyullynCrystalChip(new ModSimpleBaseItem("EngravedManyullynCrystalChip", ModTabList.ModCircuitsTab)), - EngravedQuantumChip(new ModSimpleBaseItem("EngravedQuantumChip", ModTabList.ModCircuitsTab)), - EnrichedNaquadriaSunnariumAlloy(new ModSimpleBaseItem("EnrichedNaquadriaSunnariumAlloy", ModTabList.ModSolarTab)), - EnrichedNaquadriaNeutroniumSunnariumAlloy( - new ModSimpleBaseItem("EnrichedNaquadriaNeutroniumSunnariumAlloy", ModTabList.ModSolarTab)), - EnrichedXSunnariumAlloy(new ModSimpleBaseItem("EnrichedXSunnariumAlloy", ModTabList.ModSolarTab)), - EnvironmentalCircuit(new ModSimpleBaseItem("EnvironmentalCircuit", ModTabList.ModCircuitsTab)), - EssentiaCircuit(new ModSimpleBaseItem("EssentiaCircuit", ModTabList.ModCircuitsTab)), - EtchedLowVoltageWiring(new ModSimpleBaseItem("EtchedLowVoltageWiring", ModTabList.ModCircuitsTab)), - EtchedInsaneVoltageWiring(new ModSimpleBaseItem("EtchedInsaneVoltageWiring", ModTabList.ModCircuitsTab)), - EtchedLudicrousVoltageWiring(new ModSimpleBaseItem("EtchedLudicrousVoltageWiring", ModTabList.ModCircuitsTab)), - EuropaIceDust(new ModSimpleBaseItem("EuropaIceDust", ModTabList.ModSpaceTab)), - EuropaStoneDust(new ModSimpleBaseItem("EuropaStoneDust", ModTabList.ModSpaceTab)), - ExtraLargeFuelCanister(new ModSimpleBaseItem("ExtraLargeFuelCanister", ModTabList.ModSpaceTab)), - ExtruderShapeBoat(new ModSimpleBaseItem("ExtruderShapeBoat", ModTabList.ModShapesTab)), - FieryBloodDrop(new ModSimpleBaseItem("FieryBloodDrop", ModTabList.ModThaumcraftTab)), - GanymedeStoneDust(new ModSimpleBaseItem("GanymedeStoneDust", ModTabList.ModSpaceTab)), - GeneticCircuit(new ModSimpleBaseItem("GeneticCircuit", ModTabList.ModCircuitsTab)), - GlowingMarshmallow(new ModSimpleBaseItem("GlowingMarshmallow", ModTabList.ModThaumcraftTab)), - GoldCoreChip(new ModSimpleBaseItem("GoldCoreChip", ModTabList.ModCircuitsTab)), - GoldWandCap(new ModSimpleBaseItem("GoldWandCap", ModTabList.ModThaumcraftTab)), - HeavyDutyAlloyIngotT4(new ModSimpleBaseItem("HeavyDutyAlloyIngotT4", ModTabList.ModSpaceTab)), - HeavyDutyAlloyIngotT5(new ModSimpleBaseItem("HeavyDutyAlloyIngotT5", ModTabList.ModSpaceTab)), - HeavyDutyAlloyIngotT6(new ModSimpleBaseItem("HeavyDutyAlloyIngotT6", ModTabList.ModSpaceTab)), - HeavyDutyAlloyIngotT7(new ModSimpleBaseItem("HeavyDutyAlloyIngotT7", ModTabList.ModSpaceTab)), - HeavyDutyAlloyIngotT8(new ModSimpleBaseItem("HeavyDutyAlloyIngotT8", ModTabList.ModSpaceTab)), - HeavyDutyAlloyIngotT9(new ModSimpleBaseItem("HeavyDutyAlloyIngotT9", ModTabList.ModSpaceTab)), - HeavyDutyNoseConeTier3(new ModSimpleBaseItem("HeavyDutyNoseConeTier3", ModTabList.ModSpaceTab)), - HeavyDutyNoseConeTier4(new ModSimpleBaseItem("HeavyDutyNoseConeTier4", ModTabList.ModSpaceTab)), - HeavyDutyPlateTier4(new ModSimpleBaseItem("HeavyDutyPlateTier4", ModTabList.ModSpaceTab)), - HeavyDutyPlateTier5(new ModSimpleBaseItem("HeavyDutyPlateTier5", ModTabList.ModSpaceTab)), - HeavyDutyPlateTier6(new ModSimpleBaseItem("HeavyDutyPlateTier6", ModTabList.ModSpaceTab)), - HeavyDutyPlateTier7(new ModSimpleBaseItem("HeavyDutyPlateTier7", ModTabList.ModSpaceTab)), - HeavyDutyPlateTier8(new ModSimpleBaseItem("HeavyDutyPlateTier8", ModTabList.ModSpaceTab)), - HeavyDutyRocketEngineTier3(new ModSimpleBaseItem("HeavyDutyRocketEngineTier3", ModTabList.ModSpaceTab)), - HeavyDutyRocketEngineTier4(new ModSimpleBaseItem("HeavyDutyRocketEngineTier4", ModTabList.ModSpaceTab)), - HeavyDutyRocketFinsTier3(new ModSimpleBaseItem("HeavyDutyRocketFinsTier3", ModTabList.ModSpaceTab)), - HeavyDutyRocketFinsTier4(new ModSimpleBaseItem("HeavyDutyRocketFinsTier4", ModTabList.ModSpaceTab)), - HighEnergyCircuitParts(new ModSimpleBaseItem("HighEnergyCircuitParts", ModTabList.ModCircuitsTab)), - HighEnergyFlowCircuit(new ModSimpleBaseItem("HighEnergyFlowCircuit", ModTabList.ModCircuitsTab)), - IceCompressedPlate(new ModSimpleBaseItem("IceCompressedPlate", ModTabList.ModSpaceTab)), - IceDualCompressedPlates(new ModSimpleBaseItem("IceDualCompressedPlates", ModTabList.ModSpaceTab)), - IchoriumCap(new ModSimpleBaseItem("IchoriumCap", ModTabList.ModThaumcraftTab)), - IndustryFrame(new ModSimpleBaseItem("IndustryFrame", ModTabList.ModGenericTab)), - InfernalBrick(new ModSimpleBaseItem("InfernalBrick", ModTabList.ModGenericTab)), - IoStoneDust(new ModSimpleBaseItem("IoStoneDust", ModTabList.ModSpaceTab)), - IridiumBars(new ModSimpleBaseItem("IridiumBars", ModTabList.ModBarsAndCasingsTab)), - IridiumAlloyItemCasing(new ModSimpleBaseItem("IridiumAlloyItemCasing", ModTabList.ModBarsAndCasingsTab)), - IrradiantReinforcedAluminiumPlate( - new ModSimpleBaseItem("IrradiantReinforcedAluminiumPlate", ModTabList.ModSolarTab)), - IrradiantReinforcedBedrockiumPlate( - new ModSimpleBaseItem("IrradiantReinforcedBedrockiumPlate", ModTabList.ModSolarTab)), - IrradiantReinforcedChromePlate(new ModSimpleBaseItem("IrradiantReinforcedChromePlate", ModTabList.ModSolarTab)), - IrradiantReinforcedNaquadriaPlate( - new ModSimpleBaseItem("IrradiantReinforcedNaquadriaPlate", ModTabList.ModSolarTab)), - IrradiantReinforcedNeutroniumPlate( - new ModSimpleBaseItem("IrradiantReinforcedNeutroniumPlate", ModTabList.ModSolarTab)), - IrradiantReinforcedTitaniumPlate(new ModSimpleBaseItem("IrradiantReinforcedTitaniumPlate", ModTabList.ModSolarTab)), - IrradiantReinforcedTungstenPlate(new ModSimpleBaseItem("IrradiantReinforcedTungstenPlate", ModTabList.ModSolarTab)), - IrradiantReinforcedTungstenSteelPlate( - new ModSimpleBaseItem("IrradiantReinforcedTungstenSteelPlate", ModTabList.ModSolarTab)), - IronWandCap(new ModSimpleBaseItem("IronWandCap", ModTabList.ModThaumcraftTab)), - IronDualCompressedPlates(new ModSimpleBaseItem("IronDualCompressedPlates", ModTabList.ModSpaceTab)), - HaumeaStoneDust(new ModSimpleBaseItem("HaumeaStoneDust", ModTabList.ModSpaceTab)), - HotNetherrackBrick(new ModSimpleBaseItem("HotNetherrackBrick", ModTabList.ModGenericTab)), - LapotronDust(new ModSimpleBaseItem("LapotronDust", ModTabList.ModCircuitsTab)), - LargeFuelCanister(new ModSimpleBaseItem("LargeFuelCanister", ModTabList.ModSpaceTab)), - LaserEmitter(new ModSimpleBaseItem("LaserEmitter", ModTabList.ModGenericTab)), - LeadNickelPlate(new ModSimpleBaseItem("LeadNickelPlate", ModTabList.ModSpaceTab)), - LeadOriharukonPlate(new ModSimpleBaseItem("LeadOriharukonPlate", ModTabList.ModSpaceTab)), - LedoxCompressedPlate(new ModSimpleBaseItem("LedoxCompressedPlate", ModTabList.ModSpaceTab)), - LichBone(new ModSimpleBaseItem("LichBone", ModTabList.ModThaumcraftTab)), - LichBoneChip(new ModSimpleBaseItem("LichBoneChip", ModTabList.ModThaumcraftTab)), - LichBoneFragment(new ModSimpleBaseItem("LichBoneFragment", ModTabList.ModThaumcraftTab)), - LogicProcessorItemGoldCore(new ModSimpleBaseItem("LogicProcessorItemGoldCore", ModTabList.ModCircuitsTab)), - LightShaft(new ModSimpleBaseItem("LightShaft", ModTabList.ModSpaceTab)), - LightBinding(new ModSimpleBaseItem("LightBinding", ModTabList.ModSpaceTab)), - LightAxeHead(new ModSimpleBaseItem("LightAxeHead", ModTabList.ModSpaceTab)), - LightPickaxeHead(new ModSimpleBaseItem("LightPickaxeHead", ModTabList.ModSpaceTab)), - LightSwordBlade(new ModSimpleBaseItem("LightSwordBlade", ModTabList.ModSpaceTab)), - LongObsidianRod(new ModSimpleBaseItem("LongObsidianRod", ModTabList.ModGenericTab)), - LongStoneRod(new ModSimpleBaseItem("LongStoneRod", ModTabList.ModGenericTab)), - MagicianOrb(new ModSimpleBaseItem("MagicianOrb", ModTabList.ModThaumcraftTab)), - MarsStoneDust(new ModSimpleBaseItem("MarsStoneDust", ModTabList.ModSpaceTab)), - NanoCircuit(new ModSimpleBaseItem("NanoCircuit", ModTabList.ModCircuitsTab)), - MaceratedPlantmass(new ModSimpleBaseItem("MaceratedPlantmass", ModTabList.ModGenericTab)), - MakeMakeStoneDust(new ModSimpleBaseItem("MakeMakeStoneDust", ModTabList.ModSpaceTab)), - MalformedSlush(new ModSimpleBaseItem("MalformedSlush", ModTabList.ModThaumcraftTab)), - Marshmallow(new ModSimpleBaseItem("Marshmallow", ModTabList.ModThaumcraftTab)), - ManyullynCrystal(new ModSimpleBaseItem("ManyullynCrystal", ModTabList.ModGenericTab)), - MarshmallowForm(new ModSimpleBaseItem("MarshmallowForm", ModTabList.ModThaumcraftTab)), - MarshmallowFormMold(new ModSimpleBaseItem("MarshmallowFormMold", ModTabList.ModThaumcraftTab)), - MasterOrb(new ModSimpleBaseItem("MasterOrb", ModTabList.ModThaumcraftTab)), - MediumFuelCanister(new ModSimpleBaseItem("MediumFuelCanister", ModTabList.ModSpaceTab)), - MercuryCoreDust(new ModSimpleBaseItem("MercuryCoreDust", ModTabList.ModSpaceTab)), - MercuryStoneDust(new ModSimpleBaseItem("MercuryStoneDust", ModTabList.ModSpaceTab)), - MeteoricIronString(new ModSimpleBaseItem("MeteoricIronString", ModTabList.ModSpaceTab)), - MeteoricIronDualCompressedPlates(new ModSimpleBaseItem("MeteoricIronDualCompressedPlates", ModTabList.ModSpaceTab)), - MirandaStoneDust(new ModSimpleBaseItem("MirandaStoneDust", ModTabList.ModSpaceTab)), - TuffDust(new ModSimpleBaseItem("TuffDust", ModTabList.ModGenericTab)), - ChaoticDust(new ModSimpleBaseItem("ChaoticDust", ModTabList.ModGenericTab)), - DeepslateDust(new ModSimpleBaseItem("DeepslateDust", ModTabList.ModGenericTab)), - MoldChestplate(new ModSimpleBaseItem("MoldChestplate", ModTabList.ModMoldsTab)), - MoldHelmet(new ModSimpleBaseItem("MoldHelmet", ModTabList.ModMoldsTab)), - MoldLeggings(new ModSimpleBaseItem("MoldLeggings", ModTabList.ModMoldsTab)), - MoldFormLeggings(new ModSimpleBaseItem("MoldFormLeggings", ModTabList.ModMoldsTab)), - MoldFormHelmet(new ModSimpleBaseItem("MoldFormHelmet", ModTabList.ModMoldsTab)), - MoldFormChestplate(new ModSimpleBaseItem("MoldFormChestplate", ModTabList.ModMoldsTab)), - MoldFormBoots(new ModSimpleBaseItem("MoldFormBoots", ModTabList.ModMoldsTab)), - MoldBoots(new ModSimpleBaseItem("MoldBoots", ModTabList.ModMoldsTab)), - MoldFormAnvil(new ModSimpleBaseItem("MoldFormAnvil", ModTabList.ModMoldsTab)), - MoldFormArrowHead(new ModSimpleBaseItem("MoldFormArrowHead", ModTabList.ModMoldsTab)), - MoldFormBaguette(new ModSimpleBaseItem("MoldFormBaguette", ModTabList.ModMoldsTab)), - MoldFormBall(new ModSimpleBaseItem("MoldFormBall", ModTabList.ModMoldsTab)), - MoldFormBlock(new ModSimpleBaseItem("MoldFormBlock", ModTabList.ModMoldsTab)), - MoldFormBolt(new ModSimpleBaseItem("MoldFormBolt", ModTabList.ModMoldsTab)), - MoldFormBottle(new ModSimpleBaseItem("MoldFormBottle", ModTabList.ModMoldsTab)), - MoldFormBread(new ModSimpleBaseItem("MoldFormBread", ModTabList.ModMoldsTab)), - MoldFormBuns(new ModSimpleBaseItem("MoldFormBuns", ModTabList.ModMoldsTab)), - MoldFormCasing(new ModSimpleBaseItem("MoldFormCasing", ModTabList.ModMoldsTab)), - MoldFormCoinage(new ModSimpleBaseItem("MoldFormCoinage", ModTabList.ModMoldsTab)), - MoldFormCylinder(new ModSimpleBaseItem("MoldFormCylinder", ModTabList.ModMoldsTab)), - MoldFormGear(new ModSimpleBaseItem("MoldFormGear", ModTabList.ModMoldsTab)), - MoldFormIngot(new ModSimpleBaseItem("MoldFormIngot", ModTabList.ModMoldsTab)), - MoldFormName(new ModSimpleBaseItem("MoldFormName", ModTabList.ModMoldsTab)), - MoldFormNuggets(new ModSimpleBaseItem("MoldFormNuggets", ModTabList.ModMoldsTab)), - MoldFormPlate(new ModSimpleBaseItem("MoldFormPlate", ModTabList.ModMoldsTab)), - MoldFormRing(new ModSimpleBaseItem("MoldFormRing", ModTabList.ModMoldsTab)), - MoldFormRound(new ModSimpleBaseItem("MoldFormRound", ModTabList.ModMoldsTab)), - MoldFormRotor(new ModSimpleBaseItem("MoldFormRotor", ModTabList.ModMoldsTab)), - MoldFormScrew(new ModSimpleBaseItem("MoldFormScrew", ModTabList.ModMoldsTab)), - MoldFormSmallGear(new ModSimpleBaseItem("MoldFormSmallGear", ModTabList.ModMoldsTab)), - MoldFormStick(new ModSimpleBaseItem("MoldFormStick", ModTabList.ModMoldsTab)), - MoldFormStickLong(new ModSimpleBaseItem("MoldFormStickLong", ModTabList.ModMoldsTab)), - MoldFormTurbineBlade(new ModSimpleBaseItem("MoldFormTurbineBlade", ModTabList.ModMoldsTab)), - MoldFormPipeTiny(new ModSimpleBaseItem("MoldFormPipeTiny", ModTabList.ModMoldsTab)), - MoldFormPipeSmall(new ModSimpleBaseItem("MoldFormPipeSmall", ModTabList.ModMoldsTab)), - MoldFormPipeMedium(new ModSimpleBaseItem("MoldFormPipeMedium", ModTabList.ModMoldsTab)), - MoldFormPipeLarge(new ModSimpleBaseItem("MoldFormPipeLarge", ModTabList.ModMoldsTab)), - MoldFormPipeHuge(new ModSimpleBaseItem("MoldFormPipeHuge", ModTabList.ModMoldsTab)), - MoldFormDrillHead(new ModSimpleBaseItem("MoldFormDrillHead", ModTabList.ModMoldsTab)), - MoonStoneDust(new ModSimpleBaseItem("MoonStoneDust", ModTabList.ModGenericTab)), - MushroomPowder(new ModSimpleBaseItem("MushroomPowder", ModTabList.ModGenericTab)), - MutatedEgg(new ModSimpleBaseItem("MutatedEgg", ModTabList.ModGenericTab)), - MysteriousCrystal(new ModSimpleBaseItem("MysteriousCrystal", ModTabList.ModSpaceTab)), - MysteriousCrystalGemExquisite(new ModSimpleBaseItem("MysteriousCrystalGemExquisite", ModTabList.ModSpaceTab)), - MysteriousCrystalGemFlawless(new ModSimpleBaseItem("MysteriousCrystalGemFlawless", ModTabList.ModSpaceTab)), - MysteriousCrystalLens(new ModSimpleBaseItem("MysteriousCrystalLens", ModTabList.ModSpaceTab)), - MysteriousCrystalCompressedPlate(new ModSimpleBaseItem("MysteriousCrystalCompressedPlate", ModTabList.ModSpaceTab)), - MysteriousCrystalDualCompressedPlates( - new ModSimpleBaseItem("MysteriousCrystalDualCompressedPlates", ModTabList.ModSpaceTab)), - MytrylCrystal(new ModSimpleBaseItem("MytrylCrystal", ModTabList.ModSpaceTab)), - MytrylCompressedPlate(new ModSimpleBaseItem("MytrylCompressedPlate", ModTabList.ModSpaceTab)), - MytrylDualCompressedPlates(new ModSimpleBaseItem("MytrylDualCompressedPlates", ModTabList.ModSpaceTab)), - NagaScaleChip(new ModSimpleBaseItem("NagaScaleChip", ModTabList.ModThaumcraftTab)), - NagaScaleFragment(new ModSimpleBaseItem("NagaScaleFragment", ModTabList.ModThaumcraftTab)), - NanoCrystal(new ModSimpleBaseItem("NanoCrystal", ModTabList.ModCircuitsTab)), - NanoBoard(new ModSimpleBaseItem("NanoBoard", ModTabList.ModCircuitsTab)), - NanoProcessorBoard(new ModSimpleBaseItem("NanoProcessorBoard", ModTabList.ModCircuitsTab)), - NanoChestJetPack(new ModSimpleBaseItem("NanoChestJetPack", ModTabList.ModGenericTab)), - NanoPlatedLeggings(new ModSimpleBaseItem("NanoPlatedLeggings", ModTabList.ModGenericTab)), - NanoRubberBoots(new ModSimpleBaseItem("NanoRubberBoots", ModTabList.ModGenericTab)), - NanoScubaHelmet(new ModSimpleBaseItem("NanoScubaHelmet", ModTabList.ModGenericTab)), - NaquadriaIronPlate(new ModSimpleBaseItem("NaquadriaIronPlate", ModTabList.ModSolarTab)), - NeutroniumBars(new ModSimpleBaseItem("NeutroniumBars", ModTabList.ModBarsAndCasingsTab)), - NeutroniumIronPlate(new ModSimpleBaseItem("NeutroniumIronPlate", ModTabList.ModSolarTab)), - NeutronReflectorSmallParts(new ModSimpleBaseItem("NeutronReflectorSmallParts", ModTabList.ModCircuitsTab)), - NeutronReflectorParts(new ModSimpleBaseItem("NeutronReflectorParts", ModTabList.ModCircuitsTab)), - NetherStarFragment(new ModSimpleBaseItem("NetherStarFragment", ModTabList.ModGenericTab)), - Nothing(new ModSimpleBaseItem("Nothing", ModTabList.ModGenericTab)), - PikoCircuit(new ModSimpleBaseItem("PikoCircuit", ModTabList.ModCircuitsTab)), - PistonPlate(new ModSimpleBaseItem("PistonPlate", ModTabList.ModGenericTab)), - PhobosStoneDust(new ModSimpleBaseItem("PhobosStoneDust", ModTabList.ModSpaceTab)), - PlutoIceDust(new ModSimpleBaseItem("PlutoIceDust", ModTabList.ModSpaceTab)), - PlutoStoneDust(new ModSimpleBaseItem("PlutoStoneDust", ModTabList.ModSpaceTab)), - PotassiumHydroxideDust(new ModSimpleBaseItem("PotassiumHydroxideDust", ModTabList.ModGenericTab)), - PrimordialPearlFragment(new ModSimpleBaseItem("PrimordialPearlFragment", ModTabList.ModThaumcraftTab)), - ProteusStoneDust(new ModSimpleBaseItem("ProteusStoneDust", ModTabList.ModSpaceTab)), - PulsatingIronBars(new ModSimpleBaseItem("PulsatingIronBars", ModTabList.ModBarsAndCasingsTab)), - PulsatingSpatialCoreChip(new ModSimpleBaseItem("PulsatingSpatialCoreChip", ModTabList.ModCircuitsTab)), - OberonStoneDust(new ModSimpleBaseItem("OberonStoneDust", ModTabList.ModSpaceTab)), - OsmiumBars(new ModSimpleBaseItem("OsmiumBars", ModTabList.ModBarsAndCasingsTab)), - QuantinumCompressedPlate(new ModSimpleBaseItem("QuantinumCompressedPlate", ModTabList.ModSpaceTab)), - QuantinumDualCompressedPlates(new ModSimpleBaseItem("QuantinumDualCompressedPlates", ModTabList.ModSpaceTab)), - QuantumCircuit(new ModSimpleBaseItem("QuantumCircuit", ModTabList.ModCircuitsTab)), - QuantumCrystal(new ModSimpleBaseItem("QuantumCrystal", ModTabList.ModCircuitsTab)), - QuantumPartBoots(new ModSimpleBaseItem("QuantumPartBoots", ModTabList.ModGenericTab)), - QuantumPartChestplate(new ModSimpleBaseItem("QuantumPartChestplate", ModTabList.ModGenericTab)), - QuantumPartHelmet(new ModSimpleBaseItem("QuantumPartHelmet", ModTabList.ModGenericTab)), - QuantumPartHelmetEmpty(new ModSimpleBaseItem("QuantumPartHelmetEmpty", ModTabList.ModGenericTab)), - QuantumPartLeggings(new ModSimpleBaseItem("QuantumPartLeggings", ModTabList.ModGenericTab)), - QuantumBoard(new ModSimpleBaseItem("QuantumBoard", ModTabList.ModCircuitsTab)), - QuantumProcessorBoard(new ModSimpleBaseItem("QuantumProcessorBoard", ModTabList.ModCircuitsTab)), - RawBioFiber(new ModSimpleBaseItem("RawBioFiber", ModTabList.ModGenericTab)), - RawLapotronCrystal(new ModSimpleBaseItem("RawLapotronCrystal", ModTabList.ModCircuitsTab)), - RawPicoWafer(new ModSimpleBaseItem("RawPicoWafer", ModTabList.ModCircuitsTab)), - PicoWafer(new ModSimpleBaseItem("PicoWafer", ModTabList.ModCircuitsTab)), - // AdvancedPicoWafer(new ModSimpleBaseItem("AdvancedPicoWafer",ModTabList.ModCircuitsTab)), - RawMytryl(new ModSimpleBaseItem("RawMytryl", ModTabList.ModSpaceTab)), - RawNeutronium(new ModSimpleBaseItem("RawNeutronium", ModTabList.ModSpaceTab)), - RawOrbTier1(new ModSimpleBaseItem("RawOrbTier1", ModTabList.ModThaumcraftTab)), - RawOrbTier2(new ModSimpleBaseItem("RawOrbTier2", ModTabList.ModThaumcraftTab)), - RawOrbTier3(new ModSimpleBaseItem("RawOrbTier3", ModTabList.ModThaumcraftTab)), - RawOrbTier4(new ModSimpleBaseItem("RawOrbTier4", ModTabList.ModThaumcraftTab)), - RawOrbTier5(new ModSimpleBaseItem("RawOrbTier5", ModTabList.ModThaumcraftTab)), - RawOrbTier6(new ModSimpleBaseItem("RawOrbTier6", ModTabList.ModThaumcraftTab)), - RawSDHCAlloy(new ModSimpleBaseItem("RawSDHCAlloy", ModTabList.ModSpaceTab)), - RedstoneAlloyBars(new ModSimpleBaseItem("RedstoneAlloyBars", ModTabList.ModBarsAndCasingsTab)), - ReinforcedGlassPlate(new ModSimpleBaseItem("ReinforcedGlassPlate", ModTabList.ModGenericTab)), - ReinforcedGlassLense(new ModSimpleBaseItem("ReinforcedGlassLense", ModTabList.ModGenericTab)), - ReinforcedIridiumDrillTip(new ModSimpleBaseItem("ReinforcedIridiumDrillTip", ModTabList.ModGenericTab)), - ReinforcedAluminiumIronPlate(new ModSimpleBaseItem("ReinforcedAluminiumIronPlate", ModTabList.ModSolarTab)), - ReinforcedBedrockiumIronPlate(new ModSimpleBaseItem("ReinforcedBedrockiumIronPlate", ModTabList.ModSolarTab)), - ReinforcedChromeIronPlate(new ModSimpleBaseItem("ReinforcedChromeIronPlate", ModTabList.ModSolarTab)), - ReinforcedNaquadriaIronPlate(new ModSimpleBaseItem("ReinforcedNaquadriaIronPlate", ModTabList.ModSolarTab)), - ReinforcedNeutroniumIronPlate(new ModSimpleBaseItem("ReinforcedNeutroniumIronPlate", ModTabList.ModSolarTab)), - ReinforcedTitaniumIronPlate(new ModSimpleBaseItem("ReinforcedTitaniumIronPlate", ModTabList.ModSolarTab)), - ReinforcedTungstenIronPlate(new ModSimpleBaseItem("ReinforcedTungstenIronPlate", ModTabList.ModSolarTab)), - ReinforcedTungstenSteelIronPlate(new ModSimpleBaseItem("ReinforcedTungstenSteelIronPlate", ModTabList.ModSolarTab)), - RuneOfPowerFragment(new ModSimpleBaseItem("RuneOfPowerFragment", ModTabList.ModGenericTab)), - RuneOfAgilityFragment(new ModSimpleBaseItem("RuneOfAgilityFragment", ModTabList.ModGenericTab)), - RuneOfVigorFragment(new ModSimpleBaseItem("RuneOfVigorFragment", ModTabList.ModGenericTab)), - RuneOfDefenseFragment(new ModSimpleBaseItem("RuneOfDefenseFragment", ModTabList.ModGenericTab)), - RuneOfMagicFragment(new ModSimpleBaseItem("RuneOfMagicFragment", ModTabList.ModGenericTab)), - RuneOfVoidFragment(new ModSimpleBaseItem("RuneOfVoidFragment", ModTabList.ModGenericTab)), - SandStoneRod(new ModSimpleBaseItem("SandStoneRod", ModTabList.ModGenericTab)), - SawBladeStone(new ModSimpleBaseItem("SawBladeStone", ModTabList.ModGenericTab)), - SawBladeDiamond(new ModSimpleBaseItem("SawBladeDiamond", ModTabList.ModGenericTab)), - SawBladeArdite(new ModSimpleBaseItem("SawBladeArdite", ModTabList.ModGenericTab)), - SawBladeManyullyn(new ModSimpleBaseItem("SawBladeManyullyn", ModTabList.ModGenericTab)), - SawBladeRuby(new ModSimpleBaseItem("SawBladeRuby", ModTabList.ModGenericTab)), - SawBladeSapphire(new ModSimpleBaseItem("SawBladeSapphire", ModTabList.ModGenericTab)), - SawBladePeridot(new ModSimpleBaseItem("SawBladePeridot", ModTabList.ModGenericTab)), - SchematicsAstroMiner(new ModSimpleBaseItem("SchematicsAstroMiner", ModTabList.ModSpaceTab)), - SchematicsCargoRocket(new ModSimpleBaseItem("SchematicsCargoRocket", ModTabList.ModSpaceTab)), - SchematicsMoonBuggy(new ModSimpleBaseItem("SchematicsMoonBuggy", ModTabList.ModSpaceTab)), - SchematicsTier1(new ModSimpleBaseItem("SchematicsTier1", ModTabList.ModSpaceTab)), - SchematicsTier2(new ModSimpleBaseItem("SchematicsTier2", ModTabList.ModSpaceTab)), - SchematicsTier3(new ModSimpleBaseItem("SchematicsTier3", ModTabList.ModSpaceTab)), - SchematicsTier4(new ModSimpleBaseItem("SchematicsTier4", ModTabList.ModSpaceTab)), - SchematicsTier5(new ModSimpleBaseItem("SchematicsTier5", ModTabList.ModSpaceTab)), - SchematicsTier6(new ModSimpleBaseItem("SchematicsTier6", ModTabList.ModSpaceTab)), - SchematicsTier7(new ModSimpleBaseItem("SchematicsTier7", ModTabList.ModSpaceTab)), - SchematicsTier8(new ModSimpleBaseItem("SchematicsTier8", ModTabList.ModSpaceTab)), - ShadowImbuedClothCap(new ModSimpleBaseItem("ShadowImbuedClothCap", ModTabList.ModThaumcraftTab)), - ShadowmetalCap(new ModSimpleBaseItem("ShadowmetalCap", ModTabList.ModThaumcraftTab)), - ShapeAxeHead(new ModSimpleBaseItem("ShapeAxeHead", ModTabList.ModShapesTab)), - ShapeBlock(new ModSimpleBaseItem("ShapeBlock", ModTabList.ModShapesTab)), - ShapeBoat(new ModSimpleBaseItem("ShapeBoat", ModTabList.ModShapesTab)), - ShapeBolt(new ModSimpleBaseItem("ShapeBolt", ModTabList.ModShapesTab)), - ShapeBottle(new ModSimpleBaseItem("ShapeBottle", ModTabList.ModShapesTab)), - ShapeCasing(new ModSimpleBaseItem("ShapeCasing", ModTabList.ModShapesTab)), - ShapeCell(new ModSimpleBaseItem("ShapeCell", ModTabList.ModShapesTab)), - ShapeFileHead(new ModSimpleBaseItem("ShapeFileHead", ModTabList.ModShapesTab)), - ShapeGear(new ModSimpleBaseItem("ShapeGear", ModTabList.ModShapesTab)), - ShapeHammerHead(new ModSimpleBaseItem("ShapeHammerHead", ModTabList.ModShapesTab)), - ShapeHoeHead(new ModSimpleBaseItem("ShapeHoeHead", ModTabList.ModShapesTab)), - ShapeHugePipe(new ModSimpleBaseItem("ShapeHugePipe", ModTabList.ModShapesTab)), - ShapeIngot(new ModSimpleBaseItem("ShapeIngot", ModTabList.ModShapesTab)), - ShapeLargePipe(new ModSimpleBaseItem("ShapeLargePipe", ModTabList.ModShapesTab)), - ShapeNormalPipe(new ModSimpleBaseItem("ShapeNormalPipe", ModTabList.ModShapesTab)), - ShapePickaxeHead(new ModSimpleBaseItem("ShapePickaxeHead", ModTabList.ModShapesTab)), - ShapePlate(new ModSimpleBaseItem("ShapePlate", ModTabList.ModShapesTab)), - ShapeRing(new ModSimpleBaseItem("ShapeRing", ModTabList.ModShapesTab)), - ShapeRod(new ModSimpleBaseItem("ShapeRod", ModTabList.ModShapesTab)), - ShapeRotor(new ModSimpleBaseItem("ShapeRotor", ModTabList.ModShapesTab)), - ShapeSawBlade(new ModSimpleBaseItem("ShapeSawBlade", ModTabList.ModShapesTab)), - ShapeShovelHead(new ModSimpleBaseItem("ShapeShovelHead", ModTabList.ModShapesTab)), - ShapeSmallGear(new ModSimpleBaseItem("ShapeSmallGear", ModTabList.ModShapesTab)), - ShapeSmallPipe(new ModSimpleBaseItem("ShapeSmallPipe", ModTabList.ModShapesTab)), - ShapeSwordBlade(new ModSimpleBaseItem("ShapeSwordBlade", ModTabList.ModShapesTab)), - ShapeTinyPipe(new ModSimpleBaseItem("ShapeTinyPipe", ModTabList.ModShapesTab)), - ShapeTurbineBlade(new ModSimpleBaseItem("ShapeTurbineBlade", ModTabList.ModShapesTab)), - ShapeWire(new ModSimpleBaseItem("ShapeWire", ModTabList.ModShapesTab)), // DEPRECATED. remove in next major version - ShapeDrillHead(new ModSimpleBaseItem("ShapeDrillHead", ModTabList.ModShapesTab)), - SilverThread(new ModSimpleBaseItem("SilverThread", ModTabList.ModThaumcraftTab)), - SilveredFleece(new ModSimpleBaseItem("SilveredFleece", ModTabList.ModThaumcraftTab)), - SimpleCircuitBoard(new ModSimpleBaseItem("SimpleCircuitBoard", ModTabList.ModCircuitsTab)), - SnowQueenBlood(new ModSimpleBaseItem("SnowQueenBlood", ModTabList.ModThaumcraftTab)), - SnowQueenBloodDrop(new ModSimpleBaseItem("SnowQueenBloodDrop", ModTabList.ModThaumcraftTab)), - SoulariumBars(new ModSimpleBaseItem("SoulariumBars", ModTabList.ModBarsAndCasingsTab)), - StainlessSteelBars(new ModSimpleBaseItem("StainlessSteelBars", ModTabList.ModBarsAndCasingsTab)), - SteelBars(new ModSimpleBaseItem("SteelBars", ModTabList.ModBarsAndCasingsTab)), - SteelDualCompressedPlates(new ModSimpleBaseItem("SteelDualCompressedPlates", ModTabList.ModSpaceTab)), - StonePlate(new ModSimpleBaseItem("StonePlate", ModTabList.ModGenericTab)), - StargateFramePart(new ModSimpleBaseItem("StargateFramePart", ModTabList.ModSpaceTab)), - StargateChevron(new ModSimpleBaseItem("StargateChevron", ModTabList.ModSpaceTab)), - StargateShieldingFoil(new ModSimpleBaseItem("StargateShieldingFoil", ModTabList.ModSpaceTab)), - StargateCrystalDust(new ModSimpleBaseItem("StargateCrystalDust", ModTabList.ModSpaceTab)), - TCetiESeaweedExtract(new ModSimpleBaseItem("TCetiESeaweedExtract", ModTabList.ModSpaceTab)), - TCetiEStoneDust(new ModSimpleBaseItem("TCetiEStoneDust", ModTabList.ModSpaceTab)), - TeleposerFrame(new ModSimpleBaseItem("TeleposerFrame", ModTabList.ModThaumcraftTab)), - TheBigEgg(new ModSimpleBaseItem("TheBigEgg", ModTabList.ModGenericTab)), - Tier2Booster(new ModSimpleBaseItem("Tier2Booster", ModTabList.ModSpaceTab)), - Tier3Booster(new ModSimpleBaseItem("Tier3Booster", ModTabList.ModSpaceTab)), - Tier4Booster(new ModSimpleBaseItem("Tier4Booster", ModTabList.ModSpaceTab)), - TinDualCompressedPlates(new ModSimpleBaseItem("TinDualCompressedPlates", ModTabList.ModSpaceTab)), - TitaniumBars(new ModSimpleBaseItem("TitaniumBars", ModTabList.ModBarsAndCasingsTab)), - TitaniumDualCompressedPlates(new ModSimpleBaseItem("TitaniumDualCompressedPlates", ModTabList.ModSpaceTab)), - TitaniumIronPlate(new ModSimpleBaseItem("TitaniumIronPlate", ModTabList.ModSolarTab)), - TitanStoneDust(new ModSimpleBaseItem("TitanStoneDust", ModTabList.ModSpaceTab)), - TranscendentOrb(new ModSimpleBaseItem("TranscendentOrb", ModTabList.ModThaumcraftTab)), - TritonStoneDust(new ModSimpleBaseItem("TritonStoneDust", ModTabList.ModSpaceTab)), - TungstenBars(new ModSimpleBaseItem("TungstenBars", ModTabList.ModBarsAndCasingsTab)), - TungstenIronPlate(new ModSimpleBaseItem("TungstenIronPlate", ModTabList.ModSolarTab)), - TungstenSteelBars(new ModSimpleBaseItem("TungstenSteelBars", ModTabList.ModBarsAndCasingsTab)), - TungstenSteeLIronPlate(new ModSimpleBaseItem("TungstenSteelIronPlate", ModTabList.ModSolarTab)), - TungstenString(new ModSimpleBaseItem("TungstenString", ModTabList.ModSpaceTab)), - TwilightCrystal(new ModSimpleBaseItem("TwilightCrystal", ModTabList.ModGenericTab)), - UncookedSlush(new ModSimpleBaseItem("UncookedSlush", ModTabList.ModThaumcraftTab)), - UnfiredClayBrick(new ModSimpleBaseItem("UnfiredClayBrick", ModTabList.ModGenericTab)), - UnfiredCokeOvenBrick(new ModSimpleBaseItem("UnfiredCokeOvenBrick", ModTabList.ModGenericTab)), - UnfiredSearedBrick(new ModSimpleBaseItem("UnfiredSearedBrick", ModTabList.ModGenericTab)), - UnfiredSlimeSoilBrick(new ModSimpleBaseItem("UnfiredSlimeSoilBrick", ModTabList.ModGenericTab)), - VegaBStoneDust(new ModSimpleBaseItem("VegaBStoneDust", ModTabList.ModSpaceTab)), - VenusStoneDust(new ModSimpleBaseItem("VenusStoneDust", ModTabList.ModSpaceTab)), - VibrantAlloyBars(new ModSimpleBaseItem("VibrantAlloyBars", ModTabList.ModBarsAndCasingsTab)), - VinteumThread(new ModSimpleBaseItem("VinteumThread", ModTabList.ModThaumcraftTab)), - VoidEssence(new ModSimpleBaseItem("VoidEssence", ModTabList.ModThaumcraftTab)), - VoidSeed(new ModSimpleBaseItem("VoidSeed", ModTabList.ModThaumcraftTab)), - WaferTier3(new ModSimpleBaseItem("WaferTier3", ModTabList.ModSpaceTab)), - WandCapAlchemical(new ModSimpleBaseItem("WandCapAlchemical", ModTabList.ModThaumcraftTab)), - WandCapBloodIron(new ModSimpleBaseItem("WandCapBloodIron", ModTabList.ModThaumcraftTab)), - WandCapElementium(new ModSimpleBaseItem("WandCapElementium", ModTabList.ModThaumcraftTab)), - WandCapManaSteel(new ModSimpleBaseItem("WandCapManaSteel", ModTabList.ModThaumcraftTab)), - WandCapTerraSteel(new ModSimpleBaseItem("WandCapTerraSteel", ModTabList.ModThaumcraftTab)), - WandCapVinteum(new ModSimpleBaseItem("WandCapVinteum", ModTabList.ModThaumcraftTab)), - WandCapThauminite(new ModSimpleBaseItem("WandCapThauminite", ModTabList.ModThaumcraftTab)), - WeakOrb(new ModSimpleBaseItem("WeakOrb", ModTabList.ModThaumcraftTab)), - WetTofu(new ModSimpleBaseItem("WetTofu", ModTabList.ModGenericTab)), - WirelessTransmitter(new ModSimpleBaseItem("WirelessTransmitter", ModTabList.ModGenericTab)), - WoodenCasing(new ModSimpleBaseItem("WoodenCasing", ModTabList.ModGenericTab)), - MedalDerp(new ModSimpleBaseItem("MedalDerp", ModTabList.ModGenericTab)), - MedalGTExplosion(new ModSimpleBaseItem("MedalGTExplosion", ModTabList.ModGenericTab)), - MedalBuilder(new ModSimpleBaseItem("MedalBuilder", ModTabList.ModGenericTab)), - MedalEngineer(new ModSimpleBaseItem("MedalEngineer", ModTabList.ModGenericTab)), - MedalWarp(new ModSimpleBaseItem("MedalWarp", ModTabList.ModGenericTab)), - AluminoSilicateWool(new ModSimpleBaseItem("AluminoSilicateWool", ModTabList.ModGenericTab)), - EdibleSalt(new ModSimpleBaseItem("EdibleSalt", ModTabList.ModGenericTab)), - CircuitULV(new ModSimpleBaseItem("CircuitULV", ModTabList.ModCircuitsTab)), - CircuitLV(new ModSimpleBaseItem("CircuitLV", ModTabList.ModCircuitsTab)), - CircuitMV(new ModSimpleBaseItem("CircuitMV", ModTabList.ModCircuitsTab)), - CircuitHV(new ModSimpleBaseItem("CircuitHV", ModTabList.ModCircuitsTab)), - CircuitEV(new ModSimpleBaseItem("CircuitEV", ModTabList.ModCircuitsTab)), - CircuitIV(new ModSimpleBaseItem("CircuitIV", ModTabList.ModCircuitsTab)), - CircuitLuV(new ModSimpleBaseItem("CircuitLuV", ModTabList.ModCircuitsTab)), - CircuitZPM(new ModSimpleBaseItem("CircuitZPM", ModTabList.ModCircuitsTab)), - CircuitUV(new ModSimpleBaseItem("CircuitUV", ModTabList.ModCircuitsTab)), - CircuitUHV(new ModSimpleBaseItem("CircuitUHV", ModTabList.ModCircuitsTab)), - CircuitUEV(new ModSimpleBaseItem("CircuitUEV", ModTabList.ModCircuitsTab)), - CircuitUIV(new ModSimpleBaseItem("CircuitUIV", ModTabList.ModCircuitsTab)), - CircuitUMV(new ModSimpleBaseItem("CircuitUMV", ModTabList.ModCircuitsTab)), - CircuitUXV(new ModSimpleBaseItem("CircuitUXV", ModTabList.ModCircuitsTab)), - CircuitMAX(new ModSimpleBaseItem("CircuitMAX", ModTabList.ModCircuitsTab)), - RadoxPolymerLens(new ModSimpleBaseItem("RadoxPolymerLens", ModTabList.ModSpaceTab)), - ChromaticLens(new ModSimpleBaseItem("ChromaticLens", ModTabList.ModSpaceTab)), - ChromaticGem(new ModSimpleBaseItem("ChromaticGem", ModTabList.ModSpaceTab)), - ChromaticGemFlawless(new ModSimpleBaseItem("ChromaticGemFlawless", ModTabList.ModSpaceTab)), - ChromaticGemExquisite(new ModSimpleBaseItem("ChromaticGemExquisite", ModTabList.ModSpaceTab)), - NanoCircuitOrigin(new ModSimpleBaseItem("OriginNanoCircuit", ModTabList.ModSpaceTab)), - GatePlateOrigin(new ModSimpleBaseItem("OriginGatePlate", ModTabList.ModSpaceTab)), - ChevronOrigin(new ModSimpleBaseItem("OriginChevron", ModTabList.ModSpaceTab)), - FramePartOrigin(new ModSimpleBaseItem("OriginFramePart", ModTabList.ModSpaceTab)), - PikoCircuitPolychrome(new ModSimpleBaseItem("PolychromePikoCircuit", ModTabList.ModSpaceTab)), - QuantumCircuitPolychrome(new ModSimpleBaseItem("PolychromeQuantumCircuit", ModTabList.ModSpaceTab)), - GatePlatePolychrome(new ModSimpleBaseItem("PolychromeGatePlate", ModTabList.ModSpaceTab)), - ChevronPolychrome(new ModSimpleBaseItem("PolychromeChevron", ModTabList.ModSpaceTab)), - FramePartPolychrome(new ModSimpleBaseItem("PolychromeFramePart", ModTabList.ModSpaceTab)), - PikoCircuitDimensional(new ModSimpleBaseItem("DimensionalPikoCircuit", ModTabList.ModSpaceTab)), - QuantumCircuitDimensional(new ModSimpleBaseItem("DimensionalQuantumCircuit", ModTabList.ModSpaceTab)), - GatePlateDimensional(new ModSimpleBaseItem("DimensionalGatePlate", ModTabList.ModSpaceTab)), - ChevronDimensional(new ModSimpleBaseItem("DimensionalChevron", ModTabList.ModSpaceTab)), - FramePartDimensional(new ModSimpleBaseItem("DimensionalFramePart", ModTabList.ModSpaceTab)), - GatePlateHarmonic(new ModSimpleBaseItem("HarmonicGatePlate", ModTabList.ModSpaceTab)), - ChevronHarmonic(new ModSimpleBaseItem("HarmonicChevron", ModTabList.ModSpaceTab)), - FramePartHarmonic(new ModSimpleBaseItem("HarmonicFramePart", ModTabList.ModSpaceTab)), - StargateDustAncients(new ModSimpleBaseItem("StargateDustAncients", ModTabList.ModSpaceTab)), - StargateCrystalAncients(new ModSimpleBaseItem("StargateCrystalAncients", ModTabList.ModSpaceTab)), + // ===== Complex Items ===== + OvenGlove("OvenGlove", new OvenGlove(), GENERIC), + WitherProtectionRing("WitherProtectionRing", new WitherProtectionRing(), THAUMCRAFT), + WoodenBrickForm("WoodenBrickForm", new WoodenBrickForm(), GENERIC), + QuantumBread("QuantumBread", new QuantumBread(), GENERIC), + BowFletchingCast("BowFletchingCast", new CustomPattern(), MOLDS), + BowStringCast("BowStringCast", new CustomPattern(), MOLDS), - // Do not delete this - EndOfList(null); + // ===== Simple Items ===== + MicaBasedPulp("MicaBasedPulp", GENERIC), + MicaBasedSheet("MicaBasedSheet", GENERIC), + MicaInsulatorSheet("MicaInsulatorSheet", GENERIC), + MicaInsulatorFoil("MicaInsulatorFoil", GENERIC), + TenKCell("TenKCell", GENERIC), + ThirtyKCell("ThirtyKCell", GENERIC), + SixtyKCell("SixtyKCell", GENERIC), + Empty180SpCell("Empty180SpCell", GENERIC), + Empty360SpCell("Empty360SpCell", GENERIC), + Empty540SpCell("Empty540SpCell", GENERIC), + Empty1080SpCell("Empty1080SpCell", GENERIC), + AdsorptionFilterCasing("AdsorptionFilterCasing", GENERIC), + AdsorptionFilter("AdsorptionFilter", GENERIC), + AdsorptionFilterDirty("AdsorptionFilterDirty", GENERIC), + AluminiumBars("AluminiumBars", BARS_AND_CASINGS), + AluminiumIronPlate("AluminiumIronPlate", SOLAR), + AdvancedCokeOvenBrick("AdvancedCokeOvenBrick", GENERIC), + AdvancedCokeOvenBrickDust("AdvancedCokeOvenBrickDust", GENERIC), + AdvancedBoard("AdvancedBoard", CIRCUITS), + AdvancedProcessorBoard("AdvancedProcessorBoard", CIRCUITS), + ApprenticeOrb("ApprenticeOrb", THAUMCRAFT), + ArcaneSlate("ArcaneSlate", THAUMCRAFT), + ArchmageOrb("ArchmageOrb", THAUMCRAFT), + ArcaneShardChip("ArcaneShardChip", GENERIC), + ArcaneShardFragment("ArcaneShardFragment", GENERIC), + ArtificialLeather("ArtificialLeather", GENERIC), + AsteroidsStoneDust("AsteroidsStoneDust", GENERIC), + BarnardaEStoneDust("BarnardaEStoneDust", SPACE), + BarnardaFStoneDust("BarnardaFStoneDust", SPACE), + BioCarbonPlate("BioCarbonPlate", GENERIC), + BedrockiumIronPlate("BedrockiumIronPlate", SOLAR), + BioBall("BioBall", GENERIC), + BioOrganicMesh("BioOrganicMesh", GENERIC), + BioChunk("BioChunk", GENERIC), + Blaster("Blaster", THAUMCRAFT), + BloodVial("BloodVial", THAUMCRAFT), + CompressedBioBall("CompressedBioBall", GENERIC), + BlackPlutoniumCompressedPlate("BlackPlutoniumCompressedPlate", SPACE), + BlankPlatedChip("BlankPlatedChip", CIRCUITS), + CallistoIceCompressedPlate("CallistoIceCompressedPlate", SPACE), + CallistoStoneDust("CallistoStoneDust", SPACE), + CarbonPartBoots("CarbonPartBoots", GENERIC), + CarbonPartChestplate("CarbonPartChestplate", GENERIC), + CarbonPartHelmet("CarbonPartHelmet", GENERIC), + CarbonPartHelmetNightVision("CarbonPartHelmetNightVision", GENERIC), + CarbonPartLeggings("CarbonPartLeggings", GENERIC), + CarminiteChip("CarminiteChip", THAUMCRAFT), + CarminiteFragment("CarminiteFragment", THAUMCRAFT), + CentauriASurfaceDust("CentauriASurfaceDust", SPACE), + CentauriAStoneDust("CentauriAStoneDust", SPACE), + CeresStoneDust("CeresStoneDust", SPACE), + ChargedMechanistWandCap("ChargedMechanistWandCap", THAUMCRAFT), + ChargedSilverWandCap("ChargedSilverWandCap", THAUMCRAFT), + ChargedSojournerWandCap("ChargedSojournerWandCap", THAUMCRAFT), + ChargedThaumiumWandCap("ChargedThaumiumWandCap", THAUMCRAFT), + ChargedVoidWandCap("ChargedVoidWandCap", THAUMCRAFT), + ChargedCertusQuartzDust("ChargedCertusQuartzDust", GENERIC), + ChargedCertusQuartzPlate("ChargedCertusQuartzPlate", GENERIC), + ChargedCertusQuartzRod("ChargedCertusQuartzRod", GENERIC), + CoinChunkloaderTierI("CoinChunkloaderTierI", GENERIC), + CoinChunkloaderTierII("CoinChunkloaderTierII", GENERIC), + CoinChunkloaderTierIII("CoinChunkloaderTierIII", GENERIC), + CoinChunkloaderTierIV("CoinChunkloaderTierIV", GENERIC), + CoinChunkloaderTierV("CoinChunkloaderTierV", GENERIC), + CoinAdventure("CoinAdventure", GENERIC), + CoinAdventureI("CoinAdventureI", GENERIC), + CoinAdventureII("CoinAdventureII", GENERIC), + CoinAdventureIII("CoinAdventureIII", GENERIC), + CoinAdventureIV("CoinAdventureIV", GENERIC), + CoinBees("CoinBees", GENERIC), + CoinBeesI("CoinBeesI", GENERIC), + CoinBeesII("CoinBeesII", GENERIC), + CoinBeesIII("CoinBeesIII", GENERIC), + CoinBeesIV("CoinBeesIV", GENERIC), + CoinBlank("CoinBlank", GENERIC), + CoinBlankI("CoinBlankI", GENERIC), + CoinBlankII("CoinBlankII", GENERIC), + CoinBlankIII("CoinBlankIII", GENERIC), + CoinBlankIV("CoinBlankIV", GENERIC), + CoinBlood("CoinBlood", GENERIC), + CoinBloodI("CoinBloodI", GENERIC), + CoinBloodII("CoinBloodII", GENERIC), + CoinBloodIII("CoinBloodIII", GENERIC), + CoinBloodIV("CoinBloodIV", GENERIC), + CoinChemist("CoinChemist", GENERIC), + CoinChemistI("CoinChemistI", GENERIC), + CoinChemistII("CoinChemistII", GENERIC), + CoinChemistIII("CoinChemistIII", GENERIC), + CoinChemistIV("CoinChemistIV", GENERIC), + CoinCook("CoinCook", GENERIC), + CoinCookI("CoinCookI", GENERIC), + CoinCookII("CoinCookII", GENERIC), + CoinCookIII("CoinCookIII", GENERIC), + CoinCookIV("CoinCookIV", GENERIC), + CoinDarkWizard("CoinDarkWizard", GENERIC), + CoinDarkWizardI("CoinDarkWizardI", GENERIC), + CoinDarkWizardII("CoinDarkWizardII", GENERIC), + CoinDarkWizardIII("CoinDarkWizardIII", GENERIC), + CoinDarkWizardIV("CoinDarkWizardIV", GENERIC), + CoinFarmer("CoinFarmer", GENERIC), + CoinFarmerI("CoinFarmerI", GENERIC), + CoinFarmerII("CoinFarmerII", GENERIC), + CoinFarmerIII("CoinFarmerIII", GENERIC), + CoinFarmerIV("CoinFarmerIV", GENERIC), + CoinFlower("CoinFlower", GENERIC), + CoinFlowerI("CoinFlowerI", GENERIC), + CoinFlowerII("CoinFlowerII", GENERIC), + CoinFlowerIII("CoinFlowerIII", GENERIC), + CoinFlowerIV("CoinFlowerIV", GENERIC), + CoinForestry("CoinForestry", GENERIC), + CoinForestryI("CoinForestryI", GENERIC), + CoinForestryII("CoinForestryII", GENERIC), + CoinForestryIII("CoinForestryIII", GENERIC), + CoinForestryIV("CoinForestryIV", GENERIC), + CoinSmith("CoinSmith", GENERIC), + CoinSmithI("CoinSmithI", GENERIC), + CoinSmithII("CoinSmithII", GENERIC), + CoinSmithIII("CoinSmithIII", GENERIC), + CoinSmithIV("CoinSmithIV", GENERIC), + CoinWitch("CoinWitch", GENERIC), + CoinWitchI("CoinWitchI", GENERIC), + CoinWitchII("CoinWitchII", GENERIC), + CoinWitchIII("CoinWitchIII", GENERIC), + CoinWitchIV("CoinWitchIV", GENERIC), + CoinSpace("CoinSpace", GENERIC), + CoinSpaceI("CoinSpaceI", GENERIC), + CoinSpaceII("CoinSpaceII", GENERIC), + CoinSpaceIII("CoinSpaceIII", GENERIC), + CoinSpaceIV("CoinSpaceIV", GENERIC), + CoinSurvivor("CoinSurvivor", GENERIC), + CoinSurvivorI("CoinSurvivorI", GENERIC), + CoinSurvivorII("CoinSurvivorII", GENERIC), + CoinSurvivorIII("CoinSurvivorIII", GENERIC), + CoinSurvivorIV("CoinSurvivorIV", GENERIC), + CoinTechnician("CoinTechnician", GENERIC), + CoinTechnicianI("CoinTechnicianI", GENERIC), + CoinTechnicianII("CoinTechnicianII", GENERIC), + CoinTechnicianIII("CoinTechnicianIII", GENERIC), + CoinTechnicianIV("CoinTechnicianIV", GENERIC), + CoinDonation("CoinDonation", GENERIC), + CokeOvenBrick("CokeOvenBrick", GENERIC), + CokeOvenBrickDust("CokeOvenBrickDust", GENERIC), + ConductiveIronBars("ConductiveIronBars", BARS_AND_CASINGS), + CopperDualCompressedPlates("CopperDualCompressedPlates", SPACE), + ChromeBars("ChromeBars", BARS_AND_CASINGS), + ChromeIronPlate("ChromeIronPlate", SOLAR), + CobbleStoneRod("CobbleStoneRod", GENERIC), + CopperWandCap("CopperWandCap", THAUMCRAFT), + CrimsonStainedClothCap("CrimsonStainedClothCap", THAUMCRAFT), + DraconiumEgg("DraconiumEgg", GENERIC), + DeimosStoneDust("DeimosStoneDust", SPACE), + DeshDualCompressedPlates("DeshDualCompressedPlates", SPACE), + Display("Display", CIRCUITS), + DiamondCoreChip("DiamondCoreChip", CIRCUITS), + DiamondDrillTip("DiamondDrillTip", GENERIC), + DiamondFluidCoreChip("DiamondFluidCoreChip", CIRCUITS), + EctoplasmaChip("EctoplasmaChip", GENERIC), + EctoplasmaFragment("EctoplasmaFragment", GENERIC), + ElectricalSteelBars("ElectricalSteelBars", BARS_AND_CASINGS), + ElectricBoatHull("ElectricBoatHull", GENERIC), + ElectrotineWire("ElectrotineWire", GENERIC), + EmeraldAdvancedCoreChip("EmeraldAdvancedCoreChip", CIRCUITS), + EmeraldAdvancedFluidCoreChip("EmeraldAdvancedFluidCoreChip", CIRCUITS), + EmeraldHighAdvancedCoreChip("EmeraldHighAdvancedCoreChip", CIRCUITS), + EMT("EMT", GENERIC), + EnceladusIceDust("EnceladusIceDust", SPACE), + EnceladusStoneDust("EnceladusStoneDust", SPACE), + EnchantedClothCap("EnchantedClothCap", THAUMCRAFT), + EnderiumBaseBars("EnderiumBaseBars", BARS_AND_CASINGS), + EnderiumBars("EnderiumBars", BARS_AND_CASINGS), + EnergeticAlloyBars("EnergeticAlloyBars", BARS_AND_CASINGS), + EnderEgg("EnderEgg", GENERIC), + EngineeringProcessorEssentiaPulsatingCore("EngineeringProcessorEssentiaPulsatingCore", CIRCUITS), + EngineeringProcessorFluidDiamondCore("EngineeringProcessorFluidDiamondCore", CIRCUITS), + EngineeringProcessorFluidEmeraldCore("EngineeringProcessorFluidEmeraldCore", CIRCUITS), + EngineeringProcessorItemAdvEmeraldCore("EngineeringProcessorItemAdvEmeraldCore", CIRCUITS), + EngineeringProcessorItemEmeraldCore("EngineeringProcessorItemEmeraldCore", CIRCUITS), + EngineeringProcessorItemDiamondCore("EngineeringProcessorItemDiamondCore", CIRCUITS), + EngineeringProcessorSpatialPulsatingCore("EngineeringProcessorSpatialPulsatingCore", CIRCUITS), + EngineCore("EngineCore", GENERIC), + EngravedEnergyChip("EngravedEnergyChip", CIRCUITS), + EngravedDiamondCrystalChip("EngravedDiamondCrystalChip", CIRCUITS), + EngravedGoldChip("EngravedGoldChip", CIRCUITS), + EngravedManyullynCrystalChip("EngravedManyullynCrystalChip", CIRCUITS), + EngravedQuantumChip("EngravedQuantumChip", CIRCUITS), + EnrichedNaquadriaSunnariumAlloy("EnrichedNaquadriaSunnariumAlloy", SOLAR), + EnrichedNaquadriaNeutroniumSunnariumAlloy("EnrichedNaquadriaNeutroniumSunnariumAlloy", SOLAR), + EnrichedXSunnariumAlloy("EnrichedXSunnariumAlloy", SOLAR), + EnvironmentalCircuit("EnvironmentalCircuit", CIRCUITS), + EssentiaCircuit("EssentiaCircuit", CIRCUITS), + EtchedLowVoltageWiring("EtchedLowVoltageWiring", CIRCUITS), + EtchedInsaneVoltageWiring("EtchedInsaneVoltageWiring", CIRCUITS), + EtchedLudicrousVoltageWiring("EtchedLudicrousVoltageWiring", CIRCUITS), + EuropaIceDust("EuropaIceDust", SPACE), + EuropaStoneDust("EuropaStoneDust", SPACE), + ExtraLargeFuelCanister("ExtraLargeFuelCanister", SPACE), + ExtruderShapeBoat("ExtruderShapeBoat", SHAPES), + FieryBloodDrop("FieryBloodDrop", THAUMCRAFT), + GanymedeStoneDust("GanymedeStoneDust", SPACE), + GeneticCircuit("GeneticCircuit", CIRCUITS), + GlowingMarshmallow("GlowingMarshmallow", THAUMCRAFT), + GoldCoreChip("GoldCoreChip", CIRCUITS), + GoldWandCap("GoldWandCap", THAUMCRAFT), + HeavyDutyAlloyIngotT4("HeavyDutyAlloyIngotT4", SPACE), + HeavyDutyAlloyIngotT5("HeavyDutyAlloyIngotT5", SPACE), + HeavyDutyAlloyIngotT6("HeavyDutyAlloyIngotT6", SPACE), + HeavyDutyAlloyIngotT7("HeavyDutyAlloyIngotT7", SPACE), + HeavyDutyAlloyIngotT8("HeavyDutyAlloyIngotT8", SPACE), + HeavyDutyAlloyIngotT9("HeavyDutyAlloyIngotT9", SPACE), + HeavyDutyNoseConeTier3("HeavyDutyNoseConeTier3", SPACE), + HeavyDutyNoseConeTier4("HeavyDutyNoseConeTier4", SPACE), + HeavyDutyPlateTier4("HeavyDutyPlateTier4", SPACE), + HeavyDutyPlateTier5("HeavyDutyPlateTier5", SPACE), + HeavyDutyPlateTier6("HeavyDutyPlateTier6", SPACE), + HeavyDutyPlateTier7("HeavyDutyPlateTier7", SPACE), + HeavyDutyPlateTier8("HeavyDutyPlateTier8", SPACE), + HeavyDutyRocketEngineTier3("HeavyDutyRocketEngineTier3", SPACE), + HeavyDutyRocketEngineTier4("HeavyDutyRocketEngineTier4", SPACE), + HeavyDutyRocketFinsTier3("HeavyDutyRocketFinsTier3", SPACE), + HeavyDutyRocketFinsTier4("HeavyDutyRocketFinsTier4", SPACE), + HighEnergyCircuitParts("HighEnergyCircuitParts", CIRCUITS), + HighEnergyFlowCircuit("HighEnergyFlowCircuit", CIRCUITS), + IceCompressedPlate("IceCompressedPlate", SPACE), + IceDualCompressedPlates("IceDualCompressedPlates", SPACE), + IchoriumCap("IchoriumCap", THAUMCRAFT), + IndustryFrame("IndustryFrame", GENERIC), + InfernalBrick("InfernalBrick", GENERIC), + IoStoneDust("IoStoneDust", SPACE), + IridiumBars("IridiumBars", BARS_AND_CASINGS), + IridiumAlloyItemCasing("IridiumAlloyItemCasing", BARS_AND_CASINGS), + IrradiantReinforcedAluminiumPlate("IrradiantReinforcedAluminiumPlate", SOLAR), + IrradiantReinforcedBedrockiumPlate("IrradiantReinforcedBedrockiumPlate", SOLAR), + IrradiantReinforcedChromePlate("IrradiantReinforcedChromePlate", SOLAR), + IrradiantReinforcedNaquadriaPlate("IrradiantReinforcedNaquadriaPlate", SOLAR), + IrradiantReinforcedNeutroniumPlate("IrradiantReinforcedNeutroniumPlate", SOLAR), + IrradiantReinforcedTitaniumPlate("IrradiantReinforcedTitaniumPlate", SOLAR), + IrradiantReinforcedTungstenPlate("IrradiantReinforcedTungstenPlate", SOLAR), + IrradiantReinforcedTungstenSteelPlate("IrradiantReinforcedTungstenSteelPlate", SOLAR), + IronWandCap("IronWandCap", THAUMCRAFT), + IronDualCompressedPlates("IronDualCompressedPlates", SPACE), + HaumeaStoneDust("HaumeaStoneDust", SPACE), + HotNetherrackBrick("HotNetherrackBrick", GENERIC), + LapotronDust("LapotronDust", CIRCUITS), + LargeFuelCanister("LargeFuelCanister", SPACE), + LaserEmitter("LaserEmitter", GENERIC), + LeadNickelPlate("LeadNickelPlate", SPACE), + LeadOriharukonPlate("LeadOriharukonPlate", SPACE), + LedoxCompressedPlate("LedoxCompressedPlate", SPACE), + LichBone("LichBone", THAUMCRAFT), + LichBoneChip("LichBoneChip", THAUMCRAFT), + LichBoneFragment("LichBoneFragment", THAUMCRAFT), + LogicProcessorItemGoldCore("LogicProcessorItemGoldCore", CIRCUITS), + LightShaft("LightShaft", SPACE), + LightBinding("LightBinding", SPACE), + LightAxeHead("LightAxeHead", SPACE), + LightPickaxeHead("LightPickaxeHead", SPACE), + LightSwordBlade("LightSwordBlade", SPACE), + LongObsidianRod("LongObsidianRod", GENERIC), + LongStoneRod("LongStoneRod", GENERIC), + MagicianOrb("MagicianOrb", THAUMCRAFT), + MarsStoneDust("MarsStoneDust", SPACE), + NanoCircuit("NanoCircuit", CIRCUITS), + MaceratedPlantmass("MaceratedPlantmass", GENERIC), + MakeMakeStoneDust("MakeMakeStoneDust", SPACE), + MalformedSlush("MalformedSlush", THAUMCRAFT), + Marshmallow("Marshmallow", THAUMCRAFT), + ManyullynCrystal("ManyullynCrystal", GENERIC), + MarshmallowForm("MarshmallowForm", THAUMCRAFT), + MarshmallowFormMold("MarshmallowFormMold", THAUMCRAFT), + MasterOrb("MasterOrb", THAUMCRAFT), + MediumFuelCanister("MediumFuelCanister", SPACE), + MercuryCoreDust("MercuryCoreDust", SPACE), + MercuryStoneDust("MercuryStoneDust", SPACE), + MeteoricIronString("MeteoricIronString", SPACE), + MeteoricIronDualCompressedPlates("MeteoricIronDualCompressedPlates", SPACE), + MirandaStoneDust("MirandaStoneDust", SPACE), + TuffDust("TuffDust", GENERIC), + ChaoticDust("ChaoticDust", GENERIC), + DeepslateDust("DeepslateDust", GENERIC), + MoldChestplate("MoldChestplate", MOLDS), + MoldHelmet("MoldHelmet", MOLDS), + MoldLeggings("MoldLeggings", MOLDS), + MoldFormLeggings("MoldFormLeggings", MOLDS), + MoldFormHelmet("MoldFormHelmet", MOLDS), + MoldFormChestplate("MoldFormChestplate", MOLDS), + MoldFormBoots("MoldFormBoots", MOLDS), + MoldBoots("MoldBoots", MOLDS), + MoldFormAnvil("MoldFormAnvil", MOLDS), + MoldFormArrowHead("MoldFormArrowHead", MOLDS), + MoldFormBaguette("MoldFormBaguette", MOLDS), + MoldFormBall("MoldFormBall", MOLDS), + MoldFormBlock("MoldFormBlock", MOLDS), + MoldFormBolt("MoldFormBolt", MOLDS), + MoldFormBottle("MoldFormBottle", MOLDS), + MoldFormBread("MoldFormBread", MOLDS), + MoldFormBuns("MoldFormBuns", MOLDS), + MoldFormCasing("MoldFormCasing", MOLDS), + MoldFormCoinage("MoldFormCoinage", MOLDS), + MoldFormCylinder("MoldFormCylinder", MOLDS), + MoldFormGear("MoldFormGear", MOLDS), + MoldFormIngot("MoldFormIngot", MOLDS), + MoldFormName("MoldFormName", MOLDS), + MoldFormNuggets("MoldFormNuggets", MOLDS), + MoldFormPlate("MoldFormPlate", MOLDS), + MoldFormRing("MoldFormRing", MOLDS), + MoldFormRound("MoldFormRound", MOLDS), + MoldFormRotor("MoldFormRotor", MOLDS), + MoldFormScrew("MoldFormScrew", MOLDS), + MoldFormSmallGear("MoldFormSmallGear", MOLDS), + MoldFormStick("MoldFormStick", MOLDS), + MoldFormStickLong("MoldFormStickLong", MOLDS), + MoldFormTurbineBlade("MoldFormTurbineBlade", MOLDS), + MoldFormPipeTiny("MoldFormPipeTiny", MOLDS), + MoldFormPipeSmall("MoldFormPipeSmall", MOLDS), + MoldFormPipeMedium("MoldFormPipeMedium", MOLDS), + MoldFormPipeLarge("MoldFormPipeLarge", MOLDS), + MoldFormPipeHuge("MoldFormPipeHuge", MOLDS), + MoldFormDrillHead("MoldFormDrillHead", MOLDS), + MoonStoneDust("MoonStoneDust", GENERIC), + MushroomPowder("MushroomPowder", GENERIC), + MutatedEgg("MutatedEgg", GENERIC), + MysteriousCrystal("MysteriousCrystal", SPACE), + MysteriousCrystalGemExquisite("MysteriousCrystalGemExquisite", SPACE), + MysteriousCrystalGemFlawless("MysteriousCrystalGemFlawless", SPACE), + MysteriousCrystalLens("MysteriousCrystalLens", SPACE), + MysteriousCrystalCompressedPlate("MysteriousCrystalCompressedPlate", SPACE), + MysteriousCrystalDualCompressedPlates("MysteriousCrystalDualCompressedPlates", SPACE), + MytrylCrystal("MytrylCrystal", SPACE), + MytrylCompressedPlate("MytrylCompressedPlate", SPACE), + MytrylDualCompressedPlates("MytrylDualCompressedPlates", SPACE), + NagaScaleChip("NagaScaleChip", THAUMCRAFT), + NagaScaleFragment("NagaScaleFragment", THAUMCRAFT), + NanoCrystal("NanoCrystal", CIRCUITS), + NanoBoard("NanoBoard", CIRCUITS), + NanoProcessorBoard("NanoProcessorBoard", CIRCUITS), + NanoChestJetPack("NanoChestJetPack", GENERIC), + NanoPlatedLeggings("NanoPlatedLeggings", GENERIC), + NanoRubberBoots("NanoRubberBoots", GENERIC), + NanoScubaHelmet("NanoScubaHelmet", GENERIC), + NaquadriaIronPlate("NaquadriaIronPlate", SOLAR), + NeutroniumBars("NeutroniumBars", BARS_AND_CASINGS), + NeutroniumIronPlate("NeutroniumIronPlate", SOLAR), + NeutronReflectorSmallParts("NeutronReflectorSmallParts", CIRCUITS), + NeutronReflectorParts("NeutronReflectorParts", CIRCUITS), + NetherStarFragment("NetherStarFragment", GENERIC), + Nothing("Nothing", GENERIC), + PikoCircuit("PikoCircuit", CIRCUITS), + PistonPlate("PistonPlate", GENERIC), + PhobosStoneDust("PhobosStoneDust", SPACE), + PlutoIceDust("PlutoIceDust", SPACE), + PlutoStoneDust("PlutoStoneDust", SPACE), + PotassiumHydroxideDust("PotassiumHydroxideDust", GENERIC), + PrimordialPearlFragment("PrimordialPearlFragment", THAUMCRAFT), + ProteusStoneDust("ProteusStoneDust", SPACE), + PulsatingIronBars("PulsatingIronBars", BARS_AND_CASINGS), + PulsatingSpatialCoreChip("PulsatingSpatialCoreChip", CIRCUITS), + OberonStoneDust("OberonStoneDust", SPACE), + OsmiumBars("OsmiumBars", BARS_AND_CASINGS), + QuantinumCompressedPlate("QuantinumCompressedPlate", SPACE), + QuantinumDualCompressedPlates("QuantinumDualCompressedPlates", SPACE), + QuantumCircuit("QuantumCircuit", CIRCUITS), + QuantumCrystal("QuantumCrystal", CIRCUITS), + QuantumPartBoots("QuantumPartBoots", GENERIC), + QuantumPartChestplate("QuantumPartChestplate", GENERIC), + QuantumPartHelmet("QuantumPartHelmet", GENERIC), + QuantumPartHelmetEmpty("QuantumPartHelmetEmpty", GENERIC), + QuantumPartLeggings("QuantumPartLeggings", GENERIC), + QuantumBoard("QuantumBoard", CIRCUITS), + QuantumProcessorBoard("QuantumProcessorBoard", CIRCUITS), + RawBioFiber("RawBioFiber", GENERIC), + RawLapotronCrystal("RawLapotronCrystal", CIRCUITS), + RawPicoWafer("RawPicoWafer", CIRCUITS), + PicoWafer("PicoWafer", CIRCUITS), + // AdvancedPicoWafer("AdvancedPicoWafer", ModTabList.CircuitsTab), + RawMytryl("RawMytryl", SPACE), + RawNeutronium("RawNeutronium", SPACE), + RawOrbTier1("RawOrbTier1", THAUMCRAFT), + RawOrbTier2("RawOrbTier2", THAUMCRAFT), + RawOrbTier3("RawOrbTier3", THAUMCRAFT), + RawOrbTier4("RawOrbTier4", THAUMCRAFT), + RawOrbTier5("RawOrbTier5", THAUMCRAFT), + RawOrbTier6("RawOrbTier6", THAUMCRAFT), + RawSDHCAlloy("RawSDHCAlloy", SPACE), + RedstoneAlloyBars("RedstoneAlloyBars", BARS_AND_CASINGS), + ReinforcedGlassPlate("ReinforcedGlassPlate", GENERIC), + ReinforcedGlassLense("ReinforcedGlassLense", GENERIC), + ReinforcedIridiumDrillTip("ReinforcedIridiumDrillTip", GENERIC), + ReinforcedAluminiumIronPlate("ReinforcedAluminiumIronPlate", SOLAR), + ReinforcedBedrockiumIronPlate("ReinforcedBedrockiumIronPlate", SOLAR), + ReinforcedChromeIronPlate("ReinforcedChromeIronPlate", SOLAR), + ReinforcedNaquadriaIronPlate("ReinforcedNaquadriaIronPlate", SOLAR), + ReinforcedNeutroniumIronPlate("ReinforcedNeutroniumIronPlate", SOLAR), + ReinforcedTitaniumIronPlate("ReinforcedTitaniumIronPlate", SOLAR), + ReinforcedTungstenIronPlate("ReinforcedTungstenIronPlate", SOLAR), + ReinforcedTungstenSteelIronPlate("ReinforcedTungstenSteelIronPlate", SOLAR), + RuneOfPowerFragment("RuneOfPowerFragment", GENERIC), + RuneOfAgilityFragment("RuneOfAgilityFragment", GENERIC), + RuneOfVigorFragment("RuneOfVigorFragment", GENERIC), + RuneOfDefenseFragment("RuneOfDefenseFragment", GENERIC), + RuneOfMagicFragment("RuneOfMagicFragment", GENERIC), + RuneOfVoidFragment("RuneOfVoidFragment", GENERIC), + SandStoneRod("SandStoneRod", GENERIC), + SawBladeStone("SawBladeStone", GENERIC), + SawBladeDiamond("SawBladeDiamond", GENERIC), + SawBladeArdite("SawBladeArdite", GENERIC), + SawBladeManyullyn("SawBladeManyullyn", GENERIC), + SawBladeRuby("SawBladeRuby", GENERIC), + SawBladeSapphire("SawBladeSapphire", GENERIC), + SawBladePeridot("SawBladePeridot", GENERIC), + SchematicsAstroMiner("SchematicsAstroMiner", SPACE), + SchematicsCargoRocket("SchematicsCargoRocket", SPACE), + SchematicsMoonBuggy("SchematicsMoonBuggy", SPACE), + SchematicsTier1("SchematicsTier1", SPACE), + SchematicsTier2("SchematicsTier2", SPACE), + SchematicsTier3("SchematicsTier3", SPACE), + SchematicsTier4("SchematicsTier4", SPACE), + SchematicsTier5("SchematicsTier5", SPACE), + SchematicsTier6("SchematicsTier6", SPACE), + SchematicsTier7("SchematicsTier7", SPACE), + SchematicsTier8("SchematicsTier8", SPACE), + ShadowImbuedClothCap("ShadowImbuedClothCap", THAUMCRAFT), + ShadowmetalCap("ShadowmetalCap", THAUMCRAFT), + ShapeAxeHead("ShapeAxeHead", SHAPES), + ShapeBlock("ShapeBlock", SHAPES), + ShapeBoat("ShapeBoat", SHAPES), + ShapeBolt("ShapeBolt", SHAPES), + ShapeBottle("ShapeBottle", SHAPES), + ShapeCasing("ShapeCasing", SHAPES), + ShapeCell("ShapeCell", SHAPES), + ShapeFileHead("ShapeFileHead", SHAPES), + ShapeGear("ShapeGear", SHAPES), + ShapeHammerHead("ShapeHammerHead", SHAPES), + ShapeHoeHead("ShapeHoeHead", SHAPES), + ShapeHugePipe("ShapeHugePipe", SHAPES), + ShapeIngot("ShapeIngot", SHAPES), + ShapeLargePipe("ShapeLargePipe", SHAPES), + ShapeNormalPipe("ShapeNormalPipe", SHAPES), + ShapePickaxeHead("ShapePickaxeHead", SHAPES), + ShapePlate("ShapePlate", SHAPES), + ShapeRing("ShapeRing", SHAPES), + ShapeRod("ShapeRod", SHAPES), + ShapeRotor("ShapeRotor", SHAPES), + ShapeSawBlade("ShapeSawBlade", SHAPES), + ShapeShovelHead("ShapeShovelHead", SHAPES), + ShapeSmallGear("ShapeSmallGear", SHAPES), + ShapeSmallPipe("ShapeSmallPipe", SHAPES), + ShapeSwordBlade("ShapeSwordBlade", SHAPES), + ShapeTinyPipe("ShapeTinyPipe", SHAPES), + ShapeTurbineBlade("ShapeTurbineBlade", SHAPES), + ShapeWire("ShapeWire", SHAPES), // DEPRECATED. remove in next major version + ShapeDrillHead("ShapeDrillHead", SHAPES), + SilverThread("SilverThread", THAUMCRAFT), + SilveredFleece("SilveredFleece", THAUMCRAFT), + SimpleCircuitBoard("SimpleCircuitBoard", CIRCUITS), + SnowQueenBlood("SnowQueenBlood", THAUMCRAFT), + SnowQueenBloodDrop("SnowQueenBloodDrop", THAUMCRAFT), + SoulariumBars("SoulariumBars", BARS_AND_CASINGS), + StainlessSteelBars("StainlessSteelBars", BARS_AND_CASINGS), + SteelBars("SteelBars", BARS_AND_CASINGS), + SteelDualCompressedPlates("SteelDualCompressedPlates", SPACE), + StonePlate("StonePlate", GENERIC), + StargateFramePart("StargateFramePart", SPACE), + StargateChevron("StargateChevron", SPACE), + StargateShieldingFoil("StargateShieldingFoil", SPACE), + StargateCrystalDust("StargateCrystalDust", SPACE), + TCetiESeaweedExtract("TCetiESeaweedExtract", SPACE), + TCetiEStoneDust("TCetiEStoneDust", SPACE), + TeleposerFrame("TeleposerFrame", THAUMCRAFT), + TheBigEgg("TheBigEgg", GENERIC), + Tier2Booster("Tier2Booster", SPACE), + Tier3Booster("Tier3Booster", SPACE), + Tier4Booster("Tier4Booster", SPACE), + TinDualCompressedPlates("TinDualCompressedPlates", SPACE), + TitaniumBars("TitaniumBars", BARS_AND_CASINGS), + TitaniumDualCompressedPlates("TitaniumDualCompressedPlates", SPACE), + TitaniumIronPlate("TitaniumIronPlate", SOLAR), + TitanStoneDust("TitanStoneDust", SPACE), + TranscendentOrb("TranscendentOrb", THAUMCRAFT), + TritonStoneDust("TritonStoneDust", SPACE), + TungstenBars("TungstenBars", BARS_AND_CASINGS), + TungstenIronPlate("TungstenIronPlate", SOLAR), + TungstenSteelBars("TungstenSteelBars", BARS_AND_CASINGS), + TungstenSteelIronPlate("TungstenSteelIronPlate", SOLAR), + TungstenString("TungstenString", SPACE), + TwilightCrystal("TwilightCrystal", GENERIC), + UncookedSlush("UncookedSlush", THAUMCRAFT), + UnfiredClayBrick("UnfiredClayBrick", GENERIC), + UnfiredCokeOvenBrick("UnfiredCokeOvenBrick", GENERIC), + UnfiredSearedBrick("UnfiredSearedBrick", GENERIC), + UnfiredSlimeSoilBrick("UnfiredSlimeSoilBrick", GENERIC), + VegaBStoneDust("VegaBStoneDust", SPACE), + VenusStoneDust("VenusStoneDust", SPACE), + VibrantAlloyBars("VibrantAlloyBars", BARS_AND_CASINGS), + VinteumThread("VinteumThread", THAUMCRAFT), + VoidEssence("VoidEssence", THAUMCRAFT), + VoidSeed("VoidSeed", THAUMCRAFT), + WaferTier3("WaferTier3", SPACE), + WandCapAlchemical("WandCapAlchemical", THAUMCRAFT), + WandCapBloodIron("WandCapBloodIron", THAUMCRAFT), + WandCapElementium("WandCapElementium", THAUMCRAFT), + WandCapManaSteel("WandCapManaSteel", THAUMCRAFT), + WandCapTerraSteel("WandCapTerraSteel", THAUMCRAFT), + WandCapVinteum("WandCapVinteum", THAUMCRAFT), + WandCapThauminite("WandCapThauminite", THAUMCRAFT), + WeakOrb("WeakOrb", THAUMCRAFT), + WetTofu("WetTofu", GENERIC), + WirelessTransmitter("WirelessTransmitter", GENERIC), + WoodenCasing("WoodenCasing", GENERIC), + MedalDerp("MedalDerp", GENERIC), + MedalGTExplosion("MedalGTExplosion", GENERIC), + MedalBuilder("MedalBuilder", GENERIC), + MedalEngineer("MedalEngineer", GENERIC), + MedalWarp("MedalWarp", GENERIC), + AluminoSilicateWool("AluminoSilicateWool", GENERIC), + EdibleSalt("EdibleSalt", GENERIC), + CircuitULV("CircuitULV", CIRCUITS), + CircuitLV("CircuitLV", CIRCUITS), + CircuitMV("CircuitMV", CIRCUITS), + CircuitHV("CircuitHV", CIRCUITS), + CircuitEV("CircuitEV", CIRCUITS), + CircuitIV("CircuitIV", CIRCUITS), + CircuitLuV("CircuitLuV", CIRCUITS), + CircuitZPM("CircuitZPM", CIRCUITS), + CircuitUV("CircuitUV", CIRCUITS), + CircuitUHV("CircuitUHV", CIRCUITS), + CircuitUEV("CircuitUEV", CIRCUITS), + CircuitUIV("CircuitUIV", CIRCUITS), + CircuitUMV("CircuitUMV", CIRCUITS), + CircuitUXV("CircuitUXV", CIRCUITS), + CircuitMAX("CircuitMAX", CIRCUITS), + RadoxPolymerLens("RadoxPolymerLens", SPACE), + ChromaticLens("ChromaticLens", SPACE), + ChromaticGem("ChromaticGem", SPACE), + ChromaticGemFlawless("ChromaticGemFlawless", SPACE), + ChromaticGemExquisite("ChromaticGemExquisite", SPACE), + NanoCircuitOrigin("OriginNanoCircuit", SPACE), + GatePlateOrigin("OriginGatePlate", SPACE), + ChevronOrigin("OriginChevron", SPACE), + FramePartOrigin("OriginFramePart", SPACE), + PikoCircuitPolychrome("PolychromePikoCircuit", SPACE), + QuantumCircuitPolychrome("PolychromeQuantumCircuit", SPACE), + GatePlatePolychrome("PolychromeGatePlate", SPACE), + ChevronPolychrome("PolychromeChevron", SPACE), + FramePartPolychrome("PolychromeFramePart", SPACE), + PikoCircuitDimensional("DimensionalPikoCircuit", SPACE), + QuantumCircuitDimensional("DimensionalQuantumCircuit", SPACE), + GatePlateDimensional("DimensionalGatePlate", SPACE), + ChevronDimensional("DimensionalChevron", SPACE), + FramePartDimensional("DimensionalFramePart", SPACE), + GatePlateHarmonic("HarmonicGatePlate", SPACE), + ChevronHarmonic("HarmonicChevron", SPACE), + FramePartHarmonic("HarmonicFramePart", SPACE), + StargateDustAncients("StargateDustAncients", SPACE), + StargateCrystalAncients("StargateCrystalAncients", SPACE); // ################################################################################ - public ModSimpleBaseItem Item; + public final String name; + public final Item item; - NHItemList(ModSimpleBaseItem pItem) { - Item = pItem; - if (Item != null) { - Item.setModIDName(Refstrings.MODID); - } + NHItemList(String name, CreativeTabs tab) { + this(name, new Item(), tab); } - public static boolean AddToItemManager(ModItemManager pItemManager) { - boolean tResult = true; - 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())); - tResult = false; - } - } - } + NHItemList(String name, Item item, CreativeTabs tab) { + this.name = name; + this.item = item; - return tResult; + item.setUnlocalizedName(name); + item.setTextureName(Refstrings.MODID + ":item" + name); + item.setCreativeTab(tab); } public ItemStack getIS() { - return new ItemStack(Item.getConstructedItem(), 1); + return new ItemStack(item, 1); } public ItemStack getIS(int amount) { - return new ItemStack(Item.getConstructedItem(), amount); + return new ItemStack(item, amount); + } + + public static void registerAll() { + for (final var entry : NHItemList.values()) { + GameRegistry.registerItem(entry.item, entry.name); + } } } diff --git a/src/main/java/com/dreammaster/item/Pattern.java b/src/main/java/com/dreammaster/item/Pattern.java deleted file mode 100644 index d11c33af57..0000000000 --- a/src/main/java/com/dreammaster/item/Pattern.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.dreammaster.item; - -import static gregtech.api.enums.Mods.NewHorizonsCoreMod; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.ItemStack; - -import mantle.items.abstracts.CraftingItem; -import tconstruct.library.crafting.PatternBuilder; -import tconstruct.library.util.IPattern; - -public class Pattern extends CraftingItem implements IPattern { - - public Pattern(String[] names, String[] tex, CreativeTabs tab) { - super(names, tex, "", NewHorizonsCoreMod.ID, tab); - } - - public Pattern(String[] names, String[] tex, String folder, String modTexturePrefix, CreativeTabs tab) { - super(names, tex, folder, modTexturePrefix, tab); - } - - @Override - public int getPatternCost(ItemStack pattern) { - return 0; - } - - @Override - public ItemStack getPatternOutput(ItemStack pattern, ItemStack input, PatternBuilder.MaterialSet set) { - return null; - } -} diff --git a/src/main/java/com/dreammaster/item/WoodenBrickForm.java b/src/main/java/com/dreammaster/item/WoodenBrickForm.java index e937db9ae2..6e15b12ec2 100644 --- a/src/main/java/com/dreammaster/item/WoodenBrickForm.java +++ b/src/main/java/com/dreammaster/item/WoodenBrickForm.java @@ -1,76 +1,17 @@ package com.dreammaster.item; -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import com.dreammaster.lib.Refstrings; -import com.dreammaster.main.NHItems; - -import eu.usrv.yamcore.iface.IExtendedModItem; -public class WoodenBrickForm extends Item implements IExtendedModItem { +public class WoodenBrickForm extends Item { - public static final Logger LOGGER = LogManager.getLogger(); - - private final String _mCreativeTab; - private final String _mItemName; private static final int maxDurability = 300; - @Override - public WoodenBrickForm getConstructedItem() { - return NHItems.WOODEN_BRICK_FORM.get(); - } - - @Override - public String getUnlocalizedNameForRegistration() { - return super.getUnlocalizedName(); - } - - @Override - public String getCreativeTabName() { - return _mCreativeTab; - } - - public WoodenBrickForm(String pItemName, String pCreativeTab) { - _mItemName = pItemName; - _mCreativeTab = pCreativeTab; - - super.setTextureName(String.format("%s:item%s", Refstrings.MODID, _mItemName)); - super.setUnlocalizedName(_mItemName); + public WoodenBrickForm() { super.setMaxDamage(maxDurability); super.setMaxStackSize(1); } - @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack); - } - - public IIcon icon; - - @Override - public void registerIcons(IIconRegister reg) { - icon = reg.registerIcon(String.format("%s:item%s", Refstrings.MODID, _mItemName)); - } - - @Override - public IIcon getIconFromDamage(int meta) { - return icon; - } - - @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { - list.add(new ItemStack(item, 1, 0)); - } - @Override public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) { return false; diff --git a/src/main/java/com/dreammaster/baubles/OvenGlove.java b/src/main/java/com/dreammaster/item/baubles/OvenGlove.java similarity index 69% rename from src/main/java/com/dreammaster/baubles/OvenGlove.java rename to src/main/java/com/dreammaster/item/baubles/OvenGlove.java index d4182e673f..ef2d81d260 100644 --- a/src/main/java/com/dreammaster/baubles/OvenGlove.java +++ b/src/main/java/com/dreammaster/item/baubles/OvenGlove.java @@ -1,4 +1,4 @@ -package com.dreammaster.baubles; +package com.dreammaster.item.baubles; import java.util.List; @@ -11,16 +11,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; +import net.minecraft.util.StatCollector; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingAttackEvent; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import com.dreammaster.lib.Refstrings; import com.dreammaster.main.MainRegistry; -import com.dreammaster.main.NHItems; import baubles.api.BaubleType; import baubles.api.IBauble; @@ -29,42 +25,16 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; -import eu.usrv.yamcore.iface.IExtendedModItem; import gregtech.api.damagesources.GTDamageSources.DamageSourceHotItem; import gregtech.api.enums.Mods; import xonin.backhand.api.core.BackhandUtils; -public final class OvenGlove extends Item implements IBauble, IExtendedModItem { +public final class OvenGlove extends Item implements IBauble { - public static final Logger LOGGER = LogManager.getLogger(); private static final String NBTTAG_DURABILITY = "Durability"; + private static final int MAX_DURABILITY = 1000; - private final String _mItemName; - private final String _mCreativeTab; - private static final int MaxDurability = 1000; - private static boolean checkPopup = false; - - @Override - public OvenGlove getConstructedItem() { - return NHItems.OVEN_GLOVE.get(); - } - - @Override - public String getCreativeTabName() { - return _mCreativeTab; - } - - @Override - public String getUnlocalizedNameForRegistration() { - return super.getUnlocalizedName(); - } - - public OvenGlove(String pItemName, String pCreativeTab) { - _mItemName = pItemName; - _mCreativeTab = pCreativeTab; - - super.setTextureName(String.format("%s:item%s", Refstrings.MODID, _mItemName)); - super.setUnlocalizedName(_mItemName); + public OvenGlove() { super.setMaxDamage(0); super.setHasSubtypes(true); } @@ -73,16 +43,18 @@ public OvenGlove(String pItemName, String pCreativeTab) { private static int curRand = -1; @Override - public String getUnlocalizedName(ItemStack stack) { + public String getItemStackDisplayName(ItemStack stack) { if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) { long curTime = System.currentTimeMillis(); if (curTime - prevTime > 1000L || curRand == -1) { curRand = MainRegistry.Rnd.nextInt(4); } prevTime = curTime; - return String.format("%s_%d_%d", getUnlocalizedName(), stack.getItemDamage(), curRand); + + return StatCollector + .translateToLocal(getUnlocalizedName() + "_" + stack.getItemDamage() + "_" + curRand + ".name"); } else { - return super.getUnlocalizedName(stack); + return super.getItemStackDisplayName(stack); } } @@ -90,9 +62,8 @@ public String getUnlocalizedName(ItemStack stack) { @Override public void registerIcons(IIconRegister reg) { - for (int i = 0; i < 2; i++) { - icons[i] = reg.registerIcon(String.format("%s:item%s_%d", Refstrings.MODID, _mItemName, i)); - } + icons[0] = reg.registerIcon(super.getIconString() + "_0"); + icons[1] = reg.registerIcon(super.getIconString() + "_1"); } @Override @@ -101,10 +72,9 @@ public IIcon getIconFromDamage(int meta) { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { - for (int i = 0; i < 2; i++) { - list.add(new ItemStack(item, 1, i)); - } + public void getSubItems(Item item, CreativeTabs tab, List list) { + list.add(new ItemStack(item, 1, 0)); + list.add(new ItemStack(item, 1, 1)); } @Override @@ -123,9 +93,7 @@ public BaubleType getBaubleType(ItemStack arg0) { } @Override - public void onWornTick(ItemStack itemstack, EntityLivingBase player) { - - } + public void onWornTick(ItemStack itemstack, EntityLivingBase player) {} @Override public void onEquipped(ItemStack arg0, EntityLivingBase entity) {} @@ -151,20 +119,22 @@ private static void damageItem(ItemStack pItemStack) { } @Override - public void addInformation(ItemStack pItemStack, EntityPlayer pWorld, List list, boolean par4) { - createOrInitNBTTag(pItemStack); - - list.add("Protecting your fingers since 1890"); - list.add(String.format("Durability: %d/%d", getNBTDurability(pItemStack), MaxDurability)); - if (pItemStack.stackTagCompound.getInteger(NBTTAG_DURABILITY) <= 1) { - list.add("This glove is too damaged to protect you. You need to repair it"); + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { + createOrInitNBTTag(stack); + + list.add(StatCollector.translateToLocal("item.OvenGlove.desc.1")); + list.add( + StatCollector + .translateToLocalFormatted("item.OvenGlove.desc.2", getNBTDurability(stack), MAX_DURABILITY)); + if (stack.stackTagCompound.getInteger(NBTTAG_DURABILITY) <= 1) { + list.add(StatCollector.translateToLocal("item.OvenGlove.desc.broken")); } } - private void createOrInitNBTTag(ItemStack pItemStack) { - if (pItemStack.stackTagCompound == null) { - pItemStack.setTagCompound(new NBTTagCompound()); - pItemStack.stackTagCompound.setInteger(NBTTAG_DURABILITY, MaxDurability); + private void createOrInitNBTTag(ItemStack stack) { + if (stack.stackTagCompound == null) { + stack.setTagCompound(new NBTTagCompound()); + stack.stackTagCompound.setInteger(NBTTAG_DURABILITY, MAX_DURABILITY); } } @@ -205,8 +175,7 @@ public void onDamage(LivingAttackEvent event) { ItemStack gloveR = null; ItemStack[] stackList = baubles.stackList; - for (int i = 0; i < stackList.length; i++) { - ItemStack stack = stackList[i]; + for (ItemStack stack : stackList) { if (stack != null && stack.getItem() instanceof OvenGlove) { if (gloveL == null && stack.getItemDamage() == 0) { gloveL = stack; diff --git a/src/main/java/com/dreammaster/item/baubles/WitherProtectionRing.java b/src/main/java/com/dreammaster/item/baubles/WitherProtectionRing.java new file mode 100644 index 0000000000..3b5199d806 --- /dev/null +++ b/src/main/java/com/dreammaster/item/baubles/WitherProtectionRing.java @@ -0,0 +1,62 @@ +package com.dreammaster.item.baubles; + +import java.util.List; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; + +import baubles.api.BaubleType; +import baubles.api.IBauble; + +public final class WitherProtectionRing extends Item implements IBauble { + + @Override + public boolean canEquip(ItemStack stack, EntityLivingBase user) { + return true; + } + + @Override + public boolean canUnequip(ItemStack stack, EntityLivingBase user) { + return true; + } + + @Override + public BaubleType getBaubleType(ItemStack stack) { + return BaubleType.RING; + } + + @Override + public void onEquipped(ItemStack stack, EntityLivingBase user) {} + + @Override + public void onUnequipped(ItemStack stack, EntityLivingBase user) {} + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { + list.add( + EnumChatFormatting.GREEN.toString() + EnumChatFormatting.ITALIC + + StatCollector.translateToLocal("item.WitherProtectionRing.desc.1")); + list.add( + EnumChatFormatting.GREEN.toString() + EnumChatFormatting.ITALIC + + StatCollector.translateToLocal("item.WitherProtectionRing.desc.2")); + } + + @Override + public void onWornTick(ItemStack stack, EntityLivingBase user) { + if (!(user instanceof EntityPlayer player)) { + return; + } + + if (user.worldObj.rand.nextInt(20) == 0) { + Potion potion = Potion.wither; + if (player.isPotionActive(potion)) { + player.removePotionEffect(potion.id); + } + } + } +} diff --git a/src/main/java/com/dreammaster/item/food/QuantumBread.java b/src/main/java/com/dreammaster/item/food/QuantumBread.java index e6365abc0f..4593e2b89e 100644 --- a/src/main/java/com/dreammaster/item/food/QuantumBread.java +++ b/src/main/java/com/dreammaster/item/food/QuantumBread.java @@ -2,17 +2,15 @@ import java.util.List; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import com.dreammaster.lib.Refstrings; import com.dreammaster.main.MainRegistry; import cpw.mods.fml.common.FMLCommonHandler; @@ -20,65 +18,49 @@ public final class QuantumBread extends ItemFood { - private static final String QUANTUM_BREAD_NAME = "QuantumBread"; - - private QuantumBread() { + public QuantumBread() { super(1, 0.0F, true); - super.setTextureName(String.format("%s:item%s", Refstrings.MODID, QUANTUM_BREAD_NAME)); - setUnlocalizedName(QUANTUM_BREAD_NAME); setAlwaysEdible(); } - private static QuantumBread _mInstance; - - public static QuantumBread Instance() { - if (_mInstance == null) { - _mInstance = new QuantumBread(); - } - - return _mInstance; - } - private static long prevTime = Long.MIN_VALUE; private static int curRand = -1; @Override - public String getUnlocalizedName(ItemStack stack) { + public String getItemStackDisplayName(ItemStack stack) { if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) { long curTime = System.currentTimeMillis(); if (curTime - prevTime > 250L || curRand == -1) { curRand = MainRegistry.Rnd.nextInt(2); } prevTime = curTime; - return String.format("%s_%d", getUnlocalizedName(), curRand); + + return StatCollector.translateToLocal(getUnlocalizedName() + "_" + curRand + ".name"); } else { - return super.getUnlocalizedName(stack); + return super.getItemStackDisplayName(stack); } } @Override - public boolean hasEffect(ItemStack par1ItemStack, int pass) { + public boolean hasEffect(ItemStack stack, int pass) { return true; } @Override - protected void onFoodEaten(ItemStack pStack, World pWorld, EntityPlayer pPlayer) { - pPlayer.getFoodStats().addStats(10, 1.0F); - pPlayer.addPotionEffect(new PotionEffect(Potion.regeneration.id, 20 * 60, 2)); - pPlayer.addPotionEffect(new PotionEffect(Potion.jump.id, 20 * 60, 2)); - pPlayer.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 20 * 60, 2)); - super.onFoodEaten(pStack, pWorld, pPlayer); + protected void onFoodEaten(ItemStack stack, World world, EntityPlayer player) { + player.getFoodStats().addStats(10, 1.0F); + player.addPotionEffect(new PotionEffect(Potion.regeneration.id, 20 * 60, 2)); + player.addPotionEffect(new PotionEffect(Potion.jump.id, 20 * 60, 2)); + player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 20 * 60, 2)); + super.onFoodEaten(stack, world, player); } @Override - public void addInformation(ItemStack pStack, EntityPlayer pPlayer, List pList, boolean pBool) { - super.addInformation(pStack, pPlayer, pList, pBool); + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { + super.addInformation(stack, player, list, adv); if (curRand == 1) { - pList.add(EnumChatFormatting.AQUA + "...wasn't it sliced just a second ago?"); + list.add(EnumChatFormatting.AQUA + StatCollector.translateToLocal("item.QuantumBread.desc")); } } - - @Override - public void getSubItems(Item p_150895_1_, CreativeTabs p_150895_2_, List p_150895_3_) {} } diff --git a/src/main/java/com/dreammaster/main/MainRegistry.java b/src/main/java/com/dreammaster/main/MainRegistry.java index 6d9ceffad2..5d3cbe1835 100644 --- a/src/main/java/com/dreammaster/main/MainRegistry.java +++ b/src/main/java/com/dreammaster/main/MainRegistry.java @@ -18,11 +18,13 @@ import static gregtech.api.util.GTRecipeBuilder.SECONDS; import java.io.File; +import java.util.HashMap; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; @@ -35,8 +37,6 @@ import com.dreammaster.bartworksHandler.BacteriaRegistry; import com.dreammaster.bartworksHandler.BioItemLoader; import com.dreammaster.bartworksHandler.PyrolyseOvenLoader; -import com.dreammaster.baubles.OvenGlove; -import com.dreammaster.baubles.WitherProtectionRing; import com.dreammaster.block.BlockList; import com.dreammaster.client.util.GTNHPauseScreen; import com.dreammaster.command.AllPurposeDebugCommand; @@ -49,14 +49,12 @@ import com.dreammaster.creativetab.ModTabList; import com.dreammaster.detrav.ScannerTools; import com.dreammaster.fluids.FluidList; -import com.dreammaster.gthandler.CustomItemList; import com.dreammaster.gthandler.GT_CustomLoader; import com.dreammaster.gthandler.recipes.DTPFRecipes; import com.dreammaster.iguana.IguanaProxy; -import com.dreammaster.item.CustomPatterns; import com.dreammaster.item.ItemBucketList; import com.dreammaster.item.NHItemList; -import com.dreammaster.item.WoodenBrickForm; +import com.dreammaster.item.baubles.OvenGlove; import com.dreammaster.lib.Refstrings; import com.dreammaster.loginhandler.LoginHandler; import com.dreammaster.modbabychest.BlockBabyChest; @@ -108,7 +106,6 @@ import eu.usrv.yamcore.client.NotificationTickHandler; import eu.usrv.yamcore.creativetabs.CreativeTabsManager; import eu.usrv.yamcore.fluids.ModFluidManager; -import eu.usrv.yamcore.items.ModItemManager; import gregtech.api.GregTechAPI; import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; @@ -137,7 +134,6 @@ public class MainRegistry { @Mod.Instance(Refstrings.MODID) public static MainRegistry instance; - public static ModItemManager ItemManager; public static CreativeTabsManager TabManager; public static ModFluidManager FluidManager; public static ModBlockManager BlockManager; @@ -239,21 +235,19 @@ public void PreLoad(FMLPreInitializationEvent PreEvent) { // ------------------------------------------------------------ Logger.debug("PRELOAD Init itemmanager"); - ItemManager = new ModItemManager(Refstrings.MODID); BlockManager = new ModBlockManager(Refstrings.MODID); // ------------------------------------------------------------ // ------------------------------------------------------------ Logger.debug("PRELOAD Init Tabmanager"); TabManager = new CreativeTabsManager(); - ModTabList.InitModTabs(TabManager, ItemManager); + ModTabList.InitModTabs(TabManager); // ------------------------------------------------------------ // ------------------------------------------------------------ + // FIXME: Move bio-items to Bartworks and remove this whole section. Logger.debug("PRELOAD Create Items"); - if (!NHItemList.AddToItemManager(ItemManager) - | !(!TinkerConstruct.isModLoaded() || CustomPatterns.RegisterPatterns(TabManager)) - | !(BioItemLoader.preInit())) { + if (!BioItemLoader.preInit()) { Logger.warn("Some items failed to register. Check the logfile for details"); AddLoginError("[CoreMod-Items] Some items failed to register. Check the logfile for details"); } @@ -308,7 +302,7 @@ public void PreLoad(FMLPreInitializationEvent PreEvent) { // register final list with valid items to forge Logger.debug("LOAD Register Items"); - ItemManager.RegisterItems(TabManager); + NHItemList.registerAll(); Logger.debug("LOAD Register Blocks"); BlockManager.RegisterItems(TabManager); @@ -316,12 +310,6 @@ public void PreLoad(FMLPreInitializationEvent PreEvent) { Logger.debug("LOAD Register Fluids"); FluidManager.RegisterItems(TabManager); - // register all non-enum items - Logger.debug("LOAD Register non enum Items"); - if (!RegisterNonEnumItems()) { - Logger.error("Some extended items could not be registered to the game registry"); - AddLoginError("[CoreMod-Items] Some extended items could not be registered to the game registry"); - } if (PreEvent.getSide() == Side.CLIENT) { FMLCommonHandler.instance().bus().register(new NotificationTickHandler()); } @@ -348,25 +336,6 @@ public void PreLoad(FMLPreInitializationEvent PreEvent) { } } - private static boolean RegisterNonEnumItems() { - boolean tResult = true; - NHItems.OVEN_GLOVE.place(new OvenGlove("OvenGlove", ModTabList.ModGenericTab)); - if (!ItemManager.RegisterNonEnumItem(TabManager, NHItems.OVEN_GLOVE.get())) { - tResult = false; - } - NHItems.WITHER_PROTECTION_RING - .place(new WitherProtectionRing("WitherProtectionRing", ModTabList.ModThaumcraftTab)); - if (!ItemManager.RegisterNonEnumItem(TabManager, NHItems.WITHER_PROTECTION_RING.get())) { - tResult = false; - } - NHItems.WOODEN_BRICK_FORM.place(new WoodenBrickForm("WoodenBrickForm", ModTabList.ModGenericTab)); - if (!ItemManager.RegisterNonEnumItem(TabManager, NHItems.WOODEN_BRICK_FORM.get())) { - tResult = false; - } - - return tResult; - } - @Mod.EventHandler public void load(FMLInitializationEvent event) { // register events in modules @@ -599,19 +568,37 @@ public void serverUnload(FMLServerStoppingEvent event) { @Mod.EventHandler public void onMissingMappings(FMLMissingMappingsEvent event) { + HashMap itemListRemaps = null; + for (FMLMissingMappingsEvent.MissingMapping mapping : event.get()) { - if (mapping.type != GameRegistry.Type.ITEM) { - continue; + if (mapping.type != GameRegistry.Type.ITEM) continue; + + if (mapping.name.startsWith("dreamcraft:item.")) { + // Remap all the old Yamcl names to the new names. + if (itemListRemaps == null) { + itemListRemaps = createNHItemListRemaps(); + } + + mapping.remap(itemListRemaps.get(mapping.name.substring(16))); + } else if ("dreamcraft:itemQuantumToast".equals(mapping.name)) { + // Replace the old Quantum Bread declaration with the new one. + mapping.remap(NHItemList.QuantumBread.item); } + } + } - // Remaps the old "UnfiredSlimeSoulBrick" (with a typo) to the new, correct "UnfiredSlimeSoilBrick". - final String oldBrickName = "dreamcraft:item.UnfiredSlimeSoulBrick"; - if (oldBrickName.equals(mapping.name)) { - mapping.remap(CustomItemList.UnfiredSlimeSoilBrick.getItem()); - } + private static HashMap createNHItemListRemaps() { + final HashMap itemListData = new HashMap<>(); - break; + // Remap all the old Yamcl names to the new names. + for (var entry : NHItemList.values()) { + itemListData.put(entry.name, entry.item); } + + // Remaps the old "UnfiredSlimeSoulBrick" (with a typo) to the new, correct "UnfiredSlimeSoilBrick". + itemListData.put("UnfiredSlimeSoulBrick", NHItemList.UnfiredSlimeSoilBrick.item); + + return itemListData; } @Optional.Method(modid = Mods.ModIDs.BETTER_QUESTING) diff --git a/src/main/java/com/dreammaster/main/NHItems.java b/src/main/java/com/dreammaster/main/NHItems.java deleted file mode 100644 index 7c18104582..0000000000 --- a/src/main/java/com/dreammaster/main/NHItems.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.dreammaster.main; - -import net.minecraft.block.Block; - -import com.dreammaster.baubles.OvenGlove; -import com.dreammaster.baubles.WitherProtectionRing; -import com.dreammaster.item.WoodenBrickForm; - -import eu.usrv.yamcore.auxiliary.Placeable; - -public class NHItems { - - public static final Placeable OVEN_GLOVE = Placeable.make(); - public static final Placeable WITHER_PROTECTION_RING = Placeable.make(); - public static final Placeable WOODEN_BRICK_FORM = Placeable.make(); - public static Block ZINC_GRAVEL_ORE; -} diff --git a/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java b/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java index 8e01db56da..62ed8b6b97 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java @@ -5,7 +5,6 @@ import static gregtech.api.enums.Mods.Avaritia; import static gregtech.api.enums.Mods.EternalSingularity; import static gregtech.api.enums.Mods.Minecraft; -import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.Mods.OpenComputers; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.circuitAssemblerRecipes; @@ -88,14 +87,8 @@ public void loadRecipes() { final ItemStack NIOBIUM_PLATE = GTOreDictUnificator.get(OrePrefixes.plate, Materials.NiobiumTitanium, 1L); final ItemStack NETHER_QUARTZ_PLATE = GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L); final ItemStack LAPIS_SCREW = GTOreDictUnificator.get(OrePrefixes.screw, Materials.Lapis, 1L); - final ItemStack FLUID_CORE_1 = getModItem( - NewHorizonsCoreMod.ID, - "item.EngineeringProcessorFluidDiamondCore", - 1); - final ItemStack FLUID_CORE_2 = getModItem( - NewHorizonsCoreMod.ID, - "item.EngineeringProcessorFluidEmeraldCore", - 1); + final ItemStack FLUID_CORE_1 = NHItemList.EngineeringProcessorFluidDiamondCore.getIS(); + final ItemStack FLUID_CORE_2 = NHItemList.EngineeringProcessorFluidEmeraldCore.getIS(); final ItemStack FISH = getModItem(Minecraft.ID, "fish", 1, 0); final ItemStack CELL_1 = getModItem(AE2FluidCraft.ID, "fluid_storage1", 1, 0); final ItemStack CELL_4 = getModItem(AE2FluidCraft.ID, "fluid_storage4", 1, 0); diff --git a/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java b/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java index e29225303d..804e80bdf1 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java +++ b/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java @@ -54,9 +54,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 com.dreammaster.tinkersConstruct.SmelteryFluidTypes; import com.dreammaster.tinkersConstruct.TConstructHelper; @@ -114,7 +112,7 @@ public void loadRecipes() { addShapedRecipe(NHItemList.LongObsidianRod.getIS(2), "craftingToolSaw", "stoneObsidian", "craftingToolFile"); addShapedRecipe(NHItemList.LongStoneRod.getIS(2), "craftingToolSaw", "stone", "craftingToolFile"); addShapedRecipe( - NHItemList.MushroomPowder.getIS(1), + NHItemList.MushroomPowder.getIS(), "listAllmushroom", null, null, @@ -136,7 +134,7 @@ public void loadRecipes() { "craftingToolScrewdriver", "screwIron"); addShapedRecipe( - NHItemList.LaserEmitter.getIS(1), + NHItemList.LaserEmitter.getIS(), "itemCasingTitanium", "lensRuby", "itemCasingTitanium", @@ -147,7 +145,7 @@ public void loadRecipes() { "plateAlloyAdvanced", "plateAlloyAdvanced"); addShapedRecipe( - NHItemList.DiamondDrillTip.getIS(1), + NHItemList.DiamondDrillTip.getIS(), "plateDiamond", "plateSteel", "plateDiamond", @@ -158,7 +156,7 @@ public void loadRecipes() { "craftingToolHardHammer", "plateSteel"); addShapedRecipe( - NHItemList.ReinforcedIridiumDrillTip.getIS(1), + NHItemList.ReinforcedIridiumDrillTip.getIS(), "plateAlloyIridium", "plateSteel", "plateAlloyIridium", @@ -169,7 +167,7 @@ public void loadRecipes() { "craftingToolHardHammer", "plateSteel"); addShapedRecipe( - NHItemList.SawBladeDiamond.getIS(1), + NHItemList.SawBladeDiamond.getIS(), "plateDiamond", "plateDiamond", null, @@ -177,7 +175,7 @@ public void loadRecipes() { "craftingToolHardHammer", null); addShapedRecipe( - NHItemList.SawBladeStone.getIS(1), + NHItemList.SawBladeStone.getIS(), "plateStone", "plateStone", null, @@ -185,7 +183,7 @@ public void loadRecipes() { "craftingToolHardHammer", null); addShapedRecipe( - NHItemList.SawBladeArdite.getIS(1), + NHItemList.SawBladeArdite.getIS(), "plateArdite", "plateArdite", null, @@ -193,7 +191,7 @@ public void loadRecipes() { "craftingToolHardHammer", null); addShapedRecipe( - NHItemList.SawBladeManyullyn.getIS(1), + NHItemList.SawBladeManyullyn.getIS(), "plateManyullyn", "plateManyullyn", null, @@ -201,7 +199,7 @@ public void loadRecipes() { "craftingToolHardHammer", null); addShapedRecipe( - NHItemList.SawBladeRuby.getIS(1), + NHItemList.SawBladeRuby.getIS(), "plateRuby", "plateRuby", null, @@ -209,7 +207,7 @@ public void loadRecipes() { "craftingToolHardHammer", null); addShapedRecipe( - NHItemList.SawBladeSapphire.getIS(1), + NHItemList.SawBladeSapphire.getIS(), "plateSapphire", "plateSapphire", null, @@ -217,7 +215,7 @@ public void loadRecipes() { "craftingToolHardHammer", null); addShapedRecipe( - NHItemList.SawBladePeridot.getIS(1), + NHItemList.SawBladePeridot.getIS(), "plateOlivine", "plateOlivine", null, @@ -225,7 +223,7 @@ public void loadRecipes() { "craftingToolHardHammer", null); addShapedRecipe( - new ItemStack(CustomPatterns.BowFletchingCast, 1), + NHItemList.BowFletchingCast.getIS(), null, null, "craftingToolHardHammer", @@ -236,7 +234,7 @@ public void loadRecipes() { null, "craftingToolFile"); addShapedRecipe( - new ItemStack(CustomPatterns.BowFletchingCast, 1), + NHItemList.BowFletchingCast.getIS(), null, null, "craftingToolHardHammer", @@ -247,7 +245,7 @@ public void loadRecipes() { null, "craftingToolFile"); addShapedRecipe( - new ItemStack(CustomPatterns.BowStringCast, 1), + NHItemList.BowStringCast.getIS(), null, null, null, @@ -258,7 +256,7 @@ public void loadRecipes() { "craftingToolFile", "craftingToolKnife"); addShapedRecipe( - new ItemStack(CustomPatterns.BowStringCast, 1), + NHItemList.BowStringCast.getIS(), null, null, null, @@ -532,7 +530,7 @@ public void loadRecipes() { "craftingToolHardHammer", "screwStainlessSteel"); addShapedRecipe( - createItemStack(NewHorizonsCoreMod.ID, "item.OvenGlove", 1, 0, "{Durability:1000}", missing), + createItemStack(NewHorizonsCoreMod.ID, "OvenGlove", 1, 0, "{Durability:1000}", missing), getModItem(PamsHarvestCraft.ID, "wovencottonItem", 1, 0, missing), "itemLeather", getModItem(PamsHarvestCraft.ID, "wovencottonItem", 1, 0, missing), @@ -543,13 +541,13 @@ public void loadRecipes() { getModItem(Minecraft.ID, "string", 1, 0, missing), getModItem(Minecraft.ID, "string", 1, 0, missing)); addShapelessRecipe( - createItemStack(NewHorizonsCoreMod.ID, "item.OvenGlove", 1, 0, "{Durability:1000}", missing), - new ItemStack(NHItems.OVEN_GLOVE.get(), 1, 0), + createItemStack(NewHorizonsCoreMod.ID, "OvenGlove", 1, 0, "{Durability:1000}", missing), + new ItemStack(NHItemList.OvenGlove.item, 1, 0), "itemLeather", "itemLeather", "itemLeather"); addShapedRecipe( - createItemStack(NewHorizonsCoreMod.ID, "item.OvenGlove", 1, 1, "{Durability:1000}", missing), + createItemStack(NewHorizonsCoreMod.ID, "OvenGlove", 1, 1, "{Durability:1000}", missing), "itemLeather", getModItem(PamsHarvestCraft.ID, "wovencottonItem", 1, 0, missing), "itemLeather", @@ -560,8 +558,8 @@ public void loadRecipes() { getModItem(Minecraft.ID, "string", 1, 0, missing), getModItem(Minecraft.ID, "string", 1, 0, missing)); addShapelessRecipe( - createItemStack(NewHorizonsCoreMod.ID, "item.OvenGlove", 1, 1, "{Durability:1000}", missing), - new ItemStack(NHItems.OVEN_GLOVE.get(), 1, 1), + createItemStack(NewHorizonsCoreMod.ID, "OvenGlove", 1, 1, "{Durability:1000}", missing), + new ItemStack(NHItemList.OvenGlove.item, 1, 1), "itemLeather", "itemLeather", "itemLeather"); @@ -577,7 +575,7 @@ public void loadRecipes() { "stickDiamond", "stickDiamond"); addShapedRecipe( - NHItemList.MoldFormCoinage.getIS(1), + NHItemList.MoldFormCoinage.getIS(), null, null, null, @@ -675,33 +673,33 @@ public void loadRecipes() { 'e', getModItem(Minecraft.ID, "piston", 1, 0, missing)); TConstructRegistry.getTableCasting().addCastingRecipe( - NHItemList.ExtruderShapeBoat.getIS(1), + NHItemList.ExtruderShapeBoat.getIS(), FluidRegistry.getFluidStack("steel.molten", 576), - NHItemList.ShapeBoat.getIS(1), + NHItemList.ShapeBoat.getIS(), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( CustomItemList.MoldBoots.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - NHItemList.MoldFormBoots.getIS(1), + NHItemList.MoldFormBoots.getIS(), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( CustomItemList.MoldChestplate.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - NHItemList.MoldFormChestplate.getIS(1), + NHItemList.MoldFormChestplate.getIS(), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( CustomItemList.MoldHelmet.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - NHItemList.MoldFormHelmet.getIS(1), + NHItemList.MoldFormHelmet.getIS(), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( CustomItemList.MoldLeggings.get(1L), FluidRegistry.getFluidStack("steel.molten", 576), - NHItemList.MoldFormLeggings.getIS(1), + NHItemList.MoldFormLeggings.getIS(), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( @@ -711,13 +709,13 @@ public void loadRecipes() { true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( - new ItemStack(CustomPatterns.BowFletchingCast, 1), + NHItemList.BowFletchingCast.getIS(), FluidRegistry.getFluidStack(SmelteryFluidTypes.getMoltenPatternFluidName(), 144), getModItem(TinkerConstruct.ID, "fletching", 1, wildcard, missing), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( - new ItemStack(CustomPatterns.BowStringCast, 1), + NHItemList.BowStringCast.getIS(), FluidRegistry.getFluidStack(SmelteryFluidTypes.getMoltenPatternFluidName(), 144), getModItem(TinkerConstruct.ID, "bowstring", 1, wildcard, missing), true, @@ -810,14 +808,14 @@ public void loadRecipes() { .itemInputs( getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 2, 6, missing), getModItem(GalacticraftCore.ID, "item.basicItem", 2, 14, missing)) - .itemOutputs(NHItemList.LightBinding.getIS(1)).duration(30 * SECONDS).eut(480).addTo(assemblerRecipes); + .itemOutputs(NHItemList.LightBinding.getIS()).duration(30 * SECONDS).eut(480).addTo(assemblerRecipes); GTValues.RA.stdBuilder().itemInputs(NHItemList.RawBioFiber.getIS(2)).circuit(2) - .itemOutputs(NHItemList.BioOrganicMesh.getIS(1)).duration(40 * SECONDS).eut(2).addTo(assemblerRecipes); + .itemOutputs(NHItemList.BioOrganicMesh.getIS()).duration(40 * SECONDS).eut(2).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1L), NHItemList.CompressedBioBall.getIS(8)) - .itemOutputs(NHItemList.BioChunk.getIS(1)).duration(1 * MINUTES).eut(64).addTo(assemblerRecipes); + .itemOutputs(NHItemList.BioChunk.getIS()).duration(1 * MINUTES).eut(64).addTo(assemblerRecipes); GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.stick, Materials.Diamond, 4L)) .circuit(4).itemOutputs(BlockList.DiamondFrameBox.getIS()).duration(3 * SECONDS + 4 * TICKS).eut(8) .addTo(assemblerRecipes); @@ -831,54 +829,47 @@ public void loadRecipes() { .itemInputs( getModItem(RemoteIO.ID, "item.chip.location", 1, 0, missing), getModItem(RemoteIO.ID, "item.blank_plate", 1, 0, missing)) - .itemOutputs(NHItemList.BlankPlatedChip.getIS(1)).duration(5 * SECONDS).eut(480) - .addTo(assemblerRecipes); + .itemOutputs(NHItemList.BlankPlatedChip.getIS()).duration(5 * SECONDS).eut(480).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24, missing), - NHItemList.PulsatingSpatialCoreChip.getIS(1)) - .itemOutputs( - getModItem( - NewHorizonsCoreMod.ID, - "item.EngineeringProcessorSpatialPulsatingCore", - 1, - 0, - missing)) - .duration(5 * SECONDS).eut(7680).addTo(assemblerRecipes); + NHItemList.PulsatingSpatialCoreChip.getIS()) + .itemOutputs(NHItemList.EngineeringProcessorSpatialPulsatingCore.getIS()).duration(5 * SECONDS) + .eut(7680).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24, missing), - NHItemList.DiamondFluidCoreChip.getIS(1)) - .itemOutputs(NHItemList.EngineeringProcessorFluidDiamondCore.getIS(1)).duration(5 * SECONDS).eut(1920) + NHItemList.DiamondFluidCoreChip.getIS()) + .itemOutputs(NHItemList.EngineeringProcessorFluidDiamondCore.getIS()).duration(5 * SECONDS).eut(1920) .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24, missing), - NHItemList.EmeraldAdvancedFluidCoreChip.getIS(1)) - .itemOutputs(NHItemList.EngineeringProcessorFluidEmeraldCore.getIS(1)).duration(5 * SECONDS).eut(7680) + NHItemList.EmeraldAdvancedFluidCoreChip.getIS()) + .itemOutputs(NHItemList.EngineeringProcessorFluidEmeraldCore.getIS()).duration(5 * SECONDS).eut(7680) .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 22, missing), - NHItemList.GoldCoreChip.getIS(1)) + NHItemList.GoldCoreChip.getIS()) .itemOutputs(CustomItemList.LogicProcessorItemGoldCore.get(1L)).duration(5 * SECONDS).eut(480) .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24, missing), - NHItemList.DiamondCoreChip.getIS(1)) + NHItemList.DiamondCoreChip.getIS()) .itemOutputs(CustomItemList.EngineeringProcessorItemDiamondCore.get(1L)).duration(5 * SECONDS).eut(1920) .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24, missing), - NHItemList.EmeraldAdvancedCoreChip.getIS(1)) + NHItemList.EmeraldAdvancedCoreChip.getIS()) .itemOutputs(CustomItemList.EngineeringProcessorItemEmeraldCore.get(1L)).duration(5 * SECONDS).eut(7680) .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24, missing), - NHItemList.EmeraldHighAdvancedCoreChip.getIS(1)) + NHItemList.EmeraldHighAdvancedCoreChip.getIS()) .itemOutputs(CustomItemList.EngineeringProcessorItemAdvEmeraldCore.get(1L)).duration(5 * SECONDS) .eut(30720).addTo(assemblerRecipes); GTValues.RA.stdBuilder() @@ -893,19 +884,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(NHItemList.RawBioFiber.getIS(1)).outputChances(3300) + .itemOutputs(NHItemList.RawBioFiber.getIS()).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(NHItemList.RawBioFiber.getIS(1)).outputChances(5000) + .itemOutputs(NHItemList.RawBioFiber.getIS()).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(NHItemList.RawBioFiber.getIS(1)).outputChances(9000) + .itemOutputs(NHItemList.RawBioFiber.getIS()).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(NHItemList.RawBioFiber.getIS(1)).outputChances(10000) + .itemOutputs(NHItemList.RawBioFiber.getIS()).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)) @@ -1029,43 +1020,43 @@ public void loadRecipes() { .itemInputs( GTUtility.copyAmount(0, GTOreDictUnificator.get(OrePrefixes.lens, Materials.Tanzanite, 1L)), CustomItemList.ManyullynCrystal.get(1L)) - .itemOutputs(NHItemList.EngravedManyullynCrystalChip.getIS(1)).duration(45 * SECONDS).eut(7680) + .itemOutputs(NHItemList.EngravedManyullynCrystalChip.getIS()).duration(45 * SECONDS).eut(7680) .addTo(laserEngraverRecipes); GTValues.RA.stdBuilder() .itemInputs( GTUtility.copyAmount(0, GTOreDictUnificator.get(OrePrefixes.lens, Materials.Amethyst, 1L)), CustomItemList.ManyullynCrystal.get(1L)) - .itemOutputs(NHItemList.EngravedManyullynCrystalChip.getIS(1)).duration(45 * SECONDS).eut(7680) + .itemOutputs(NHItemList.EngravedManyullynCrystalChip.getIS()).duration(45 * SECONDS).eut(7680) .addTo(laserEngraverRecipes); GTValues.RA.stdBuilder() .itemInputs( GTUtility.copyAmount(0, GTOreDictUnificator.get(OrePrefixes.lens, Materials.NetherStar, 1L)), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L)) - .itemOutputs(NHItemList.EngravedGoldChip.getIS(1)).duration(5 * SECONDS).eut(120) + .itemOutputs(NHItemList.EngravedGoldChip.getIS()).duration(5 * SECONDS).eut(120) .addTo(laserEngraverRecipes); GTValues.RA.stdBuilder() .itemInputs( GTUtility.copyAmount(0, GTOreDictUnificator.get(OrePrefixes.lens, Materials.Dilithium, 1L)), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L)) - .itemOutputs(NHItemList.EngravedGoldChip.getIS(1)).duration(5 * SECONDS).eut(120) + .itemOutputs(NHItemList.EngravedGoldChip.getIS()).duration(5 * SECONDS).eut(120) .addTo(laserEngraverRecipes); GTValues.RA.stdBuilder() .itemInputs( GTUtility.copyAmount(0, GTOreDictUnificator.get(OrePrefixes.lens, Materials.InfusedOrder, 1L)), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L)) - .itemOutputs(NHItemList.EngravedGoldChip.getIS(1)).duration(5 * SECONDS).eut(120) + .itemOutputs(NHItemList.EngravedGoldChip.getIS()).duration(5 * SECONDS).eut(120) .addTo(laserEngraverRecipes); GTValues.RA.stdBuilder() .itemInputs( GTUtility.copyAmount(0, GTOreDictUnificator.get(OrePrefixes.lens, Materials.Glass, 1L)), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L)) - .itemOutputs(NHItemList.EngravedGoldChip.getIS(1)).duration(5 * SECONDS).eut(120) + .itemOutputs(NHItemList.EngravedGoldChip.getIS()).duration(5 * SECONDS).eut(120) .addTo(laserEngraverRecipes); GTValues.RA.stdBuilder() .itemInputs( GTUtility.copyAmount(0, GTOreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1L)), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L)) - .itemOutputs(NHItemList.EngravedGoldChip.getIS(1)).duration(5 * SECONDS).eut(120) + .itemOutputs(NHItemList.EngravedGoldChip.getIS()).duration(5 * SECONDS).eut(120) .addTo(laserEngraverRecipes); GTValues.RA.stdBuilder().circuit(3).fluidInputs(FluidRegistry.getFluidStack("fermentedbacterialsludge", 10)) .fluidOutputs(FluidRegistry.getFluidStack("mutagen", 1)).duration(3 * SECONDS).eut(1920) @@ -1080,12 +1071,12 @@ public void loadRecipes() { .itemInputs( getModItem(TinkerConstruct.ID, "materials", 2, 4, missing), ItemList.Shape_Extruder_Saw.get(0L)) - .itemOutputs(NHItemList.SawBladeArdite.getIS(1)).duration(20 * SECONDS).eut(120).addTo(extruderRecipes); + .itemOutputs(NHItemList.SawBladeArdite.getIS()).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(NHItemList.SawBladeManyullyn.getIS(1)).duration(30 * SECONDS).eut(120) + .itemOutputs(NHItemList.SawBladeManyullyn.getIS()).duration(30 * SECONDS).eut(120) .addTo(extruderRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -1094,106 +1085,96 @@ public void loadRecipes() { .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, Materials.Manyullyn, 1)).duration(5 * SECONDS) .eut(480).addTo(extruderRecipes); GTValues.RA.stdBuilder() - .itemInputs( - getModItem(Minecraft.ID, "feather", 1, 0, missing), - new ItemStack(CustomPatterns.BowFletchingCast, 0)) + .itemInputs(getModItem(Minecraft.ID, "feather", 1, 0, missing), NHItemList.BowFletchingCast.getIS(0)) .itemOutputs(getModItem(TinkerConstruct.ID, "fletching", 1, 0, missing)).duration(10 * SECONDS).eut(30) .addTo(extruderRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(TinkerConstruct.ID, "materials", 1, 1, missing), - new ItemStack(CustomPatterns.BowFletchingCast, 0)) + NHItemList.BowFletchingCast.getIS(0)) .itemOutputs(getModItem(TinkerConstruct.ID, "fletching", 1, 2, missing)).duration(10 * SECONDS).eut(30) .addTo(extruderRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(TinkerConstruct.ID, "materials", 1, 17, missing), - new ItemStack(CustomPatterns.BowFletchingCast, 0)) + NHItemList.BowFletchingCast.getIS(0)) .itemOutputs(getModItem(TinkerConstruct.ID, "fletching", 1, 3, missing)).duration(10 * SECONDS).eut(30) .addTo(extruderRecipes); GTValues.RA.stdBuilder() - .itemInputs( - getModItem(Minecraft.ID, "leaves", 1, 0, missing), - new ItemStack(CustomPatterns.BowFletchingCast, 0)) + .itemInputs(getModItem(Minecraft.ID, "leaves", 1, 0, missing), NHItemList.BowFletchingCast.getIS(0)) .itemOutputs(getModItem(TinkerConstruct.ID, "fletching", 1, 1, missing)).duration(10 * SECONDS).eut(30) .addTo(extruderRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(TinkerConstruct.ID, "slime.leaves", 1, 0, missing), - new ItemStack(CustomPatterns.BowFletchingCast, 0)) + NHItemList.BowFletchingCast.getIS(0)) .itemOutputs(getModItem(TinkerConstruct.ID, "fletching", 1, 4, missing)).duration(10 * SECONDS).eut(30) .addTo(extruderRecipes); GTValues.RA.stdBuilder() - .itemInputs( - getModItem(Minecraft.ID, "string", 3, 0, missing), - new ItemStack(CustomPatterns.BowStringCast, 0)) + .itemInputs(getModItem(Minecraft.ID, "string", 3, 0, missing), NHItemList.BowStringCast.getIS(0)) .itemOutputs(getModItem(TinkerConstruct.ID, "bowstring", 1, 0, missing)).duration(20 * SECONDS).eut(30) .addTo(extruderRecipes); GTValues.RA.stdBuilder() - .itemInputs( - getModItem(Natura.ID, "barleyFood", 3, 7, missing), - new ItemStack(CustomPatterns.BowStringCast, 0)) + .itemInputs(getModItem(Natura.ID, "barleyFood", 3, 7, missing), NHItemList.BowStringCast.getIS(0)) .itemOutputs(getModItem(TinkerConstruct.ID, "bowstring", 1, 2, missing)).duration(20 * SECONDS).eut(30) .addTo(extruderRecipes); GTValues.RA.stdBuilder() - .itemInputs( - getModItem(Thaumcraft.ID, "ItemResource", 3, 7, missing), - new ItemStack(CustomPatterns.BowStringCast, 0)) + .itemInputs(getModItem(Thaumcraft.ID, "ItemResource", 3, 7, missing), NHItemList.BowStringCast.getIS(0)) .itemOutputs(getModItem(TinkerConstruct.ID, "bowstring", 1, 1, missing)).duration(20 * SECONDS).eut(30) .addTo(extruderRecipes); GTValues.RA.stdBuilder() .itemInputs( - NHItemList.EngravedManyullynCrystalChip.getIS(1), + NHItemList.EngravedManyullynCrystalChip.getIS(), getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1, 4, missing)) - .itemOutputs(NHItemList.PulsatingSpatialCoreChip.getIS(1)).duration(15 * SECONDS).eut(7680) + .itemOutputs(NHItemList.PulsatingSpatialCoreChip.getIS()).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(NHItemList.DiamondFluidCoreChip.getIS(1)).duration(15 * SECONDS).eut(480) + .itemOutputs(NHItemList.DiamondFluidCoreChip.getIS()).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(NHItemList.EmeraldAdvancedFluidCoreChip.getIS(1)).duration(15 * SECONDS).eut(1024) + .itemOutputs(NHItemList.EmeraldAdvancedFluidCoreChip.getIS()).duration(15 * SECONDS).eut(1024) .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( - NHItemList.EngravedGoldChip.getIS(1), + NHItemList.EngravedGoldChip.getIS(), getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1, 2, missing)) - .itemOutputs(NHItemList.GoldCoreChip.getIS(1)).duration(15 * SECONDS).eut(256) + .itemOutputs(NHItemList.GoldCoreChip.getIS()).duration(15 * SECONDS).eut(256) .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( CustomItemList.EngravedDiamondCrystalChip.get(1L), getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1, 3, missing)) - .itemOutputs(NHItemList.DiamondCoreChip.getIS(1)).duration(15 * SECONDS).eut(480) + .itemOutputs(NHItemList.DiamondCoreChip.getIS()).duration(15 * SECONDS).eut(480) .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( CustomItemList.EngravedEnergyChip.get(1L), getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1, 7, missing)) - .itemOutputs(NHItemList.EmeraldAdvancedCoreChip.getIS(1)).duration(15 * SECONDS).eut(1024) + .itemOutputs(NHItemList.EmeraldAdvancedCoreChip.getIS()).duration(15 * SECONDS).eut(1024) .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( CustomItemList.EngravedQuantumChip.get(1L), getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1, 7, missing)) - .itemOutputs(NHItemList.EmeraldHighAdvancedCoreChip.getIS(1)).duration(15 * SECONDS).eut(4096) + .itemOutputs(NHItemList.EmeraldHighAdvancedCoreChip.getIS()).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(NHItemList.GeneticCircuit.getIS(1)).duration(15 * SECONDS).eut(480) + .itemOutputs(NHItemList.GeneticCircuit.getIS()).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(NHItemList.EnvironmentalCircuit.getIS(1)).duration(15 * SECONDS).eut(480) + .itemOutputs(NHItemList.EnvironmentalCircuit.getIS()).duration(15 * SECONDS).eut(480) .addTo(formingPressRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -1279,7 +1260,7 @@ 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(NHItemList.RawMytryl.getIS(1)) + GTValues.RA.stdBuilder().itemInputs(NHItemList.RawMytryl.getIS()) .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)) diff --git a/src/main/java/com/dreammaster/scripts/ScriptTCCoreMod.java b/src/main/java/com/dreammaster/scripts/ScriptTCCoreMod.java index 9e43b755e6..9f08713315 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptTCCoreMod.java +++ b/src/main/java/com/dreammaster/scripts/ScriptTCCoreMod.java @@ -32,10 +32,8 @@ import java.util.Arrays; import java.util.List; -import net.minecraft.item.ItemStack; - import com.dreammaster.gthandler.CustomItemList; -import com.dreammaster.main.NHItems; +import com.dreammaster.item.NHItemList; import com.dreammaster.thaumcraft.TCHelper; import gregtech.api.enums.GTValues; @@ -95,12 +93,12 @@ public void loadRecipes() { 3, 2, 3, - new ItemStack(NHItems.WITHER_PROTECTION_RING.get(), 1)).setParents("RUNICARMOR") - .setSiblings("RUNICARMOR").setConcealed() - .setPages(new ResearchPage("NewHorizons.research_page.WITHERRING")).registerResearchItem(); + NHItemList.WitherProtectionRing.getIS()).setParents("RUNICARMOR").setSiblings("RUNICARMOR") + .setConcealed().setPages(new ResearchPage("NewHorizons.research_page.WITHERRING")) + .registerResearchItem(); TCHelper.addInfusionCraftingRecipe( "WITHERRING", - new ItemStack(NHItems.WITHER_PROTECTION_RING.get(), 1), + NHItemList.WitherProtectionRing.getIS(), 3, new AspectList().add(Aspect.getAspect("alienis"), 45).add(Aspect.getAspect("praecantatio"), 35) .add(Aspect.getAspect("spiritus"), 30).add(Aspect.getAspect("superbia"), 25) @@ -113,7 +111,7 @@ public void loadRecipes() { getModItem(Minecraft.ID, "skull", 1, 1, missing)); TCHelper.addResearchPage( "WITHERRING", - new ResearchPage(TCHelper.findInfusionRecipe(new ItemStack(NHItems.WITHER_PROTECTION_RING.get(), 1)))); + new ResearchPage(TCHelper.findInfusionRecipe(NHItemList.WitherProtectionRing.getIS()))); ThaumcraftApi.addWarpToResearch("WITHERRING", 2); new ResearchItem( "EMINENCESTONE", diff --git a/src/main/java/com/dreammaster/tinkersConstruct/TiCoLoader.java b/src/main/java/com/dreammaster/tinkersConstruct/TiCoLoader.java index 3b08b2dde2..bd4f1bdc87 100644 --- a/src/main/java/com/dreammaster/tinkersConstruct/TiCoLoader.java +++ b/src/main/java/com/dreammaster/tinkersConstruct/TiCoLoader.java @@ -14,7 +14,6 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.oredict.OreDictionary; -import com.dreammaster.main.NHItems; import com.dreammaster.mantle.BookLoader; import com.dreammaster.tinkersConstruct.worldgen.ZincGravelOre; import com.dreammaster.tinkersConstruct.worldgen.ZincGravelOreItem; @@ -31,15 +30,17 @@ public class TiCoLoader { + public static Block ZINC_GRAVEL_ORE; + public static void doPreInitialization() { registerZincGravelOre(); } private static void registerZincGravelOre() { - NHItems.ZINC_GRAVEL_ORE = new ZincGravelOre().setBlockName("block.ore.gravel.zinc"); - NHItems.ZINC_GRAVEL_ORE.setHarvestLevel("shovel", 1, 0); - GameRegistry.registerBlock(NHItems.ZINC_GRAVEL_ORE, ZincGravelOreItem.class, "ZincGravelOre"); - OreDictionary.registerOre("oreZinc", new ItemStack(NHItems.ZINC_GRAVEL_ORE, 1, 0)); + ZINC_GRAVEL_ORE = new ZincGravelOre().setBlockName("block.ore.gravel.zinc"); + ZINC_GRAVEL_ORE.setHarvestLevel("shovel", 1, 0); + GameRegistry.registerBlock(ZINC_GRAVEL_ORE, ZincGravelOreItem.class, "ZincGravelOre"); + OreDictionary.registerOre("oreZinc", new ItemStack(ZINC_GRAVEL_ORE, 1, 0)); } public static void doInitialization() { @@ -157,12 +158,12 @@ private static void registerGravelOrePosteaTransformers() { String targetBlock = "TConstruct:GravelOre"; BlockReplacementManager.addBlockReplacement(targetBlock, (blockConversionInfoOld, world) -> { BlockConversionInfo blockConversionInfoNew = new BlockConversionInfo(); - blockConversionInfoNew.blockID = Block.getIdFromBlock(NHItems.ZINC_GRAVEL_ORE); + blockConversionInfoNew.blockID = Block.getIdFromBlock(ZINC_GRAVEL_ORE); blockConversionInfoNew.metadata = 0; return blockConversionInfoNew; }); ItemStackReplacementManager.addItemReplacement(targetBlock, tag -> { - tag.setShort("id", (short) Block.getIdFromBlock(NHItems.ZINC_GRAVEL_ORE)); + tag.setShort("id", (short) Block.getIdFromBlock(ZINC_GRAVEL_ORE)); tag.setShort("Damage", (short) 0); return tag; }); diff --git a/src/main/java/com/dreammaster/tinkersConstruct/worldgen/ZincGravelWorldgen.java b/src/main/java/com/dreammaster/tinkersConstruct/worldgen/ZincGravelWorldgen.java index 77e12c3c3f..72a03151fa 100644 --- a/src/main/java/com/dreammaster/tinkersConstruct/worldgen/ZincGravelWorldgen.java +++ b/src/main/java/com/dreammaster/tinkersConstruct/worldgen/ZincGravelWorldgen.java @@ -10,7 +10,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate; -import com.dreammaster.main.NHItems; +import com.dreammaster.tinkersConstruct.TiCoLoader; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableList; @@ -20,7 +20,7 @@ public class ZincGravelWorldgen { - private final SurfaceOreGen zincSurface = new SurfaceOreGen(NHItems.ZINC_GRAVEL_ORE, 0, 12, true); + private final SurfaceOreGen zincSurface = new SurfaceOreGen(TiCoLoader.ZINC_GRAVEL_ORE, 0, 12, true); private static final ImmutableCollection EXTRA_ORE_BIOMES = ImmutableList .of(extremeHills, extremeHillsEdge); diff --git a/src/main/resources/assets/dreamcraft/lang/en_US.lang b/src/main/resources/assets/dreamcraft/lang/en_US.lang index c7882eaad1..2c7c63a2dd 100644 --- a/src/main/resources/assets/dreamcraft/lang/en_US.lang +++ b/src/main/resources/assets/dreamcraft/lang/en_US.lang @@ -224,11 +224,8 @@ item.LeadNickelPlate.name=Compressed Lead-Nickel Plate item.LeadOriharukonPlate.name=Compressed Lead-Oriharukon Plate item.EnvironmentalCircuit.name=Environmental Circuit item.GeneticCircuit.name=Genetic Circuit -item.Cast.name=Cast item.BowFletchingCast.name=Bow Fletching Cast -item.Cast.BowFletchingCast.name=Bow Fletching Cast item.BowStringCast.name=Bow String Cast -item.Cast.BowStringCast.name=Bow String Cast item.AluminiumBars.name=Aluminium Bars item.StainlessSteelBars.name=Stainless Steel Bars item.TitaniumBars.name=Titanium Bars @@ -292,7 +289,6 @@ itemGroup.tabDreamCraftBlocks=GT New Horizons: Blocks itemGroup.tabDreamCraftSpace=GT New Horizons: GC-GS Space itemGroup.tabDreamCraftSolar=GT New Horizons: Solar Components itemGroup.tabDreamCraftBars_Casings=GT New Horizons: Bars and Casings -itemGroup.tabDreamGregTechAdditions=GT New Horizons: New GT Tiles and Casings item.OvenGlove.name=Glove item.OvenGlove_0_0.name=Pizza Glove (Left hand) item.OvenGlove_0_1.name=Cake Glove (Left hand) @@ -302,6 +298,9 @@ item.OvenGlove_1_0.name=Pizza Glove (Right hand) item.OvenGlove_1_1.name=Cake Glove (Right hand) item.OvenGlove_1_2.name=Lava Glove (Right hand) item.OvenGlove_1_3.name=BBQ Glove (Right hand) +item.OvenGlove.desc.1=Protecting your fingers since 1890 +item.OvenGlove.desc.2=Durability: %s/%s +item.OvenGlove.desc.broken=This glove is too damaged to protect you. You need to repair it. item.SodiumPotassium_bucket.name=Bucket of Sodium Potassium (NaK) item.PotassiumHydroxideDust.name=Potassium Hydroxide Dust item.ElectrotineWire.name=Electrotine Wire @@ -354,12 +353,16 @@ item.MoldFormHelmet.name=Casting Form (Helmet Mold) item.MoldHelmet.name=Mold (Helmet) item.MoldFormLeggings.name=Casting Form (Leggings Mold) item.MoldLeggings.name=Mold (Leggings) +item.QuantumBread.name=Quantum Bread item.QuantumBread_0.name=Quantum Sliced Bread item.QuantumBread_1.name=Quantum Bread +item.QuantumBread.desc=...wasn't it sliced just a second ago? tile.AdminsBedrockLamp.name=Admin's Bedrock Lamp tile.BoringBlock.name=Just A Boring Block... tile.CompressedGraphite.name=Compressed Graphite item.WitherProtectionRing.name=Wither Protection Ring +item.WitherProtectionRing.desc.1=Finally, a way to get rid of the nasty withering effect. +item.WitherProtectionRing.desc.2=Now it's time to get some Stars! tile.babyChest.name=Baby Chest item.NagaScaleChip.name=Naga Scale Chip item.NagaScaleFragment.name=Naga Scale Fragment