diff options
30 files changed, 184 insertions, 373 deletions
diff --git a/src/Java/miscutil/core/block/ModBlocks.java b/src/Java/miscutil/core/block/ModBlocks.java index e4010f1c95..a59ba21bc7 100644 --- a/src/Java/miscutil/core/block/ModBlocks.java +++ b/src/Java/miscutil/core/block/ModBlocks.java @@ -1,11 +1,8 @@ package miscutil.core.block; import miscutil.core.block.base.BasicBlock; -import miscutil.core.block.base.BasicBlock.BlockTypes; -import miscutil.core.block.base.BlockBaseModular; import miscutil.core.block.general.LightGlass; import miscutil.core.block.general.fluids.FluidRegistryHandler; -import miscutil.core.item.base.itemblock.ItemBlockGtFrameBox; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks; @@ -74,9 +71,9 @@ public final class ModBlocks { //GtFrames //GameRegistry.registerBlock(blockGtFrameSet1 = new BlockGtFrameBox("blockGtFrameSet1", Material.iron ,BlockTypes.FRAME, true, Utils.rgbtoHexValue(68, 75, 66), Utils.rgbtoHexValue(68, 75, 166), Utils.rgbtoHexValue(122, 135, 196)), "blockGtFrameSet1"); - GameRegistry.registerBlock(blockGtFrameTantalloy60 = new BlockBaseModular("blockGtFrameStaballoy", "Staballoy", BlockTypes.FRAME, Utils.rgbtoHexValue(68, 75, 66)), ItemBlockGtFrameBox.class, "blockGtFrameStaballoy"); - GameRegistry.registerBlock(blockGtFrameTantalloy60 = new BlockBaseModular("blockGtFrameTantalloy60", "Tantalloy-60", BlockTypes.FRAME, Utils.rgbtoHexValue(68, 75, 166)), ItemBlockGtFrameBox.class, "blockGtFrameTantalloy60"); - GameRegistry.registerBlock(blockGtFrameTantalloy61 = new BlockBaseModular("blockGtFrameTantalloy61", "Tantalloy-61", BlockTypes.FRAME, Utils.rgbtoHexValue(122, 135, 196)), ItemBlockGtFrameBox.class, "blockGtFrameTantalloy61"); + //GameRegistry.registerBlock(blockGtFrameTantalloy60 = new BlockBaseModular("blockGtFrameStaballoy", "Staballoy", BlockTypes.FRAME, Utils.rgbtoHexValue(68, 75, 66)), ItemBlockGtFrameBox.class, "blockGtFrameStaballoy"); + //GameRegistry.registerBlock(blockGtFrameTantalloy60 = new BlockBaseModular("blockGtFrameTantalloy60", "Tantalloy-60", BlockTypes.FRAME, Utils.rgbtoHexValue(68, 75, 166)), ItemBlockGtFrameBox.class, "blockGtFrameTantalloy60"); + //GameRegistry.registerBlock(blockGtFrameTantalloy61 = new BlockBaseModular("blockGtFrameTantalloy61", "Tantalloy-61", BlockTypes.FRAME, Utils.rgbtoHexValue(122, 135, 196)), ItemBlockGtFrameBox.class, "blockGtFrameTantalloy61"); } }
\ No newline at end of file diff --git a/src/Java/miscutil/core/block/base/BasicBlock.java b/src/Java/miscutil/core/block/base/BasicBlock.java index 284342b197..9fd57b510f 100644 --- a/src/Java/miscutil/core/block/base/BasicBlock.java +++ b/src/Java/miscutil/core/block/base/BasicBlock.java @@ -21,8 +21,8 @@ public class BasicBlock extends Block { public static enum BlockTypes { - STANDARD("block", "pickaxe", soundTypeStone), - FRAME("blockGtFrame", "wrench", soundTypeMetal); + STANDARD("blockBlock", "pickaxe", soundTypeStone), + FRAME("blockFrameGt", "wrench", soundTypeMetal); private String TEXTURE_NAME; private String HARVEST_TOOL; diff --git a/src/Java/miscutil/core/block/base/BlockBaseModular.java b/src/Java/miscutil/core/block/base/BlockBaseModular.java index 613320b801..fedfc1c391 100644 --- a/src/Java/miscutil/core/block/base/BlockBaseModular.java +++ b/src/Java/miscutil/core/block/base/BlockBaseModular.java @@ -1,13 +1,13 @@ package miscutil.core.block.base; -import gregtech.api.util.GT_OreDictUnificator; +import miscutil.core.item.base.itemblock.ItemBlockGtBlock; +import miscutil.core.item.base.itemblock.ItemBlockGtFrameBox; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; -import miscutil.core.util.item.UtilsItems; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.Item; import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -19,7 +19,7 @@ public class BlockBaseModular extends BasicBlock{ protected String thisBlockMaterial; public BlockBaseModular(String unlocalizedName, String blockMaterial, BlockTypes blockType, int colour) { - super(unlocalizedName, Material.iron); + super(blockType.getTexture()+unlocalizedName, Material.iron); this.setHarvestLevel(blockType.getHarvestTool(), 2); this.setBlockTextureName(CORE.MODID+":"+blockType.getTexture()); this.blockColour = colour; @@ -27,7 +27,14 @@ public class BlockBaseModular extends BasicBlock{ this.thisBlockMaterial = blockMaterial; this.setBlockName(getLocalizedName()); LanguageRegistry.addName(this, getLocalizedName()); - setOreDict(unlocalizedName, blockType); + //setOreDict(unlocalizedName, blockType); + if (thisBlock == BlockTypes.STANDARD){ + GameRegistry.registerBlock(this, ItemBlockGtBlock.class, blockType.getTexture()+unlocalizedName); + } + else if (thisBlock == BlockTypes.FRAME){ + GameRegistry.registerBlock(this, ItemBlockGtFrameBox.class, blockType.getTexture()+unlocalizedName); + } + } @@ -44,16 +51,13 @@ public class BlockBaseModular extends BasicBlock{ return 0; } - private void setOreDict(String unlocalizedName, BlockTypes blockType){ - if (blockType == BlockTypes.FRAME){ - GT_OreDictUnificator.registerOre(unlocalizedName.replace("BlockGtFrame", "frameGt"),UtilsItems.getSimpleStack(Item.getItemFromBlock(this))); - } - } - @Override public String getLocalizedName() { - String tempIngot = getUnlocalizedName().replace("tile.blockGtFrame", ""); - if (thisBlock == BlockTypes.FRAME){ + String tempIngot; + if (thisBlock == BlockTypes.STANDARD){ + tempIngot = "Block of "+thisBlockMaterial; + } + else if (thisBlock == BlockTypes.FRAME){ tempIngot = thisBlockMaterial + " Frame Box"; } else { diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java index 3b24a3cad2..7af35469de 100644 --- a/src/Java/miscutil/core/item/ModItems.java +++ b/src/Java/miscutil/core/item/ModItems.java @@ -186,13 +186,21 @@ public final class ModItems { //Start meta Item Generation ItemsFoods.load(); - UtilsItems.generateItemsFromMaterial("EnergyCrystal", "Energy Crystal", Utils.rgbtoHexValue(228, 175, 0), true); - UtilsItems.generateItemsFromMaterial("BloodSteel", "Blood Steel", Utils.rgbtoHexValue(142, 28, 0), false); - UtilsItems.generateItemsFromMaterial("Staballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66), true); - UtilsItems.generateItemsFromMaterial("Tantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166), true); - UtilsItems.generateItemsFromMaterial("Tantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196), true); - UtilsItems.generateItemsFromMaterial("Bedrockium", "Bedrockium", Utils.rgbtoHexValue(32, 32, 32), false); - UtilsItems.generateItemsFromMaterial("Quantum", "Quantum", Utils.rgbtoHexValue(128, 128, 128), true); + UtilsItems.generateItemsFromMaterial("EnergyCrystal", "Energy Crystal", 8, Utils.rgbtoHexValue(228, 225, 0), true); + UtilsItems.generateItemsFromMaterial("BloodSteel", "Blood Steel", 3, Utils.rgbtoHexValue(142, 28, 0), false); + UtilsItems.generateItemsFromMaterial("Staballoy", "Staballoy", 6, Utils.rgbtoHexValue(68, 75, 66), true); + UtilsItems.generateItemsFromMaterial("Tantalloy60", "Tantalloy-60", 5, Utils.rgbtoHexValue(68, 75, 166), true); + UtilsItems.generateItemsFromMaterial("Tantalloy61", "Tantalloy-61", 6, Utils.rgbtoHexValue(122, 135, 196), true); + UtilsItems.generateItemsFromMaterial("Bedrockium", "Bedrockium", 9, Utils.rgbtoHexValue(32, 32, 32), false); + UtilsItems.generateItemsFromMaterial("Quantum", "Quantum", 10, Utils.rgbtoHexValue(128, 128, 128), true); + + + UtilsItems.generateItemsFromMaterial("Inconel625", "Inconel-625", 4, Utils.rgbtoHexValue(128, 200, 128), true); //Inconel 625: Acid resistant, good weldability. The LCF version is typically used in bellows. + UtilsItems.generateItemsFromMaterial("Inconel690", "Inconel-690", 6, Utils.rgbtoHexValue(118, 220, 138), true); //Inconel 690: Low cobalt content for nuclear applications, and low resistivity. + UtilsItems.generateItemsFromMaterial("Inconel792", "Inconel-792", 5, Utils.rgbtoHexValue(108, 240, 118), true); //Inconel 792: Increased aluminium content for improved high temperature corrosion properties, used especially in gas turbines. + + UtilsItems.generateItemsFromMaterial("Tumbaga", "Tumbaga", 2, Utils.rgbtoHexValue(255,178,15), false); //Tumbaga was the name given by Spaniards to a non-specific alloy of gold and copper + UtilsItems.generateItemsFromMaterial("Potin", "Potin", 4, Utils.rgbtoHexValue(201,151,129), false); //Potin is traditionally an alloy of bronze, tin and lead, with varying quantities of each possible //EnderIO Resources if (LoadedMods.EnderIO || LOAD_ALL_CONTENT){ @@ -319,7 +327,7 @@ public final class ModItems { //Special Item Handling Case if (configSwitches.enableAlternativeBatteryAlloy) { ModItems.itemIngotBatteryAlloy = new BaseItemIngot("itemIngotBatteryAlloy", "Battery Alloy", Utils.rgbtoHexValue(35, 228, 141)); - ModItems.itemPlateBatteryAlloy = new BaseItemPlate("itemPlateBatteryAlloy", "Battery Alloy", Utils.rgbtoHexValue(35, 228, 141)); + ModItems.itemPlateBatteryAlloy = new BaseItemPlate("itemPlateBatteryAlloy", "Battery Alloy", Utils.rgbtoHexValue(35, 228, 141), 2); } diff --git a/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java b/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java index bff3b1f3c3..e529e8329b 100644 --- a/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java +++ b/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java @@ -21,8 +21,9 @@ public class BaseItemBolt extends Item{ protected int colour; protected String materialName; protected String unlocalName; + private int mTier; - public BaseItemBolt(String unlocalizedName, String materialName, int colour) { + public BaseItemBolt(String unlocalizedName, String materialName, int colour, int tier) { setUnlocalizedName(unlocalizedName); this.setCreativeTab(AddToCreativeTab.tabMisc); this.setUnlocalizedName(unlocalizedName); @@ -30,6 +31,7 @@ public class BaseItemBolt extends Item{ this.setMaxStackSize(64); this.setTextureName(CORE.MODID + ":" + "itemBolt"); this.colour = colour; + this.mTier = tier; this.materialName = materialName; GameRegistry.registerItem(this, unlocalizedName); GT_OreDictUnificator.registerOre(unlocalName.replace("itemB", "b"), UtilsItems.getSimpleStack(this)); @@ -68,7 +70,11 @@ public class BaseItemBolt extends Item{ String tempIngot = unlocalName.replace("itemBolt", "ingot"); ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1); if (null != tempOutputStack){ - GT_Values.RA.addExtruderRecipe(tempOutputStack, ItemList.Shape_Extruder_Bolt.get(1), UtilsItems.getSimpleStack(this, 8), 10*20, 24); + GT_Values.RA.addExtruderRecipe(tempOutputStack, + ItemList.Shape_Extruder_Bolt.get(1), + UtilsItems.getSimpleStack(this, 8), + 30*mTier*20, + 24*mTier); } } diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java index 993ed9636b..9e98fbb821 100644 --- a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java +++ b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java @@ -1,6 +1,7 @@ package miscutil.core.item.base.dusts; import static miscutil.core.creative.AddToCreativeTab.tabMisc; +import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -21,9 +22,11 @@ public class BaseItemDust extends Item{ protected int colour; protected String materialName; protected String pileType; + protected boolean useBlastFurnace; String name = ""; + private int mTier; - public BaseItemDust(String unlocalizedName, String materialName, int colour, String pileSize) { + public BaseItemDust(String unlocalizedName, String materialName, int colour, String pileSize, boolean blastFurnaceRequired, int tier) { setUnlocalizedName(unlocalizedName); this.setUnlocalizedName(unlocalizedName); this.setMaxStackSize(64); @@ -34,7 +37,9 @@ public class BaseItemDust extends Item{ this.setMaxStackSize(64); this.setCreativeTab(tabMisc); this.colour = colour; + this.mTier = tier; this.materialName = materialName; + this.useBlastFurnace = blastFurnaceRequired; GameRegistry.registerItem(this, unlocalizedName); String temp = ""; @@ -61,6 +66,7 @@ public class BaseItemDust extends Item{ if (temp != null && temp != ""){ GT_OreDictUnificator.registerOre(temp, UtilsItems.getSimpleStack(this)); } + addFurnaceRecipe(); addMacerationRecipe(); } @@ -166,7 +172,7 @@ public class BaseItemDust extends Item{ String tempDust = getUnlocalizedName().replace("item.itemDust", "dust"); ItemStack tempInputStack; ItemStack tempOutputStack; - + if (getUnlocalizedName().contains("DustSmall") || getUnlocalizedName().contains("DustTiny")){ return; } @@ -192,4 +198,51 @@ public class BaseItemDust extends Item{ } } + private void addFurnaceRecipe(){ + + String temp = ""; + if (getUnlocalizedName().contains("item.")){ + temp = getUnlocalizedName().replace("item.", ""); + } + else { + temp = getUnlocalizedName(); + } + if (temp.contains("DustTiny") || temp.contains("DustSmall")){ + return; + } + temp = temp.replace("itemDust", "ingot"); + if (temp != null && temp != ""){ + + if (this.useBlastFurnace){ + Utils.LOG_INFO("Adding recipe for Hot "+materialName+" Ingots in a Blast furnace."); + String tempIngot = temp.replace("ingot", "ingotHot"); + ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1); + Utils.LOG_INFO("This will produce "+tempOutputStack.getDisplayName() + " Debug: "+tempIngot); + if (null != tempOutputStack){ + addBlastFurnaceRecipe(UtilsItems.getSimpleStack(this), null, tempOutputStack, null, 350*mTier); + } + return; + } + Utils.LOG_INFO("Adding recipe for "+materialName+" Ingots in a furnace."); + ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(temp, 1); + Utils.LOG_INFO("This will produce an ingot of "+tempOutputStack.getDisplayName() + " Debug: "+temp); + if (null != tempOutputStack){ + GT_ModHandler.addSmeltingAndAlloySmeltingRecipe(UtilsItems.getSimpleStack(this), tempOutputStack); + } + } + } + + private void addBlastFurnaceRecipe(ItemStack input1, ItemStack input2, ItemStack output1, ItemStack output2, int tempRequired){ + //Utils.LOG_INFO("Adding Blast Furnace recipe for a Hot Ingot of "+materialName+"."); + GT_Values.RA.addBlastRecipe( + input1, + input2, + GT_Values.NF, GT_Values.NF, + output1, + output2, + 250*mTier*20, + mTier*64, + tempRequired); + } + } diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDustSmall.java b/src/Java/miscutil/core/item/base/dusts/BaseItemDustSmall.java deleted file mode 100644 index 2e0334887b..0000000000 --- a/src/Java/miscutil/core/item/base/dusts/BaseItemDustSmall.java +++ /dev/null @@ -1,30 +0,0 @@ -package miscutil.core.item.base.dusts; - -import java.util.List; - -import miscutil.core.lib.CORE; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; - -public class BaseItemDustSmall extends BaseItemDust{ - - protected int colour = 0; - protected String materialName; - - public BaseItemDustSmall(String unlocalizedName, String materialName, int colour, String size) { - super(unlocalizedName, materialName, colour, size); - this.setTextureName(CORE.MODID + ":" + "dustSmall"); - this.setMaxStackSize(64); - this.colour = colour; - this.materialName = materialName; - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { - list.add(EnumChatFormatting.GRAY+"A small pile of " + materialName + " dust."); - super.addInformation(stack, aPlayer, list, bool); - } - -} diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDustTiny.java b/src/Java/miscutil/core/item/base/dusts/BaseItemDustTiny.java deleted file mode 100644 index 814f79ebd7..0000000000 --- a/src/Java/miscutil/core/item/base/dusts/BaseItemDustTiny.java +++ /dev/null @@ -1,30 +0,0 @@ -package miscutil.core.item.base.dusts; - -import java.util.List; - -import miscutil.core.lib.CORE; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; - -public class BaseItemDustTiny extends BaseItemDust{ - - protected int colour = 0; - protected String materialName; - - public BaseItemDustTiny(String unlocalizedName, String materialName, int colour, String size) { - super(unlocalizedName, materialName, colour, size); - this.setTextureName(CORE.MODID + ":" + "dustTiny"); - this.setMaxStackSize(64); - this.colour = colour; - this.materialName = materialName; - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { - list.add(EnumChatFormatting.GRAY+"A tiny pile of " + materialName + " dust."); - super.addInformation(stack, aPlayer, list, bool); - } - -} diff --git a/src/Java/miscutil/core/item/base/gears/BaseItemGear.java b/src/Java/miscutil/core/item/base/gears/BaseItemGear.java index b91a17ddd3..5c427a025f 100644 --- a/src/Java/miscutil/core/item/base/gears/BaseItemGear.java +++ b/src/Java/miscutil/core/item/base/gears/BaseItemGear.java @@ -21,8 +21,9 @@ public class BaseItemGear extends Item{ protected int colour; protected String materialName; protected String unlocalName; + private int mTier; - public BaseItemGear(String unlocalizedName, String materialName, int colour) { + public BaseItemGear(String unlocalizedName, String materialName, int colour, int tier) { setUnlocalizedName(unlocalizedName); this.setCreativeTab(AddToCreativeTab.tabMisc); this.setUnlocalizedName(unlocalizedName); @@ -30,6 +31,7 @@ public class BaseItemGear extends Item{ this.setMaxStackSize(64); this.setTextureName(CORE.MODID + ":" + "itemGear"); this.colour = colour; + this.mTier = tier; this.materialName = materialName; GameRegistry.registerItem(this, unlocalizedName); GT_OreDictUnificator.registerOre(unlocalName.replace("itemG", "g"), UtilsItems.getSimpleStack(this)); @@ -68,7 +70,11 @@ public class BaseItemGear extends Item{ String tempIngot = unlocalName.replace("itemGear", "ingot"); ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 8); if (null != tempOutputStack){ - GT_Values.RA.addExtruderRecipe(tempOutputStack, ItemList.Shape_Extruder_Gear.get(1), UtilsItems.getSimpleStack(this), 15*20, 24); + GT_Values.RA.addExtruderRecipe(tempOutputStack, + ItemList.Shape_Extruder_Gear.get(1), + UtilsItems.getSimpleStack(this), + 40*mTier*20, + 24*mTier); } } diff --git a/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java b/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java index 8a3e8a60b0..bd66c3a6bb 100644 --- a/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java +++ b/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java @@ -1,8 +1,6 @@ package miscutil.core.item.base.ingots; -import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; import java.util.List; @@ -76,12 +74,4 @@ public class BaseItemIngot extends Item{ } - private void addBendingRecipe(){ - if (!unlocalName.toLowerCase().contains("ingothot")){ - GT_Values.RA.addBenderRecipe(GT_Utility.copyAmount(1L, new Object[]{this}), - UtilsItems.getItemStackOfAmountFromOreDict("plate"+materialName, 1), - 1200, 24); - } - } - } diff --git a/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java b/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java index bcf4aa935c..e7be91bc8c 100644 --- a/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java +++ b/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java @@ -19,11 +19,13 @@ public class BaseItemIngotHot extends BaseItemIngot{ private ItemStack outputIngot; private int tickCounter = 0; private int tickCounterMax = 200; + private int mTier; - public BaseItemIngotHot(String unlocalizedName, String materialName, ItemStack coldIngot) { + public BaseItemIngotHot(String unlocalizedName, String materialName, ItemStack coldIngot, int tier) { super(unlocalizedName, materialName, Utils.rgbtoHexValue(225, 225, 225)); this.setTextureName(CORE.MODID + ":" + "itemIngotHot"); this.outputIngot = coldIngot; + this.mTier = tier; generateRecipe(); } @@ -47,9 +49,11 @@ public class BaseItemIngotHot extends BaseItemIngot{ } private void generateRecipe(){ - Utils.LOG_INFO("Adding recipe for a Hot Ingot of "+materialName+"."); - GT_Values.RA.addVacuumFreezerRecipe(UtilsItems.getSimpleStack(this), outputIngot.copy(), 500); - } + Utils.LOG_INFO("Adding Vacuum Freezer recipe for a Hot Ingot of "+materialName+"."); + GT_Values.RA.addVacuumFreezerRecipe(UtilsItems.getSimpleStack(this), outputIngot.copy(), 60*mTier); + + + } @Override public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) { diff --git a/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java b/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java index 80dc8864cf..93784ca78a 100644 --- a/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java +++ b/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java @@ -12,7 +12,7 @@ public class ItemBlockGtFrameBox extends ItemBlock{ public ItemBlockGtFrameBox(Block block) { super(block); this.blockColour = block.getBlockColor(); - GT_OreDictUnificator.registerOre(block.getUnlocalizedName().replace("BlockGtFrame", "frameGt"), UtilsItems.getSimpleStack(this)); + GT_OreDictUnificator.registerOre("frameGt"+block.getUnlocalizedName().replace("tile.", "").replace("tile.BlockGtFrame", "").replace("-", "").replace("_", "").replace(" ", "").replace("FrameBox", ""), UtilsItems.getSimpleStack(this)); } public int getRenderColor(int aMeta) { diff --git a/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java b/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java index 0e9bb37f38..689f085198 100644 --- a/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java +++ b/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java @@ -20,8 +20,9 @@ public class BaseItemPlate extends Item{ protected int colour; protected String materialName; protected String unlocalName; + private int mTier; - public BaseItemPlate(String unlocalizedName, String materialName, int colour) { + public BaseItemPlate(String unlocalizedName, String materialName, int colour, int tier) { setUnlocalizedName(unlocalizedName); this.setCreativeTab(AddToCreativeTab.tabMisc); this.setUnlocalizedName(unlocalizedName); @@ -30,6 +31,7 @@ public class BaseItemPlate extends Item{ this.setTextureName(CORE.MODID + ":" + "itemPlate"); this.setMaxStackSize(64); this.colour = colour; + this.mTier = tier; this.materialName = materialName; GameRegistry.registerItem(this, unlocalizedName); GT_OreDictUnificator.registerOre(unlocalName.replace("itemP", "p"), UtilsItems.getSimpleStack(this)); @@ -70,7 +72,8 @@ public class BaseItemPlate extends Item{ if (null != tempOutputStack){ GT_Values.RA.addBenderRecipe(tempOutputStack, UtilsItems.getSimpleStack(this), - 1200, 24); + 14*mTier*20, + 64*mTier); } } diff --git a/src/Java/miscutil/core/item/base/rings/BaseItemRing.java b/src/Java/miscutil/core/item/base/rings/BaseItemRing.java index d60abf2524..0938076905 100644 --- a/src/Java/miscutil/core/item/base/rings/BaseItemRing.java +++ b/src/Java/miscutil/core/item/base/rings/BaseItemRing.java @@ -21,8 +21,9 @@ public class BaseItemRing extends Item{ protected int colour; protected String materialName; protected String unlocalName; + private int mTier; - public BaseItemRing(String unlocalizedName, String materialName, int colour) { + public BaseItemRing(String unlocalizedName, String materialName, int colour, int tier) { setUnlocalizedName(unlocalizedName); this.setCreativeTab(AddToCreativeTab.tabMisc); this.setUnlocalizedName(unlocalizedName); @@ -30,6 +31,7 @@ public class BaseItemRing extends Item{ this.setMaxStackSize(64); this.setTextureName(CORE.MODID + ":" + "itemRing"); this.colour = colour; + this.mTier = tier; this.materialName = materialName; GameRegistry.registerItem(this, unlocalizedName); GT_OreDictUnificator.registerOre(unlocalName.replace("itemR", "r"), UtilsItems.getSimpleStack(this)); @@ -68,7 +70,11 @@ public class BaseItemRing extends Item{ String tempIngot = unlocalName.replace("itemRing", "ingot"); ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1); if (null != tempOutputStack){ - GT_Values.RA.addExtruderRecipe(tempOutputStack, ItemList.Shape_Extruder_Ring.get(1), UtilsItems.getSimpleStack(this, 4), 1600, 96); + GT_Values.RA.addExtruderRecipe(tempOutputStack, + ItemList.Shape_Extruder_Ring.get(1), + UtilsItems.getSimpleStack(this, 4), + 160*mTier, + 32*mTier); } } diff --git a/src/Java/miscutil/core/item/base/rods/BaseItemRod.java b/src/Java/miscutil/core/item/base/rods/BaseItemRod.java index d292733538..6d7424c96d 100644 --- a/src/Java/miscutil/core/item/base/rods/BaseItemRod.java +++ b/src/Java/miscutil/core/item/base/rods/BaseItemRod.java @@ -22,8 +22,9 @@ public class BaseItemRod extends Item{ protected int colour; protected String materialName; protected String unlocalName; + private int mTier; - public BaseItemRod(String unlocalizedName, String materialName, int colour) { + public BaseItemRod(String unlocalizedName, String materialName, int colour, int tier) { setUnlocalizedName(unlocalizedName); this.setCreativeTab(AddToCreativeTab.tabMisc); this.setUnlocalizedName(unlocalizedName); @@ -31,6 +32,7 @@ public class BaseItemRod extends Item{ this.setTextureName(CORE.MODID + ":" + "itemRod"); this.setMaxStackSize(64); this.colour = colour; + this.mTier = tier; this.materialName = materialName; GameRegistry.registerItem(this, unlocalizedName); GT_OreDictUnificator.registerOre(unlocalName.replace("itemR", "r"), UtilsItems.getSimpleStack(this)); @@ -69,14 +71,17 @@ public class BaseItemRod extends Item{ String tempIngot = unlocalName.replace("itemRod", "ingot"); ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1); if (null != tempOutputStack){ - GT_Values.RA.addExtruderRecipe(tempOutputStack, ItemList.Shape_Extruder_Rod.get(1), UtilsItems.getSimpleStack(this, 2), 1200, 24); + GT_Values.RA.addExtruderRecipe(tempOutputStack, + ItemList.Shape_Extruder_Rod.get(1), + UtilsItems.getSimpleStack(this, 2), + 12*mTier*20, 24*mTier); } ItemStack rods = UtilsItems.getSimpleStack(this, 1); UtilsRecipe.addShapedGregtechRecipe( rods, rods, rods, rods, "craftingToolWrench", rods, rods, rods, rods, - UtilsItems.getItemStackOfAmountFromOreDict(unlocalName.replace("itemR", "frameGt"), 1)); + UtilsItems.getItemStackOfAmountFromOreDict(unlocalName.replace("itemRod", "frameGt"), 2)); } } diff --git a/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java b/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java index c34530d672..37efc3e935 100644 --- a/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java +++ b/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java @@ -21,8 +21,9 @@ public class BaseItemScrew extends Item{ protected int colour; protected String materialName; protected String unlocalName; + private int mTier; - public BaseItemScrew(String unlocalizedName, String materialName, int colour) { + public BaseItemScrew(String unlocalizedName, String materialName, int colour, int tier) { setUnlocalizedName(unlocalizedName); this.setCreativeTab(AddToCreativeTab.tabMisc); this.setUnlocalizedName(unlocalizedName); @@ -31,6 +32,7 @@ public class BaseItemScrew extends Item{ this.setTextureName(CORE.MODID + ":" + "itemScrew"); this.setMaxStackSize(64); this.colour = colour; + this.mTier = tier; this.materialName = materialName; GameRegistry.registerItem(this, unlocalizedName); GT_OreDictUnificator.registerOre(unlocalName.replace("itemS", "s"), UtilsItems.getSimpleStack(this)); @@ -70,7 +72,7 @@ public class BaseItemScrew extends Item{ if (null != boltStack){ GT_Values.RA.addLatheRecipe(boltStack, UtilsItems.getSimpleStack(this), null, - 60, 16); + 60*mTier, 16*mTier); UtilsRecipe.addShapedGregtechRecipe( "craftingToolFile", boltStack, null, boltStack, null, null, diff --git a/src/Java/miscutil/core/item/init/ItemsBolts.java b/src/Java/miscutil/core/item/init/ItemsBolts.java deleted file mode 100644 index 57bfa8a8d9..0000000000 --- a/src/Java/miscutil/core/item/init/ItemsBolts.java +++ /dev/null @@ -1,23 +0,0 @@ -package miscutil.core.item.init; - -import miscutil.core.item.ModItems; -import miscutil.core.item.base.bolts.BaseItemBolt; -import miscutil.core.util.Utils; - -public class ItemsBolts { - - public static void load(){ - run(); - } - - private static void run(){ - - ModItems.itemBoltStaballoy = new BaseItemBolt("itemBoltStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66)); - ModItems.itemBoltBloodSteel = new BaseItemBolt("itemBoltBloodSteel", "Blood Steel", Utils.rgbtoHexValue(142, 28, 0)); - ModItems.itemBoltTantalloy60 = new BaseItemBolt("itemBoltTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166)); - ModItems.itemBoltTantalloy61 = new BaseItemBolt("itemBoltTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196)); - - - } - -} diff --git a/src/Java/miscutil/core/item/init/ItemsDusts.java b/src/Java/miscutil/core/item/init/ItemsDusts.java deleted file mode 100644 index 7e83ca8d01..0000000000 --- a/src/Java/miscutil/core/item/init/ItemsDusts.java +++ /dev/null @@ -1,37 +0,0 @@ -package miscutil.core.item.init; - -import miscutil.core.item.ModItems; -import miscutil.core.item.base.dusts.BaseItemDust; -import miscutil.core.util.Utils; - -public class ItemsDusts { - - public static void load(){ - run(); - } - - private static void run(){ - - //Staballoy Dusts - ModItems.itemDustStaballoy = new BaseItemDust("itemDustStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66), "Dust"); - ModItems.itemDustTinyStaballoy = new BaseItemDust("itemDustTinyStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66), "Tiny"); - ModItems.itemDustSmallStaballoy = new BaseItemDust("itemDustSmallStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66), "Small"); - - //Tantalloy60 Dusts - ModItems.itemDustTantalloy60 = new BaseItemDust("itemDustTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166), "Dust"); - ModItems.itemDustTinyTantalloy60 = new BaseItemDust("itemDustTinyTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166), "Tiny"); - ModItems.itemDustSmallTantalloy60 = new BaseItemDust("itemDustSmallTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166), "Small"); - - //Tantalloy60 Dusts - ModItems.itemDustTantalloy61 = new BaseItemDust("itemDustTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196), "Dust"); - ModItems.itemDustTinyTantalloy61 = new BaseItemDust("itemDustTinyTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196), "Tiny"); - ModItems.itemDustSmallTantalloy61 = new BaseItemDust("itemDustSmallTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196), "Small"); - - //BloodSteel Dusts - ModItems.itemDustBloodSteel = new BaseItemDust("itemDustBloodSteel", "BloodSteel", Utils.rgbtoHexValue(142, 28, 0), "Dust"); - ModItems.itemDustTinyBloodSteel = new BaseItemDust("itemDustTinyBloodSteel", "BloodSteel", Utils.rgbtoHexValue(142, 28, 0), "Tiny"); - ModItems.itemDustSmallBloodSteel = new BaseItemDust("itemDustSmallBloodSteel", "BloodSteel", Utils.rgbtoHexValue(142, 28, 0), "Small"); - - } - -} diff --git a/src/Java/miscutil/core/item/init/ItemsGears.java b/src/Java/miscutil/core/item/init/ItemsGears.java deleted file mode 100644 index d6520c7ba3..0000000000 --- a/src/Java/miscutil/core/item/init/ItemsGears.java +++ /dev/null @@ -1,23 +0,0 @@ -package miscutil.core.item.init; - -import miscutil.core.item.ModItems; -import miscutil.core.item.base.gears.BaseItemGear; -import miscutil.core.util.Utils; - -public class ItemsGears { - - public static void load(){ - run(); - } - - private static void run(){ - - ModItems.itemGearStaballoy = new BaseItemGear("itemGearStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66)); - ModItems.itemGearBloodSteel = new BaseItemGear("itemGearBloodSteel", "Blood Steel", Utils.rgbtoHexValue(142, 28, 0)); - ModItems.itemGearTantalloy60 = new BaseItemGear("itemGearTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166)); - ModItems.itemGearTantalloy61 = new BaseItemGear("itemGearTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196)); - - - } - -} diff --git a/src/Java/miscutil/core/item/init/ItemsIngots.java b/src/Java/miscutil/core/item/init/ItemsIngots.java deleted file mode 100644 index 981dfecf47..0000000000 --- a/src/Java/miscutil/core/item/init/ItemsIngots.java +++ /dev/null @@ -1,32 +0,0 @@ -package miscutil.core.item.init; - -import miscutil.core.item.ModItems; -import miscutil.core.item.base.ingots.BaseItemIngot; -import miscutil.core.item.base.ingots.BaseItemIngotHot; -import miscutil.core.lib.CORE; -import miscutil.core.util.Utils; -import miscutil.core.util.item.UtilsItems; - -public class ItemsIngots { - - public static void load(){ - run(); - } - - private static void run(){ - - //Standard - ModItems.itemIngotStaballoy = new BaseItemIngot("itemIngotStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66)); - ModItems.itemIngotTantalloy60 = new BaseItemIngot("itemIngotTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166)); - ModItems.itemIngotTantalloy61 = new BaseItemIngot("itemIngotTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196)); - ModItems.itemIngotBloodSteel = new BaseItemIngot("itemIngotBloodSteel", "Blood Steel", Utils.rgbtoHexValue(142, 28, 0)); - - - //Hot Ingots - ModItems.itemHotIngotStaballoy = new BaseItemIngotHot("itemHotIngotStaballoy", "Staballoy", UtilsItems.getItemStack(CORE.MODID+":itemIngotStaballoy", 1)); - ModItems.itemHotIngotTantalloy60 = new BaseItemIngotHot("itemHotIngotTantalloy60", "Tantalloy-60", UtilsItems.getItemStack(CORE.MODID+":itemIngotTantalloy60", 1)); - ModItems.itemHotIngotTantalloy61 = new BaseItemIngotHot("itemHotIngotTantalloy61", "Tantalloy-61", UtilsItems.getItemStack(CORE.MODID+":itemIngotTantalloy61", 1)); - - } - -} diff --git a/src/Java/miscutil/core/item/init/ItemsPlates.java b/src/Java/miscutil/core/item/init/ItemsPlates.java deleted file mode 100644 index 878b6cbb4d..0000000000 --- a/src/Java/miscutil/core/item/init/ItemsPlates.java +++ /dev/null @@ -1,23 +0,0 @@ -package miscutil.core.item.init; - -import miscutil.core.item.ModItems; -import miscutil.core.item.base.plates.BaseItemPlate; -import miscutil.core.util.Utils; - -public class ItemsPlates { - - public static void load(){ - run(); - } - - private static void run(){ - - ModItems.itemPlateStaballoy = new BaseItemPlate("itemPlateStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66)); - ModItems.itemPlateBloodSteel = new BaseItemPlate("itemPlateBloodSteel", "Blood Steel", Utils.rgbtoHexValue(142, 28, 0)); - ModItems.itemPlateTantalloy60 = new BaseItemPlate("itemPlateTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166)); - ModItems.itemPlateTantalloy61 = new BaseItemPlate("itemPlateTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196)); - - - } - -} diff --git a/src/Java/miscutil/core/item/init/ItemsRings.java b/src/Java/miscutil/core/item/init/ItemsRings.java deleted file mode 100644 index a01765f109..0000000000 --- a/src/Java/miscutil/core/item/init/ItemsRings.java +++ /dev/null @@ -1,23 +0,0 @@ -package miscutil.core.item.init; - -import miscutil.core.item.ModItems; -import miscutil.core.item.base.rings.BaseItemRing; -import miscutil.core.util.Utils; - -public class ItemsRings { - - public static void load(){ - run(); - } - - private static void run(){ - - ModItems.itemRingStaballoy = new BaseItemRing("itemRingStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66)); - ModItems.itemRingBloodSteel = new BaseItemRing("itemRingBloodSteel", "Blood Steel", Utils.rgbtoHexValue(142, 28, 0)); - ModItems.itemRingTantalloy60 = new BaseItemRing("itemRingTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166)); - ModItems.itemRingTantalloy61 = new BaseItemRing("itemRingTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196)); - - - } - -} diff --git a/src/Java/miscutil/core/item/init/ItemsRods.java b/src/Java/miscutil/core/item/init/ItemsRods.java deleted file mode 100644 index ff36d7f757..0000000000 --- a/src/Java/miscutil/core/item/init/ItemsRods.java +++ /dev/null @@ -1,23 +0,0 @@ -package miscutil.core.item.init; - -import miscutil.core.item.ModItems; -import miscutil.core.item.base.rods.BaseItemRod; -import miscutil.core.util.Utils; - -public class ItemsRods { - - public static void load(){ - run(); - } - - private static void run(){ - - ModItems.itemRodStaballoy = new BaseItemRod("itemRodStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66)); - ModItems.itemRodBloodSteel = new BaseItemRod("itemRodBloodSteel", "Blood Steel", Utils.rgbtoHexValue(142, 28, 0)); - ModItems.itemRodTantalloy60 = new BaseItemRod("itemRodTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166)); - ModItems.itemRodTantalloy61 = new BaseItemRod("itemRodTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196)); - - - } - -} diff --git a/src/Java/miscutil/core/item/init/ItemsRotors.java b/src/Java/miscutil/core/item/init/ItemsRotors.java deleted file mode 100644 index d12a48baa9..0000000000 --- a/src/Java/miscutil/core/item/init/ItemsRotors.java +++ /dev/null @@ -1,23 +0,0 @@ -package miscutil.core.item.init; - -import miscutil.core.item.ModItems; -import miscutil.core.item.base.rotors.BaseItemRotor; -import miscutil.core.util.Utils; - -public class ItemsRotors { - - public static void load(){ - run(); - } - - private static void run(){ - - ModItems.itemRotorStaballoy = new BaseItemRotor("itemRotorStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66)); - ModItems.itemRotorBloodSteel = new BaseItemRotor("itemRotorBloodSteel", "Blood Steel", Utils.rgbtoHexValue(142, 28, 0)); - ModItems.itemRotorTantalloy60 = new BaseItemRotor("itemRotorTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166)); - ModItems.itemRotorTantalloy61 = new BaseItemRotor("itemRotorTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196)); - - - } - -} diff --git a/src/Java/miscutil/core/item/init/ItemsScrews.java b/src/Java/miscutil/core/item/init/ItemsScrews.java deleted file mode 100644 index 8cb08f2ce2..0000000000 --- a/src/Java/miscutil/core/item/init/ItemsScrews.java +++ /dev/null @@ -1,23 +0,0 @@ -package miscutil.core.item.init; - -import miscutil.core.item.ModItems; -import miscutil.core.item.base.screws.BaseItemScrew; -import miscutil.core.util.Utils; - -public class ItemsScrews { - - public static void load(){ - run(); - } - - private static void run(){ - - ModItems.itemScrewStaballoy = new BaseItemScrew("itemScrewStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66)); - ModItems.itemScrewBloodSteel = new BaseItemScrew("itemScrewBloodSteel", "Blood Steel", Utils.rgbtoHexValue(142, 28, 0)); - ModItems.itemScrewTantalloy60 = new BaseItemScrew("itemScrewTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166)); - ModItems.itemScrewTantalloy61 = new BaseItemScrew("itemScrewTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196)); - - - } - -} diff --git a/src/Java/miscutil/core/util/Utils.java b/src/Java/miscutil/core/util/Utils.java index 8f6a988a27..5ead0bc76f 100644 --- a/src/Java/miscutil/core/util/Utils.java +++ b/src/Java/miscutil/core/util/Utils.java @@ -488,6 +488,13 @@ public class Utils { return false; } + public static boolean invertBoolean(boolean booleans){ + if (booleans == true){ + return false; + } + return true; + } + } diff --git a/src/Java/miscutil/core/util/item/UtilsItems.java b/src/Java/miscutil/core/util/item/UtilsItems.java index 114a877e1e..37be076562 100644 --- a/src/Java/miscutil/core/util/item/UtilsItems.java +++ b/src/Java/miscutil/core/util/item/UtilsItems.java @@ -4,6 +4,8 @@ import gregtech.api.util.GT_OreDictUnificator; import java.util.ArrayList; +import miscutil.core.block.base.BasicBlock.BlockTypes; +import miscutil.core.block.base.BlockBaseModular; import miscutil.core.item.ModItems; import miscutil.core.item.base.BasicSpawnEgg; import miscutil.core.item.base.bolts.BaseItemBolt; @@ -20,6 +22,7 @@ import miscutil.core.lib.CORE; import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; import miscutil.core.util.wrapper.var; +import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -234,23 +237,30 @@ public class UtilsItems { return getSimpleStack(ModItems.AAA_Broken, amount); } - public static void generateItemsFromMaterial(String unlocalizedName, String materialName, int Colour, boolean hotIngot){ + public static void generateItemsFromMaterial(String unlocalizedName, String materialName, int materialTier, int Colour, boolean hotIngot){ + if (materialTier > 10 || materialTier <= 0){ + materialTier = 2; + } Item temp; - temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, Colour, "Dust"); - temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, Colour, "Tiny"); - temp = new BaseItemDust("itemDustSmall"+unlocalizedName, materialName, Colour, "Small"); + Block tempBlock; + tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.STANDARD, Colour); + tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.FRAME, Colour); temp = new BaseItemIngot("itemIngot"+unlocalizedName, materialName, Colour); if (hotIngot){ - Item tempIngot = temp; - temp = new BaseItemIngotHot("itemHotIngot"+unlocalizedName, materialName, UtilsItems.getSimpleStack(tempIngot, 1)); - } - temp = new BaseItemPlate("itemPlate"+unlocalizedName, materialName, Colour); - temp = new BaseItemRod("itemRod"+unlocalizedName, materialName, Colour); - temp = new BaseItemRing("itemRing"+unlocalizedName, materialName, Colour); - temp = new BaseItemScrew("itemScrew"+unlocalizedName, materialName, Colour); - temp = new BaseItemBolt("itemBolt"+unlocalizedName, materialName, Colour); + Item tempIngot = temp; + temp = new BaseItemIngotHot("itemHotIngot"+unlocalizedName, materialName, UtilsItems.getSimpleStack(tempIngot, 1), materialTier); + } + temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, Colour, "Dust", hotIngot, materialTier); + temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, Colour, "Tiny", hotIngot, materialTier); + temp = new BaseItemDust("itemDustSmall"+unlocalizedName, materialName, Colour, "Small", hotIngot, materialTier); + + temp = new BaseItemPlate("itemPlate"+unlocalizedName, materialName, Colour, materialTier); + temp = new BaseItemRod("itemRod"+unlocalizedName, materialName, Colour, materialTier); + temp = new BaseItemRing("itemRing"+unlocalizedName, materialName, Colour, materialTier); + temp = new BaseItemBolt("itemBolt"+unlocalizedName, materialName, Colour, materialTier); + temp = new BaseItemScrew("itemScrew"+unlocalizedName, materialName, Colour, materialTier); temp = new BaseItemRotor("itemRotor"+unlocalizedName, materialName, Colour); - temp = new BaseItemGear("itemGear"+unlocalizedName, materialName, Colour); + temp = new BaseItemGear("itemGear"+unlocalizedName, materialName, Colour, materialTier); } } diff --git a/src/Java/miscutil/core/util/recipe/UtilsRecipe.java b/src/Java/miscutil/core/util/recipe/UtilsRecipe.java index 3de2e5e887..9e36652b10 100644 --- a/src/Java/miscutil/core/util/recipe/UtilsRecipe.java +++ b/src/Java/miscutil/core/util/recipe/UtilsRecipe.java @@ -318,17 +318,17 @@ public class UtilsRecipe { Object InputItem1, Object InputItem2, Object InputItem3, Object InputItem4, Object InputItem5, Object InputItem6, Object InputItem7, Object InputItem8, Object InputItem9, - ItemStack OutputItem){ - - if ((!(InputItem1 instanceof ItemStack) && !(InputItem1 instanceof String)) || - (!(InputItem2 instanceof ItemStack) && !(InputItem2 instanceof String)) || - (!(InputItem3 instanceof ItemStack) && !(InputItem3 instanceof String)) || - (!(InputItem4 instanceof ItemStack) && !(InputItem4 instanceof String)) || - (!(InputItem5 instanceof ItemStack) && !(InputItem5 instanceof String)) || - (!(InputItem6 instanceof ItemStack) && !(InputItem6 instanceof String)) || - (!(InputItem7 instanceof ItemStack) && !(InputItem7 instanceof String)) || - (!(InputItem8 instanceof ItemStack) && !(InputItem8 instanceof String)) || - (!(InputItem9 instanceof ItemStack) && !(InputItem9 instanceof String))){ + ItemStack OutputItem){ + + if ((!(InputItem1 instanceof ItemStack) && !(InputItem1 instanceof String) && (InputItem1 != null)) || + (!(InputItem2 instanceof ItemStack) && !(InputItem2 instanceof String) && (InputItem2 != null)) || + (!(InputItem3 instanceof ItemStack) && !(InputItem3 instanceof String) && (InputItem3 != null)) || + (!(InputItem4 instanceof ItemStack) && !(InputItem4 instanceof String) && (InputItem4 != null)) || + (!(InputItem5 instanceof ItemStack) && !(InputItem5 instanceof String) && (InputItem5 != null)) || + (!(InputItem6 instanceof ItemStack) && !(InputItem6 instanceof String) && (InputItem6 != null)) || + (!(InputItem7 instanceof ItemStack) && !(InputItem7 instanceof String) && (InputItem7 != null)) || + (!(InputItem8 instanceof ItemStack) && !(InputItem8 instanceof String) && (InputItem8 != null)) || + (!(InputItem9 instanceof ItemStack) && !(InputItem9 instanceof String) && (InputItem9 != null))){ Utils.LOG_INFO("One Input item was not an ItemStack of an OreDict String."); return; } diff --git a/src/resources/assets/miscutils/textures/blocks/blockBlock.png b/src/resources/assets/miscutils/textures/blocks/blockBlock.png Binary files differnew file mode 100644 index 0000000000..03ebe05688 --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/blockBlock.png diff --git a/src/resources/assets/miscutils/textures/blocks/blockGtFrame.png b/src/resources/assets/miscutils/textures/blocks/blockFrameGt.png Binary files differindex d93c52c24c..d93c52c24c 100644 --- a/src/resources/assets/miscutils/textures/blocks/blockGtFrame.png +++ b/src/resources/assets/miscutils/textures/blocks/blockFrameGt.png |
