Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Moved grate to Archaic tier

Browse source
This commit is contained in:
Calclavia 2014-02-28 10:31:44 +08:00
parent 6c470c0b65
commit 23ee4136e3
7 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
archaic/src/main/java/resonantinduction/archaic/Archaic.java
View file

@ -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));

2
mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/BlockGrate.java → archaic/src/main/java/resonantinduction/archaic/fluid/grate/BlockGrate.java
View file

@ -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;

2
mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TileGrate.java → archaic/src/main/java/resonantinduction/archaic/fluid/grate/TileGrate.java
View file

@ -1,4 +1,4 @@
package resonantinduction.mechanical.fluid.transport;
package resonantinduction.archaic.fluid.grate;
import java.util.Collections;
import java.util.Comparator;

2
archaic/src/main/java/resonantinduction/archaic/gutter/BlockGutter.java → archaic/src/main/java/resonantinduction/archaic/fluid/gutter/BlockGutter.java
View file

@ -1,4 +1,4 @@
package resonantinduction.archaic.gutter;
package resonantinduction.archaic.fluid.gutter;
import java.util.List;

2
archaic/src/main/java/resonantinduction/archaic/gutter/RenderGutter.java → archaic/src/main/java/resonantinduction/archaic/fluid/gutter/RenderGutter.java
View file

@ -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;

2
archaic/src/main/java/resonantinduction/archaic/gutter/TileGutter.java → archaic/src/main/java/resonantinduction/archaic/fluid/gutter/TileGutter.java
View file

@ -1,4 +1,4 @@
package resonantinduction.archaic.gutter;
package resonantinduction.archaic.fluid.gutter;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;

7
mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java
View file

@ -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));