From c69e9d66258ea2dc2784e9f8050f3747fc901e5c Mon Sep 17 00:00:00 2001 From: Boblet Date: Thu, 20 Aug 2020 12:38:11 +0200 Subject: [PATCH] seperated ItemBlades from ItemStamp, added desh blade --- src/main/java/com/hbm/items/ModItems.java | 95 ++++++------------- .../com/hbm/items/machine/ItemBlades.java | 25 ----- .../java/com/hbm/items/machine/ItemStamp.java | 41 ++++++++ .../machine/TileEntityMachineEPress.java | 4 +- .../machine/TileEntityMachinePress.java | 4 +- .../machine/TileEntityMachineShredder.java | 80 ++++------------ 6 files changed, 94 insertions(+), 155 deletions(-) create mode 100644 src/main/java/com/hbm/items/machine/ItemStamp.java diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index f41ef9dd9..f82217616 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -5,54 +5,16 @@ import com.hbm.handler.BucketHandler; import com.hbm.handler.ToolAbility; import com.hbm.handler.ToolAbility.LuckAbility; import com.hbm.handler.WeaponAbility; -import com.hbm.handler.guncfg.Gun12GaugeFactory; -import com.hbm.handler.guncfg.Gun20GaugeFactory; -import com.hbm.handler.guncfg.Gun22LRFactory; -import com.hbm.handler.guncfg.Gun357MagnumFactory; -import com.hbm.handler.guncfg.Gun44MagnumFactory; -import com.hbm.handler.guncfg.Gun4GaugeFactory; -import com.hbm.handler.guncfg.Gun50AEFactory; -import com.hbm.handler.guncfg.Gun50BMGFactory; -import com.hbm.handler.guncfg.Gun556mmFactory; -import com.hbm.handler.guncfg.Gun5mmFactory; -import com.hbm.handler.guncfg.Gun9mmFactory; -import com.hbm.handler.guncfg.GunEnergyFactory; -import com.hbm.handler.guncfg.GunFatmanFactory; -import com.hbm.handler.guncfg.GunGaussFactory; -import com.hbm.handler.guncfg.GunGrenadeFactory; -import com.hbm.handler.guncfg.GunOSIPRFactory; -import com.hbm.handler.guncfg.GunRocketFactory; +import com.hbm.handler.guncfg.*; import com.hbm.items.armor.*; import com.hbm.items.bomb.*; import com.hbm.items.food.*; -import com.hbm.items.machine.ItemAssemblyTemplate; -import com.hbm.items.machine.ItemBattery; -import com.hbm.items.machine.ItemBlades; -import com.hbm.items.machine.ItemCapacitor; -import com.hbm.items.machine.ItemCassette; -import com.hbm.items.machine.ItemCatalyst; -import com.hbm.items.machine.ItemChemistryIcon; -import com.hbm.items.machine.ItemChemistryTemplate; -import com.hbm.items.machine.ItemFluidDuct; -import com.hbm.items.machine.ItemFluidIcon; -import com.hbm.items.machine.ItemFluidIdentifier; -import com.hbm.items.machine.ItemFluidTank; -import com.hbm.items.machine.ItemFuelRod; -import com.hbm.items.machine.ItemLens; -import com.hbm.items.machine.ItemMachineUpgrade; -import com.hbm.items.machine.ItemReactorSensor; -import com.hbm.items.machine.ItemSatChip; -import com.hbm.items.machine.ItemTemplateFolder; -import com.hbm.items.machine.ItemTurretBiometry; -import com.hbm.items.machine.ItemTurretChip; +import com.hbm.items.machine.*; import com.hbm.items.special.*; import com.hbm.items.tool.*; import com.hbm.items.tool.ItemToolAbility.EnumToolType; import com.hbm.items.weapon.*; -import com.hbm.items.weapon.ItemMissile.FuelType; -import com.hbm.items.weapon.ItemMissile.PartSize; -import com.hbm.items.weapon.ItemMissile.Rarity; -import com.hbm.items.weapon.ItemMissile.WarheadType; +import com.hbm.items.weapon.ItemMissile.*; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; @@ -547,6 +509,7 @@ public class ModItems { public static Item blades_advanced_alloy; public static Item blades_combine_steel; public static Item blades_schrabidium; + public static Item blades_desh; public static Item part_lithium; public static Item part_beryllium; @@ -2444,30 +2407,30 @@ public class ModItems { crystal_xen = new ItemDrop().setUnlocalizedName("crystal_xen").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":crystal_xen"); inf_water = new Item().setUnlocalizedName("inf_water").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":inf_water"); - stamp_stone_flat = new ItemBlades(5).setUnlocalizedName("stamp_stone_flat").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_stone_flat"); - stamp_stone_plate = new ItemBlades(5).setUnlocalizedName("stamp_stone_plate").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_stone_plate"); - stamp_stone_wire = new ItemBlades(5).setUnlocalizedName("stamp_stone_wire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_stone_wire"); - stamp_stone_circuit = new ItemBlades(5).setUnlocalizedName("stamp_stone_circuit").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_stone_circuit"); - stamp_iron_flat = new ItemBlades(25).setUnlocalizedName("stamp_iron_flat").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_iron_flat"); - stamp_iron_plate = new ItemBlades(25).setUnlocalizedName("stamp_iron_plate").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_iron_plate"); - stamp_iron_wire = new ItemBlades(25).setUnlocalizedName("stamp_iron_wire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_iron_wire"); - stamp_iron_circuit = new ItemBlades(25).setUnlocalizedName("stamp_iron_circuit").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_iron_circuit"); - stamp_steel_flat = new ItemBlades(50).setUnlocalizedName("stamp_steel_flat").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_steel_flat"); - stamp_steel_plate = new ItemBlades(50).setUnlocalizedName("stamp_steel_plate").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_steel_plate"); - stamp_steel_wire = new ItemBlades(50).setUnlocalizedName("stamp_steel_wire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_steel_wire"); - stamp_steel_circuit = new ItemBlades(50).setUnlocalizedName("stamp_steel_circuit").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_steel_circuit"); - stamp_titanium_flat = new ItemBlades(65).setUnlocalizedName("stamp_titanium_flat").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_titanium_flat"); - stamp_titanium_plate = new ItemBlades(65).setUnlocalizedName("stamp_titanium_plate").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_titanium_plate"); - stamp_titanium_wire = new ItemBlades(65).setUnlocalizedName("stamp_titanium_wire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_titanium_wire"); - stamp_titanium_circuit = new ItemBlades(65).setUnlocalizedName("stamp_titanium_circuit").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_titanium_circuit"); - stamp_obsidian_flat = new ItemBlades(100).setUnlocalizedName("stamp_obsidian_flat").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_obsidian_flat"); - stamp_obsidian_plate = new ItemBlades(100).setUnlocalizedName("stamp_obsidian_plate").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_obsidian_plate"); - stamp_obsidian_wire = new ItemBlades(100).setUnlocalizedName("stamp_obsidian_wire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_obsidian_wire"); - stamp_obsidian_circuit = new ItemBlades(100).setUnlocalizedName("stamp_obsidian_circuit").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_obsidian_circuit"); - stamp_schrabidium_flat = new ItemBlades(1024).setUnlocalizedName("stamp_schrabidium_flat").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_schrabidium_flat"); - stamp_schrabidium_plate = new ItemBlades(1024).setUnlocalizedName("stamp_schrabidium_plate").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_schrabidium_plate"); - stamp_schrabidium_wire = new ItemBlades(1024).setUnlocalizedName("stamp_schrabidium_wire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_schrabidium_wire"); - stamp_schrabidium_circuit = new ItemBlades(1024).setUnlocalizedName("stamp_schrabidium_circuit").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_schrabidium_circuit"); + stamp_stone_flat = new ItemStamp(5).setUnlocalizedName("stamp_stone_flat").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_stone_flat"); + stamp_stone_plate = new ItemStamp(5).setUnlocalizedName("stamp_stone_plate").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_stone_plate"); + stamp_stone_wire = new ItemStamp(5).setUnlocalizedName("stamp_stone_wire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_stone_wire"); + stamp_stone_circuit = new ItemStamp(5).setUnlocalizedName("stamp_stone_circuit").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_stone_circuit"); + stamp_iron_flat = new ItemStamp(25).setUnlocalizedName("stamp_iron_flat").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_iron_flat"); + stamp_iron_plate = new ItemStamp(25).setUnlocalizedName("stamp_iron_plate").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_iron_plate"); + stamp_iron_wire = new ItemStamp(25).setUnlocalizedName("stamp_iron_wire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_iron_wire"); + stamp_iron_circuit = new ItemStamp(25).setUnlocalizedName("stamp_iron_circuit").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_iron_circuit"); + stamp_steel_flat = new ItemStamp(50).setUnlocalizedName("stamp_steel_flat").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_steel_flat"); + stamp_steel_plate = new ItemStamp(50).setUnlocalizedName("stamp_steel_plate").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_steel_plate"); + stamp_steel_wire = new ItemStamp(50).setUnlocalizedName("stamp_steel_wire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_steel_wire"); + stamp_steel_circuit = new ItemStamp(50).setUnlocalizedName("stamp_steel_circuit").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_steel_circuit"); + stamp_titanium_flat = new ItemStamp(65).setUnlocalizedName("stamp_titanium_flat").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_titanium_flat"); + stamp_titanium_plate = new ItemStamp(65).setUnlocalizedName("stamp_titanium_plate").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_titanium_plate"); + stamp_titanium_wire = new ItemStamp(65).setUnlocalizedName("stamp_titanium_wire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_titanium_wire"); + stamp_titanium_circuit = new ItemStamp(65).setUnlocalizedName("stamp_titanium_circuit").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_titanium_circuit"); + stamp_obsidian_flat = new ItemStamp(100).setUnlocalizedName("stamp_obsidian_flat").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_obsidian_flat"); + stamp_obsidian_plate = new ItemStamp(100).setUnlocalizedName("stamp_obsidian_plate").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_obsidian_plate"); + stamp_obsidian_wire = new ItemStamp(100).setUnlocalizedName("stamp_obsidian_wire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_obsidian_wire"); + stamp_obsidian_circuit = new ItemStamp(100).setUnlocalizedName("stamp_obsidian_circuit").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_obsidian_circuit"); + stamp_schrabidium_flat = new ItemStamp(1024).setUnlocalizedName("stamp_schrabidium_flat").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_schrabidium_flat"); + stamp_schrabidium_plate = new ItemStamp(1024).setUnlocalizedName("stamp_schrabidium_plate").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_schrabidium_plate"); + stamp_schrabidium_wire = new ItemStamp(1024).setUnlocalizedName("stamp_schrabidium_wire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_schrabidium_wire"); + stamp_schrabidium_circuit = new ItemStamp(1024).setUnlocalizedName("stamp_schrabidium_circuit").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_schrabidium_circuit"); stamp_357 = new ItemBlades(512).setUnlocalizedName("stamp_357").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_357"); stamp_44 = new ItemBlades(512).setUnlocalizedName("stamp_44").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_44"); stamp_9 = new ItemBlades(512).setUnlocalizedName("stamp_9").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_9"); @@ -2481,6 +2444,7 @@ public class ModItems { blades_advanced_alloy = new ItemBlades(85).setUnlocalizedName("blades_advanced_alloy").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_advanced_alloy"); blades_combine_steel = new ItemBlades(150).setUnlocalizedName("blades_combine_steel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_combine_steel"); blades_schrabidium = new ItemBlades(250).setUnlocalizedName("blades_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_schrabidium"); + blades_desh = new ItemBlades(250).setUnlocalizedName("blades_desh").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_desh"); part_lithium = new Item().setUnlocalizedName("part_lithium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":part_lithium"); part_beryllium = new Item().setUnlocalizedName("part_beryllium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":part_beryllium"); @@ -4724,6 +4688,7 @@ public class ModItems { GameRegistry.registerItem(blades_advanced_alloy, blades_advanced_alloy.getUnlocalizedName()); GameRegistry.registerItem(blades_combine_steel, blades_combine_steel.getUnlocalizedName()); GameRegistry.registerItem(blades_schrabidium, blades_schrabidium.getUnlocalizedName()); + GameRegistry.registerItem(blades_desh, blades_desh.getUnlocalizedName()); //Generator Stuff GameRegistry.registerItem(thermo_element, thermo_element.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/machine/ItemBlades.java b/src/main/java/com/hbm/items/machine/ItemBlades.java index ff02ac7df..6fae73dff 100644 --- a/src/main/java/com/hbm/items/machine/ItemBlades.java +++ b/src/main/java/com/hbm/items/machine/ItemBlades.java @@ -13,29 +13,4 @@ public class ItemBlades extends Item { { this.setMaxDamage(dura); } - - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) - { - if(this == ModItems.stamp_iron_circuit || - this == ModItems.stamp_iron_plate || - this == ModItems.stamp_iron_wire || - this == ModItems.stamp_obsidian_circuit || - this == ModItems.stamp_obsidian_plate || - this == ModItems.stamp_obsidian_wire || - this == ModItems.stamp_schrabidium_circuit || - this == ModItems.stamp_schrabidium_plate || - this == ModItems.stamp_schrabidium_wire || - this == ModItems.stamp_steel_circuit || - this == ModItems.stamp_steel_plate || - this == ModItems.stamp_steel_wire || - this == ModItems.stamp_titanium_circuit || - this == ModItems.stamp_titanium_plate || - this == ModItems.stamp_titanium_wire || - this == ModItems.stamp_stone_circuit || - this == ModItems.stamp_stone_plate || - this == ModItems.stamp_stone_wire) - list.add("[CREATED USING TEMPLATE FOLDER]"); - } - } diff --git a/src/main/java/com/hbm/items/machine/ItemStamp.java b/src/main/java/com/hbm/items/machine/ItemStamp.java new file mode 100644 index 000000000..8f951a86a --- /dev/null +++ b/src/main/java/com/hbm/items/machine/ItemStamp.java @@ -0,0 +1,41 @@ +package com.hbm.items.machine; + +import java.util.List; + +import com.hbm.items.ModItems; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public class ItemStamp extends Item { + + public ItemStamp(int dura) + { + this.setMaxDamage(dura); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) + { + if(this == ModItems.stamp_iron_circuit || + this == ModItems.stamp_iron_plate || + this == ModItems.stamp_iron_wire || + this == ModItems.stamp_obsidian_circuit || + this == ModItems.stamp_obsidian_plate || + this == ModItems.stamp_obsidian_wire || + this == ModItems.stamp_schrabidium_circuit || + this == ModItems.stamp_schrabidium_plate || + this == ModItems.stamp_schrabidium_wire || + this == ModItems.stamp_steel_circuit || + this == ModItems.stamp_steel_plate || + this == ModItems.stamp_steel_wire || + this == ModItems.stamp_titanium_circuit || + this == ModItems.stamp_titanium_plate || + this == ModItems.stamp_titanium_wire || + this == ModItems.stamp_stone_circuit || + this == ModItems.stamp_stone_plate || + this == ModItems.stamp_stone_wire) + list.add("[CREATED USING TEMPLATE FOLDER]"); + } + +} diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineEPress.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineEPress.java index c86e84455..909ee4c21 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineEPress.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineEPress.java @@ -2,7 +2,7 @@ package com.hbm.tileentity.machine; import com.hbm.interfaces.IConsumer; import com.hbm.inventory.MachineRecipes; -import com.hbm.items.machine.ItemBlades; +import com.hbm.items.machine.ItemStamp; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.PacketDispatcher; @@ -106,7 +106,7 @@ public class TileEntityMachineEPress extends TileEntity implements ISidedInvento @Override public boolean isItemValidForSlot(int i, ItemStack stack) { - if(stack.getItem() instanceof ItemBlades && i == 1) + if(stack.getItem() instanceof ItemStamp && i == 1) return true; if(TileEntityFurnace.getItemBurnTime(stack) > 0 && i == 0) diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePress.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePress.java index 2c11718a9..90cc7abfe 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePress.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePress.java @@ -1,7 +1,7 @@ package com.hbm.tileentity.machine; import com.hbm.inventory.MachineRecipes; -import com.hbm.items.machine.ItemBlades; +import com.hbm.items.machine.ItemStamp; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEPressPacket; @@ -105,7 +105,7 @@ public class TileEntityMachinePress extends TileEntity implements ISidedInventor @Override public boolean isItemValidForSlot(int i, ItemStack stack) { - if(stack.getItem() instanceof ItemBlades && i == 1) + if(stack.getItem() instanceof ItemStamp && i == 1) return true; if(TileEntityFurnace.getItemBurnTime(stack) > 0 && i == 0) diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineShredder.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineShredder.java index 503a64b24..e9251330b 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineShredder.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineShredder.java @@ -1,6 +1,7 @@ package com.hbm.tileentity.machine; import com.hbm.interfaces.IConsumer; +import com.hbm.interfaces.Untested; import com.hbm.inventory.ShredderRecipes; import com.hbm.items.machine.ItemBlades; import com.hbm.lib.Library; @@ -222,8 +223,9 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven if(this.progress == TileEntityMachineShredder.processingSpeed) { - this.slots[27].setItemDamage(this.slots[27].getItemDamage() + 1); - this.slots[28].setItemDamage(this.slots[28].getItemDamage() + 1); + for(int i = 27; i <= 28; i++) + if(slots[i].getMaxDamage() > 0) + this.slots[i].setItemDamage(this.slots[i].getItemDamage() + 1); this.progress = 0; this.processItem(); @@ -262,59 +264,6 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven } } - /*public void processItem() { - - boolean flag = false; - - for(int i = 0; i < 9; i++) - { - ItemStack result = MachineRecipes.getResult(slots[i]); - if(slots[i] != null && slots[i].stackSize > 0 && hasSpace(result)); - flag = true; - } - - if(!flag) { - return; - } - - for(int i = 0; i < 9; i++) - { - ItemStack result = MachineRecipes.getResult(slots[i]); - - if(slots[i] != null && slots[i].stackSize > 0 && hasSpace(result)) { - slots[i].stackSize -= 1; - if(slots[i].stackSize < 0) - { - slots[i] = null; - } - - boolean flag1 = false; - - for(int j = 9; j < 27; j++) - { - if(slots[j] != null && slots[j].getItem() == result.getItem() && slots[j].stackSize + result.stackSize <= result.getMaxStackSize()) - { - slots[j].stackSize += result.stackSize; - flag1 = true; - break; - } - } - - if(!flag1) - { - for(int j = 9; j < 27; j++) - { - if(slots[j] == null) - { - slots[j] = result; - break; - } - } - } - } - } - }*/ - public void processItem() { for(int i = 0; i < 9; i++) { @@ -350,15 +299,18 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven } } + @Untested public boolean canProcess() { if(slots[27] != null && slots[28] != null && - slots[27].getItem() instanceof ItemBlades && slots[28].getItem() instanceof ItemBlades && - slots[27].getItemDamage() < slots[27].getMaxDamage() && slots[28].getItemDamage() < slots[28].getMaxDamage()) - for(int i = 0; i < 9; i++) - { - if(slots[i] != null && slots[i].stackSize > 0 && hasSpace(slots[i])) + this.getGearLeft() > 0 && this.getGearLeft() < 3 && + this.getGearRight() > 0 && this.getGearRight() < 3) { + + for(int i = 0; i < 9; i++) { - return true; + if(slots[i] != null && slots[i].stackSize > 0 && hasSpace(slots[i])) + { + return true; + } } } @@ -408,6 +360,9 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven if(slots[27] != null && slots[27].getItem() instanceof ItemBlades) { + if(slots[27].getMaxDamage() == 0) + return 1; + if(slots[27].getItemDamage() < slots[27].getItem().getMaxDamage()/2) { return 1; @@ -425,6 +380,9 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven if(slots[28] != null && slots[28].getItem() instanceof ItemBlades) { + if(slots[28].getMaxDamage() == 0) + return 1; + if(slots[28].getItemDamage() < slots[28].getItem().getMaxDamage()/2) { return 1;