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

Added basic turntable

Browse source
This commit is contained in:
Henry Mao 2013-02-06 14:28:37 +08:00
parent 99f6b9b74f
commit 92f212483b
3 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
resources/assemblyline/textures/blocks.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 23 KiB

8
src/minecraft/assemblyline/common/AssemblyLine.java
View file

@ -5,7 +5,6 @@ import java.io.File;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.server.MinecraftServer;
import net.minecraftforge.common.Configuration; import net.minecraftforge.common.Configuration;
import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe;
@ -15,6 +14,7 @@ import universalelectricity.prefab.UpdateNotifier;
import universalelectricity.prefab.multiblock.BlockMulti; import universalelectricity.prefab.multiblock.BlockMulti;
import universalelectricity.prefab.network.PacketManager; import universalelectricity.prefab.network.PacketManager;
import assemblyline.common.block.BlockCrate; import assemblyline.common.block.BlockCrate;
import assemblyline.common.block.BlockTurntable;
import assemblyline.common.block.ItemBlockCrate; import assemblyline.common.block.ItemBlockCrate;
import assemblyline.common.machine.BlockManipulator; import assemblyline.common.machine.BlockManipulator;
import assemblyline.common.machine.BlockRejector; import assemblyline.common.machine.BlockRejector;
@ -83,6 +83,7 @@ public class AssemblyLine
public static Block blockArmbot; public static Block blockArmbot;
public static Block blockCraneController; public static Block blockCraneController;
public static Block blockCraneParts; public static Block blockCraneParts;
public static Block blockTurntable;
public static BlockMulti blockMulti; public static BlockMulti blockMulti;
@ -108,6 +109,7 @@ public class AssemblyLine
blockMulti = new BlockMulti(CONFIGURATION.getBlock("Multiblock", BLOCK_ID_PREFIX + 9).getInt()); blockMulti = new BlockMulti(CONFIGURATION.getBlock("Multiblock", BLOCK_ID_PREFIX + 9).getInt());
blockCraneController = new BlockCraneController(CONFIGURATION.getBlock("CraneController", BLOCK_ID_PREFIX + 10).getInt()); blockCraneController = new BlockCraneController(CONFIGURATION.getBlock("CraneController", BLOCK_ID_PREFIX + 10).getInt());
blockCraneParts = new BlockCraneParts(CONFIGURATION.getBlock("CraneParts", BLOCK_ID_PREFIX + 11).getInt()); blockCraneParts = new BlockCraneParts(CONFIGURATION.getBlock("CraneParts", BLOCK_ID_PREFIX + 11).getInt());
blockTurntable = new BlockTurntable(CONFIGURATION.getBlock("Turntable", BLOCK_ID_PREFIX + 12).getInt(), 10);
itemImprint = new ItemImprinter(CONFIGURATION.getItem("Imprint", ITEM_ID_PREFIX).getInt()); itemImprint = new ItemImprinter(CONFIGURATION.getItem("Imprint", ITEM_ID_PREFIX).getInt());
itemDisk = new ItemDisk(CONFIGURATION.getItem("Disk", ITEM_ID_PREFIX + 1).getInt()); itemDisk = new ItemDisk(CONFIGURATION.getItem("Disk", ITEM_ID_PREFIX + 1).getInt());
@ -122,6 +124,7 @@ public class AssemblyLine
GameRegistry.registerBlock(blockDetector, "Detector"); GameRegistry.registerBlock(blockDetector, "Detector");
GameRegistry.registerBlock(blockRejector, "Rejector"); GameRegistry.registerBlock(blockRejector, "Rejector");
GameRegistry.registerBlock(blockArmbot, "Armbot"); GameRegistry.registerBlock(blockArmbot, "Armbot");
GameRegistry.registerBlock(blockTurntable, "Turntable");
GameRegistry.registerBlock(blockCraneController, "Crane Controller"); GameRegistry.registerBlock(blockCraneController, "Crane Controller");
GameRegistry.registerBlock(blockCraneParts, ItemCraneParts.class, "Crane Parts"); GameRegistry.registerBlock(blockCraneParts, ItemCraneParts.class, "Crane Parts");
@ -165,6 +168,9 @@ public class AssemblyLine
// Rejector // Rejector
GameRegistry.addRecipe(new ShapedOreRecipe(blockRejector, new Object[] { "WPW", "@R@", '@', "ingotSteel", 'R', Item.redstone, 'P', Block.pistonBase, 'C', "basicCircuit", 'W', "copperWire" })); GameRegistry.addRecipe(new ShapedOreRecipe(blockRejector, new Object[] { "WPW", "@R@", '@', "ingotSteel", 'R', Item.redstone, 'P', Block.pistonBase, 'C', "basicCircuit", 'W', "copperWire" }));
// Turntable
GameRegistry.addRecipe(new ShapedOreRecipe(blockTurntable, new Object[] { "M", "P", 'M', "motor", 'P', Block.pistonBase }));
// Manipulator // Manipulator
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(blockManipulator, 2), new Object[] { Block.dispenser, "basicCircuit" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(blockManipulator, 2), new Object[] { Block.dispenser, "basicCircuit" }));
} }

31
src/minecraft/assemblyline/common/block/BlockTurntable.java Normal file
View file

@ -0,0 +1,31 @@
package assemblyline.common.block;
import assemblyline.common.AssemblyLine;
import assemblyline.common.TabAssemblyLine;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
public class BlockTurntable extends Block
{
public BlockTurntable(int par1, int par2)
{
super(par1, par2, Material.piston);
this.setCreativeTab(TabAssemblyLine.INSTANCE);
this.setTextureFile(AssemblyLine.BLOCK_TEXTURE_PATH);
}
@Override
public int getBlockTextureFromSide(int side)
{
if (side == 0)
{
return this.blockIndexInTexture;
}
else if (side == 1)
{
return this.blockIndexInTexture + 1;
}
return this.blockIndexInTexture + 2;
}
}