diff --git a/src/main/java/com/dyonovan/modernalchemy/handlers/BlockHandler.java b/src/main/java/com/dyonovan/modernalchemy/handlers/BlockHandler.java index 7edd586..2e7bfc3 100644 --- a/src/main/java/com/dyonovan/modernalchemy/handlers/BlockHandler.java +++ b/src/main/java/com/dyonovan/modernalchemy/handlers/BlockHandler.java @@ -67,10 +67,10 @@ public static void init() { GameRegistry.registerBlock(blockFluidAir, "blockFluidAir"); //Ore Actinium - registerBlock(blockOreActinium = new BlockOreActinium(), "oreActinium", null); + registerBlock(blockOreActinium = new BlockOreActinium(), "blockOreActinium", null); //Ore Copper - registerBlock(blockOreCopper = new BlockOreCopper(), "oreCopper", null); + registerBlock(blockOreCopper = new BlockOreCopper(), "blockOreCopper", null); OreDictionary.registerOre("oreCopper", new ItemStack(blockOreCopper)); //BlockElectricBellows @@ -80,25 +80,25 @@ public static void init() { registerBlock(blockAmalgamator = new BlockAmalgamator(), "blockAmalgamator", TileAmalgamator.class); // Block Pattern Recorder - registerBlock(blockPatternRecorder = new BlockPatternRecorder(), "patternRecorder", TilePatternRecorder.class); + registerBlock(blockPatternRecorder = new BlockPatternRecorder(), "blockPatternRecorder", TilePatternRecorder.class); //ArcFurnaceCore - registerBlock(blockArcFurnaceCore = new BlockArcFurnaceCore(), "arcFurnaceCore", TileArcFurnaceCore.class); + registerBlock(blockArcFurnaceCore = new BlockArcFurnaceCore(), "blockArcFurnaceCore", TileArcFurnaceCore.class); //ArcFurnaceDummy - registerBlock(blockArcFurnaceDummy = new BlockDummy("arcFurnaceDummy"), "arcFurnaceDummy", TileDummy.class); + registerBlock(blockArcFurnaceDummy = new BlockDummy("blockArcFurnaceDummy"), "blockArcFurnaceDummy", TileDummy.class); //ArcFurnaceDummy Energy - registerBlock(blockArcFurnaceDummyEnergy = new BlockDummyEnergyReciever("arcFurnaceDummyEnergy"), "arcFurnaceDummyEnergy", TileDummyEnergyReciever.class); + registerBlock(blockArcFurnaceDummyEnergy = new BlockDummyEnergyReciever("blockArcFurnaceDummyEnergy"), "blockArcFurnaceDummyEnergy", TileDummyEnergyReciever.class); //ArcFurnaceDummyItemIO - registerBlock(blockArcFurnaceDummyItemIO = new BlockItemIODummy("arcFurnaceDummyItemIO"), "arcFurnaceDummyItemIO", TileDummyItemIO.class); + registerBlock(blockArcFurnaceDummyItemIO = new BlockItemIODummy("blockArcFurnaceDummyItemIO"), "blockArcFurnaceDummyItemIO", TileDummyItemIO.class); //ArcFurnaceDummyAirValue - registerBlock(blockArcFurnaceDummyAirValve = new BlockDummyAirValve("arcFurnaceDummyAirValve"), "arcFurnaceDummyAirValve", TileDummyAirValve.class); + registerBlock(blockArcFurnaceDummyAirValve = new BlockDummyAirValve("blockArcFurnaceDummyAirValve"), "blockArcFurnaceDummyAirValve", TileDummyAirValve.class); //ArcFurnaceDummyOutputValue - registerBlock(blockArcFurnaceDummyOutputValve = new BlockDummyOutputValve("arcFurnaceDummyOutputValve"), "arcFurnaceDummyOutputValve", TileDummyOutputValve.class); + registerBlock(blockArcFurnaceDummyOutputValve = new BlockDummyOutputValve("blockArcFurnaceDummyOutputValve"), "blockArcFurnaceDummyOutputValve", TileDummyOutputValve.class); //Tesla Base registerBlock(blockTeslaBase = new BlockTeslaBase(), "blockTeslaBase", TileTeslaBase.class); @@ -107,7 +107,7 @@ public static void init() { registerBlock(blockTeslaStand = new BlockTeslaStand(), "blockTeslaStand", TileTeslaStand.class); //Tesla Coil - registerBlock(blockCoil = new BlockTeslaCoil(), "blockCoil", TileTeslaCoil.class); + registerBlock(blockCoil = new BlockTeslaCoil(), "blockTeslaCoil", TileTeslaCoil.class); //BlockFrameEnergy registerBlock(blockReplicatorCPU = new BlockReplicatorCPU(), "blockReplicatorCPU", TileReplicatorCPU.class); @@ -119,7 +119,7 @@ public static void init() { registerBlock(blockReplicatorStand = new BlockReplicatorStand(), "blockReplicatorStand", TileReplicatorStand.class); //BlockFurnace - registerBlock(blockAdvancedFurnace = new BlockAdvancedCrafter(), "blockAdvancedFurnace", TileAdvancedCrafter.class); + registerBlock(blockAdvancedFurnace = new BlockAdvancedCrafter(), "blockAdvancedCrafter", TileAdvancedCrafter.class); } public static void registerBlock(Block registerBlock, String name, Class tileEntity) { diff --git a/src/main/java/com/dyonovan/modernalchemy/manual/component/ComponentItemRender.java b/src/main/java/com/dyonovan/modernalchemy/manual/component/ComponentItemRender.java index da6427b..b413b72 100644 --- a/src/main/java/com/dyonovan/modernalchemy/manual/component/ComponentItemRender.java +++ b/src/main/java/com/dyonovan/modernalchemy/manual/component/ComponentItemRender.java @@ -1,11 +1,8 @@ package com.dyonovan.modernalchemy.manual.component; -import com.dyonovan.modernalchemy.handlers.BlockHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; diff --git a/src/main/resources/assets/modernalchemy/lang/en_US.lang b/src/main/resources/assets/modernalchemy/lang/en_US.lang index ab3e59c..c226b4e 100644 --- a/src/main/resources/assets/modernalchemy/lang/en_US.lang +++ b/src/main/resources/assets/modernalchemy/lang/en_US.lang @@ -3,19 +3,21 @@ tile.modernalchemy:blockTeslaStand.name=Tesla Coil Stand tile.modernalchemy:fluidCompressedAir.name=Compressed Air tile.modernalchemy:fluidActinium.name=Molten Actinium tile.modernalchemy:blockOreActinium.name=Actinium Ore -tile.modernalchemy:arcFurnaceDummy.name=Arc Furnace Casing +tile.modernalchemy:blockArcFurnaceDummy.name=Arc Furnace Casing tile.modernalchemy:blockArcFurnaceCore.name=Arc Furnace Processor tile.modernalchemy:blockElectricBellows.name=Electric Bellows tile.modernalchemy:blockAmalgamator.name=Amalgamator tile.modernalchemy:blockPatternRecorder.name=Pattern Recorder -tile.modernalchemy:arcFurnaceDummyOutputValue.name=Arc Furnace Output Valve -tile.modernalchemy:arcFurnaceDummyItemIO.name=Arc Furnace Item I/O -tile.modernalchemy:arcFurnaceDummyEnergy.name=Arc Furnace Energy Receiver -tile.modernalchemy:arcFurnaceDummyAirValue.name=Arc Furnace Compressed Air Valve +tile.modernalchemy:blockArcFurnaceDummyOutputValve.name=Arc Furnace Output Valve +tile.modernalchemy:blockArcFurnaceDummyItemIO.name=Arc Furnace Item I/O +tile.modernalchemy:blockArcFurnaceDummyEnergy.name=Arc Furnace Energy Receiver +tile.modernalchemy:blockArcFurnaceDummyAirValve.name=Arc Furnace Compressed Air Valve tile.modernalchemy:blockTeslaBase.name=Tesla Coil Base tile.modernalchemy:blockReplicatorFrame.name=Replicator Frame tile.modernalchemy:blockReplicatorCPU.name=Replicator Controller tile.modernalchemy:blockReplicatorStand.name=Replicator Stand +tile.modernalchemy:blockAdvancedCrafter.name=Advanced Crafter +tile.modernalchemy:blockCopperOre.name=Copper Ore item.modernalchemy:pattern.name=Replicator Pattern item.modernalchemy:bucketActinium.name=Bucket of Actinium @@ -48,6 +50,10 @@ mainPage.authors.list=Dyonovan, pauljoda, Dominance, beef mainPage.categories.header=Categories blocksPage.title=Blocks +blocksPage.machines=Machines +blocksPage.arcFurnace=Arc Furnace +blockPage.replicator=Replicator +blockPage.teslaCoil=Tesla Coil pageTeslaCoil.description=The Tesla Coil is a monument of engineering, it will accept RF in through the bottom and convert to Tesla energy and transmit it via its head piece to nearby machines and devices. pageTeslaCoil.moreInfo=The Tesla Coil has a side effect called death, it will hurt and ignite you if you come in contact with a bolt of energy. To prevent accidental death or personal injury wear a pair of Faraday Armor, bolts also can kill mobs and charge creepers. \ No newline at end of file diff --git a/src/main/resources/manualPages/blockCoil.json b/src/main/resources/manualPages/blockTeslaCoil.json similarity index 98% rename from src/main/resources/manualPages/blockCoil.json rename to src/main/resources/manualPages/blockTeslaCoil.json index 6390839..5e237c1 100644 --- a/src/main/resources/manualPages/blockCoil.json +++ b/src/main/resources/manualPages/blockTeslaCoil.json @@ -12,7 +12,7 @@ "text": "", "destination": "", "type": "ITEM_RENDER", - "item": "modernalchemy:blockCoil:0", + "item": "modernalchemy:blockTeslaCoil:0", "alignment" : 0, "resource": { "resourceDomain": "", diff --git a/src/main/resources/manualPages/blocks.json b/src/main/resources/manualPages/blocks.json index 2fe059f..6ac2e95 100644 --- a/src/main/resources/manualPages/blocks.json +++ b/src/main/resources/manualPages/blocks.json @@ -1,7 +1,7 @@ [ { - "title" : "blocksPage.title", - "numPages" : 1, + "title" : "blocksPage.machines", + "numPages" : 3, "component" : [ { "xPos": 15, @@ -9,8 +9,314 @@ "width": 110, "height": 15, "pageNum": 1, + "text": "tile.modernalchemy:blockAdvancedCrafter.name", + "destination": "blockAdvancedCrafter", + "type": "LINK", + "item": "", + "alignment" : 0, + "resource": { + "resourceDomain": "", + "resourcePath": "" + }, + "tooltips": [ "Click for details" ] + }, + { + "xPos": 15, + "yPos": 45, + "width": 110, + "height": 15, + "pageNum": 1, + "text": "tile.modernalchemy:blockElectricBellows.name", + "destination": "blockElectricBellows", + "type": "LINK", + "item": "", + "alignment" : 0, + "resource": { + "resourceDomain": "", + "resourcePath": "" + }, + "tooltips": [ "Click for details" ] + }, + { + "xPos": 15, + "yPos": 60, + "width": 110, + "height": 15, + "pageNum": 1, + "text": "tile.modernalchemy:blockAmalgamator.name", + "destination": "blockAmalgamator", + "type": "LINK", + "item": "", + "alignment" : 0, + "resource": { + "resourceDomain": "", + "resourcePath": "" + }, + "tooltips": [ "Click for details" ] + }, + { + "xPos": 15, + "yPos": 75, + "width": 110, + "height": 15, + "pageNum": 1, + "text": "tile.modernalchemy:blockPatternRecorder.name", + "destination": "blockPatternRecorder", + "type": "LINK", + "item": "", + "alignment" : 0, + "resource": { + "resourceDomain": "", + "resourcePath": "" + }, + "tooltips": [ "Click for details" ] + }, + { + "xPos": 135, + "yPos": 15, + "width": 110, + "height": 15, + "pageNum": 1, + "text": "blocksPage.arcFurnace", + "destination": "", + "type": "HEADER", + "item": "", + "alignment" : 1, + "resource": { + "resourceDomain": "", + "resourcePath": "" + }, + "tooltips": [] + }, + { + "xPos": 135, + "yPos": 30, + "width": 110, + "height": 15, + "pageNum": 1, + "text": "tile.modernalchemy:blockArcFurnaceCore.name", + "destination": "blockArcFurnaceCore", + "type": "LINK", + "item": "", + "alignment" : 0, + "resource": { + "resourceDomain": "", + "resourcePath": "" + }, + "tooltips": [ "Click for details" ] + }, + { + "xPos": 135, + "yPos": 60, + "width": 110, + "height": 15, + "pageNum": 1, + "text": "tile.modernalchemy:blockArcFurnaceDummy.name", + "destination": "blockArcFurnaceDummy", + "type": "LINK", + "item": "", + "alignment" : 0, + "resource": { + "resourceDomain": "", + "resourcePath": "" + }, + "tooltips": [ "Click for details" ] + }, + { + "xPos": 135, + "yPos": 75, + "width": 110, + "height": 15, + "pageNum": 1, + "text": "tile.modernalchemy:blockArcFurnaceDummyItemIO.name", + "destination": "blockArcFurnaceDummyItemIO", + "type": "LINK", + "item": "", + "alignment" : 0, + "resource": { + "resourceDomain": "", + "resourcePath": "" + }, + "tooltips": [ "Click for details" ] + }, + { + "xPos": 135, + "yPos": 90, + "width": 110, + "height": 15, + "pageNum": 1, + "text": "tile.modernalchemy:blockArcFurnaceDummyAirValve.name", + "destination": "blockArcFurnaceDummyAirValve", + "type": "LINK", + "item": "", + "alignment" : 0, + "resource": { + "resourceDomain": "", + "resourcePath": "" + }, + "tooltips": [ "Click for details" ] + }, + { + "xPos": 135, + "yPos": 120, + "width": 110, + "height": 15, + "pageNum": 1, + "text": "tile.modernalchemy:blockArcFurnaceDummyOutputValve.name", + "destination": "blockArcFurnaceDummyOutputValve", + "type": "LINK", + "item": "", + "alignment" : 0, + "resource": { + "resourceDomain": "", + "resourcePath": "" + }, + "tooltips": [ "Click for details" ] + }, + { + "xPos": 15, + "yPos": 15, + "width": 110, + "height": 15, + "pageNum": 2, + "text": "tile.modernalchemy:blockArcFurnaceDummyEnergy.name", + "destination": "blockArcFurnaceDummyEnergy", + "type": "LINK", + "item": "", + "alignment" : 0, + "resource": { + "resourceDomain": "", + "resourcePath": "" + }, + "tooltips": [ "Click for details" ] + }, + { + "xPos": 135, + "yPos": 15, + "width": 110, + "height": 15, + "pageNum": 2, + "text": "blockPage.replicator", + "destination": "", + "type": "HEADER", + "item": "", + "alignment" : 1, + "resource": { + "resourceDomain": "", + "resourcePath": "" + }, + "tooltips": [] + }, + { + "xPos": 135, + "yPos": 30, + "width": 110, + "height": 15, + "pageNum": 2, + "text": "tile.modernalchemy:blockReplicatorCPU.name", + "destination": "blockReplicatorCPU", + "type": "LINK", + "item": "", + "alignment" : 0, + "resource": { + "resourceDomain": "", + "resourcePath": "" + }, + "tooltips": [ "Click for details" ] + }, + { + "xPos": 135, + "yPos": 45, + "width": 110, + "height": 15, + "pageNum": 2, + "text": "tile.modernalchemy:blockReplicatorFrame.name", + "destination": "blockReplicatorFrame", + "type": "LINK", + "item": "", + "alignment" : 0, + "resource": { + "resourceDomain": "", + "resourcePath": "" + }, + "tooltips": [ "Click for details" ] + }, + { + "xPos": 135, + "yPos": 60, + "width": 110, + "height": 15, + "pageNum": 2, + "text": "tile.modernalchemy:blockReplicatorStand.name", + "destination": "blockReplicatorStand", + "type": "LINK", + "item": "", + "alignment" : 0, + "resource": { + "resourceDomain": "", + "resourcePath": "" + }, + "tooltips": [ "Click for details" ] + }, + { + "xPos": 15, + "yPos": 15, + "width": 110, + "height": 15, + "pageNum": 3, + "text": "blockPage.teslaCoil", + "destination": "", + "type": "HEADER", + "item": "", + "alignment" : 1, + "resource": { + "resourceDomain": "", + "resourcePath": "" + }, + "tooltips": [] + }, + { + "xPos": 15, + "yPos": 30, + "width": 110, + "height": 15, + "pageNum": 3, "text": "tile.modernalchemy:blockTeslaCoil.name", - "destination": "blockCoil", + "destination": "blockTeslaCoil", + "type": "LINK", + "item": "", + "alignment" : 0, + "resource": { + "resourceDomain": "", + "resourcePath": "" + }, + "tooltips": [ "Click for details" ] + }, + { + "xPos": 15, + "yPos": 45, + "width": 110, + "height": 15, + "pageNum": 3, + "text": "tile.modernalchemy:blockTeslaStand.name", + "destination": "blockTeslaStand", + "type": "LINK", + "item": "", + "alignment" : 0, + "resource": { + "resourceDomain": "", + "resourcePath": "" + }, + "tooltips": [ "Click for details" ] + }, + { + "xPos": 15, + "yPos": 60, + "width": 110, + "height": 15, + "pageNum": 3, + "text": "tile.modernalchemy:blockTeslaBase.name", + "destination": "blockTeslaBase", "type": "LINK", "item": "", "alignment" : 0,