diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index 7b3f0d107..aa78e9319 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -108,7 +108,7 @@ public class Core { ModBlocks.init(); ModTileEntities.init(); ModFluids.init(); - ModItems.init(); + TRItems.init(); // Entitys EntityRegistry.registerModEntity(new ResourceLocation("techreborn", "nuke"), EntityNukePrimed.class, "nuke", 0, INSTANCE, 160, 5, true); @@ -154,7 +154,7 @@ public class Core { 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(ModItems.SCRAP_BOX, new BehaviorDispenseScrapbox()); + BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(TRItems.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 9504803de..d08ee16fa 100644 --- a/src/main/java/techreborn/api/TechRebornAPI.java +++ b/src/main/java/techreborn/api/TechRebornAPI.java @@ -56,7 +56,7 @@ public final class TechRebornAPI { } /** - * Use this to get an item from techrebonrn, @see * ModItems.java for the full list * @@ -65,7 +65,31 @@ public final class TechRebornAPI { */ public static Item getItem(String name) { try { - Object e = Class.forName("techreborn.init.ModItems").getField(name).get(null); + Object e = Class.forName("techreborn.init.TRItems").getField(name).get(null); + return e instanceof Item ? (Item) e : null; + } catch (NoSuchFieldException e1) { + e1.printStackTrace(); + return null; + } catch (IllegalAccessException e) { + e.printStackTrace(); + return null; + } catch (ClassNotFoundException e) { + e.printStackTrace(); + return null; + } + } + + /** + * Use this to get an ingredient item from Tech Reborn, @see + * ModItems.java for the full list + * + * @param name + * @return + */ + public static Item getIngredient(String name) { + try { + Object e = Class.forName("techreborn.init.TRIngredient").getField(name).get(null); return e instanceof Item ? (Item) e : null; } catch (NoSuchFieldException e1) { e1.printStackTrace(); diff --git a/src/main/java/techreborn/api/recipe/machines/ScrapboxRecipe.java b/src/main/java/techreborn/api/recipe/machines/ScrapboxRecipe.java index cb9c9a76f..4b6678d76 100644 --- a/src/main/java/techreborn/api/recipe/machines/ScrapboxRecipe.java +++ b/src/main/java/techreborn/api/recipe/machines/ScrapboxRecipe.java @@ -34,6 +34,7 @@ public class ScrapboxRecipe extends BaseRecipe { public ScrapboxRecipe(ItemStack output, int tickTime, int euPerTick) { super(Reference.SCRAPBOX_RECIPE, tickTime, euPerTick); if (output != null) { + // TODO: Fix recipe addInput(new ItemStack(TechRebornAPI.getItem("SCRAP_BOX"))); addOutput(output); } diff --git a/src/main/java/techreborn/client/ClientEventHandler.java b/src/main/java/techreborn/client/ClientEventHandler.java index 8a5a44df8..4bc1c3856 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.ModItems; +import techreborn.init.TRItems; 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 == ModItems.CLOAKING_DEVICE) { + if (chestslot != null && chestslot == TRItems.CLOAKING_DEVICE) { event.setCanceled(true); } } diff --git a/src/main/java/techreborn/client/RegisterItemJsons.java b/src/main/java/techreborn/client/RegisterItemJsons.java index 5bdb5bd57..815143890 100644 --- a/src/main/java/techreborn/client/RegisterItemJsons.java +++ b/src/main/java/techreborn/client/RegisterItemJsons.java @@ -37,7 +37,7 @@ import techreborn.blocks.cable.BlockCable; import techreborn.blocks.cable.EnumCableType; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; -import techreborn.init.ModItems; +import techreborn.init.TRItems; import techreborn.init.TRIngredients; import techreborn.items.*; import techreborn.lib.ModInfo; @@ -51,82 +51,82 @@ public class RegisterItemJsons { } private static void registerItems() { - register(ModItems.RE_BATTERY, "battery/re_battery"); - register(ModItems.LITHIUM_BATTERY, "battery/lithium_battery"); - register(ModItems.ENERGY_CRYSTAL, "battery/energy_crystal"); - register(ModItems.LAPOTRONIC_CRYSTAL, "battery/lapotron_crystal"); - register(ModItems.LAPOTRONIC_ORB, "battery/lapotronic_orb"); + register(TRItems.RE_BATTERY, "battery/re_battery"); + register(TRItems.LITHIUM_BATTERY, "battery/lithium_battery"); + register(TRItems.ENERGY_CRYSTAL, "battery/energy_crystal"); + register(TRItems.LAPOTRONIC_CRYSTAL, "battery/lapotron_crystal"); + register(TRItems.LAPOTRONIC_ORB, "battery/lapotronic_orb"); - register(ModItems.FREQUENCY_TRANSMITTER, "misc/frequency_transmitter"); - register(ModItems.SCRAP_BOX, "misc/scrapbox"); - register(ModItems.MANUAL, "misc/manual"); - register(ModItems.DEBUG, "misc/debug"); + register(TRItems.FREQUENCY_TRANSMITTER, "misc/frequency_transmitter"); + register(TRItems.SCRAP_BOX, "misc/scrapbox"); + register(TRItems.MANUAL, "misc/manual"); + register(TRItems.DEBUG, "misc/debug"); register(ModBlocks.RUBBER_SAPLING, "misc/rubber_sapling"); - register(ModItems.STEEL_DRILL, "tool/steel_drill"); - register(ModItems.DIAMOND_DRILL, "tool/diamond_drill"); - register(ModItems.ADVANCED_DRILL, "tool/advanced_drill"); - register(ModItems.STEEL_CHAINSAW, "tool/steel_chainsaw"); - register(ModItems.DIAMOND_CHAINSAW, "tool/diamond_chainsaw"); - register(ModItems.ADVANCED_CHAINSAW, "tool/advanced_chainsaw"); - register(ModItems.STEEL_JACKHAMMER, "tool/steel_jackhammer"); - register(ModItems.DIAMOND_JACKHAMMER, "tool/diamond_jackhammer"); - register(ModItems.ADVANCED_JACKHAMMER, "tool/advanced_jackhammer"); - register(ModItems.NANOSABER, "tool/nanosaber"); - register(ModItems.TREE_TAP, "tool/treetap"); - register(ModItems.ELECTRIC_TREE_TAP, "tool/electric_treetap"); - register(ModItems.CLOAKING_DEVICE, "tool/cloaking_device"); - register(ModItems.OMNI_TOOL, "tool/omni_tool"); - register(ModItems.ROCK_CUTTER, "tool/rock_cutter"); - register(ModItems.WRENCH, "tool/wrench"); - register(ModItems.LAPOTRONIC_ORB_PACK, "tool/lapotronic_orbpack"); - register(ModItems.LITHIUM_BATTERY_PACK, "tool/lithium_batpack"); + register(TRItems.STEEL_DRILL, "tool/steel_drill"); + register(TRItems.DIAMOND_DRILL, "tool/diamond_drill"); + register(TRItems.ADVANCED_DRILL, "tool/advanced_drill"); + register(TRItems.STEEL_CHAINSAW, "tool/steel_chainsaw"); + register(TRItems.DIAMOND_CHAINSAW, "tool/diamond_chainsaw"); + register(TRItems.ADVANCED_CHAINSAW, "tool/advanced_chainsaw"); + register(TRItems.STEEL_JACKHAMMER, "tool/steel_jackhammer"); + register(TRItems.DIAMOND_JACKHAMMER, "tool/diamond_jackhammer"); + register(TRItems.ADVANCED_JACKHAMMER, "tool/advanced_jackhammer"); + register(TRItems.NANOSABER, "tool/nanosaber"); + register(TRItems.TREE_TAP, "tool/treetap"); + register(TRItems.ELECTRIC_TREE_TAP, "tool/electric_treetap"); + register(TRItems.CLOAKING_DEVICE, "tool/cloaking_device"); + register(TRItems.OMNI_TOOL, "tool/omni_tool"); + register(TRItems.ROCK_CUTTER, "tool/rock_cutter"); + register(TRItems.WRENCH, "tool/wrench"); + register(TRItems.LAPOTRONIC_ORB_PACK, "tool/lapotronic_orbpack"); + register(TRItems.LITHIUM_BATTERY_PACK, "tool/lithium_batpack"); if (ConfigTechReborn.enableGemArmorAndTools) { - registerBlockstateMultiItem(ModItems.RUBY_HELMET, "ruby_helmet", "items/tool/armour"); - registerBlockstateMultiItem(ModItems.RUBY_CHESTPLATE, "ruby_chestplate", "items/tool/armour"); - registerBlockstateMultiItem(ModItems.RUBY_LEGGINGS, "ruby_leggings", "items/tool/armour"); - registerBlockstateMultiItem(ModItems.RUBY_BOOTS, "ruby_boots", "items/tool/armour"); - registerBlockstateMultiItem(ModItems.SAPPHIRE_HELMET, "sapphire_helmet", "items/tool/armour"); - registerBlockstateMultiItem(ModItems.SAPPHIRE_CHSTPLATE, "sapphire_chestplate", "items/tool/armour"); - registerBlockstateMultiItem(ModItems.SAPPHIRE_LEGGINGS, "sapphire_leggings", "items/tool/armour"); - registerBlockstateMultiItem(ModItems.SAPPHIRE_BOOTS, "sapphire_boots", "items/tool/armour"); - registerBlockstateMultiItem(ModItems.PERIDOT_HELMET, "peridot_helmet", "items/tool/armour"); - registerBlockstateMultiItem(ModItems.PERIDOT_CHESTPLATE, "peridot_chestplate", "items/tool/armour"); - registerBlockstateMultiItem(ModItems.PERIDOT_LEGGINGS, "peridot_leggings", "items/tool/armour"); - registerBlockstateMultiItem(ModItems.PERIDOT_BOOTS, "peridot_boots", "items/tool/armour"); - registerBlockstateMultiItem(ModItems.BRONZE_HELMET, "bronze_helmet", "items/tool/armour"); - registerBlockstateMultiItem(ModItems.BRONZE_CHESTPLATE, "bronze_chestplate", "items/tool/armour"); - registerBlockstateMultiItem(ModItems.BRONZE_LEGGINGS, "bronze_leggings", "items/tool/armour"); - registerBlockstateMultiItem(ModItems.BRONZE_BOOTS, "bronze_boots", "items/tool/armour"); + registerBlockstateMultiItem(TRItems.RUBY_HELMET, "ruby_helmet", "items/tool/armour"); + registerBlockstateMultiItem(TRItems.RUBY_CHESTPLATE, "ruby_chestplate", "items/tool/armour"); + registerBlockstateMultiItem(TRItems.RUBY_LEGGINGS, "ruby_leggings", "items/tool/armour"); + registerBlockstateMultiItem(TRItems.RUBY_BOOTS, "ruby_boots", "items/tool/armour"); + registerBlockstateMultiItem(TRItems.SAPPHIRE_HELMET, "sapphire_helmet", "items/tool/armour"); + registerBlockstateMultiItem(TRItems.SAPPHIRE_CHSTPLATE, "sapphire_chestplate", "items/tool/armour"); + registerBlockstateMultiItem(TRItems.SAPPHIRE_LEGGINGS, "sapphire_leggings", "items/tool/armour"); + registerBlockstateMultiItem(TRItems.SAPPHIRE_BOOTS, "sapphire_boots", "items/tool/armour"); + registerBlockstateMultiItem(TRItems.PERIDOT_HELMET, "peridot_helmet", "items/tool/armour"); + registerBlockstateMultiItem(TRItems.PERIDOT_CHESTPLATE, "peridot_chestplate", "items/tool/armour"); + registerBlockstateMultiItem(TRItems.PERIDOT_LEGGINGS, "peridot_leggings", "items/tool/armour"); + registerBlockstateMultiItem(TRItems.PERIDOT_BOOTS, "peridot_boots", "items/tool/armour"); + registerBlockstateMultiItem(TRItems.BRONZE_HELMET, "bronze_helmet", "items/tool/armour"); + registerBlockstateMultiItem(TRItems.BRONZE_CHESTPLATE, "bronze_chestplate", "items/tool/armour"); + registerBlockstateMultiItem(TRItems.BRONZE_LEGGINGS, "bronze_leggings", "items/tool/armour"); + registerBlockstateMultiItem(TRItems.BRONZE_BOOTS, "bronze_boots", "items/tool/armour"); - registerBlockstateMultiItem(ModItems.RUBY_PICKAXE, "ruby_pickaxe", "items/tool/tool"); - registerBlockstateMultiItem(ModItems.RUBY_SWORD, "ruby_sword", "items/tool/tool"); - registerBlockstateMultiItem(ModItems.RUBY_AXE, "ruby_axe", "items/tool/tool"); - registerBlockstateMultiItem(ModItems.RUBY_SPADE, "ruby_spade", "items/tool/tool"); - registerBlockstateMultiItem(ModItems.RUBY_HOE, "ruby_hoe", "items/tool/tool"); - registerBlockstateMultiItem(ModItems.SAPPHIRE_PICKAXE, "sapphire_pickaxe", "items/tool/tool"); - registerBlockstateMultiItem(ModItems.SAPPHIRE_SWORD, "sapphire_sword", "items/tool/tool"); - registerBlockstateMultiItem(ModItems.SAPPHIRE_AXE, "sapphire_axe", "items/tool/tool"); - registerBlockstateMultiItem(ModItems.SAPPHIRE_SPADE, "sapphire_spade", "items/tool/tool"); - registerBlockstateMultiItem(ModItems.SAPPHIRE_HOE, "sapphire_hoe", "items/tool/tool"); - registerBlockstateMultiItem(ModItems.PERIDOT_PICKAXE, "peridot_pickaxe", "items/tool/tool"); - registerBlockstateMultiItem(ModItems.PERIDOT_SWORD, "peridot_sword", "items/tool/tool"); - registerBlockstateMultiItem(ModItems.PERIDOT_AXE, "peridot_axe", "items/tool/tool"); - registerBlockstateMultiItem(ModItems.PERIDOT_SAPPHIRE, "peridot_spade", "items/tool/tool"); - registerBlockstateMultiItem(ModItems.PERIDOT_HOE, "peridot_hoe", "items/tool/tool"); - registerBlockstateMultiItem(ModItems.BRONZE_PICKAXE, "bronze_pickaxe", "items/tool/tool"); - registerBlockstateMultiItem(ModItems.BRONZE_SWORD, "bronze_sword", "items/tool/tool"); - registerBlockstateMultiItem(ModItems.BRONZE_AXE, "bronze_axe", "items/tool/tool"); - registerBlockstateMultiItem(ModItems.BRONZE_SPADE, "bronze_spade", "items/tool/tool"); - registerBlockstateMultiItem(ModItems.BRONZE_HOE, "bronze_hoe", "items/tool/tool"); + registerBlockstateMultiItem(TRItems.RUBY_PICKAXE, "ruby_pickaxe", "items/tool/tool"); + registerBlockstateMultiItem(TRItems.RUBY_SWORD, "ruby_sword", "items/tool/tool"); + registerBlockstateMultiItem(TRItems.RUBY_AXE, "ruby_axe", "items/tool/tool"); + registerBlockstateMultiItem(TRItems.RUBY_SPADE, "ruby_spade", "items/tool/tool"); + registerBlockstateMultiItem(TRItems.RUBY_HOE, "ruby_hoe", "items/tool/tool"); + registerBlockstateMultiItem(TRItems.SAPPHIRE_PICKAXE, "sapphire_pickaxe", "items/tool/tool"); + registerBlockstateMultiItem(TRItems.SAPPHIRE_SWORD, "sapphire_sword", "items/tool/tool"); + registerBlockstateMultiItem(TRItems.SAPPHIRE_AXE, "sapphire_axe", "items/tool/tool"); + registerBlockstateMultiItem(TRItems.SAPPHIRE_SPADE, "sapphire_spade", "items/tool/tool"); + registerBlockstateMultiItem(TRItems.SAPPHIRE_HOE, "sapphire_hoe", "items/tool/tool"); + registerBlockstateMultiItem(TRItems.PERIDOT_PICKAXE, "peridot_pickaxe", "items/tool/tool"); + registerBlockstateMultiItem(TRItems.PERIDOT_SWORD, "peridot_sword", "items/tool/tool"); + registerBlockstateMultiItem(TRItems.PERIDOT_AXE, "peridot_axe", "items/tool/tool"); + registerBlockstateMultiItem(TRItems.PERIDOT_SAPPHIRE, "peridot_spade", "items/tool/tool"); + registerBlockstateMultiItem(TRItems.PERIDOT_HOE, "peridot_hoe", "items/tool/tool"); + registerBlockstateMultiItem(TRItems.BRONZE_PICKAXE, "bronze_pickaxe", "items/tool/tool"); + registerBlockstateMultiItem(TRItems.BRONZE_SWORD, "bronze_sword", "items/tool/tool"); + registerBlockstateMultiItem(TRItems.BRONZE_AXE, "bronze_axe", "items/tool/tool"); + registerBlockstateMultiItem(TRItems.BRONZE_SPADE, "bronze_spade", "items/tool/tool"); + registerBlockstateMultiItem(TRItems.BRONZE_HOE, "bronze_hoe", "items/tool/tool"); } TRIngredients.registerModel(); String[] name = ItemUpgrades.types.clone(); for (int i = 0; i < ItemUpgrades.types.length; ++i) { - registerBlockstate(ModItems.UPGRADES, i, name[i], "items/misc/"); + registerBlockstate(TRItems.UPGRADES, i, name[i], "items/misc/"); } for (EnumCableType cableType : EnumCableType.values()) { diff --git a/src/main/java/techreborn/client/gui/TRBuilder.java b/src/main/java/techreborn/client/gui/TRBuilder.java index bbf566aa2..deb7a1ae9 100644 --- a/src/main/java/techreborn/client/gui/TRBuilder.java +++ b/src/main/java/techreborn/client/gui/TRBuilder.java @@ -42,7 +42,7 @@ import reborncore.api.tile.IUpgradeable; import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.TilePowerAcceptor; -import techreborn.init.ModItems; +import techreborn.init.TRItems; import techreborn.lib.ModInfo; import techreborn.proxies.ClientProxy; @@ -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(ModItems.WRENCH), posX - 19, posY + 92 - offset); + renderItemStack(new ItemStack(TRItems.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 d4e181ad1..67b821853 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.ModItems; +import techreborn.init.TRItems; 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(ModItems.CELL, stack -> MODEL_LOCATION); - ModelBakery.registerItemVariants(ModItems.CELL, MODEL_LOCATION); + ModelLoader.setCustomMeshDefinition(TRItems.CELL, stack -> MODEL_LOCATION); + ModelBakery.registerItemVariants(TRItems.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 9a24a15d0..7063cc780 100644 --- a/src/main/java/techreborn/events/BlockBreakHandler.java +++ b/src/main/java/techreborn/events/BlockBreakHandler.java @@ -36,7 +36,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.util.OreDrop; -import techreborn.init.ModItems; +import techreborn.init.TRItems; import techreborn.init.TRIngredients; import techreborn.lib.ModInfo; import techreborn.utils.OreDictUtils; @@ -91,7 +91,7 @@ public class BlockBreakHandler { @SubscribeEvent public void getBreakSpeedEvent(PlayerEvent.BreakSpeed event){ - if(event.getEntityPlayer().getHeldItem(EnumHand.MAIN_HAND).getItem() == ModItems.ADVANCED_CHAINSAW && event.getOriginalSpeed() > 1.0f){ + if(event.getEntityPlayer().getHeldItem(EnumHand.MAIN_HAND).getItem() == TRItems.ADVANCED_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 ae0e9f1d1..d34ed1616 100644 --- a/src/main/java/techreborn/events/TRRecipeHandler.java +++ b/src/main/java/techreborn/events/TRRecipeHandler.java @@ -33,7 +33,7 @@ import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.registries.IForgeRegistryEntry; import reborncore.common.util.ItemUtils; -import techreborn.init.ModItems; +import techreborn.init.TRItems; import techreborn.init.TRIngredients; import techreborn.lib.ModInfo; @@ -58,7 +58,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() == ModItems.TREE_TAP) { + if (recipe.getRecipeOutput().getItem() == TRItems.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 71254d21f..9b2f48d7e 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.ModItems; +import techreborn.init.TRItems; 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 == ModItems.CLOAKING_DEVICE && player.isInvisible() + if (previouslyWearing != chestslot && previouslyWearing == TRItems.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 e46df1cd1..538517925 100644 --- a/src/main/java/techreborn/init/OreDict.java +++ b/src/main/java/techreborn/init/OreDict.java @@ -65,11 +65,11 @@ public class OreDict { OreUtil.registerOre("machineBlockElite", BlockMachineFrames.getFrameByName("highlyAdvancedMachine", 1)); // Tools&Armor - OreUtil.registerOre("reBattery", ModItems.RE_BATTERY); - OreUtil.registerOre("lapotronCrystal", ModItems.LAPOTRONIC_CRYSTAL); - OreUtil.registerOre("energyCrystal", ModItems.ENERGY_CRYSTAL); - OreUtil.registerOre("drillBasic", ModItems.STEEL_DRILL); - OreUtil.registerOre("drillDiamond", ModItems.DIAMOND_DRILL); + OreUtil.registerOre("reBattery", TRItems.RE_BATTERY); + OreUtil.registerOre("lapotronCrystal", TRItems.LAPOTRONIC_CRYSTAL); + OreUtil.registerOre("energyCrystal", TRItems.ENERGY_CRYSTAL); + OreUtil.registerOre("drillBasic", TRItems.STEEL_DRILL); + OreUtil.registerOre("drillDiamond", TRItems.DIAMOND_DRILL); // Misc OreUtil.registerOre("industrialTnt", Blocks.TNT); diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/TRItems.java similarity index 95% rename from src/main/java/techreborn/init/ModItems.java rename to src/main/java/techreborn/init/TRItems.java index ca0e4131e..23d2ff150 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/TRItems.java @@ -35,41 +35,51 @@ import techreborn.api.Reference; import techreborn.blocks.BlockMachineFrames; import techreborn.config.ConfigTechReborn; import techreborn.items.*; -import techreborn.items.armor.ItemLapotronPack; -import techreborn.items.armor.ItemLithiumBatpack; -import techreborn.items.armor.ItemTRArmour; +import techreborn.items.armor.*; import techreborn.items.battery.*; import techreborn.items.tools.*; import javax.annotation.Nullable; -public class ModItems { - - public static Item ROCK_CUTTER; - public static Item LITHIUM_BATTERY_PACK; - public static Item LAPOTRONIC_ORB_PACK; - public static Item LITHIUM_BATTERY; - public static Item OMNI_TOOL; - public static Item LAPOTRONIC_ORB; - public static Item MANUAL; +public class TRItems { + + // Armor public static Item CLOAKING_DEVICE; - public static Item RE_BATTERY; - public static Item TREE_TAP; - public static Item ELECTRIC_TREE_TAP; - public static Item STEEL_DRILL; - public static Item DIAMOND_DRILL; - public static Item ADVANCED_DRILL; - public static Item STEEL_CHAINSAW; - public static Item DIAMOND_CHAINSAW; - public static Item ADVANCED_CHAINSAW; - public static Item STEEL_JACKHAMMER; - public static Item DIAMOND_JACKHAMMER; - public static Item ADVANCED_JACKHAMMER; - public static Item NANOSABER; - public static Item WRENCH; + public static Item LAPOTRONIC_ORB_PACK; + public static Item LITHIUM_BATTERY_PACK; + + // Battery + public static Item ENERGY_CRYSTAL; public static Item LAPOTRONIC_CRYSTAL; - public static Item ENERGY_CRYSTAL; - public static Item SCRAP_BOX; + public static Item LAPOTRONIC_ORB; + public static Item LITHIUM_BATTERY; + public static Item RE_BATTERY; + + // Tools + public static Item ADVANCED_CHAINSAW; + public static Item ADVANCED_DRILL; + public static Item ADVANCED_JACKHAMMER; + public static Item DEBUG; + public static Item DIAMOND_CHAINSAW; + public static Item DIAMOND_DRILL; + public static Item DIAMOND_JACKHAMMER; + public static Item ELECTRIC_TREE_TAP; + public static Item NANOSABER; + public static Item OMNI_TOOL; + public static Item ROCK_CUTTER; + public static Item STEEL_CHAINSAW; + public static Item STEEL_DRILL; + public static Item STEEL_JACKHAMMER; + public static Item MANUAL; + public static Item TREE_TAP; + public static Item WRENCH; + + // Other + public static DynamicCell CELL; public static Item FREQUENCY_TRANSMITTER; + public static Item SCRAP_BOX; + public static Item UPGRADES; + + // Gem armor & tools @Nullable public static Item BRONZE_SWORD; @Nullable @@ -142,62 +152,79 @@ public class ModItems { public static Item PERIDOT_LEGGINGS; @Nullable public static Item PERIDOT_BOOTS; - public static Item UPGRADES; - public static Item DEBUG; - public static DynamicCell CELL; - + public static void init() { TRIngredients.register(); - ROCK_CUTTER = new ItemRockCutter(); - registerItem(ROCK_CUTTER, "rockCutter"); - LITHIUM_BATTERY_PACK = new ItemLithiumBatpack(); - registerItem(LITHIUM_BATTERY_PACK, "lithiumBatpack"); + // Armor + CLOAKING_DEVICE = new ItemCloakingDevice(); + registerItem(CLOAKING_DEVICE, "cloakingdevice"); LAPOTRONIC_ORB_PACK = new ItemLapotronPack(); registerItem(LAPOTRONIC_ORB_PACK, "lapotronPack"); - LITHIUM_BATTERY = new ItemLithiumBattery(); - registerItem(LITHIUM_BATTERY, "lithiumBattery"); - LAPOTRONIC_ORB = new ItemLapotronicOrb(); - registerItem(LAPOTRONIC_ORB, "lapotronicOrb"); - OMNI_TOOL = new ItemOmniTool(); - registerItem(OMNI_TOOL, "omniTool"); + LITHIUM_BATTERY_PACK = new ItemLithiumBatpack(); + registerItem(LITHIUM_BATTERY_PACK, "lithiumBatpack"); + + // Battery ENERGY_CRYSTAL = new ItemEnergyCrystal(); registerItem(ENERGY_CRYSTAL, "energycrystal"); LAPOTRONIC_CRYSTAL = new ItemLapotronCrystal(); registerItem(LAPOTRONIC_CRYSTAL, "lapotroncrystal"); - - MANUAL = new ItemTechManual(); - registerItem(MANUAL, "techmanuel"); + LAPOTRONIC_ORB = new ItemLapotronicOrb(); + registerItem(LAPOTRONIC_ORB, "lapotronicOrb"); + LITHIUM_BATTERY = new ItemLithiumBattery(); + registerItem(LITHIUM_BATTERY, "lithiumBattery"); RE_BATTERY = new ItemReBattery(); registerItem(RE_BATTERY, "rebattery"); - TREE_TAP = new ItemTreeTap(); - registerItem(TREE_TAP, "treetap"); - - ELECTRIC_TREE_TAP = new ItemElectricTreetap(); - registerItem(ELECTRIC_TREE_TAP, "electricTreetap"); - - STEEL_DRILL = new ItemSteelDrill(); - registerItem(STEEL_DRILL, "steelDrill"); - DIAMOND_DRILL = new ItemDiamondDrill(); - registerItem(DIAMOND_DRILL, "diamondDrill"); - ADVANCED_DRILL = new ItemAdvancedDrill(); - registerItem(ADVANCED_DRILL, "advancedDrill"); - - STEEL_CHAINSAW = new ItemSteelChainsaw(); - registerItem(STEEL_CHAINSAW, "steelChainsaw"); - DIAMOND_CHAINSAW = new ItemDiamondChainsaw(); - registerItem(DIAMOND_CHAINSAW, "diamondChainsaw"); + + // Tools ADVANCED_CHAINSAW = new ItemAdvancedChainsaw(); registerItem(ADVANCED_CHAINSAW, "advancedChainsaw"); - - STEEL_JACKHAMMER = new ItemSteelJackhammer(); - registerItem(STEEL_JACKHAMMER, "steelJackhammer"); - DIAMOND_JACKHAMMER = new ItemDiamondJackhammer(); - registerItem(DIAMOND_JACKHAMMER, "diamondJackhammer"); + ADVANCED_DRILL = new ItemAdvancedDrill(); + registerItem(ADVANCED_DRILL, "advancedDrill"); ADVANCED_JACKHAMMER = new ItemAdvancedJackhammer(); registerItem(ADVANCED_JACKHAMMER, "advancedJackhammer"); - + DEBUG = new ItemDebugTool(); + registerItem(DEBUG, "debug"); + DIAMOND_CHAINSAW = new ItemDiamondChainsaw(); + registerItem(DIAMOND_CHAINSAW, "diamondChainsaw"); + DIAMOND_DRILL = new ItemDiamondDrill(); + registerItem(DIAMOND_DRILL, "diamondDrill"); + DIAMOND_JACKHAMMER = new ItemDiamondJackhammer(); + registerItem(DIAMOND_JACKHAMMER, "diamondJackhammer"); + ELECTRIC_TREE_TAP = new ItemElectricTreetap(); + registerItem(ELECTRIC_TREE_TAP, "electricTreetap"); + NANOSABER = new ItemNanosaber(); + registerItem(NANOSABER, "nanosaber"); + OMNI_TOOL = new ItemOmniTool(); + registerItem(OMNI_TOOL, "omniTool"); + ROCK_CUTTER = new ItemRockCutter(); + registerItem(ROCK_CUTTER, "rockCutter"); + STEEL_CHAINSAW = new ItemSteelChainsaw(); + registerItem(STEEL_CHAINSAW, "steelChainsaw"); + STEEL_DRILL = new ItemSteelDrill(); + registerItem(STEEL_DRILL, "steelDrill"); + STEEL_JACKHAMMER = new ItemSteelJackhammer(); + registerItem(STEEL_JACKHAMMER, "steelJackhammer"); + MANUAL = new ItemTechManual(); + registerItem(MANUAL, "techmanuel"); + TREE_TAP = new ItemTreeTap(); + registerItem(TREE_TAP, "treetap"); + WRENCH = new ItemWrench(); + registerItem(WRENCH, "wrench"); + + // Other + CELL = new DynamicCell(); + registerItem(CELL, "dynamicCell"); + MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE); + FREQUENCY_TRANSMITTER = new ItemFrequencyTransmitter(); + registerItem(FREQUENCY_TRANSMITTER, "frequencyTransmitter"); + SCRAP_BOX = new ItemScrapBox(); + registerItem(SCRAP_BOX, "scrapbox"); + UPGRADES = new ItemUpgrades(); + registerItem(UPGRADES, "upgrades"); + + // Gem armor & tools if (ConfigTechReborn.enableGemArmorAndTools) { BRONZE_SWORD = new ItemTRSword(Reference.BRONZE, "ingotBronze"); registerItem(BRONZE_SWORD, "bronzeSword"); @@ -279,38 +306,10 @@ public class ModItems { PERIDOT_BOOTS = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.FEET, "gemPeridot"); registerItem(PERIDOT_BOOTS, "peridotBoots"); } - - WRENCH = new ItemWrench(); - registerItem(WRENCH, "wrench"); - - NANOSABER = new ItemNanosaber(); - registerItem(NANOSABER, "nanosaber"); - - SCRAP_BOX = new ItemScrapBox(); - registerItem(SCRAP_BOX, "scrapbox"); - - FREQUENCY_TRANSMITTER = new ItemFrequencyTransmitter(); - registerItem(FREQUENCY_TRANSMITTER, "frequencyTransmitter"); - - UPGRADES = new ItemUpgrades(); - registerItem(UPGRADES, "upgrades"); - - CLOAKING_DEVICE = new ItemCloakingDevice(); - registerItem(CLOAKING_DEVICE, "cloakingdevice"); - - DEBUG = new ItemDebugTool(); - registerItem(DEBUG, "debug"); - - CELL = new DynamicCell(); - registerItem(CELL, "dynamicCell"); - - MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE); - Core.logHelper.info("TechReborns Items Loaded"); BlockMachineBase.advancedFrameStack = BlockMachineFrames.getFrameByName("advanced", 1); BlockMachineBase.basicFrameStack = BlockMachineFrames.getFrameByName("basic", 1); - } public static void registerItem(Item item, String name) { diff --git a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java index 97c00a40b..9fe406c62 100644 --- a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java +++ b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java @@ -36,7 +36,7 @@ import techreborn.blocks.BlockStorage2; import techreborn.blocks.cable.EnumCableType; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; -import techreborn.init.ModItems; +import techreborn.init.TRItems; import techreborn.init.TRIngredients; import techreborn.items.*; @@ -60,38 +60,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(ModItems.WRENCH), "BNB", "NBN", " B ", 'B', "ingotBronze", 'N', "nuggetBronze"); - registerShaped(getStack(ModItems.TREE_TAP), " S ", "PPP", "P ", 'S', "stickWood", 'P', "plankWood"); - registerShaped(getStack(ModItems.ELECTRIC_TREE_TAP), "TB", " ", 'T', getStack(ModItems.TREE_TAP), 'B', "reBattery"); - registerShaped(getStack(ModItems.NANOSABER), "DC ", "DC ", "GLG", 'L', "lapotronCrystal", 'C', "plateCarbon", 'D', "plateDiamond", 'G', "dustsmallGlowstone"); - ItemStack rockCutter = getStack(ModItems.ROCK_CUTTER); + 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); rockCutter.addEnchantment(Enchantments.SILK_TOUCH, 1); registerShaped(rockCutter, "DT ", "DT ", "DCB", 'D', "dustDiamond", 'T', "ingotTitanium", 'C', "circuitBasic", 'B', "reBattery"); - registerShaped(getStack(ModItems.STEEL_DRILL), " S ", "SCS", "SBS", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery"); - registerShaped(getStack(ModItems.DIAMOND_DRILL), " D ", "DCD", "TST", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(ModItems.STEEL_DRILL, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium"); - registerShaped(getStack(ModItems.ADVANCED_DRILL), " I ", "NCN", "OAO", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'A', getStack(ModItems.DIAMOND_DRILL, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE)); - registerShaped(getStack(ModItems.STEEL_CHAINSAW), " SS", "SCS", "BS ", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery"); - registerShaped(getStack(ModItems.DIAMOND_CHAINSAW), " DD", "TCD", "ST ", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(ModItems.STEEL_CHAINSAW, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium"); - registerShaped(getStack(ModItems.ADVANCED_CHAINSAW), " NI", "OCN", "DO ", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'D', getStack(ModItems.DIAMOND_CHAINSAW, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE)); - registerShaped(getStack(ModItems.STEEL_JACKHAMMER), "SBS", "SCS", " S ", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery"); - registerShaped(getStack(ModItems.DIAMOND_JACKHAMMER), "DSD", "TCT", " D ", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(ModItems.STEEL_JACKHAMMER, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium"); - registerShaped(getStack(ModItems.ADVANCED_JACKHAMMER), "NDN", "OCO", " I ", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'D', getStack(ModItems.DIAMOND_JACKHAMMER, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE)); - registerShaped(getStack(ModItems.CLOAKING_DEVICE), "CIC", "IOI", "CIC", 'C', "ingotChrome", 'I', "plateIridiumAlloy", 'O', getStack(ModItems.LAPOTRONIC_ORB)); - registerShaped(getStack(ModItems.LAPOTRONIC_ORB_PACK), "FOF", "SPS", "FIF", 'F', "circuitMaster", 'O', getStack(ModItems.LAPOTRONIC_ORB), 'S', "craftingSuperconductor", 'I', "ingotIridium", 'P', getStack(ModItems.LITHIUM_BATTERY_PACK)); - registerShaped(getStack(ModItems.RE_BATTERY), " W ", "TRT", "TRT", 'T', "ingotTin", 'R', "dustRedstone", 'W', EnumCableType.ICOPPER.getStack()); - registerShaped(getStack(ModItems.LITHIUM_BATTERY), " C ", "PFP", "PFP", 'F', getCell("lithium"), 'P', "plateAluminum", 'C', EnumCableType.IGOLD.getStack()); - registerShaped(getStack(ModItems.LITHIUM_BATTERY_PACK), "BCB", "BPB", "B B", 'B', getStack(ModItems.LITHIUM_BATTERY), 'P', "plateAluminum", 'C', "circuitAdvanced"); - registerShaped(getStack(ModItems.ENERGY_CRYSTAL), "RRR", "RDR", "RRR", 'R', "dustRedstone", 'D', "gemDiamond"); - registerShaped(getStack(ModItems.LAPOTRONIC_CRYSTAL), "LCL", "LEL", "LCL", 'L', "dyeBlue", 'E', "energyCrystal", 'C', "circuitBasic"); - registerShaped(getStack(ModItems.LAPOTRONIC_ORB), "LLL", "LPL", "LLL", 'L', "lapotronCrystal", 'P', "plateIridiumAlloy"); - registerShaped(getStack(ModItems.SCRAP_BOX), "SSS", "SSS", "SSS", 'S', TRIngredients.Parts.SCRAP.getStack()); - registerShapeless(getStack(ModItems.FREQUENCY_TRANSMITTER), EnumCableType.ICOPPER.getStack(), "circuitBasic"); + registerShaped(getStack(TRItems.STEEL_DRILL), " S ", "SCS", "SBS", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery"); + registerShaped(getStack(TRItems.DIAMOND_DRILL), " D ", "DCD", "TST", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(TRItems.STEEL_DRILL, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium"); + registerShaped(getStack(TRItems.ADVANCED_DRILL), " I ", "NCN", "OAO", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'A', getStack(TRItems.DIAMOND_DRILL, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE)); + registerShaped(getStack(TRItems.STEEL_CHAINSAW), " SS", "SCS", "BS ", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery"); + registerShaped(getStack(TRItems.DIAMOND_CHAINSAW), " DD", "TCD", "ST ", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(TRItems.STEEL_CHAINSAW, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium"); + registerShaped(getStack(TRItems.ADVANCED_CHAINSAW), " NI", "OCN", "DO ", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'D', getStack(TRItems.DIAMOND_CHAINSAW, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE)); + registerShaped(getStack(TRItems.STEEL_JACKHAMMER), "SBS", "SCS", " S ", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery"); + registerShaped(getStack(TRItems.DIAMOND_JACKHAMMER), "DSD", "TCT", " D ", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(TRItems.STEEL_JACKHAMMER, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium"); + registerShaped(getStack(TRItems.ADVANCED_JACKHAMMER), "NDN", "OCO", " I ", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'D', getStack(TRItems.DIAMOND_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_ORB_PACK), "FOF", "SPS", "FIF", 'F', "circuitMaster", 'O', getStack(TRItems.LAPOTRONIC_ORB), 'S', "craftingSuperconductor", 'I', "ingotIridium", 'P', getStack(TRItems.LITHIUM_BATTERY_PACK)); + registerShaped(getStack(TRItems.RE_BATTERY), " W ", "TRT", "TRT", 'T', "ingotTin", 'R', "dustRedstone", 'W', EnumCableType.ICOPPER.getStack()); + registerShaped(getStack(TRItems.LITHIUM_BATTERY), " C ", "PFP", "PFP", 'F', getCell("lithium"), 'P', "plateAluminum", 'C', EnumCableType.IGOLD.getStack()); + registerShaped(getStack(TRItems.LITHIUM_BATTERY_PACK), "BCB", "BPB", "B B", 'B', getStack(TRItems.LITHIUM_BATTERY), 'P', "plateAluminum", 'C', "circuitAdvanced"); + registerShaped(getStack(TRItems.ENERGY_CRYSTAL), "RRR", "RDR", "RRR", 'R', "dustRedstone", 'D', "gemDiamond"); + registerShaped(getStack(TRItems.LAPOTRONIC_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', TRIngredients.Parts.SCRAP.getStack()); + registerShapeless(getStack(TRItems.FREQUENCY_TRANSMITTER), EnumCableType.ICOPPER.getStack(), "circuitBasic"); if (ConfigTechReborn.enableGemArmorAndTools) { - addToolAndArmourRecipes(getStack(ModItems.RUBY_SWORD), getStack(ModItems.RUBY_PICKAXE), getStack(ModItems.RUBY_AXE), getStack(ModItems.RUBY_HOE), getStack(ModItems.RUBY_SPADE), getStack(ModItems.RUBY_HELMET), getStack(ModItems.RUBY_CHESTPLATE), getStack(ModItems.RUBY_LEGGINGS), getStack(ModItems.RUBY_BOOTS), "gemRuby"); - addToolAndArmourRecipes(getStack(ModItems.SAPPHIRE_SWORD), getStack(ModItems.SAPPHIRE_PICKAXE), getStack(ModItems.SAPPHIRE_AXE), getStack(ModItems.SAPPHIRE_HOE), getStack(ModItems.SAPPHIRE_SPADE), getStack(ModItems.SAPPHIRE_HELMET), getStack(ModItems.SAPPHIRE_CHSTPLATE), getStack(ModItems.SAPPHIRE_LEGGINGS), getStack(ModItems.SAPPHIRE_BOOTS), "gemSapphire"); - addToolAndArmourRecipes(getStack(ModItems.PERIDOT_SWORD), getStack(ModItems.PERIDOT_PICKAXE), getStack(ModItems.PERIDOT_AXE), getStack(ModItems.PERIDOT_HOE), getStack(ModItems.PERIDOT_SAPPHIRE), getStack(ModItems.PERIDOT_HELMET), getStack(ModItems.PERIDOT_CHESTPLATE), getStack(ModItems.PERIDOT_LEGGINGS), getStack(ModItems.PERIDOT_BOOTS), "gemPeridot"); - addToolAndArmourRecipes(getStack(ModItems.BRONZE_SWORD), getStack(ModItems.BRONZE_PICKAXE), getStack(ModItems.BRONZE_AXE), getStack(ModItems.BRONZE_HOE), getStack(ModItems.BRONZE_SPADE), getStack(ModItems.BRONZE_HELMET), getStack(ModItems.BRONZE_CHESTPLATE), getStack(ModItems.BRONZE_LEGGINGS), getStack(ModItems.BRONZE_BOOTS), "ingotBronze"); + 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_CHSTPLATE), 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_SAPPHIRE), 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"); } //Upgrades @@ -127,21 +127,21 @@ public class CraftingTableRecipes extends RecipeMethods { registerShaped(getStack(ModBlocks.CHEMICAL_REACTOR), "IMI", "CPC", "IEI", 'I', "plateInvar", 'C', "circuitAdvanced", 'M', getStack(ModBlocks.EXTRACTOR), 'P', getStack(ModBlocks.COMPRESSOR), 'E', getStack(ModBlocks.EXTRACTOR)); registerShaped(getStack(ModBlocks.ROLLING_MACHINE), "PCP", "MBM", "PCP", 'P', getStack(Blocks.PISTON), 'C', "circuitAdvanced", 'M', getStack(ModBlocks.COMPRESSOR), 'B', "machineBlockBasic"); registerShaped(getStack(ModBlocks.AUTO_CRAFTING_TABLE), "MPM", "PCP", "MPM", 'M', "circuitAdvanced", 'C', "workbench", 'P', "plateIron"); - registerShaped(getStack(ModBlocks.CHARGE_O_MAT), "ETE", "COC", "EAE", 'E', "circuitMaster", 'T', "energyCrystal", 'C', "chest", 'O', getStack(ModItems.LAPOTRONIC_ORB), 'A', "machineBlockAdvanced"); + registerShaped(getStack(ModBlocks.CHARGE_O_MAT), "ETE", "COC", "EAE", 'E', "circuitMaster", 'T', "energyCrystal", 'C', "chest", 'O', getStack(TRItems.LAPOTRONIC_ORB), 'A', "machineBlockAdvanced"); registerShaped(getStack(ModBlocks.ALLOY_SMELTER), " C ", "FMF", " ", 'C', "circuitBasic", 'F', getStack(ModBlocks.ELECTRIC_FURNACE), 'M', "machineBlockBasic"); registerShaped(getStack(ModBlocks.INTERDIMENSIONAL_SU), "PAP", "ACA", "PAP", 'P', "plateIridiumAlloy", 'C', "chestEnder", 'A', getStack(ModBlocks.ADJUSTABLE_SU)); - registerShaped(getStack(ModBlocks.ADJUSTABLE_SU), "LLL", "LCL", "LLL", 'L', getStack(ModItems.LAPOTRONIC_ORB), 'C', "energyCrystal"); + registerShaped(getStack(ModBlocks.ADJUSTABLE_SU), "LLL", "LCL", "LLL", 'L', getStack(TRItems.LAPOTRONIC_ORB), 'C', "energyCrystal"); registerShaped(getStack(ModBlocks.LAPOTRONIC_SU), " L ", "CBC", " M ", 'L', getStack(ModBlocks.LV_TRANSFORMER), 'C', "circuitAdvanced", 'M', getStack(ModBlocks.MV_TRANSFORMER), 'B', getStack(ModBlocks.LSU_STORAGE)); registerShaped(getStack(ModBlocks.LSU_STORAGE), "LLL", "LCL", "LLL", 'L', "blockLapis", 'C', "circuitBasic"); - registerShaped(getStack(ModBlocks.SCRAPBOXINATOR), "ICI", "DSD", "ICI", 'S', getStack(ModItems.SCRAP_BOX), 'C', "circuitBasic", 'I', "plateIron", 'D', "dirt"); + registerShaped(getStack(ModBlocks.SCRAPBOXINATOR), "ICI", "DSD", "ICI", 'S', getStack(TRItems.SCRAP_BOX), 'C', "circuitBasic", 'I', "plateIron", 'D', "dirt"); registerShaped(getStack(ModBlocks.FUSION_CONTROL_COMPUTER), "CCC", "PTP", "CCC", 'P', "energyCrystal", 'T', getStack(ModBlocks.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(ModBlocks.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateAluminum", 'D', TRIngredients.Parts.DATA_ORB.getStack(), 'C', TRIngredients.Parts.COMPUTER_MONITOR.getStack()); registerShaped(getStack(ModBlocks.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateSteel", 'D', TRIngredients.Parts.DATA_ORB.getStack(), 'C', TRIngredients.Parts.COMPUTER_MONITOR.getStack()); - registerShaped(getStack(ModBlocks.MATTER_FABRICATOR), "ETE", "AOA", "ETE", 'E', "circuitMaster", 'T', getStack(ModBlocks.EXTRACTOR), 'A', "machineBlockElite", 'O', getStack(ModItems.LAPOTRONIC_ORB)); + registerShaped(getStack(ModBlocks.MATTER_FABRICATOR), "ETE", "AOA", "ETE", 'E', "circuitMaster", 'T', getStack(ModBlocks.EXTRACTOR), 'A', "machineBlockElite", 'O', getStack(TRItems.LAPOTRONIC_ORB)); registerShaped(getStack(ModBlocks.COMPUTER_CUBE), "OMC", "MFM", "CMO", 'O', TRIngredients.Parts.DATA_ORB.getStack(), 'M', TRIngredients.Parts.COMPUTER_MONITOR.getStack(), 'C', "circuitMaster", 'F', "machineBlockAdvanced"); registerShaped(getStack(ModBlocks.PLAYER_DETECTOR, true), " D ", "CFC", " D ", 'D', "circuitStorage", 'C', "circuitAdvanced", 'F', getStack(ModBlocks.COMPUTER_CUBE)); - registerShaped(getStack(ModBlocks.DRAGON_EGG_SYPHON), "CTC", "PSP", "CBC", 'C', "circuitMaster", 'T', getStack(ModBlocks.MEDIUM_VOLTAGE_SU), 'P', "plateIridiumAlloy", 'S', "craftingSuperconductor", 'B', getStack(ModItems.LAPOTRONIC_ORB)); + registerShaped(getStack(ModBlocks.DRAGON_EGG_SYPHON), "CTC", "PSP", "CBC", 'C', "circuitMaster", 'T', getStack(ModBlocks.MEDIUM_VOLTAGE_SU), 'P', "plateIridiumAlloy", 'S', "craftingSuperconductor", 'B', getStack(TRItems.LAPOTRONIC_ORB)); registerShaped(getStack(ModBlocks.PLASMA_GENERATOR), "PPP", "PTP", "CGC", 'P', "plateTungstensteel", 'T', getStack(ModBlocks.HV_TRANSFORMER), 'C', "circuitMaster", 'G', getStack(ModBlocks.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)); @@ -165,7 +165,7 @@ public class CraftingTableRecipes extends RecipeMethods { registerShaped(getStack(ModBlocks.RECYCLER), " E ", "DCD", "GDG", 'D', "dirt", 'C', getStack(ModBlocks.COMPRESSOR), 'G', "dustGlowstone", 'E', "circuitBasic"); registerShaped(getStack(ModBlocks.IRON_FURNACE), "III", "I I", "III", 'I', "ingotIron"); registerShaped(getStack(ModBlocks.IRON_FURNACE), " I ", "I I", "IFI", 'I', "ingotIron", 'F', getStack(Blocks.FURNACE)); - registerShaped(getStack(ModBlocks.EXTRACTOR), "TMT", "TCT", " ", 'T', getStack(ModItems.TREE_TAP, true), 'M', "machineBlockBasic", 'C', "circuitBasic"); + registerShaped(getStack(ModBlocks.EXTRACTOR), "TMT", "TCT", " ", 'T', getStack(TRItems.TREE_TAP, true), 'M', "machineBlockBasic", 'C', "circuitBasic"); registerShaped(getStack(ModBlocks.GRINDER), "FFF", "SMS", " C ", 'F', Items.FLINT, 'S', getStack(Blocks.COBBLESTONE), 'M', "machineBlockBasic", 'C', "circuitBasic"); registerShaped(getStack(ModBlocks.QUANTUM_CHEST), "DCD", "ATA", "DQD", 'D', TRIngredients.Parts.DATA_ORB.getStack(), 'C', TRIngredients.Parts.COMPUTER_MONITOR.getStack(), 'A', "machineBlockElite", 'Q', getStack(ModBlocks.DIGITAL_CHEST), 'T', getStack(ModBlocks.COMPRESSOR)); registerShaped(getStack(ModBlocks.QUANTUM_TANK), "EPE", "PCP", "EPE", 'P', "platePlatinum", 'E', "circuitAdvanced", 'C', getStack(ModBlocks.QUANTUM_CHEST)); @@ -286,7 +286,7 @@ public class CraftingTableRecipes extends RecipeMethods { registerShaped(new ItemStack(ModBlocks.RUBBER_LOG_SLAB_HALF), "WWW", 'W', new ItemStack(ModBlocks.RUBBER_PLANKS)); registerShaped(new ItemStack(ModBlocks.RUBBER_LOG_STAIR), "W ", "WW ", "WWW", 'W', new ItemStack(ModBlocks.RUBBER_PLANKS)); - RebornCraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.MANUAL), "ingotRefinedIron", + RebornCraftingHelper.addShapelessOreRecipe(new ItemStack(TRItems.MANUAL), "ingotRefinedIron", Items.BOOK); diff --git a/src/main/java/techreborn/items/DynamicCell.java b/src/main/java/techreborn/items/DynamicCell.java index c7549f12f..0b98da978 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.ModItems; +import techreborn.init.TRItems; import techreborn.utils.TechRebornCreativeTab; /** @@ -177,14 +177,14 @@ public class DynamicCell extends Item { public static ItemStack getCellWithFluid(Fluid fluid, int stackSize) { Validate.notNull(fluid); - ItemStack stack = new ItemStack(ModItems.CELL); + ItemStack stack = new ItemStack(TRItems.CELL); getFluidHandler(stack).fill(new FluidStack(fluid, CAPACITY), true); stack.setCount(stackSize); return stack; } public static ItemStack getEmptyCell(int amount) { - return new ItemStack(ModItems.CELL, amount); + return new ItemStack(TRItems.CELL, amount); } public static ItemStack getCellWithFluid(Fluid fluid) { @@ -238,14 +238,14 @@ public class DynamicCell extends Item { cell = super.getContainer(); } else { - cell = new ItemStack(ModItems.CELL, 1); + cell = new ItemStack(TRItems.CELL, 1); } return cell; } @Override protected void setContainerToEmpty() { - container = new ItemStack(ModItems.CELL, 1); + container = new ItemStack(TRItems.CELL, 1); } } } diff --git a/src/main/java/techreborn/items/ItemFrequencyTransmitter.java b/src/main/java/techreborn/items/ItemFrequencyTransmitter.java index c7acc9d0b..26159e620 100644 --- a/src/main/java/techreborn/items/ItemFrequencyTransmitter.java +++ b/src/main/java/techreborn/items/ItemFrequencyTransmitter.java @@ -41,7 +41,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.ModItems; +import techreborn.init.TRItems; import techreborn.lib.MessageIDs; import techreborn.utils.TechRebornCreativeTab; @@ -132,7 +132,7 @@ public class ItemFrequencyTransmitter extends ItemTR { public static class StackInfoFreqTransmitter extends StackInfoElement { public StackInfoFreqTransmitter() { - super(ModItems.FREQUENCY_TRANSMITTER); + super(TRItems.FREQUENCY_TRANSMITTER); } @Override diff --git a/src/main/java/techreborn/items/ItemUpgrades.java b/src/main/java/techreborn/items/ItemUpgrades.java index d15b1df9e..42fb1e16e 100644 --- a/src/main/java/techreborn/items/ItemUpgrades.java +++ b/src/main/java/techreborn/items/ItemUpgrades.java @@ -42,7 +42,7 @@ import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.tile.TileLegacyMachineBase; import reborncore.common.util.ItemNBTHelper; import techreborn.Core; -import techreborn.init.ModItems; +import techreborn.init.TRItems; import techreborn.lib.ModInfo; import techreborn.utils.TechRebornCreativeTab; @@ -75,7 +75,7 @@ public class ItemUpgrades extends ItemTR implements IUpgrade { public static ItemStack getUpgradeByName(String name, int count) { for (int i = 0; i < types.length; i++) { if (types[i].equalsIgnoreCase(name)) { - return new ItemStack(ModItems.UPGRADES, count, i); + return new ItemStack(TRItems.UPGRADES, count, i); } } throw new InvalidParameterException("The upgrade " + name + " could not be found."); diff --git a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java b/src/main/java/techreborn/items/armor/ItemCloakingDevice.java similarity index 97% rename from src/main/java/techreborn/items/tools/ItemCloakingDevice.java rename to src/main/java/techreborn/items/armor/ItemCloakingDevice.java index cc39e301a..30000732b 100644 --- a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java +++ b/src/main/java/techreborn/items/armor/ItemCloakingDevice.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.items.tools; +package techreborn.items.armor; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -46,7 +46,7 @@ import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.util.ItemUtils; import techreborn.api.Reference; import techreborn.config.ConfigTechReborn; -import techreborn.init.ModItems; +import techreborn.init.TRItems; import techreborn.items.armor.ItemTRArmour; import techreborn.lib.ModInfo; import techreborn.utils.TechRebornCreativeTab; @@ -97,7 +97,7 @@ public class ItemCloakingDevice extends ItemTRArmour implements IEnergyItemInfo if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack uncharged = new ItemStack(ModItems.CLOAKING_DEVICE); + ItemStack uncharged = new ItemStack(TRItems.CLOAKING_DEVICE); // 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/ItemLapotronPack.java b/src/main/java/techreborn/items/armor/ItemLapotronPack.java index 8a939b5ab..ab20f5476 100644 --- a/src/main/java/techreborn/items/armor/ItemLapotronPack.java +++ b/src/main/java/techreborn/items/armor/ItemLapotronPack.java @@ -41,7 +41,7 @@ import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ItemUtils; import techreborn.config.ConfigTechReborn; -import techreborn.init.ModItems; +import techreborn.init.TRItems; import techreborn.utils.TechRebornCreativeTab; import javax.annotation.Nullable; @@ -66,7 +66,7 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack uncharged = new ItemStack(ModItems.LAPOTRONIC_ORB_PACK); + ItemStack uncharged = new ItemStack(TRItems.LAPOTRONIC_ORB_PACK); // ItemStack charged = new ItemStack(ModItems.LAPOTRONIC_ORB_PACK); // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); diff --git a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java index d08aa7168..d6fd57271 100644 --- a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java +++ b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java @@ -43,7 +43,7 @@ import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ItemUtils; import techreborn.config.ConfigTechReborn; -import techreborn.init.ModItems; +import techreborn.init.TRItems; import techreborn.utils.TechRebornCreativeTab; import javax.annotation.Nullable; @@ -121,7 +121,7 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack uncharged = new ItemStack(ModItems.LITHIUM_BATTERY_PACK); + ItemStack uncharged = new ItemStack(TRItems.LITHIUM_BATTERY_PACK); // ItemStack charged = new ItemStack(ModItems.LITHIUM_BATTERY_PACK); // 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 210a2dafa..33e560894 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.ModItems; +import techreborn.init.TRItems; public class ItemEnergyCrystal extends ItemBattery { @@ -45,7 +45,7 @@ public class ItemEnergyCrystal extends ItemBattery { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(ModItems.ENERGY_CRYSTAL); + ItemStack stack = new ItemStack(TRItems.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 d46a6b34a..14a44acc4 100644 --- a/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java +++ b/src/main/java/techreborn/items/battery/ItemLapotronCrystal.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.ModItems; +import techreborn.init.TRItems; public class ItemLapotronCrystal extends ItemBattery { @@ -45,7 +45,7 @@ public class ItemLapotronCrystal extends ItemBattery { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(ModItems.LAPOTRONIC_CRYSTAL); + ItemStack stack = new ItemStack(TRItems.LAPOTRONIC_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/ItemLapotronicOrb.java b/src/main/java/techreborn/items/battery/ItemLapotronicOrb.java index 748bb6b16..269f20e9a 100644 --- a/src/main/java/techreborn/items/battery/ItemLapotronicOrb.java +++ b/src/main/java/techreborn/items/battery/ItemLapotronicOrb.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.ModItems; +import techreborn.init.TRItems; public class ItemLapotronicOrb extends ItemBattery { @@ -45,7 +45,7 @@ public class ItemLapotronicOrb extends ItemBattery { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(ModItems.LAPOTRONIC_ORB); + ItemStack stack = new ItemStack(TRItems.LAPOTRONIC_ORB); // 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/ItemLithiumBattery.java b/src/main/java/techreborn/items/battery/ItemLithiumBattery.java index c59369206..7f186b95c 100644 --- a/src/main/java/techreborn/items/battery/ItemLithiumBattery.java +++ b/src/main/java/techreborn/items/battery/ItemLithiumBattery.java @@ -29,7 +29,7 @@ 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.ModItems; +import techreborn.init.TRItems; public class ItemLithiumBattery extends ItemBattery { @@ -44,7 +44,7 @@ public class ItemLithiumBattery extends ItemBattery { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(ModItems.LITHIUM_BATTERY); + ItemStack stack = new ItemStack(TRItems.LITHIUM_BATTERY); // 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/ItemReBattery.java b/src/main/java/techreborn/items/battery/ItemReBattery.java index 773202cd3..7b4873b33 100644 --- a/src/main/java/techreborn/items/battery/ItemReBattery.java +++ b/src/main/java/techreborn/items/battery/ItemReBattery.java @@ -29,7 +29,7 @@ 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.ModItems; +import techreborn.init.TRItems; public class ItemReBattery extends ItemBattery { @@ -44,7 +44,7 @@ public class ItemReBattery extends ItemBattery { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(ModItems.RE_BATTERY); + ItemStack stack = new ItemStack(TRItems.RE_BATTERY); // ItemStack charged = stack.copy(); //IEnergyStorage capEnergy = charged.getCapability(CapabilityEnergy.ENERGY, null); //capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java b/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java index cd4858b5d..29289b507 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java @@ -38,7 +38,7 @@ import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import techreborn.config.ConfigTechReborn; -import techreborn.init.ModItems; +import techreborn.init.TRItems; public class ItemAdvancedChainsaw extends ItemChainsaw { @@ -56,7 +56,7 @@ public class ItemAdvancedChainsaw extends ItemChainsaw { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(ModItems.ADVANCED_CHAINSAW); + ItemStack stack = new ItemStack(TRItems.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/tools/ItemAdvancedDrill.java b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java index 964f91f0d..35b7a6b39 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java @@ -40,7 +40,7 @@ import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import techreborn.config.ConfigTechReborn; -import techreborn.init.ModItems; +import techreborn.init.TRItems; import javax.annotation.Nullable; import java.util.HashSet; @@ -150,7 +150,7 @@ public class ItemAdvancedDrill extends ItemDrill { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(ModItems.ADVANCED_DRILL); + ItemStack stack = new ItemStack(TRItems.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/tools/ItemAdvancedJackhammer.java b/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java index 81ac57ead..22107faca 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java +++ b/src/main/java/techreborn/items/tools/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.ModItems; +import techreborn.init.TRItems; public class ItemAdvancedJackhammer extends ItemJackhammer { @@ -49,7 +49,7 @@ public class ItemAdvancedJackhammer extends ItemJackhammer { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(ModItems.ADVANCED_JACKHAMMER); + ItemStack stack = new ItemStack(TRItems.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/tools/ItemDiamondChainsaw.java b/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java index 1181774ab..069fe6c33 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.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.ModItems; +import techreborn.init.TRItems; public class ItemDiamondChainsaw extends ItemChainsaw { @@ -49,7 +49,7 @@ public class ItemDiamondChainsaw extends ItemChainsaw { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(ModItems.DIAMOND_CHAINSAW); + ItemStack stack = new ItemStack(TRItems.DIAMOND_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/tools/ItemDiamondDrill.java b/src/main/java/techreborn/items/tools/ItemDiamondDrill.java index 164bbb44d..a0e31c850 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondDrill.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.ModItems; +import techreborn.init.TRItems; public class ItemDiamondDrill extends ItemDrill { @@ -49,7 +49,7 @@ public class ItemDiamondDrill extends ItemDrill { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(ModItems.DIAMOND_DRILL); + ItemStack stack = new ItemStack(TRItems.DIAMOND_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/tools/ItemDiamondJackhammer.java b/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java index 5a5b70550..8a5b5b2c3 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.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.ModItems; +import techreborn.init.TRItems; public class ItemDiamondJackhammer extends ItemJackhammer { @@ -48,7 +48,7 @@ public class ItemDiamondJackhammer extends ItemJackhammer { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(ModItems.DIAMOND_JACKHAMMER); + ItemStack stack = new ItemStack(TRItems.DIAMOND_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/tools/ItemElectricTreetap.java b/src/main/java/techreborn/items/tools/ItemElectricTreetap.java index 3346f3b5e..663f32a0e 100644 --- a/src/main/java/techreborn/items/tools/ItemElectricTreetap.java +++ b/src/main/java/techreborn/items/tools/ItemElectricTreetap.java @@ -35,7 +35,7 @@ import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ItemUtils; -import techreborn.init.ModItems; +import techreborn.init.TRItems; import techreborn.items.ItemTR; import techreborn.utils.TechRebornCreativeTab; @@ -82,7 +82,7 @@ public class ItemElectricTreetap extends ItemTR implements IEnergyItemInfo { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack uncharged = new ItemStack(ModItems.ELECTRIC_TREE_TAP); + ItemStack uncharged = new ItemStack(TRItems.ELECTRIC_TREE_TAP); // 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/tools/ItemNanosaber.java b/src/main/java/techreborn/items/tools/ItemNanosaber.java index ba5c87206..cd18a70a3 100644 --- a/src/main/java/techreborn/items/tools/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tools/ItemNanosaber.java @@ -54,7 +54,7 @@ import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ChatUtils; import reborncore.common.util.ItemUtils; import techreborn.config.ConfigTechReborn; -import techreborn.init.ModItems; +import techreborn.init.TRItems; import techreborn.lib.MessageIDs; import techreborn.utils.TechRebornCreativeTab; @@ -200,7 +200,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack inactiveUncharged = new ItemStack(ModItems.NANOSABER); + ItemStack inactiveUncharged = new ItemStack(TRItems.NANOSABER); inactiveUncharged.setTagCompound(new NBTTagCompound()); inactiveUncharged.getTagCompound().setBoolean("isActive", false); diff --git a/src/main/java/techreborn/items/tools/ItemOmniTool.java b/src/main/java/techreborn/items/tools/ItemOmniTool.java index 8831705b0..f201bf3a0 100644 --- a/src/main/java/techreborn/items/tools/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tools/ItemOmniTool.java @@ -48,7 +48,7 @@ import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ItemUtils; import reborncore.common.util.TorchHelper; import techreborn.config.ConfigTechReborn; -import techreborn.init.ModItems; +import techreborn.init.TRItems; import techreborn.utils.TechRebornCreativeTab; import javax.annotation.Nullable; @@ -162,7 +162,7 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack uncharged = new ItemStack(ModItems.OMNI_TOOL); + ItemStack uncharged = new ItemStack(TRItems.OMNI_TOOL); // 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/items/tools/ItemRockCutter.java b/src/main/java/techreborn/items/tools/ItemRockCutter.java index 39ff0b1dd..7f1858107 100644 --- a/src/main/java/techreborn/items/tools/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tools/ItemRockCutter.java @@ -46,7 +46,7 @@ import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ItemUtils; import techreborn.config.ConfigTechReborn; -import techreborn.init.ModItems; +import techreborn.init.TRItems; import techreborn.utils.TechRebornCreativeTab; import javax.annotation.Nullable; @@ -146,7 +146,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack uncharged = new ItemStack(ModItems.ROCK_CUTTER); + ItemStack uncharged = new ItemStack(TRItems.ROCK_CUTTER); 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/tools/ItemSteelChainsaw.java b/src/main/java/techreborn/items/tools/ItemSteelChainsaw.java index fca46f7b1..111e252c1 100644 --- a/src/main/java/techreborn/items/tools/ItemSteelChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemSteelChainsaw.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.ModItems; +import techreborn.init.TRItems; public class ItemSteelChainsaw extends ItemChainsaw { @@ -48,7 +48,7 @@ public class ItemSteelChainsaw extends ItemChainsaw { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(ModItems.STEEL_CHAINSAW); + ItemStack stack = new ItemStack(TRItems.STEEL_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/tools/ItemSteelDrill.java b/src/main/java/techreborn/items/tools/ItemSteelDrill.java index 226e78432..bba010266 100644 --- a/src/main/java/techreborn/items/tools/ItemSteelDrill.java +++ b/src/main/java/techreborn/items/tools/ItemSteelDrill.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.ModItems; +import techreborn.init.TRItems; public class ItemSteelDrill extends ItemDrill { @@ -48,7 +48,7 @@ public class ItemSteelDrill extends ItemDrill { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(ModItems.STEEL_DRILL); + ItemStack stack = new ItemStack(TRItems.STEEL_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/tools/ItemSteelJackhammer.java b/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java index b8bf06768..09822ccac 100644 --- a/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemSteelJackhammer.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.ModItems; +import techreborn.init.TRItems; public class ItemSteelJackhammer extends ItemJackhammer { @@ -46,7 +46,7 @@ public class ItemSteelJackhammer extends ItemJackhammer { if (!isInCreativeTab(par2CreativeTabs)) { return; } - ItemStack stack = new ItemStack(ModItems.STEEL_JACKHAMMER); + ItemStack stack = new ItemStack(TRItems.STEEL_JACKHAMMER); // ItemStack charged = stack.copy(); // 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 b5fac5a79..eb8e55924 100644 --- a/src/main/java/techreborn/tiles/TileMatterFabricator.java +++ b/src/main/java/techreborn/tiles/TileMatterFabricator.java @@ -38,7 +38,7 @@ import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; -import techreborn.init.ModItems; +import techreborn.init.TRItems; import techreborn.init.TRIngredients; import techreborn.lib.ModInfo; @@ -112,7 +112,7 @@ public class TileMatterFabricator extends TilePowerAcceptor public int getValue(ItemStack itemStack) { if (itemStack.isItemEqual(TRIngredients.Parts.SCRAP.getStack())) { return 200; - } else if (itemStack.getItem() == ModItems.SCRAP_BOX) { + } else if (itemStack.getItem() == TRItems.SCRAP_BOX) { return 2000; } return 0; diff --git a/src/main/java/techreborn/tiles/tier1/TileScrapboxinator.java b/src/main/java/techreborn/tiles/tier1/TileScrapboxinator.java index 2edf62120..cbd32aa8d 100644 --- a/src/main/java/techreborn/tiles/tier1/TileScrapboxinator.java +++ b/src/main/java/techreborn/tiles/tier1/TileScrapboxinator.java @@ -33,7 +33,7 @@ import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; -import techreborn.init.ModItems; +import techreborn.init.TRItems; import techreborn.lib.ModInfo; import techreborn.tiles.TileGenericMachine; @@ -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() == ModItems.SCRAP_BOX).outputSlot(1, 101, 45) + .tile(this).filterSlot(0, 55, 45, stack -> stack.getItem() == TRItems.SCRAP_BOX).outputSlot(1, 101, 45) .energySlot(2, 8, 72).syncEnergyValue().syncCrafterValue().addInventory().create(this); } } \ No newline at end of file