tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Renamed "Crane Parts" to "Crane Rail"

Browse source 
Removed ItemCraneParts; we don't need a custom ItemBlock
This commit is contained in:
Brian Ricketts 2013-02-09 18:41:44 -06:00
parent 0df335b442
commit d9d93e6103
5 changed files with 9 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,8 +22,7 @@ import assemblyline.common.machine.BlockRejector;
import assemblyline.common.machine.armbot.BlockArmbot; import assemblyline.common.machine.armbot.BlockArmbot;
import assemblyline.common.machine.belt.BlockConveyorBelt; import assemblyline.common.machine.belt.BlockConveyorBelt;
import assemblyline.common.machine.crane.BlockCraneController; import assemblyline.common.machine.crane.BlockCraneController;
import assemblyline.common.machine.crane.BlockCraneParts; import assemblyline.common.machine.crane.BlockCraneRail;
import assemblyline.common.machine.crane.ItemCraneParts;
import assemblyline.common.machine.detector.BlockDetector; import assemblyline.common.machine.detector.BlockDetector;
import assemblyline.common.machine.encoder.BlockEncoder; import assemblyline.common.machine.encoder.BlockEncoder;
import assemblyline.common.machine.encoder.ItemDisk; import assemblyline.common.machine.encoder.ItemDisk;
@ -36,11 +35,9 @@ import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.Init; import cpw.mods.fml.common.Mod.Init;
import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.Mod.Instance;
import cpw.mods.fml.common.Mod.PreInit; import cpw.mods.fml.common.Mod.PreInit;
import cpw.mods.fml.common.Mod.ServerStarted;
import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStartedEvent;
import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
@ -84,7 +81,7 @@ public class AssemblyLine
public static Block blockRejector; public static Block blockRejector;
public static Block blockArmbot; public static Block blockArmbot;
public static Block blockCraneController; public static Block blockCraneController;
public static Block blockCraneParts; public static Block blockCraneRail;
public static Block blockTurntable; public static Block blockTurntable;
public static BlockMulti blockMulti; public static BlockMulti blockMulti;
@ -114,7 +111,7 @@ public class AssemblyLine
blockArmbot = new BlockArmbot(CONFIGURATION.getBlock("Armbot", BLOCK_ID_PREFIX + 8).getInt()); blockArmbot = new BlockArmbot(CONFIGURATION.getBlock("Armbot", BLOCK_ID_PREFIX + 8).getInt());
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()); blockCraneRail = new BlockCraneRail(CONFIGURATION.getBlock("CraneParts", BLOCK_ID_PREFIX + 11).getInt());
blockTurntable = new BlockTurntable(CONFIGURATION.getBlock("Turntable", BLOCK_ID_PREFIX + 12).getInt(), 10); 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());
@ -132,7 +129,7 @@ public class AssemblyLine
GameRegistry.registerBlock(blockArmbot, "Armbot"); GameRegistry.registerBlock(blockArmbot, "Armbot");
GameRegistry.registerBlock(blockTurntable, "Turntable"); GameRegistry.registerBlock(blockTurntable, "Turntable");
GameRegistry.registerBlock(blockCraneController, "Crane Controller"); GameRegistry.registerBlock(blockCraneController, "Crane Controller");
GameRegistry.registerBlock(blockCraneParts, ItemCraneParts.class, "Crane Parts"); GameRegistry.registerBlock(blockCraneRail, "Crane Rail");
TabAssemblyLine.itemStack = new ItemStack(AssemblyLine.blockConveyorBelt); TabAssemblyLine.itemStack = new ItemStack(AssemblyLine.blockConveyorBelt);
UpdateNotifier.INSTANCE.checkUpdate(NAME, VERSION, "http://calclavia.com/downloads/al/recommendedversion.txt"); UpdateNotifier.INSTANCE.checkUpdate(NAME, VERSION, "http://calclavia.com/downloads/al/recommendedversion.txt");

3
src/minecraft/assemblyline/common/machine/crane/BlockCraneController.java
View file

@ -7,6 +7,7 @@ import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.UniversalElectricity; import universalelectricity.core.UniversalElectricity;
import universalelectricity.prefab.BlockMachine; import universalelectricity.prefab.BlockMachine;
import assemblyline.client.render.BlockRenderingHandler; import assemblyline.client.render.BlockRenderingHandler;
import assemblyline.common.TabAssemblyLine;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
@ -18,7 +19,7 @@ public class BlockCraneController extends BlockMachine
super("cranecontroller", id, UniversalElectricity.machine); super("cranecontroller", id, UniversalElectricity.machine);
this.setResistance(5.0f); this.setResistance(5.0f);
this.setHardness(5.0f); this.setHardness(5.0f);
// this.setCreativeTab(TabAssemblyLine.INSTANCE); this.setCreativeTab(TabAssemblyLine.INSTANCE);
} }
@Override @Override

4
src/minecraft/assemblyline/common/machine/crane/BlockCraneParts.java → src/minecraft/assemblyline/common/machine/crane/BlockCraneRail.java
View file

@ -3,11 +3,11 @@ package assemblyline.common.machine.crane;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import universalelectricity.prefab.BlockMachine; import universalelectricity.prefab.BlockMachine;
public class BlockCraneParts extends BlockMachine public class BlockCraneRail extends BlockMachine
{ {
public static final int RAIL_META = 0; public static final int RAIL_META = 0;
public BlockCraneParts(int id) public BlockCraneRail(int id)
{ {
super("CraneParts", id, Material.iron); super("CraneParts", id, Material.iron);
// this.setCreativeTab(TabAssemblyLine.INSTANCE); // this.setCreativeTab(TabAssemblyLine.INSTANCE);

2
src/minecraft/assemblyline/common/machine/crane/CraneManager.java
View file

@ -42,7 +42,7 @@ public class CraneManager
//might have to change this meta later if i go with a more complex render that will connect to walls //might have to change this meta later if i go with a more complex render that will connect to walls
ForgeDirection facing = ForgeDirection.getOrientation(meta); ForgeDirection facing = ForgeDirection.getOrientation(meta);
if (id == AssemblyLine.blockCraneParts.blockID && (dir == facing || dir == facing.getOpposite())) if (id == AssemblyLine.blockCraneRail.blockID && (dir == facing || dir == facing.getOpposite()))
{ {
return true; return true;
} }

14
src/minecraft/assemblyline/common/machine/crane/ItemCraneParts.java
View file

@ -1,14 +0,0 @@
package assemblyline.common.machine.crane;
import net.minecraft.item.ItemBlock;
public class ItemCraneParts extends ItemBlock
{
public ItemCraneParts(int par1)
{
super(par1);
this.setHasSubtypes(true);
}
}