From 5773bf66d0c36e1c5a3b3bf0fd24199922076a18 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 27 Apr 2016 17:19:06 +0100 Subject: [PATCH 1/6] Added offhand stack power hub rendering --- .../java/techreborn/client/hud/ChargeHud.java | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/src/main/java/techreborn/client/hud/ChargeHud.java b/src/main/java/techreborn/client/hud/ChargeHud.java index 9147d6303..2c3f09e3e 100644 --- a/src/main/java/techreborn/client/hud/ChargeHud.java +++ b/src/main/java/techreborn/client/hud/ChargeHud.java @@ -52,6 +52,7 @@ public class ChargeHud { EntityPlayer player = mc.thePlayer; ItemStack armorstack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ItemStack offHandstack = player.getItemStackFromSlot(EntityEquipmentSlot.OFFHAND); ItemStack stack = mc.thePlayer.inventory.getCurrentItem(); int y = 5; @@ -86,6 +87,30 @@ public class ChargeHud if (showHud) { + if (offHandstack != null && offHandstack.getItem() instanceof IEnergyInterfaceItem) + { + double MaxCharge = ((IEnergyInterfaceItem) offHandstack.getItem()).getMaxPower(offHandstack); + double CurrentCharge = ((IEnergyInterfaceItem) offHandstack.getItem()).getEnergy(offHandstack); + Color color = Color.GREEN; + double quarter = MaxCharge / 4; + double half = MaxCharge / 2; + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glEnable(32826); + RenderHelper.enableStandardItemLighting(); + RenderHelper.enableGUIStandardItemLighting(); + renderItemStack(offHandstack, 0, y - 5); + if (CurrentCharge <= half) + { + color = Color.YELLOW; + } + if (CurrentCharge <= quarter) + { + color = Color.DARK_RED; + } + mc.fontRendererObj.drawString(color + PowerSystem.getLocaliszedPower(CurrentCharge) + "/" + + PowerSystem.getLocaliszedPower(MaxCharge), 20, y, 0); + y += 20; + } if (stack != null && stack.getItem() instanceof IEnergyInterfaceItem) { double MaxCharge = ((IEnergyInterfaceItem) stack.getItem()).getMaxPower(stack); @@ -106,8 +131,7 @@ public class ChargeHud { color = Color.DARK_RED; } - mc.fontRendererObj.drawString(color + PowerSystem.getLocaliszedPower(CurrentCharge) + "/" - + PowerSystem.getLocaliszedPower(MaxCharge), 20, y, 0); + mc.fontRendererObj.drawString(color + PowerSystem.getLocaliszedPower(CurrentCharge) + "/" + PowerSystem.getLocaliszedPower(MaxCharge), 20, y, 0); } } GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); From 28448faf5302b1531bd70548f93ae7b868006b28 Mon Sep 17 00:00:00 2001 From: Modmuss50 Date: Fri, 6 May 2016 11:05:24 +0100 Subject: [PATCH 2/6] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index e15003c8f..f5d81731c 100644 --- a/README.md +++ b/README.md @@ -58,3 +58,7 @@ Inactive - joflashstudios (Recipes) And everyone else who has helped with languages and code. + + # License Infomation: + + The mod is licenced under MIT. We have got permisson from Greg to use his textures, everything else has been recoded and retextured. If you have any quierys please ask on irc or in an issue. From ab88164dfbadfbe415171146818ba1b24c86a0c2 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 6 May 2016 19:49:23 +0100 Subject: [PATCH 3/6] This might fix setup? --- build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.gradle b/build.gradle index bbcdeabd8..d4899ddf7 100644 --- a/build.gradle +++ b/build.gradle @@ -40,6 +40,9 @@ repositories { name "CraftTweaker3" artifactPattern "http://www.blamejared.com/content/[module]-[classifier]-Full-[revision].[ext]" } + maven { + url 'http://maven.rubbix.net' + } } configurations { @@ -83,6 +86,7 @@ dependencies { compile 'RebornCore:RebornCore-1.9:+:dev' deobfCompile "mezz.jei:jei_1.9:+" deobfCompile 'MCMultiPart:MCMultiPart-experimental:1.2.0_60:universal' + compile "net.darkhax.tesla:Tesla:1.9-1.0.1.21:deobf" } From 4095a0b52ddc72abb2cb3e0ed83b523586ce96f0 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 6 May 2016 22:13:24 +0100 Subject: [PATCH 4/6] Auto update mappings --- build.gradle | 39 +- src/main/java/techreborn/Core.java | 2 +- src/main/java/techreborn/api/Reference.java | 2 + .../blocks/BlockFusionControlComputer.java | 4 +- .../techreborn/blocks/BlockIronFence.java | 2 +- .../java/techreborn/blocks/BlockNuke.java | 2 +- src/main/java/techreborn/blocks/BlockOre.java | 2 +- .../techreborn/blocks/BlockRubberLog.java | 2 +- .../techreborn/blocks/BlockRubberPlank.java | 2 +- .../blocks/generator/BlockSolarPanel.java | 2 +- .../blocks/generator/BlockWaterMill.java | 2 +- .../blocks/generator/BlockWindMill.java | 2 +- .../blocks/storage/BlockEnergyStorage.java | 2 +- .../blocks/transformers/BlockTransformer.java | 2 +- .../techreborn/client/StackToolTipEvent.java | 2 +- .../client/container/ContainerAESU.java | 4 +- .../container/ContainerAlloyFurnace.java | 4 +- .../client/container/ContainerBatbox.java | 4 +- .../container/ContainerBlastFurnace.java | 4 +- .../client/container/ContainerCrafting.java | 4 +- .../container/ContainerDieselGenerator.java | 4 +- .../container/ContainerFusionReactor.java | 4 +- .../client/container/ContainerGenerator.java | 4 +- .../client/container/ContainerIDSU.java | 4 +- .../ContainerImplosionCompressor.java | 4 +- .../container/ContainerIndustrialGrinder.java | 4 +- .../client/container/ContainerLESU.java | 4 +- .../client/container/ContainerMFE.java | 4 +- .../client/container/ContainerMFSU.java | 4 +- .../container/ContainerMatterFabricator.java | 4 +- .../container/ContainerRollingMachine.java | 4 +- .../container/ContainerVacuumFreezer.java | 4 +- .../render/entitys/RenderNukePrimed.java | 2 +- .../command/TechRebornDevCommand.java | 10 +- .../compat/jei/TechRebornJeiPlugin.java | 4 +- .../java/techreborn/events/TRTickHandler.java | 2 +- src/main/java/techreborn/init/ModBlocks.java | 92 +- src/main/java/techreborn/init/ModFluids.java | 46 +- src/main/java/techreborn/init/ModItems.java | 96 +- src/main/java/techreborn/init/ModRecipes.java | 820 +++++++++--------- src/main/java/techreborn/init/ModSounds.java | 2 +- .../java/techreborn/init/RecipeCompact.java | 6 +- src/main/java/techreborn/items/ItemDusts.java | 6 +- .../techreborn/items/armor/ItemTRArmour.java | 1 + .../items/tools/ItemAdvancedChainsaw.java | 3 +- .../items/tools/ItemAdvancedDrill.java | 3 +- .../techreborn/items/tools/ItemChainsaw.java | 1 + .../items/tools/ItemCloakingDevice.java | 2 +- .../items/tools/ItemDiamondChainsaw.java | 3 +- .../items/tools/ItemDiamondDrill.java | 3 +- .../items/tools/ItemDiamondJackhammer.java | 1 + .../techreborn/items/tools/ItemDrill.java | 5 +- .../items/tools/ItemFluidbucket.java | 2 +- .../items/tools/ItemIronChainsaw.java | 3 +- .../techreborn/items/tools/ItemIronDrill.java | 3 +- .../items/tools/ItemIronJackhammer.java | 1 + .../items/tools/ItemJackhammer.java | 1 + .../techreborn/items/tools/ItemNanosaber.java | 1 + .../techreborn/items/tools/ItemOmniTool.java | 7 +- .../items/tools/ItemRockCutter.java | 3 +- .../items/tools/ItemSteelJackhammer.java | 1 + .../techreborn/items/tools/ItemTRAxe.java | 9 +- .../techreborn/items/tools/ItemTRHoe.java | 1 + .../techreborn/items/tools/ItemTRPickaxe.java | 1 + .../techreborn/items/tools/ItemTRSpade.java | 1 + .../techreborn/items/tools/ItemTRSword.java | 1 + .../techreborn/items/tools/ItemWrench.java | 2 +- .../manual/util/GuiButtonAHeight.java | 2 +- .../manual/util/GuiButtonCustomTexture.java | 2 +- .../manual/util/GuiButtonItemTexture.java | 2 +- .../manual/util/GuiButtonTextOnly.java | 2 +- .../java/techreborn/parts/CableMultipart.java | 2 +- .../techreborn/tiles/TileAlloyFurnace.java | 18 +- .../techreborn/tiles/TileIronFurnace.java | 18 +- .../generator/TileDragonEggSiphoner.java | 2 +- .../tiles/generator/TileHeatGenerator.java | 10 +- .../tiles/generator/TileThermalGenerator.java | 4 +- .../tiles/generator/TileWaterMill.java | 2 +- .../techreborn/utils/StackWIPHandler.java | 2 +- 79 files changed, 704 insertions(+), 644 deletions(-) diff --git a/build.gradle b/build.gradle index d4899ddf7..02534e7e6 100644 --- a/build.gradle +++ b/build.gradle @@ -60,7 +60,7 @@ if (ENV.BUILD_NUMBER) { minecraft { version = "1.9-12.16.0.1865-1.9" - mappings = "snapshot_20160316" + mappings = "snapshot_20160506" replace "@MODVERSION@", project.version // makeObfSourceJar = false useDepAts = true @@ -211,3 +211,40 @@ task wrapper(type: Wrapper) { //To update the wrapper change the version bellow then run: gradle wrapper gradleVersion = '2.9' } + +//Thanks Matthew from #ForgeGradle https://gist.github.com/matthewprenger/108265e3efc83181bd2cc2d2fc31a853 +task updateMappings(dependsOn: sourceJar) { + + def remapped = file('src_remapped/main/java') + def methods = file('methods.csv') + def fields = file('fields.csv') + + doLast { + + Map map = new HashMap<>() + methods.eachLine {line -> + String[] pts = line.split(",") + map.put(pts[0], pts[1]) + } + fields.eachLine {line -> + String[] pts = line.split(",") + map.put(pts[0], pts[1]) + } + + copy { + from zipTree(sourceJar.archivePath) + into remapped + include '**/*.java' + + filter { javaLine -> + map.entrySet().each { entry -> + javaLine = javaLine.replace(entry.getKey(), entry.getValue()) + } + return javaLine + } + + includeEmptyDirs = false + eachFile { println "Processing: $it.name" } + } + } +} diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index e00fa780f..83b150305 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -148,7 +148,7 @@ public class Core // Scrapbox if (config.ScrapboxDispenser) { - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.scrapBox, new BehaviorDispenseScrapbox()); + BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(ModItems.scrapBox, new BehaviorDispenseScrapbox()); } logHelper.info("Initialization Complete"); } diff --git a/src/main/java/techreborn/api/Reference.java b/src/main/java/techreborn/api/Reference.java index c3048970c..8b977ce0a 100644 --- a/src/main/java/techreborn/api/Reference.java +++ b/src/main/java/techreborn/api/Reference.java @@ -5,6 +5,8 @@ import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.util.text.translation.I18n; import net.minecraftforge.common.util.EnumHelper; +import net.minecraft.item.Item.ToolMaterial; +import net.minecraft.item.ItemArmor.ArmorMaterial; /** * This contains some static stuff used in recipes and other things */ diff --git a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java index 124fee173..5ca0b9190 100644 --- a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java +++ b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java @@ -39,9 +39,9 @@ public class BlockFusionControlComputer extends BlockMachineBase implements IAdv } @Override - public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, Entity entityIn) + public void onEntityWalk(World worldIn, BlockPos pos, Entity entityIn) { - super.onEntityCollidedWithBlock(worldIn, pos, entityIn); + super.onEntityWalk(worldIn, pos, entityIn); if (worldIn.getTileEntity(pos) instanceof TileEntityFusionController) { if (((TileEntityFusionController) worldIn.getTileEntity(pos)).crafingTickTime != 0 diff --git a/src/main/java/techreborn/blocks/BlockIronFence.java b/src/main/java/techreborn/blocks/BlockIronFence.java index bd0ef3f66..b9c8ae5f1 100644 --- a/src/main/java/techreborn/blocks/BlockIronFence.java +++ b/src/main/java/techreborn/blocks/BlockIronFence.java @@ -10,7 +10,7 @@ public class BlockIronFence extends BlockFence public BlockIronFence() { - super(Material.iron, BlockPlanks.EnumType.OAK.getMapColor()); + super(Material.IRON, BlockPlanks.EnumType.OAK.getMapColor()); setUnlocalizedName("techreborn.ironfence"); setCreativeTab(TechRebornCreativeTabMisc.instance); setHardness(2.0F); diff --git a/src/main/java/techreborn/blocks/BlockNuke.java b/src/main/java/techreborn/blocks/BlockNuke.java index 4dc7e7641..ff7008b3f 100644 --- a/src/main/java/techreborn/blocks/BlockNuke.java +++ b/src/main/java/techreborn/blocks/BlockNuke.java @@ -30,7 +30,7 @@ public class BlockNuke extends BaseBlock implements ITexturedBlock public BlockNuke() { - super(Material.tnt); + super(Material.TNT); setUnlocalizedName("techreborn.nuke"); setCreativeTab(TechRebornCreativeTabMisc.instance); RebornCore.jsonDestroyer.registerObject(this); diff --git a/src/main/java/techreborn/blocks/BlockOre.java b/src/main/java/techreborn/blocks/BlockOre.java index 202f955e8..d4e724460 100644 --- a/src/main/java/techreborn/blocks/BlockOre.java +++ b/src/main/java/techreborn/blocks/BlockOre.java @@ -133,7 +133,7 @@ public class BlockOre extends BaseBlock implements ITexturedBlock, IOreNameProvi { OreDrop cinnabar = new OreDrop(ItemDusts.getDustByName("cinnabar"), ConfigTechReborn.FortuneSecondaryOreMultiplierPerLevel); - OreDrop redstone = new OreDrop(new ItemStack(Items.redstone), 0.25); + OreDrop redstone = new OreDrop(new ItemStack(Items.REDSTONE), 0.25); OreDropSet set = new OreDropSet(cinnabar, redstone); return set.drop(fortune, random); } diff --git a/src/main/java/techreborn/blocks/BlockRubberLog.java b/src/main/java/techreborn/blocks/BlockRubberLog.java index e04256d87..916650e30 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLog.java +++ b/src/main/java/techreborn/blocks/BlockRubberLog.java @@ -35,7 +35,7 @@ public class BlockRubberLog extends Block implements ITexturedBlock public BlockRubberLog() { - super(Material.wood); + super(Material.WOOD); setUnlocalizedName("techreborn.rubberlog"); setCreativeTab(TechRebornCreativeTabMisc.instance); this.setHardness(2.0F); diff --git a/src/main/java/techreborn/blocks/BlockRubberPlank.java b/src/main/java/techreborn/blocks/BlockRubberPlank.java index f9795d575..89ce96e6a 100644 --- a/src/main/java/techreborn/blocks/BlockRubberPlank.java +++ b/src/main/java/techreborn/blocks/BlockRubberPlank.java @@ -16,7 +16,7 @@ public class BlockRubberPlank extends Block implements ITexturedBlock public BlockRubberPlank() { - super(Material.wood); + super(Material.WOOD); RebornCore.jsonDestroyer.registerObject(this); setUnlocalizedName("techreborn.rubberplank"); setCreativeTab(TechRebornCreativeTabMisc.instance); diff --git a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java index d160770a2..3f36a9e5a 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java +++ b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java @@ -26,7 +26,7 @@ public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock public BlockSolarPanel() { - super(Material.iron); + super(Material.IRON); setUnlocalizedName("techreborn.solarpanel"); setCreativeTab(TechRebornCreativeTab.instance); this.setDefaultState(this.getDefaultState().withProperty(ACTIVE, false)); diff --git a/src/main/java/techreborn/blocks/generator/BlockWaterMill.java b/src/main/java/techreborn/blocks/generator/BlockWaterMill.java index 62259472e..67f57dd5e 100644 --- a/src/main/java/techreborn/blocks/generator/BlockWaterMill.java +++ b/src/main/java/techreborn/blocks/generator/BlockWaterMill.java @@ -21,7 +21,7 @@ public class BlockWaterMill extends BaseTileBlock implements ITexturedBlock public BlockWaterMill() { - super(Material.iron); + super(Material.IRON); setUnlocalizedName("techreborn.watermill"); setCreativeTab(TechRebornCreativeTab.instance); setHardness(2.0F); diff --git a/src/main/java/techreborn/blocks/generator/BlockWindMill.java b/src/main/java/techreborn/blocks/generator/BlockWindMill.java index a10ce1688..371ab68e8 100644 --- a/src/main/java/techreborn/blocks/generator/BlockWindMill.java +++ b/src/main/java/techreborn/blocks/generator/BlockWindMill.java @@ -21,7 +21,7 @@ public class BlockWindMill extends BaseTileBlock implements ITexturedBlock public BlockWindMill() { - super(Material.iron); + super(Material.IRON); setUnlocalizedName("techreborn.windmill"); setCreativeTab(TechRebornCreativeTab.instance); setHardness(2.0F); diff --git a/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java b/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java index 5789aacf6..8153ce411 100644 --- a/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java @@ -45,7 +45,7 @@ public abstract class BlockEnergyStorage extends BaseTileBlock implements IRotat public BlockEnergyStorage(String name, int guiID) { - super(Material.rock); + super(Material.ROCK); setHardness(2f); setUnlocalizedName("techreborn." + name.toLowerCase()); setCreativeTab(TechRebornCreativeTab.instance); diff --git a/src/main/java/techreborn/blocks/transformers/BlockTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockTransformer.java index 225f2c10f..a009f75bf 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockTransformer.java @@ -40,7 +40,7 @@ public abstract class BlockTransformer extends BaseTileBlock implements IRotatio public BlockTransformer(String name) { - super(Material.rock); + super(Material.ROCK); setHardness(2f); setUnlocalizedName("techreborn." + name.toLowerCase()); setCreativeTab(TechRebornCreativeTab.instance); diff --git a/src/main/java/techreborn/client/StackToolTipEvent.java b/src/main/java/techreborn/client/StackToolTipEvent.java index c5f4ce119..d1c41acb8 100644 --- a/src/main/java/techreborn/client/StackToolTipEvent.java +++ b/src/main/java/techreborn/client/StackToolTipEvent.java @@ -62,7 +62,7 @@ public class StackToolTipEvent { Block block = Block.getBlockFromItem(event.getItemStack().getItem()); if (block != null && (block instanceof BlockContainer || block instanceof ITileEntityProvider) - && Block.blockRegistry.getNameForObject(block).getResourceDomain().contains("techreborn")) + && Block.REGISTRY.getNameForObject(block).getResourceDomain().contains("techreborn")) { TileEntity tile = block.createTileEntity(Minecraft.getMinecraft().theWorld, block.getDefaultState()); diff --git a/src/main/java/techreborn/client/container/ContainerAESU.java b/src/main/java/techreborn/client/container/ContainerAESU.java index f4eea3aba..60c6e54e2 100644 --- a/src/main/java/techreborn/client/container/ContainerAESU.java +++ b/src/main/java/techreborn/client/container/ContainerAESU.java @@ -41,8 +41,8 @@ public class ContainerAESU extends RebornContainer { @Override public void detectAndSendChanges() { super.detectAndSendChanges(); - for (int i = 0; i < this.crafters.size(); i++) { - ICrafting icrafting = this.crafters.get(i); + for (int i = 0; i < this.listeners.size(); i++) { + ICrafting icrafting = this.listeners.get(i); if (this.euOut != tile.getMaxOutput()) { icrafting.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput()); } diff --git a/src/main/java/techreborn/client/container/ContainerAlloyFurnace.java b/src/main/java/techreborn/client/container/ContainerAlloyFurnace.java index b1dc0dbb3..f63ce631d 100644 --- a/src/main/java/techreborn/client/container/ContainerAlloyFurnace.java +++ b/src/main/java/techreborn/client/container/ContainerAlloyFurnace.java @@ -64,9 +64,9 @@ public class ContainerAlloyFurnace extends RebornContainer @Override public void detectAndSendChanges() { - for (int i = 0; i < this.crafters.size(); i++) + for (int i = 0; i < this.listeners.size(); i++) { - ICrafting crafting = this.crafters.get(i); + ICrafting crafting = this.listeners.get(i); if (this.currentItemBurnTime != tile.currentItemBurnTime) { crafting.sendProgressBarUpdate(this, 0, tile.currentItemBurnTime); diff --git a/src/main/java/techreborn/client/container/ContainerBatbox.java b/src/main/java/techreborn/client/container/ContainerBatbox.java index d6a2ea97b..a429ea92c 100644 --- a/src/main/java/techreborn/client/container/ContainerBatbox.java +++ b/src/main/java/techreborn/client/container/ContainerBatbox.java @@ -54,9 +54,9 @@ public class ContainerBatbox extends RebornContainer public void detectAndSendChanges() { super.detectAndSendChanges(); - for (int i = 0; i < this.crafters.size(); i++) + for (int i = 0; i < this.listeners.size(); i++) { - ICrafting icrafting = this.crafters.get(i); + ICrafting icrafting = this.listeners.get(i); if (this.energy != (int) tile.getEnergy()) { icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy()); diff --git a/src/main/java/techreborn/client/container/ContainerBlastFurnace.java b/src/main/java/techreborn/client/container/ContainerBlastFurnace.java index f1fdb3e55..1fef530c7 100644 --- a/src/main/java/techreborn/client/container/ContainerBlastFurnace.java +++ b/src/main/java/techreborn/client/container/ContainerBlastFurnace.java @@ -57,9 +57,9 @@ public class ContainerBlastFurnace extends ContainerCrafting public void detectAndSendChanges() { super.detectAndSendChanges(); - for (int i = 0; i < this.crafters.size(); i++) + for (int i = 0; i < this.listeners.size(); i++) { - ICrafting icrafting = this.crafters.get(i); + ICrafting icrafting = this.listeners.get(i); if (this.heat != tile.getHeat()) { icrafting.sendProgressBarUpdate(this, 10, tile.getHeat()); diff --git a/src/main/java/techreborn/client/container/ContainerCrafting.java b/src/main/java/techreborn/client/container/ContainerCrafting.java index f1e64c413..a483c94b2 100644 --- a/src/main/java/techreborn/client/container/ContainerCrafting.java +++ b/src/main/java/techreborn/client/container/ContainerCrafting.java @@ -34,9 +34,9 @@ public abstract class ContainerCrafting extends RebornContainer public void detectAndSendChanges() { super.detectAndSendChanges(); - for (int i = 0; i < this.crafters.size(); i++) + for (int i = 0; i < this.listeners.size(); i++) { - ICrafting icrafting = this.crafters.get(i); + ICrafting icrafting = this.listeners.get(i); if (this.currentTickTime != crafter.currentTickTime || crafter.currentTickTime == -1) { icrafting.sendProgressBarUpdate(this, 0, crafter.currentTickTime); diff --git a/src/main/java/techreborn/client/container/ContainerDieselGenerator.java b/src/main/java/techreborn/client/container/ContainerDieselGenerator.java index 22250c31d..df96760ad 100644 --- a/src/main/java/techreborn/client/container/ContainerDieselGenerator.java +++ b/src/main/java/techreborn/client/container/ContainerDieselGenerator.java @@ -53,9 +53,9 @@ public class ContainerDieselGenerator extends RebornContainer public void detectAndSendChanges() { super.detectAndSendChanges(); - for (int i = 0; i < this.crafters.size(); i++) + for (int i = 0; i < this.listeners.size(); i++) { - ICrafting icrafting = this.crafters.get(i); + ICrafting icrafting = this.listeners.get(i); if (this.energy != (int) tiledieselGenerator.getEnergy()) { icrafting.sendProgressBarUpdate(this, 0, (int) tiledieselGenerator.getEnergy()); diff --git a/src/main/java/techreborn/client/container/ContainerFusionReactor.java b/src/main/java/techreborn/client/container/ContainerFusionReactor.java index 03cad02b7..43ac262b9 100644 --- a/src/main/java/techreborn/client/container/ContainerFusionReactor.java +++ b/src/main/java/techreborn/client/container/ContainerFusionReactor.java @@ -56,9 +56,9 @@ public class ContainerFusionReactor extends RebornContainer public void detectAndSendChanges() { super.detectAndSendChanges(); - for (int i = 0; i < this.crafters.size(); i++) + for (int i = 0; i < this.listeners.size(); i++) { - ICrafting icrafting = this.crafters.get(i); + ICrafting icrafting = this.listeners.get(i); if (this.coilStatus != fusionController.coilStatus) { icrafting.sendProgressBarUpdate(this, 0, fusionController.coilStatus); diff --git a/src/main/java/techreborn/client/container/ContainerGenerator.java b/src/main/java/techreborn/client/container/ContainerGenerator.java index acce27f2f..056b86842 100644 --- a/src/main/java/techreborn/client/container/ContainerGenerator.java +++ b/src/main/java/techreborn/client/container/ContainerGenerator.java @@ -57,9 +57,9 @@ public class ContainerGenerator extends RebornContainer public void detectAndSendChanges() { super.detectAndSendChanges(); - for (int i = 0; i < this.crafters.size(); i++) + for (int i = 0; i < this.listeners.size(); i++) { - ICrafting icrafting = this.crafters.get(i); + ICrafting icrafting = this.listeners.get(i); if (this.burnTime != tile.burnTime) { icrafting.sendProgressBarUpdate(this, 0, tile.burnTime); diff --git a/src/main/java/techreborn/client/container/ContainerIDSU.java b/src/main/java/techreborn/client/container/ContainerIDSU.java index cee7e9dea..a1a0f2171 100644 --- a/src/main/java/techreborn/client/container/ContainerIDSU.java +++ b/src/main/java/techreborn/client/container/ContainerIDSU.java @@ -42,8 +42,8 @@ public class ContainerIDSU extends RebornContainer { @Override public void detectAndSendChanges() { super.detectAndSendChanges(); - for (int i = 0; i < this.crafters.size(); i++) { - ICrafting icrafting = this.crafters.get(i); + for (int i = 0; i < this.listeners.size(); i++) { + ICrafting icrafting = this.listeners.get(i); if (this.euOut != tile.output) { icrafting.sendProgressBarUpdate(this, 0, tile.output); } diff --git a/src/main/java/techreborn/client/container/ContainerImplosionCompressor.java b/src/main/java/techreborn/client/container/ContainerImplosionCompressor.java index 0ed135996..7f74c5b65 100644 --- a/src/main/java/techreborn/client/container/ContainerImplosionCompressor.java +++ b/src/main/java/techreborn/client/container/ContainerImplosionCompressor.java @@ -55,9 +55,9 @@ public class ContainerImplosionCompressor extends ContainerCrafting public void detectAndSendChanges() { super.detectAndSendChanges(); - for (int i = 0; i < this.crafters.size(); i++) + for (int i = 0; i < this.listeners.size(); i++) { - ICrafting icrafting = this.crafters.get(i); + ICrafting icrafting = this.listeners.get(i); if (this.multIBlockState != getMultIBlockStateint()) { icrafting.sendProgressBarUpdate(this, 3, getMultIBlockStateint()); diff --git a/src/main/java/techreborn/client/container/ContainerIndustrialGrinder.java b/src/main/java/techreborn/client/container/ContainerIndustrialGrinder.java index e13b8501b..bd92114ed 100644 --- a/src/main/java/techreborn/client/container/ContainerIndustrialGrinder.java +++ b/src/main/java/techreborn/client/container/ContainerIndustrialGrinder.java @@ -57,9 +57,9 @@ public class ContainerIndustrialGrinder extends ContainerCrafting public void detectAndSendChanges() { super.detectAndSendChanges(); - for (int i = 0; i < this.crafters.size(); i++) + for (int i = 0; i < this.listeners.size(); i++) { - ICrafting icrafting = this.crafters.get(i); + ICrafting icrafting = this.listeners.get(i); if (this.connectionStatus != tile.connectionStatus) { icrafting.sendProgressBarUpdate(this, 10, tile.connectionStatus); diff --git a/src/main/java/techreborn/client/container/ContainerLESU.java b/src/main/java/techreborn/client/container/ContainerLESU.java index 119aae009..6a656952e 100644 --- a/src/main/java/techreborn/client/container/ContainerLESU.java +++ b/src/main/java/techreborn/client/container/ContainerLESU.java @@ -48,8 +48,8 @@ public class ContainerLESU extends RebornContainer { @Override public void detectAndSendChanges() { super.detectAndSendChanges(); - for (int i = 0; i < this.crafters.size(); i++) { - ICrafting icrafting = this.crafters.get(i); + for (int i = 0; i < this.listeners.size(); i++) { + ICrafting icrafting = this.listeners.get(i); if (this.euOut != tile.getMaxOutput()) { icrafting.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput()); } diff --git a/src/main/java/techreborn/client/container/ContainerMFE.java b/src/main/java/techreborn/client/container/ContainerMFE.java index d5332a1e0..54dd3143a 100644 --- a/src/main/java/techreborn/client/container/ContainerMFE.java +++ b/src/main/java/techreborn/client/container/ContainerMFE.java @@ -74,9 +74,9 @@ public class ContainerMFE extends RebornContainer public void detectAndSendChanges() { super.detectAndSendChanges(); - for (int i = 0; i < this.crafters.size(); i++) + for (int i = 0; i < this.listeners.size(); i++) { - ICrafting icrafting = this.crafters.get(i); + ICrafting icrafting = this.listeners.get(i); if (this.energy != (int) tile.getEnergy()) { icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy()); diff --git a/src/main/java/techreborn/client/container/ContainerMFSU.java b/src/main/java/techreborn/client/container/ContainerMFSU.java index 2f1409963..83bc0e820 100644 --- a/src/main/java/techreborn/client/container/ContainerMFSU.java +++ b/src/main/java/techreborn/client/container/ContainerMFSU.java @@ -69,9 +69,9 @@ public class ContainerMFSU extends RebornContainer public void detectAndSendChanges() { super.detectAndSendChanges(); - for (int i = 0; i < this.crafters.size(); i++) + for (int i = 0; i < this.listeners.size(); i++) { - ICrafting icrafting = this.crafters.get(i); + ICrafting icrafting = this.listeners.get(i); if (this.energy != (int) tile.getEnergy()) { icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy()); diff --git a/src/main/java/techreborn/client/container/ContainerMatterFabricator.java b/src/main/java/techreborn/client/container/ContainerMatterFabricator.java index 38100c96d..80af139c6 100644 --- a/src/main/java/techreborn/client/container/ContainerMatterFabricator.java +++ b/src/main/java/techreborn/client/container/ContainerMatterFabricator.java @@ -58,9 +58,9 @@ public class ContainerMatterFabricator extends RebornContainer public void detectAndSendChanges() { super.detectAndSendChanges(); - for (int i = 0; i < this.crafters.size(); i++) + for (int i = 0; i < this.listeners.size(); i++) { - ICrafting icrafting = this.crafters.get(i); + ICrafting icrafting = this.listeners.get(i); if (this.progressTime != tile.progresstime) { icrafting.sendProgressBarUpdate(this, 0, tile.progresstime); diff --git a/src/main/java/techreborn/client/container/ContainerRollingMachine.java b/src/main/java/techreborn/client/container/ContainerRollingMachine.java index 9d0cb4e61..52726a9ee 100644 --- a/src/main/java/techreborn/client/container/ContainerRollingMachine.java +++ b/src/main/java/techreborn/client/container/ContainerRollingMachine.java @@ -79,9 +79,9 @@ public class ContainerRollingMachine extends RebornContainer @Override public void detectAndSendChanges() { - for (int i = 0; i < this.crafters.size(); i++) + for (int i = 0; i < this.listeners.size(); i++) { - ICrafting crafting = this.crafters.get(i); + ICrafting crafting = this.listeners.get(i); if (this.currentItemBurnTime != tile.runTime) { crafting.sendProgressBarUpdate(this, 0, tile.runTime); diff --git a/src/main/java/techreborn/client/container/ContainerVacuumFreezer.java b/src/main/java/techreborn/client/container/ContainerVacuumFreezer.java index a08e3dcd4..7ed4cc46c 100644 --- a/src/main/java/techreborn/client/container/ContainerVacuumFreezer.java +++ b/src/main/java/techreborn/client/container/ContainerVacuumFreezer.java @@ -52,9 +52,9 @@ public class ContainerVacuumFreezer extends ContainerCrafting public void detectAndSendChanges() { super.detectAndSendChanges(); - for (int i = 0; i < this.crafters.size(); i++) + for (int i = 0; i < this.listeners.size(); i++) { - ICrafting icrafting = this.crafters.get(i); + ICrafting icrafting = this.listeners.get(i); if (this.machineStatus != tile.multiBlockStatus) { icrafting.sendProgressBarUpdate(this, 3, tile.multiBlockStatus); diff --git a/src/main/java/techreborn/client/render/entitys/RenderNukePrimed.java b/src/main/java/techreborn/client/render/entitys/RenderNukePrimed.java index b43423694..9bda1337e 100644 --- a/src/main/java/techreborn/client/render/entitys/RenderNukePrimed.java +++ b/src/main/java/techreborn/client/render/entitys/RenderNukePrimed.java @@ -68,6 +68,6 @@ public class RenderNukePrimed extends Render @Override protected ResourceLocation getEntityTexture(EntityNukePrimed entity) { - return TextureMap.locationBlocksTexture; + return TextureMap.LOCATION_BLOCKS_TEXTURE; } } diff --git a/src/main/java/techreborn/command/TechRebornDevCommand.java b/src/main/java/techreborn/command/TechRebornDevCommand.java index 636da44d9..7a03d0783 100644 --- a/src/main/java/techreborn/command/TechRebornDevCommand.java +++ b/src/main/java/techreborn/command/TechRebornDevCommand.java @@ -74,9 +74,9 @@ public class TechRebornDevCommand extends CommandBase { EntityPlayerMP playerMP = (EntityPlayerMP) sender; List blocksToRemove = new ArrayList<>(); - blocksToRemove.add(Blocks.grass); - blocksToRemove.add(Blocks.dirt); - blocksToRemove.add(Blocks.stone); + blocksToRemove.add(Blocks.GRASS); + blocksToRemove.add(Blocks.DIRT); + blocksToRemove.add(Blocks.STONE); for (int x = 0; x < 25; x++) { for (int z = 0; z < 25; z++) @@ -86,7 +86,7 @@ public class TechRebornDevCommand extends CommandBase BlockPos pos = new BlockPos(playerMP.posX + x, y, playerMP.posZ + z); if (blocksToRemove.contains(playerMP.worldObj.getBlockState(pos).getBlock())) { - playerMP.worldObj.setBlockState(pos, Blocks.air.getDefaultState(), 2); + playerMP.worldObj.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); } } } @@ -98,7 +98,7 @@ public class TechRebornDevCommand extends CommandBase sender.addChatMessage(new TextComponentString(GameData.getItemRegistry().getNameForObject(player.getHeldItem(EnumHand.MAIN_HAND).getItem()) + ":" + player.getHeldItem(EnumHand.MAIN_HAND).getItemDamage())); } else { Block block = Block.getBlockFromItem(player.getHeldItem(EnumHand.MAIN_HAND).getItem()); - if (block != null && block != Blocks.air) { + if (block != null && block != Blocks.AIR) { sender.addChatMessage(new TextComponentString(GameData.getBlockRegistry().getNameForObject(block) + ":" + player.getHeldItem(EnumHand.MAIN_HAND).getItemDamage())); } } diff --git a/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java index d0c6aee0c..d42304883 100644 --- a/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java +++ b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java @@ -63,8 +63,8 @@ import java.util.List; { private static void addDebugRecipes(IModRegistry registry) { - ItemStack diamondBlock = new ItemStack(Blocks.diamond_block); - ItemStack dirtBlock = new ItemStack(Blocks.dirt); + ItemStack diamondBlock = new ItemStack(Blocks.DIAMOND_BLOCK); + ItemStack dirtBlock = new ItemStack(Blocks.DIRT); List debugRecipes = new ArrayList<>(); for (int i = 0; i < 10; i++) { diff --git a/src/main/java/techreborn/events/TRTickHandler.java b/src/main/java/techreborn/events/TRTickHandler.java index bd0eb184e..93fc9d30d 100644 --- a/src/main/java/techreborn/events/TRTickHandler.java +++ b/src/main/java/techreborn/events/TRTickHandler.java @@ -24,7 +24,7 @@ public class TRTickHandler ? player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).getItem() : null; if (previouslyWearing != chestslot && previouslyWearing == ModItems.cloakingDevice && player.isInvisible() - && !player.isPotionActive(MobEffects.invisibility)) + && !player.isPotionActive(MobEffects.INVISIBILITY)) { player.setInvisible(false); } diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index d591cb2d5..b9e2113a7 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -236,35 +236,35 @@ public class ModBlocks GameRegistry.registerBlock(centrifuge, "techreborn.centrifuge"); GameRegistry.registerTileEntity(TileCentrifuge.class, "TileCentrifugeTR"); - RollingMachine = new BlockRollingMachine(Material.rock); + RollingMachine = new BlockRollingMachine(Material.ROCK); GameRegistry.registerBlock(RollingMachine, "rollingmachine"); GameRegistry.registerTileEntity(TileRollingMachine.class, "TileRollingMachineTR"); - BlastFurnace = new BlockBlastFurnace(Material.rock); + BlastFurnace = new BlockBlastFurnace(Material.ROCK); GameRegistry.registerBlock(BlastFurnace, "blastFurnace"); GameRegistry.registerTileEntity(TileBlastFurnace.class, "TileBlastFurnaceTR"); - AlloySmelter = new BlockAlloySmelter(Material.rock); + AlloySmelter = new BlockAlloySmelter(Material.ROCK); GameRegistry.registerBlock(AlloySmelter, "alloySmelter"); GameRegistry.registerTileEntity(TileAlloySmelter.class, "TileAlloySmalterTR"); - IndustrialGrinder = new BlockIndustrialGrinder(Material.rock); + IndustrialGrinder = new BlockIndustrialGrinder(Material.ROCK); GameRegistry.registerBlock(IndustrialGrinder, "grinder"); GameRegistry.registerTileEntity(TileIndustrialGrinder.class, "TileIndustrialGrinderTR"); - ImplosionCompressor = new BlockImplosionCompressor(Material.rock); + ImplosionCompressor = new BlockImplosionCompressor(Material.ROCK); GameRegistry.registerBlock(ImplosionCompressor, "implosioncompressor"); GameRegistry.registerTileEntity(TileImplosionCompressor.class, "TileImplosionCompressorTR"); - MatterFabricator = new BlockMatterFabricator(Material.rock); + MatterFabricator = new BlockMatterFabricator(Material.ROCK); GameRegistry.registerBlock(MatterFabricator, "matterfabricator"); GameRegistry.registerTileEntity(TileMatterFabricator.class, "TileMatterFabricatorTR"); - ChunkLoader = new BlockChunkLoader(Material.rock); + ChunkLoader = new BlockChunkLoader(Material.ROCK); GameRegistry.registerBlock(ChunkLoader, "chunkloader"); GameRegistry.registerTileEntity(TileChunkLoader.class, "TileChunkLoaderTR"); - chargeBench = new BlockChargeBench(Material.rock); + chargeBench = new BlockChargeBench(Material.ROCK); GameRegistry.registerBlock(chargeBench, "chargebench"); GameRegistry.registerTileEntity(TileChargeBench.class, "TileChargeBench"); @@ -272,57 +272,57 @@ public class ModBlocks GameRegistry.registerBlock(playerDetector, ItemBlockPlayerDetector.class, "playerDetector"); GameRegistry.registerTileEntity(TilePlayerDectector.class, "TilePlayerDectectorTR"); - MachineCasing = new BlockMachineCasing(Material.rock); + MachineCasing = new BlockMachineCasing(Material.ROCK); GameRegistry.registerBlock(MachineCasing, ItemBlockMachineCasing.class, "machinecasing"); GameRegistry.registerTileEntity(TileMachineCasing.class, "TileMachineCasingTR"); - ore = new BlockOre(Material.rock); + ore = new BlockOre(Material.ROCK); GameRegistry.registerBlock(ore, ItemBlockOre.class, "techreborn.ore"); - ore2 = new BlockOre2(Material.rock); + ore2 = new BlockOre2(Material.ROCK); GameRegistry.registerBlock(ore2, ItemBlockOre2.class, "techreborn.ore2"); - storage = new BlockStorage(Material.iron); + storage = new BlockStorage(Material.IRON); GameRegistry.registerBlock(storage, ItemBlockStorage.class, "techreborn.storage"); - storage2 = new BlockStorage2(Material.iron); + storage2 = new BlockStorage2(Material.IRON); GameRegistry.registerBlock(storage2, ItemBlockStorage2.class, "techreborn.storage2"); - Dragoneggenergysiphoner = new BlockDragonEggSiphoner(Material.rock); + Dragoneggenergysiphoner = new BlockDragonEggSiphoner(Material.ROCK); GameRegistry.registerBlock(Dragoneggenergysiphoner, "dragoneggenergsiphon"); GameRegistry.registerTileEntity(TileDragonEggSiphoner.class, "TileDragonEggSiphonerTR"); - Magicenergeyconverter = new BlockMagicEnergyConverter(Material.rock); + Magicenergeyconverter = new BlockMagicEnergyConverter(Material.ROCK); GameRegistry.registerBlock(Magicenergeyconverter, "magicenergyconverter"); - AssemblyMachine = new BlockAssemblingMachine(Material.rock); + AssemblyMachine = new BlockAssemblingMachine(Material.ROCK); GameRegistry.registerBlock(AssemblyMachine, "assemblymachine"); GameRegistry.registerTileEntity(TileAssemblingMachine.class, "TileAssemblyMachineTR"); - DieselGenerator = new BlockDieselGenerator(Material.rock); + DieselGenerator = new BlockDieselGenerator(Material.ROCK); GameRegistry.registerBlock(DieselGenerator, "dieselgenerator"); GameRegistry.registerTileEntity(TileDieselGenerator.class, "TileDieselGeneratorTR"); - IndustrialElectrolyzer = new BlockIndustrialElectrolyzer(Material.rock); + IndustrialElectrolyzer = new BlockIndustrialElectrolyzer(Material.ROCK); GameRegistry.registerBlock(IndustrialElectrolyzer, "industrialelectrolyzer"); GameRegistry.registerTileEntity(TileIndustrialElectrolyzer.class, "TileIndustrialElectrolyzerTR"); - MagicalAbsorber = new BlockMagicEnergyAbsorber(Material.rock); + MagicalAbsorber = new BlockMagicEnergyAbsorber(Material.ROCK); GameRegistry.registerBlock(MagicalAbsorber, "magicrnergyabsorber"); - Semifluidgenerator = new BlockSemiFluidGenerator(Material.rock); + Semifluidgenerator = new BlockSemiFluidGenerator(Material.ROCK); GameRegistry.registerBlock(Semifluidgenerator, "semifluidgenerator"); GameRegistry.registerTileEntity(TileSemifluidGenerator.class, "TileSemifluidGeneratorTR"); - Gasturbine = new BlockGasTurbine(Material.rock); + Gasturbine = new BlockGasTurbine(Material.ROCK); GameRegistry.registerBlock(Gasturbine, "gasturbine"); GameRegistry.registerTileEntity(TileGasTurbine.class, "TileGassTurbineTR"); - AlloyFurnace = new BlockAlloyFurnace(Material.rock); + AlloyFurnace = new BlockAlloyFurnace(Material.ROCK); GameRegistry.registerBlock(AlloyFurnace, "alloyfurnace"); GameRegistry.registerTileEntity(TileAlloyFurnace.class, "TileAlloyFurnaceTR"); - ChemicalReactor = new BlockChemicalReactor(Material.rock); + ChemicalReactor = new BlockChemicalReactor(Material.ROCK); GameRegistry.registerBlock(ChemicalReactor, "chemicalreactor"); GameRegistry.registerTileEntity(TileChemicalReactor.class, "TileChemicalReactorTR"); @@ -338,51 +338,51 @@ public class ModBlocks GameRegistry.registerBlock(Lesu, "lesu"); GameRegistry.registerTileEntity(TileLesu.class, "TileLesuTR"); - Supercondensator = new BlockSupercondensator(Material.rock); + Supercondensator = new BlockSupercondensator(Material.ROCK); GameRegistry.registerBlock(Supercondensator, "supercondensator"); - LesuStorage = new BlockLESUStorage(Material.rock); + LesuStorage = new BlockLESUStorage(Material.ROCK); GameRegistry.registerBlock(LesuStorage, "lesustorage"); GameRegistry.registerTileEntity(TileLesuStorage.class, "TileLesuStorageTR"); - Distillationtower = new BlockDistillationTower(Material.rock); + Distillationtower = new BlockDistillationTower(Material.ROCK); GameRegistry.registerBlock(Distillationtower, "distillationtower"); - ElectricCraftingTable = new BlockElectricCraftingTable(Material.rock); + ElectricCraftingTable = new BlockElectricCraftingTable(Material.ROCK); GameRegistry.registerBlock(ElectricCraftingTable, "electriccraftingtable"); - VacuumFreezer = new BlockVacuumFreezer(Material.rock); + VacuumFreezer = new BlockVacuumFreezer(Material.ROCK); GameRegistry.registerBlock(VacuumFreezer, "vacuumfreezer"); GameRegistry.registerTileEntity(TileVacuumFreezer.class, "TileVacuumFreezerTR"); - PlasmaGenerator = new BlockPlasmaGenerator(Material.rock); + PlasmaGenerator = new BlockPlasmaGenerator(Material.ROCK); GameRegistry.registerBlock(PlasmaGenerator, "plasmagenerator"); - ComputerCube = new BlockComputerCube(Material.rock); + ComputerCube = new BlockComputerCube(Material.ROCK); GameRegistry.registerBlock(ComputerCube, "computercube"); - FusionControlComputer = new BlockFusionControlComputer(Material.rock); + FusionControlComputer = new BlockFusionControlComputer(Material.ROCK); GameRegistry.registerBlock(FusionControlComputer, "fusioncontrolcomputer"); GameRegistry.registerTileEntity(TileEntityFusionController.class, "TileEntityFustionControllerTR"); - FusionCoil = new BlockFusionCoil(Material.rock); + FusionCoil = new BlockFusionCoil(Material.ROCK); GameRegistry.registerBlock(FusionCoil, "fusioncoil"); - LightningRod = new BlockLightningRod(Material.rock); + LightningRod = new BlockLightningRod(Material.ROCK); GameRegistry.registerBlock(LightningRod, "lightningrod"); - heatGenerator = new BlockHeatGenerator(Material.rock); + heatGenerator = new BlockHeatGenerator(Material.ROCK); GameRegistry.registerBlock(heatGenerator, "heatgenerator"); GameRegistry.registerTileEntity(TileHeatGenerator.class, "TileHeatGeneratorTR"); - industrialSawmill = new BlockIndustrialSawmill(Material.rock); + industrialSawmill = new BlockIndustrialSawmill(Material.ROCK); GameRegistry.registerBlock(industrialSawmill, "industrialSawmill"); GameRegistry.registerTileEntity(TileIndustrialSawmill.class, "TileIndustrialSawmillTR"); - machineframe = new BlockMachineFrame(Material.iron); + machineframe = new BlockMachineFrame(Material.IRON); GameRegistry.registerBlock(machineframe, ItemBlockMachineFrame.class, "techreborn.machineFrame"); - Grinder = new BlockGrinder(Material.iron); + Grinder = new BlockGrinder(Material.IRON); GameRegistry.registerBlock(Grinder, "techreborn.grinder"); GameRegistry.registerTileEntity(TileGrinder.class, "TileGrinderTR"); @@ -390,15 +390,15 @@ public class ModBlocks GameRegistry.registerBlock(Generator, "techreborn.generator"); GameRegistry.registerTileEntity(TileGenerator.class, "TileGeneratorTR"); - Extractor = new BlockExtractor(Material.iron); + Extractor = new BlockExtractor(Material.IRON); GameRegistry.registerBlock(Extractor, "techreborn.extractor"); GameRegistry.registerTileEntity(TileExtractor.class, "TileExtractorTR"); - Compressor = new BlockCompressor(Material.iron); + Compressor = new BlockCompressor(Material.IRON); GameRegistry.registerBlock(Compressor, "techreborn.compressor"); GameRegistry.registerTileEntity(TileCompressor.class, "TileCompressorTR"); - ElectricFurnace = new BlockElectricFurnace(Material.iron); + ElectricFurnace = new BlockElectricFurnace(Material.IRON); GameRegistry.registerBlock(ElectricFurnace, "techreborn.electricfurnace"); GameRegistry.registerTileEntity(TileElectricFurnace.class, "TileElectricFurnaceTR"); @@ -431,10 +431,10 @@ public class ModBlocks ironFence = new BlockIronFence(); GameRegistry.registerBlock(ironFence, "ironFence"); - reinforcedglass = new BlockReinforcedGlass(Material.glass); + reinforcedglass = new BlockReinforcedGlass(Material.GLASS); GameRegistry.registerBlock(reinforcedglass, "reinforcedglass"); - recycler = new BlockRecycler(Material.iron); + recycler = new BlockRecycler(Material.IRON); GameRegistry.registerBlock(recycler, "recycler"); GameRegistry.registerTileEntity(TileRecycler.class, "TileRecyclerTR"); @@ -469,7 +469,7 @@ public class ModBlocks nuke = new BlockNuke(); GameRegistry.registerBlock(nuke, "nuke"); - scrapboxinator = new BlockScrapboxinator(Material.iron); + scrapboxinator = new BlockScrapboxinator(Material.IRON); GameRegistry.registerBlock(scrapboxinator, "scrapboxinator"); GameRegistry.registerTileEntity(TileScrapboxinator.class, "TileScrapboxinatorTR"); @@ -526,9 +526,9 @@ public class ModBlocks OreDictionary.registerOre("blockYellowGarnet", new ItemStack(storage2, 1, 8)); OreDictionary.registerOre("blockRedGarnet", new ItemStack(storage2, 1, 9)); - OreDictionary.registerOre("craftingPiston", Blocks.piston); - OreDictionary.registerOre("craftingPiston", Blocks.sticky_piston); - OreDictionary.registerOre("crafterWood", Blocks.crafting_table); + OreDictionary.registerOre("craftingPiston", Blocks.PISTON); + OreDictionary.registerOre("craftingPiston", Blocks.STICKY_PISTON); + OreDictionary.registerOre("crafterWood", Blocks.CRAFTING_TABLE); OreDictionary.registerOre("machineBasic", new ItemStack(machineframe, 1)); OreDictionary.registerOre("treeSapling", rubberSapling); diff --git a/src/main/java/techreborn/init/ModFluids.java b/src/main/java/techreborn/init/ModFluids.java index 2d98a18b0..38d64df8d 100644 --- a/src/main/java/techreborn/init/ModFluids.java +++ b/src/main/java/techreborn/init/ModFluids.java @@ -85,86 +85,86 @@ public class ModFluids public static void init() { FluidRegistry.registerFluid(fluidberylium); - BlockFluidBerylium = new BlockFluidTechReborn(fluidberylium, Material.water, "techreborn.berylium"); + BlockFluidBerylium = new BlockFluidTechReborn(fluidberylium, Material.WATER, "techreborn.berylium"); GameRegistry.registerBlock(BlockFluidBerylium, ModInfo.MOD_ID + "_" + BlockFluidBerylium.getUnlocalizedName().substring(5)); fluidberylium.setUnlocalizedName(BlockFluidBerylium.getUnlocalizedName()); FluidRegistry.registerFluid(fluidcalcium); - BlockFluidCalcium = new BlockFluidTechReborn(fluidcalcium, Material.water, "techreborn.calcium"); + BlockFluidCalcium = new BlockFluidTechReborn(fluidcalcium, Material.WATER, "techreborn.calcium"); GameRegistry.registerBlock(BlockFluidCalcium, ModInfo.MOD_ID + "_" + BlockFluidCalcium.getUnlocalizedName().substring(5)); fluidcalcium.setUnlocalizedName(BlockFluidCalcium.getUnlocalizedName()); FluidRegistry.registerFluid(fluidcalciumcarbonate); - BlockFluidCalciumCarbonate = new BlockFluidTechReborn(fluidcalciumcarbonate, Material.water, + BlockFluidCalciumCarbonate = new BlockFluidTechReborn(fluidcalciumcarbonate, Material.WATER, "techreborn.calciumcarbonate"); GameRegistry.registerBlock(BlockFluidCalciumCarbonate, ModInfo.MOD_ID + "_" + BlockFluidCalciumCarbonate.getUnlocalizedName().substring(5)); fluidcalcium.setUnlocalizedName(BlockFluidCalciumCarbonate.getUnlocalizedName()); FluidRegistry.registerFluid(fluidChlorite); - BlockFluidChlorite = new BlockFluidTechReborn(fluidChlorite, Material.water, "techreborn.chlorite"); + BlockFluidChlorite = new BlockFluidTechReborn(fluidChlorite, Material.WATER, "techreborn.chlorite"); GameRegistry.registerBlock(BlockFluidChlorite, ModInfo.MOD_ID + "_" + BlockFluidChlorite.getUnlocalizedName().substring(5)); fluidChlorite.setUnlocalizedName(BlockFluidChlorite.getUnlocalizedName()); FluidRegistry.registerFluid(fluidDeuterium); - BlockFluidDeuterium = new BlockFluidTechReborn(fluidDeuterium, Material.water, "techreborn.deuterium"); + BlockFluidDeuterium = new BlockFluidTechReborn(fluidDeuterium, Material.WATER, "techreborn.deuterium"); GameRegistry.registerBlock(BlockFluidDeuterium, ModInfo.MOD_ID + "_" + BlockFluidDeuterium.getUnlocalizedName().substring(5)); fluidDeuterium.setUnlocalizedName(BlockFluidDeuterium.getUnlocalizedName()); FluidRegistry.registerFluid(fluidGlyceryl); - BlockFluidGlyceryl = new BlockFluidTechReborn(fluidGlyceryl, Material.water, "techreborn.glyceryl"); + BlockFluidGlyceryl = new BlockFluidTechReborn(fluidGlyceryl, Material.WATER, "techreborn.glyceryl"); GameRegistry.registerBlock(BlockFluidGlyceryl, ModInfo.MOD_ID + "_" + BlockFluidGlyceryl.getUnlocalizedName().substring(5)); fluidGlyceryl.setUnlocalizedName(BlockFluidGlyceryl.getUnlocalizedName()); FluidRegistry.registerFluid(fluidHelium); - BlockFluidHelium = new BlockFluidTechReborn(fluidHelium, Material.water, "techreborn.helium"); + BlockFluidHelium = new BlockFluidTechReborn(fluidHelium, Material.WATER, "techreborn.helium"); GameRegistry.registerBlock(BlockFluidHelium, ModInfo.MOD_ID + "_" + BlockFluidHelium.getUnlocalizedName().substring(5)); fluidHelium.setUnlocalizedName(BlockFluidHelium.getUnlocalizedName()); FluidRegistry.registerFluid(fluidHelium3); - BlockFluidHelium3 = new BlockFluidTechReborn(fluidHelium3, Material.water, "techreborn.helium3"); + BlockFluidHelium3 = new BlockFluidTechReborn(fluidHelium3, Material.WATER, "techreborn.helium3"); GameRegistry.registerBlock(BlockFluidHelium3, ModInfo.MOD_ID + "_" + BlockFluidHelium3.getUnlocalizedName().substring(5)); fluidHelium3.setUnlocalizedName(BlockFluidHelium3.getUnlocalizedName()); FluidRegistry.registerFluid(fluidHeliumplasma); - BlockFluidHeliumplasma = new BlockFluidTechReborn(fluidHeliumplasma, Material.water, "techreborn.heliumplasma"); + BlockFluidHeliumplasma = new BlockFluidTechReborn(fluidHeliumplasma, Material.WATER, "techreborn.heliumplasma"); GameRegistry.registerBlock(BlockFluidHeliumplasma, ModInfo.MOD_ID + "_" + BlockFluidHeliumplasma.getUnlocalizedName().substring(5)); fluidHeliumplasma.setUnlocalizedName(fluidHeliumplasma.getUnlocalizedName()); FluidRegistry.registerFluid(fluidHydrogen); - BlockFluidHydrogen = new BlockFluidTechReborn(fluidHydrogen, Material.water, "techreborn.hydrogen"); + BlockFluidHydrogen = new BlockFluidTechReborn(fluidHydrogen, Material.WATER, "techreborn.hydrogen"); GameRegistry.registerBlock(BlockFluidHydrogen, ModInfo.MOD_ID + "_" + BlockFluidHydrogen.getUnlocalizedName().substring(5)); fluidHydrogen.setUnlocalizedName(fluidHydrogen.getUnlocalizedName()); FluidRegistry.registerFluid(fluidLithium); - BlockFluidLithium = new BlockFluidTechReborn(fluidLithium, Material.water, "techreborn.lithium"); + BlockFluidLithium = new BlockFluidTechReborn(fluidLithium, Material.WATER, "techreborn.lithium"); GameRegistry.registerBlock(BlockFluidLithium, ModInfo.MOD_ID + "_" + BlockFluidLithium.getUnlocalizedName().substring(5)); fluidLithium.setUnlocalizedName(fluidLithium.getUnlocalizedName()); FluidRegistry.registerFluid(fluidMercury); - BlockFluidMercury = new BlockFluidTechReborn(fluidMercury, Material.water, "techreborn.mercury"); + BlockFluidMercury = new BlockFluidTechReborn(fluidMercury, Material.WATER, "techreborn.mercury"); GameRegistry.registerBlock(BlockFluidMercury, ModInfo.MOD_ID + "_" + BlockFluidMercury.getUnlocalizedName().substring(5)); fluidMercury.setUnlocalizedName(fluidMercury.getUnlocalizedName()); FluidRegistry.registerFluid(fluidMethane); - BlockFluidMethane = new BlockFluidTechReborn(fluidMethane, Material.water, "techreborn.methane"); + BlockFluidMethane = new BlockFluidTechReborn(fluidMethane, Material.WATER, "techreborn.methane"); GameRegistry.registerBlock(BlockFluidMethane, ModInfo.MOD_ID + "_" + BlockFluidMethane.getUnlocalizedName().substring(5)); fluidMethane.setUnlocalizedName(fluidMethane.getUnlocalizedName()); FluidRegistry.registerFluid(fluidNitrocoalfuel); - BlockFluidNitrocoalfuel = new BlockFluidTechReborn(fluidNitrocoalfuel, Material.water, + BlockFluidNitrocoalfuel = new BlockFluidTechReborn(fluidNitrocoalfuel, Material.WATER, "techreborn.nitrocoalfuel"); GameRegistry.registerBlock(BlockFluidNitrocoalfuel, ModInfo.MOD_ID + "_" + BlockFluidNitrocoalfuel.getUnlocalizedName().substring(5)); @@ -172,57 +172,57 @@ public class ModFluids FluidPowerManager.fluidPowerValues.put(fluidNitrocoalfuel, 48.0); FluidRegistry.registerFluid(fluidNitrofuel); - BlockFluidNitrofuel = new BlockFluidTechReborn(fluidNitrofuel, Material.water, "techreborn.nitrofuel"); + BlockFluidNitrofuel = new BlockFluidTechReborn(fluidNitrofuel, Material.WATER, "techreborn.nitrofuel"); GameRegistry.registerBlock(BlockFluidNitrofuel, ModInfo.MOD_ID + "_" + BlockFluidNitrofuel.getUnlocalizedName().substring(5)); fluidNitrofuel.setUnlocalizedName(fluidNitrofuel.getUnlocalizedName()); FluidRegistry.registerFluid(fluidNitrogen); - BlockFluidNitrogen = new BlockFluidTechReborn(fluidNitrogen, Material.water, "techreborn.nitrogen"); + BlockFluidNitrogen = new BlockFluidTechReborn(fluidNitrogen, Material.WATER, "techreborn.nitrogen"); GameRegistry.registerBlock(BlockFluidNitrogen, ModInfo.MOD_ID + "_" + BlockFluidNitrogen.getUnlocalizedName().substring(5)); fluidNitrogen.setUnlocalizedName(fluidNitrogen.getUnlocalizedName()); FluidRegistry.registerFluid(fluidNitrogendioxide); - BlockFluidNitrogendioxide = new BlockFluidTechReborn(fluidNitrogendioxide, Material.water, + BlockFluidNitrogendioxide = new BlockFluidTechReborn(fluidNitrogendioxide, Material.WATER, "techreborn.nitrogendioxide"); GameRegistry.registerBlock(BlockFluidNitrogendioxide, ModInfo.MOD_ID + "_" + BlockFluidNitrogendioxide.getUnlocalizedName().substring(5)); fluidNitrogendioxide.setUnlocalizedName(fluidNitrogendioxide.getUnlocalizedName()); FluidRegistry.registerFluid(fluidPotassium); - BlockFluidPotassium = new BlockFluidTechReborn(fluidPotassium, Material.water, "techreborn.potassium"); + BlockFluidPotassium = new BlockFluidTechReborn(fluidPotassium, Material.WATER, "techreborn.potassium"); GameRegistry.registerBlock(BlockFluidPotassium, ModInfo.MOD_ID + "_" + BlockFluidPotassium.getUnlocalizedName().substring(5)); fluidPotassium.setUnlocalizedName(fluidPotassium.getUnlocalizedName()); FluidRegistry.registerFluid(fluidSilicon); - BlockFluidSilicon = new BlockFluidTechReborn(fluidSilicon, Material.water, "techreborn.silicon"); + BlockFluidSilicon = new BlockFluidTechReborn(fluidSilicon, Material.WATER, "techreborn.silicon"); GameRegistry.registerBlock(BlockFluidSilicon, ModInfo.MOD_ID + "_" + BlockFluidSilicon.getUnlocalizedName().substring(5)); fluidSilicon.setUnlocalizedName(fluidSilicon.getUnlocalizedName()); FluidRegistry.registerFluid(fluidSodium); - BlockFluidSodium = new BlockFluidTechReborn(fluidSodium, Material.water, "techreborn.sodium"); + BlockFluidSodium = new BlockFluidTechReborn(fluidSodium, Material.WATER, "techreborn.sodium"); GameRegistry.registerBlock(BlockFluidSodium, ModInfo.MOD_ID + "_" + BlockFluidSodium.getUnlocalizedName().substring(5)); fluidSodium.setUnlocalizedName(fluidSodium.getUnlocalizedName()); FluidRegistry.registerFluid(fluidSodiumpersulfate); - BlockFluidSodiumpersulfate = new BlockFluidTechReborn(fluidSodiumpersulfate, Material.water, + BlockFluidSodiumpersulfate = new BlockFluidTechReborn(fluidSodiumpersulfate, Material.WATER, "techreborn.sodiumpersulfate"); GameRegistry.registerBlock(BlockFluidSodiumpersulfate, ModInfo.MOD_ID + "_" + BlockFluidSodiumpersulfate.getUnlocalizedName().substring(5)); fluidSodiumpersulfate.setUnlocalizedName(fluidSodiumpersulfate.getUnlocalizedName()); FluidRegistry.registerFluid(fluidTritium); - BlockFluidTritium = new BlockFluidTechReborn(fluidTritium, Material.water, "techreborn.tritium"); + BlockFluidTritium = new BlockFluidTechReborn(fluidTritium, Material.WATER, "techreborn.tritium"); GameRegistry.registerBlock(BlockFluidTritium, ModInfo.MOD_ID + "_" + BlockFluidTritium.getUnlocalizedName().substring(5)); fluidTritium.setUnlocalizedName(fluidTritium.getUnlocalizedName()); FluidRegistry.registerFluid(fluidWolframium); - BlockFluidWolframium = new BlockFluidTechReborn(fluidWolframium, Material.water, "techreborn.wolframium"); + BlockFluidWolframium = new BlockFluidTechReborn(fluidWolframium, Material.WATER, "techreborn.wolframium"); GameRegistry.registerBlock(BlockFluidWolframium, ModInfo.MOD_ID + "_" + BlockFluidWolframium.getUnlocalizedName().substring(5)); fluidWolframium.setUnlocalizedName(fluidWolframium.getUnlocalizedName()); diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index fa23d6f32..30dab2785 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -331,190 +331,190 @@ public class ModItems // buckets bucketBerylium = new ItemFluidbucket(ModFluids.BlockFluidBerylium); - bucketBerylium.setUnlocalizedName("bucketberylium").setContainerItem(Items.bucket); + bucketBerylium.setUnlocalizedName("bucketberylium").setContainerItem(Items.BUCKET); GameRegistry.registerItem(bucketBerylium, "bucketberylium"); FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidberylium", FluidContainerRegistry.BUCKET_VOLUME), - new ItemStack(bucketBerylium), new ItemStack(Items.bucket)); + new ItemStack(bucketBerylium), new ItemStack(Items.BUCKET)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidBerylium.getFluid(), bucketBerylium); bucketcalcium = new ItemFluidbucket(ModFluids.BlockFluidCalcium); - bucketcalcium.setUnlocalizedName("bucketcalcium").setContainerItem(Items.bucket); + bucketcalcium.setUnlocalizedName("bucketcalcium").setContainerItem(Items.BUCKET); GameRegistry.registerItem(bucketcalcium, "bucketcalcium"); FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidcalcium", FluidContainerRegistry.BUCKET_VOLUME), - new ItemStack(bucketcalcium), new ItemStack(Items.bucket)); + new ItemStack(bucketcalcium), new ItemStack(Items.BUCKET)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidCalcium.getFluid(), bucketcalcium); bucketcalciumcarbonate = new ItemFluidbucket(ModFluids.BlockFluidCalciumCarbonate); - bucketcalciumcarbonate.setUnlocalizedName("bucketcalciumcarbonate").setContainerItem(Items.bucket); + bucketcalciumcarbonate.setUnlocalizedName("bucketcalciumcarbonate").setContainerItem(Items.BUCKET); GameRegistry.registerItem(bucketcalciumcarbonate, "bucketcalciumcarbonate"); FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidcalciumcarbonate", FluidContainerRegistry.BUCKET_VOLUME), - new ItemStack(bucketcalciumcarbonate), new ItemStack(Items.bucket)); + new ItemStack(bucketcalciumcarbonate), new ItemStack(Items.BUCKET)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidCalciumCarbonate.getFluid(), bucketcalciumcarbonate); bucketChlorite = new ItemFluidbucket(ModFluids.BlockFluidChlorite); - bucketChlorite.setUnlocalizedName("bucketchlorite").setContainerItem(Items.bucket); + bucketChlorite.setUnlocalizedName("bucketchlorite").setContainerItem(Items.BUCKET); GameRegistry.registerItem(bucketChlorite, "bucketcalchlorite"); FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidchlorite", FluidContainerRegistry.BUCKET_VOLUME), - new ItemStack(bucketcalciumcarbonate), new ItemStack(Items.bucket)); + new ItemStack(bucketcalciumcarbonate), new ItemStack(Items.BUCKET)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidChlorite.getFluid(), bucketChlorite); bucketDeuterium = new ItemFluidbucket(ModFluids.BlockFluidDeuterium); - bucketDeuterium.setUnlocalizedName("bucketdeuterium").setContainerItem(Items.bucket); + bucketDeuterium.setUnlocalizedName("bucketdeuterium").setContainerItem(Items.BUCKET); GameRegistry.registerItem(bucketDeuterium, "bucketdeuterium"); FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluiddeuterium", FluidContainerRegistry.BUCKET_VOLUME), - new ItemStack(bucketDeuterium), new ItemStack(Items.bucket)); + new ItemStack(bucketDeuterium), new ItemStack(Items.BUCKET)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidDeuterium.getFluid(), bucketDeuterium); bucketGlyceryl = new ItemFluidbucket(ModFluids.BlockFluidGlyceryl); - bucketGlyceryl.setUnlocalizedName("bucketglyceryl").setContainerItem(Items.bucket); + bucketGlyceryl.setUnlocalizedName("bucketglyceryl").setContainerItem(Items.BUCKET); GameRegistry.registerItem(bucketGlyceryl, "bucketglyceryl"); FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidglyceryl", FluidContainerRegistry.BUCKET_VOLUME), - new ItemStack(bucketGlyceryl), new ItemStack(Items.bucket)); + new ItemStack(bucketGlyceryl), new ItemStack(Items.BUCKET)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidGlyceryl.getFluid(), bucketGlyceryl); bucketHelium = new ItemFluidbucket(ModFluids.BlockFluidHelium); - bucketHelium.setUnlocalizedName("buckethelium").setContainerItem(Items.bucket); + bucketHelium.setUnlocalizedName("buckethelium").setContainerItem(Items.BUCKET); GameRegistry.registerItem(bucketHelium, "buckethelium"); FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidhelium", FluidContainerRegistry.BUCKET_VOLUME), - new ItemStack(bucketHelium), new ItemStack(Items.bucket)); + new ItemStack(bucketHelium), new ItemStack(Items.BUCKET)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHelium.getFluid(), bucketHelium); bucketHelium3 = new ItemFluidbucket(ModFluids.BlockFluidHelium3); - bucketHelium3.setUnlocalizedName("buckethelium3").setContainerItem(Items.bucket); + bucketHelium3.setUnlocalizedName("buckethelium3").setContainerItem(Items.BUCKET); GameRegistry.registerItem(bucketHelium3, "buckethelium3"); FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidhelium3", FluidContainerRegistry.BUCKET_VOLUME), - new ItemStack(bucketHelium3), new ItemStack(Items.bucket)); + new ItemStack(bucketHelium3), new ItemStack(Items.BUCKET)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHelium3.getFluid(), bucketHelium3); bucketHeliumplasma = new ItemFluidbucket(ModFluids.BlockFluidHeliumplasma); - bucketHeliumplasma.setUnlocalizedName("bucketheliumplasma").setContainerItem(Items.bucket); + bucketHeliumplasma.setUnlocalizedName("bucketheliumplasma").setContainerItem(Items.BUCKET); GameRegistry.registerItem(bucketHeliumplasma, "bucketheliumplasma"); FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidheliumplasma", FluidContainerRegistry.BUCKET_VOLUME), - new ItemStack(bucketHeliumplasma), new ItemStack(Items.bucket)); + new ItemStack(bucketHeliumplasma), new ItemStack(Items.BUCKET)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHeliumplasma.getFluid(), bucketHeliumplasma); bucketHydrogen = new ItemFluidbucket(ModFluids.BlockFluidHydrogen); - bucketHydrogen.setUnlocalizedName("buckethydrogen").setContainerItem(Items.bucket); + bucketHydrogen.setUnlocalizedName("buckethydrogen").setContainerItem(Items.BUCKET); GameRegistry.registerItem(bucketHydrogen, "buckethydrogen"); FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidhydrogen", FluidContainerRegistry.BUCKET_VOLUME), - new ItemStack(bucketHydrogen), new ItemStack(Items.bucket)); + new ItemStack(bucketHydrogen), new ItemStack(Items.BUCKET)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHydrogen.getFluid(), bucketHydrogen); bucketLithium = new ItemFluidbucket(ModFluids.BlockFluidLithium); - bucketLithium.setUnlocalizedName("bucketlithium").setContainerItem(Items.bucket); + bucketLithium.setUnlocalizedName("bucketlithium").setContainerItem(Items.BUCKET); GameRegistry.registerItem(bucketLithium, "bucketlithium"); FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidlithium", FluidContainerRegistry.BUCKET_VOLUME), - new ItemStack(bucketLithium), new ItemStack(Items.bucket)); + new ItemStack(bucketLithium), new ItemStack(Items.BUCKET)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidLithium.getFluid(), bucketLithium); bucketMercury = new ItemFluidbucket(ModFluids.BlockFluidMercury); - bucketMercury.setUnlocalizedName("bucketmercury").setContainerItem(Items.bucket); + bucketMercury.setUnlocalizedName("bucketmercury").setContainerItem(Items.BUCKET); GameRegistry.registerItem(bucketMercury, "bucketmercury"); FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidmercury", FluidContainerRegistry.BUCKET_VOLUME), - new ItemStack(bucketMercury), new ItemStack(Items.bucket)); + new ItemStack(bucketMercury), new ItemStack(Items.BUCKET)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidMercury.getFluid(), bucketMercury); bucketMethane = new ItemFluidbucket(ModFluids.BlockFluidMethane); - bucketMethane.setUnlocalizedName("bucketmethane").setContainerItem(Items.bucket); + bucketMethane.setUnlocalizedName("bucketmethane").setContainerItem(Items.BUCKET); GameRegistry.registerItem(bucketMethane, "bucketmethane"); FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidmethane", FluidContainerRegistry.BUCKET_VOLUME), - new ItemStack(bucketMethane), new ItemStack(Items.bucket)); + new ItemStack(bucketMethane), new ItemStack(Items.BUCKET)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidMethane.getFluid(), bucketMethane); bucketNitrocoalfuel = new ItemFluidbucket(ModFluids.BlockFluidNitrocoalfuel); - bucketNitrocoalfuel.setUnlocalizedName("bucketnitrocoalfuel").setContainerItem(Items.bucket); + bucketNitrocoalfuel.setUnlocalizedName("bucketnitrocoalfuel").setContainerItem(Items.BUCKET); GameRegistry.registerItem(bucketNitrocoalfuel, "bucketnitrocoalfuel"); FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidnitrocoalfuel", FluidContainerRegistry.BUCKET_VOLUME), - new ItemStack(bucketNitrocoalfuel), new ItemStack(Items.bucket)); + new ItemStack(bucketNitrocoalfuel), new ItemStack(Items.BUCKET)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrocoalfuel.getFluid(), bucketNitrocoalfuel); bucketNitrofuel = new ItemFluidbucket(ModFluids.BlockFluidNitrofuel); - bucketNitrofuel.setUnlocalizedName("bucketnitrofuel").setContainerItem(Items.bucket); + bucketNitrofuel.setUnlocalizedName("bucketnitrofuel").setContainerItem(Items.BUCKET); GameRegistry.registerItem(bucketNitrofuel, "bucketnitrofuel"); FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidnitrofuel", FluidContainerRegistry.BUCKET_VOLUME), - new ItemStack(bucketNitrofuel), new ItemStack(Items.bucket)); + new ItemStack(bucketNitrofuel), new ItemStack(Items.BUCKET)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrofuel.getFluid(), bucketNitrofuel); bucketNitrogen = new ItemFluidbucket(ModFluids.BlockFluidNitrogen); - bucketNitrogen.setUnlocalizedName("bucketnitrogen").setContainerItem(Items.bucket); + bucketNitrogen.setUnlocalizedName("bucketnitrogen").setContainerItem(Items.BUCKET); GameRegistry.registerItem(bucketNitrogen, "bucketnitrogen"); FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidnitrogen", FluidContainerRegistry.BUCKET_VOLUME), - new ItemStack(bucketNitrogen), new ItemStack(Items.bucket)); + new ItemStack(bucketNitrogen), new ItemStack(Items.BUCKET)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrogen.getFluid(), bucketNitrogen); bucketNitrogendioxide = new ItemFluidbucket(ModFluids.BlockFluidNitrogendioxide); - bucketNitrogendioxide.setUnlocalizedName("bucketnitrogendioxide").setContainerItem(Items.bucket); + bucketNitrogendioxide.setUnlocalizedName("bucketnitrogendioxide").setContainerItem(Items.BUCKET); GameRegistry.registerItem(bucketNitrogendioxide, "bucketnitrogendioxide"); FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidnitrogendioxide", FluidContainerRegistry.BUCKET_VOLUME), - new ItemStack(bucketNitrogendioxide), new ItemStack(Items.bucket)); + new ItemStack(bucketNitrogendioxide), new ItemStack(Items.BUCKET)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrogendioxide.getFluid(), bucketNitrogendioxide); bucketPotassium = new ItemFluidbucket(ModFluids.BlockFluidPotassium); - bucketPotassium.setUnlocalizedName("bucketpotassium").setContainerItem(Items.bucket); + bucketPotassium.setUnlocalizedName("bucketpotassium").setContainerItem(Items.BUCKET); GameRegistry.registerItem(bucketPotassium, "bucketpotassium"); FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidpotassium", FluidContainerRegistry.BUCKET_VOLUME), - new ItemStack(bucketPotassium), new ItemStack(Items.bucket)); + new ItemStack(bucketPotassium), new ItemStack(Items.BUCKET)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidPotassium.getFluid(), bucketPotassium); bucketSilicon = new ItemFluidbucket(ModFluids.BlockFluidSilicon); - bucketSilicon.setUnlocalizedName("bucketsilicon").setContainerItem(Items.bucket); + bucketSilicon.setUnlocalizedName("bucketsilicon").setContainerItem(Items.BUCKET); GameRegistry.registerItem(bucketSilicon, "bucketsilicon"); FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidsilicon", FluidContainerRegistry.BUCKET_VOLUME), - new ItemStack(bucketSilicon), new ItemStack(Items.bucket)); + new ItemStack(bucketSilicon), new ItemStack(Items.BUCKET)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidSilicon.getFluid(), bucketSilicon); bucketSodium = new ItemFluidbucket(ModFluids.BlockFluidSodium); - bucketSodium.setUnlocalizedName("bucketsodium").setContainerItem(Items.bucket); + bucketSodium.setUnlocalizedName("bucketsodium").setContainerItem(Items.BUCKET); GameRegistry.registerItem(bucketSodium, "bucketsodium"); FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidsodium", FluidContainerRegistry.BUCKET_VOLUME), - new ItemStack(bucketSodium), new ItemStack(Items.bucket)); + new ItemStack(bucketSodium), new ItemStack(Items.BUCKET)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidSodium.getFluid(), bucketSodium); bucketSodiumpersulfate = new ItemFluidbucket(ModFluids.BlockFluidSodiumpersulfate); - bucketSodiumpersulfate.setUnlocalizedName("bucketsodiumpersulfate").setContainerItem(Items.bucket); + bucketSodiumpersulfate.setUnlocalizedName("bucketsodiumpersulfate").setContainerItem(Items.BUCKET); GameRegistry.registerItem(bucketSodiumpersulfate, "bucketsodiumpersulfate"); FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidsodiumpersulfate", FluidContainerRegistry.BUCKET_VOLUME), - new ItemStack(bucketSodiumpersulfate), new ItemStack(Items.bucket)); + new ItemStack(bucketSodiumpersulfate), new ItemStack(Items.BUCKET)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidSodiumpersulfate.getFluid(), bucketSodiumpersulfate); bucketTritium = new ItemFluidbucket(ModFluids.BlockFluidTritium); - bucketTritium.setUnlocalizedName("buckettritium").setContainerItem(Items.bucket); + bucketTritium.setUnlocalizedName("buckettritium").setContainerItem(Items.BUCKET); GameRegistry.registerItem(bucketTritium, "buckettritium"); FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidtritium", FluidContainerRegistry.BUCKET_VOLUME), - new ItemStack(bucketTritium), new ItemStack(Items.bucket)); + new ItemStack(bucketTritium), new ItemStack(Items.BUCKET)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidTritium.getFluid(), bucketTritium); bucketWolframium = new ItemFluidbucket(ModFluids.BlockFluidWolframium); - bucketWolframium.setUnlocalizedName("bucketwolframium").setContainerItem(Items.bucket); + bucketWolframium.setUnlocalizedName("bucketwolframium").setContainerItem(Items.BUCKET); GameRegistry.registerItem(bucketWolframium, "bucketwolframium"); FluidContainerRegistry.registerFluidContainer( FluidRegistry.getFluidStack("fluidwolframium", FluidContainerRegistry.BUCKET_VOLUME), - new ItemStack(bucketWolframium), new ItemStack(Items.bucket)); + new ItemStack(bucketWolframium), new ItemStack(Items.BUCKET)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidWolframium.getFluid(), bucketWolframium); missingRecipe = new ItemMissingRecipe().setUnlocalizedName("missingRecipe"); @@ -761,7 +761,7 @@ public class ModItems OreUnifier.registerOre("plateZinc", ItemPlates.getPlateByName("zinc")); OreUnifier.registerOre("diamondTR", ItemDusts.getDustByName("Diamond")); - OreUnifier.registerOre("diamondTR", Items.diamond); + OreUnifier.registerOre("diamondTR", Items.DIAMOND); OreUnifier.registerOre("craftingGrinder", ItemParts.getPartByName("diamondGrindingHead")); OreUnifier.registerOre("craftingGrinder", ItemParts.getPartByName("wolframiumGrindingHead")); @@ -772,7 +772,7 @@ public class ModItems OreUnifier.registerOre("blockLapis", ItemParts.getPartByName("lazuriteChunk")); OreUnifier.registerOre("containerWater", ItemCells.getCellByName("water")); - OreUnifier.registerOre("containerWater", Items.water_bucket); + OreUnifier.registerOre("containerWater", Items.WATER_BUCKET); OreUnifier.registerOre("materialResin", ItemParts.getPartByName("rubberSap")); OreUnifier.registerOre("materialRubber", ItemParts.getPartByName("rubber")); diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 6a7ea98b3..1ce2bb1f7 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -37,7 +37,7 @@ public class ModRecipes public static ItemStack batteryStack = new ItemStack(ModItems.reBattery, 1, OreDictionary.WILDCARD_VALUE); public static ItemStack crystalStack = new ItemStack(ModItems.energyCrystal, 1, OreDictionary.WILDCARD_VALUE); public static ItemStack lapcrystalStack = new ItemStack(ModItems.lapotronCrystal, 1, OreDictionary.WILDCARD_VALUE); - public static ItemStack dyes = new ItemStack(Items.dye, 1, OreDictionary.WILDCARD_VALUE); + public static ItemStack dyes = new ItemStack(Items.DYE, 1, OreDictionary.WILDCARD_VALUE); public static Item hammer = ModItems.hammer; public static void init() @@ -72,148 +72,148 @@ public class ModRecipes static void addScrapBoxloot() { - ScrapboxList.addItemStackToList(new ItemStack(Items.diamond)); - ScrapboxList.addItemStackToList(new ItemStack(Items.stick)); - ScrapboxList.addItemStackToList(new ItemStack(Items.coal)); - ScrapboxList.addItemStackToList(new ItemStack(Items.apple)); - ScrapboxList.addItemStackToList(new ItemStack(Items.baked_potato)); - ScrapboxList.addItemStackToList(new ItemStack(Items.blaze_powder)); - ScrapboxList.addItemStackToList(new ItemStack(Items.wheat)); - ScrapboxList.addItemStackToList(new ItemStack(Items.carrot)); - ScrapboxList.addItemStackToList(new ItemStack(Items.boat)); - ScrapboxList.addItemStackToList(new ItemStack(Items.acacia_boat)); - ScrapboxList.addItemStackToList(new ItemStack(Items.birch_boat)); - ScrapboxList.addItemStackToList(new ItemStack(Items.dark_oak_boat)); - ScrapboxList.addItemStackToList(new ItemStack(Items.jungle_boat)); - ScrapboxList.addItemStackToList(new ItemStack(Items.spruce_boat)); - ScrapboxList.addItemStackToList(new ItemStack(Items.blaze_rod)); - ScrapboxList.addItemStackToList(new ItemStack(Items.compass)); - ScrapboxList.addItemStackToList(new ItemStack(Items.map)); - ScrapboxList.addItemStackToList(new ItemStack(Items.leather_leggings)); - ScrapboxList.addItemStackToList(new ItemStack(Items.bow)); - ScrapboxList.addItemStackToList(new ItemStack(Items.cooked_chicken)); - ScrapboxList.addItemStackToList(new ItemStack(Items.cake)); - ScrapboxList.addItemStackToList(new ItemStack(Items.acacia_door)); - ScrapboxList.addItemStackToList(new ItemStack(Items.dark_oak_door)); - ScrapboxList.addItemStackToList(new ItemStack(Items.birch_door)); - ScrapboxList.addItemStackToList(new ItemStack(Items.jungle_door)); - ScrapboxList.addItemStackToList(new ItemStack(Items.oak_door)); - ScrapboxList.addItemStackToList(new ItemStack(Items.spruce_door)); - ScrapboxList.addItemStackToList(new ItemStack(Items.wooden_axe)); - ScrapboxList.addItemStackToList(new ItemStack(Items.wooden_hoe)); - ScrapboxList.addItemStackToList(new ItemStack(Items.wooden_pickaxe)); - ScrapboxList.addItemStackToList(new ItemStack(Items.wooden_shovel)); - ScrapboxList.addItemStackToList(new ItemStack(Items.wooden_sword)); - ScrapboxList.addItemStackToList(new ItemStack(Items.bed)); - ScrapboxList.addItemStackToList(new ItemStack(Items.skull, 1, 0)); - ScrapboxList.addItemStackToList(new ItemStack(Items.skull, 1, 2)); - ScrapboxList.addItemStackToList(new ItemStack(Items.skull, 1, 4)); + ScrapboxList.addItemStackToList(new ItemStack(Items.DIAMOND)); + ScrapboxList.addItemStackToList(new ItemStack(Items.STICK)); + ScrapboxList.addItemStackToList(new ItemStack(Items.COAL)); + ScrapboxList.addItemStackToList(new ItemStack(Items.APPLE)); + ScrapboxList.addItemStackToList(new ItemStack(Items.BAKED_POTATO)); + ScrapboxList.addItemStackToList(new ItemStack(Items.BLAZE_POWDER)); + ScrapboxList.addItemStackToList(new ItemStack(Items.WHEAT)); + ScrapboxList.addItemStackToList(new ItemStack(Items.CARROT)); + ScrapboxList.addItemStackToList(new ItemStack(Items.BOAT)); + ScrapboxList.addItemStackToList(new ItemStack(Items.ACACIA_BOAT)); + ScrapboxList.addItemStackToList(new ItemStack(Items.BIRCH_BOAT)); + ScrapboxList.addItemStackToList(new ItemStack(Items.DARK_OAK_BOAT)); + ScrapboxList.addItemStackToList(new ItemStack(Items.JUNGLE_BOAT)); + ScrapboxList.addItemStackToList(new ItemStack(Items.SPRUCE_BOAT)); + ScrapboxList.addItemStackToList(new ItemStack(Items.BLAZE_ROD)); + ScrapboxList.addItemStackToList(new ItemStack(Items.COMPASS)); + ScrapboxList.addItemStackToList(new ItemStack(Items.MAP)); + ScrapboxList.addItemStackToList(new ItemStack(Items.LEATHER_LEGGINGS)); + ScrapboxList.addItemStackToList(new ItemStack(Items.BOW)); + ScrapboxList.addItemStackToList(new ItemStack(Items.COOKED_CHICKEN)); + ScrapboxList.addItemStackToList(new ItemStack(Items.CAKE)); + ScrapboxList.addItemStackToList(new ItemStack(Items.ACACIA_DOOR)); + ScrapboxList.addItemStackToList(new ItemStack(Items.DARK_OAK_DOOR)); + ScrapboxList.addItemStackToList(new ItemStack(Items.BIRCH_DOOR)); + ScrapboxList.addItemStackToList(new ItemStack(Items.JUNGLE_DOOR)); + ScrapboxList.addItemStackToList(new ItemStack(Items.OAK_DOOR)); + ScrapboxList.addItemStackToList(new ItemStack(Items.SPRUCE_DOOR)); + ScrapboxList.addItemStackToList(new ItemStack(Items.WOODEN_AXE)); + ScrapboxList.addItemStackToList(new ItemStack(Items.WOODEN_HOE)); + ScrapboxList.addItemStackToList(new ItemStack(Items.WOODEN_PICKAXE)); + ScrapboxList.addItemStackToList(new ItemStack(Items.WOODEN_SHOVEL)); + ScrapboxList.addItemStackToList(new ItemStack(Items.WOODEN_SWORD)); + ScrapboxList.addItemStackToList(new ItemStack(Items.BED)); + ScrapboxList.addItemStackToList(new ItemStack(Items.SKULL, 1, 0)); + ScrapboxList.addItemStackToList(new ItemStack(Items.SKULL, 1, 2)); + ScrapboxList.addItemStackToList(new ItemStack(Items.SKULL, 1, 4)); for (int i = 0; i < StackWIPHandler.devHeads.size(); i++) ScrapboxList.addItemStackToList(StackWIPHandler.devHeads.get(i)); - ScrapboxList.addItemStackToList(new ItemStack(Items.dye, 1, 3)); - ScrapboxList.addItemStackToList(new ItemStack(Items.glowstone_dust)); - ScrapboxList.addItemStackToList(new ItemStack(Items.string)); - ScrapboxList.addItemStackToList(new ItemStack(Items.minecart)); - ScrapboxList.addItemStackToList(new ItemStack(Items.chest_minecart)); - ScrapboxList.addItemStackToList(new ItemStack(Items.hopper_minecart)); - ScrapboxList.addItemStackToList(new ItemStack(Items.prismarine_shard)); - ScrapboxList.addItemStackToList(new ItemStack(Items.shears)); - ScrapboxList.addItemStackToList(new ItemStack(Items.experience_bottle)); - ScrapboxList.addItemStackToList(new ItemStack(Items.bone)); - ScrapboxList.addItemStackToList(new ItemStack(Items.bowl)); - ScrapboxList.addItemStackToList(new ItemStack(Items.brick)); - ScrapboxList.addItemStackToList(new ItemStack(Items.fishing_rod)); - ScrapboxList.addItemStackToList(new ItemStack(Items.book)); - ScrapboxList.addItemStackToList(new ItemStack(Items.paper)); - ScrapboxList.addItemStackToList(new ItemStack(Items.sugar)); - ScrapboxList.addItemStackToList(new ItemStack(Items.reeds)); - ScrapboxList.addItemStackToList(new ItemStack(Items.spider_eye)); - ScrapboxList.addItemStackToList(new ItemStack(Items.slime_ball)); - ScrapboxList.addItemStackToList(new ItemStack(Items.rotten_flesh)); - ScrapboxList.addItemStackToList(new ItemStack(Items.sign)); - ScrapboxList.addItemStackToList(new ItemStack(Items.writable_book)); - ScrapboxList.addItemStackToList(new ItemStack(Items.cooked_beef)); - ScrapboxList.addItemStackToList(new ItemStack(Items.name_tag)); - ScrapboxList.addItemStackToList(new ItemStack(Items.saddle)); - ScrapboxList.addItemStackToList(new ItemStack(Items.redstone)); - ScrapboxList.addItemStackToList(new ItemStack(Items.gunpowder)); - ScrapboxList.addItemStackToList(new ItemStack(Items.rabbit_hide)); - ScrapboxList.addItemStackToList(new ItemStack(Items.rabbit_foot)); - ScrapboxList.addItemStackToList(new ItemStack(Items.apple)); - ScrapboxList.addItemStackToList(new ItemStack(Items.golden_apple)); - ScrapboxList.addItemStackToList(new ItemStack(Items.gold_nugget)); + ScrapboxList.addItemStackToList(new ItemStack(Items.DYE, 1, 3)); + ScrapboxList.addItemStackToList(new ItemStack(Items.GLOWSTONE_DUST)); + ScrapboxList.addItemStackToList(new ItemStack(Items.STRING)); + ScrapboxList.addItemStackToList(new ItemStack(Items.MINECART)); + ScrapboxList.addItemStackToList(new ItemStack(Items.CHEST_MINECART)); + ScrapboxList.addItemStackToList(new ItemStack(Items.HOPPER_MINECART)); + ScrapboxList.addItemStackToList(new ItemStack(Items.PRISMARINE_SHARD)); + ScrapboxList.addItemStackToList(new ItemStack(Items.SHEARS)); + ScrapboxList.addItemStackToList(new ItemStack(Items.EXPERIENCE_BOTTLE)); + ScrapboxList.addItemStackToList(new ItemStack(Items.BONE)); + ScrapboxList.addItemStackToList(new ItemStack(Items.BOWL)); + ScrapboxList.addItemStackToList(new ItemStack(Items.BRICK)); + ScrapboxList.addItemStackToList(new ItemStack(Items.FISHING_ROD)); + ScrapboxList.addItemStackToList(new ItemStack(Items.BOOK)); + ScrapboxList.addItemStackToList(new ItemStack(Items.PAPER)); + ScrapboxList.addItemStackToList(new ItemStack(Items.SUGAR)); + ScrapboxList.addItemStackToList(new ItemStack(Items.REEDS)); + ScrapboxList.addItemStackToList(new ItemStack(Items.SPIDER_EYE)); + ScrapboxList.addItemStackToList(new ItemStack(Items.SLIME_BALL)); + ScrapboxList.addItemStackToList(new ItemStack(Items.ROTTEN_FLESH)); + ScrapboxList.addItemStackToList(new ItemStack(Items.SIGN)); + ScrapboxList.addItemStackToList(new ItemStack(Items.WRITABLE_BOOK)); + ScrapboxList.addItemStackToList(new ItemStack(Items.COOKED_BEEF)); + ScrapboxList.addItemStackToList(new ItemStack(Items.NAME_TAG)); + ScrapboxList.addItemStackToList(new ItemStack(Items.SADDLE)); + ScrapboxList.addItemStackToList(new ItemStack(Items.REDSTONE)); + ScrapboxList.addItemStackToList(new ItemStack(Items.GUNPOWDER)); + ScrapboxList.addItemStackToList(new ItemStack(Items.RABBIT_HIDE)); + ScrapboxList.addItemStackToList(new ItemStack(Items.RABBIT_FOOT)); + ScrapboxList.addItemStackToList(new ItemStack(Items.APPLE)); + ScrapboxList.addItemStackToList(new ItemStack(Items.GOLDEN_APPLE)); + ScrapboxList.addItemStackToList(new ItemStack(Items.GOLD_NUGGET)); ScrapboxList.addItemStackToList(ItemCells.getCellByName("empty")); ScrapboxList.addItemStackToList(ItemCells.getCellByName("water")); ScrapboxList.addItemStackToList(ItemParts.getPartByName("scrap")); ScrapboxList.addItemStackToList(ItemParts.getPartByName("rubber")); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.trapdoor)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.stone_button)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.wooden_button)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.acacia_fence)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.acacia_fence_gate)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.birch_fence)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.birch_fence_gate)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.dark_oak_fence)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.dark_oak_fence_gate)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.jungle_fence)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.jungle_fence_gate)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.nether_brick_fence)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.oak_fence)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.oak_fence_gate)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.spruce_fence)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.spruce_fence_gate)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.brick_block)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.crafting_table)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.pumpkin)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.netherrack)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.grass)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.dirt, 1, 0)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.dirt, 1, 1)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.sand, 1, 0)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.sand, 1, 1)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.glowstone)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.gravel)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.hardened_clay)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.glass)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.glass_pane)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.cactus)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.tallgrass, 1, 0)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.tallgrass, 1, 1)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.deadbush)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.chest)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.tnt)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.rail)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.detector_rail)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.golden_rail)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.activator_rail)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.yellow_flower)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.red_flower, 1, 0)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.red_flower, 1, 1)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.red_flower, 1, 2)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.red_flower, 1, 3)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.red_flower, 1, 4)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.red_flower, 1, 5)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.red_flower, 1, 6)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.red_flower, 1, 7)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.red_flower, 1, 8)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.brown_mushroom)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.red_mushroom)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.brown_mushroom_block)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.red_mushroom_block)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.sapling, 1, 0)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.sapling, 1, 1)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.sapling, 1, 2)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.sapling, 1, 3)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.sapling, 1, 4)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.sapling, 1, 5)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.leaves, 1, 0)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.leaves, 1, 1)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.leaves, 1, 2)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.leaves, 1, 3)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.leaves2, 1, 0)); - ScrapboxList.addItemStackToList(new ItemStack(Blocks.leaves2, 1, 1)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.TRAPDOOR)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.STONE_BUTTON)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.WOODEN_BUTTON)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.ACACIA_FENCE)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.ACACIA_FENCE_GATE)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.BIRCH_FENCE)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.BIRCH_FENCE_GATE)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.DARK_OAK_FENCE)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.DARK_OAK_FENCE_GATE)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.JUNGLE_FENCE)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.JUNGLE_FENCE_GATE)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.NETHER_BRICK_FENCE)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.OAK_FENCE)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.OAK_FENCE_GATE)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.SPRUCE_FENCE)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.SPRUCE_FENCE_GATE)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.BRICK_BLOCK)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.CRAFTING_TABLE)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.PUMPKIN)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.NETHERRACK)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.GRASS)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.DIRT, 1, 0)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.DIRT, 1, 1)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.SAND, 1, 0)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.SAND, 1, 1)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.GLOWSTONE)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.GRAVEL)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.HARDENED_CLAY)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.GLASS)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.GLASS_PANE)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.CACTUS)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.TALLGRASS, 1, 0)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.TALLGRASS, 1, 1)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.DEADBUSH)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.CHEST)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.TNT)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.RAIL)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.DETECTOR_RAIL)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.GOLDEN_RAIL)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.ACTIVATOR_RAIL)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.YELLOW_FLOWER)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.RED_FLOWER, 1, 0)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.RED_FLOWER, 1, 1)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.RED_FLOWER, 1, 2)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.RED_FLOWER, 1, 3)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.RED_FLOWER, 1, 4)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.RED_FLOWER, 1, 5)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.RED_FLOWER, 1, 6)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.RED_FLOWER, 1, 7)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.RED_FLOWER, 1, 8)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.BROWN_MUSHROOM)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.RED_MUSHROOM)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.BROWN_MUSHROOM_BLOCK)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.RED_MUSHROOM_BLOCK)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.SAPLING, 1, 0)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.SAPLING, 1, 1)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.SAPLING, 1, 2)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.SAPLING, 1, 3)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.SAPLING, 1, 4)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.SAPLING, 1, 5)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.LEAVES, 1, 0)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.LEAVES, 1, 1)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.LEAVES, 1, 2)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.LEAVES, 1, 3)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.LEAVES2, 1, 0)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.LEAVES2, 1, 1)); ScrapboxList.addItemStackToList(new ItemStack(ModBlocks.rubberSapling)); @@ -226,10 +226,10 @@ public class ModRecipes for (String i : ItemGems.types) ScrapboxList.addItemStackToList(ItemGems.getGemByName(i)); - registerDyable(Blocks.carpet); - registerDyable(Blocks.stained_glass); - registerDyable(Blocks.stained_glass_pane); - registerDyable(Blocks.stained_hardened_clay); + registerDyable(Blocks.CARPET); + registerDyable(Blocks.STAINED_GLASS); + registerDyable(Blocks.STAINED_GLASS_PANE); + registerDyable(Blocks.STAINED_HARDENED_CLAY); for (int i = 0; i < ScrapboxList.stacks.size(); i++) { @@ -308,7 +308,7 @@ public class ModRecipes 20)); RecipeHandler.addRecipe( - new CompressorRecipe(new ItemStack(Items.iron_ingot), ItemPlates.getPlateByName("iron"), 400, 20)); + new CompressorRecipe(new ItemStack(Items.IRON_INGOT), ItemPlates.getPlateByName("iron"), 400, 20)); RecipeHandler.addRecipe( new CompressorRecipe(ItemIngots.getIngotByName("copper"), ItemPlates.getPlateByName("copper"), 400, 20)); @@ -357,16 +357,16 @@ public class ModRecipes { // Vanilla RecipeHandler.addRecipe( - new GrinderRecipe(new ItemStack(Blocks.iron_ore), ItemDusts.getDustByName("iron", 2), 100, 20)); + new GrinderRecipe(new ItemStack(Blocks.IRON_ORE), ItemDusts.getDustByName("iron", 2), 100, 20)); RecipeHandler.addRecipe( - new GrinderRecipe(new ItemStack(Blocks.gold_ore), ItemDusts.getDustByName("gold", 2), 100, 20)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Items.coal), ItemDusts.getDustByName("coal"), 100, 20)); + new GrinderRecipe(new ItemStack(Blocks.GOLD_ORE), ItemDusts.getDustByName("gold", 2), 100, 20)); + RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Items.COAL), ItemDusts.getDustByName("coal"), 100, 20)); RecipeHandler - .addRecipe(new GrinderRecipe(new ItemStack(Blocks.coal_ore), new ItemStack(Items.coal, 2), 100, 20)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Items.bone), new ItemStack(Items.dye, 6, 15), 100, 20)); + .addRecipe(new GrinderRecipe(new ItemStack(Blocks.COAL_ORE), new ItemStack(Items.COAL, 2), 100, 20)); + RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Items.BONE), new ItemStack(Items.DYE, 6, 15), 100, 20)); RecipeHandler - .addRecipe(new GrinderRecipe(new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.sand), 100, 20)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.gravel), new ItemStack(Items.flint), 100, 20)); + .addRecipe(new GrinderRecipe(new ItemStack(Blocks.COBBLESTONE), new ItemStack(Blocks.SAND), 100, 20)); + RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.GRAVEL), new ItemStack(Items.FLINT), 100, 20)); // TechReborn RecipeHandler.addRecipe( @@ -477,17 +477,17 @@ public class ModRecipes CraftingHelper .addShapedOreRecipe(ItemParts.getPartByName("computerMonitor"), "ADA", "DGD", "ADA", 'D', dyes, 'A', - "ingotAluminum", 'G', Blocks.glass_pane); + "ingotAluminum", 'G', Blocks.GLASS_PANE); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.reinforcedglass, 7), "GAG", "GGG", "GAG", 'A', - ItemIngots.getIngotByName("advancedAlloy"), 'G', Blocks.glass); + ItemIngots.getIngotByName("advancedAlloy"), 'G', Blocks.GLASS); CraftingHelper .addShapedOreRecipe(new ItemStack(ModBlocks.windMill, 2), "IXI", "XGX", "IXI", 'I', "ingotIron", 'G', ModBlocks.Generator); CraftingHelper - .addShapedOreRecipe(new ItemStack(ModBlocks.waterMill), "SWS", "WGW", "SWS", 'S', Items.stick, 'W', + .addShapedOreRecipe(new ItemStack(ModBlocks.waterMill), "SWS", "WGW", "SWS", 'S', Items.STICK, 'W', "plankWood", 'G', ModBlocks.Generator); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.hvt), "XHX", "XMX", "XHX", 'M', ModBlocks.mvt, 'H', @@ -519,8 +519,8 @@ public class ModRecipes ItemIngots.getIngotByName("invar"), 'R', ModBlocks.reinforcedglass, 'G', ModBlocks.Generator, 'C', ItemParts.getPartByName("electronicCircuit")); - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.recycler), "XEX", "DCD", "GDG", 'D', Blocks.dirt, 'C', - ModBlocks.Compressor, 'G', Items.glowstone_dust, 'E', ItemParts.getPartByName("electronicCircuit")); + CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.recycler), "XEX", "DCD", "GDG", 'D', Blocks.DIRT, 'C', + ModBlocks.Compressor, 'G', Items.GLOWSTONE_DUST, 'E', ItemParts.getPartByName("electronicCircuit")); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.batBox), "WCW", "BBB", "WWW", 'W', "plankWood", 'B', batteryStack, 'C', ItemStandaloneCables.getCableByName("insulatedcopper")); @@ -643,23 +643,23 @@ public class ModRecipes CraftingHelper .addShapedOreRecipe(new ItemStack(ModBlocks.Compressor), "SXS", "SCS", "SMS", 'C', "circuitBasic", 'M', - BlockMachineFrame.getFrameByName("machine", 1), 'S', Blocks.stone); + BlockMachineFrame.getFrameByName("machine", 1), 'S', Blocks.STONE); CraftingHelper .addShapedOreRecipe(new ItemStack(ModBlocks.ElectricFurnace), "XCX", "RFR", "XXX", 'C', "circuitBasic", - 'F', new ItemStack(ModBlocks.ironFurnace), 'R', Items.redstone); + 'F', new ItemStack(ModBlocks.ironFurnace), 'R', Items.REDSTONE); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ironFurnace), "III", "IXI", "III", 'I', "ingotIron"); CraftingHelper .addShapedOreRecipe(new ItemStack(ModBlocks.ironFurnace), "XIX", "IXI", "IFI", 'I', "ingotIron", 'F', - Blocks.furnace); + Blocks.FURNACE); CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("electronicCircuit"), "WWW", "SRS", "WWW", 'R', - "ingotRefinedIron", 'S', Items.redstone, 'W', ItemStandaloneCables.getCableByName("insulatedcopper")); + "ingotRefinedIron", 'S', Items.REDSTONE, 'W', ItemStandaloneCables.getCableByName("insulatedcopper")); CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.reBattery), "XWX", "TRT", "TRT", 'T', "ingotTin", 'R', - Items.redstone, 'W', ItemStandaloneCables.getCableByName("insulatedcopper")); + Items.REDSTONE, 'W', ItemStandaloneCables.getCableByName("insulatedcopper")); CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.wrench), "BAB", "BBB", "ABA", 'B', "ingotBronze"); @@ -673,19 +673,19 @@ public class ModRecipes 'E', new ItemStack(ModBlocks.Extractor), 'A', "machineBlockAdvanced", 'C', "circuitBasic"); CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("advancedCircuit"), "RGR", "LCL", "RGR", 'R', - Items.redstone, 'G', Items.glowstone_dust, 'L', "dyeBlue", 'C', + Items.REDSTONE, 'G', Items.GLOWSTONE_DUST, 'L', "dyeBlue", 'C', ItemParts.getPartByName("electronicCircuit")); CraftingHelper - .addShapedOreRecipe(new ItemStack(ModItems.energyCrystal), "RRR", "RDR", "RRR", 'R', Items.redstone, - 'D', Items.diamond); + .addShapedOreRecipe(new ItemStack(ModItems.energyCrystal), "RRR", "RDR", "RRR", 'R', Items.REDSTONE, + 'D', Items.DIAMOND); CraftingHelper .addShapedOreRecipe(new ItemStack(ModItems.lapotronCrystal), "LCL", "LEL", "LCL", 'L', "dyeBlue", 'E', new ItemStack(ModItems.energyCrystal), 'C', ItemParts.getPartByName("electronicCircuit")); CraftingHelper.addShapelessOreRecipe(new ItemStack(ModBlocks.Generator), batteryStack, - BlockMachineFrame.getFrameByName("machine", 1), Blocks.furnace); + BlockMachineFrame.getFrameByName("machine", 1), Blocks.FURNACE); CraftingHelper.addShapedOreRecipe(BlockMachineFrame.getFrameByName("machine", 1), "AAA", "AXA", "AAA", 'A', ItemIngots.getIngotByName("refinediron")); @@ -696,7 +696,7 @@ public class ModRecipes BlockMachineFrame.getFrameByName("machine", 1)); CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("dataStorageCircuit"), "EEE", "ECE", "EEE", 'E', - new ItemStack(Items.emerald), 'C', ItemParts.getPartByName("electronicCircuit")); + new ItemStack(Items.EMERALD), 'C', ItemParts.getPartByName("electronicCircuit")); CraftingHelper .addShapedOreRecipe(new ItemStack(ModItems.parts, 4, 8), "DSD", "S S", "DSD", 'D', "dustDiamond", 'S', @@ -745,7 +745,7 @@ public class ModRecipes if (part.endsWith("Gear")) { CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName(part), " O ", "OIO", " O ", 'I', - new ItemStack(Items.iron_ingot), 'O', + new ItemStack(Items.IRON_INGOT), 'O', "ingot" + capitalizeFirstLetter(part.replace("Gear", ""))); } } @@ -778,7 +778,7 @@ public class ModRecipes new ItemStack(ModItems.lapotronicOrb), 'C', new ItemStack(ModBlocks.ComputerCube)); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Idsu), "PAP", "ACA", "PAP", 'P', - ItemPlates.getPlateByName("iridium"), 'C', new ItemStack(Blocks.ender_chest), 'A', + ItemPlates.getPlateByName("iridium"), 'C', new ItemStack(Blocks.ENDER_CHEST), 'A', new ItemStack(ModBlocks.Aesu)); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.FusionControlComputer), "CCC", "PTP", "CCC", 'P', @@ -940,10 +940,10 @@ public class ModRecipes static void addSmeltingRecipes() { - GameRegistry.addSmelting(ItemDusts.getDustByName("iron", 1), new ItemStack(Items.iron_ingot), 1F); - GameRegistry.addSmelting(ItemDusts.getDustByName("gold", 1), new ItemStack(Items.gold_ingot), 1F); + GameRegistry.addSmelting(ItemDusts.getDustByName("iron", 1), new ItemStack(Items.IRON_INGOT), 1F); + GameRegistry.addSmelting(ItemDusts.getDustByName("gold", 1), new ItemStack(Items.GOLD_INGOT), 1F); GameRegistry.addSmelting(ItemParts.getPartByName("rubberSap"), ItemParts.getPartByName("rubber"), 1F); - GameRegistry.addSmelting(new ItemStack(Items.iron_ingot), ItemIngots.getIngotByName("refinediron"), 1F); + GameRegistry.addSmelting(new ItemStack(Items.IRON_INGOT), ItemIngots.getIngotByName("refinediron"), 1F); GameRegistry.addSmelting(BlockOre2.getOreByName("copper"), ItemIngots.getIngotByName("copper"), 1F); GameRegistry.addSmelting(BlockOre2.getOreByName("tin"), ItemIngots.getIngotByName("tin"), 1F); @@ -969,10 +969,10 @@ public class ModRecipes // Electrum RecipeHandler.addRecipe( - new AlloySmelterRecipe(new ItemStack(Items.gold_ingot, 1), ItemIngots.getIngotByName("silver", 1), + new AlloySmelterRecipe(new ItemStack(Items.GOLD_INGOT, 1), ItemIngots.getIngotByName("silver", 1), ItemIngots.getIngotByName("electrum", 2), 200, 16)); RecipeHandler.addRecipe( - new AlloySmelterRecipe(new ItemStack(Items.gold_ingot, 1), ItemDusts.getDustByName("silver", 1), + new AlloySmelterRecipe(new ItemStack(Items.GOLD_INGOT, 1), ItemDusts.getDustByName("silver", 1), ItemIngots.getIngotByName("electrum", 2), 200, 16)); RecipeHandler.addRecipe( new AlloySmelterRecipe(ItemDusts.getDustByName("gold", 1), ItemIngots.getIngotByName("silver", 1), @@ -983,10 +983,10 @@ public class ModRecipes // Invar RecipeHandler.addRecipe( - new AlloySmelterRecipe(new ItemStack(Items.iron_ingot, 2), ItemIngots.getIngotByName("nickel", 1), + new AlloySmelterRecipe(new ItemStack(Items.IRON_INGOT, 2), ItemIngots.getIngotByName("nickel", 1), ItemIngots.getIngotByName("invar", 3), 200, 16)); RecipeHandler.addRecipe( - new AlloySmelterRecipe(new ItemStack(Items.iron_ingot, 2), ItemDusts.getDustByName("nickel", 1), + new AlloySmelterRecipe(new ItemStack(Items.IRON_INGOT, 2), ItemDusts.getDustByName("nickel", 1), ItemIngots.getIngotByName("invar", 3), 200, 16)); RecipeHandler.addRecipe( new AlloySmelterRecipe(ItemDusts.getDustByName("iron", 2), ItemIngots.getIngotByName("nickel", 1), @@ -1020,10 +1020,10 @@ public class ModRecipes ItemStack redAlloyStack = OreDictionary.getOres("ingotRedAlloy").get(0); redAlloyStack.stackSize = 1; RecipeHandler.addRecipe( - new AlloySmelterRecipe(new ItemStack(Items.redstone, 4), ItemIngots.getIngotByName("copper", 1), + new AlloySmelterRecipe(new ItemStack(Items.REDSTONE, 4), ItemIngots.getIngotByName("copper", 1), redAlloyStack, 200, 16)); RecipeHandler.addRecipe( - new AlloySmelterRecipe(new ItemStack(Items.redstone, 4), new ItemStack(Items.iron_ingot, 1), + new AlloySmelterRecipe(new ItemStack(Items.REDSTONE, 4), new ItemStack(Items.IRON_INGOT, 1), redAlloyStack, 200, 16)); } @@ -1046,7 +1046,7 @@ public class ModRecipes RecipeHandler.addRecipe(new AlloySmelterRecipe(ItemIngots.getIngotByName("redAlloy", 1), ItemIngots.getIngotByName("blueAlloy", 1), purpleAlloyStack, 200, 16)); RecipeHandler.addRecipe( - new AlloySmelterRecipe(new ItemStack(Items.gold_ingot, 1), infusedTeslatiteStack, purpleAlloyStack, + new AlloySmelterRecipe(new ItemStack(Items.GOLD_INGOT, 1), infusedTeslatiteStack, purpleAlloyStack, 200, 16)); } @@ -1092,7 +1092,7 @@ public class ModRecipes ItemStack conductiveIronStack = OreDictionary.getOres("ingotConductiveIron").get(0); conductiveIronStack.stackSize = 1; RecipeHandler.addRecipe( - new AlloySmelterRecipe(new ItemStack(Items.redstone, 1), new ItemStack(Items.iron_ingot, 1), + new AlloySmelterRecipe(new ItemStack(Items.REDSTONE, 1), new ItemStack(Items.IRON_INGOT, 1), conductiveIronStack, 200, 16)); } @@ -1104,7 +1104,7 @@ public class ModRecipes ItemStack siliconStack = OreDictionary.getOres("itemSilicon").get(0); siliconStack.stackSize = 1; RecipeHandler.addRecipe( - new AlloySmelterRecipe(new ItemStack(Items.redstone, 1), siliconStack, redstoneAlloyStack, 200, + new AlloySmelterRecipe(new ItemStack(Items.REDSTONE, 1), siliconStack, redstoneAlloyStack, 200, 16)); } @@ -1114,10 +1114,10 @@ public class ModRecipes ItemStack pulsatingIronStack = OreDictionary.getOres("ingotPhasedIron").get(0); pulsatingIronStack.stackSize = 1; RecipeHandler.addRecipe( - new AlloySmelterRecipe(new ItemStack(Items.iron_ingot, 1), new ItemStack(Items.ender_pearl, 1), + new AlloySmelterRecipe(new ItemStack(Items.IRON_INGOT, 1), new ItemStack(Items.ENDER_PEARL, 1), pulsatingIronStack, 200, 16)); RecipeHandler.addRecipe( - new AlloySmelterRecipe(new ItemStack(Items.iron_ingot, 1), ItemDusts.getDustByName("enderPearl", 1), + new AlloySmelterRecipe(new ItemStack(Items.IRON_INGOT, 1), ItemDusts.getDustByName("enderPearl", 1), pulsatingIronStack, 200, 16)); } @@ -1129,7 +1129,7 @@ public class ModRecipes ItemStack vibrantAlloyStack = OreDictionary.getOres("ingotPhasedGold").get(0); vibrantAlloyStack.stackSize = 1; RecipeHandler.addRecipe( - new AlloySmelterRecipe(energeticAlloyStack, new ItemStack(Items.ender_pearl, 1), vibrantAlloyStack, + new AlloySmelterRecipe(energeticAlloyStack, new ItemStack(Items.ENDER_PEARL, 1), vibrantAlloyStack, 200, 16)); RecipeHandler.addRecipe( new AlloySmelterRecipe(energeticAlloyStack, ItemDusts.getDustByName("enderPearl", 1), @@ -1142,7 +1142,7 @@ public class ModRecipes ItemStack soulariumStack = OreDictionary.getOres("ingotSoularium").get(0); soulariumStack.stackSize = 1; RecipeHandler.addRecipe( - new AlloySmelterRecipe(new ItemStack(Blocks.soul_sand, 1), new ItemStack(Items.gold_ingot, 1), + new AlloySmelterRecipe(new ItemStack(Blocks.SOUL_SAND, 1), new ItemStack(Items.GOLD_INGOT, 1), soulariumStack, 200, 16)); } @@ -1163,54 +1163,54 @@ public class ModRecipes // Obsidian RecipeHandler.addRecipe( - new PlateCuttingMachineRecipe(new ItemStack(Blocks.obsidian), ItemPlates.getPlateByName("obsidian", 9), + new PlateCuttingMachineRecipe(new ItemStack(Blocks.OBSIDIAN), ItemPlates.getPlateByName("obsidian", 9), 100, 4)); } static void addIndustrialSawmillRecipes() { ItemStack pulpStack = OreDictionary.getOres("pulpWood").get(0); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.log, 1, 0), null, - new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Blocks.planks, 6, 0), pulpStack, null, 200, 30, + RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.LOG, 1, 0), null, + new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Blocks.PLANKS, 6, 0), pulpStack, null, 200, 30, false)); RecipeHandler.addRecipe( - new IndustrialSawmillRecipe(new ItemStack(Blocks.log, 1, 0), new ItemStack(Items.water_bucket), null, - new ItemStack(Blocks.planks, 6, 0), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); + new IndustrialSawmillRecipe(new ItemStack(Blocks.LOG, 1, 0), new ItemStack(Items.WATER_BUCKET), null, + new ItemStack(Blocks.PLANKS, 6, 0), pulpStack, new ItemStack(Items.BUCKET), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.log, 1, 1), null, - new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Blocks.planks, 6, 1), pulpStack, null, 200, 30, + RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.LOG, 1, 1), null, + new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Blocks.PLANKS, 6, 1), pulpStack, null, 200, 30, false)); RecipeHandler.addRecipe( - new IndustrialSawmillRecipe(new ItemStack(Blocks.log, 1, 1), new ItemStack(Items.water_bucket), null, - new ItemStack(Blocks.planks, 6, 1), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); + new IndustrialSawmillRecipe(new ItemStack(Blocks.LOG, 1, 1), new ItemStack(Items.WATER_BUCKET), null, + new ItemStack(Blocks.PLANKS, 6, 1), pulpStack, new ItemStack(Items.BUCKET), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.log, 1, 2), null, - new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Blocks.planks, 6, 2), pulpStack, null, 200, 30, + RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.LOG, 1, 2), null, + new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Blocks.PLANKS, 6, 2), pulpStack, null, 200, 30, false)); RecipeHandler.addRecipe( - new IndustrialSawmillRecipe(new ItemStack(Blocks.log, 1, 2), new ItemStack(Items.water_bucket), null, - new ItemStack(Blocks.planks, 6, 2), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); + new IndustrialSawmillRecipe(new ItemStack(Blocks.LOG, 1, 2), new ItemStack(Items.WATER_BUCKET), null, + new ItemStack(Blocks.PLANKS, 6, 2), pulpStack, new ItemStack(Items.BUCKET), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.log, 1, 3), null, - new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Blocks.planks, 6, 3), pulpStack, null, 200, 30, + RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.LOG, 1, 3), null, + new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Blocks.PLANKS, 6, 3), pulpStack, null, 200, 30, false)); RecipeHandler.addRecipe( - new IndustrialSawmillRecipe(new ItemStack(Blocks.log, 1, 3), new ItemStack(Items.water_bucket), null, - new ItemStack(Blocks.planks, 6, 3), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); + new IndustrialSawmillRecipe(new ItemStack(Blocks.LOG, 1, 3), new ItemStack(Items.WATER_BUCKET), null, + new ItemStack(Blocks.PLANKS, 6, 3), pulpStack, new ItemStack(Items.BUCKET), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.log2, 1, 0), null, - new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Blocks.planks, 6, 4), pulpStack, null, 200, 30, + RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.LOG2, 1, 0), null, + new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Blocks.PLANKS, 6, 4), pulpStack, null, 200, 30, false)); RecipeHandler.addRecipe( - new IndustrialSawmillRecipe(new ItemStack(Blocks.log2, 1, 0), new ItemStack(Items.water_bucket), null, - new ItemStack(Blocks.planks, 6, 4), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); + new IndustrialSawmillRecipe(new ItemStack(Blocks.LOG2, 1, 0), new ItemStack(Items.WATER_BUCKET), null, + new ItemStack(Blocks.PLANKS, 6, 4), pulpStack, new ItemStack(Items.BUCKET), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.log2, 1, 1), null, - new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Blocks.planks, 6, 5), pulpStack, null, 200, 30, + RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.LOG2, 1, 1), null, + new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Blocks.PLANKS, 6, 5), pulpStack, null, 200, 30, false)); RecipeHandler.addRecipe( - new IndustrialSawmillRecipe(new ItemStack(Blocks.log2, 1, 1), new ItemStack(Items.water_bucket), null, - new ItemStack(Blocks.planks, 6, 5), pulpStack, new ItemStack(Items.bucket), 200, 30, false)); + new IndustrialSawmillRecipe(new ItemStack(Blocks.LOG2, 1, 1), new ItemStack(Items.WATER_BUCKET), null, + new ItemStack(Blocks.PLANKS, 6, 5), pulpStack, new ItemStack(Items.BUCKET), 200, 30, false)); } static void addBlastFurnaceRecipes() @@ -1246,7 +1246,7 @@ public class ModRecipes ItemIngots.getIngotByName("lead"), 80, 120, 1500)); RecipeHandler.addRecipe( - new BlastFurnaceRecipe(new ItemStack(Items.iron_ingot), ItemDusts.getDustByName("coal", 2), + new BlastFurnaceRecipe(new ItemStack(Items.IRON_INGOT), ItemDusts.getDustByName("coal", 2), ItemIngots.getIngotByName("steel"), ItemDusts.getDustByName("darkAshes", 2), 500, 120, 1000)); RecipeHandler.addRecipe( @@ -1255,12 +1255,12 @@ public class ModRecipes 500, 3000)); RecipeHandler.addRecipe( - new BlastFurnaceRecipe(new ItemStack(Blocks.iron_ore), ItemDusts.getDustByName("calcite"), - new ItemStack(Items.iron_ingot, 3), ItemDusts.getDustByName("darkAshes"), 140, 120, 1000)); + new BlastFurnaceRecipe(new ItemStack(Blocks.IRON_ORE), ItemDusts.getDustByName("calcite"), + new ItemStack(Items.IRON_INGOT, 3), ItemDusts.getDustByName("darkAshes"), 140, 120, 1000)); RecipeHandler.addRecipe( new BlastFurnaceRecipe(BlockOre.getOreByName("Pyrite"), ItemDusts.getDustByName("calcite"), - new ItemStack(Items.iron_ingot, 2), ItemDusts.getDustByName("darkAshes"), 140, 120, 1000)); + new ItemStack(Items.IRON_INGOT, 2), ItemDusts.getDustByName("darkAshes"), 140, 120, 1000)); } static void addUUrecipes() @@ -1268,110 +1268,110 @@ public class ModRecipes if (ConfigTechReborn.UUrecipesWood) CraftingHelper - .addShapedOreRecipe(new ItemStack(Blocks.log, 8), " U ", " ", " ", 'U', ModItems.uuMatter); + .addShapedOreRecipe(new ItemStack(Blocks.LOG, 8), " U ", " ", " ", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesStone) CraftingHelper - .addShapedOreRecipe(new ItemStack(Blocks.stone, 16), " ", " U ", " ", 'U', ModItems.uuMatter); + .addShapedOreRecipe(new ItemStack(Blocks.STONE, 16), " ", " U ", " ", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesSnowBlock) CraftingHelper - .addShapedOreRecipe(new ItemStack(Blocks.snow, 16), "U U", " ", " ", 'U', ModItems.uuMatter); + .addShapedOreRecipe(new ItemStack(Blocks.SNOW, 16), "U U", " ", " ", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesGrass) CraftingHelper - .addShapedOreRecipe(new ItemStack(Blocks.grass, 16), " ", "U ", "U ", 'U', ModItems.uuMatter); + .addShapedOreRecipe(new ItemStack(Blocks.GRASS, 16), " ", "U ", "U ", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesObsidian) - CraftingHelper.addShapedOreRecipe(new ItemStack(Blocks.obsidian, 12), "U U", "U U", " ", 'U', + CraftingHelper.addShapedOreRecipe(new ItemStack(Blocks.OBSIDIAN, 12), "U U", "U U", " ", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesGlass) CraftingHelper - .addShapedOreRecipe(new ItemStack(Blocks.glass, 32), " U ", "U U", " U ", 'U', ModItems.uuMatter); + .addShapedOreRecipe(new ItemStack(Blocks.GLASS, 32), " U ", "U U", " U ", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesCocoa) CraftingHelper - .addShapedOreRecipe(new ItemStack(Items.dye, 32, 3), "UU ", " U", "UU ", 'U', ModItems.uuMatter); + .addShapedOreRecipe(new ItemStack(Items.DYE, 32, 3), "UU ", " U", "UU ", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesGlowstoneBlock) - CraftingHelper.addShapedOreRecipe(new ItemStack(Blocks.glowstone, 8), " U ", "U U", "UUU", 'U', + CraftingHelper.addShapedOreRecipe(new ItemStack(Blocks.GLOWSTONE, 8), " U ", "U U", "UUU", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesCactus) CraftingHelper - .addShapedOreRecipe(new ItemStack(Blocks.cactus, 48), " U ", "UUU", "U U", 'U', ModItems.uuMatter); + .addShapedOreRecipe(new ItemStack(Blocks.CACTUS, 48), " U ", "UUU", "U U", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesSugarCane) CraftingHelper - .addShapedOreRecipe(new ItemStack(Items.reeds, 48), "U U", "U U", "U U", 'U', ModItems.uuMatter); + .addShapedOreRecipe(new ItemStack(Items.REEDS, 48), "U U", "U U", "U U", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesVine) CraftingHelper - .addShapedOreRecipe(new ItemStack(Blocks.vine, 24), "U ", "U ", "U ", 'U', ModItems.uuMatter); + .addShapedOreRecipe(new ItemStack(Blocks.VINE, 24), "U ", "U ", "U ", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesSnowBall) CraftingHelper - .addShapedOreRecipe(new ItemStack(Items.snowball, 16), " ", " ", "UUU", 'U', ModItems.uuMatter); + .addShapedOreRecipe(new ItemStack(Items.SNOWBALL, 16), " ", " ", "UUU", 'U', ModItems.uuMatter); CraftingHelper - .addShapedOreRecipe(new ItemStack(Items.clay_ball, 48), "UU ", "U ", "UU ", 'U', ModItems.uuMatter); + .addShapedOreRecipe(new ItemStack(Items.CLAY_BALL, 48), "UU ", "U ", "UU ", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipeslilypad) - CraftingHelper.addShapedOreRecipe(new ItemStack(Blocks.waterlily, 64), "U U", " U ", " U ", 'U', + CraftingHelper.addShapedOreRecipe(new ItemStack(Blocks.WATERLILY, 64), "U U", " U ", " U ", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesGunpowder) - CraftingHelper.addShapedOreRecipe(new ItemStack(Items.gunpowder, 15), "UUU", "U ", "UUU", 'U', + CraftingHelper.addShapedOreRecipe(new ItemStack(Items.GUNPOWDER, 15), "UUU", "U ", "UUU", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesBone) CraftingHelper - .addShapedOreRecipe(new ItemStack(Items.bone, 32), "U ", "UU ", "U ", 'U', ModItems.uuMatter); + .addShapedOreRecipe(new ItemStack(Items.BONE, 32), "U ", "UU ", "U ", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesFeather) CraftingHelper - .addShapedOreRecipe(new ItemStack(Items.feather, 32), " U ", " U ", "U U", 'U', ModItems.uuMatter); + .addShapedOreRecipe(new ItemStack(Items.FEATHER, 32), " U ", " U ", "U U", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesInk) CraftingHelper - .addShapedOreRecipe(new ItemStack(Items.dye, 48), " UU", " UU", " U ", 'U', ModItems.uuMatter); + .addShapedOreRecipe(new ItemStack(Items.DYE, 48), " UU", " UU", " U ", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesEnderPearl) - CraftingHelper.addShapedOreRecipe(new ItemStack(Items.ender_pearl, 1), "UUU", "U U", " U ", 'U', + CraftingHelper.addShapedOreRecipe(new ItemStack(Items.ENDER_PEARL, 1), "UUU", "U U", " U ", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesCoal) CraftingHelper - .addShapedOreRecipe(new ItemStack(Items.coal, 5), " U", "U ", " U", 'U', ModItems.uuMatter); + .addShapedOreRecipe(new ItemStack(Items.COAL, 5), " U", "U ", " U", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesIronOre) CraftingHelper - .addShapedOreRecipe(new ItemStack(Blocks.iron_ore, 2), "U U", " U ", "U U", 'U', ModItems.uuMatter); + .addShapedOreRecipe(new ItemStack(Blocks.IRON_ORE, 2), "U U", " U ", "U U", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesGoldOre) CraftingHelper - .addShapedOreRecipe(new ItemStack(Blocks.gold_ore, 2), " U ", "UUU", " U ", 'U', ModItems.uuMatter); + .addShapedOreRecipe(new ItemStack(Blocks.GOLD_ORE, 2), " U ", "UUU", " U ", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesRedStone) CraftingHelper - .addShapedOreRecipe(new ItemStack(Items.redstone, 24), " ", " U ", "UUU", 'U', ModItems.uuMatter); + .addShapedOreRecipe(new ItemStack(Items.REDSTONE, 24), " ", " U ", "UUU", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesLapis) CraftingHelper - .addShapedOreRecipe(new ItemStack(Items.dye, 9, 4), " U ", " U ", " UU", 'U', ModItems.uuMatter); + .addShapedOreRecipe(new ItemStack(Items.DYE, 9, 4), " U ", " U ", " UU", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesEmeraldOre) - CraftingHelper.addShapedOreRecipe(new ItemStack(Blocks.emerald_ore, 1), "UU ", "U U", " UU", 'U', + CraftingHelper.addShapedOreRecipe(new ItemStack(Blocks.EMERALD_ORE, 1), "UU ", "U U", " UU", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesEmerald) CraftingHelper - .addShapedOreRecipe(new ItemStack(Items.emerald, 2), "UUU", "UUU", " U ", 'U', ModItems.uuMatter); + .addShapedOreRecipe(new ItemStack(Items.EMERALD, 2), "UUU", "UUU", " U ", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesDiamond) CraftingHelper - .addShapedOreRecipe(new ItemStack(Items.diamond, 1), "UUU", "UUU", "UUU", 'U', ModItems.uuMatter); + .addShapedOreRecipe(new ItemStack(Items.DIAMOND, 1), "UUU", "UUU", "UUU", 'U', ModItems.uuMatter); if (ConfigTechReborn.UUrecipesTinDust) CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.dusts, 10, 77), " ", "U U", " U", 'U', @@ -1416,19 +1416,19 @@ public class ModRecipes // Mycelium Byproducts RecipeHandler.addRecipe( - new CentrifugeRecipe(new ItemStack(Blocks.mycelium, 8), null, new ItemStack(Blocks.brown_mushroom, 2), - new ItemStack(Blocks.red_mushroom, 2), new ItemStack(Items.clay_ball, 1), - new ItemStack(Blocks.sand, 4), 1640, 5)); + new CentrifugeRecipe(new ItemStack(Blocks.MYCELIUM, 8), null, new ItemStack(Blocks.BROWN_MUSHROOM, 2), + new ItemStack(Blocks.RED_MUSHROOM, 2), new ItemStack(Items.CLAY_BALL, 1), + new ItemStack(Blocks.SAND, 4), 1640, 5)); // Blaze Powder Byproducts RecipeHandler.addRecipe( - new CentrifugeRecipe(new ItemStack(Items.blaze_powder), null, ItemDusts.getDustByName("darkAshes", 1), + new CentrifugeRecipe(new ItemStack(Items.BLAZE_POWDER), null, ItemDusts.getDustByName("darkAshes", 1), ItemDusts.getDustByName("sulfur", 1), null, null, 1240, 5)); // Magma Cream Products RecipeHandler.addRecipe( - new CentrifugeRecipe(new ItemStack(Items.magma_cream, 1), null, new ItemStack(Items.blaze_powder, 1), - new ItemStack(Items.slime_ball, 1), null, null, 2500, 5)); + new CentrifugeRecipe(new ItemStack(Items.MAGMA_CREAM, 1), null, new ItemStack(Items.BLAZE_POWDER, 1), + new ItemStack(Items.SLIME_BALL, 1), null, null, 2500, 5)); // Dust Byproducts // RecipeHandler.addRecipe(new @@ -1467,16 +1467,16 @@ public class ModRecipes new CentrifugeRecipe(ItemDusts.getDustByName("bronze", 4), null, ItemDusts.getDustByName("tin", 1), ItemDusts.getDustByName("copper", 3), null, null, 2420, 5)); RecipeHandler.addRecipe( - new CentrifugeRecipe(ItemDusts.getDustByName("netherrack", 16), null, new ItemStack(Items.redstone, 1), + new CentrifugeRecipe(ItemDusts.getDustByName("netherrack", 16), null, new ItemStack(Items.REDSTONE, 1), ItemDusts.getDustByName("sulfur", 4), ItemDusts.getDustByName("basalt", 1), - new ItemStack(Items.gold_nugget, 1), 2400, 5)); + new ItemStack(Items.GOLD_NUGGET, 1), 2400, 5)); RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("enderEye", 1), null, - ItemDusts.getDustByName("enderPearl", 1), new ItemStack(Items.blaze_powder, 1), null, null, 1280, 5)); + ItemDusts.getDustByName("enderPearl", 1), new ItemStack(Items.BLAZE_POWDER, 1), null, null, 1280, 5)); RecipeHandler.addRecipe( - new CentrifugeRecipe(new ItemStack(Items.glowstone_dust, 16), RecipeUtils.getEmptyCell(1), + new CentrifugeRecipe(new ItemStack(Items.GLOWSTONE_DUST, 16), RecipeUtils.getEmptyCell(1), ItemCells.getCellByName("helium", 1, false), ItemDusts.getDustByName("gold", 8), - new ItemStack(Items.redstone), null, 25000, 20)); + new ItemStack(Items.REDSTONE), null, 25000, 20)); } static void addIndustrialGrinderRecipes() @@ -1493,11 +1493,11 @@ public class ModRecipes OreUtil.getStackFromName("dustSmall" + capitalizeFirstLetter(ore), 2), null, 100, 120)); RecipeHandler.addRecipe( new IndustrialGrinderRecipe(OreUtil.getStackFromName("block" + capitalizeFirstLetter(ore)), - new ItemStack(Items.water_bucket), null, + new ItemStack(Items.WATER_BUCKET), null, OreUtil.getStackFromName("ingot" + capitalizeFirstLetter(ore)), OreUtil.getStackFromName("dustSmall" + capitalizeFirstLetter(ore), 6), OreUtil.getStackFromName("dustSmall" + capitalizeFirstLetter(ore), 2), - new ItemStack(Items.bucket), 100, 120)); + new ItemStack(Items.BUCKET), 100, 120)); } } @@ -1511,9 +1511,9 @@ public class ModRecipes new IndustrialGrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("copper", 2), ItemDustsSmall.getSmallDustByName("Gold", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1), null, 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, + RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.WATER_BUCKET), null, ItemDusts.getDustByName("copper", 2), ItemDustsSmall.getSmallDustByName("Gold", 1), - ItemDustsSmall.getSmallDustByName("Nickel", 1), new ItemStack(Items.bucket), 100, 120)); + ItemDustsSmall.getSmallDustByName("Nickel", 1), new ItemStack(Items.BUCKET), 100, 120)); RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, null, new FluidStack(ModFluids.fluidSodiumpersulfate, 1000), ItemDusts.getDustByName("copper", 2), @@ -1522,7 +1522,7 @@ public class ModRecipes RecipeHandler.addRecipe( new IndustrialGrinderRecipe(oreStack, new ItemStack(ModItems.bucketSodiumpersulfate), null, ItemDusts.getDustByName("copper", 2), ItemDusts.getDustByName("gold", 1), - ItemDustsSmall.getSmallDustByName("Nickel", 1), new ItemStack(Items.bucket), 100, 120)); + ItemDustsSmall.getSmallDustByName("Nickel", 1), new ItemStack(Items.BUCKET), 100, 120)); RecipeHandler.addRecipe( new IndustrialGrinderRecipe(oreStack, null, new FluidStack(ModFluids.fluidMercury, 1000), @@ -1531,7 +1531,7 @@ public class ModRecipes RecipeHandler.addRecipe( new IndustrialGrinderRecipe(oreStack, ItemCells.getCellByName("mercury", 1), null, ItemDusts.getDustByName("copper", 2), ItemDustsSmall.getSmallDustByName("Gold", 1), - ItemDusts.getDustByName("nickel", 1), new ItemStack(Items.bucket), 100, 120)); + ItemDusts.getDustByName("nickel", 1), new ItemStack(Items.BUCKET), 100, 120)); } catch (Exception e) { Core.logHelper.info("Failed to Load Grinder Recipe for Copper Ore"); @@ -1548,9 +1548,9 @@ public class ModRecipes new IndustrialGrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("tin", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDustsSmall.getSmallDustByName("Zinc", 1), null, 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, + RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.WATER_BUCKET), null, ItemDusts.getDustByName("tin", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), - ItemDustsSmall.getSmallDustByName("Zinc", 1), new ItemStack(Items.bucket), 100, 120)); + ItemDustsSmall.getSmallDustByName("Zinc", 1), new ItemStack(Items.BUCKET), 100, 120)); RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, null, new FluidStack(ModFluids.fluidSodiumpersulfate, 1000), ItemDusts.getDustByName("tin", 2), @@ -1559,7 +1559,7 @@ public class ModRecipes RecipeHandler.addRecipe( new IndustrialGrinderRecipe(oreStack, new ItemStack(ModItems.bucketSodiumpersulfate), null, ItemDusts.getDustByName("tin", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), - ItemDusts.getDustByName("zinc", 1), new ItemStack(Items.bucket), 100, 120)); + ItemDusts.getDustByName("zinc", 1), new ItemStack(Items.BUCKET), 100, 120)); } catch (Exception e) { Core.logHelper.info("Failed to Load Grinder Recipe for Tin Ore"); @@ -1576,9 +1576,9 @@ public class ModRecipes new IndustrialGrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("nickel", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDustsSmall.getSmallDustByName("Platinum", 1), null, 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, + RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.WATER_BUCKET), null, ItemDusts.getDustByName("nickel", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), - ItemDustsSmall.getSmallDustByName("Platinum", 1), new ItemStack(Items.bucket), 100, 120)); + ItemDustsSmall.getSmallDustByName("Platinum", 1), new ItemStack(Items.BUCKET), 100, 120)); RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, null, new FluidStack(ModFluids.fluidSodiumpersulfate, 1000), ItemDusts.getDustByName("nickel", 3), @@ -1587,7 +1587,7 @@ public class ModRecipes RecipeHandler.addRecipe( new IndustrialGrinderRecipe(oreStack, new ItemStack(ModItems.bucketSodiumpersulfate), null, ItemDusts.getDustByName("nickel", 3), ItemDustsSmall.getSmallDustByName("Iron", 1), - ItemDustsSmall.getSmallDustByName("Platinum", 1), new ItemStack(Items.bucket), 100, + ItemDustsSmall.getSmallDustByName("Platinum", 1), new ItemStack(Items.BUCKET), 100, 120)); RecipeHandler.addRecipe( @@ -1597,7 +1597,7 @@ public class ModRecipes RecipeHandler.addRecipe( new IndustrialGrinderRecipe(oreStack, new ItemStack(ModItems.bucketMercury), null, ItemDusts.getDustByName("nickel", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), - ItemDusts.getDustByName("platinum", 1), new ItemStack(Items.bucket), 100, 120)); + ItemDusts.getDustByName("platinum", 1), new ItemStack(Items.BUCKET), 100, 120)); } catch (Exception e) { Core.logHelper.info("Failed to Load Grinder Recipe for Nickel Ore"); @@ -1614,9 +1614,9 @@ public class ModRecipes new IndustrialGrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("zinc", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDustsSmall.getSmallDustByName("Tin", 1), null, 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, + RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.WATER_BUCKET), null, ItemDusts.getDustByName("zinc", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), - ItemDustsSmall.getSmallDustByName("Tin", 1), new ItemStack(Items.bucket), 100, 120)); + ItemDustsSmall.getSmallDustByName("Tin", 1), new ItemStack(Items.BUCKET), 100, 120)); RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, null, new FluidStack(ModFluids.fluidSodiumpersulfate, 1000), ItemDusts.getDustByName("zinc", 2), @@ -1625,7 +1625,7 @@ public class ModRecipes RecipeHandler.addRecipe( new IndustrialGrinderRecipe(oreStack, new ItemStack(ModItems.bucketSodiumpersulfate), null, ItemDusts.getDustByName("zinc", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), - ItemDusts.getDustByName("iron", 1), new ItemStack(Items.bucket), 100, 120)); + ItemDusts.getDustByName("iron", 1), new ItemStack(Items.BUCKET), 100, 120)); } catch (Exception e) { Core.logHelper.info("Failed to Load Grinder Recipe for Zinc Ore"); @@ -1642,9 +1642,9 @@ public class ModRecipes new IndustrialGrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("silver", 2), ItemDustsSmall.getSmallDustByName("Lead", 1), ItemDustsSmall.getSmallDustByName("Sulfur", 1), null, 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, + RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.WATER_BUCKET), null, ItemDusts.getDustByName("silver", 2), ItemDustsSmall.getSmallDustByName("Lead", 1), - ItemDustsSmall.getSmallDustByName("Sulfur", 1), new ItemStack(Items.bucket), 100, 120)); + ItemDustsSmall.getSmallDustByName("Sulfur", 1), new ItemStack(Items.BUCKET), 100, 120)); RecipeHandler.addRecipe( new IndustrialGrinderRecipe(oreStack, null, new FluidStack(ModFluids.fluidMercury, 1000), @@ -1653,7 +1653,7 @@ public class ModRecipes RecipeHandler.addRecipe( new IndustrialGrinderRecipe(oreStack, new ItemStack(ModItems.bucketMercury), null, ItemDusts.getDustByName("silver", 3), ItemDustsSmall.getSmallDustByName("Lead", 1), - ItemDustsSmall.getSmallDustByName("Sulfur", 1), new ItemStack(Items.bucket), 100, 120)); + ItemDustsSmall.getSmallDustByName("Sulfur", 1), new ItemStack(Items.BUCKET), 100, 120)); } catch (Exception e) { Core.logHelper.info("Failed to Load Grinder Recipe for Silver Ore"); @@ -1670,9 +1670,9 @@ public class ModRecipes new IndustrialGrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("lead", 2), ItemDustsSmall.getSmallDustByName("Silver", 1), ItemDustsSmall.getSmallDustByName("Sulfur", 1), null, 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, + RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.WATER_BUCKET), null, ItemDusts.getDustByName("lead", 2), ItemDustsSmall.getSmallDustByName("Silver", 1), - ItemDustsSmall.getSmallDustByName("Sulfur", 1), new ItemStack(Items.bucket), 100, 120)); + ItemDustsSmall.getSmallDustByName("Sulfur", 1), new ItemStack(Items.BUCKET), 100, 120)); RecipeHandler.addRecipe( new IndustrialGrinderRecipe(oreStack, null, new FluidStack(ModFluids.fluidMercury, 1000), @@ -1681,7 +1681,7 @@ public class ModRecipes RecipeHandler.addRecipe( new IndustrialGrinderRecipe(oreStack, new ItemStack(ModItems.bucketMercury), null, ItemDusts.getDustByName("lead", 2), ItemDusts.getDustByName("silver", 1), - ItemDustsSmall.getSmallDustByName("Sulfur", 1), new ItemStack(Items.bucket), 100, 120)); + ItemDustsSmall.getSmallDustByName("Sulfur", 1), new ItemStack(Items.BUCKET), 100, 120)); } catch (Exception e) { Core.logHelper.info("Failed to Load Grinder Recipe for Lead Ore"); @@ -1700,9 +1700,9 @@ public class ModRecipes new IndustrialGrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), gemStack, gemStack, ItemDustsSmall.getSmallDustByName("Phosphorous", 4), null, 100, 120)); RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, gemStack, + new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.WATER_BUCKET), null, gemStack, gemStack, ItemDustsSmall.getSmallDustByName("Phosphorous", 4), - new ItemStack(Items.bucket), 100, 120)); + new ItemStack(Items.BUCKET), 100, 120)); } catch (Exception e) { Core.logHelper.info("Failed to Load Grinder Recipe for Apatite Ore"); @@ -1716,12 +1716,12 @@ public class ModRecipes { ItemStack dustStack = OreDictionary.getOres("dustNetherQuartz").get(0); dustStack.stackSize = 4; - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.quartz_ore, 1), null, - new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Items.quartz, 2), dustStack, + RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.QUARTZ_ORE, 1), null, + new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Items.QUARTZ, 2), dustStack, ItemDustsSmall.getSmallDustByName("Netherrack", 2), null, 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.quartz_ore, 1), - new ItemStack(Items.water_bucket), null, new ItemStack(Items.quartz, 2), dustStack, - ItemDustsSmall.getSmallDustByName("Netherrack", 2), new ItemStack(Items.bucket), 100, 120)); + RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.QUARTZ_ORE, 1), + new ItemStack(Items.WATER_BUCKET), null, new ItemStack(Items.QUARTZ, 2), dustStack, + ItemDustsSmall.getSmallDustByName("Netherrack", 2), new ItemStack(Items.BUCKET), 100, 120)); } catch (Exception e) { Core.logHelper.info("Failed to Load Grinder Recipe for Nether Quartz Ore"); @@ -1741,8 +1741,8 @@ public class ModRecipes new IndustrialGrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), gemStack, dustStack, null, null, 100, 120)); RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, gemStack, - dustStack, null, new ItemStack(Items.bucket), 100, 120)); + new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.WATER_BUCKET), null, gemStack, + dustStack, null, new ItemStack(Items.BUCKET), 100, 120)); } catch (Exception e) { Core.logHelper.info("Failed to Load Grinder Recipe for Certus Quartz Ore"); @@ -1762,8 +1762,8 @@ public class ModRecipes new IndustrialGrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), gemStack, dustStack, null, null, 100, 120)); RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, gemStack, - dustStack, null, new ItemStack(Items.bucket), 100, 120)); + new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.WATER_BUCKET), null, gemStack, + dustStack, null, new ItemStack(Items.BUCKET), 100, 120)); } catch (Exception e) { Core.logHelper.info("Failed to Load Grinder Recipe for Charged Certus Quartz Ore"); @@ -1784,8 +1784,8 @@ public class ModRecipes new IndustrialGrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), gemStack, dustStack, null, null, 100, 120)); RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, gemStack, - dustStack, null, new ItemStack(Items.bucket), 100, 120)); + new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.WATER_BUCKET), null, gemStack, + dustStack, null, new ItemStack(Items.BUCKET), 100, 120)); } catch (Exception e) { Core.logHelper.info("Failed to Load Grinder Recipe for Certus Quartz Ore"); @@ -1806,8 +1806,8 @@ public class ModRecipes new IndustrialGrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), gemStack, dustStack, null, null, 100, 120)); RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, gemStack, - dustStack, null, new ItemStack(Items.bucket), 100, 120)); + new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.WATER_BUCKET), null, gemStack, + dustStack, null, new ItemStack(Items.BUCKET), 100, 120)); } catch (Exception e) { Core.logHelper.info("Failed to Load Grinder Recipe for Topaz Ore"); @@ -1828,8 +1828,8 @@ public class ModRecipes new IndustrialGrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), gemStack, dustStack, null, null, 100, 120)); RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, gemStack, - dustStack, null, new ItemStack(Items.bucket), 100, 120)); + new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.WATER_BUCKET), null, gemStack, + dustStack, null, new ItemStack(Items.BUCKET), 100, 120)); } catch (Exception e) { Core.logHelper.info("Failed to Load Grinder Recipe for Tanzanite Ore"); @@ -1850,8 +1850,8 @@ public class ModRecipes new IndustrialGrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), gemStack, dustStack, null, null, 100, 120)); RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, gemStack, - dustStack, null, new ItemStack(Items.bucket), 100, 120)); + new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.WATER_BUCKET), null, gemStack, + dustStack, null, new ItemStack(Items.BUCKET), 100, 120)); } catch (Exception e) { Core.logHelper.info("Failed to Load Grinder Recipe for Malachite Ore"); @@ -1864,9 +1864,9 @@ public class ModRecipes ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemDustsSmall.getSmallDustByName("Silver", 1), null, 100, 120)); RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 0), new ItemStack(Items.water_bucket), null, + new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 0), new ItemStack(Items.WATER_BUCKET), null, ItemDusts.getDustByName("galena", 2), ItemDustsSmall.getSmallDustByName("Sulfur", 1), - ItemDustsSmall.getSmallDustByName("Silver", 1), new ItemStack(Items.bucket), 100, 120)); + ItemDustsSmall.getSmallDustByName("Silver", 1), new ItemStack(Items.BUCKET), 100, 120)); RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 0), null, new FluidStack(ModFluids.fluidMercury, 1000), ItemDusts.getDustByName("galena", 2), @@ -1874,7 +1874,7 @@ public class ModRecipes RecipeHandler.addRecipe( new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 0), new ItemStack(ModItems.bucketMercury), null, ItemDusts.getDustByName("galena", 2), ItemDustsSmall.getSmallDustByName("Sulfur", 1), - ItemDusts.getDustByName("silver", 1), new ItemStack(Items.bucket), 100, 120)); + ItemDusts.getDustByName("silver", 1), new ItemStack(Items.BUCKET), 100, 120)); // Ruby Ore RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 2), null, @@ -1882,9 +1882,9 @@ public class ModRecipes ItemDustsSmall.getSmallDustByName("Ruby", 6), ItemDustsSmall.getSmallDustByName("Chrome", 2), null, 100, 120)); RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 2), new ItemStack(Items.water_bucket), null, + new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 2), new ItemStack(Items.WATER_BUCKET), null, ItemGems.getGemByName("ruby", 1), ItemDustsSmall.getSmallDustByName("Ruby", 6), - ItemDustsSmall.getSmallDustByName("Chrome", 2), new ItemStack(Items.bucket), 100, 120)); + ItemDustsSmall.getSmallDustByName("Chrome", 2), new ItemStack(Items.BUCKET), 100, 120)); // Sapphire Ore RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 3), null, @@ -1892,9 +1892,9 @@ public class ModRecipes ItemDustsSmall.getSmallDustByName("Sapphire", 6), ItemDustsSmall.getSmallDustByName("Aluminum", 2), null, 100, 120)); RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 3), new ItemStack(Items.water_bucket), null, + new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 3), new ItemStack(Items.WATER_BUCKET), null, ItemGems.getGemByName("sapphire", 1), ItemDustsSmall.getSmallDustByName("Sapphire", 6), - ItemDustsSmall.getSmallDustByName("Aluminum", 2), new ItemStack(Items.bucket), 100, 120)); + ItemDustsSmall.getSmallDustByName("Aluminum", 2), new ItemStack(Items.BUCKET), 100, 120)); // Bauxite Ore RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 4), null, @@ -1902,9 +1902,9 @@ public class ModRecipes ItemDustsSmall.getSmallDustByName("Grossular", 4), ItemDustsSmall.getSmallDustByName("Titanium", 4), null, 100, 120)); RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 4), new ItemStack(Items.water_bucket), null, + new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 4), new ItemStack(Items.WATER_BUCKET), null, ItemDusts.getDustByName("bauxite", 2), ItemDustsSmall.getSmallDustByName("Grossular", 4), - ItemDustsSmall.getSmallDustByName("Titanium", 4), new ItemStack(Items.bucket), 100, 120)); + ItemDustsSmall.getSmallDustByName("Titanium", 4), new ItemStack(Items.BUCKET), 100, 120)); // Pyrite Ore RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 5), null, @@ -1912,9 +1912,9 @@ public class ModRecipes ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemDustsSmall.getSmallDustByName("Phosphorous", 1), null, 100, 120)); RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 5), new ItemStack(Items.water_bucket), null, + new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 5), new ItemStack(Items.WATER_BUCKET), null, ItemDusts.getDustByName("pyrite", 2), ItemDustsSmall.getSmallDustByName("Sulfur", 1), - ItemDustsSmall.getSmallDustByName("Phosphorous", 1), new ItemStack(Items.bucket), 100, 120)); + ItemDustsSmall.getSmallDustByName("Phosphorous", 1), new ItemStack(Items.BUCKET), 100, 120)); // Cinnabar Ore RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 6), null, @@ -1922,9 +1922,9 @@ public class ModRecipes ItemDustsSmall.getSmallDustByName("Redstone", 1), ItemDustsSmall.getSmallDustByName("Glowstone", 1), null, 100, 120)); RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 6), new ItemStack(Items.water_bucket), null, + new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 6), new ItemStack(Items.WATER_BUCKET), null, ItemDusts.getDustByName("cinnabar", 2), ItemDustsSmall.getSmallDustByName("Redstone", 1), - ItemDustsSmall.getSmallDustByName("Glowstone", 1), new ItemStack(Items.bucket), 100, 120)); + ItemDustsSmall.getSmallDustByName("Glowstone", 1), new ItemStack(Items.BUCKET), 100, 120)); // Sphalerite Ore RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 7), null, @@ -1932,9 +1932,9 @@ public class ModRecipes ItemDustsSmall.getSmallDustByName("Zinc", 1), ItemDustsSmall.getSmallDustByName("YellowGarnet", 1), null, 100, 120)); RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 7), new ItemStack(Items.water_bucket), null, + new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 7), new ItemStack(Items.WATER_BUCKET), null, ItemDusts.getDustByName("sphalerite", 2), ItemDustsSmall.getSmallDustByName("Zinc", 1), - ItemDustsSmall.getSmallDustByName("YellowGarnet", 1), new ItemStack(Items.bucket), 100, 120)); + ItemDustsSmall.getSmallDustByName("YellowGarnet", 1), new ItemStack(Items.BUCKET), 100, 120)); RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 7), null, new FluidStack(ModFluids.fluidSodiumpersulfate, 1000), ItemDusts.getDustByName("sphalerite", 2), @@ -1943,7 +1943,7 @@ public class ModRecipes RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 7), new ItemStack(ModItems.bucketSodiumpersulfate), null, ItemDusts.getDustByName("sphalerite", 2), ItemDusts.getDustByName("zinc", 1), ItemDustsSmall.getSmallDustByName("YellowGarnet", 1), - new ItemStack(Items.bucket), 100, 120)); + new ItemStack(Items.BUCKET), 100, 120)); // Tungsten Ore RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 8), null, @@ -1951,9 +1951,9 @@ public class ModRecipes ItemDustsSmall.getSmallDustByName("Manganese", 1), ItemDustsSmall.getSmallDustByName("Silver", 1), null, 100, 120)); RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 8), new ItemStack(Items.water_bucket), null, + new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 8), new ItemStack(Items.WATER_BUCKET), null, ItemDusts.getDustByName("tungsten", 2), ItemDustsSmall.getSmallDustByName("Manganese", 1), - ItemDustsSmall.getSmallDustByName("Silver", 1), new ItemStack(Items.bucket), 100, 120)); + ItemDustsSmall.getSmallDustByName("Silver", 1), new ItemStack(Items.BUCKET), 100, 120)); RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 8), null, new FluidStack(ModFluids.fluidMercury, 1000), ItemDusts.getDustByName("tungsten", 2), @@ -1962,16 +1962,16 @@ public class ModRecipes RecipeHandler.addRecipe( new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 8), new ItemStack(ModItems.bucketMercury), null, ItemDusts.getDustByName("tungsten", 2), ItemDustsSmall.getSmallDustByName("Manganese", 1), - ItemDusts.getDustByName("silver", 2), new ItemStack(Items.bucket), 100, 120)); + ItemDusts.getDustByName("silver", 2), new ItemStack(Items.BUCKET), 100, 120)); // Sheldonite Ore RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 9), null, new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("platinum", 2), ItemNuggets.getNuggetByName("iridium", 2), ItemDusts.getDustByName("nickel", 1), null, 100, 120)); RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 9), new ItemStack(Items.water_bucket), null, + new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 9), new ItemStack(Items.WATER_BUCKET), null, ItemDusts.getDustByName("platinum", 2), ItemNuggets.getNuggetByName("iridium", 2), - ItemDusts.getDustByName("nickel", 1), new ItemStack(Items.bucket), 100, 120)); + ItemDusts.getDustByName("nickel", 1), new ItemStack(Items.BUCKET), 100, 120)); RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 9), null, new FluidStack(ModFluids.fluidMercury, 1000), ItemDusts.getDustByName("platinum", 3), @@ -1979,7 +1979,7 @@ public class ModRecipes RecipeHandler.addRecipe( new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 9), new ItemStack(ModItems.bucketMercury), null, ItemDusts.getDustByName("platinum", 3), ItemNuggets.getNuggetByName("iridium", 2), - ItemDusts.getDustByName("nickel", 1), new ItemStack(Items.bucket), 100, 120)); + ItemDusts.getDustByName("nickel", 1), new ItemStack(Items.BUCKET), 100, 120)); // Peridot Ore RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 10), null, @@ -1987,9 +1987,9 @@ public class ModRecipes ItemDustsSmall.getSmallDustByName("Peridot", 6), ItemDustsSmall.getSmallDustByName("Pyrope", 2), null, 100, 120)); RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 10), new ItemStack(Items.water_bucket), + new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 10), new ItemStack(Items.WATER_BUCKET), null, ItemGems.getGemByName("peridot", 1), ItemDustsSmall.getSmallDustByName("Peridot", 6), - ItemDustsSmall.getSmallDustByName("Pyrope", 2), new ItemStack(Items.bucket), 100, 120)); + ItemDustsSmall.getSmallDustByName("Pyrope", 2), new ItemStack(Items.BUCKET), 100, 120)); // Sodalite Ore RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 11), null, @@ -1997,8 +1997,8 @@ public class ModRecipes ItemDusts.getDustByName("aluminum", 3), null, null, 100, 120)); RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 11), new ItemStack(Items.water_bucket), - null, ItemDusts.getDustByName("sodalite", 12), ItemDusts.getDustByName("aluminum", 3), null, new ItemStack(Items.bucket), 100, 120)); + new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 11), new ItemStack(Items.WATER_BUCKET), + null, ItemDusts.getDustByName("sodalite", 12), ItemDusts.getDustByName("aluminum", 3), null, new ItemStack(Items.BUCKET), 100, 120)); } static void addImplosionCompressorRecipes() @@ -2011,8 +2011,8 @@ public class ModRecipes new ChemicalReactorRecipe(ItemCells.getCellByName("calcium", 1), ItemCells.getCellByName("carbon", 1), ItemCells.getCellByName("calciumCarbonate", 2), 240, 30)); RecipeHandler.addRecipe( - new ChemicalReactorRecipe(new ItemStack(Items.gold_nugget, 8), new ItemStack(Items.melon, 1), - new ItemStack(Items.speckled_melon, 1), 40, 30)); + new ChemicalReactorRecipe(new ItemStack(Items.GOLD_NUGGET, 8), new ItemStack(Items.MELON, 1), + new ItemStack(Items.SPECKLED_MELON, 1), 40, 30)); RecipeHandler.addRecipe( new ChemicalReactorRecipe(ItemCells.getCellByName("nitrogen", 1), ItemCells.getCellByName("carbon", 1), ItemCells.getCellByName("nitrocarbon", 2), 1500, 30)); @@ -2023,23 +2023,23 @@ public class ModRecipes new ChemicalReactorRecipe(ItemCells.getCellByName("sulfur", 1), ItemCells.getCellByName("sodium", 1), ItemCells.getCellByName("sodiumSulfide", 2), 100, 30)); RecipeHandler.addRecipe( - new ChemicalReactorRecipe(new ItemStack(Items.blaze_powder, 1), new ItemStack(Items.ender_pearl, 1), - new ItemStack(Items.ender_eye, 1), 40, 30)); + new ChemicalReactorRecipe(new ItemStack(Items.BLAZE_POWDER, 1), new ItemStack(Items.ENDER_PEARL, 1), + new ItemStack(Items.ENDER_EYE, 1), 40, 30)); RecipeHandler.addRecipe( - new ChemicalReactorRecipe(new ItemStack(Items.gold_nugget, 8), new ItemStack(Items.carrot, 1), - new ItemStack(Items.golden_carrot, 1), 40, 30)); + new ChemicalReactorRecipe(new ItemStack(Items.GOLD_NUGGET, 8), new ItemStack(Items.CARROT, 1), + new ItemStack(Items.GOLDEN_CARROT, 1), 40, 30)); RecipeHandler.addRecipe( new ChemicalReactorRecipe(ItemCells.getCellByName("glyceryl", 1), ItemCells.getCellByName("diesel", 4), ItemCells.getCellByName("nitroDiesel", 5), 1000, 30)); RecipeHandler.addRecipe( - new ChemicalReactorRecipe(new ItemStack(Items.gold_ingot, 8), new ItemStack(Items.apple, 1), - new ItemStack(Items.golden_apple, 1), 40, 30)); + new ChemicalReactorRecipe(new ItemStack(Items.GOLD_INGOT, 8), new ItemStack(Items.APPLE, 1), + new ItemStack(Items.GOLDEN_APPLE, 1), 40, 30)); RecipeHandler.addRecipe( - new ChemicalReactorRecipe(new ItemStack(Blocks.gold_block, 8), new ItemStack(Items.apple, 1), - new ItemStack(Items.golden_apple, 1, 1), 40, 30)); + new ChemicalReactorRecipe(new ItemStack(Blocks.GOLD_BLOCK, 8), new ItemStack(Items.APPLE, 1), + new ItemStack(Items.GOLDEN_APPLE, 1, 1), 40, 30)); RecipeHandler.addRecipe( - new ChemicalReactorRecipe(new ItemStack(Items.blaze_powder, 1), new ItemStack(Items.slime_ball, 1), - new ItemStack(Items.magma_cream, 1), 40, 30)); + new ChemicalReactorRecipe(new ItemStack(Items.BLAZE_POWDER, 1), new ItemStack(Items.SLIME_BALL, 1), + new ItemStack(Items.MAGMA_CREAM, 1), 40, 30)); } static void addIndustrialElectrolyzerRecipes() @@ -2059,7 +2059,7 @@ public class ModRecipes static void addIc2Recipes() { CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.manual), ItemIngots.getIngotByName("refinedIron"), - Items.book); + Items.BOOK); CraftingHelper .addShapedOreRecipe(ItemParts.getPartByName("machineParts", 16), "CSC", "SCS", "CSC", 'S', "ingotSteel", @@ -2093,7 +2093,7 @@ public class ModRecipes CraftingHelper .addShapedOreRecipe(new ItemStack(ModBlocks.heatGenerator), "III", "IHI", "CGC", 'I', "plateIron", 'H', - new ItemStack(Blocks.iron_bars), 'C', "circuitBasic", 'G', ModBlocks.Generator); + new ItemStack(Blocks.IRON_BARS), 'C', "circuitBasic", 'G', ModBlocks.Generator); CraftingHelper .addShapedOreRecipe(new ItemStack(ModBlocks.Gasturbine), "IAI", "WGW", "IAI", 'I', "ingotInvar", 'A', @@ -2183,7 +2183,7 @@ public class ModRecipes ModBlocks.Compressor, 'E', ModBlocks.Extractor); CraftingHelper - .addShapedOreRecipe(new ItemStack(ModBlocks.RollingMachine), "PCP", "MBM", "PCP", 'P', Blocks.piston, + .addShapedOreRecipe(new ItemStack(ModBlocks.RollingMachine), "PCP", "MBM", "PCP", 'P', Blocks.PISTON, 'C', ItemParts.getPartByName("advancedCircuit"), 'M', ModBlocks.Compressor, 'B', BlockMachineFrame.getFrameByName("machine", 1)); @@ -2255,23 +2255,23 @@ public class ModRecipes // Saw mill ItemStack pulpStack = OreDictionary.getOres("pulpWood").get(0); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.log, 1, 0), - TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Blocks.planks, 6, 0), pulpStack, + RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.LOG, 1, 0), + TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Blocks.PLANKS, 6, 0), pulpStack, ItemCells.getCellByName("empty"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.log, 1, 0), - TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Blocks.planks, 6, 0), pulpStack, + RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.LOG, 1, 0), + TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Blocks.PLANKS, 6, 0), pulpStack, ItemCells.getCellByName("empty"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.log, 1, 2), - TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Blocks.planks, 6, 2), pulpStack, + RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.LOG, 1, 2), + TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Blocks.PLANKS, 6, 2), pulpStack, ItemCells.getCellByName("empty"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.log, 1, 3), - TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Blocks.planks, 6, 3), pulpStack, + RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.LOG, 1, 3), + TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Blocks.PLANKS, 6, 3), pulpStack, ItemCells.getCellByName("empty"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.log2, 1, 0), - TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Blocks.planks, 6, 4), pulpStack, + RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.LOG2, 1, 0), + TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Blocks.PLANKS, 6, 4), pulpStack, ItemCells.getCellByName("empty"), 200, 30, false)); - RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.log2, 1, 1), - TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Blocks.planks, 6, 5), pulpStack, + RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Blocks.LOG2, 1, 1), + TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Blocks.PLANKS, 6, 5), pulpStack, ItemCells.getCellByName("empty"), 200, 30, false)); // UU @@ -2305,68 +2305,68 @@ public class ModRecipes // Methane RecipeHandler.addRecipe( - new CentrifugeRecipe(new ItemStack(Items.mushroom_stew, 16), ItemCells.getCellByName("empty"), + new CentrifugeRecipe(new ItemStack(Items.MUSHROOM_STEW, 16), ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.apple, 32), ItemCells.getCellByName("empty"), + RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.APPLE, 32), ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); RecipeHandler.addRecipe( - new CentrifugeRecipe(new ItemStack(Items.porkchop, 12), ItemCells.getCellByName("empty"), + new CentrifugeRecipe(new ItemStack(Items.PORKCHOP, 12), ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); RecipeHandler.addRecipe( - new CentrifugeRecipe(new ItemStack(Items.cooked_porkchop, 16), ItemCells.getCellByName("empty"), + new CentrifugeRecipe(new ItemStack(Items.COOKED_PORKCHOP, 16), ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.bread, 64), ItemCells.getCellByName("empty"), + RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.BREAD, 64), ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.fish, 12), ItemCells.getCellByName("empty"), + RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.FISH, 12), ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); RecipeHandler.addRecipe( - new CentrifugeRecipe(new ItemStack(Items.cooked_fish, 16), ItemCells.getCellByName("empty"), + new CentrifugeRecipe(new ItemStack(Items.COOKED_FISH, 16), ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.beef, 12), ItemCells.getCellByName("empty"), + RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.BEEF, 12), ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); RecipeHandler.addRecipe( - new CentrifugeRecipe(new ItemStack(Items.cooked_beef, 16), ItemCells.getCellByName("empty"), + new CentrifugeRecipe(new ItemStack(Items.COOKED_BEEF, 16), ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); RecipeHandler.addRecipe( - new CentrifugeRecipe(new ItemStack(Blocks.pumpkin, 16), ItemCells.getCellByName("empty"), + new CentrifugeRecipe(new ItemStack(Blocks.PUMPKIN, 16), ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); RecipeHandler.addRecipe( - new CentrifugeRecipe(new ItemStack(Items.speckled_melon, 1), ItemCells.getCellByName("empty"), - ItemCells.getCellByName("methane", 1), new ItemStack(Items.gold_nugget, 6), null, null, 5000, + new CentrifugeRecipe(new ItemStack(Items.SPECKLED_MELON, 1), ItemCells.getCellByName("empty"), + ItemCells.getCellByName("methane", 1), new ItemStack(Items.GOLD_NUGGET, 6), null, null, 5000, 5)); RecipeHandler.addRecipe( - new CentrifugeRecipe(new ItemStack(Items.spider_eye, 32), ItemCells.getCellByName("empty"), + new CentrifugeRecipe(new ItemStack(Items.SPIDER_EYE, 32), ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.chicken, 12), ItemCells.getCellByName("empty"), + RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.CHICKEN, 12), ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); RecipeHandler.addRecipe( - new CentrifugeRecipe(new ItemStack(Items.cooked_chicken, 16), ItemCells.getCellByName("empty"), + new CentrifugeRecipe(new ItemStack(Items.COOKED_CHICKEN, 16), ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); RecipeHandler.addRecipe( - new CentrifugeRecipe(new ItemStack(Items.rotten_flesh, 16), ItemCells.getCellByName("empty"), + new CentrifugeRecipe(new ItemStack(Items.ROTTEN_FLESH, 16), ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.melon, 64), ItemCells.getCellByName("empty"), + RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.MELON, 64), ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.cookie, 64), ItemCells.getCellByName("empty"), + RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.COOKIE, 64), ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.cake, 8), ItemCells.getCellByName("empty"), + RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.CAKE, 8), ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); RecipeHandler.addRecipe( - new CentrifugeRecipe(new ItemStack(Items.golden_carrot, 1), ItemCells.getCellByName("empty"), - ItemCells.getCellByName("methane", 1), new ItemStack(Items.gold_nugget, 6), null, null, 5000, + new CentrifugeRecipe(new ItemStack(Items.GOLDEN_CARROT, 1), ItemCells.getCellByName("empty"), + ItemCells.getCellByName("methane", 1), new ItemStack(Items.GOLD_NUGGET, 6), null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.carrot, 16), ItemCells.getCellByName("empty"), + RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.CARROT, 16), ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); RecipeHandler.addRecipe( - new CentrifugeRecipe(new ItemStack(Items.baked_potato, 24), ItemCells.getCellByName("empty"), + new CentrifugeRecipe(new ItemStack(Items.BAKED_POTATO, 24), ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.potato, 16), ItemCells.getCellByName("empty"), + RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.POTATO, 16), ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); RecipeHandler.addRecipe( - new CentrifugeRecipe(new ItemStack(Items.poisonous_potato, 12), ItemCells.getCellByName("empty"), + new CentrifugeRecipe(new ItemStack(Items.POISONOUS_POTATO, 12), ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); RecipeHandler.addRecipe( - new CentrifugeRecipe(new ItemStack(Items.nether_wart, 1), ItemCells.getCellByName("empty"), + new CentrifugeRecipe(new ItemStack(Items.NETHER_WART, 1), ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); // Fix with ic2 // RecipeHandler.addRecipe(new CentrifugeRecipe(new @@ -2374,35 +2374,35 @@ public class ModRecipes // 16), ItemCells.getCellByName("empty"), // ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); RecipeHandler.addRecipe( - new CentrifugeRecipe(new ItemStack(Blocks.brown_mushroom, 1), ItemCells.getCellByName("empty"), + new CentrifugeRecipe(new ItemStack(Blocks.BROWN_MUSHROOM, 1), ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); RecipeHandler.addRecipe( - new CentrifugeRecipe(new ItemStack(Blocks.red_mushroom, 1), ItemCells.getCellByName("empty"), + new CentrifugeRecipe(new ItemStack(Blocks.RED_MUSHROOM, 1), ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5)); // Rubber Wood Yields RecipeHandler.addRecipe( new CentrifugeRecipe(new ItemStack(TechRebornAPI.recipeCompact.getItem("rubberWood").getItem(), 16), ItemCells.getCellByName("empty", 5), new ItemStack(ModItems.parts, 8, 41), - new ItemStack(Blocks.sapling, 6), ItemCells.getCellByName("methane", 1), + new ItemStack(Blocks.SAPLING, 6), ItemCells.getCellByName("methane", 1), ItemCells.getCellByName("carbon", 4), 5000, 5, false)); // Soul Sand Byproducts RecipeHandler.addRecipe( - new CentrifugeRecipe(new ItemStack(Blocks.soul_sand, 16), ItemCells.getCellByName("empty"), + new CentrifugeRecipe(new ItemStack(Blocks.SOUL_SAND, 16), ItemCells.getCellByName("empty"), ItemCells.getCellByName("oil", 1), ItemDusts.getDustByName("saltpeter", 4), - ItemDusts.getDustByName("coal", 1), new ItemStack(Blocks.sand, 10), 2500, 5)); + ItemDusts.getDustByName("coal", 1), new ItemStack(Blocks.SAND, 10), 2500, 5)); // Ice RecipeHandler.addRecipe( - new CentrifugeRecipe(ItemCells.getCellByName("ice", 1), null, new ItemStack(Blocks.ice, 1), + new CentrifugeRecipe(ItemCells.getCellByName("ice", 1), null, new ItemStack(Blocks.ICE, 1), ItemCells.getCellByName("empty"), null, null, 40, 5)); // Dust Byproducts RecipeHandler.addRecipe( - new CentrifugeRecipe(new ItemStack(Items.glowstone_dust, 16), ItemCells.getCellByName("empty"), - new ItemStack(Items.redstone, 8), ItemDusts.getDustByName("gold", 8), + new CentrifugeRecipe(new ItemStack(Items.GLOWSTONE_DUST, 16), ItemCells.getCellByName("empty"), + new ItemStack(Items.REDSTONE, 8), ItemDusts.getDustByName("gold", 8), ItemCells.getCellByName("helium", 1), null, 25000, 5)); RecipeHandler.addRecipe( new CentrifugeRecipe(ItemDusts.getDustByName("phosphorous", 5), ItemCells.getCellByName("empty", 3), @@ -2411,13 +2411,13 @@ public class ModRecipes new CentrifugeRecipe(ItemDusts.getDustByName("ashes", 1), ItemCells.getCellByName("empty"), ItemCells.getCellByName("carbon"), null, null, null, 80, 5)); RecipeHandler.addRecipe( - new CentrifugeRecipe(new ItemStack(Items.redstone, 10), ItemCells.getCellByName("empty", 4), + new CentrifugeRecipe(new ItemStack(Items.REDSTONE, 10), ItemCells.getCellByName("empty", 4), ItemCells.getCellByName("silicon", 1), ItemDusts.getDustByName("pyrite", 3), ItemDusts.getDustByName("ruby", 1), ItemCells.getCellByName("mercury", 3), 6800, 5)); RecipeHandler.addRecipe( new CentrifugeRecipe(ItemDusts.getDustByName("endstone", 16), ItemCells.getCellByName("empty", 2), ItemCells.getCellByName("helium3", 1), ItemCells.getCellByName("helium"), - ItemDustsSmall.getSmallDustByName("Tungsten", 1), new ItemStack(Blocks.sand, 12), 4800, 5)); + ItemDustsSmall.getSmallDustByName("Tungsten", 1), new ItemStack(Blocks.SAND, 12), 4800, 5)); RecipeHandler.addRecipe( new CentrifugeRecipe(ItemDusts.getDustByName("cinnabar", 2), ItemCells.getCellByName("empty"), ItemCells.getCellByName("mercury", 1), ItemDusts.getDustByName("sulfur", 1), null, null, 80, @@ -2440,44 +2440,44 @@ public class ModRecipes ItemIngots.getIngotByName("tin", 2), 6000, 5)); // IndustrialGrinderRecipes - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.coal_ore, 1), - TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Items.coal, 1), + RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.COAL_ORE, 1), + TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Items.COAL, 1), ItemDustsSmall.getSmallDustByName("Coal", 6), ItemDustsSmall.getSmallDustByName("Coal", 2), ItemCells.getCellByName("empty"), 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.iron_ore, 1), + RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.IRON_ORE, 1), TechRebornAPI.recipeCompact.getItem("waterCell"), null, ItemDusts.getDustByName("iron", 2), ItemDustsSmall.getSmallDustByName("Nickel", 1), ItemDustsSmall.getSmallDustByName("Tin", 1), ItemCells.getCellByName("empty"), 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.gold_ore, 1), + RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.GOLD_ORE, 1), TechRebornAPI.recipeCompact.getItem("waterCell"), null, ItemDusts.getDustByName("gold", 2), ItemDustsSmall.getSmallDustByName("Copper", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1), ItemCells.getCellByName("empty"), 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.iron_ore, 1), + RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.IRON_ORE, 1), ItemCells.getCellByName("sodiumPersulfate", 1), null, ItemDusts.getDustByName("iron", 2), ItemDusts.getDustByName("nickel", 1), ItemDustsSmall.getSmallDustByName("Tin", 1), ItemCells.getCellByName("empty"), 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.gold_ore, 1), + RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.GOLD_ORE, 1), ItemCells.getCellByName("sodiumPersulfate", 1), null, ItemDusts.getDustByName("gold", 2), ItemDusts.getDustByName("copper", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1), ItemCells.getCellByName("empty"), 100, 120)); RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(new ItemStack(Blocks.gold_ore, 1), ItemCells.getCellByName("mercury", 1), + new IndustrialGrinderRecipe(new ItemStack(Blocks.GOLD_ORE, 1), ItemCells.getCellByName("mercury", 1), null, ItemDusts.getDustByName("gold", 3), ItemDustsSmall.getSmallDustByName("Copper", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1), ItemCells.getCellByName("empty"), 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.diamond_ore, 1), - TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Items.diamond, 1), + RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.DIAMOND_ORE, 1), + TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Items.DIAMOND, 1), ItemDustsSmall.getSmallDustByName("Diamond", 6), ItemDustsSmall.getSmallDustByName("Coal", 2), ItemCells.getCellByName("empty"), 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.emerald_ore, 1), - TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Items.emerald, 1), + RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.EMERALD_ORE, 1), + TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Items.EMERALD, 1), ItemDustsSmall.getSmallDustByName("Emerald", 6), ItemDustsSmall.getSmallDustByName("Aluminum", 2), ItemCells.getCellByName("empty"), 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.redstone_ore, 1), - TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Items.redstone, 10), + RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.REDSTONE_ORE, 1), + TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Items.REDSTONE, 10), ItemDustsSmall.getSmallDustByName("Cinnabar", 1), ItemDustsSmall.getSmallDustByName("Glowstone", 1), ItemCells.getCellByName("empty"), 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.lapis_ore, 1), - TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Items.dye, 6, 4), + RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.LAPIS_ORE, 1), + TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Items.DYE, 6, 4), ItemDustsSmall.getSmallDustByName("Lazurite", 3), null, ItemCells.getCellByName("empty"), 100, 120)); @@ -2638,8 +2638,8 @@ public class ModRecipes new IndustrialGrinderRecipe(oreStack, TechRebornAPI.recipeCompact.getItem("waterCell"), null, uranium238Stack, uranium235Stack, null, ItemCells.getCellByName("empty"), 100, 120)); RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, uranium238Stack, - uranium235Stack, null, new ItemStack(Items.bucket), 100, 120)); + new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.WATER_BUCKET), null, uranium238Stack, + uranium235Stack, null, new ItemStack(Items.BUCKET), 100, 120)); } catch (Exception e) { Core.logHelper.info("Failed to Load Grinder Recipe for Uranium Ore"); @@ -2663,8 +2663,8 @@ public class ModRecipes new IndustrialGrinderRecipe(oreStack, TechRebornAPI.recipeCompact.getItem("waterCell"), null, uranium238Stack, uranium235Stack, null, ItemCells.getCellByName("empty"), 100, 120)); RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, uranium238Stack, - uranium235Stack, null, new ItemStack(Items.bucket), 100, 120)); + new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.WATER_BUCKET), null, uranium238Stack, + uranium235Stack, null, new ItemStack(Items.BUCKET), 100, 120)); } catch (Exception e) { Core.logHelper.info("Failed to Load Grinder Recipe for Uranium Ore"); @@ -2921,8 +2921,8 @@ public class ModRecipes { ItemStack dustStack = OreDictionary.getOres("dustNetherQuartz").get(0); dustStack.stackSize = 4; - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.quartz_ore, 1), - TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Items.quartz, 2), + RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.QUARTZ_ORE, 1), + TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Items.QUARTZ, 2), dustStack, ItemDustsSmall.getSmallDustByName("Netherrack", 2), ItemCells.getCellByName("empty"), 100, 120)); } catch (Exception e) @@ -3054,7 +3054,7 @@ public class ModRecipes ItemDusts.getDustByName("darkAshes", 16), 20, 30)); RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("emerald", 4), new ItemStack(TechRebornAPI.recipeCompact.getItem("industrialTnt").getItem(), 24), - new ItemStack(Items.emerald, 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); + new ItemStack(Items.EMERALD, 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("sapphire", 4), new ItemStack(TechRebornAPI.recipeCompact.getItem("industrialTnt").getItem(), 24), ItemGems.getGemByName("sapphire", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); @@ -3091,8 +3091,8 @@ public class ModRecipes TechRebornAPI.recipeCompact.getItem("waterCell"), null, TechRebornAPI.recipeCompact.getItem("iridiumOre"), ItemDustsSmall.getSmallDustByName("Platinum", 2), null, ItemCells.getCellByName("empty"), 100, 120)); RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 1), new ItemStack(Items.water_bucket), null, - TechRebornAPI.recipeCompact.getItem("iridiumOre"),ItemDustsSmall.getSmallDustByName("Platinum", 2), null, new ItemStack(Items.bucket), 100, 120)); + new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 1), new ItemStack(Items.WATER_BUCKET), null, + TechRebornAPI.recipeCompact.getItem("iridiumOre"),ItemDustsSmall.getSmallDustByName("Platinum", 2), null, new ItemStack(Items.BUCKET), 100, 120)); RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 1), null, new FluidStack(ModFluids.fluidMercury, 1000), TechRebornAPI.recipeCompact.getItem("iridiumOre"), @@ -3107,7 +3107,7 @@ public class ModRecipes new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 1), new ItemStack(ModItems.bucketMercury), null, TechRebornAPI.recipeCompact.getItem("iridiumOre"), ItemDustsSmall.getSmallDustByName("Platinum", 2), null, - new ItemStack(Items.bucket), 100, 120)); + new ItemStack(Items.BUCKET), 100, 120)); RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 2), TechRebornAPI.recipeCompact.getItem("waterCell"), null, ItemGems.getGemByName("ruby", 1), @@ -3229,7 +3229,7 @@ public class ModRecipes ItemCells.getCellByName("empty", 9), 520, 120)); RecipeHandler.addRecipe( - new IndustrialElectrolyzerRecipe(new ItemStack(Items.dye, 3, 15), ItemCells.getCellByName("empty", 1), + new IndustrialElectrolyzerRecipe(new ItemStack(Items.DYE, 3, 15), ItemCells.getCellByName("empty", 1), null, ItemCells.getCellByName("calcium", 1), null, null, 20, 106)); RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemCells.getCellByName("glyceryl", 20), null, @@ -3254,7 +3254,7 @@ public class ModRecipes ItemDusts.getDustByName("magnesium", 3), ItemCells.getCellByName("silicon", 3), ItemCells.getCellByName("empty", 9), 400, 120)); - ItemStack sand = new ItemStack(Blocks.sand); + ItemStack sand = new ItemStack(Blocks.SAND); sand.stackSize = 16; RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(sand, ItemCells.getCellByName("empty", 2), @@ -3306,7 +3306,7 @@ public class ModRecipes if (ConfigTechReborn.ExpensiveMacerator) CraftingHelper .addShapedOreRecipe(TechRebornAPI.recipeCompact.getItem("macerator"), "FDF", "DMD", "FCF", 'F', - Items.flint, 'D', Items.diamond, 'M', TechRebornAPI.recipeCompact.getItem("machine"), 'C', + Items.FLINT, 'D', Items.DIAMOND, 'M', TechRebornAPI.recipeCompact.getItem("machine"), 'C', TechRebornAPI.recipeCompact.getItem("electronicCircuit")); if (ConfigTechReborn.ExpensiveDrill) @@ -3354,15 +3354,15 @@ public class ModRecipes ItemStack gemspade, ItemStack gemhelmet, ItemStack gemchestplate, ItemStack gemleggings, ItemStack gemboots, ItemStack gem) { - CraftingHelper.addShapedOreRecipe(gemsword, " G ", " G ", " S ", 'S', Items.stick, 'G', gem); + CraftingHelper.addShapedOreRecipe(gemsword, " G ", " G ", " S ", 'S', Items.STICK, 'G', gem); - CraftingHelper.addShapedOreRecipe(gempick, "GGG", " S ", " S ", 'S', Items.stick, 'G', gem); + CraftingHelper.addShapedOreRecipe(gempick, "GGG", " S ", " S ", 'S', Items.STICK, 'G', gem); - CraftingHelper.addShapedOreRecipe(gemaxe, " GG", " SG", " S ", 'S', Items.stick, 'G', gem); + CraftingHelper.addShapedOreRecipe(gemaxe, " GG", " SG", " S ", 'S', Items.STICK, 'G', gem); - CraftingHelper.addShapedOreRecipe(gemHoe, " GG", " S ", " S ", 'S', Items.stick, 'G', gem); + CraftingHelper.addShapedOreRecipe(gemHoe, " GG", " S ", " S ", 'S', Items.STICK, 'G', gem); - CraftingHelper.addShapedOreRecipe(gemspade, " G ", " S ", " S ", 'S', Items.stick, 'G', gem); + CraftingHelper.addShapedOreRecipe(gemspade, " G ", " S ", " S ", 'S', Items.STICK, 'G', gem); CraftingHelper.addShapedOreRecipe(gemhelmet, "GGG", "G G", " ", 'G', gem); diff --git a/src/main/java/techreborn/init/ModSounds.java b/src/main/java/techreborn/init/ModSounds.java index dd266da12..5ceb2ecba 100644 --- a/src/main/java/techreborn/init/ModSounds.java +++ b/src/main/java/techreborn/init/ModSounds.java @@ -18,7 +18,7 @@ public class ModSounds private static SoundEvent getSound(String str) { - SoundEvent soundEvent = SoundEvent.soundEventRegistry.getObject(new ResourceLocation("techreborn" + str)); + SoundEvent soundEvent = SoundEvent.REGISTRY.getObject(new ResourceLocation("techreborn" + str)); return soundEvent; } diff --git a/src/main/java/techreborn/init/RecipeCompact.java b/src/main/java/techreborn/init/RecipeCompact.java index 95f3fe5ad..7527d457a 100644 --- a/src/main/java/techreborn/init/RecipeCompact.java +++ b/src/main/java/techreborn/init/RecipeCompact.java @@ -26,8 +26,8 @@ public class RecipeCompact implements IRecipeCompact public void init() { - recipes.put("industrialDiamond", new ItemStack(Items.diamond)); - recipes.put("industrialTnt", new ItemStack(Blocks.tnt)); + recipes.put("industrialDiamond", new ItemStack(Items.DIAMOND)); + recipes.put("industrialTnt", new ItemStack(Blocks.TNT)); recipes.put("copperIngot", ItemIngots.getIngotByName("copper")); recipes.put("tinIngot", ItemIngots.getIngotByName("tin")); recipes.put("bronzeIngot", ItemIngots.getIngotByName("bronze")); @@ -66,7 +66,7 @@ public class RecipeCompact implements IRecipeCompact recipes.put("reinforcedGlass", new ItemStack(ModBlocks.reinforcedglass)); recipes.put("compressor", new ItemStack(ModBlocks.Compressor)); recipes.put("insulatedGoldCableItem", ItemStandaloneCables.getCableByName("insulatedgold")); - recipes.put("fertilizer", new ItemStack(Items.dye)); + recipes.put("fertilizer", new ItemStack(Items.DYE)); inited = false; } diff --git a/src/main/java/techreborn/items/ItemDusts.java b/src/main/java/techreborn/items/ItemDusts.java index ceba317ea..3c17037ca 100644 --- a/src/main/java/techreborn/items/ItemDusts.java +++ b/src/main/java/techreborn/items/ItemDusts.java @@ -41,15 +41,15 @@ public class ItemDusts extends ItemTextureBase if (name.equalsIgnoreCase("glowstone")) { - return new ItemStack(Items.glowstone_dust, count); + return new ItemStack(Items.GLOWSTONE_DUST, count); } if (name.equalsIgnoreCase("redstone")) { - return new ItemStack(Items.redstone, count); + return new ItemStack(Items.REDSTONE, count); } if (name.equalsIgnoreCase("gunpowder")) { - return new ItemStack(Items.gunpowder, count); + return new ItemStack(Items.GUNPOWDER, count); } throw new InvalidParameterException("The dust " + name + " could not be found."); } diff --git a/src/main/java/techreborn/items/armor/ItemTRArmour.java b/src/main/java/techreborn/items/armor/ItemTRArmour.java index de7ab7d96..13829a509 100644 --- a/src/main/java/techreborn/items/armor/ItemTRArmour.java +++ b/src/main/java/techreborn/items/armor/ItemTRArmour.java @@ -12,6 +12,7 @@ import reborncore.RebornCore; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.lib.ModInfo; +import net.minecraft.item.ItemArmor.ArmorMaterial; /** * Created by modmuss50 on 26/02/2016. */ diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java b/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java index 3ea3dae9a..ec2215452 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java @@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import techreborn.config.ConfigTechReborn; +import net.minecraft.item.Item.ToolMaterial; public class ItemAdvancedChainsaw extends ItemChainsaw { @@ -22,7 +23,7 @@ public class ItemAdvancedChainsaw extends ItemChainsaw @Override public boolean canHarvestBlock(IBlockState blockIn) { - return Items.diamond_axe.canHarvestBlock(blockIn); + return Items.DIAMOND_AXE.canHarvestBlock(blockIn); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java index 64cd3ea61..c2639f149 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java @@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import techreborn.config.ConfigTechReborn; +import net.minecraft.item.Item.ToolMaterial; public class ItemAdvancedDrill extends ItemDrill { @@ -22,7 +23,7 @@ public class ItemAdvancedDrill extends ItemDrill @Override public boolean canHarvestBlock(IBlockState blockIn) { - return Items.diamond_pickaxe.canHarvestBlock(blockIn) || Items.diamond_shovel.canHarvestBlock(blockIn); + return Items.DIAMOND_PICKAXE.canHarvestBlock(blockIn) || Items.DIAMOND_SHOVEL.canHarvestBlock(blockIn); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemChainsaw.java b/src/main/java/techreborn/items/tools/ItemChainsaw.java index 48b60f675..c0ed6e6db 100644 --- a/src/main/java/techreborn/items/tools/ItemChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemChainsaw.java @@ -25,6 +25,7 @@ import reborncore.common.util.TorchHelper; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; +import net.minecraft.item.Item.ToolMaterial; public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, ITexturedItem , IHandHeld { diff --git a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java index 04019c0f3..9a87a0398 100644 --- a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java +++ b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java @@ -41,7 +41,7 @@ public class ItemCloakingDevice extends ItemTextureBase implements IEnergyItemIn player.setInvisible(true); } else { - if (!player.isPotionActive(MobEffects.invisibility)) + if (!player.isPotionActive(MobEffects.INVISIBILITY)) { player.setInvisible(false); } diff --git a/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java b/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java index 6b022f1a6..f25d48b9c 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java @@ -4,6 +4,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Items; import techreborn.config.ConfigTechReborn; +import net.minecraft.item.Item.ToolMaterial; public class ItemDiamondChainsaw extends ItemChainsaw { @@ -17,7 +18,7 @@ public class ItemDiamondChainsaw extends ItemChainsaw @Override public boolean canHarvestBlock(IBlockState blockIn) { - return Items.diamond_axe.canHarvestBlock(blockIn); + return Items.DIAMOND_AXE.canHarvestBlock(blockIn); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemDiamondDrill.java b/src/main/java/techreborn/items/tools/ItemDiamondDrill.java index bb8eeeded..f87a55cbd 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondDrill.java @@ -4,6 +4,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Items; import techreborn.config.ConfigTechReborn; +import net.minecraft.item.Item.ToolMaterial; public class ItemDiamondDrill extends ItemDrill { @@ -17,7 +18,7 @@ public class ItemDiamondDrill extends ItemDrill @Override public boolean canHarvestBlock(IBlockState state) { - return Items.diamond_pickaxe.canHarvestBlock(state) || Items.diamond_shovel.canHarvestBlock(state); + return Items.DIAMOND_PICKAXE.canHarvestBlock(state) || Items.DIAMOND_SHOVEL.canHarvestBlock(state); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java b/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java index c281c6dbd..b019abc8d 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java @@ -2,6 +2,7 @@ package techreborn.items.tools; import techreborn.config.ConfigTechReborn; +import net.minecraft.item.Item.ToolMaterial; public class ItemDiamondJackhammer extends ItemJackhammer { diff --git a/src/main/java/techreborn/items/tools/ItemDrill.java b/src/main/java/techreborn/items/tools/ItemDrill.java index b4920c73c..f1c3411db 100644 --- a/src/main/java/techreborn/items/tools/ItemDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDrill.java @@ -30,6 +30,7 @@ import techreborn.lib.ModInfo; import java.util.List; import java.util.Random; +import net.minecraft.item.Item.ToolMaterial; public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem , IHandHeld { @@ -70,8 +71,8 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITextured { return unpoweredSpeed; } - if (Items.wooden_pickaxe.getStrVsBlock(stack, state) > 1.0F - || Items.wooden_shovel.getStrVsBlock(stack, state) > 1.0F) + if (Items.WOODEN_PICKAXE.getStrVsBlock(stack, state) > 1.0F + || Items.WOODEN_SHOVEL.getStrVsBlock(stack, state) > 1.0F) { return efficiencyOnProperMaterial; } else diff --git a/src/main/java/techreborn/items/tools/ItemFluidbucket.java b/src/main/java/techreborn/items/tools/ItemFluidbucket.java index 5072a897f..0c2191a3c 100644 --- a/src/main/java/techreborn/items/tools/ItemFluidbucket.java +++ b/src/main/java/techreborn/items/tools/ItemFluidbucket.java @@ -20,7 +20,7 @@ public class ItemFluidbucket extends ItemBucket implements ITexturedItem public ItemFluidbucket(BlockFluidBase block) { super(block); - setContainerItem(Items.bucket); + setContainerItem(Items.BUCKET); setCreativeTab(TechRebornCreativeTabMisc.instance); setUnlocalizedName("techreborn.fluidbucket"); RebornCore.jsonDestroyer.registerObject(this); diff --git a/src/main/java/techreborn/items/tools/ItemIronChainsaw.java b/src/main/java/techreborn/items/tools/ItemIronChainsaw.java index 1181d7117..5827207db 100644 --- a/src/main/java/techreborn/items/tools/ItemIronChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemIronChainsaw.java @@ -4,6 +4,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Items; import techreborn.config.ConfigTechReborn; +import net.minecraft.item.Item.ToolMaterial; public class ItemIronChainsaw extends ItemChainsaw { @@ -17,7 +18,7 @@ public class ItemIronChainsaw extends ItemChainsaw @Override public boolean canHarvestBlock(IBlockState state) { - return Items.iron_axe.canHarvestBlock(state); + return Items.IRON_AXE.canHarvestBlock(state); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemIronDrill.java b/src/main/java/techreborn/items/tools/ItemIronDrill.java index 098004f0b..f26cd173d 100644 --- a/src/main/java/techreborn/items/tools/ItemIronDrill.java +++ b/src/main/java/techreborn/items/tools/ItemIronDrill.java @@ -4,6 +4,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Items; import techreborn.config.ConfigTechReborn; +import net.minecraft.item.Item.ToolMaterial; public class ItemIronDrill extends ItemDrill { @@ -17,7 +18,7 @@ public class ItemIronDrill extends ItemDrill @Override public boolean canHarvestBlock(IBlockState state) { - return Items.iron_pickaxe.canHarvestBlock(state) || Items.iron_shovel.canHarvestBlock(state); + return Items.IRON_PICKAXE.canHarvestBlock(state) || Items.IRON_SHOVEL.canHarvestBlock(state); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemIronJackhammer.java b/src/main/java/techreborn/items/tools/ItemIronJackhammer.java index b505739b6..f6226ae0d 100644 --- a/src/main/java/techreborn/items/tools/ItemIronJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemIronJackhammer.java @@ -2,6 +2,7 @@ package techreborn.items.tools; import techreborn.config.ConfigTechReborn; +import net.minecraft.item.Item.ToolMaterial; public class ItemIronJackhammer extends ItemJackhammer { diff --git a/src/main/java/techreborn/items/tools/ItemJackhammer.java b/src/main/java/techreborn/items/tools/ItemJackhammer.java index 23b894c2d..b663b53a8 100644 --- a/src/main/java/techreborn/items/tools/ItemJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemJackhammer.java @@ -30,6 +30,7 @@ import techreborn.utils.OreDictUtils; import java.util.List; import java.util.Random; +import net.minecraft.item.Item.ToolMaterial; public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem , IHandHeld { diff --git a/src/main/java/techreborn/items/tools/ItemNanosaber.java b/src/main/java/techreborn/items/tools/ItemNanosaber.java index 72cdd5dfe..84b25b6d2 100644 --- a/src/main/java/techreborn/items/tools/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tools/ItemNanosaber.java @@ -24,6 +24,7 @@ import reborncore.common.util.ItemNBTHelper; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; +import net.minecraft.item.Item.ToolMaterial; public class ItemNanosaber extends ItemSword implements IEnergyItemInfo, ITexturedItem { diff --git a/src/main/java/techreborn/items/tools/ItemOmniTool.java b/src/main/java/techreborn/items/tools/ItemOmniTool.java index 30f29e7d3..d43a15aa2 100644 --- a/src/main/java/techreborn/items/tools/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tools/ItemOmniTool.java @@ -29,6 +29,7 @@ import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; import techreborn.lib.ModInfo; +import net.minecraft.item.Item.ToolMaterial; public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem { @@ -59,9 +60,9 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, ITextu @Override public boolean canHarvestBlock(IBlockState state) { - return Items.diamond_axe.canHarvestBlock(state) || Items.diamond_sword.canHarvestBlock(state) - || Items.diamond_pickaxe.canHarvestBlock(state) || Items.diamond_shovel.canHarvestBlock(state) - || Items.shears.canHarvestBlock(state); + return Items.DIAMOND_AXE.canHarvestBlock(state) || Items.DIAMOND_SWORD.canHarvestBlock(state) + || Items.DIAMOND_PICKAXE.canHarvestBlock(state) || Items.DIAMOND_SHOVEL.canHarvestBlock(state) + || Items.SHEARS.canHarvestBlock(state); } // @Override diff --git a/src/main/java/techreborn/items/tools/ItemRockCutter.java b/src/main/java/techreborn/items/tools/ItemRockCutter.java index aec0309ec..7f598dc0e 100644 --- a/src/main/java/techreborn/items/tools/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tools/ItemRockCutter.java @@ -22,6 +22,7 @@ import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; import techreborn.lib.ModInfo; +import net.minecraft.item.Item.ToolMaterial; public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem { @@ -58,7 +59,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, ITex @Override public boolean canHarvestBlock(IBlockState state) { - if (Items.diamond_pickaxe.canHarvestBlock(state)) + if (Items.DIAMOND_PICKAXE.canHarvestBlock(state)) { // if (PoweredItem.canUseEnergy(cost, stack)) { // PoweredItem.useEnergy(cost, stack); diff --git a/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java b/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java index 7b7bfcb7b..19f92b116 100644 --- a/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java @@ -2,6 +2,7 @@ package techreborn.items.tools; import techreborn.config.ConfigTechReborn; +import net.minecraft.item.Item.ToolMaterial; public class ItemSteelJackhammer extends ItemJackhammer { diff --git a/src/main/java/techreborn/items/tools/ItemTRAxe.java b/src/main/java/techreborn/items/tools/ItemTRAxe.java index df57a6139..c049ecfda 100644 --- a/src/main/java/techreborn/items/tools/ItemTRAxe.java +++ b/src/main/java/techreborn/items/tools/ItemTRAxe.java @@ -20,12 +20,13 @@ import reborncore.RebornCore; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.lib.ModInfo; +import net.minecraft.item.Item.ToolMaterial; public class ItemTRAxe extends ItemTool implements ITexturedItem , IHandHeld { private ToolMaterial material = ToolMaterial.WOOD; - private static final Set EFFECTIVE_ON = Sets.newHashSet(new Block[] { Blocks.planks, Blocks.bookshelf, - Blocks.log, Blocks.log2, Blocks.chest, Blocks.pumpkin, Blocks.lit_pumpkin, Blocks.melon_block, - Blocks.ladder, Blocks.wooden_button, Blocks.wooden_pressure_plate }); + private static final Set EFFECTIVE_ON = Sets.newHashSet(new Block[] { Blocks.PLANKS, Blocks.BOOKSHELF, + Blocks.LOG, Blocks.LOG2, Blocks.CHEST, Blocks.PUMPKIN, Blocks.LIT_PUMPKIN, Blocks.MELON_BLOCK, + Blocks.LADDER, Blocks.WOODEN_BUTTON, Blocks.WOODEN_PRESSURE_PLATE }); public ItemTRAxe(ToolMaterial material) { super(material, EFFECTIVE_ON); @@ -39,7 +40,7 @@ public class ItemTRAxe extends ItemTool implements ITexturedItem , IHandHeld { public float getStrVsBlock(ItemStack stack, IBlockState state) { Material material = state.getMaterial(); - return material != Material.wood && material != Material.plants && material != Material.vine + return material != Material.WOOD && material != Material.PLANTS && material != Material.VINE ? super.getStrVsBlock(stack, state) : this.efficiencyOnProperMaterial; } diff --git a/src/main/java/techreborn/items/tools/ItemTRHoe.java b/src/main/java/techreborn/items/tools/ItemTRHoe.java index dbd0f4075..60ba447d7 100644 --- a/src/main/java/techreborn/items/tools/ItemTRHoe.java +++ b/src/main/java/techreborn/items/tools/ItemTRHoe.java @@ -12,6 +12,7 @@ import reborncore.RebornCore; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.lib.ModInfo; +import net.minecraft.item.Item.ToolMaterial; public class ItemTRHoe extends ItemHoe implements ITexturedItem, IHandHeld { private ToolMaterial material = ToolMaterial.WOOD; diff --git a/src/main/java/techreborn/items/tools/ItemTRPickaxe.java b/src/main/java/techreborn/items/tools/ItemTRPickaxe.java index f939188ae..04cd82518 100644 --- a/src/main/java/techreborn/items/tools/ItemTRPickaxe.java +++ b/src/main/java/techreborn/items/tools/ItemTRPickaxe.java @@ -12,6 +12,7 @@ import reborncore.RebornCore; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.lib.ModInfo; +import net.minecraft.item.Item.ToolMaterial; public class ItemTRPickaxe extends ItemPickaxe implements ITexturedItem , IHandHeld { private ToolMaterial material = ToolMaterial.WOOD; diff --git a/src/main/java/techreborn/items/tools/ItemTRSpade.java b/src/main/java/techreborn/items/tools/ItemTRSpade.java index d5f417725..e47204eb7 100644 --- a/src/main/java/techreborn/items/tools/ItemTRSpade.java +++ b/src/main/java/techreborn/items/tools/ItemTRSpade.java @@ -12,6 +12,7 @@ import reborncore.RebornCore; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.lib.ModInfo; +import net.minecraft.item.Item.ToolMaterial; public class ItemTRSpade extends ItemSpade implements ITexturedItem , IHandHeld { private ToolMaterial material = ToolMaterial.WOOD; diff --git a/src/main/java/techreborn/items/tools/ItemTRSword.java b/src/main/java/techreborn/items/tools/ItemTRSword.java index e5964b3d7..298a57c80 100644 --- a/src/main/java/techreborn/items/tools/ItemTRSword.java +++ b/src/main/java/techreborn/items/tools/ItemTRSword.java @@ -12,6 +12,7 @@ import reborncore.RebornCore; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.lib.ModInfo; +import net.minecraft.item.Item.ToolMaterial; public class ItemTRSword extends ItemSword implements ITexturedItem , IHandHeld { private ToolMaterial material = ToolMaterial.WOOD; diff --git a/src/main/java/techreborn/items/tools/ItemWrench.java b/src/main/java/techreborn/items/tools/ItemWrench.java index 582b0ada5..99058be39 100644 --- a/src/main/java/techreborn/items/tools/ItemWrench.java +++ b/src/main/java/techreborn/items/tools/ItemWrench.java @@ -158,7 +158,7 @@ public class ItemWrench extends ItemTR implements ITexturedItem // 0.8F, 1F); if (!world.isRemote) { - world.setBlockState(pos, Blocks.air.getDefaultState(), 2); + world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); } return EnumActionResult.SUCCESS; } diff --git a/src/main/java/techreborn/manual/util/GuiButtonAHeight.java b/src/main/java/techreborn/manual/util/GuiButtonAHeight.java index 3dcb2c412..8410f0526 100644 --- a/src/main/java/techreborn/manual/util/GuiButtonAHeight.java +++ b/src/main/java/techreborn/manual/util/GuiButtonAHeight.java @@ -21,7 +21,7 @@ public class GuiButtonAHeight extends GuiButton if (this.visible) { FontRenderer fontrenderer = minecraft.fontRendererObj; - minecraft.getTextureManager().bindTexture(buttonTextures); + minecraft.getTextureManager().bindTexture(BUTTON_TEXTURES); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.hovered = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; diff --git a/src/main/java/techreborn/manual/util/GuiButtonCustomTexture.java b/src/main/java/techreborn/manual/util/GuiButtonCustomTexture.java index 469516038..f68569899 100644 --- a/src/main/java/techreborn/manual/util/GuiButtonCustomTexture.java +++ b/src/main/java/techreborn/manual/util/GuiButtonCustomTexture.java @@ -48,7 +48,7 @@ public class GuiButtonCustomTexture extends GuiButtonExt { boolean flag = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; - mc.getTextureManager().bindTexture(buttonTextures); + mc.getTextureManager().bindTexture(BUTTON_TEXTURES); int u = textureU; int v = textureV; diff --git a/src/main/java/techreborn/manual/util/GuiButtonItemTexture.java b/src/main/java/techreborn/manual/util/GuiButtonItemTexture.java index 081e6b8b3..e7eeb1a2b 100644 --- a/src/main/java/techreborn/manual/util/GuiButtonItemTexture.java +++ b/src/main/java/techreborn/manual/util/GuiButtonItemTexture.java @@ -35,7 +35,7 @@ public class GuiButtonItemTexture extends GuiButtonExt { boolean flag = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; - mc.getTextureManager().bindTexture(buttonTextures); + mc.getTextureManager().bindTexture(BUTTON_TEXTURES); int u = textureU; int v = textureV; if (flag) diff --git a/src/main/java/techreborn/manual/util/GuiButtonTextOnly.java b/src/main/java/techreborn/manual/util/GuiButtonTextOnly.java index 279e8888c..b6cce5175 100644 --- a/src/main/java/techreborn/manual/util/GuiButtonTextOnly.java +++ b/src/main/java/techreborn/manual/util/GuiButtonTextOnly.java @@ -29,7 +29,7 @@ public class GuiButtonTextOnly extends GuiButton if (this.visible) { FontRenderer fontrenderer = minecraft.fontRendererObj; - minecraft.getTextureManager().bindTexture(buttonTextures); + minecraft.getTextureManager().bindTexture(BUTTON_TEXTURES); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.hovered = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; diff --git a/src/main/java/techreborn/parts/CableMultipart.java b/src/main/java/techreborn/parts/CableMultipart.java index 9812394d8..be497a1ec 100644 --- a/src/main/java/techreborn/parts/CableMultipart.java +++ b/src/main/java/techreborn/parts/CableMultipart.java @@ -292,7 +292,7 @@ public abstract class CableMultipart extends Multipart } public Material getMaterial() { - return Material.cloth; + return Material.CLOTH; } @Override diff --git a/src/main/java/techreborn/tiles/TileAlloyFurnace.java b/src/main/java/techreborn/tiles/TileAlloyFurnace.java index 009bd2d9a..d87e1012e 100644 --- a/src/main/java/techreborn/tiles/TileAlloyFurnace.java +++ b/src/main/java/techreborn/tiles/TileAlloyFurnace.java @@ -49,21 +49,21 @@ public class TileAlloyFurnace extends TileMachineBase implements IWrenchable, II { Item item = stack.getItem(); - if (item instanceof ItemBlock && Block.getBlockFromItem(item) != Blocks.air) + if (item instanceof ItemBlock && Block.getBlockFromItem(item) != Blocks.AIR) { Block block = Block.getBlockFromItem(item); - if (block == Blocks.wooden_slab) + if (block == Blocks.WOODEN_SLAB) { return 150; } - if (block.getMaterial(block.getDefaultState()) == Material.wood) + if (block.getMaterial(block.getDefaultState()) == Material.WOOD) { return 300; } - if (block == Blocks.coal_block) + if (block == Blocks.COAL_BLOCK) { return 16000; } @@ -75,15 +75,15 @@ public class TileAlloyFurnace extends TileMachineBase implements IWrenchable, II return 200; // if (item instanceof ItemHoe && ((ItemHoe) // item).getToolMaterialName().equals("WOOD")) return 200; - if (item == Items.stick) + if (item == Items.STICK) return 100; - if (item == Items.coal) + if (item == Items.COAL) return 1600; - if (item == Items.lava_bucket) + if (item == Items.LAVA_BUCKET) return 20000; - if (item == Item.getItemFromBlock(Blocks.sapling)) + if (item == Item.getItemFromBlock(Blocks.SAPLING)) return 100; - if (item == Items.blaze_rod) + if (item == Items.BLAZE_ROD) return 2400; return GameRegistry.getFuelValue(stack); } diff --git a/src/main/java/techreborn/tiles/TileIronFurnace.java b/src/main/java/techreborn/tiles/TileIronFurnace.java index 83a4743ac..cfa599259 100644 --- a/src/main/java/techreborn/tiles/TileIronFurnace.java +++ b/src/main/java/techreborn/tiles/TileIronFurnace.java @@ -40,22 +40,22 @@ public class TileIronFurnace extends TileMachineBase implements IInventoryProvid { Block block = Block.getBlockFromItem(item); - if (block == Blocks.wooden_slab) + if (block == Blocks.WOODEN_SLAB) { return 150; } - if (block == Blocks.log) + if (block == Blocks.LOG) { return 1200; } - if (block.getMaterial(block.getDefaultState()) == Material.wood) + if (block.getMaterial(block.getDefaultState()) == Material.WOOD) { return 300; } - if (block == Blocks.coal_block) + if (block == Blocks.COAL_BLOCK) { return 16000; } @@ -67,15 +67,15 @@ public class TileIronFurnace extends TileMachineBase implements IInventoryProvid return 200; if (item instanceof ItemHoe && ((ItemHoe) item).getMaterialName().equals("WOOD")) return 200; - if (item == Items.stick) + if (item == Items.STICK) return 100; - if (item == Items.coal) + if (item == Items.COAL) return 1600; - if (item == Items.lava_bucket) + if (item == Items.LAVA_BUCKET) return 20000; - if (item == new ItemStack(Blocks.sapling).getItem()) + if (item == new ItemStack(Blocks.SAPLING).getItem()) return 100; - if (item == Items.blaze_rod) + if (item == Items.BLAZE_ROD) return 2400; return GameRegistry.getFuelValue(stack); } diff --git a/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java b/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java index 5cf81a553..c1548b9b4 100644 --- a/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java +++ b/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java @@ -32,7 +32,7 @@ public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrencha if (!worldObj.isRemote) { if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY() + 1, getPos().getZ())) - .getBlock() == Blocks.dragon_egg) + .getBlock() == Blocks.DRAGON_EGG) { addEnergy(euTick); } diff --git a/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java b/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java index c7dc759a6..b406bd1c2 100644 --- a/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java @@ -29,23 +29,23 @@ public class TileHeatGenerator extends TilePowerAcceptor implements IWrenchable if (!worldObj.isRemote) { if (worldObj.getBlockState(new BlockPos(getPos().getX() + 1, getPos().getY(), getPos().getZ())) - .getBlock() == Blocks.lava) + .getBlock() == Blocks.LAVA) { addEnergy(euTick); } else if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY(), getPos().getZ() + 1)) - .getBlock() == Blocks.lava) + .getBlock() == Blocks.LAVA) { addEnergy(euTick); } else if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY(), getPos().getZ() - 1)) - .getBlock() == Blocks.lava) + .getBlock() == Blocks.LAVA) { addEnergy(euTick); } else if (worldObj.getBlockState(new BlockPos(getPos().getX() - 1, getPos().getY(), getPos().getZ())) - .getBlock() == Blocks.lava) + .getBlock() == Blocks.LAVA) { addEnergy(euTick); } else if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY() - 1, getPos().getZ())) - .getBlock() == Blocks.lava) + .getBlock() == Blocks.LAVA) { addEnergy(euTick); } diff --git a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java index 4b32e1df9..445899387 100644 --- a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java @@ -153,7 +153,7 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab { if (worldObj.getBlockState(new BlockPos(getPos().getX() + direction.getFrontOffsetX(), getPos().getY() + direction.getFrontOffsetY(), getPos().getZ() + direction.getFrontOffsetZ())) - .getBlock() == Blocks.lava) + .getBlock() == Blocks.LAVA) { addEnergy(1); } @@ -167,7 +167,7 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab { if (worldObj.getBlockState(new BlockPos(getPos().getX() + direction.getFrontOffsetX(), getPos().getY() + direction.getFrontOffsetY(), - getPos().getZ() + direction.getFrontOffsetZ())).getBlock() == Blocks.lava) + getPos().getZ() + direction.getFrontOffsetZ())).getBlock() == Blocks.LAVA) { didFindLava = true; } diff --git a/src/main/java/techreborn/tiles/generator/TileWaterMill.java b/src/main/java/techreborn/tiles/generator/TileWaterMill.java index 4f2833a57..c7e8b6959 100644 --- a/src/main/java/techreborn/tiles/generator/TileWaterMill.java +++ b/src/main/java/techreborn/tiles/generator/TileWaterMill.java @@ -37,7 +37,7 @@ public class TileWaterMill extends TilePowerAcceptor waterblocks = 0; for (EnumFacing facing : EnumFacing.HORIZONTALS) { - if (worldObj.getBlockState(getPos().offset(facing)).getBlock() == Blocks.water) + if (worldObj.getBlockState(getPos().offset(facing)).getBlock() == Blocks.WATER) { waterblocks++; } diff --git a/src/main/java/techreborn/utils/StackWIPHandler.java b/src/main/java/techreborn/utils/StackWIPHandler.java index 779baebcc..4098bb3f2 100644 --- a/src/main/java/techreborn/utils/StackWIPHandler.java +++ b/src/main/java/techreborn/utils/StackWIPHandler.java @@ -37,7 +37,7 @@ public class StackWIPHandler } private void addHead(String name){ - ItemStack head = new ItemStack(Items.skull, 1, 3); + ItemStack head = new ItemStack(Items.SKULL, 1, 3); head.setTagCompound(new NBTTagCompound()); head.getTagCompound().setTag("SkullOwner", new NBTTagString(name)); devHeads.add(head); From 024d562415c2a567f0a90e27ec858c0098a746f5 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 7 May 2016 13:44:00 +0100 Subject: [PATCH 5/6] Update forge --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 02534e7e6..8c4ff6f8c 100644 --- a/build.gradle +++ b/build.gradle @@ -59,7 +59,7 @@ if (ENV.BUILD_NUMBER) { } minecraft { - version = "1.9-12.16.0.1865-1.9" + version = "1.9-12.16.1.1887" mappings = "snapshot_20160506" replace "@MODVERSION@", project.version // makeObfSourceJar = false From a060c33e5acd3cbe4e715f8f840d3ea87bb63a08 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 7 May 2016 13:45:33 +0100 Subject: [PATCH 6/6] Fixes #522 --- src/main/java/techreborn/init/ModRecipes.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 1ce2bb1f7..64c6c1e64 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -946,7 +946,8 @@ public class ModRecipes GameRegistry.addSmelting(new ItemStack(Items.IRON_INGOT), ItemIngots.getIngotByName("refinediron"), 1F); GameRegistry.addSmelting(BlockOre2.getOreByName("copper"), ItemIngots.getIngotByName("copper"), 1F); GameRegistry.addSmelting(BlockOre2.getOreByName("tin"), ItemIngots.getIngotByName("tin"), 1F); - + GameRegistry.addSmelting(BlockOre.getOreByName("sliver"), ItemIngots.getIngotByName("sliver"), 1F); + GameRegistry.addSmelting(BlockOre.getOreByName("lead"), ItemIngots.getIngotByName("lead"), 1F); Core.logHelper.info("Smelting Recipes Added"); }