diff options
Diffstat (limited to 'ihl/items_blocks')
| -rw-r--r-- | ihl/items_blocks/FlexibleCableItem.java | 15 | ||||
| -rw-r--r-- | ihl/items_blocks/IHLBucketHandler.java | 20 | ||||
| -rw-r--r-- | ihl/items_blocks/IHLItemBlock.java | 43 | ||||
| -rw-r--r-- | ihl/items_blocks/ItemSubstance.java | 514 | ||||
| -rw-r--r-- | ihl/items_blocks/MachineBaseBlock.java | 150 |
5 files changed, 278 insertions, 464 deletions
diff --git a/ihl/items_blocks/FlexibleCableItem.java b/ihl/items_blocks/FlexibleCableItem.java index 7fd2583..9944f4c 100644 --- a/ihl/items_blocks/FlexibleCableItem.java +++ b/ihl/items_blocks/FlexibleCableItem.java @@ -28,7 +28,6 @@ import ihl.flexible_cable.AnchorTileEntity; import ihl.flexible_cable.NodeEntity;
import ihl.flexible_cable.PowerCableNodeEntity;
import ihl.interfaces.ICableHolder;
-import ihl.interfaces.IDataCableHolder;
import ihl.interfaces.IEnergyNetNode;
import ihl.interfaces.IMultiPowerCableHolder;
import ihl.interfaces.IWire;
@@ -100,8 +99,7 @@ public class FlexibleCableItem extends Item implements IWire { world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, "step.stone", 1.0F, 0.8F);
if (!world.isRemote && t != null
&& ((t instanceof IEnergyNetNode && !isDataCable)
- || (t instanceof IMultiPowerCableHolder && !isDataCable)
- || (t instanceof IDataCableHolder && isDataCable))
+ || (t instanceof IMultiPowerCableHolder && !isDataCable))
&& stack.stackTagCompound.getInteger("fullLength") >= 1) {
double ppx, ppy, ppz;
ICableHolder te;
@@ -138,10 +136,15 @@ public class FlexibleCableItem extends Item implements IWire { stack.stackTagCompound.setBoolean("firstConnection", false);
return false;
} else {
- if (t2 instanceof IMultiPowerCableHolder) {
- te = ((IMultiPowerCableHolder) t2).getEnergyNetNode(facing);
+ if (t instanceof IMultiPowerCableHolder) {
+ facing = ((IMultiPowerCableHolder) t).getSide(player);
+ if (facing == -1) {
+ return false;
+ } else {
+ te = ((IMultiPowerCableHolder) t).getEnergyNetNode(facing);
+ }
} else {
- te = (ICableHolder) t2;
+ te = (ICableHolder) t;
}
te.setCableCheck(true);
}
diff --git a/ihl/items_blocks/IHLBucketHandler.java b/ihl/items_blocks/IHLBucketHandler.java new file mode 100644 index 0000000..c0a23b6 --- /dev/null +++ b/ihl/items_blocks/IHLBucketHandler.java @@ -0,0 +1,20 @@ +package ihl.items_blocks;
+
+import net.minecraft.block.Block;
+import net.minecraftforge.event.entity.player.FillBucketEvent;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+
+public class IHLBucketHandler
+{
+ public IHLBucketHandler() {}
+ @SubscribeEvent
+ public void onBucketFill(FillBucketEvent event)
+ {
+ Block block = event.world.getBlock(event.target.blockX, event.target.blockY, event.target.blockZ);
+ if (block instanceof IHLFluidBlock && event.isCancelable())
+ {
+ event.setCanceled(true);
+ }
+ }
+
+}
diff --git a/ihl/items_blocks/IHLItemBlock.java b/ihl/items_blocks/IHLItemBlock.java index 3bde475..c25450d 100644 --- a/ihl/items_blocks/IHLItemBlock.java +++ b/ihl/items_blocks/IHLItemBlock.java @@ -10,9 +10,6 @@ import ic2.api.tile.IWrenchable; import ic2.core.IC2;
import ihl.IHLCreativeTab;
import ihl.IHLModInfo;
-import ihl.collector.ChargerEjectorTileEntity;
-import ihl.processing.metallurgy.PassiveBlock;
-import ihl.tunneling_shield.DriverTileEntity;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
@@ -101,25 +98,6 @@ public class IHLItemBlock extends ItemBlock{ this.field_150939_a.onBlockPlacedBy(world, x, y, z, player, par1ItemStack);
this.field_150939_a.onPostBlockPlaced(world, x, y, z, var13);
TileEntity tile=world.getTileEntity(x, y, z);
- if(tile!=null && par1ItemStack.stackTagCompound!=null && par1ItemStack.stackTagCompound.hasKey("energy") && tile instanceof ChargerEjectorTileEntity && IC2.platform.isSimulating())
- {
- ChargerEjectorTileEntity te=(ChargerEjectorTileEntity)tile;
- double energy;
- try
- {
- energy = par1ItemStack.stackTagCompound.getDouble("energy");
- }
- catch (Exception var3)
- {
- energy = par1ItemStack.stackTagCompound.getInteger("energy");
-
- if (energy > Integer.MAX_VALUE)
- {
- energy *= 10.0D;
- }
- }
- te.setStored(energy);
- }
if(tile instanceof IWrenchable && IC2.platform.isSimulating())
{
IWrenchable te=(IWrenchable)tile;
@@ -234,27 +212,6 @@ public class IHLItemBlock extends ItemBlock{ }
}
- @Override
- public boolean onItemUseFirst(ItemStack itemstack, EntityPlayer entityPlayer, World world, int x, int y, int z, int l, float hitX, float hitY, float hitZ)
- {
- TileEntity tileEntity = world.getTileEntity(x, y, z);
- if (tileEntity instanceof DriverTileEntity && IC2.platform.isSimulating())
- {
- DriverTileEntity dte = (DriverTileEntity) tileEntity;
- if(itemstack.getUnlocalizedName()==PassiveBlock.Type.IHLShieldAssemblyUnitBlock.unlocalizedName)
- {
- dte.installShield();
- itemstack.stackSize--;
- }
- else if(itemstack.getUnlocalizedName()==PassiveBlock.Type.AdvancedShieldAssemblyUnitBlock.unlocalizedName)
- {
- dte.installAdvancedShield();
- itemstack.stackSize--;
- }
- }
- return false;
- }
-
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public void addInformation(ItemStack itemStack, EntityPlayer player, List info, boolean flag)
diff --git a/ihl/items_blocks/ItemSubstance.java b/ihl/items_blocks/ItemSubstance.java index d934172..7404a54 100644 --- a/ihl/items_blocks/ItemSubstance.java +++ b/ihl/items_blocks/ItemSubstance.java @@ -34,304 +34,286 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
-public class ItemSubstance extends Item implements IItemHasMiniGUI{
-
+public class ItemSubstance extends Item implements IItemHasMiniGUI {
+
private static Map<Integer, IIcon> iconMap = new HashMap<Integer, IIcon>();
private static Map<Integer, String> nameMap = new HashMap<Integer, String>();
private static Map<Integer, String> descriptionMap = new HashMap<Integer, String>();
public static ItemSubstance instance;
-
- public ItemSubstance()
- {
+
+ public ItemSubstance() {
super();
this.setMaxDamage(0);
this.setNoRepair();
this.setHasSubtypes(true);
this.setCreativeTab(IHLCreativeTab.tab);
this.setUnlocalizedName("ihlSimpleItem");
- instance=this;
+ instance = this;
}
-
- public static void init()
- {
- Item breadWithLard = (new ItemFood(4, 0.1F, false)).setUnlocalizedName("breadWithLard").setTextureName(IHLModInfo.MODID+":breadWithLard").setCreativeTab(IHLCreativeTab.tab);
- GameRegistry.registerItem(breadWithLard,"food");
- IHLUtils.registerLocally("breadWithLard", new ItemStack(breadWithLard,1,0));
+
+ public static void init() {
+ Item breadWithLard = (new ItemFood(4, 0.1F, false)).setUnlocalizedName("breadWithLard")
+ .setTextureName(IHLModInfo.MODID + ":breadWithLard").setCreativeTab(IHLCreativeTab.tab);
+ GameRegistry.registerItem(breadWithLard, "food");
+ IHLUtils.registerLocally("breadWithLard", new ItemStack(breadWithLard, 1, 0));
ItemSubstance item = new ItemSubstance();
- GameRegistry.registerItem(item,item.getUnlocalizedName());
+ GameRegistry.registerItem(item, item.getUnlocalizedName());
Type[] var1 = Type.values();
- for(int i=0;i<var1.length;i++)
- {
- nameMap.put(var1[i].damage,var1[i].unLocalizedName);
- IHLUtils.registerLocally(var1[i].unLocalizedName, new ItemStack(item,1,var1[i].damage));
- if(var1[i].registerInOreDictionary)
- {
- OreDictionary.registerOre(var1[i].oreRegistryName, new ItemStack(item,1,var1[i].damage));
+ for (int i = 0; i < var1.length; i++) {
+ nameMap.put(var1[i].damage, var1[i].unLocalizedName);
+ IHLUtils.registerLocally(var1[i].unLocalizedName, new ItemStack(item, 1, var1[i].damage));
+ if (var1[i].registerInOreDictionary) {
+ OreDictionary.registerOre(var1[i].oreRegistryName, new ItemStack(item, 1, var1[i].damage));
}
- if(var1[i].description!=null)
- {
- descriptionMap.put(var1[i].damage,var1[i].description);
+ if (var1[i].description != null) {
+ descriptionMap.put(var1[i].damage, var1[i].description);
}
}
- ItemStack emptyCell = IC2Items.getItem("cell");
+ ItemStack emptyCell = IC2Items.getItem("cell");
IHLFluidType[] var2 = IHLFluidType.values();
- for(int i=0;i<var2.length;i++)
- {
+ for (int i = 0; i < var2.length; i++) {
IHLFluidType type = var2[i];
- if(type.cell!=null)
- {
- OreDictionary.registerOre("cell"+type.fluidName.replaceFirst("fluid", ""), type.cell);
- FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(type.fluid, FluidContainerRegistry.BUCKET_VOLUME), type.cell, emptyCell.copy()));
- }
- else
- {
- ItemStack filledCell = FluidContainerRegistry.fillFluidContainer(new FluidStack(type.fluid, FluidContainerRegistry.BUCKET_VOLUME),emptyCell.copy());
- if(filledCell==null && type.hasCell)
- {
- ItemStack stack = new ItemStack(item,1,type.damage);
- nameMap.put(type.damage,type.cellName);
+ if (type.cell != null) {
+ OreDictionary.registerOre("cell" + type.fluidName.replaceFirst("fluid", ""), type.cell);
+ FluidContainerRegistry.registerFluidContainer(new FluidContainerData(
+ new FluidStack(type.fluid, FluidContainerRegistry.BUCKET_VOLUME), type.cell, emptyCell.copy()));
+ } else {
+ ItemStack filledCell = FluidContainerRegistry.fillFluidContainer(
+ new FluidStack(type.fluid, FluidContainerRegistry.BUCKET_VOLUME), emptyCell.copy());
+ if (filledCell == null && type.hasCell) {
+ ItemStack stack = new ItemStack(item, 1, type.damage);
+ nameMap.put(type.damage, type.cellName);
IHLUtils.registerLocally(type.cellName, stack);
type.cell = stack;
- OreDictionary.registerOre("cell"+type.fluidName.replaceFirst("fluid", ""), type.cell);
- FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(type.fluid, FluidContainerRegistry.BUCKET_VOLUME), stack, emptyCell.copy()));
- }
- else
- {
- type.cell=filledCell;
+ OreDictionary.registerOre("cell" + type.fluidName.replaceFirst("fluid", ""), type.cell);
+ FluidContainerRegistry.registerFluidContainer(new FluidContainerData(
+ new FluidStack(type.fluid, FluidContainerRegistry.BUCKET_VOLUME), stack, emptyCell.copy()));
+ } else {
+ type.cell = filledCell;
}
}
}
- OreDictionary.registerOre("itemSalt",IHLUtils.getThisModItemStack("dustSalt"));
+ OreDictionary.registerOre("itemSalt", IHLUtils.getThisModItemStack("dustSalt"));
}
-
- public static void postInit()
- {
+
+ public static void postInit() {
Type[] var1 = Type.values();
- for(int i=0;i<var1.length;i++)
- {
- if(var1[i].registerInOreDictionary)
- {
- if(var1[i].oreRegistryName.contains("dustTiny"))
- {
- RecipeInputOreDict stack = new RecipeInputOreDict(var1[i].oreRegistryName);;
- Recipes.advRecipes.addShapelessRecipe(IHLUtils.getOreDictItemStackWithSize(var1[i].oreRegistryName,9),new RecipeInputOreDict(var1[i].oreRegistryName.replace("dustTiny", "dust")));
- Recipes.advRecipes.addShapelessRecipe(IHLUtils.getOreDictItemStack(var1[i].oreRegistryName.replace("dustTiny", "dust")),stack,stack,stack,stack,stack,stack,stack,stack,stack);
+ for (int i = 0; i < var1.length; i++) {
+ if (var1[i].registerInOreDictionary) {
+ if (var1[i].oreRegistryName.contains("dustTiny")) {
+ RecipeInputOreDict stack = new RecipeInputOreDict(var1[i].oreRegistryName);
+ ;
+ Recipes.advRecipes.addShapelessRecipe(
+ IHLUtils.getOreDictItemStackWithSize(var1[i].oreRegistryName, 9),
+ new RecipeInputOreDict(var1[i].oreRegistryName.replace("dustTiny", "dust")));
+ Recipes.advRecipes.addShapelessRecipe(
+ IHLUtils.getOreDictItemStack(var1[i].oreRegistryName.replace("dustTiny", "dust")), stack,
+ stack, stack, stack, stack, stack, stack, stack, stack);
}
- if(var1[i].oreRegistryName.contains("ingot") && IHLUtils.hasOreDictionaryEntry(var1[i].oreRegistryName.replace("ingot", "dust")))
- {
- IHLUtils.addIC2MaceratorRecipe(var1[i].oreRegistryName, IHLUtils.getOreDictItemStack(var1[i].oreRegistryName.replace("ingot", "dust")));
+ if (var1[i].oreRegistryName.contains("ingot")
+ && IHLUtils.hasOreDictionaryEntry(var1[i].oreRegistryName.replace("ingot", "dust"))) {
+ IHLUtils.addIC2MaceratorRecipe(var1[i].oreRegistryName,
+ IHLUtils.getOreDictItemStack(var1[i].oreRegistryName.replace("ingot", "dust")));
}
}
}
}
-
+
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
@SideOnly(Side.CLIENT)
- public void getSubItems(Item item, CreativeTabs tabs, List itemList)
- {
+ public void getSubItems(Item item, CreativeTabs tabs, List itemList) {
Type[] var1 = Type.values();
- for(int i=0;i<var1.length;i++)
- {
+ for (int i = 0; i < var1.length; i++) {
ItemStack stack = IHLUtils.getThisModItemStack(var1[i].unLocalizedName);
- if(var1[i]==Type.Detonator)
- {
- stack.stackTagCompound=new NBTTagCompound();
+ if (var1[i] == Type.Detonator) {
+ stack.stackTagCompound = new NBTTagCompound();
stack.stackTagCompound.setInteger("detonator_delay", 5);
}
- itemList.add(stack);
+ itemList.add(stack);
}
IHLFluidType[] var2 = IHLFluidType.values();
- for(int i=0;i<var2.length;i++)
- {
- if(var2[i].hasCell && var2[i].cell!=null)
- {
+ for (int i = 0; i < var2.length; i++) {
+ if (var2[i].hasCell && var2[i].cell != null) {
itemList.add(var2[i].cell);
}
}
- }
+ }
@Override
@SideOnly(Side.CLIENT)
- public void registerIcons(IIconRegister register)
- {
+ public void registerIcons(IIconRegister register) {
Type[] var1 = Type.values();
- for(int i=0;i<var1.length;i++)
- {
- iconMap.put(var1[i].damage, register.registerIcon(IHLModInfo.MODID + ":"+var1[i].textureName));
+ for (int i = 0; i < var1.length; i++) {
+ iconMap.put(var1[i].damage, register.registerIcon(IHLModInfo.MODID + ":" + var1[i].textureName));
}
IHLFluidType[] var2 = IHLFluidType.values();
- for(int i=0;i<var2.length;i++)
- {
+ for (int i = 0; i < var2.length; i++) {
IHLFluidType type = var2[i];
- if(var2[i].hasCell)
- {
- iconMap.put(type.damage, register.registerIcon(IHLModInfo.MODID + ":"+type.cellName));
+ if (var2[i].hasCell) {
+ iconMap.put(type.damage, register.registerIcon(IHLModInfo.MODID + ":" + type.cellName));
}
}
-
+
}
@Override
@SideOnly(Side.CLIENT)
- public IIcon getIconFromDamage(int i)
- {
+ public IIcon getIconFromDamage(int i) {
return iconMap.get(i);
}
-
+
@Override
- public String getUnlocalizedName(ItemStack stack)
- {
+ public String getUnlocalizedName(ItemStack stack) {
return nameMap.get(stack.getItemDamage());
}
-
- @Override
+
+ @Override
@SuppressWarnings({ "rawtypes", "unchecked" })
- public void addInformation(ItemStack itemStack, EntityPlayer player, List info, boolean flag)
- {
- if(ItemSubstance.descriptionMap.containsKey(itemStack.getItemDamage()))
- {
- info.add(ItemSubstance.descriptionMap.get(itemStack.getItemDamage()));
- }
- if(itemStack.stackTagCompound!=null && itemStack.stackTagCompound.hasKey("detonator_delay"))
- {
- info.add(StatCollector.translateToLocal("ihl.detonator_delay")+" "+itemStack.stackTagCompound.getInteger("detonator_delay")+StatCollector.translateToLocal("ihl.seconds"));
- }
- }
-
- public enum Type
- {
+ public void addInformation(ItemStack itemStack, EntityPlayer player, List info, boolean flag) {
+ if (ItemSubstance.descriptionMap.containsKey(itemStack.getItemDamage())) {
+ info.add(ItemSubstance.descriptionMap.get(itemStack.getItemDamage()));
+ }
+ if (itemStack.stackTagCompound != null && itemStack.stackTagCompound.hasKey("detonator_delay")) {
+ info.add(StatCollector.translateToLocal("ihl.detonator_delay") + " "
+ + itemStack.stackTagCompound.getInteger("detonator_delay")
+ + StatCollector.translateToLocal("ihl.seconds"));
+ }
+ }
+
+ public enum Type {
+ dustMercuryFulminate(195, "dustMercuryFulminate", true, "Hg(CNO)\u2082"),
Detonator(194, "detonator"),
- dustPentaerythritolTetranitrate(193,"dustPentaerythritolTetranitrate",true,"C(CH\u2082ONO\u2082)\u2084"),
- DustPentaerythritol(192, "dustPentaerythritol",true,"C(CH\u2082OH)\u2084"),
- DustPotassiumOxide(191, "dustPotassiumOxide",true,"K\u2082O"),
- IngotPotassium(190, "ingotPotassium",true,"K"),
- catalystIron(189, "catalystIron",false,"Fe (foam) + Al\u2082O\u2083 + K\u2082O"),
- catalystIronOxide(188, "catalystIronOxide",false,"Fe\u2082O\u2083 + Al\u2082O\u2083 + K\u2082O"),
- catalystRawIronOxide(187, "catalystRawIronOxide",false,"Fe\u2082O\u2083 + Al\u2082O\u2083 + K\u2082O"),
- IronOxideCatalystMix(186, "dustIronOxideCatalystMix",false,"Fe\u2082O\u2083 + Al\u2082O\u2083 + K\u2082O"),
- SodiumFormate(185, "dustSodiumFormate",true,"HCO\u2082Na"),
- MercuryChloride(184, "dustMercuryChloride",true,"HgCl\u2082"),
- CalciumAcetate(183, "dustCalciumAcetate",true,"Ca(CH\u2083COO)\u2082"),
- TinySiliconDioxide(182, "dustTinySiliconDioxide",true,"SiO\u2082"),
- TinyIronOxide(181, "dustTinyIronOxide",true,"Fe\u2082O\u2083"),
- TinyManganeseOxide(180, "dustTinyManganeseOxide",true,"Mn\u2083O\u2084"),
- TinyGypsum(179, "dustTinyGypsum",true,"CaSO\u2084\u00B72H\u2082O"),
- SodiumZeoliteCoked(178,"dustSodiumZeoliteCoked",true,"Na[AlSi\u2083O\u2088]+C"),
- SodiumZeolite(177,"dustSodiumZeolite",true,"Na[AlSi\u2083O\u2088]"),
- SodiumAluminate(176,"dustSodiumAluminate",true,"NaAlO\u2082"),
- SodiumHydroxide(175,"dustSodiumHydroxide",true,"NaOH"),
- DustTinyTungsten(174,"dustTinyTungsten",true,"W"),
- BauxiteDust(173, "dustBauxite",true,"Al\u2082O\u2083\u00B7H\u2082O"),
- LithiumIngot(172,"ingotLithium",true,"Li"),
- DustLithiumChloride(171,"dustLithiumChloride",true,"LiCl"),
+ dustPentaerythritolTetranitrate(193, "dustPentaerythritolTetranitrate", true, "C(CH\u2082ONO\u2082)\u2084"),
+ DustPentaerythritol(192, "dustPentaerythritol", true, "C(CH\u2082OH)\u2084"),
+ DustPotassiumOxide(191, "dustPotassiumOxide", true, "K\u2082O"),
+ IngotPotassium(190, "ingotPotassium", true, "K"),
+ catalystIron(189, "catalystIron", false, "Fe (foam) + Al\u2082O\u2083 + K\u2082O"),
+ catalystIronOxide(188, "catalystIronOxide", false, "Fe\u2082O\u2083 + Al\u2082O\u2083 + K\u2082O"),
+ catalystRawIronOxide(187, "catalystRawIronOxide", false, "Fe\u2082O\u2083 + Al\u2082O\u2083 + K\u2082O"),
+ IronOxideCatalystMix(186, "dustIronOxideCatalystMix", false, "Fe\u2082O\u2083 + Al\u2082O\u2083 + K\u2082O"),
+ SodiumFormate(185, "dustSodiumFormate", true, "HCO\u2082Na"),
+ MercuryChloride(184, "dustMercuryChloride", true, "HgCl\u2082"),
+ CalciumAcetate(183, "dustCalciumAcetate", true, "Ca(CH\u2083COO)\u2082"),
+ TinySiliconDioxide(182, "dustTinySiliconDioxide", true, "SiO\u2082"),
+ TinyIronOxide(181, "dustTinyIronOxide", true, "Fe\u2082O\u2083"),
+ TinyManganeseOxide(180, "dustTinyManganeseOxide", true, "Mn\u2083O\u2084"),
+ TinyGypsum(179, "dustTinyGypsum", true, "CaSO\u2084\u00B72H\u2082O"),
+ SodiumZeoliteCoked(178, "dustSodiumZeoliteCoked", true, "Na[AlSi\u2083O\u2088]+C"),
+ SodiumZeolite(177, "dustSodiumZeolite", true, "Na[AlSi\u2083O\u2088]"),
+ SodiumAluminate(176, "dustSodiumAluminate", true, "NaAlO\u2082"),
+ SodiumHydroxide(175, "dustSodiumHydroxide", true, "NaOH"),
+ DustTinyTungsten(174, "dustTinyTungsten", true, "W"),
+ BauxiteDust(173, "dustBauxite", true, "Al\u2082O\u2083\u00B7H\u2082O"),
+ LithiumIngot(172, "ingotLithium", true, "Li"),
+ DustLithiumChloride(171, "dustLithiumChloride", true, "LiCl"),
CoalPlate(170, "plateCoal", true, "C (amorphic)"),
GraphitePlate(156, "plateGraphite", true, "C (graphite)"),
CoalRawPlate(155, "plateRawCoal"),
- //RedstoneSensor(169,"redstoneSensor"),
- //RedstoneEmitter(168,"redstoneEmitter"),
- IncisorSteelDiamondCoated(167,"incisorSteelDiamondCoated"),
- IncisorSteel(166,"incisorSteel"),
- LampHolderPorcelain(165,"lampHolderPorcelain"),
- LampHolderRawPorcelain(164,"lampHolderRawPorcelain"),
- DustIridium(163,"dustIridium",true,"Ir"),
- SiliconTiny(162, "dustTinySilicon",true,"Si"),
- DustMagnesiumOxide(161,"dustMagnesiumOxide",true,"MgO"),
- Silicon(160, "dustSilicon",true,"Si"),
- Bischofite(159,"dustBischofite",true,"MgCl\u2082\u00B76H\u2082O"),
- DustMagnesium(158,"dustMagnesium",true,"Mg"),
- IngotMagnesium(157,"ingotMagnesium",true,"Mg"),
- Ignitron(154,"ignitron"),
- BoronCarbideElectrode(153,"stickBoronCarbide",true,"B\u2084C"),
- LeadFoil(152,"foilLead",true,"Pb"),
- DustLeadPlumbate(151,"dustLeadPlumbate",true,"Pb\u2082PbO\u2084"),
- VacuumSwitch(150,"vacuumSwitch"),
- HallSensor(149,"hallSensor"),
- BatteryCells(148,"batteryCellsEbonite"),
- //BatteryCellsRaw(147,"batteryCellsRawEbonite"),
- MuscoviteGetinax(146,"plateMica",true,"KAl\u2082(AlSi\u2083O\u2081\u2080)(OH)\u2082"),
- BoronCarbide(145,"dustBoronCarbide",true,"B\u2084C"),
- DustBoricAcid(144,"dustBoricAcid",true,"H\u2083BO\u2083"),
- DustDatolite(143,"dustDatolite",true,"H\u2082Ca\u2082B\u2082Si\u2082O\u2081\u2080"),
- DustFerrite(142,"dustFerrite",true,"Li\u2082Fe\u2082O\u2084"),
- RingFerrite(141,"ringFerrite",true,"Li\u2082Fe\u2082O\u2084"),
- RingRawFerrite(140,"ringRawFerrite"),
- LithiumOxide(139,"dustLithiumOxide",true,"Li\u2082O"),
- SolderingAlloyDust(138,"dustSolderingAlloy",true,"Sn\u2089Sb"),
- AntimonyTinyDust(137,"dustTinyAntimony",true,"Sb"),
- InsulatorPorcelain(136,"insulatorPorcelain"),
- InsulatorRawPorcelain(135,"insulatorRawPorcelain"),
- AntimonyDust(134,"dustAntimony",true,"Sb"),
- AntimonyOxide(133,"dustAntimonyOxide",true,"Sb\u2082O\u2083"),
- StibniteDust(132,"dustStibnite",true,"Sb\u2082S\u2083"),
- CrushedPurifiedStibnite(131,"crushedPurifiedStibnite",true,"Sb\u2082S\u2083"),
- CrushedStibnite(130,"crushedStibnite",true,"Sb\u2082S\u2083"),
- RingPorcelain(129,"ringPorcelain"),
- RingRawPorcelain(128,"ringRawPorcelain"),
- CopperFoil(127,"foilCopper",true,"Cu"),
- CrushedPurifiedBauxite(126, "crushedPurifiedBauxite",true,"Al\u2082O\u2083\u00B7H\u2082O"),
- CrushedBauxite(125, "crushedBauxite",true,"Al\u2082O\u2083�H\u2082O + SiO\u2082, Fe\u2082O\u2083"),
- SodiumSulfide(124,"dustSodiumSulfide",true,"NaS"),
- SodiumSulfate(123,"dustSodiumSulfate",true,"Na\u2082SO\u2084"),
- dustWood(122,"dustWood",true),
- Kenotron(121,"valveTube1C21P"),
- HighVolatgeCapacitor(120,"highVoltageCapacitor"),
- MuscovitePaper(119,"foilMica",true,"KAl\u2082(AlSi\u2083O\u2081\u2080)(OH)\u2082"),
- MuscoviteDust(118,"dustMica",true,"KAl\u2082(AlSi\u2083O\u2081\u2080)(OH)\u2082"),
+ // RedstoneSensor(169,"redstoneSensor"),
+ // RedstoneEmitter(168,"redstoneEmitter"),
+ IncisorSteelDiamondCoated(167, "incisorSteelDiamondCoated"),
+ IncisorSteel(166, "incisorSteel"),
+ LampHolderPorcelain(165, "lampHolderPorcelain"),
+ LampHolderRawPorcelain(164, "lampHolderRawPorcelain"),
+ DustIridium(163, "dustIridium", true, "Ir"),
+ SiliconTiny(162, "dustTinySilicon", true, "Si"),
+ DustMagnesiumOxide(161, "dustMagnesiumOxide", true, "MgO"),
+ Silicon(160, "dustSilicon", true, "Si"),
+ Bischofite(159, "dustBischofite", true, "MgCl\u2082\u00B76H\u2082O"),
+ DustMagnesium(158, "dustMagnesium", true, "Mg"),
+ IngotMagnesium(157, "ingotMagnesium", true, "Mg"),
+ Ignitron(154, "ignitron"),
+ BoronCarbideElectrode(153, "stickBoronCarbide", true, "B\u2084C"),
+ LeadFoil(152, "foilLead", true, "Pb"),
+ DustLeadPlumbate(151, "dustLeadPlumbate", true, "Pb\u2082PbO\u2084"),
+ VacuumSwitch(150, "vacuumSwitch"),
+ HallSensor(149, "hallSensor"),
+ BatteryCells(148, "batteryCellsEbonite"),
+ // BatteryCellsRaw(147,"batteryCellsRawEbonite"),
+ MuscoviteGetinax(146, "plateMica", true, "KAl\u2082(AlSi\u2083O\u2081\u2080)(OH)\u2082"),
+ BoronCarbide(145, "dustBoronCarbide", true, "B\u2084C"),
+ DustBoricAcid(144, "dustBoricAcid", true, "H\u2083BO\u2083"),
+ DustDatolite(143, "dustDatolite", true, "H\u2082Ca\u2082B\u2082Si\u2082O\u2081\u2080"),
+ DustFerrite(142, "dustFerrite", true, "Li\u2082Fe\u2082O\u2084"),
+ RingFerrite(141, "ringFerrite", true, "Li\u2082Fe\u2082O\u2084"),
+ RingRawFerrite(140, "ringRawFerrite"),
+ LithiumOxide(139, "dustLithiumOxide", true, "Li\u2082O"),
+ SolderingAlloyDust(138, "dustSolderingAlloy", true, "Sn\u2089Sb"),
+ AntimonyTinyDust(137, "dustTinyAntimony", true, "Sb"),
+ InsulatorPorcelain(136, "insulatorPorcelain"),
+ InsulatorRawPorcelain(135, "insulatorRawPorcelain"),
+ AntimonyDust(134, "dustAntimony", true, "Sb"),
+ AntimonyOxide(133, "dustAntimonyOxide", true, "Sb\u2082O\u2083"),
+ StibniteDust(132, "dustStibnite", true, "Sb\u2082S\u2083"),
+ CrushedPurifiedStibnite(131, "crushedPurifiedStibnite", true, "Sb\u2082S\u2083"),
+ CrushedStibnite(130, "crushedStibnite", true, "Sb\u2082S\u2083"),
+ RingPorcelain(129, "ringPorcelain"),
+ RingRawPorcelain(128, "ringRawPorcelain"),
+ CopperFoil(127, "foilCopper", true, "Cu"),
+ CrushedPurifiedBauxite(126, "crushedPurifiedBauxite", true, "Al\u2082O\u2083\u00B7H\u2082O"),
+ CrushedBauxite(125, "crushedBauxite", true, "Al\u2082O\u2083�H\u2082O + SiO\u2082, Fe\u2082O\u2083"),
+ SodiumSulfide(124, "dustSodiumSulfide", true, "NaS"),
+ SodiumSulfate(123, "dustSodiumSulfate", true, "Na\u2082SO\u2084"),
+ dustWood(122, "dustWood", true),
+ Kenotron(121, "valveTube1C21P"),
+ HighVolatgeCapacitor(120, "highVoltageCapacitor"),
+ MuscovitePaper(119, "foilMica", true, "KAl\u2082(AlSi\u2083O\u2081\u2080)(OH)\u2082"),
+ MuscoviteDust(118, "dustMica", true, "KAl\u2082(AlSi\u2083O\u2081\u2080)(OH)\u2082"),
GaedesPumpBarrel(117, "gaedesPumpBarrelPorcelain"),
RawGaedesPumpBarrel(116, "gaedesPumpBarrelRawPorcelain"),
- GlassDust(115, "dustGlass",true),
+ GlassDust(115, "dustGlass", true),
Gu81m(114, "gu-81m"),
- TungstenFoil(113, "foilTungsten",true),
- TungstenIngot(112, "ingotTungsten",true),
- TungstenPlate(111, "plateTungsten",true),
- TungstenHotPlate(110, "plateHotTungsten",true),
- CrushedPurifiedCinnabar(109, "crushedPurifiedCinnabar",true,"HgS"),
- CrushedCinnabar(108, "crushedCinnabar",true,"HgS"),
- OvenRawPorcelain(107,"ovenRawPorcelain"),
- PrecipitatorCondenserRawPorcelain(106,"precipitatorCondenserRawPorcelain"),
- ChimneyKneeRawPorcelain(105,"chimneyKneeRawPorcelain"),
- TungstenDust(104, "dustTungsten",true,"W"),
- ElectrolysisBathPorcelain(103,"electrolysisBathPorcelain"),
- ElectrolysisBathRawPorcelain(102,"electrolysisBathRawPorcelain"),
- Porcelain(99,"dustPorcelain",true),
- FoilGold(98, "foilGold",true),
- TungsticAcid(97, "dustTungsticAcid",true,"WO\u2083\u00B7H\u2082O"),
- TurboCompressorSetOfMoldedParts(96,"turboCompressorSetOfMoldedPartsBronze"),
- TungstenOxide(94, "dustTungstenOxide",true,"WO\u2083"),
- CalciumTungstate(93, "dustCalciumTungstate",true,"CaWO\u2084"),
- SodiumHydrogenSulfate(92, "dustSodiumHydrogenSulfate",true,"NaHSO\u2084"),
- Salt(91, "dustSalt",true,"NaCl"),
- CalciumChloride(90, "dustCalciumChloride",true,"CaCl\u2082"),
- PotassiumSulphate(89, "dustPotassiumSulphate",true,"K\u2082SO\u2084"),
- RockSalt(88, "dustRockSalt",true,"KCl"),
- CrushedPurifiedGyuibnera(87, "crushedPurifiedGyubnera",true,"(Mn,Fe)WO\u2084 (5:1)"),
- CrushedGyuibnera(86, "crushedGyubnera",true,"(Mn,Fe)WO\u2084 (5:1)"),
- ManganeseOxide(85, "dustManganeseOxide",true,"Mn\u2083O\u2084"),
- IronOxide(84, "dustIronOxide",true,"Fe\u2082O\u2083"),
- SmallRound(83,"smallRoundSteel"),
- SmallRoundPolished(82,"smallRoundPolishedSteel"),
- RollingMachineSetOfMoldedParts(81,"rollingMachineSetOfMoldedPartsSteel"),
+ TungstenFoil(113, "foilTungsten", true),
+ TungstenIngot(112, "ingotTungsten", true),
+ TungstenPlate(111, "plateTungsten", true),
+ TungstenHotPlate(110, "plateHotTungsten", true),
+ CrushedPurifiedCinnabar(109, "crushedPurifiedCinnabar", true, "HgS"),
+ CrushedCinnabar(108, "crushedCinnabar", true, "HgS"),
+ OvenRawPorcelain(107, "ovenRawPorcelain"),
+ PrecipitatorCondenserRawPorcelain(106, "precipitatorCondenserRawPorcelain"),
+ ChimneyKneeRawPorcelain(105, "chimneyKneeRawPorcelain"),
+ TungstenDust(104, "dustTungsten", true, "W"),
+ ElectrolysisBathPorcelain(103, "electrolysisBathPorcelain"),
+ ElectrolysisBathRawPorcelain(102, "electrolysisBathRawPorcelain"),
+ Porcelain(99, "dustPorcelain", true),
+ FoilGold(98, "foilGold", true),
+ TungsticAcid(97, "dustTungsticAcid", true, "WO\u2083\u00B7H\u2082O"),
+ TurboCompressorSetOfMoldedParts(96, "turboCompressorSetOfMoldedPartsBronze"),
+ TungstenOxide(94, "dustTungstenOxide", true, "WO\u2083"),
+ CalciumTungstate(93, "dustCalciumTungstate", true, "CaWO\u2084"),
+ SodiumHydrogenSulfate(92, "dustSodiumHydrogenSulfate", true, "NaHSO\u2084"),
+ Salt(91, "dustSalt", true, "NaCl"),
+ CalciumChloride(90, "dustCalciumChloride", true, "CaCl\u2082"),
+ PotassiumSulphate(89, "dustPotassiumSulphate", true, "K\u2082SO\u2084"),
+ RockSalt(88, "dustRockSalt", true, "KCl"),
+ CrushedPurifiedGyuibnera(87, "crushedPurifiedGyubnera", true, "(Mn,Fe)WO\u2084 (5:1)"),
+ CrushedGyuibnera(86, "crushedGyubnera", true, "(Mn,Fe)WO\u2084 (5:1)"),
+ ManganeseOxide(85, "dustManganeseOxide", true, "Mn\u2083O\u2084"),
+ IronOxide(84, "dustIronOxide", true, "Fe\u2082O\u2083"),
+ SmallRound(83, "smallRoundSteel"),
+ SmallRoundPolished(82, "smallRoundPolishedSteel"),
+ RollingMachineSetOfMoldedParts(81, "rollingMachineSetOfMoldedPartsSteel"),
PistonCylinder(80, "pistonCylinderSteel"),
PipelineAccessoriesSteel(77, "pipelineAccessoriesSteel"),
- DustTrona(76, "dustTrona",true,"Na\u2082CO\u2083�NaHCO\u2083\u00B72H\u2082O"),
+ DustTrona(76, "dustTrona", true, "Na\u2082CO\u2083�NaHCO\u2083\u00B72H\u2082O"),
HighPressureVessel(75, "highPressureVesselSteel"),
GasJet(74, "gasJetSteel"),
GasReducerSteel(73, "gasReducerSteel"),
HotSteelIngot(70, "ingotHotSteel", true),
BarD10Gold(69, "barD10Gold"),
- CalciumCarbide(68, "dustCalciumCarbide",true,"CaC\u2082"),
- foilRubber(67,"foilRubber", true,"(C\u2085H\u2088)n"),
- Fabric(66,"fabric"),
- ThinRubberWithSulfur(65,"foilRubberWithSulfur"),
- Bucket_tarPitch(64,"bucket_tarPitch"),
- DetonationSprayingMachineSetOfMoldedParts(63,"detonationSprayingMachineSetOfMoldedPartsBronze"),
- SetOfPartsForLVElemotorSteel(62,"setOfPartsForLVElemotorSteel"),
- //PlateNonVulcanizedRubber(60, "plateNonVulcanizedRubber"),
+ CalciumCarbide(68, "dustCalciumCarbide", true, "CaC\u2082"),
+ foilRubber(67, "foilRubber", true, "(C\u2085H\u2088)n"),
+ Fabric(66, "fabric"),
+ ThinRubberWithSulfur(65, "foilRubberWithSulfur"),
+ Bucket_tarPitch(64, "bucket_tarPitch"),
+ DetonationSprayingMachineSetOfMoldedParts(63, "detonationSprayingMachineSetOfMoldedPartsBronze"),
+ SetOfPartsForLVElemotorSteel(62, "setOfPartsForLVElemotorSteel"),
+ // PlateNonVulcanizedRubber(60, "plateNonVulcanizedRubber"),
TapM10SteelHot(59, "tapM10x1SteelHot"),
DiceM10SteelHot(58, "diceM10x1SteelHot"),
- NailSteel(57,"nailSteel"),
- NutM10x1Steel(56,"nutM10x1Steel"),
+ NailSteel(57, "nailSteel"),
+ NutM10x1Steel(56, "nutM10x1Steel"),
GraverSteel(55, "graverSteel"),
GraverSteelHot(54, "graverSteelHot"),
DrillSteel(53, "drillSteel"),
@@ -352,7 +334,7 @@ public class ItemSubstance extends Item implements IItemHasMiniGUI{ BlankSetOfFilesSteel(37, "blankSetOfFilesSteel"),
HandDrillSetOfMoldedPartsBronze(36, "handDrillSetOfMoldedPartsBronze"),
ViseSetOfMoldedPartsSteel(34, "viseSetOfMoldedPartsSteel"),
- DustIrongraphite(33, "dustIrongraphite",true),
+ DustIrongraphite(33, "dustIrongraphite", true),
PlateSteelHot(32, "plateHotSteel"),
Chisel(31, "blankChiselSteel"),
CrucibleMixture(30, "crucibleMixture"),
@@ -368,63 +350,63 @@ public class ItemSubstance extends Item implements IItemHasMiniGUI{ SpringSteel(19, "springSteel"),
CoalElectrodePremix(18, "dustCoalElectrodePremix"),
rawCoalElectrode(17, "stickCoalElectrodePremix"),
- FoilSteel(16, "foilSteel",true),
- StickSteel(15, "stickSteel",true),
- Quicklime(14, "dustQuicklime",true,"CaO"),
- Calcite(13, "dustCalcite",true,"CaCO\u2082"),
- Gypsum(12, "dustGypsum",true,"CaSO\u2084\u00B72H\u2082O"),
- PotassiumFeldspar(11, "dustPotassiumFeldspar",true,"K[AlSi\u2083O\u2088]"),
- Apatite(10, "gemApatite",true,"Ca\u2085[PO\u2084]\u2083(F,Cl,OH)"),
- Saltpeter(9, "dustSaltpeter",true,"KNO\u2083"),
- TarPitch(8, "ingotTarPitch",true),
- nuggetTarPitch(7, "nuggetTarPitch",true),
- Graphite_Electrode(6, "stickGraphite",true, "C (graphite)"),
- Coal_Electrode(5, "stickCoal",true, "C (amorphic)"),
- Carborundum(4, "dustCarborundum",true,"SiC"),
- IridiumAndSodiumOxide(3, "dustIridiumAndSodiumOxide",true,"IrO\u2082 + Na\u2082O"),
- PlatinumGroupSludge(2, "dustPlatinumGroupSludge",true),
- TinyPlatinumGroupSludge(1, "dustTinyPlatinumGroupSludge",true),
- SodiumPeroxide(0, "dustSodiumPeroxide",true,"Na\u2082O\u2082");
- Type(int damage1, String unlocalizedName1)
- {
- damage=damage1;
- textureName=unLocalizedName=unlocalizedName1;
+ FoilSteel(16, "foilSteel", true),
+ StickSteel(15, "stickSteel", true),
+ Quicklime(14, "dustQuicklime", true, "CaO"),
+ Calcite(13, "dustCalcite", true, "CaCO\u2082"),
+ Gypsum(12, "dustGypsum", true, "CaSO\u2084\u00B72H\u2082O"),
+ PotassiumFeldspar(11, "dustPotassiumFeldspar", true, "K[AlSi\u2083O\u2088]"),
+ Apatite(10, "gemApatite", true, "Ca\u2085[PO\u2084]\u2083(F,Cl,OH)"),
+ Saltpeter(9, "dustSaltpeter", true, "KNO\u2083"),
+ TarPitch(8, "ingotTarPitch", true),
+ nuggetTarPitch(7, "nuggetTarPitch", true),
+ Graphite_Electrode(6, "stickGraphite", true, "C (graphite)"),
+ Coal_Electrode(5, "stickCoal", true, "C (amorphic)"),
+ Carborundum(4, "dustCarborundum", true, "SiC"),
+ IridiumAndSodiumOxide(3, "dustIridiumAndSodiumOxide", true, "IrO\u2082 + Na\u2082O"),
+ PlatinumGroupSludge(2, "dustPlatinumGroupSludge", true),
+ TinyPlatinumGroupSludge(1, "dustTinyPlatinumGroupSludge", true),
+ SodiumPeroxide(0, "dustSodiumPeroxide", true, "Na\u2082O\u2082");
+ Type(int damage1, String unlocalizedName1) {
+ damage = damage1;
+ textureName = unLocalizedName = unlocalizedName1;
}
- Type(int damage1,String unlocalizedName1, boolean registerInOreDictionary1)
- {
- damage=damage1;
- textureName=oreRegistryName=unLocalizedName=unlocalizedName1;
- registerInOreDictionary=registerInOreDictionary1;
+
+ Type(int damage1, String unlocalizedName1, boolean registerInOreDictionary1) {
+ damage = damage1;
+ textureName = oreRegistryName = unLocalizedName = unlocalizedName1;
+ registerInOreDictionary = registerInOreDictionary1;
}
- Type(int damage1,String unlocalizedName1, boolean registerInOreDictionary1,String description1)
- {
- damage=damage1;
- textureName=oreRegistryName=unLocalizedName=unlocalizedName1;
- registerInOreDictionary=registerInOreDictionary1;
- description=description1;
+
+ Type(int damage1, String unlocalizedName1, boolean registerInOreDictionary1, String description1) {
+ damage = damage1;
+ textureName = oreRegistryName = unLocalizedName = unlocalizedName1;
+ registerInOreDictionary = registerInOreDictionary1;
+ description = description1;
}
- Type(int damage1,String unlocalizedName1, boolean registerInOreDictionary1,String description1, String textureName1)
- {
- damage=damage1;
- oreRegistryName=unLocalizedName=unlocalizedName1;
- registerInOreDictionary=registerInOreDictionary1;
- description=description1;
- textureName=textureName1;
+
+ Type(int damage1, String unlocalizedName1, boolean registerInOreDictionary1, String description1,
+ String textureName1) {
+ damage = damage1;
+ oreRegistryName = unLocalizedName = unlocalizedName1;
+ registerInOreDictionary = registerInOreDictionary1;
+ description = description1;
+ textureName = textureName1;
}
+
public int damage;
public String unLocalizedName;
public String oreRegistryName;
public String description;
public String textureName;
- public boolean registerInOreDictionary=false;
+ public boolean registerInOreDictionary = false;
}
@Override
@SideOnly(Side.CLIENT)
- public ItemMiniGUI getMiniGUI(GuiContainer gui, Slot slot)
- {
- if(slot.getHasStack() && slot.getStack().getItemDamage()==Type.Detonator.damage && slot.getStack().stackTagCompound!=null)
- {
+ public ItemMiniGUI getMiniGUI(GuiContainer gui, Slot slot) {
+ if (slot.getHasStack() && slot.getStack().getItemDamage() == Type.Detonator.damage
+ && slot.getStack().stackTagCompound != null) {
return new DetonatorMiniGUI(gui, slot);
}
return null;
diff --git a/ihl/items_blocks/MachineBaseBlock.java b/ihl/items_blocks/MachineBaseBlock.java index a5d6764..80bcd5a 100644 --- a/ihl/items_blocks/MachineBaseBlock.java +++ b/ihl/items_blocks/MachineBaseBlock.java @@ -7,8 +7,6 @@ import ic2.core.item.tool.ItemToolCutter; import ihl.IHLCreativeTab;
import ihl.IHLMod;
import ihl.IHLModInfo;
-import ihl.collector.GlassBoxTileEntity;
-import ihl.datanet.RedstoneSignalConverterTileEntity;
import ihl.flexible_cable.BatterySwitchUnitTileEntity;
import ihl.flexible_cable.IronWorkbenchTileEntity;
import ihl.flexible_cable.RectifierTransformerUnitTileEntity;
@@ -40,12 +38,10 @@ import ihl.processing.metallurgy.LathePart2TileEntity; import ihl.processing.metallurgy.MuffleFurnanceTileEntity;
import ihl.processing.metallurgy.RollingMachinePart1TileEntity;
import ihl.processing.metallurgy.RollingMachinePart2TileEntity;
-import ihl.processing.metallurgy.VacuumInductionMeltingFurnaceTileEntity;
import ihl.processing.metallurgy.VulcanizationExtrudingMoldTileEntity;
import ihl.processing.metallurgy.WireMillTileEntity;
import ihl.processing.metallurgy.WoodenRollingMachinePart1TileEntity;
import ihl.processing.metallurgy.WoodenRollingMachinePart2TileEntity;
-import ihl.tunneling_shield.HydrotransportPulpRegeneratorTileEntity;
import ihl.utils.IHLUtils;
import java.util.ArrayList;
@@ -151,11 +147,6 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider{ world.setBlockToAir(x, y+1, z);
}
}
- if(te instanceof RedstoneSignalConverterTileEntity)
- {
- RedstoneSignalConverterTileEntity rscte = (RedstoneSignalConverterTileEntity) te;
- rscte.linksOrInventoryChanged=true;
- }
}
}
@@ -191,11 +182,6 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider{ if(inventory.getStackInSlot(i)!=null)world.spawnEntityInWorld(new EntityItem(world, x, y+1, z, inventory.getStackInSlot(i)));
}
}
- if(te instanceof RedstoneSignalConverterTileEntity)
- {
- RedstoneSignalConverterTileEntity rsce = (RedstoneSignalConverterTileEntity)te;
- rsce.removeAttachedChains();
- }
}
}
super.onBlockPreDestroy(world, x, y, z, meta);
@@ -220,23 +206,6 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider{ super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity);
this.setBlockBoundsForItemRender();
break;
- case GlassBox:
- this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.1F, 1.0F);
- super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity);
- this.setBlockBounds(0.0F, 0.0F, 0.0F, 0.1F, 1.0F, 1.0F);
- super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity);
- this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 0.1F);
- super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity);
- this.setBlockBounds(0.9F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
- super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity);
- this.setBlockBounds(0.0F, 0.0F, 0.9F, 1.0F, 1.0F, 1.0F);
- super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity);
- this.setBlockBoundsForItemRender();
- break;
- case RedstoneSignalConverter:
- this.setBlockBounds(0.2F, 0.2F, 0.2F, 0.8F, 0.8F, 0.8F);
- super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity);
- break;
default:
super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity);
break;
@@ -249,49 +218,6 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider{ this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
}
- @Override
- public void setBlockBoundsBasedOnState(IBlockAccess blockAccess, int x, int y, int z)
- {
- int facing = 3;
- TileEntity te = blockAccess.getTileEntity(x, y, z);
- if(te!=null && te instanceof IWrenchable)
- {
- IWrenchable tebh = (IWrenchable) te;
- facing=tebh.getFacing();
- }
- switch(this.type)
- {
- case VacuumInductionMeltingFurnace:
- switch(facing)
- {
- case 0:
- this.setBlockBounds(-1.0F, -2.0F, 0.0F, 2.0F, 1.0F, 3.0F);
- break;
- case 1:
- this.setBlockBounds(-1.0F, 0.0F, 0.0F, 2.0F, 3.0F, 3.0F);
- break;
- case 2:
- this.setBlockBounds(-1.0F, 0.0F, -2.0F, 2.0F, 3.0F, 1.0F);
- break;
- case 3:
- this.setBlockBounds(-1.0F, 0.0F, 0.0F, 2.0F, 3.0F, 3.0F);
- break;
- case 4:
- this.setBlockBounds(-2.0F, 0.0F, -1.0F, 1.0F, 3.0F, 2.0F);
- break;
- case 5:
- this.setBlockBounds(0.0F, 0.0F, -1.0F, 3.0F, 3.0F, 2.0F);
- break;
- default:
- break;
- }
- break;
- default:
- super.setBlockBoundsBasedOnState(blockAccess, x, y, z);
- break;
- }
- }
-
public static void init()
{
MachineType[] var1 = MachineType.values();
@@ -484,10 +410,6 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider{ {
return this.steel;
}
- if(this.type==MachineType.RedstoneSignalConverter)
- {
- return this.redstoneSignalConverterEmptySide;
- }
if(this.type==MachineType.RectifierTransformerUnit)
{
switch(side)
@@ -535,10 +457,6 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider{ case 0:
switch(this.type)
{
- case HydrotransportPulpRegenerator:
- return this.hydrotransportPulpRegeneratorFront;
- case GlassBox:
- return this.glassBoxSide;
case BronzeTub:
return this.bronzeTubSide;
case AchesonFurnace:
@@ -559,18 +477,12 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider{ return this.textureFrontCryogenicDistiller;
case PaperMachine:
return this.textureFrontPaperMachine;
- case VacuumInductionMeltingFurnace:
- return this.vacuumInductionMeltingFurnaceFront;
default:
break;
}
case 1:
switch(this.type)
{
- case HydrotransportPulpRegenerator:
- return this.hydrotransportPulpRegeneratorBack;
- case GlassBox:
- return this.glassBoxSide;
case BronzeTub:
return this.bronzeTubSide;
case LeadOven:
@@ -587,8 +499,6 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider{ return this.textureBackCryogenicDistiller;
case ChemicalReactor:
return this.textureBackCryogenicDistiller;
- case VacuumInductionMeltingFurnace:
- return this.vacuumInductionMeltingFurnaceBack;
default:
return this.textureBack;
}
@@ -596,10 +506,6 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider{ case 2:
switch(this.type)
{
- case HydrotransportPulpRegenerator:
- return this.textureBackMachineCasing;
- case GlassBox:
- return this.glassBoxBottom;
case BronzeTub:
return this.bronzeTubSide;
case LeadOven:
@@ -616,18 +522,12 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider{ return this.textureBackMachineCasing;
case ChemicalReactor:
return this.textureBackMachineCasing;
- case VacuumInductionMeltingFurnace:
- return this.vacuumInductionMeltingFurnaceRight;
default:
return this.textureTop;
}
case 3:
switch(this.type)
{
- case HydrotransportPulpRegenerator:
- return this.textureTopMachineCasing;
- case GlassBox:
- return this.glassBoxTop;
case BronzeTub:
return this.bronzeTubTop;
case AchesonFurnace:
@@ -648,18 +548,12 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider{ return this.textureTopMachineCasing;
case ChemicalReactor:
return this.textureTopMachineCasing;
- case VacuumInductionMeltingFurnace:
- return this.vacuumInductionMeltingFurnaceRight;
default:
return this.textureTop;
}
case 4:
switch(this.type)
{
- case HydrotransportPulpRegenerator:
- return this.textureRightMachineCasing;
- case GlassBox:
- return this.glassBoxSide;
case BronzeTub:
return this.bronzeTubSide;
case LeadOven:
@@ -676,18 +570,12 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider{ return this.textureRightMachineCasing;
case ChemicalReactor:
return this.textureRightMachineCasing;
- case VacuumInductionMeltingFurnace:
- return this.vacuumInductionMeltingFurnaceRight;
default:
return this.textureSide;
}
case 5:
switch(this.type)
{
- case HydrotransportPulpRegenerator:
- return this.textureLeftMachineCasing;
- case GlassBox:
- return this.glassBoxSide;
case BronzeTub:
return this.bronzeTubSide;
case LeadOven:
@@ -704,8 +592,6 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider{ return this.textureLeftMachineCasing;
case FluidizedBedReactor:
return this.textureLeftMachineCasing;
- case VacuumInductionMeltingFurnace:
- return this.vacuumInductionMeltingFurnaceLeft;
default:
return this.textureSide;
}
@@ -720,18 +606,6 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider{ return true;
}
- @Override
- public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int side)
- {
- TileEntity te = world.getTileEntity(x, y, z);
- if(te instanceof RedstoneSignalConverterTileEntity)
- {
- RedstoneSignalConverterTileEntity rte = (RedstoneSignalConverterTileEntity) te;
- return rte.isProvidingRedstonePower(side);
- }
- return 0;
- }
-
@Override
public boolean canProvidePower()
{
@@ -748,10 +622,6 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider{ {
IronWorkbench("ironWorkbench",IronWorkbenchTileEntity.class, false, true, null),
- RedstoneSignalConverter("redstoneSignalConverter",RedstoneSignalConverterTileEntity.class, true, true, IHLUtils.getThisModItemStack("foilSteel")),
- HydrotransportPulpRegenerator("hydrotransportPulpRegenerator", HydrotransportPulpRegeneratorTileEntity.class, true, IHLUtils.getThisModItemStack("extruderSetOfMoldedPartsSteel")),
- VacuumInductionMeltingFurnace("vacuumInductionMeltingFurnace", VacuumInductionMeltingFurnaceTileEntity.class, true, IHLUtils.getThisModItemStack("foilSteel")),
- GlassBox("glassBoxBlock",GlassBoxTileEntity.class, false, true, IHLUtils.getThisModItemStack("dustGlass")),
ElectrolysisBath("electrolysisBath",ElectrolysisBathTileEntity.class, false, IHLUtils.getThisModItemStack("plateGraphite")),
RectifierTransformerUnit("rectifierTransformerUnit",RectifierTransformerUnitTileEntity.class, false, true, IHLUtils.getThisModItemStack("foilSteel")),
BatterySwitchUnit("batterySwitchUnit",BatterySwitchUnitTileEntity.class, false, IHLUtils.getThisModItemStack("foilSteel")),
@@ -808,7 +678,7 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider{ itemDroppedOnBlockDestroy=itemDroppedOnBlockDestroy1;
}
- String unlocalizedName;
+ public String unlocalizedName;
Class<? extends TileEntity> teclass;
boolean isNormalBlock=true;
boolean hasSpecialBlockRenderer=false;
@@ -845,24 +715,6 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider{ {
case BronzeTub:
return this.bronzeTubSide;
- case GlassBox:
- switch(flag)
- {
- case 0:
- return this.glassBoxInnerSide;
- case 1:
- return this.glassBoxInnerBottom;
- }
- case RedstoneSignalConverter:
- switch(flag)
- {
- case 0:
- return this.redstoneSignalConverterEmptySide;
- case 1:
- return this.redstoneSignalConverterEmitterSide;
- case 2:
- return this.redstoneSignalConverterSensorSide;
- }
default:
return this.blockIcon;
}
|