From 23ee4136e32b0fee3b1b28ef8915032e4ab42c06 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Fri, 28 Feb 2014 10:31:44 +0800 Subject: [PATCH] Moved grate to Archaic tier --- .../java/resonantinduction/archaic/Archaic.java | 17 ++++++++++++----- .../archaic/fluid/grate}/BlockGrate.java | 2 +- .../archaic/fluid/grate}/TileGrate.java | 2 +- .../archaic/{ => fluid}/gutter/BlockGutter.java | 2 +- .../{ => fluid}/gutter/RenderGutter.java | 2 +- .../archaic/{ => fluid}/gutter/TileGutter.java | 2 +- .../mechanical/Mechanical.java | 7 ++----- 7 files changed, 19 insertions(+), 15 deletions(-) rename {mechanical/src/main/java/resonantinduction/mechanical/fluid/transport => archaic/src/main/java/resonantinduction/archaic/fluid/grate}/BlockGrate.java (96%) rename {mechanical/src/main/java/resonantinduction/mechanical/fluid/transport => archaic/src/main/java/resonantinduction/archaic/fluid/grate}/TileGrate.java (99%) rename archaic/src/main/java/resonantinduction/archaic/{ => fluid}/gutter/BlockGutter.java (98%) rename archaic/src/main/java/resonantinduction/archaic/{ => fluid}/gutter/RenderGutter.java (98%) rename archaic/src/main/java/resonantinduction/archaic/{ => fluid}/gutter/TileGutter.java (98%) diff --git a/archaic/src/main/java/resonantinduction/archaic/Archaic.java b/archaic/src/main/java/resonantinduction/archaic/Archaic.java index cc14c849..4851786e 100644 --- a/archaic/src/main/java/resonantinduction/archaic/Archaic.java +++ b/archaic/src/main/java/resonantinduction/archaic/Archaic.java @@ -15,8 +15,10 @@ import resonantinduction.archaic.firebox.BlockFirebox; import resonantinduction.archaic.firebox.BlockHotPlate; import resonantinduction.archaic.firebox.TileFirebox; import resonantinduction.archaic.firebox.TileHotPlate; -import resonantinduction.archaic.gutter.BlockGutter; -import resonantinduction.archaic.gutter.TileGutter; +import resonantinduction.archaic.fluid.grate.BlockGrate; +import resonantinduction.archaic.fluid.grate.TileGrate; +import resonantinduction.archaic.fluid.gutter.BlockGutter; +import resonantinduction.archaic.fluid.gutter.TileGutter; import resonantinduction.archaic.imprint.BlockImprinter; import resonantinduction.archaic.imprint.TileImprinter; import resonantinduction.archaic.process.BlockCastingMold; @@ -79,13 +81,16 @@ public class Archaic public static Block blockHotPlate; public static Block blockMillstone; public static Block blockCast; - public static Block blockChannel; public static Item itemImprint; // Machine and Processing public static Item itemHammer; public static Item itemHandCrank; + // Fluid + public static Block blockGrate; + public static Block blockGutter; + @EventHandler public void preInit(FMLPreInitializationEvent evt) { @@ -99,7 +104,8 @@ public class Archaic blockHotPlate = contentRegistry.createTile(BlockHotPlate.class, TileHotPlate.class); blockMillstone = contentRegistry.createTile(BlockMillstone.class, TileMillstone.class); blockCast = contentRegistry.createTile(BlockCastingMold.class, TileCastingMold.class); - blockChannel = contentRegistry.createTile(BlockGutter.class, TileGutter.class); + blockGutter = contentRegistry.createTile(BlockGutter.class, TileGutter.class); + blockGrate = contentRegistry.createTile(BlockGrate.class, TileGrate.class); itemHandCrank = contentRegistry.createItem(ItemHandCrank.class); itemImprint = contentRegistry.createItem(ItemImprint.class); @@ -136,7 +142,8 @@ public class Archaic GameRegistry.addRecipe(new ShapedOreRecipe(blockTurntable, "SSS", "PGP", "WWW", 'S', Block.stone, 'G', UniversalRecipe.MOTOR.get(), 'P', Block.pistonBase, 'W', "logWood")); GameRegistry.addRecipe(new ShapedOreRecipe(blockCast, "I I", "IBI", "III", 'S', Item.ingotIron, 'B', Block.fenceIron)); - GameRegistry.addRecipe(new ShapedOreRecipe(blockChannel, "S S", "I I", "III", 'S', Item.stick, 'I', "plankWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(blockGutter, "S S", "I I", "III", 'S', Item.stick, 'I', "plankWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(blockGrate, "WBW", "B B", "WBW", 'B', Block.fenceIron, 'W', "plankWood")); GameRegistry.addRecipe(new ShapedOreRecipe(blockHotPlate, "SSS", "III", 'I', Item.ingotIron, 'S', Block.stone)); GameRegistry.addRecipe(new ShapedOreRecipe(blockMillstone, "SPS", "SAS", "SSS", 'P', Block.pistonBase, 'A', Item.pickaxeStone, 'S', Block.stone)); GameRegistry.addRecipe(new ShapedOreRecipe(itemHandCrank, "S ", "SSS", " S", 'S', Item.stick)); diff --git a/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/BlockGrate.java b/archaic/src/main/java/resonantinduction/archaic/fluid/grate/BlockGrate.java similarity index 96% rename from mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/BlockGrate.java rename to archaic/src/main/java/resonantinduction/archaic/fluid/grate/BlockGrate.java index 63a98887..455c2b3b 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/BlockGrate.java +++ b/archaic/src/main/java/resonantinduction/archaic/fluid/grate/BlockGrate.java @@ -1,4 +1,4 @@ -package resonantinduction.mechanical.fluid.transport; +package resonantinduction.archaic.fluid.grate; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TileGrate.java b/archaic/src/main/java/resonantinduction/archaic/fluid/grate/TileGrate.java similarity index 99% rename from mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TileGrate.java rename to archaic/src/main/java/resonantinduction/archaic/fluid/grate/TileGrate.java index fcf2f6f1..5e094309 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TileGrate.java +++ b/archaic/src/main/java/resonantinduction/archaic/fluid/grate/TileGrate.java @@ -1,4 +1,4 @@ -package resonantinduction.mechanical.fluid.transport; +package resonantinduction.archaic.fluid.grate; import java.util.Collections; import java.util.Comparator; diff --git a/archaic/src/main/java/resonantinduction/archaic/gutter/BlockGutter.java b/archaic/src/main/java/resonantinduction/archaic/fluid/gutter/BlockGutter.java similarity index 98% rename from archaic/src/main/java/resonantinduction/archaic/gutter/BlockGutter.java rename to archaic/src/main/java/resonantinduction/archaic/fluid/gutter/BlockGutter.java index a87a9299..4f814232 100644 --- a/archaic/src/main/java/resonantinduction/archaic/gutter/BlockGutter.java +++ b/archaic/src/main/java/resonantinduction/archaic/fluid/gutter/BlockGutter.java @@ -1,4 +1,4 @@ -package resonantinduction.archaic.gutter; +package resonantinduction.archaic.fluid.gutter; import java.util.List; diff --git a/archaic/src/main/java/resonantinduction/archaic/gutter/RenderGutter.java b/archaic/src/main/java/resonantinduction/archaic/fluid/gutter/RenderGutter.java similarity index 98% rename from archaic/src/main/java/resonantinduction/archaic/gutter/RenderGutter.java rename to archaic/src/main/java/resonantinduction/archaic/fluid/gutter/RenderGutter.java index a9b21be7..f72760b7 100644 --- a/archaic/src/main/java/resonantinduction/archaic/gutter/RenderGutter.java +++ b/archaic/src/main/java/resonantinduction/archaic/fluid/gutter/RenderGutter.java @@ -1,4 +1,4 @@ -package resonantinduction.archaic.gutter; +package resonantinduction.archaic.fluid.gutter; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; diff --git a/archaic/src/main/java/resonantinduction/archaic/gutter/TileGutter.java b/archaic/src/main/java/resonantinduction/archaic/fluid/gutter/TileGutter.java similarity index 98% rename from archaic/src/main/java/resonantinduction/archaic/gutter/TileGutter.java rename to archaic/src/main/java/resonantinduction/archaic/fluid/gutter/TileGutter.java index 47e34fc6..8e80ce57 100644 --- a/archaic/src/main/java/resonantinduction/archaic/gutter/TileGutter.java +++ b/archaic/src/main/java/resonantinduction/archaic/fluid/gutter/TileGutter.java @@ -1,4 +1,4 @@ -package resonantinduction.archaic.gutter; +package resonantinduction.archaic.fluid.gutter; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java b/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java index 8b9aeb65..132a6d19 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java @@ -7,6 +7,8 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import resonantinduction.api.mechanical.IMechanical; +import resonantinduction.archaic.fluid.grate.BlockGrate; +import resonantinduction.archaic.fluid.grate.TileGrate; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.Settings; @@ -26,9 +28,7 @@ import resonantinduction.mechanical.fluid.pipe.ItemBlockFluidContainer; import resonantinduction.mechanical.fluid.pipe.ItemPipe; import resonantinduction.mechanical.fluid.tank.BlockTank; import resonantinduction.mechanical.fluid.tank.TileTank; -import resonantinduction.mechanical.fluid.transport.BlockGrate; import resonantinduction.mechanical.fluid.transport.BlockPump; -import resonantinduction.mechanical.fluid.transport.TileGrate; import resonantinduction.mechanical.fluid.transport.TilePump; import resonantinduction.mechanical.logistic.belt.BlockDetector; import resonantinduction.mechanical.logistic.belt.BlockManipulator; @@ -101,7 +101,6 @@ public class Mechanical // Fluids public static Block blockTank; public static Block blockReleaseValve; - public static Block blockGrate; public static Block blockPump; public static Item itemPipe; @@ -133,7 +132,6 @@ public class Mechanical blockRejector = contentRegistry.createTile(BlockRejector.class, TileRejector.class); blockTank = contentRegistry.createBlock(BlockTank.class, ItemBlockFluidContainer.class, TileTank.class); - blockGrate = contentRegistry.createTile(BlockGrate.class, TileGrate.class); blockPump = contentRegistry.createTile(BlockPump.class, TilePump.class); itemPipe = contentRegistry.createItem(ItemPipe.class); @@ -181,7 +179,6 @@ public class Mechanical GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockWaterTurbine, 1, 0), " W ", "WGW", " W ", 'G', itemGear, 'W', UniversalRecipe.PRIMARY_METAL.get())); GameRegistry.addRecipe(new ShapedOreRecipe(blockTank, "GGG", "GSG", "GGG", 'G', Block.glass, 'S', Item.ingotIron)); - GameRegistry.addRecipe(new ShapedOreRecipe(blockGrate, "BBB", "B B", "BBB", 'B', Block.fenceIron)); GameRegistry.addRecipe(new ShapedOreRecipe(blockPump, "PPP", "GGG", "PPP", 'P', itemPipe, 'G', itemGear)); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(itemPipe, 3), "BBB", " ", "BBB", 'B', Item.ingotIron));