diff --git a/src/main/java/techreborn/TechReborn.java b/src/main/java/techreborn/TechReborn.java index 228c7dfbb..3b978964f 100644 --- a/src/main/java/techreborn/TechReborn.java +++ b/src/main/java/techreborn/TechReborn.java @@ -124,7 +124,7 @@ public class TechReborn { TRBlocks.init(); TRTileEntities.init(); ModFluids.init(); - TRItems.init(); + TRContent.registerItems(); // Entitys EntityRegistry.registerModEntity(new ResourceLocation("techreborn", "nuke"), EntityNukePrimed.class, "nuke", 0, INSTANCE, 160, 5, true); @@ -167,7 +167,7 @@ public class TechReborn { ModLootTables.CHESTS_RUBBER_PLANTATION.toString(); //Done to make it load, then it will be read from disk // Scrapbox if (BehaviorDispenseScrapbox.dispenseScrapboxes) { - BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(TRItems.SCRAP_BOX, new BehaviorDispenseScrapbox()); + BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(TRContent.SCRAP_BOX, new BehaviorDispenseScrapbox()); } Torus.genSizeMap(TileFusionControlComputer.maxCoilSize); diff --git a/src/main/java/techreborn/api/TechRebornAPI.java b/src/main/java/techreborn/api/TechRebornAPI.java index d08ee16fa..92f61a0fc 100644 --- a/src/main/java/techreborn/api/TechRebornAPI.java +++ b/src/main/java/techreborn/api/TechRebornAPI.java @@ -65,7 +65,7 @@ public final class TechRebornAPI { */ public static Item getItem(String name) { try { - Object e = Class.forName("techreborn.init.TRItems").getField(name).get(null); + Object e = Class.forName("techreborn.init.TRContent").getField(name).get(null); return e instanceof Item ? (Item) e : null; } catch (NoSuchFieldException e1) { e1.printStackTrace(); @@ -89,7 +89,7 @@ public final class TechRebornAPI { */ public static Item getIngredient(String name) { try { - Object e = Class.forName("techreborn.init.TRIngredient").getField(name).get(null); + Object e = Class.forName("techreborn.init.TRContent").getField(name).get(null); return e instanceof Item ? (Item) e : null; } catch (NoSuchFieldException e1) { e1.printStackTrace(); diff --git a/src/main/java/techreborn/client/ClientEventHandler.java b/src/main/java/techreborn/client/ClientEventHandler.java index 4bc1c3856..ffd04baf5 100644 --- a/src/main/java/techreborn/client/ClientEventHandler.java +++ b/src/main/java/techreborn/client/ClientEventHandler.java @@ -29,7 +29,7 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import techreborn.init.TRItems; +import techreborn.init.TRContent; public class ClientEventHandler { @@ -38,7 +38,7 @@ public class ClientEventHandler { EntityPlayer player = event.getEntityPlayer(); Item chestslot = !player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).isEmpty() ? player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).getItem() : null; - if (chestslot != null && chestslot == TRItems.CLOAKING_DEVICE) { + if (chestslot != null && chestslot == TRContent.CLOAKING_DEVICE) { event.setCanceled(true); } } diff --git a/src/main/java/techreborn/client/RegisterItemJsons.java b/src/main/java/techreborn/client/RegisterItemJsons.java index 9fdc164a5..34133ef60 100644 --- a/src/main/java/techreborn/client/RegisterItemJsons.java +++ b/src/main/java/techreborn/client/RegisterItemJsons.java @@ -33,7 +33,6 @@ import techreborn.TechReborn; import techreborn.config.ConfigTechReborn; import techreborn.init.TRBlocks; import techreborn.init.TRContent; -import techreborn.init.TRItems; public class RegisterItemJsons { public static void registerModels() { @@ -44,80 +43,80 @@ public class RegisterItemJsons { private static void registerItems() { // Armor - register(TRItems.CLOAKING_DEVICE, "armor/cloaking_device"); - register(TRItems.LAPOTRONIC_ORBPACK, "armor/lapotronic_orbpack"); - register(TRItems.LITHIUM_ION_BATPACK, "armor/lithium_batpack"); + register(TRContent.CLOAKING_DEVICE, "armor/cloaking_device"); + register(TRContent.LAPOTRONIC_ORBPACK, "armor/lapotronic_orbpack"); + register(TRContent.LITHIUM_ION_BATPACK, "armor/lithium_batpack"); // Battery - register(TRItems.RED_CELL_BATTERY, "battery/re_battery"); - register(TRItems.LITHIUM_ION_BATTERY, "battery/lithium_battery"); - register(TRItems.ENERGY_CRYSTAL, "battery/energy_crystal"); - register(TRItems.LAPOTRON_CRYSTAL, "battery/lapotron_crystal"); - register(TRItems.LAPOTRONIC_ORB, "battery/lapotronic_orb"); + register(TRContent.RED_CELL_BATTERY, "battery/re_battery"); + register(TRContent.LITHIUM_ION_BATTERY, "battery/lithium_battery"); + register(TRContent.ENERGY_CRYSTAL, "battery/energy_crystal"); + register(TRContent.LAPOTRON_CRYSTAL, "battery/lapotron_crystal"); + register(TRContent.LAPOTRONIC_ORB, "battery/lapotronic_orb"); // Tools - register(TRItems.INDUSTRIAL_CHAINSAW, "tool/industrial_chainsaw"); - register(TRItems.INDUSTRIAL_DRILL, "tool/industrial_drill"); - register(TRItems.INDUSTRIAL_JACKHAMMER, "tool/industrial_jackhammer"); - register(TRItems.DEBUG_TOOL, "tool/debug"); - register(TRItems.ADVANCED_CHAINSAW, "tool/advanced_chainsaw"); - register(TRItems.ADVANCED_DRILL, "tool/advanced_drill"); - register(TRItems.ADVANCED_JACKHAMMER, "tool/advanced_jackhammer"); - register(TRItems.ELECTRIC_TREE_TAP, "tool/electric_treetap"); - register(TRItems.NANOSABER, "tool/nanosaber"); - register(TRItems.OMNI_TOOL, "tool/omni_tool"); - register(TRItems.ROCK_CUTTER, "tool/rock_cutter"); - register(TRItems.BASIC_CHAINSAW, "tool/basic_chainsaw"); - register(TRItems.BASIC_DRILL, "tool/basic_drill"); - register(TRItems.BASIC_JACKHAMMER, "tool/basic_jackhammer"); - register(TRItems.TREE_TAP, "tool/treetap"); - register(TRItems.WRENCH, "tool/wrench"); + register(TRContent.INDUSTRIAL_CHAINSAW, "tool/industrial_chainsaw"); + register(TRContent.INDUSTRIAL_DRILL, "tool/industrial_drill"); + register(TRContent.INDUSTRIAL_JACKHAMMER, "tool/industrial_jackhammer"); + register(TRContent.DEBUG_TOOL, "tool/debug"); + register(TRContent.ADVANCED_CHAINSAW, "tool/advanced_chainsaw"); + register(TRContent.ADVANCED_DRILL, "tool/advanced_drill"); + register(TRContent.ADVANCED_JACKHAMMER, "tool/advanced_jackhammer"); + register(TRContent.ELECTRIC_TREE_TAP, "tool/electric_treetap"); + register(TRContent.NANOSABER, "tool/nanosaber"); + register(TRContent.OMNI_TOOL, "tool/omni_tool"); + register(TRContent.ROCK_CUTTER, "tool/rock_cutter"); + register(TRContent.BASIC_CHAINSAW, "tool/basic_chainsaw"); + register(TRContent.BASIC_DRILL, "tool/basic_drill"); + register(TRContent.BASIC_JACKHAMMER, "tool/basic_jackhammer"); + register(TRContent.TREE_TAP, "tool/treetap"); + register(TRContent.WRENCH, "tool/wrench"); // Other - register(TRItems.FREQUENCY_TRANSMITTER, "misc/frequency_transmitter"); - register(TRItems.SCRAP_BOX, "misc/scrapbox"); - register(TRItems.MANUAL, "misc/manual"); + register(TRContent.FREQUENCY_TRANSMITTER, "misc/frequency_transmitter"); + register(TRContent.SCRAP_BOX, "misc/scrapbox"); + register(TRContent.MANUAL, "misc/manual"); ; // Gem armor & tools if (ConfigTechReborn.enableGemArmorAndTools) { - registerBlockstateMultiItem(TRItems.RUBY_HELMET, "ruby_helmet", "items/armour"); - registerBlockstateMultiItem(TRItems.RUBY_CHESTPLATE, "ruby_chestplate", "items/armour"); - registerBlockstateMultiItem(TRItems.RUBY_LEGGINGS, "ruby_leggings", "items/armour"); - registerBlockstateMultiItem(TRItems.RUBY_BOOTS, "ruby_boots", "items/armour"); - registerBlockstateMultiItem(TRItems.SAPPHIRE_HELMET, "sapphire_helmet", "items/armour"); - registerBlockstateMultiItem(TRItems.SAPPHIRE_CHESTPLATE, "sapphire_chestplate", "items/armour"); - registerBlockstateMultiItem(TRItems.SAPPHIRE_LEGGINGS, "sapphire_leggings", "items/armour"); - registerBlockstateMultiItem(TRItems.SAPPHIRE_BOOTS, "sapphire_boots", "items/armour"); - registerBlockstateMultiItem(TRItems.PERIDOT_HELMET, "peridot_helmet", "items/armour"); - registerBlockstateMultiItem(TRItems.PERIDOT_CHESTPLATE, "peridot_chestplate", "items/armour"); - registerBlockstateMultiItem(TRItems.PERIDOT_LEGGINGS, "peridot_leggings", "items/armour"); - registerBlockstateMultiItem(TRItems.PERIDOT_BOOTS, "peridot_boots", "items/armour"); - registerBlockstateMultiItem(TRItems.BRONZE_HELMET, "bronze_helmet", "items/armour"); - registerBlockstateMultiItem(TRItems.BRONZE_CHESTPLATE, "bronze_chestplate", "items/armour"); - registerBlockstateMultiItem(TRItems.BRONZE_LEGGINGS, "bronze_leggings", "items/armour"); - registerBlockstateMultiItem(TRItems.BRONZE_BOOTS, "bronze_boots", "items/armour"); + registerBlockstateMultiItem(TRContent.RUBY_HELMET, "ruby_helmet", "items/armour"); + registerBlockstateMultiItem(TRContent.RUBY_CHESTPLATE, "ruby_chestplate", "items/armour"); + registerBlockstateMultiItem(TRContent.RUBY_LEGGINGS, "ruby_leggings", "items/armour"); + registerBlockstateMultiItem(TRContent.RUBY_BOOTS, "ruby_boots", "items/armour"); + registerBlockstateMultiItem(TRContent.SAPPHIRE_HELMET, "sapphire_helmet", "items/armour"); + registerBlockstateMultiItem(TRContent.SAPPHIRE_CHESTPLATE, "sapphire_chestplate", "items/armour"); + registerBlockstateMultiItem(TRContent.SAPPHIRE_LEGGINGS, "sapphire_leggings", "items/armour"); + registerBlockstateMultiItem(TRContent.SAPPHIRE_BOOTS, "sapphire_boots", "items/armour"); + registerBlockstateMultiItem(TRContent.PERIDOT_HELMET, "peridot_helmet", "items/armour"); + registerBlockstateMultiItem(TRContent.PERIDOT_CHESTPLATE, "peridot_chestplate", "items/armour"); + registerBlockstateMultiItem(TRContent.PERIDOT_LEGGINGS, "peridot_leggings", "items/armour"); + registerBlockstateMultiItem(TRContent.PERIDOT_BOOTS, "peridot_boots", "items/armour"); + registerBlockstateMultiItem(TRContent.BRONZE_HELMET, "bronze_helmet", "items/armour"); + registerBlockstateMultiItem(TRContent.BRONZE_CHESTPLATE, "bronze_chestplate", "items/armour"); + registerBlockstateMultiItem(TRContent.BRONZE_LEGGINGS, "bronze_leggings", "items/armour"); + registerBlockstateMultiItem(TRContent.BRONZE_BOOTS, "bronze_boots", "items/armour"); - registerBlockstateMultiItem(TRItems.RUBY_PICKAXE, "ruby_pickaxe", "items/tool"); - registerBlockstateMultiItem(TRItems.RUBY_SWORD, "ruby_sword", "items/tool"); - registerBlockstateMultiItem(TRItems.RUBY_AXE, "ruby_axe", "items/tool"); - registerBlockstateMultiItem(TRItems.RUBY_SPADE, "ruby_spade", "items/tool"); - registerBlockstateMultiItem(TRItems.RUBY_HOE, "ruby_hoe", "items/tool"); - registerBlockstateMultiItem(TRItems.SAPPHIRE_PICKAXE, "sapphire_pickaxe", "items/tool"); - registerBlockstateMultiItem(TRItems.SAPPHIRE_SWORD, "sapphire_sword", "items/tool"); - registerBlockstateMultiItem(TRItems.SAPPHIRE_AXE, "sapphire_axe", "items/tool"); - registerBlockstateMultiItem(TRItems.SAPPHIRE_SPADE, "sapphire_spade", "items/tool"); - registerBlockstateMultiItem(TRItems.SAPPHIRE_HOE, "sapphire_hoe", "items/tool"); - registerBlockstateMultiItem(TRItems.PERIDOT_PICKAXE, "peridot_pickaxe", "items/tool"); - registerBlockstateMultiItem(TRItems.PERIDOT_SWORD, "peridot_sword", "items/tool"); - registerBlockstateMultiItem(TRItems.PERIDOT_AXE, "peridot_axe", "items/tool"); - registerBlockstateMultiItem(TRItems.PERIDOT_SPADE, "peridot_spade", "items/tool"); - registerBlockstateMultiItem(TRItems.PERIDOT_HOE, "peridot_hoe", "items/tool"); - registerBlockstateMultiItem(TRItems.BRONZE_PICKAXE, "bronze_pickaxe", "items/tool"); - registerBlockstateMultiItem(TRItems.BRONZE_SWORD, "bronze_sword", "items/tool"); - registerBlockstateMultiItem(TRItems.BRONZE_AXE, "bronze_axe", "items/tool"); - registerBlockstateMultiItem(TRItems.BRONZE_SPADE, "bronze_spade", "items/tool"); - registerBlockstateMultiItem(TRItems.BRONZE_HOE, "bronze_hoe", "items/tool"); + registerBlockstateMultiItem(TRContent.RUBY_PICKAXE, "ruby_pickaxe", "items/tool"); + registerBlockstateMultiItem(TRContent.RUBY_SWORD, "ruby_sword", "items/tool"); + registerBlockstateMultiItem(TRContent.RUBY_AXE, "ruby_axe", "items/tool"); + registerBlockstateMultiItem(TRContent.RUBY_SPADE, "ruby_spade", "items/tool"); + registerBlockstateMultiItem(TRContent.RUBY_HOE, "ruby_hoe", "items/tool"); + registerBlockstateMultiItem(TRContent.SAPPHIRE_PICKAXE, "sapphire_pickaxe", "items/tool"); + registerBlockstateMultiItem(TRContent.SAPPHIRE_SWORD, "sapphire_sword", "items/tool"); + registerBlockstateMultiItem(TRContent.SAPPHIRE_AXE, "sapphire_axe", "items/tool"); + registerBlockstateMultiItem(TRContent.SAPPHIRE_SPADE, "sapphire_spade", "items/tool"); + registerBlockstateMultiItem(TRContent.SAPPHIRE_HOE, "sapphire_hoe", "items/tool"); + registerBlockstateMultiItem(TRContent.PERIDOT_PICKAXE, "peridot_pickaxe", "items/tool"); + registerBlockstateMultiItem(TRContent.PERIDOT_SWORD, "peridot_sword", "items/tool"); + registerBlockstateMultiItem(TRContent.PERIDOT_AXE, "peridot_axe", "items/tool"); + registerBlockstateMultiItem(TRContent.PERIDOT_SPADE, "peridot_spade", "items/tool"); + registerBlockstateMultiItem(TRContent.PERIDOT_HOE, "peridot_hoe", "items/tool"); + registerBlockstateMultiItem(TRContent.BRONZE_PICKAXE, "bronze_pickaxe", "items/tool"); + registerBlockstateMultiItem(TRContent.BRONZE_SWORD, "bronze_sword", "items/tool"); + registerBlockstateMultiItem(TRContent.BRONZE_AXE, "bronze_axe", "items/tool"); + registerBlockstateMultiItem(TRContent.BRONZE_SPADE, "bronze_spade", "items/tool"); + registerBlockstateMultiItem(TRContent.BRONZE_HOE, "bronze_hoe", "items/tool"); } register(TRBlocks.RUBBER_SAPLING, "misc/rubber_sapling"); diff --git a/src/main/java/techreborn/client/gui/GuiBase.java b/src/main/java/techreborn/client/gui/GuiBase.java index 6ac5f5c2d..110494887 100644 --- a/src/main/java/techreborn/client/gui/GuiBase.java +++ b/src/main/java/techreborn/client/gui/GuiBase.java @@ -41,7 +41,7 @@ import techreborn.client.container.builder.BuiltContainer; import techreborn.client.gui.slot.GuiFluidConfiguration; import techreborn.client.gui.slot.GuiSlotConfiguration; import techreborn.client.gui.widget.GuiButtonPowerBar; -import techreborn.init.TRItems; +import techreborn.init.TRContent; import techreborn.items.DynamicCell; import java.io.IOException; @@ -144,7 +144,7 @@ public class GuiBase extends GuiContainer { } } if(getMachine().hasSlotConfig()){ - builder.drawSlotTab(this, guiLeft, guiTop, mouseX, mouseY, upgrades, new ItemStack(TRItems.WRENCH)); + builder.drawSlotTab(this, guiLeft, guiTop, mouseX, mouseY, upgrades, new ItemStack(TRContent.WRENCH)); } if(getMachine().showTankConfig()){ builder.drawSlotTab(this, guiLeft, guiTop + 27, mouseX, mouseY, upgrades, DynamicCell.getCellWithFluid(FluidRegistry.LAVA)); diff --git a/src/main/java/techreborn/client/gui/GuiIronFurnace.java b/src/main/java/techreborn/client/gui/GuiIronFurnace.java index b495b8bc7..77cd13248 100644 --- a/src/main/java/techreborn/client/gui/GuiIronFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiIronFurnace.java @@ -29,7 +29,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import techreborn.init.TRItems; +import techreborn.init.TRContent; import techreborn.tiles.machine.iron.TileIronFurnace; public class GuiIronFurnace extends GuiBase { @@ -50,7 +50,7 @@ public class GuiIronFurnace extends GuiBase { protected void drawGuiContainerBackgroundLayer(final float p_146976_1_, final int p_146976_2_, final int p_146976_3_) { this.drawDefaultBackground(); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - builder.drawSlotTab(this, guiLeft, guiTop, p_146976_2_, p_146976_3_, upgrades, new ItemStack(TRItems.WRENCH)); + builder.drawSlotTab(this, guiLeft, guiTop, p_146976_2_, p_146976_3_, upgrades, new ItemStack(TRContent.WRENCH)); this.mc.getTextureManager().bindTexture(GuiIronFurnace.texture); final int k = (this.width - this.xSize) / 2; final int l = (this.height - this.ySize) / 2; diff --git a/src/main/java/techreborn/client/gui/TRBuilder.java b/src/main/java/techreborn/client/gui/TRBuilder.java index d97dd2ccd..cbbd94f6d 100644 --- a/src/main/java/techreborn/client/gui/TRBuilder.java +++ b/src/main/java/techreborn/client/gui/TRBuilder.java @@ -43,7 +43,7 @@ import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.TilePowerAcceptor; import techreborn.TechReborn; -import techreborn.init.TRItems; +import techreborn.init.TRContent; import techreborn.proxies.ClientProxy; import java.util.ArrayList; @@ -455,7 +455,7 @@ public class TRBuilder extends GuiBuilder { } Minecraft.getMinecraft().getTextureManager().bindTexture(GUI_SHEET); gui.drawTexturedModalRect(posX - 26, posY + 84 - offset, 157, 148, 30, 30); - renderItemStack(new ItemStack(TRItems.WRENCH), posX - 19, posY + 92 - offset); + renderItemStack(new ItemStack(TRContent.WRENCH), posX - 19, posY + 92 - offset); } public void renderItemStack(ItemStack stack, int x, int y) { diff --git a/src/main/java/techreborn/client/render/ModelDynamicCell.java b/src/main/java/techreborn/client/render/ModelDynamicCell.java index 67b821853..3cc7c28a2 100644 --- a/src/main/java/techreborn/client/render/ModelDynamicCell.java +++ b/src/main/java/techreborn/client/render/ModelDynamicCell.java @@ -44,7 +44,7 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import techreborn.init.TRItems; +import techreborn.init.TRContent; import techreborn.items.DynamicCell; import javax.annotation.Nullable; @@ -69,8 +69,8 @@ public class ModelDynamicCell implements IModel { private static final float SOUTH_Z_FLUID = 8.4f / 16f; public static void init() { - ModelLoader.setCustomMeshDefinition(TRItems.CELL, stack -> MODEL_LOCATION); - ModelBakery.registerItemVariants(TRItems.CELL, MODEL_LOCATION); + ModelLoader.setCustomMeshDefinition(TRContent.CELL, stack -> MODEL_LOCATION); + ModelBakery.registerItemVariants(TRContent.CELL, MODEL_LOCATION); ModelLoaderRegistry.registerLoader(new DynamicCellLoader()); } diff --git a/src/main/java/techreborn/events/BlockBreakHandler.java b/src/main/java/techreborn/events/BlockBreakHandler.java index c4c517e86..653d90def 100644 --- a/src/main/java/techreborn/events/BlockBreakHandler.java +++ b/src/main/java/techreborn/events/BlockBreakHandler.java @@ -38,7 +38,6 @@ import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.util.OreDrop; import techreborn.TechReborn; import techreborn.init.TRContent; -import techreborn.init.TRItems; import techreborn.utils.OreDictUtils; import java.util.List; @@ -91,7 +90,7 @@ public class BlockBreakHandler { @SubscribeEvent public void getBreakSpeedEvent(PlayerEvent.BreakSpeed event){ - if(event.getEntityPlayer().getHeldItem(EnumHand.MAIN_HAND).getItem() == TRItems.INDUSTRIAL_CHAINSAW && event.getOriginalSpeed() > 1.0f){ + if(event.getEntityPlayer().getHeldItem(EnumHand.MAIN_HAND).getItem() == TRContent.INDUSTRIAL_CHAINSAW && event.getOriginalSpeed() > 1.0f){ BlockPos pos = event.getPos(); World worldIn = event.getEntityPlayer().world; float speed = 20F; diff --git a/src/main/java/techreborn/events/TRRecipeHandler.java b/src/main/java/techreborn/events/TRRecipeHandler.java index 82884de6a..668c5c120 100644 --- a/src/main/java/techreborn/events/TRRecipeHandler.java +++ b/src/main/java/techreborn/events/TRRecipeHandler.java @@ -35,8 +35,6 @@ import net.minecraftforge.registries.IForgeRegistryEntry; import reborncore.common.util.ItemUtils; import techreborn.TechReborn; import techreborn.init.TRContent; -import techreborn.init.TRItems; - import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -58,7 +56,7 @@ public class TRRecipeHandler { if (entityItemPickupEvent.getEntityPlayer() instanceof EntityPlayerMP) { if (ItemUtils.isInputEqual("logWood", entityItemPickupEvent.getItem().getItem(), false, false, true)) { for (IRecipe recipe : CraftingManager.REGISTRY) { - if (recipe.getRecipeOutput().getItem() == TRItems.TREE_TAP) { + if (recipe.getRecipeOutput().getItem() == TRContent.TREE_TAP) { entityItemPickupEvent.getEntityPlayer().unlockRecipes(Collections.singletonList(recipe)); } } diff --git a/src/main/java/techreborn/events/TRTickHandler.java b/src/main/java/techreborn/events/TRTickHandler.java index 9b2f48d7e..33bc75fa5 100644 --- a/src/main/java/techreborn/events/TRTickHandler.java +++ b/src/main/java/techreborn/events/TRTickHandler.java @@ -31,7 +31,7 @@ import net.minecraft.item.Item; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; -import techreborn.init.TRItems; +import techreborn.init.TRContent; public class TRTickHandler { @@ -43,7 +43,7 @@ public class TRTickHandler { Item chestslot = !player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).isEmpty() ? player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).getItem() : null; - if (previouslyWearing != chestslot && previouslyWearing == TRItems.CLOAKING_DEVICE && player.isInvisible() + if (previouslyWearing != chestslot && previouslyWearing == TRContent.CLOAKING_DEVICE && player.isInvisible() && !player.isPotionActive(MobEffects.INVISIBILITY)) { player.setInvisible(false); } diff --git a/src/main/java/techreborn/init/OreDict.java b/src/main/java/techreborn/init/OreDict.java index e996c42bb..45c9d0d31 100644 --- a/src/main/java/techreborn/init/OreDict.java +++ b/src/main/java/techreborn/init/OreDict.java @@ -82,11 +82,11 @@ public class OreDict { OreUtil.registerOre("machineBlockElite", new ItemStack(TRContent.MachineBlocks.INDUSTRIAL.getFrame())); // Tools&Armor - OreUtil.registerOre("reBattery", TRItems.RED_CELL_BATTERY); - OreUtil.registerOre("lapotronCrystal", TRItems.LAPOTRON_CRYSTAL); - OreUtil.registerOre("energyCrystal", TRItems.ENERGY_CRYSTAL); - OreUtil.registerOre("drillBasic", TRItems.BASIC_DRILL); - OreUtil.registerOre("drillDiamond", TRItems.ADVANCED_DRILL); + OreUtil.registerOre("reBattery", TRContent.RED_CELL_BATTERY); + OreUtil.registerOre("lapotronCrystal", TRContent.LAPOTRON_CRYSTAL); + OreUtil.registerOre("energyCrystal", TRContent.ENERGY_CRYSTAL); + OreUtil.registerOre("drillBasic", TRContent.BASIC_DRILL); + OreUtil.registerOre("drillDiamond", TRContent.ADVANCED_DRILL); // Misc OreUtil.registerOre("industrialTnt", Blocks.TNT); diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index 2506f0afd..41553b70a 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -5,20 +5,25 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.DefaultStateMapper; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IItemProvider; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.RebornRegistry; import reborncore.api.power.EnumPowerTier; import reborncore.api.tile.IUpgrade; +import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.util.BucketHandler; import techreborn.TechReborn; +import techreborn.api.Reference; import techreborn.blocks.BlockMachineCasing; import techreborn.blocks.BlockMachineFrame; import techreborn.blocks.BlockOre; @@ -27,130 +32,166 @@ import techreborn.blocks.cable.BlockCable; import techreborn.blocks.generator.BlockSolarPanel; import techreborn.blocks.tier1.BlockElectricFurnace; import techreborn.config.ConfigTechReborn; +import techreborn.items.DynamicCell; +import techreborn.items.ItemFrequencyTransmitter; +import techreborn.items.ItemManual; +import techreborn.items.ItemScrapBox; import techreborn.items.ItemUpgrade; +import techreborn.items.armor.ItemCloakingDevice; +import techreborn.items.armor.ItemLapotronicOrbpack; +import techreborn.items.armor.ItemLithiumIonBatpack; +import techreborn.items.armor.ItemTRArmour; +import techreborn.items.battery.ItemEnergyCrystal; +import techreborn.items.battery.ItemLapotronCrystal; +import techreborn.items.battery.ItemLapotronicOrb; +import techreborn.items.battery.ItemLithiumIonBattery; +import techreborn.items.battery.ItemRedCellBattery; +import techreborn.items.tool.ItemDebugTool; +import techreborn.items.tool.ItemTreeTap; +import techreborn.items.tool.ItemWrench; +import techreborn.items.tool.advanced.ItemAdvancedChainsaw; +import techreborn.items.tool.advanced.ItemAdvancedDrill; +import techreborn.items.tool.advanced.ItemAdvancedJackhammer; +import techreborn.items.tool.advanced.ItemRockCutter; +import techreborn.items.tool.basic.ItemBasicChainsaw; +import techreborn.items.tool.basic.ItemBasicDrill; +import techreborn.items.tool.basic.ItemBasicJackhammer; +import techreborn.items.tool.basic.ItemElectricTreetap; +import techreborn.items.tool.industrial.ItemIndustrialChainsaw; +import techreborn.items.tool.industrial.ItemIndustrialDrill; +import techreborn.items.tool.industrial.ItemIndustrialJackhammer; +import techreborn.items.tool.industrial.ItemNanosaber; +import techreborn.items.tool.industrial.ItemOmniTool; +import techreborn.items.tool.vanilla.ItemTRAxe; +import techreborn.items.tool.vanilla.ItemTRHoe; +import techreborn.items.tool.vanilla.ItemTRSpade; +import techreborn.items.tool.vanilla.ItemTRSword; import techreborn.utils.InitUtils; import java.util.Arrays; import java.util.Map; +import javax.annotation.Nullable; + import com.google.common.collect.Maps; @RebornRegister(modID = TechReborn.MOD_ID) public class TRContent { - - public static void registerBlocks() { - Arrays.stream(Ores.values()).forEach(value -> RebornRegistry.registerBlock(value.block)); - Arrays.stream(StorageBlocks.values()).forEach(value -> RebornRegistry.registerBlock(value.block)); - Arrays.stream(MachineBlocks.values()).forEach(value -> { - RebornRegistry.registerBlock(value.frame); - RebornRegistry.registerBlock(value.casing); - }); - Arrays.stream(SolarPanels.values()).forEach(value -> RebornRegistry.registerBlock(value.block)); - Arrays.stream(Cables.values()).forEach(value -> RebornRegistry.registerBlock(value.block)); - } - - public static void registerItems() { - Arrays.stream(Ingots.values()).forEach(value -> RebornRegistry.registerItem(value.item)); - Arrays.stream(Nuggets.values()).forEach(value -> RebornRegistry.registerItem(value.item)); - Arrays.stream(Gems.values()).forEach(value -> RebornRegistry.registerItem(value.item)); - Arrays.stream(Dusts.values()).forEach(value -> RebornRegistry.registerItem(value.item)); - Arrays.stream(SmallDusts.values()).forEach(value -> RebornRegistry.registerItem(value.item)); - Arrays.stream(Plates.values()).forEach(value -> RebornRegistry.registerItem(value.item)); - Arrays.stream(Parts.values()).forEach(value -> RebornRegistry.registerItem(value.item)); - Arrays.stream(Upgrades.values()).forEach(value -> RebornRegistry.registerItem(value.item)); - } - - @SideOnly(Side.CLIENT) - public static void registerModel() { - ResourceLocation dustsRL = new ResourceLocation(TechReborn.MOD_ID, "items/material/dust"); - Arrays.stream(Dusts.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, - new ModelResourceLocation(dustsRL, "type=" + value.name))); - - ResourceLocation dustsSmallRL = new ResourceLocation(TechReborn.MOD_ID, "items/material/small_dust"); - Arrays.stream(SmallDusts.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, - new ModelResourceLocation(dustsSmallRL, "type=" + value.name))); - - ResourceLocation gemsRL = new ResourceLocation(TechReborn.MOD_ID, "items/material/gem"); - Arrays.stream(Gems.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, - new ModelResourceLocation(gemsRL, "type=" + value.name))); - - ResourceLocation ingotsRL = new ResourceLocation(TechReborn.MOD_ID, "items/material/ingot"); - Arrays.stream(Ingots.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, - new ModelResourceLocation(ingotsRL, "type=" + value.name))); - - ResourceLocation nuggetsRL = new ResourceLocation(TechReborn.MOD_ID, "items/material/nugget"); - Arrays.stream(Nuggets.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, - new ModelResourceLocation(nuggetsRL, "type=" + value.name))); - - ResourceLocation partsRL = new ResourceLocation(TechReborn.MOD_ID, "items/material/part"); - Arrays.stream(Parts.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, - new ModelResourceLocation(partsRL, "type=" + value.name))); - - ResourceLocation platesRL = new ResourceLocation(TechReborn.MOD_ID, "items/material/plate"); - Arrays.stream(Plates.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, - new ModelResourceLocation(platesRL, "type=" + value.name))); - - ResourceLocation upgradeRL = new ResourceLocation(TechReborn.MOD_ID, "items/misc/upgrades"); - Arrays.stream(Upgrades.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, - new ModelResourceLocation(upgradeRL, "type=" + value.name))); - - ResourceLocation oresRL = new ResourceLocation(TechReborn.MOD_ID, "ore"); - for (Ores value : Ores.values()) { - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.block), 0, new ModelResourceLocation(oresRL, "type=" + value.name)); - ModelLoader.setCustomStateMapper(value.block, new DefaultStateMapper() { - @Override - protected ModelResourceLocation getModelResourceLocation(IBlockState state) { - return new ModelResourceLocation(oresRL, "type=" + value.name); - } - }); - } - - ResourceLocation storageRL = new ResourceLocation(TechReborn.MOD_ID, "storage_block"); - for (StorageBlocks value : StorageBlocks.values()) { - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.block), 0, new ModelResourceLocation(storageRL, "type=" + value.name)); - ModelLoader.setCustomStateMapper(value.block, new DefaultStateMapper() { - @Override - protected ModelResourceLocation getModelResourceLocation(IBlockState state) { - return new ModelResourceLocation(storageRL, "type=" + value.name); - } - }); - } - - ResourceLocation machineBlockRL = new ResourceLocation(TechReborn.MOD_ID, "machine_block"); - for (MachineBlocks value : MachineBlocks.values()) { - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.frame), 0, new ModelResourceLocation(machineBlockRL, "type=" + value.name + "_machine_frame")); - ModelLoader.setCustomStateMapper(value.frame, new DefaultStateMapper() { - @Override - protected ModelResourceLocation getModelResourceLocation(IBlockState state) { - return new ModelResourceLocation(machineBlockRL, "type=" + value.name + "_machine_frame"); - } - }); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.casing), 0, new ModelResourceLocation(machineBlockRL, "type=" + value.name + "_machine_casing")); - ModelLoader.setCustomStateMapper(value.casing, new DefaultStateMapper() { - @Override - protected ModelResourceLocation getModelResourceLocation(IBlockState state) { - return new ModelResourceLocation(machineBlockRL, "type=" + value.name + "_machine_casing"); - } - }); - } - - ResourceLocation cableRL = new ResourceLocation(TechReborn.MOD_ID, "cable_inv"); - for (Cables value : Cables.values()) { - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.block), 0, - new ModelResourceLocation(cableRL, "type=" + value.name)); - ModelLoader.setCustomStateMapper(value.block, new DefaultStateMapper() { - @Override - protected ModelResourceLocation getModelResourceLocation(IBlockState state) { - Map, Comparable> map = Maps.newLinkedHashMap(state.getProperties()); - String property = this.getPropertyString(map) + ",ztype=" + value.name; - - return new ModelResourceLocation(new ResourceLocation(TechReborn.MOD_ID, - "cable_" + (value.cableThickness == 5 ? "thick" : "thin")), property); - } - }); - } - } + // Armor + public static Item CLOAKING_DEVICE; + public static Item LAPOTRONIC_ORBPACK; + public static Item LITHIUM_ION_BATPACK; + + // Battery + public static Item ENERGY_CRYSTAL; + public static Item LAPOTRON_CRYSTAL; + public static Item LAPOTRONIC_ORB; + public static Item LITHIUM_ION_BATTERY; + public static Item RED_CELL_BATTERY; + + // Tools + public static Item TREE_TAP; + public static Item WRENCH; + + public static Item BASIC_CHAINSAW; + public static Item BASIC_DRILL; + public static Item BASIC_JACKHAMMER; + public static Item ELECTRIC_TREE_TAP; + + public static Item ADVANCED_CHAINSAW; + public static Item ADVANCED_DRILL; + public static Item ADVANCED_JACKHAMMER; + public static Item ROCK_CUTTER; + + public static Item INDUSTRIAL_CHAINSAW; + public static Item INDUSTRIAL_DRILL; + public static Item INDUSTRIAL_JACKHAMMER; + public static Item NANOSABER; + public static Item OMNI_TOOL; + + public static Item DEBUG_TOOL; + + // Other + public static Item FREQUENCY_TRANSMITTER; + public static Item SCRAP_BOX; + public static Item MANUAL; + public static DynamicCell CELL; + + // Gem armor & tools + @Nullable + public static Item BRONZE_SWORD; + @Nullable + public static Item BRONZE_PICKAXE; + @Nullable + public static Item BRONZE_SPADE; + @Nullable + public static Item BRONZE_AXE; + @Nullable + public static Item BRONZE_HOE; + @Nullable + public static Item BRONZE_HELMET; + @Nullable + public static Item BRONZE_CHESTPLATE; + @Nullable + public static Item BRONZE_LEGGINGS; + @Nullable + public static Item BRONZE_BOOTS; + @Nullable + public static Item RUBY_SWORD; + @Nullable + public static Item RUBY_PICKAXE; + @Nullable + public static Item RUBY_SPADE; + @Nullable + public static Item RUBY_AXE; + @Nullable + public static Item RUBY_HOE; + @Nullable + public static Item RUBY_HELMET; + @Nullable + public static Item RUBY_CHESTPLATE; + @Nullable + public static Item RUBY_LEGGINGS; + @Nullable + public static Item RUBY_BOOTS; + @Nullable + public static Item SAPPHIRE_SWORD; + @Nullable + public static Item SAPPHIRE_PICKAXE; + @Nullable + public static Item SAPPHIRE_SPADE; + @Nullable + public static Item SAPPHIRE_AXE; + @Nullable + public static Item SAPPHIRE_HOE; + @Nullable + public static Item SAPPHIRE_HELMET; + @Nullable + public static Item SAPPHIRE_CHESTPLATE; + @Nullable + public static Item SAPPHIRE_LEGGINGS; + @Nullable + public static Item SAPPHIRE_BOOTS; + @Nullable + public static Item PERIDOT_SWORD; + @Nullable + public static Item PERIDOT_PICKAXE; + @Nullable + public static Item PERIDOT_SPADE; + @Nullable + public static Item PERIDOT_AXE; + @Nullable + public static Item PERIDOT_HOE; + @Nullable + public static Item PERIDOT_HELMET; + @Nullable + public static Item PERIDOT_CHESTPLATE; + @Nullable + public static Item PERIDOT_LEGGINGS; + @Nullable + public static Item PERIDOT_BOOTS; + public static enum SolarPanels { BASIC(EnumPowerTier.MICRO, ConfigTechReborn.basicGenerationRateD, ConfigTechReborn.basicGenerationRateN), ADVANCED(EnumPowerTier.LOW, ConfigTechReborn.advancedGenerationRateD, ConfigTechReborn.advancedGenerationRateN), @@ -594,4 +635,210 @@ public class TRContent { return item; } } + + public static void registerBlocks() { + Arrays.stream(Ores.values()).forEach(value -> RebornRegistry.registerBlock(value.block)); + Arrays.stream(StorageBlocks.values()).forEach(value -> RebornRegistry.registerBlock(value.block)); + Arrays.stream(MachineBlocks.values()).forEach(value -> { + RebornRegistry.registerBlock(value.frame); + RebornRegistry.registerBlock(value.casing); + }); + Arrays.stream(SolarPanels.values()).forEach(value -> RebornRegistry.registerBlock(value.block)); + Arrays.stream(Cables.values()).forEach(value -> RebornRegistry.registerBlock(value.block)); + } + + public static void registerItems() { + Arrays.stream(Ingots.values()).forEach(value -> RebornRegistry.registerItem(value.item)); + Arrays.stream(Nuggets.values()).forEach(value -> RebornRegistry.registerItem(value.item)); + Arrays.stream(Gems.values()).forEach(value -> RebornRegistry.registerItem(value.item)); + Arrays.stream(Dusts.values()).forEach(value -> RebornRegistry.registerItem(value.item)); + Arrays.stream(SmallDusts.values()).forEach(value -> RebornRegistry.registerItem(value.item)); + Arrays.stream(Plates.values()).forEach(value -> RebornRegistry.registerItem(value.item)); + Arrays.stream(Parts.values()).forEach(value -> RebornRegistry.registerItem(value.item)); + Arrays.stream(Upgrades.values()).forEach(value -> RebornRegistry.registerItem(value.item)); + + // Gem armor & tools + if (ConfigTechReborn.enableGemArmorAndTools) { + //Todo: repair with tags + RebornRegistry.registerItem(BRONZE_SWORD = InitUtils.setup(new ItemTRSword(Reference.BRONZE, "ingotBronze"), "bronze_sword")); + RebornRegistry.registerItem(BRONZE_PICKAXE = InitUtils.setup(new ItemTRSword(Reference.BRONZE, "ingotBronze"), "bronze_pickaxe")); + RebornRegistry.registerItem(BRONZE_SPADE = InitUtils.setup(new ItemTRSpade(Reference.BRONZE, "ingotBronze"), "bronze_spade")); + RebornRegistry.registerItem(BRONZE_AXE = InitUtils.setup(new ItemTRAxe(Reference.BRONZE, "ingotBronze"), "bronze_axe")); + RebornRegistry.registerItem(BRONZE_HOE = InitUtils.setup(new ItemTRHoe(Reference.BRONZE, "ingotBronze"), "bronze_hoe")); + + RebornRegistry.registerItem(BRONZE_HELMET = InitUtils.setup(new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.HEAD, "ingotBronze"), "bronze_helmet")); + RebornRegistry.registerItem(BRONZE_CHESTPLATE = InitUtils.setup(new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.CHEST, "ingotBronze"), "bronze_chestplate")); + RebornRegistry.registerItem(BRONZE_LEGGINGS = InitUtils.setup(new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.LEGS, "ingotBronze"), "bronze_leggings")); + RebornRegistry.registerItem(BRONZE_BOOTS = InitUtils.setup(new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.FEET, "ingotBronze"), "bronze_boots")); + + RebornRegistry.registerItem(RUBY_SWORD = InitUtils.setup(new ItemTRSword(Reference.RUBY, "gemRuby"), "ruby_sword")); + RebornRegistry.registerItem(RUBY_PICKAXE = InitUtils.setup(new ItemTRSword(Reference.RUBY, "gemRuby"), "ruby_pickaxe")); + RebornRegistry.registerItem(RUBY_SPADE = InitUtils.setup(new ItemTRSpade(Reference.RUBY, "gemRuby"), "ruby_spade")); + RebornRegistry.registerItem(RUBY_AXE = InitUtils.setup(new ItemTRAxe(Reference.RUBY, "gemRuby"), "ruby_axe")); + RebornRegistry.registerItem(RUBY_HOE = InitUtils.setup(new ItemTRHoe(Reference.RUBY, "gemRuby"), "ruby_hoe")); + + RebornRegistry.registerItem(RUBY_HELMET = InitUtils.setup(new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.HEAD, "gemRuby"), "ruby_helmet")); + RebornRegistry.registerItem(RUBY_CHESTPLATE = InitUtils.setup(new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.CHEST, "gemRuby"), "ruby_chestplate")); + RebornRegistry.registerItem(RUBY_LEGGINGS = InitUtils.setup(new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.LEGS, "gemRuby"), "ruby_leggings")); + RebornRegistry.registerItem(RUBY_BOOTS = InitUtils.setup(new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.FEET, "gemRuby"), "ruby_boots")); + + RebornRegistry.registerItem(SAPPHIRE_SWORD = InitUtils.setup(new ItemTRSword(Reference.SAPPHIRE, "gemSapphire"), "sapphire_sword")); + RebornRegistry.registerItem(SAPPHIRE_PICKAXE = InitUtils.setup(new ItemTRSword(Reference.SAPPHIRE, "gemSapphire"), "sapphire_pickaxe")); + RebornRegistry.registerItem(SAPPHIRE_SPADE = InitUtils.setup(new ItemTRSpade(Reference.SAPPHIRE, "gemSapphire"), "sapphire_spade")); + RebornRegistry.registerItem(SAPPHIRE_AXE = InitUtils.setup(new ItemTRAxe(Reference.SAPPHIRE, "gemSapphire"), "sapphire_axe")); + RebornRegistry.registerItem(SAPPHIRE_HOE = InitUtils.setup(new ItemTRHoe(Reference.SAPPHIRE, "gemSapphire"), "sapphire_hoe")); + + RebornRegistry.registerItem(SAPPHIRE_HELMET = InitUtils.setup(new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.HEAD, "gemSapphire"), "sapphire_helmet")); + RebornRegistry.registerItem(SAPPHIRE_CHESTPLATE = InitUtils.setup(new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.CHEST, "gemSapphire"), "sapphire_chestplate")); + RebornRegistry.registerItem(SAPPHIRE_LEGGINGS = InitUtils.setup(new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.LEGS, "gemSapphire"), "sapphire_leggings")); + RebornRegistry.registerItem(SAPPHIRE_BOOTS = InitUtils.setup(new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.FEET, "gemSapphire"), "sapphire_boots")); + + RebornRegistry.registerItem(PERIDOT_SWORD = InitUtils.setup(new ItemTRSword(Reference.PERIDOT, "gemPeridot"), "peridot_sword")); + RebornRegistry.registerItem(PERIDOT_PICKAXE = InitUtils.setup(new ItemTRSword(Reference.PERIDOT, "gemPeridot"), "peridot_pickaxe")); + RebornRegistry.registerItem(PERIDOT_SPADE = InitUtils.setup(new ItemTRSpade(Reference.PERIDOT, "gemPeridot"), "peridot_spade")); + RebornRegistry.registerItem(PERIDOT_AXE = InitUtils.setup(new ItemTRAxe(Reference.PERIDOT, "gemPeridot"), "peridot_axe")); + RebornRegistry.registerItem(PERIDOT_HOE = InitUtils.setup(new ItemTRHoe(Reference.PERIDOT, "gemPeridot"), "peridot_hoe")); + + RebornRegistry.registerItem(PERIDOT_HELMET = InitUtils.setup(new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.HEAD, "gemPeridot"), "peridot_helmet")); + RebornRegistry.registerItem(PERIDOT_CHESTPLATE = InitUtils.setup(new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.CHEST, "gemPeridot"), "peridot_chestplate")); + RebornRegistry.registerItem(PERIDOT_LEGGINGS = InitUtils.setup(new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.LEGS, "gemPeridot"), "peridot_leggings")); + RebornRegistry.registerItem(PERIDOT_BOOTS = InitUtils.setup(new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.FEET, "gemPeridot"), "peridot_boots")); + } + + // Battery + RebornRegistry.registerItem(RED_CELL_BATTERY = InitUtils.setup(new ItemRedCellBattery(), "red_cell_battery")); + RebornRegistry.registerItem(LITHIUM_ION_BATTERY = InitUtils.setup(new ItemLithiumIonBattery(), "lithium_ion_battery")); + RebornRegistry.registerItem(LITHIUM_ION_BATPACK = InitUtils.setup(new ItemLithiumIonBatpack(), "lithium_ion_batpack")); + RebornRegistry.registerItem(ENERGY_CRYSTAL = InitUtils.setup(new ItemEnergyCrystal(), "energy_crystal")); + RebornRegistry.registerItem(LAPOTRON_CRYSTAL = InitUtils.setup(new ItemLapotronCrystal(), "lapotron_crystal")); + RebornRegistry.registerItem(LAPOTRONIC_ORB = InitUtils.setup(new ItemLapotronicOrb(), "lapotronic_orb")); + RebornRegistry.registerItem(LAPOTRONIC_ORBPACK = InitUtils.setup(new ItemLapotronicOrbpack(), "lapotronic_orbpack")); + + // Tools + RebornRegistry.registerItem(TREE_TAP = InitUtils.setup(new ItemTreeTap(), "treetap")); + RebornRegistry.registerItem(WRENCH = InitUtils.setup(new ItemWrench(), "wrench")); + + RebornRegistry.registerItem(BASIC_DRILL = InitUtils.setup(new ItemBasicDrill(), "basic_drill")); + RebornRegistry.registerItem(BASIC_CHAINSAW = InitUtils.setup(new ItemBasicChainsaw(), "basic_chainsaw")); + RebornRegistry.registerItem(BASIC_JACKHAMMER = InitUtils.setup(new ItemBasicJackhammer(), "basic_jackhammer")); + RebornRegistry.registerItem(ELECTRIC_TREE_TAP = InitUtils.setup(new ItemElectricTreetap(), "electric_treetap")); + + RebornRegistry.registerItem(ADVANCED_DRILL = InitUtils.setup(new ItemAdvancedDrill(), "advanced_drill")); + RebornRegistry.registerItem(ADVANCED_CHAINSAW = InitUtils.setup(new ItemAdvancedChainsaw(), "advanced_chainsaw")); + RebornRegistry.registerItem(ADVANCED_JACKHAMMER = InitUtils.setup(new ItemAdvancedJackhammer(), "advanced_jackhammer")); + RebornRegistry.registerItem(ROCK_CUTTER = InitUtils.setup(new ItemRockCutter(), "rock_cutter")); + + RebornRegistry.registerItem(INDUSTRIAL_DRILL = InitUtils.setup(new ItemIndustrialDrill(), "industrial_drill")); + RebornRegistry.registerItem(INDUSTRIAL_CHAINSAW = InitUtils.setup(new ItemIndustrialChainsaw(), "industrial_chainsaw")); + RebornRegistry.registerItem(INDUSTRIAL_JACKHAMMER = InitUtils.setup(new ItemIndustrialJackhammer(), "industrial_jackhammer")); + RebornRegistry.registerItem(NANOSABER = InitUtils.setup(new ItemNanosaber(), "nanosaber")); + RebornRegistry.registerItem(OMNI_TOOL = InitUtils.setup(new ItemOmniTool(), "omni_tool")); + + // Armor + RebornRegistry.registerItem(CLOAKING_DEVICE = InitUtils.setup(new ItemCloakingDevice(), "cloaking_device")); + + // Other + RebornRegistry.registerItem(FREQUENCY_TRANSMITTER = InitUtils.setup(new ItemFrequencyTransmitter(), "frequency_transmitter")); + RebornRegistry.registerItem(SCRAP_BOX = InitUtils.setup(new ItemScrapBox(), "scrap_box")); + RebornRegistry.registerItem(MANUAL = InitUtils.setup(new ItemManual(), "manual")); + RebornRegistry.registerItem(DEBUG_TOOL = InitUtils.setup(new ItemDebugTool(), "debug_tool")); + RebornRegistry.registerItem(CELL = InitUtils.setup(new DynamicCell(), "cell")); + MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE); + + // TODO: do we need this at all? + BlockMachineBase.advancedFrameStack = new ItemStack(TRContent.MachineBlocks.ADVANCED.getFrame()); + BlockMachineBase.basicFrameStack = new ItemStack(TRContent.MachineBlocks.BASIC.getFrame()); + } + + @SideOnly(Side.CLIENT) + public static void registerModel() { + ResourceLocation dustsRL = new ResourceLocation(TechReborn.MOD_ID, "items/material/dust"); + Arrays.stream(Dusts.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, + new ModelResourceLocation(dustsRL, "type=" + value.name))); + + ResourceLocation dustsSmallRL = new ResourceLocation(TechReborn.MOD_ID, "items/material/small_dust"); + Arrays.stream(SmallDusts.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, + new ModelResourceLocation(dustsSmallRL, "type=" + value.name))); + + ResourceLocation gemsRL = new ResourceLocation(TechReborn.MOD_ID, "items/material/gem"); + Arrays.stream(Gems.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, + new ModelResourceLocation(gemsRL, "type=" + value.name))); + + ResourceLocation ingotsRL = new ResourceLocation(TechReborn.MOD_ID, "items/material/ingot"); + Arrays.stream(Ingots.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, + new ModelResourceLocation(ingotsRL, "type=" + value.name))); + + ResourceLocation nuggetsRL = new ResourceLocation(TechReborn.MOD_ID, "items/material/nugget"); + Arrays.stream(Nuggets.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, + new ModelResourceLocation(nuggetsRL, "type=" + value.name))); + + ResourceLocation partsRL = new ResourceLocation(TechReborn.MOD_ID, "items/material/part"); + Arrays.stream(Parts.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, + new ModelResourceLocation(partsRL, "type=" + value.name))); + + ResourceLocation platesRL = new ResourceLocation(TechReborn.MOD_ID, "items/material/plate"); + Arrays.stream(Plates.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, + new ModelResourceLocation(platesRL, "type=" + value.name))); + + ResourceLocation upgradeRL = new ResourceLocation(TechReborn.MOD_ID, "items/misc/upgrades"); + Arrays.stream(Upgrades.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, + new ModelResourceLocation(upgradeRL, "type=" + value.name))); + + ResourceLocation oresRL = new ResourceLocation(TechReborn.MOD_ID, "ore"); + for (Ores value : Ores.values()) { + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.block), 0, new ModelResourceLocation(oresRL, "type=" + value.name)); + ModelLoader.setCustomStateMapper(value.block, new DefaultStateMapper() { + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state) { + return new ModelResourceLocation(oresRL, "type=" + value.name); + } + }); + } + + ResourceLocation storageRL = new ResourceLocation(TechReborn.MOD_ID, "storage_block"); + for (StorageBlocks value : StorageBlocks.values()) { + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.block), 0, new ModelResourceLocation(storageRL, "type=" + value.name)); + ModelLoader.setCustomStateMapper(value.block, new DefaultStateMapper() { + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state) { + return new ModelResourceLocation(storageRL, "type=" + value.name); + } + }); + } + + ResourceLocation machineBlockRL = new ResourceLocation(TechReborn.MOD_ID, "machine_block"); + for (MachineBlocks value : MachineBlocks.values()) { + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.frame), 0, new ModelResourceLocation(machineBlockRL, "type=" + value.name + "_machine_frame")); + ModelLoader.setCustomStateMapper(value.frame, new DefaultStateMapper() { + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state) { + return new ModelResourceLocation(machineBlockRL, "type=" + value.name + "_machine_frame"); + } + }); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.casing), 0, new ModelResourceLocation(machineBlockRL, "type=" + value.name + "_machine_casing")); + ModelLoader.setCustomStateMapper(value.casing, new DefaultStateMapper() { + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state) { + return new ModelResourceLocation(machineBlockRL, "type=" + value.name + "_machine_casing"); + } + }); + } + + ResourceLocation cableRL = new ResourceLocation(TechReborn.MOD_ID, "cable_inv"); + for (Cables value : Cables.values()) { + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.block), 0, + new ModelResourceLocation(cableRL, "type=" + value.name)); + ModelLoader.setCustomStateMapper(value.block, new DefaultStateMapper() { + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state) { + Map, Comparable> map = Maps.newLinkedHashMap(state.getProperties()); + String property = this.getPropertyString(map) + ",ztype=" + value.name; + + return new ModelResourceLocation(new ResourceLocation(TechReborn.MOD_ID, + "cable_" + (value.cableThickness == 5 ? "thick" : "thin")), property); + } + }); + } + } + } diff --git a/src/main/java/techreborn/init/TRItems.java b/src/main/java/techreborn/init/TRItems.java deleted file mode 100644 index 5241cce1d..000000000 --- a/src/main/java/techreborn/init/TRItems.java +++ /dev/null @@ -1,283 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.init; - -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; -import reborncore.RebornRegistry; -import reborncore.common.blocks.BlockMachineBase; -import reborncore.common.util.BucketHandler; -import techreborn.api.Reference; -import techreborn.config.ConfigTechReborn; -import techreborn.items.DynamicCell; -import techreborn.items.ItemFrequencyTransmitter; -import techreborn.items.ItemManual; -import techreborn.items.ItemScrapBox; -import techreborn.items.armor.ItemCloakingDevice; -import techreborn.items.armor.ItemLapotronicOrbpack; -import techreborn.items.armor.ItemLithiumIonBatpack; -import techreborn.items.armor.ItemTRArmour; -import techreborn.items.battery.*; -import techreborn.items.tool.ItemDebugTool; -import techreborn.items.tool.ItemTreeTap; -import techreborn.items.tool.ItemWrench; -import techreborn.items.tool.advanced.ItemAdvancedChainsaw; -import techreborn.items.tool.advanced.ItemAdvancedDrill; -import techreborn.items.tool.advanced.ItemAdvancedJackhammer; -import techreborn.items.tool.advanced.ItemRockCutter; -import techreborn.items.tool.basic.ItemBasicChainsaw; -import techreborn.items.tool.basic.ItemBasicDrill; -import techreborn.items.tool.basic.ItemBasicJackhammer; -import techreborn.items.tool.basic.ItemElectricTreetap; -import techreborn.items.tool.industrial.*; -import techreborn.items.tool.vanilla.ItemTRAxe; -import techreborn.items.tool.vanilla.ItemTRHoe; -import techreborn.items.tool.vanilla.ItemTRSpade; -import techreborn.items.tool.vanilla.ItemTRSword; -import techreborn.utils.InitUtils; - -import javax.annotation.Nullable; - -public class TRItems { - - // Armor - public static Item CLOAKING_DEVICE; - public static Item LAPOTRONIC_ORBPACK; - public static Item LITHIUM_ION_BATPACK; - - // Battery - public static Item ENERGY_CRYSTAL; - public static Item LAPOTRON_CRYSTAL; - public static Item LAPOTRONIC_ORB; - public static Item LITHIUM_ION_BATTERY; - public static Item RED_CELL_BATTERY; - - // Tools - public static Item TREE_TAP; - public static Item WRENCH; - - public static Item BASIC_CHAINSAW; - public static Item BASIC_DRILL; - public static Item BASIC_JACKHAMMER; - public static Item ELECTRIC_TREE_TAP; - - public static Item ADVANCED_CHAINSAW; - public static Item ADVANCED_DRILL; - public static Item ADVANCED_JACKHAMMER; - public static Item ROCK_CUTTER; - - public static Item INDUSTRIAL_CHAINSAW; - public static Item INDUSTRIAL_DRILL; - public static Item INDUSTRIAL_JACKHAMMER; - public static Item NANOSABER; - public static Item OMNI_TOOL; - - public static Item DEBUG_TOOL; - - - // Other - public static Item FREQUENCY_TRANSMITTER; - public static Item SCRAP_BOX; - public static Item MANUAL; - public static DynamicCell CELL; - - // Gem armor & tools - @Nullable - public static Item BRONZE_SWORD; - @Nullable - public static Item BRONZE_PICKAXE; - @Nullable - public static Item BRONZE_SPADE; - @Nullable - public static Item BRONZE_AXE; - @Nullable - public static Item BRONZE_HOE; - @Nullable - public static Item BRONZE_HELMET; - @Nullable - public static Item BRONZE_CHESTPLATE; - @Nullable - public static Item BRONZE_LEGGINGS; - @Nullable - public static Item BRONZE_BOOTS; - @Nullable - public static Item RUBY_SWORD; - @Nullable - public static Item RUBY_PICKAXE; - @Nullable - public static Item RUBY_SPADE; - @Nullable - public static Item RUBY_AXE; - @Nullable - public static Item RUBY_HOE; - @Nullable - public static Item RUBY_HELMET; - @Nullable - public static Item RUBY_CHESTPLATE; - @Nullable - public static Item RUBY_LEGGINGS; - @Nullable - public static Item RUBY_BOOTS; - @Nullable - public static Item SAPPHIRE_SWORD; - @Nullable - public static Item SAPPHIRE_PICKAXE; - @Nullable - public static Item SAPPHIRE_SPADE; - @Nullable - public static Item SAPPHIRE_AXE; - @Nullable - public static Item SAPPHIRE_HOE; - @Nullable - public static Item SAPPHIRE_HELMET; - @Nullable - public static Item SAPPHIRE_CHESTPLATE; - @Nullable - public static Item SAPPHIRE_LEGGINGS; - @Nullable - public static Item SAPPHIRE_BOOTS; - @Nullable - public static Item PERIDOT_SWORD; - @Nullable - public static Item PERIDOT_PICKAXE; - @Nullable - public static Item PERIDOT_SPADE; - @Nullable - public static Item PERIDOT_AXE; - @Nullable - public static Item PERIDOT_HOE; - @Nullable - public static Item PERIDOT_HELMET; - @Nullable - public static Item PERIDOT_CHESTPLATE; - @Nullable - public static Item PERIDOT_LEGGINGS; - @Nullable - public static Item PERIDOT_BOOTS; - - public static void init() { - - TRContent.registerItems(); - - // Gem armor & tools - if (ConfigTechReborn.enableGemArmorAndTools) { - //Todo: repair with tags - registerItem(BRONZE_SWORD = InitUtils.setup(new ItemTRSword(Reference.BRONZE, "ingotBronze"), "bronze_sword")); - registerItem(BRONZE_PICKAXE = InitUtils.setup(new ItemTRSword(Reference.BRONZE, "ingotBronze"), "bronze_pickaxe")); - registerItem(BRONZE_SPADE = InitUtils.setup(new ItemTRSpade(Reference.BRONZE, "ingotBronze"), "bronze_spade")); - registerItem(BRONZE_AXE = InitUtils.setup(new ItemTRAxe(Reference.BRONZE, "ingotBronze"), "bronze_axe")); - registerItem(BRONZE_HOE = InitUtils.setup(new ItemTRHoe(Reference.BRONZE, "ingotBronze"), "bronze_hoe")); - - registerItem(BRONZE_HELMET = InitUtils.setup(new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.HEAD, "ingotBronze"), "bronze_helmet")); - registerItem(BRONZE_CHESTPLATE = InitUtils.setup(new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.CHEST, "ingotBronze"), "bronze_chestplate")); - registerItem(BRONZE_LEGGINGS = InitUtils.setup(new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.LEGS, "ingotBronze"), "bronze_leggings")); - registerItem(BRONZE_BOOTS = InitUtils.setup(new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.FEET, "ingotBronze"), "bronze_boots")); - - registerItem(RUBY_SWORD = InitUtils.setup(new ItemTRSword(Reference.RUBY, "gemRuby"), "ruby_sword")); - registerItem(RUBY_PICKAXE = InitUtils.setup(new ItemTRSword(Reference.RUBY, "gemRuby"), "ruby_pickaxe")); - registerItem(RUBY_SPADE = InitUtils.setup(new ItemTRSpade(Reference.RUBY, "gemRuby"), "ruby_spade")); - registerItem(RUBY_AXE = InitUtils.setup(new ItemTRAxe(Reference.RUBY, "gemRuby"), "ruby_axe")); - registerItem(RUBY_HOE = InitUtils.setup(new ItemTRHoe(Reference.RUBY, "gemRuby"), "ruby_hoe")); - - registerItem(RUBY_HELMET = InitUtils.setup(new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.HEAD, "gemRuby"), "ruby_helmet")); - registerItem(RUBY_CHESTPLATE = InitUtils.setup(new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.CHEST, "gemRuby"), "ruby_chestplate")); - registerItem(RUBY_LEGGINGS = InitUtils.setup(new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.LEGS, "gemRuby"), "ruby_leggings")); - registerItem(RUBY_BOOTS = InitUtils.setup(new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.FEET, "gemRuby"), "ruby_boots")); - - registerItem(SAPPHIRE_SWORD = InitUtils.setup(new ItemTRSword(Reference.SAPPHIRE, "gemSapphire"), "sapphire_sword")); - registerItem(SAPPHIRE_PICKAXE = InitUtils.setup(new ItemTRSword(Reference.SAPPHIRE, "gemSapphire"), "sapphire_pickaxe")); - registerItem(SAPPHIRE_SPADE = InitUtils.setup(new ItemTRSpade(Reference.SAPPHIRE, "gemSapphire"), "sapphire_spade")); - registerItem(SAPPHIRE_AXE = InitUtils.setup(new ItemTRAxe(Reference.SAPPHIRE, "gemSapphire"), "sapphire_axe")); - registerItem(SAPPHIRE_HOE = InitUtils.setup(new ItemTRHoe(Reference.SAPPHIRE, "gemSapphire"), "sapphire_hoe")); - - registerItem(SAPPHIRE_HELMET = InitUtils.setup(new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.HEAD, "gemSapphire"), "sapphire_helmet")); - registerItem(SAPPHIRE_CHESTPLATE = InitUtils.setup(new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.CHEST, "gemSapphire"), "sapphire_chestplate")); - registerItem(SAPPHIRE_LEGGINGS = InitUtils.setup(new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.LEGS, "gemSapphire"), "sapphire_leggings")); - registerItem(SAPPHIRE_BOOTS = InitUtils.setup(new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.FEET, "gemSapphire"), "sapphire_boots")); - - registerItem(PERIDOT_SWORD = InitUtils.setup(new ItemTRSword(Reference.PERIDOT, "gemPeridot"), "peridot_sword")); - registerItem(PERIDOT_PICKAXE = InitUtils.setup(new ItemTRSword(Reference.PERIDOT, "gemPeridot"), "peridot_pickaxe")); - registerItem(PERIDOT_SPADE = InitUtils.setup(new ItemTRSpade(Reference.PERIDOT, "gemPeridot"), "peridot_spade")); - registerItem(PERIDOT_AXE = InitUtils.setup(new ItemTRAxe(Reference.PERIDOT, "gemPeridot"), "peridot_axe")); - registerItem(PERIDOT_HOE = InitUtils.setup(new ItemTRHoe(Reference.PERIDOT, "gemPeridot"), "peridot_hoe")); - - registerItem(PERIDOT_HELMET = InitUtils.setup(new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.HEAD, "gemPeridot"), "peridot_helmet")); - registerItem(PERIDOT_CHESTPLATE = InitUtils.setup(new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.CHEST, "gemPeridot"), "peridot_chestplate")); - registerItem(PERIDOT_LEGGINGS = InitUtils.setup(new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.LEGS, "gemPeridot"), "peridot_leggings")); - registerItem(PERIDOT_BOOTS = InitUtils.setup(new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.FEET, "gemPeridot"), "peridot_boots")); - } - - // Battery - registerItem(RED_CELL_BATTERY = InitUtils.setup(new ItemRedCellBattery(), "red_cell_battery")); - registerItem(LITHIUM_ION_BATTERY = InitUtils.setup(new ItemLithiumIonBattery(), "lithium_ion_battery")); - registerItem(LITHIUM_ION_BATPACK = InitUtils.setup(new ItemLithiumIonBatpack(), "lithium_ion_batpack")); - registerItem(ENERGY_CRYSTAL = InitUtils.setup(new ItemEnergyCrystal(), "energy_crystal")); - registerItem(LAPOTRON_CRYSTAL = InitUtils.setup(new ItemLapotronCrystal(), "lapotron_crystal")); - registerItem(LAPOTRONIC_ORB = InitUtils.setup(new ItemLapotronicOrb(), "lapotronic_orb")); - registerItem(LAPOTRONIC_ORBPACK = InitUtils.setup(new ItemLapotronicOrbpack(), "lapotronic_orbpack")); - - // Tools - registerItem(TREE_TAP = InitUtils.setup(new ItemTreeTap(), "treetap")); - registerItem(WRENCH = InitUtils.setup(new ItemWrench(), "wrench")); - - registerItem(BASIC_DRILL = InitUtils.setup(new ItemBasicDrill(), "basic_drill")); - registerItem(BASIC_CHAINSAW = InitUtils.setup(new ItemBasicChainsaw(), "basic_chainsaw")); - registerItem(BASIC_JACKHAMMER = InitUtils.setup(new ItemBasicJackhammer(), "basic_jackhammer")); - registerItem(ELECTRIC_TREE_TAP = InitUtils.setup(new ItemElectricTreetap(), "electric_treetap")); - - registerItem(ADVANCED_DRILL = InitUtils.setup(new ItemAdvancedDrill(), "advanced_drill")); - registerItem(ADVANCED_CHAINSAW = InitUtils.setup(new ItemAdvancedChainsaw(), "advanced_chainsaw")); - registerItem(ADVANCED_JACKHAMMER = InitUtils.setup(new ItemAdvancedJackhammer(), "advanced_jackhammer")); - registerItem(ROCK_CUTTER = InitUtils.setup(new ItemRockCutter(), "rock_cutter")); - - registerItem(INDUSTRIAL_DRILL = InitUtils.setup(new ItemIndustrialDrill(), "industrial_drill")); - registerItem(INDUSTRIAL_CHAINSAW = InitUtils.setup(new ItemIndustrialChainsaw(), "industrial_chainsaw")); - registerItem(INDUSTRIAL_JACKHAMMER = InitUtils.setup(new ItemIndustrialJackhammer(), "industrial_jackhammer")); - registerItem(NANOSABER = InitUtils.setup(new ItemNanosaber(), "nanosaber")); - registerItem(OMNI_TOOL = InitUtils.setup(new ItemOmniTool(), "omni_tool")); - - - // Armor - registerItem(CLOAKING_DEVICE = InitUtils.setup(new ItemCloakingDevice(), "cloaking_device")); - - // Other - registerItem(FREQUENCY_TRANSMITTER = InitUtils.setup(new ItemFrequencyTransmitter(), "frequency_transmitter")); - registerItem(SCRAP_BOX = InitUtils.setup(new ItemScrapBox(), "scrap_box")); - registerItem(MANUAL = InitUtils.setup(new ItemManual(), "manual")); - registerItem(DEBUG_TOOL = InitUtils.setup(new ItemDebugTool(), "debug_tool")); - registerItem(CELL = InitUtils.setup(new DynamicCell(), "cell")); - MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE); - - // TODO: do we need this at all? - BlockMachineBase.advancedFrameStack = new ItemStack(TRContent.MachineBlocks.ADVANCED.getFrame()); - BlockMachineBase.basicFrameStack = new ItemStack(TRContent.MachineBlocks.BASIC.getFrame()); - } - - public static void registerItem(Item item) { - RebornRegistry.registerItem(item); - } -} diff --git a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java index c8d2d59a4..f21e6e4fc 100644 --- a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java +++ b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java @@ -34,7 +34,6 @@ import techreborn.TechReborn; import techreborn.config.ConfigTechReborn; import techreborn.init.TRBlocks; import techreborn.init.TRContent; -import techreborn.init.TRItems; import techreborn.items.*; /** @@ -57,38 +56,38 @@ public class CraftingTableRecipes extends RecipeMethods { // registerShaped(getMaterial("iridium_alloy", Type.INGOT), "IAI", "ADA", "IAI", 'I', "ingotIridium", 'D', "dustDiamond", 'A', "plateAdvancedAlloy"); // Tools and devices - registerShaped(getStack(TRItems.WRENCH), "BNB", "NBN", " B ", 'B', "ingotBronze", 'N', "nuggetBronze"); - registerShaped(getStack(TRItems.TREE_TAP), " S ", "PPP", "P ", 'S', "stickWood", 'P', "plankWood"); - registerShaped(getStack(TRItems.ELECTRIC_TREE_TAP), "TB", " ", 'T', getStack(TRItems.TREE_TAP), 'B', "reBattery"); - registerShaped(getStack(TRItems.NANOSABER), "DC ", "DC ", "GLG", 'L', "lapotronCrystal", 'C', "plateCarbon", 'D', "plateDiamond", 'G', "dustsmallGlowstone"); - ItemStack rockCutter = getStack(TRItems.ROCK_CUTTER); + registerShaped(getStack(TRContent.WRENCH), "BNB", "NBN", " B ", 'B', "ingotBronze", 'N', "nuggetBronze"); + registerShaped(getStack(TRContent.TREE_TAP), " S ", "PPP", "P ", 'S', "stickWood", 'P', "plankWood"); + registerShaped(getStack(TRContent.ELECTRIC_TREE_TAP), "TB", " ", 'T', getStack(TRContent.TREE_TAP), 'B', "reBattery"); + registerShaped(getStack(TRContent.NANOSABER), "DC ", "DC ", "GLG", 'L', "lapotronCrystal", 'C', "plateCarbon", 'D', "plateDiamond", 'G', "dustsmallGlowstone"); + ItemStack rockCutter = getStack(TRContent.ROCK_CUTTER); rockCutter.addEnchantment(Enchantments.SILK_TOUCH, 1); registerShaped(rockCutter, "DT ", "DT ", "DCB", 'D', "dustDiamond", 'T', "ingotTitanium", 'C', "circuitBasic", 'B', "reBattery"); - registerShaped(getStack(TRItems.BASIC_DRILL), " S ", "SCS", "SBS", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery"); - registerShaped(getStack(TRItems.ADVANCED_DRILL), " D ", "DCD", "TST", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(TRItems.BASIC_DRILL, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium"); - registerShaped(getStack(TRItems.INDUSTRIAL_DRILL), " I ", "NCN", "OAO", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'A', getStack(TRItems.ADVANCED_DRILL, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE)); - registerShaped(getStack(TRItems.BASIC_CHAINSAW), " SS", "SCS", "BS ", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery"); - registerShaped(getStack(TRItems.ADVANCED_CHAINSAW), " DD", "TCD", "ST ", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(TRItems.BASIC_CHAINSAW, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium"); - registerShaped(getStack(TRItems.INDUSTRIAL_CHAINSAW), " NI", "OCN", "DO ", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'D', getStack(TRItems.ADVANCED_CHAINSAW, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE)); - registerShaped(getStack(TRItems.BASIC_JACKHAMMER), "SBS", "SCS", " S ", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery"); - registerShaped(getStack(TRItems.ADVANCED_JACKHAMMER), "DSD", "TCT", " D ", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(TRItems.BASIC_JACKHAMMER, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium"); - registerShaped(getStack(TRItems.INDUSTRIAL_JACKHAMMER), "NDN", "OCO", " I ", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'D', getStack(TRItems.ADVANCED_JACKHAMMER, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE)); - registerShaped(getStack(TRItems.CLOAKING_DEVICE), "CIC", "IOI", "CIC", 'C', "ingotChrome", 'I', "plateIridiumAlloy", 'O', getStack(TRItems.LAPOTRONIC_ORB)); - registerShaped(getStack(TRItems.LAPOTRONIC_ORBPACK), "FOF", "SPS", "FIF", 'F', "circuitMaster", 'O', getStack(TRItems.LAPOTRONIC_ORB), 'S', "craftingSuperconductor", 'I', "ingotIridium", 'P', getStack(TRItems.LITHIUM_ION_BATPACK)); -// registerShaped(getStack(TRItems.RED_CELL_BATTERY), " W ", "TRT", "TRT", 'T', "ingotTin", 'R', "dustRedstone", 'W', EnumCableType.ICOPPER.getStack()); -// registerShaped(getStack(TRItems.LITHIUM_ION_BATTERY), " C ", "PFP", "PFP", 'F', getCell("lithium"), 'P', "plateAluminum", 'C', EnumCableType.IGOLD.getStack()); - registerShaped(getStack(TRItems.LITHIUM_ION_BATPACK), "BCB", "BPB", "B B", 'B', getStack(TRItems.LITHIUM_ION_BATTERY), 'P', "plateAluminum", 'C', "circuitAdvanced"); - registerShaped(getStack(TRItems.ENERGY_CRYSTAL), "RRR", "RDR", "RRR", 'R', "dustRedstone", 'D', "gemDiamond"); - registerShaped(getStack(TRItems.LAPOTRON_CRYSTAL), "LCL", "LEL", "LCL", 'L', "dyeBlue", 'E', "energyCrystal", 'C', "circuitBasic"); - registerShaped(getStack(TRItems.LAPOTRONIC_ORB), "LLL", "LPL", "LLL", 'L', "lapotronCrystal", 'P', "plateIridiumAlloy"); - registerShaped(getStack(TRItems.SCRAP_BOX), "SSS", "SSS", "SSS", 'S', TRContent.Parts.SCRAP.getStack()); - //registerShapeless(getStack(TRItems.FREQUENCY_TRANSMITTER), EnumCableType.ICOPPER.getStack(), "circuitBasic"); + registerShaped(getStack(TRContent.BASIC_DRILL), " S ", "SCS", "SBS", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery"); + registerShaped(getStack(TRContent.ADVANCED_DRILL), " D ", "DCD", "TST", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(TRContent.BASIC_DRILL, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium"); + registerShaped(getStack(TRContent.INDUSTRIAL_DRILL), " I ", "NCN", "OAO", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'A', getStack(TRContent.ADVANCED_DRILL, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE)); + registerShaped(getStack(TRContent.BASIC_CHAINSAW), " SS", "SCS", "BS ", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery"); + registerShaped(getStack(TRContent.ADVANCED_CHAINSAW), " DD", "TCD", "ST ", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(TRContent.BASIC_CHAINSAW, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium"); + registerShaped(getStack(TRContent.INDUSTRIAL_CHAINSAW), " NI", "OCN", "DO ", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'D', getStack(TRContent.ADVANCED_CHAINSAW, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE)); + registerShaped(getStack(TRContent.BASIC_JACKHAMMER), "SBS", "SCS", " S ", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery"); + registerShaped(getStack(TRContent.ADVANCED_JACKHAMMER), "DSD", "TCT", " D ", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(TRContent.BASIC_JACKHAMMER, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium"); + registerShaped(getStack(TRContent.INDUSTRIAL_JACKHAMMER), "NDN", "OCO", " I ", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'D', getStack(TRContent.ADVANCED_JACKHAMMER, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE)); + registerShaped(getStack(TRContent.CLOAKING_DEVICE), "CIC", "IOI", "CIC", 'C', "ingotChrome", 'I', "plateIridiumAlloy", 'O', getStack(TRContent.LAPOTRONIC_ORB)); + registerShaped(getStack(TRContent.LAPOTRONIC_ORBPACK), "FOF", "SPS", "FIF", 'F', "circuitMaster", 'O', getStack(TRContent.LAPOTRONIC_ORB), 'S', "craftingSuperconductor", 'I', "ingotIridium", 'P', getStack(TRContent.LITHIUM_ION_BATPACK)); +// registerShaped(getStack(TRContent.RED_CELL_BATTERY), " W ", "TRT", "TRT", 'T', "ingotTin", 'R', "dustRedstone", 'W', EnumCableType.ICOPPER.getStack()); +// registerShaped(getStack(TRContent.LITHIUM_ION_BATTERY), " C ", "PFP", "PFP", 'F', getCell("lithium"), 'P', "plateAluminum", 'C', EnumCableType.IGOLD.getStack()); + registerShaped(getStack(TRContent.LITHIUM_ION_BATPACK), "BCB", "BPB", "B B", 'B', getStack(TRContent.LITHIUM_ION_BATTERY), 'P', "plateAluminum", 'C', "circuitAdvanced"); + registerShaped(getStack(TRContent.ENERGY_CRYSTAL), "RRR", "RDR", "RRR", 'R', "dustRedstone", 'D', "gemDiamond"); + registerShaped(getStack(TRContent.LAPOTRON_CRYSTAL), "LCL", "LEL", "LCL", 'L', "dyeBlue", 'E', "energyCrystal", 'C', "circuitBasic"); + registerShaped(getStack(TRContent.LAPOTRONIC_ORB), "LLL", "LPL", "LLL", 'L', "lapotronCrystal", 'P', "plateIridiumAlloy"); + registerShaped(getStack(TRContent.SCRAP_BOX), "SSS", "SSS", "SSS", 'S', TRContent.Parts.SCRAP.getStack()); + //registerShapeless(getStack(TRContent.FREQUENCY_TRANSMITTER), EnumCableType.ICOPPER.getStack(), "circuitBasic"); if (ConfigTechReborn.enableGemArmorAndTools) { - addToolAndArmourRecipes(getStack(TRItems.RUBY_SWORD), getStack(TRItems.RUBY_PICKAXE), getStack(TRItems.RUBY_AXE), getStack(TRItems.RUBY_HOE), getStack(TRItems.RUBY_SPADE), getStack(TRItems.RUBY_HELMET), getStack(TRItems.RUBY_CHESTPLATE), getStack(TRItems.RUBY_LEGGINGS), getStack(TRItems.RUBY_BOOTS), "gemRuby"); - addToolAndArmourRecipes(getStack(TRItems.SAPPHIRE_SWORD), getStack(TRItems.SAPPHIRE_PICKAXE), getStack(TRItems.SAPPHIRE_AXE), getStack(TRItems.SAPPHIRE_HOE), getStack(TRItems.SAPPHIRE_SPADE), getStack(TRItems.SAPPHIRE_HELMET), getStack(TRItems.SAPPHIRE_CHESTPLATE), getStack(TRItems.SAPPHIRE_LEGGINGS), getStack(TRItems.SAPPHIRE_BOOTS), "gemSapphire"); - addToolAndArmourRecipes(getStack(TRItems.PERIDOT_SWORD), getStack(TRItems.PERIDOT_PICKAXE), getStack(TRItems.PERIDOT_AXE), getStack(TRItems.PERIDOT_HOE), getStack(TRItems.PERIDOT_SPADE), getStack(TRItems.PERIDOT_HELMET), getStack(TRItems.PERIDOT_CHESTPLATE), getStack(TRItems.PERIDOT_LEGGINGS), getStack(TRItems.PERIDOT_BOOTS), "gemPeridot"); - addToolAndArmourRecipes(getStack(TRItems.BRONZE_SWORD), getStack(TRItems.BRONZE_PICKAXE), getStack(TRItems.BRONZE_AXE), getStack(TRItems.BRONZE_HOE), getStack(TRItems.BRONZE_SPADE), getStack(TRItems.BRONZE_HELMET), getStack(TRItems.BRONZE_CHESTPLATE), getStack(TRItems.BRONZE_LEGGINGS), getStack(TRItems.BRONZE_BOOTS), "ingotBronze"); + addToolAndArmourRecipes(getStack(TRContent.RUBY_SWORD), getStack(TRContent.RUBY_PICKAXE), getStack(TRContent.RUBY_AXE), getStack(TRContent.RUBY_HOE), getStack(TRContent.RUBY_SPADE), getStack(TRContent.RUBY_HELMET), getStack(TRContent.RUBY_CHESTPLATE), getStack(TRContent.RUBY_LEGGINGS), getStack(TRContent.RUBY_BOOTS), "gemRuby"); + addToolAndArmourRecipes(getStack(TRContent.SAPPHIRE_SWORD), getStack(TRContent.SAPPHIRE_PICKAXE), getStack(TRContent.SAPPHIRE_AXE), getStack(TRContent.SAPPHIRE_HOE), getStack(TRContent.SAPPHIRE_SPADE), getStack(TRContent.SAPPHIRE_HELMET), getStack(TRContent.SAPPHIRE_CHESTPLATE), getStack(TRContent.SAPPHIRE_LEGGINGS), getStack(TRContent.SAPPHIRE_BOOTS), "gemSapphire"); + addToolAndArmourRecipes(getStack(TRContent.PERIDOT_SWORD), getStack(TRContent.PERIDOT_PICKAXE), getStack(TRContent.PERIDOT_AXE), getStack(TRContent.PERIDOT_HOE), getStack(TRContent.PERIDOT_SPADE), getStack(TRContent.PERIDOT_HELMET), getStack(TRContent.PERIDOT_CHESTPLATE), getStack(TRContent.PERIDOT_LEGGINGS), getStack(TRContent.PERIDOT_BOOTS), "gemPeridot"); + addToolAndArmourRecipes(getStack(TRContent.BRONZE_SWORD), getStack(TRContent.BRONZE_PICKAXE), getStack(TRContent.BRONZE_AXE), getStack(TRContent.BRONZE_HOE), getStack(TRContent.BRONZE_SPADE), getStack(TRContent.BRONZE_HELMET), getStack(TRContent.BRONZE_CHESTPLATE), getStack(TRContent.BRONZE_LEGGINGS), getStack(TRContent.BRONZE_BOOTS), "ingotBronze"); } //Upgrades @@ -124,21 +123,21 @@ public class CraftingTableRecipes extends RecipeMethods { registerShaped(getStack(TRBlocks.CHEMICAL_REACTOR), "IMI", "CPC", "IEI", 'I', "plateInvar", 'C', "circuitAdvanced", 'M', getStack(TRBlocks.EXTRACTOR), 'P', getStack(TRBlocks.COMPRESSOR), 'E', getStack(TRBlocks.EXTRACTOR)); registerShaped(getStack(TRBlocks.ROLLING_MACHINE), "PCP", "MBM", "PCP", 'P', getStack(Blocks.PISTON), 'C', "circuitAdvanced", 'M', getStack(TRBlocks.COMPRESSOR), 'B', "machineBlockBasic"); registerShaped(getStack(TRBlocks.AUTO_CRAFTING_TABLE), "MPM", "PCP", "MPM", 'M', "circuitAdvanced", 'C', "workbench", 'P', "plateIron"); - registerShaped(getStack(TRBlocks.CHARGE_O_MAT), "ETE", "COC", "EAE", 'E', "circuitMaster", 'T', "energyCrystal", 'C', "chest", 'O', getStack(TRItems.LAPOTRONIC_ORB), 'A', "machineBlockAdvanced"); + registerShaped(getStack(TRBlocks.CHARGE_O_MAT), "ETE", "COC", "EAE", 'E', "circuitMaster", 'T', "energyCrystal", 'C', "chest", 'O', getStack(TRContent.LAPOTRONIC_ORB), 'A', "machineBlockAdvanced"); registerShaped(getStack(TRBlocks.ALLOY_SMELTER), " C ", "FMF", " ", 'C', "circuitBasic", 'F', getStack(TRBlocks.ELECTRIC_FURNACE), 'M', "machineBlockBasic"); registerShaped(getStack(TRBlocks.INTERDIMENSIONAL_SU), "PAP", "ACA", "PAP", 'P', "plateIridiumAlloy", 'C', "chestEnder", 'A', getStack(TRBlocks.ADJUSTABLE_SU)); - registerShaped(getStack(TRBlocks.ADJUSTABLE_SU), "LLL", "LCL", "LLL", 'L', getStack(TRItems.LAPOTRONIC_ORB), 'C', "energyCrystal"); + registerShaped(getStack(TRBlocks.ADJUSTABLE_SU), "LLL", "LCL", "LLL", 'L', getStack(TRContent.LAPOTRONIC_ORB), 'C', "energyCrystal"); registerShaped(getStack(TRBlocks.LAPOTRONIC_SU), " L ", "CBC", " M ", 'L', getStack(TRBlocks.LV_TRANSFORMER), 'C', "circuitAdvanced", 'M', getStack(TRBlocks.MV_TRANSFORMER), 'B', getStack(TRBlocks.LSU_STORAGE)); registerShaped(getStack(TRBlocks.LSU_STORAGE), "LLL", "LCL", "LLL", 'L', "blockLapis", 'C', "circuitBasic"); - registerShaped(getStack(TRBlocks.SCRAPBOXINATOR), "ICI", "DSD", "ICI", 'S', getStack(TRItems.SCRAP_BOX), 'C', "circuitBasic", 'I', "plateIron", 'D', "dirt"); + registerShaped(getStack(TRBlocks.SCRAPBOXINATOR), "ICI", "DSD", "ICI", 'S', getStack(TRContent.SCRAP_BOX), 'C', "circuitBasic", 'I', "plateIron", 'D', "dirt"); registerShaped(getStack(TRBlocks.FUSION_CONTROL_COMPUTER), "CCC", "PTP", "CCC", 'P', "energyCrystal", 'T', getStack(TRBlocks.FUSION_COIL), 'C', "circuitMaster"); // registerShaped(getStack(ModBlocks.FUSION_COIL), "CSC", "NAN", "CRC", 'A', getStack(ModBlocks.MACHINE_CASINGS, 1, 2), 'N', getMaterial("nichromeHeatingCoil", Type.PART), 'C', "circuitMaster", 'S', "craftingSuperconductor", 'R', getMaterial("iridiumNeutronReflector", Type.PART)); registerShaped(getStack(TRBlocks.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateAluminum", 'D', TRContent.Parts.DATA_STORAGE_CORE.getStack(), 'C', TRContent.Parts.DIGITAL_DISPLAY.getStack()); registerShaped(getStack(TRBlocks.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateSteel", 'D', TRContent.Parts.DATA_STORAGE_CORE.getStack(), 'C', TRContent.Parts.DIGITAL_DISPLAY.getStack()); - registerShaped(getStack(TRBlocks.MATTER_FABRICATOR), "ETE", "AOA", "ETE", 'E', "circuitMaster", 'T', getStack(TRBlocks.EXTRACTOR), 'A', "machineBlockElite", 'O', getStack(TRItems.LAPOTRONIC_ORB)); + registerShaped(getStack(TRBlocks.MATTER_FABRICATOR), "ETE", "AOA", "ETE", 'E', "circuitMaster", 'T', getStack(TRBlocks.EXTRACTOR), 'A', "machineBlockElite", 'O', getStack(TRContent.LAPOTRONIC_ORB)); registerShaped(getStack(TRBlocks.COMPUTER_CUBE), "OMC", "MFM", "CMO", 'O', TRContent.Parts.DATA_STORAGE_CORE.getStack(), 'M', TRContent.Parts.DIGITAL_DISPLAY.getStack(), 'C', "circuitMaster", 'F', "machineBlockAdvanced"); registerShaped(getStack(TRBlocks.PLAYER_DETECTOR, true), " D ", "CFC", " D ", 'D', "circuitStorage", 'C', "circuitAdvanced", 'F', getStack(TRBlocks.COMPUTER_CUBE)); - registerShaped(getStack(TRBlocks.DRAGON_EGG_SYPHON), "CTC", "PSP", "CBC", 'C', "circuitMaster", 'T', getStack(TRBlocks.MEDIUM_VOLTAGE_SU), 'P', "plateIridiumAlloy", 'S', "craftingSuperconductor", 'B', getStack(TRItems.LAPOTRONIC_ORB)); + registerShaped(getStack(TRBlocks.DRAGON_EGG_SYPHON), "CTC", "PSP", "CBC", 'C', "circuitMaster", 'T', getStack(TRBlocks.MEDIUM_VOLTAGE_SU), 'P', "plateIridiumAlloy", 'S', "craftingSuperconductor", 'B', getStack(TRContent.LAPOTRONIC_ORB)); registerShaped(getStack(TRBlocks.PLASMA_GENERATOR), "PPP", "PTP", "CGC", 'P', "plateTungstensteel", 'T', getStack(TRBlocks.HV_TRANSFORMER), 'C', "circuitMaster", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR)); // registerShaped(getStack(ModBlocks.SOLAR_PANEL, 1, 0), "DLD", "LDL", "CGC", 'D', "dustCoal", 'L', "paneGlass", 'G', getStack(ModBlocks.SOLID_FUEL_GENEREATOR), 'C', "circuitBasic"); // registerShaped(getStack(ModBlocks.SOLAR_PANEL, 1, 1), "DLD", "LDL", "CPC", 'D', "dustCoal", 'L', "blockGlass", 'C', "circuitAdvanced", 'P', getStack(ModBlocks.SOLAR_PANEL, 1, 0)); @@ -162,7 +161,7 @@ public class CraftingTableRecipes extends RecipeMethods { registerShaped(getStack(TRBlocks.RECYCLER), " E ", "DCD", "GDG", 'D', "dirt", 'C', getStack(TRBlocks.COMPRESSOR), 'G', "dustGlowstone", 'E', "circuitBasic"); registerShaped(getStack(TRBlocks.IRON_FURNACE), "III", "I I", "III", 'I', "ingotIron"); registerShaped(getStack(TRBlocks.IRON_FURNACE), " I ", "I I", "IFI", 'I', "ingotIron", 'F', getStack(Blocks.FURNACE)); - registerShaped(getStack(TRBlocks.EXTRACTOR), "TMT", "TCT", " ", 'T', getStack(TRItems.TREE_TAP, true), 'M', "machineBlockBasic", 'C', "circuitBasic"); + registerShaped(getStack(TRBlocks.EXTRACTOR), "TMT", "TCT", " ", 'T', getStack(TRContent.TREE_TAP, true), 'M', "machineBlockBasic", 'C', "circuitBasic"); registerShaped(getStack(TRBlocks.GRINDER), "FFF", "SMS", " C ", 'F', Items.FLINT, 'S', getStack(Blocks.COBBLESTONE), 'M', "machineBlockBasic", 'C', "circuitBasic"); registerShaped(getStack(TRBlocks.QUANTUM_CHEST), "DCD", "ATA", "DQD", 'D', TRContent.Parts.DATA_STORAGE_CORE.getStack(), 'C', TRContent.Parts.DIGITAL_DISPLAY.getStack(), 'A', "machineBlockElite", 'Q', getStack(TRBlocks.DIGITAL_CHEST), 'T', getStack(TRBlocks.COMPRESSOR)); registerShaped(getStack(TRBlocks.QUANTUM_TANK), "EPE", "PCP", "EPE", 'P', "platePlatinum", 'E', "circuitAdvanced", 'C', getStack(TRBlocks.QUANTUM_CHEST)); @@ -283,7 +282,7 @@ public class CraftingTableRecipes extends RecipeMethods { registerShaped(new ItemStack(TRBlocks.RUBBER_LOG_SLAB_HALF), "WWW", 'W', new ItemStack(TRBlocks.RUBBER_PLANKS)); registerShaped(new ItemStack(TRBlocks.RUBBER_LOG_STAIR), "W ", "WW ", "WWW", 'W', new ItemStack(TRBlocks.RUBBER_PLANKS)); - RebornCraftingHelper.addShapelessOreRecipe(new ItemStack(TRItems.MANUAL), "ingotRefinedIron", + RebornCraftingHelper.addShapelessOreRecipe(new ItemStack(TRContent.MANUAL), "ingotRefinedIron", Items.BOOK); diff --git a/src/main/java/techreborn/items/DynamicCell.java b/src/main/java/techreborn/items/DynamicCell.java index a749a8d34..b4a068b23 100644 --- a/src/main/java/techreborn/items/DynamicCell.java +++ b/src/main/java/techreborn/items/DynamicCell.java @@ -48,7 +48,7 @@ import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStack; import org.apache.commons.lang3.Validate; import reborncore.common.util.StringUtils; import techreborn.events.TRRecipeHandler; -import techreborn.init.TRItems; +import techreborn.init.TRContent; /** * Created by modmuss50 on 17/05/2016. @@ -174,14 +174,14 @@ public class DynamicCell extends Item { public static ItemStack getCellWithFluid(Fluid fluid, int stackSize) { Validate.notNull(fluid); - ItemStack stack = new ItemStack(TRItems.CELL); + ItemStack stack = new ItemStack(TRContent.CELL); getFluidHandler(stack).fill(new FluidStack(fluid, CAPACITY), true); stack.setCount(stackSize); return stack; } public static ItemStack getEmptyCell(int amount) { - return new ItemStack(TRItems.CELL, amount); + return new ItemStack(TRContent.CELL, amount); } public static ItemStack getCellWithFluid(Fluid fluid) { @@ -235,14 +235,14 @@ public class DynamicCell extends Item { cell = super.getContainer(); } else { - cell = new ItemStack(TRItems.CELL, 1); + cell = new ItemStack(TRContent.CELL, 1); } return cell; } @Override protected void setContainerToEmpty() { - container = new ItemStack(TRItems.CELL, 1); + container = new ItemStack(TRContent.CELL, 1); } } } diff --git a/src/main/java/techreborn/items/ItemFrequencyTransmitter.java b/src/main/java/techreborn/items/ItemFrequencyTransmitter.java index 774ac17da..6e629a9dc 100644 --- a/src/main/java/techreborn/items/ItemFrequencyTransmitter.java +++ b/src/main/java/techreborn/items/ItemFrequencyTransmitter.java @@ -42,7 +42,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.client.hud.StackInfoElement; import reborncore.common.util.ChatUtils; -import techreborn.init.TRItems; +import techreborn.init.TRContent; import techreborn.utils.MessageIDs; import javax.annotation.Nullable; @@ -132,7 +132,7 @@ public class ItemFrequencyTransmitter extends Item { public static class StackInfoFreqTransmitter extends StackInfoElement { public StackInfoFreqTransmitter() { - super(TRItems.FREQUENCY_TRANSMITTER); + super(TRContent.FREQUENCY_TRANSMITTER); } @Override diff --git a/src/main/java/techreborn/items/armor/ItemCloakingDevice.java b/src/main/java/techreborn/items/armor/ItemCloakingDevice.java index 4a755721e..efca83d98 100644 --- a/src/main/java/techreborn/items/armor/ItemCloakingDevice.java +++ b/src/main/java/techreborn/items/armor/ItemCloakingDevice.java @@ -46,8 +46,6 @@ import reborncore.common.util.ItemUtils; import techreborn.TechReborn; import techreborn.api.Reference; import techreborn.config.ConfigTechReborn; -import techreborn.init.TRItems; - import javax.annotation.Nullable; @RebornRegister(modID = TechReborn.MOD_ID) @@ -90,7 +88,7 @@ public class ItemCloakingDevice extends ItemTRArmour implements IEnergyItemInfo if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack uncharged = new ItemStack(TRItems.CLOAKING_DEVICE); + ItemStack uncharged = new ItemStack(this); // ItemStack charged = new ItemStack(ModItems.CLOAKING_DEVICE); // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); diff --git a/src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java b/src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java index 4e8c0e3c3..9967d7634 100644 --- a/src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java +++ b/src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java @@ -41,8 +41,6 @@ import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ItemUtils; import techreborn.config.ConfigTechReborn; -import techreborn.init.TRItems; - import javax.annotation.Nullable; public class ItemLapotronicOrbpack extends ItemArmor implements IEnergyItemInfo { @@ -63,7 +61,7 @@ public class ItemLapotronicOrbpack extends ItemArmor implements IEnergyItemInfo if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack uncharged = new ItemStack(TRItems.LAPOTRONIC_ORBPACK); + ItemStack uncharged = new ItemStack(this); // ItemStack charged = new ItemStack(ModItems.LAPOTRONIC_ORBPACK); // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); diff --git a/src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java b/src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java index 156061c76..c15b45b53 100644 --- a/src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java +++ b/src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java @@ -43,8 +43,6 @@ import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ItemUtils; import techreborn.config.ConfigTechReborn; -import techreborn.init.TRItems; - import javax.annotation.Nullable; public class ItemLithiumIonBatpack extends ItemArmor implements IEnergyItemInfo { @@ -120,7 +118,7 @@ public class ItemLithiumIonBatpack extends ItemArmor implements IEnergyItemInfo if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack uncharged = new ItemStack(TRItems.LITHIUM_ION_BATPACK); + ItemStack uncharged = new ItemStack(this); // ItemStack charged = new ItemStack(ModItems.LITHIUM_ION_BATPACK); // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); diff --git a/src/main/java/techreborn/items/battery/ItemEnergyCrystal.java b/src/main/java/techreborn/items/battery/ItemEnergyCrystal.java index 582ae291f..8238fa94a 100644 --- a/src/main/java/techreborn/items/battery/ItemEnergyCrystal.java +++ b/src/main/java/techreborn/items/battery/ItemEnergyCrystal.java @@ -30,7 +30,7 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import techreborn.config.ConfigTechReborn; -import techreborn.init.TRItems; +import techreborn.init.TRContent; public class ItemEnergyCrystal extends ItemBattery { @@ -45,7 +45,7 @@ public class ItemEnergyCrystal extends ItemBattery { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(TRItems.ENERGY_CRYSTAL); + ItemStack stack = new ItemStack(TRContent.ENERGY_CRYSTAL); // ItemStack charged = stack.copy(); // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); diff --git a/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java b/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java index 402ea2d2c..c447ea310 100644 --- a/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java +++ b/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java @@ -30,7 +30,6 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import techreborn.config.ConfigTechReborn; -import techreborn.init.TRItems; public class ItemLapotronCrystal extends ItemBattery { @@ -45,7 +44,7 @@ public class ItemLapotronCrystal extends ItemBattery { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(TRItems.LAPOTRON_CRYSTAL); + ItemStack stack = new ItemStack(this); // ItemStack charged = stack.copy(); // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); diff --git a/src/main/java/techreborn/items/battery/ItemLapotronicOrb.java b/src/main/java/techreborn/items/battery/ItemLapotronicOrb.java index 2537d1504..e59a6ebc1 100644 --- a/src/main/java/techreborn/items/battery/ItemLapotronicOrb.java +++ b/src/main/java/techreborn/items/battery/ItemLapotronicOrb.java @@ -30,7 +30,6 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import techreborn.config.ConfigTechReborn; -import techreborn.init.TRItems; public class ItemLapotronicOrb extends ItemBattery { @@ -45,7 +44,7 @@ public class ItemLapotronicOrb extends ItemBattery { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(TRItems.LAPOTRONIC_ORB); + ItemStack stack = new ItemStack(this); // ItemStack charged = stack.copy(); // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); diff --git a/src/main/java/techreborn/items/battery/ItemLithiumIonBattery.java b/src/main/java/techreborn/items/battery/ItemLithiumIonBattery.java index 7063b48f0..f4ba33ae1 100644 --- a/src/main/java/techreborn/items/battery/ItemLithiumIonBattery.java +++ b/src/main/java/techreborn/items/battery/ItemLithiumIonBattery.java @@ -29,7 +29,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import techreborn.init.TRItems; public class ItemLithiumIonBattery extends ItemBattery { @@ -44,7 +43,7 @@ public class ItemLithiumIonBattery extends ItemBattery { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(TRItems.LITHIUM_ION_BATTERY); + ItemStack stack = new ItemStack(this); // ItemStack charged = stack.copy(); // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); //capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); diff --git a/src/main/java/techreborn/items/battery/ItemRedCellBattery.java b/src/main/java/techreborn/items/battery/ItemRedCellBattery.java index bbf7cbbc6..fe5ee9817 100644 --- a/src/main/java/techreborn/items/battery/ItemRedCellBattery.java +++ b/src/main/java/techreborn/items/battery/ItemRedCellBattery.java @@ -29,7 +29,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import techreborn.init.TRItems; public class ItemRedCellBattery extends ItemBattery { @@ -44,7 +43,7 @@ public class ItemRedCellBattery extends ItemBattery { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(TRItems.RED_CELL_BATTERY); + ItemStack stack = new ItemStack(this); // ItemStack charged = stack.copy(); //IEnergyStorage capEnergy = charged.getCapability(CapabilityEnergy.ENERGY, null); //capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); diff --git a/src/main/java/techreborn/items/tool/advanced/ItemAdvancedChainsaw.java b/src/main/java/techreborn/items/tool/advanced/ItemAdvancedChainsaw.java index be3363beb..fac0339f5 100644 --- a/src/main/java/techreborn/items/tool/advanced/ItemAdvancedChainsaw.java +++ b/src/main/java/techreborn/items/tool/advanced/ItemAdvancedChainsaw.java @@ -32,7 +32,7 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import techreborn.config.ConfigTechReborn; -import techreborn.init.TRItems; +import techreborn.init.TRContent; import techreborn.items.tool.ItemChainsaw; public class ItemAdvancedChainsaw extends ItemChainsaw { @@ -50,7 +50,7 @@ public class ItemAdvancedChainsaw extends ItemChainsaw { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(TRItems.ADVANCED_CHAINSAW); + ItemStack stack = new ItemStack(TRContent.ADVANCED_CHAINSAW); // ItemStack charged = stack.copy(); // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); diff --git a/src/main/java/techreborn/items/tool/advanced/ItemAdvancedDrill.java b/src/main/java/techreborn/items/tool/advanced/ItemAdvancedDrill.java index cda852a57..ec93190e4 100644 --- a/src/main/java/techreborn/items/tool/advanced/ItemAdvancedDrill.java +++ b/src/main/java/techreborn/items/tool/advanced/ItemAdvancedDrill.java @@ -32,7 +32,7 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import techreborn.config.ConfigTechReborn; -import techreborn.init.TRItems; +import techreborn.init.TRContent; import techreborn.items.tool.ItemDrill; public class ItemAdvancedDrill extends ItemDrill { @@ -50,7 +50,7 @@ public class ItemAdvancedDrill extends ItemDrill { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(TRItems.ADVANCED_DRILL); + ItemStack stack = new ItemStack(TRContent.ADVANCED_DRILL); // ItemStack charged = stack.copy(); // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); diff --git a/src/main/java/techreborn/items/tool/advanced/ItemAdvancedJackhammer.java b/src/main/java/techreborn/items/tool/advanced/ItemAdvancedJackhammer.java index 630666de4..7b0cc0e10 100644 --- a/src/main/java/techreborn/items/tool/advanced/ItemAdvancedJackhammer.java +++ b/src/main/java/techreborn/items/tool/advanced/ItemAdvancedJackhammer.java @@ -30,7 +30,7 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import techreborn.config.ConfigTechReborn; -import techreborn.init.TRItems; +import techreborn.init.TRContent; import techreborn.items.tool.ItemJackhammer; public class ItemAdvancedJackhammer extends ItemJackhammer { @@ -49,7 +49,7 @@ public class ItemAdvancedJackhammer extends ItemJackhammer { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(TRItems.ADVANCED_JACKHAMMER); + ItemStack stack = new ItemStack(TRContent.ADVANCED_JACKHAMMER); // ItemStack charged = stack.copy(); // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); diff --git a/src/main/java/techreborn/items/tool/advanced/ItemRockCutter.java b/src/main/java/techreborn/items/tool/advanced/ItemRockCutter.java index 45faf6a9e..291e57cfa 100644 --- a/src/main/java/techreborn/items/tool/advanced/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tool/advanced/ItemRockCutter.java @@ -46,8 +46,6 @@ import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ItemUtils; import techreborn.config.ConfigTechReborn; -import techreborn.init.TRItems; - import javax.annotation.Nullable; import java.util.Random; @@ -145,7 +143,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack uncharged = new ItemStack(TRItems.ROCK_CUTTER); + ItemStack uncharged = new ItemStack(this); uncharged.addEnchantment(Enchantments.SILK_TOUCH, 1); // ItemStack charged = new ItemStack(ModItems.ROCK_CUTTER); // charged.addEnchantment(Enchantments.SILK_TOUCH, 1); diff --git a/src/main/java/techreborn/items/tool/basic/ItemBasicChainsaw.java b/src/main/java/techreborn/items/tool/basic/ItemBasicChainsaw.java index 585adafd4..749053339 100644 --- a/src/main/java/techreborn/items/tool/basic/ItemBasicChainsaw.java +++ b/src/main/java/techreborn/items/tool/basic/ItemBasicChainsaw.java @@ -32,7 +32,7 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import techreborn.config.ConfigTechReborn; -import techreborn.init.TRItems; +import techreborn.init.TRContent; import techreborn.items.tool.ItemChainsaw; public class ItemBasicChainsaw extends ItemChainsaw { @@ -49,7 +49,7 @@ public class ItemBasicChainsaw extends ItemChainsaw { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(TRItems.BASIC_CHAINSAW); + ItemStack stack = new ItemStack(TRContent.BASIC_CHAINSAW); // ItemStack charged = stack.copy(); // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); diff --git a/src/main/java/techreborn/items/tool/basic/ItemBasicDrill.java b/src/main/java/techreborn/items/tool/basic/ItemBasicDrill.java index 74274a02a..5d7082c2b 100644 --- a/src/main/java/techreborn/items/tool/basic/ItemBasicDrill.java +++ b/src/main/java/techreborn/items/tool/basic/ItemBasicDrill.java @@ -32,7 +32,6 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import techreborn.config.ConfigTechReborn; -import techreborn.init.TRItems; import techreborn.items.tool.ItemDrill; public class ItemBasicDrill extends ItemDrill { @@ -49,7 +48,7 @@ public class ItemBasicDrill extends ItemDrill { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(TRItems.BASIC_DRILL); + ItemStack stack = new ItemStack(this); // ItemStack charged = stack.copy(); // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); diff --git a/src/main/java/techreborn/items/tool/basic/ItemBasicJackhammer.java b/src/main/java/techreborn/items/tool/basic/ItemBasicJackhammer.java index 553a6d960..c8ea02d7d 100644 --- a/src/main/java/techreborn/items/tool/basic/ItemBasicJackhammer.java +++ b/src/main/java/techreborn/items/tool/basic/ItemBasicJackhammer.java @@ -30,7 +30,7 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import techreborn.config.ConfigTechReborn; -import techreborn.init.TRItems; +import techreborn.init.TRContent; import techreborn.items.tool.ItemJackhammer; public class ItemBasicJackhammer extends ItemJackhammer { @@ -47,7 +47,7 @@ public class ItemBasicJackhammer extends ItemJackhammer { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(TRItems.BASIC_JACKHAMMER); + ItemStack stack = new ItemStack(TRContent.BASIC_JACKHAMMER); // ItemStack charged = stack.copy(); // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); diff --git a/src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java b/src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java index c8e6c577c..8fbf22fbb 100644 --- a/src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java +++ b/src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java @@ -36,8 +36,6 @@ import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ItemUtils; -import techreborn.init.TRItems; - import javax.annotation.Nullable; /** @@ -79,7 +77,7 @@ public class ItemElectricTreetap extends Item implements IEnergyItemInfo { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack uncharged = new ItemStack(TRItems.ELECTRIC_TREE_TAP); + ItemStack uncharged = new ItemStack(this); // ItemStack charged = new ItemStack(ModItems.ELECTRIC_TREE_TAP); // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); diff --git a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java index 400432a91..478c0893c 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java @@ -38,7 +38,6 @@ import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import techreborn.config.ConfigTechReborn; -import techreborn.init.TRItems; import techreborn.items.tool.ItemChainsaw; public class ItemIndustrialChainsaw extends ItemChainsaw { @@ -56,7 +55,7 @@ public class ItemIndustrialChainsaw extends ItemChainsaw { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(TRItems.INDUSTRIAL_CHAINSAW); + ItemStack stack = new ItemStack(this); // ItemStack charged = stack.copy(); // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); diff --git a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java index b07939c73..33512458b 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java @@ -40,7 +40,6 @@ import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import techreborn.config.ConfigTechReborn; -import techreborn.init.TRItems; import techreborn.items.tool.ItemDrill; import javax.annotation.Nullable; @@ -155,7 +154,7 @@ public class ItemIndustrialDrill extends ItemDrill { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(TRItems.INDUSTRIAL_DRILL); + ItemStack stack = new ItemStack(this); // ItemStack charged = stack.copy(); // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); diff --git a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialJackhammer.java b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialJackhammer.java index 94adc16ad..4e0a9bcfb 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialJackhammer.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialJackhammer.java @@ -30,7 +30,6 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import techreborn.config.ConfigTechReborn; -import techreborn.init.TRItems; import techreborn.items.tool.ItemJackhammer; public class ItemIndustrialJackhammer extends ItemJackhammer { @@ -50,7 +49,7 @@ public class ItemIndustrialJackhammer extends ItemJackhammer { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(TRItems.INDUSTRIAL_JACKHAMMER); + ItemStack stack = new ItemStack(this); // ItemStack charged = stack.copy(); // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); diff --git a/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java b/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java index 73376fd92..a2ec75fdf 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java @@ -54,7 +54,6 @@ import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ChatUtils; import reborncore.common.util.ItemUtils; import techreborn.config.ConfigTechReborn; -import techreborn.init.TRItems; import techreborn.utils.MessageIDs; import javax.annotation.Nullable; @@ -203,7 +202,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack inactiveUncharged = new ItemStack(TRItems.NANOSABER); + ItemStack inactiveUncharged = new ItemStack(this); inactiveUncharged.setTagCompound(new NBTTagCompound()); inactiveUncharged.getTagCompound().setBoolean("isActive", false); diff --git a/src/main/java/techreborn/items/tool/industrial/ItemOmniTool.java b/src/main/java/techreborn/items/tool/industrial/ItemOmniTool.java index 9d6c058ed..41b087a64 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemOmniTool.java @@ -48,8 +48,6 @@ import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ItemUtils; import reborncore.common.util.TorchHelper; import techreborn.config.ConfigTechReborn; -import techreborn.init.TRItems; - import javax.annotation.Nullable; import java.util.List; @@ -159,7 +157,7 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack uncharged = new ItemStack(TRItems.OMNI_TOOL); + ItemStack uncharged = new ItemStack(this); // ItemStack charged = new ItemStack(ModItems.OMNI_TOOL); // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); diff --git a/src/main/java/techreborn/tiles/TileMatterFabricator.java b/src/main/java/techreborn/tiles/TileMatterFabricator.java index c77a7b2a2..b79c09f2c 100644 --- a/src/main/java/techreborn/tiles/TileMatterFabricator.java +++ b/src/main/java/techreborn/tiles/TileMatterFabricator.java @@ -40,7 +40,6 @@ import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.TRBlocks; import techreborn.init.TRContent; -import techreborn.init.TRItems; @RebornRegister(modID = TechReborn.MOD_ID) public class TileMatterFabricator extends TilePowerAcceptor @@ -112,7 +111,7 @@ public class TileMatterFabricator extends TilePowerAcceptor public int getValue(ItemStack itemStack) { if (itemStack.isItemEqual(TRContent.Parts.SCRAP.getStack())) { return 200; - } else if (itemStack.getItem() == TRItems.SCRAP_BOX) { + } else if (itemStack.getItem() == TRContent.SCRAP_BOX) { return 2000; } return 0; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java b/src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java index 5643439a8..a748e256c 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java @@ -34,7 +34,7 @@ import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.TRBlocks; -import techreborn.init.TRItems; +import techreborn.init.TRContent; import techreborn.tiles.TileGenericMachine; @RebornRegister(modID = TechReborn.MOD_ID) @@ -63,7 +63,7 @@ public class TileScrapboxinator extends TileGenericMachine implements IContainer @Override public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("scrapboxinator").player(player.inventory).inventory().hotbar().addInventory() - .tile(this).filterSlot(0, 55, 45, stack -> stack.getItem() == TRItems.SCRAP_BOX).outputSlot(1, 101, 45) + .tile(this).filterSlot(0, 55, 45, stack -> stack.getItem() == TRContent.SCRAP_BOX).outputSlot(1, 101, 45) .energySlot(2, 8, 72).syncEnergyValue().syncCrafterValue().addInventory().create(this); } } \ No newline at end of file