aboutsummaryrefslogtreecommitdiff
path: root/src/Java
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-07-31 02:12:12 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-07-31 02:12:12 +1000
commitcf7c25052d94a2fd2758babec9995aab318dc3e3 (patch)
tree140ed8c508a9b1fd0afd74324606dde83df1824b /src/Java
parentd8c84e1d4515d956a2ab6c30e777dcdcbd96b660 (diff)
downloadGT5-Unofficial-cf7c25052d94a2fd2758babec9995aab318dc3e3.tar.gz
GT5-Unofficial-cf7c25052d94a2fd2758babec9995aab318dc3e3.tar.bz2
GT5-Unofficial-cf7c25052d94a2fd2758babec9995aab318dc3e3.zip
+ Added long Rods for all Materials
+ Added Tungsten Carbide, Silicon Carbide, Talonite, Stellite, Maraging Steel 250/300/350, Zeron-100. + Added more recipes for everything in general.
Diffstat (limited to 'src/Java')
-rw-r--r--src/Java/miscutil/core/item/ModItems.java35
-rw-r--r--src/Java/miscutil/core/item/base/dusts/BaseItemDust.java88
-rw-r--r--src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java29
-rw-r--r--src/Java/miscutil/core/item/base/itemblock/ItemBlockGtBlock.java22
-rw-r--r--src/Java/miscutil/core/item/base/rods/BaseItemRod.java2
-rw-r--r--src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java86
-rw-r--r--src/Java/miscutil/core/lib/CORE.java1
-rw-r--r--src/Java/miscutil/core/lib/MaterialInfo.java67
-rw-r--r--src/Java/miscutil/core/recipe/RECIPES_Machines.java70
-rw-r--r--src/Java/miscutil/core/util/item/UtilsItems.java11
10 files changed, 350 insertions, 61 deletions
diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java
index 7af35469de..d4784a14f4 100644
--- a/src/Java/miscutil/core/item/ModItems.java
+++ b/src/Java/miscutil/core/item/ModItems.java
@@ -26,6 +26,7 @@ import miscutil.core.item.tool.staballoy.StaballoyPickaxe;
import miscutil.core.lib.CORE;
import miscutil.core.lib.CORE.configSwitches;
import miscutil.core.lib.LoadedMods;
+import miscutil.core.lib.MaterialInfo;
import miscutil.core.util.Utils;
import miscutil.core.util.debug.DEBUG_INIT;
import miscutil.core.util.item.UtilsItems;
@@ -186,21 +187,31 @@ public final class ModItems {
//Start meta Item Generation
ItemsFoods.load();
- 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("EnergyCrystal", "Energy Crystal", 8, MaterialInfo.ENERGYCRYSTAL, Utils.rgbtoHexValue(228, 225, 0), true);
+ UtilsItems.generateItemsFromMaterial("BloodSteel", "Blood Steel", 3, MaterialInfo.BLOODSTEEL, Utils.rgbtoHexValue(142, 28, 0), false);
+ UtilsItems.generateItemsFromMaterial("Staballoy", "Staballoy", 6, MaterialInfo.STABALLOY, Utils.rgbtoHexValue(68, 75, 66), true);
+ UtilsItems.generateItemsFromMaterial("Tantalloy60", "Tantalloy-60", 5, MaterialInfo.TANTALLOY60, Utils.rgbtoHexValue(68, 75, 166), true);
+ UtilsItems.generateItemsFromMaterial("Tantalloy61", "Tantalloy-61", 6, MaterialInfo.TANTALLOY61, Utils.rgbtoHexValue(122, 135, 196), true);
+ UtilsItems.generateItemsFromMaterial("Bedrockium", "Bedrockium", 9, MaterialInfo.BEDROCKIUM, Utils.rgbtoHexValue(32, 32, 32), false);
+ UtilsItems.generateItemsFromMaterial("Quantum", "Quantum", 10, MaterialInfo.QUANTUM, 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("Inconel625", "Inconel-625", 4, MaterialInfo.INCONEL625, 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, MaterialInfo.INCONEL690, Utils.rgbtoHexValue(118, 220, 138), true); //Inconel 690: Low cobalt content for nuclear applications, and low resistivity.
+ UtilsItems.generateItemsFromMaterial("Inconel792", "Inconel-792", 5, MaterialInfo.INCONEL792, 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
+
+ UtilsItems.generateItemsFromMaterial("TungstenCarbide", "Tungsten Carbide", 5, MaterialInfo.TUNGSTENCARBIDE, Utils.rgbtoHexValue(44, 44, 44), true);
+ UtilsItems.generateItemsFromMaterial("SiliconCarbide", "Silicon Carbide", 4, MaterialInfo.SILICONCARBIDE, Utils.rgbtoHexValue(32, 32, 32), false);
+ UtilsItems.generateItemsFromMaterial("Zeron100", "Zeron-100", 8, MaterialInfo.ZERON100, Utils.rgbtoHexValue(180, 180, 20), true);
+ UtilsItems.generateItemsFromMaterial("MaragingSteel250", "Maraging Steel 250", 4, MaterialInfo.MARAGING250, Utils.rgbtoHexValue(140, 140, 140), true);
+ UtilsItems.generateItemsFromMaterial("MaragingSteel300", "Maraging Steel 300", 5, MaterialInfo.MARAGING300, Utils.rgbtoHexValue(150, 150, 150), true);
+ UtilsItems.generateItemsFromMaterial("MaragingSteel350", "Maraging Steel 350", 6, MaterialInfo.MARAGING350, Utils.rgbtoHexValue(160, 160, 160), true);
+ UtilsItems.generateItemsFromMaterial("Stellite", "Stellite", 7, MaterialInfo.STELLITE, Utils.rgbtoHexValue(129, 75, 120), true);
+ UtilsItems.generateItemsFromMaterial("Talonite", "Talonite", 8, MaterialInfo.TALONITE, Utils.rgbtoHexValue(228, 75, 120), false);
+
+ UtilsItems.generateItemsFromMaterial("Tumbaga", "Tumbaga", 2, MaterialInfo.TUMBAGA, 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, MaterialInfo.POTIN, 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){
diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java
index 9e98fbb821..de84c739bb 100644
--- a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java
@@ -2,12 +2,15 @@ package miscutil.core.item.base.dusts;
import static miscutil.core.creative.AddToCreativeTab.tabMisc;
import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import java.util.List;
import miscutil.core.lib.CORE;
+import miscutil.core.lib.MaterialInfo;
import miscutil.core.util.Utils;
import miscutil.core.util.item.UtilsItems;
import miscutil.core.util.recipe.UtilsRecipe;
@@ -25,8 +28,9 @@ public class BaseItemDust extends Item{
protected boolean useBlastFurnace;
String name = "";
private int mTier;
+ private MaterialInfo dustInfo;
- public BaseItemDust(String unlocalizedName, String materialName, int colour, String pileSize, boolean blastFurnaceRequired, int tier) {
+ public BaseItemDust(String unlocalizedName, String materialName, MaterialInfo matInfo, int colour, String pileSize, boolean blastFurnaceRequired, int tier) {
setUnlocalizedName(unlocalizedName);
this.setUnlocalizedName(unlocalizedName);
this.setMaxStackSize(64);
@@ -40,6 +44,7 @@ public class BaseItemDust extends Item{
this.mTier = tier;
this.materialName = materialName;
this.useBlastFurnace = blastFurnaceRequired;
+ this.dustInfo = matInfo;
GameRegistry.registerItem(this, unlocalizedName);
String temp = "";
@@ -66,6 +71,7 @@ public class BaseItemDust extends Item{
if (temp != null && temp != ""){
GT_OreDictUnificator.registerOre(temp, UtilsItems.getSimpleStack(this));
}
+ addMixerRecipe();
addFurnaceRecipe();
addMacerationRecipe();
}
@@ -114,6 +120,8 @@ public class BaseItemDust extends Item{
private void addMixerRecipe(){
ItemStack tempStack = UtilsItems.getSimpleStack(this);
ItemStack tempOutput = null;
+ ItemStack[] inputStacks = dustInfo.getInputs();
+ ItemStack[] outputStacks = dustInfo.getOutputs();
String temp = "";
Utils.LOG_WARNING("Unlocalized name for OreDict nameGen: "+getUnlocalizedName());
if (getUnlocalizedName().contains("item.")){
@@ -136,7 +144,21 @@ public class BaseItemDust extends Item{
Utils.LOG_WARNING("Generating OreDict Name: "+temp);
}
if (temp != null && temp != ""){
- tempOutput = UtilsItems.getItemStackOfAmountFromOreDict(temp, 1);
+
+ if (getUnlocalizedName().contains("DustTiny") || getUnlocalizedName().contains("DustSmall")){
+ tempOutput = UtilsItems.getItemStackOfAmountFromOreDict(temp, 1);
+ }
+ else {
+ if (outputStacks[0] != null){
+ Utils.LOG_INFO("Getting output dusts for mixer recipe. Checking ENUM, got: "+outputStacks[0].toString());
+ tempOutput = outputStacks[0];
+ }
+ else {
+ Utils.LOG_INFO("Getting output dusts for mixer recipe. Enum check failed, failback item is: "+temp);
+ tempOutput = UtilsItems.getItemStackOfAmountFromOreDict(temp, 1);
+ }
+ }
+
}
if (tempOutput != null){
@@ -155,11 +177,14 @@ public class BaseItemDust extends Item{
null, null, null);
}
else {
- Utils.LOG_WARNING("Generating a shapeless Dust recipe for "+materialName);
- UtilsRecipe.addShapelessGregtechRecipe(tempOutput,
- "dustTungsten", "dustTantalum", "dustTantalum",
- "dustTantalum", "dustTantalum", "dustTantalum",
- "dustTantalum", "dustTantalum", "dustTantalum");
+ Utils.LOG_WARNING("Generating a shapeless Dust recipe for "+materialName);
+
+ GT_Values.RA.addMixerRecipe(
+ inputStacks[0], inputStacks[1],
+ inputStacks[2], inputStacks[3],
+ null, null,
+ tempOutput,
+ 8*mTier*20, 8*mTier*2);
}
}
@@ -188,14 +213,21 @@ public class BaseItemDust extends Item{
tempIngot = tempIngot.replace("itemDust", "ingot");
Utils.LOG_WARNING("Generating OreDict Name: "+tempIngot);
-
+ ItemStack[] outputStacks = dustInfo.getOutputs();
+ if (tempIngot != null && tempIngot != "" && outputStacks[1] != null){
+ tempInputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1);
+ tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempDust, 1);
+ if (null != tempOutputStack && null != tempInputStack){
+ GT_ModHandler.addPulverisationRecipe(tempInputStack, outputStacks[0], outputStacks[1], mTier*10/Utils.randInt(10, 20));
+ }
+ }
if (tempIngot != null && tempIngot != ""){
tempInputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1);
tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempDust, 1);
if (null != tempOutputStack && null != tempInputStack){
GT_ModHandler.addPulverisationRecipe(tempInputStack, tempOutputStack);
}
- }
+ }
}
private void addFurnaceRecipe(){
@@ -227,13 +259,32 @@ public class BaseItemDust extends Item{
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);
- }
+ if (mTier < 5){
+ if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
+ addSmeltingAndAlloySmeltingRecipe(UtilsItems.getSimpleStack(this), tempOutputStack, false);
+ }
+ else {
+ GT_ModHandler.addSmeltingAndAlloySmeltingRecipe(UtilsItems.getSimpleStack(this), tempOutputStack);
+ }
+ }
+ else if (mTier >= 5){
+ Utils.LOG_INFO("Adding recipe for "+materialName+" Ingots in a Blast furnace.");
+ Utils.LOG_INFO("This will produce "+tempOutputStack.getDisplayName());
+ if (null != tempOutputStack){
+ addBlastFurnaceRecipe(UtilsItems.getSimpleStack(this), null, tempOutputStack, null, 350*mTier);
+ }
+ return;
+ }
+ }
+
}
}
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+".");
+ //Special Cases
+ if (input1.getUnlocalizedName().toLowerCase().contains("tantalloy61")){
+ input2 = UtilsItems.getItemStackOfAmountFromOreDict("dustTantalloy60", 2);
+ }
GT_Values.RA.addBlastRecipe(
input1,
input2,
@@ -243,6 +294,19 @@ public class BaseItemDust extends Item{
250*mTier*20,
mTier*64,
tempRequired);
+
+
+
+ }
+
+ private boolean addSmeltingAndAlloySmeltingRecipe(ItemStack aInput, ItemStack aOutput, boolean hidden) {
+ if (aInput == null || aOutput == null) return false;
+ boolean temp = false;
+ if (aInput.stackSize == 1 && GT_ModHandler.addSmeltingRecipe(aInput, aOutput)) temp = true;
+ if (GT_Values.RA.addAlloySmelterRecipe(aInput, OrePrefixes.ingot.contains(aOutput) ? ItemList.Shape_Mold_Ingot.get(0) : OrePrefixes.block.contains(aOutput) ? ItemList.Shape_Mold_Block.get(0) : OrePrefixes.nugget.contains(aOutput) ? ItemList.Shape_Mold_Nugget.get(0) : null, aOutput, 130, 3))
+ temp = true;
+ if (GT_ModHandler.addInductionSmelterRecipe(aInput, null, aOutput, null, aOutput.stackSize * 1600, 0)) temp = true;
+ return temp;
}
}
diff --git a/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java b/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java
index bd66c3a6bb..8915b155bd 100644
--- a/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java
+++ b/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java
@@ -1,5 +1,6 @@
package miscutil.core.item.base.ingots;
+import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import java.util.List;
@@ -41,7 +42,7 @@ public class BaseItemIngot extends Item{
if (temp != null && temp != ""){
GT_OreDictUnificator.registerOre(temp, UtilsItems.getSimpleStack(this));
}
- //addBendingRecipe();
+ generateCompressorRecipe();
}
@Override
@@ -74,4 +75,30 @@ public class BaseItemIngot extends Item{
}
+ private void generateCompressorRecipe(){
+ if (unlocalName.contains("itemIngot")){
+ ItemStack tempStack = UtilsItems.getSimpleStack(this, 9);
+ ItemStack tempOutput = null;
+ String temp = getUnlocalizedName().replace("item.itemIngot", "block");
+ Utils.LOG_WARNING("Unlocalized name for OreDict nameGen: "+getUnlocalizedName());
+ if (getUnlocalizedName().contains("item.")){
+ temp = getUnlocalizedName().replace("item.", "");
+ Utils.LOG_WARNING("Generating OreDict Name: "+temp);
+ }
+ temp = temp.replace("itemIngot", "block");
+ Utils.LOG_WARNING("Generating OreDict Name: "+temp);
+ if (temp != null && temp != ""){
+ tempOutput = UtilsItems.getItemStackOfAmountFromOreDict(temp, 1);
+ if (tempOutput != null){
+ GT_ModHandler.addCompressionRecipe(tempStack, tempOutput);
+ }
+
+ }
+ }
+ else if (unlocalName.contains("itemHotIngot")){
+ return;
+ }
+
+
+ }
}
diff --git a/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtBlock.java b/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtBlock.java
new file mode 100644
index 0000000000..0bd051928e
--- /dev/null
+++ b/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtBlock.java
@@ -0,0 +1,22 @@
+package miscutil.core.item.base.itemblock;
+
+import gregtech.api.util.GT_OreDictUnificator;
+import miscutil.core.util.item.UtilsItems;
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemBlock;
+
+public class ItemBlockGtBlock extends ItemBlock{
+
+ protected int blockColour;
+
+ public ItemBlockGtBlock(Block block) {
+ super(block);
+ this.blockColour = block.getBlockColor();
+ GT_OreDictUnificator.registerOre("block"+block.getUnlocalizedName().replace("tile.block", "").replace("tile.", "").replace("of", "").replace("Block", "").replace("-", "").replace("_", "").replace(" ", ""), UtilsItems.getSimpleStack(this));
+ }
+
+ public int getRenderColor(int aMeta) {
+ return blockColour;
+ }
+
+}
diff --git a/src/Java/miscutil/core/item/base/rods/BaseItemRod.java b/src/Java/miscutil/core/item/base/rods/BaseItemRod.java
index 6d7424c96d..853e6dde70 100644
--- a/src/Java/miscutil/core/item/base/rods/BaseItemRod.java
+++ b/src/Java/miscutil/core/item/base/rods/BaseItemRod.java
@@ -35,7 +35,7 @@ public class BaseItemRod extends Item{
this.mTier = tier;
this.materialName = materialName;
GameRegistry.registerItem(this, unlocalizedName);
- GT_OreDictUnificator.registerOre(unlocalName.replace("itemR", "r"), UtilsItems.getSimpleStack(this));
+ GT_OreDictUnificator.registerOre(unlocalName.replace("itemRod", "stick"), UtilsItems.getSimpleStack(this));
addExtruderRecipe();
}
diff --git a/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java b/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java
new file mode 100644
index 0000000000..64b7d7f2bb
--- /dev/null
+++ b/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java
@@ -0,0 +1,86 @@
+package miscutil.core.item.base.rods;
+
+import gregtech.api.enums.GT_Values;
+import gregtech.api.util.GT_OreDictUnificator;
+
+import java.util.List;
+
+import miscutil.core.creative.AddToCreativeTab;
+import miscutil.core.lib.CORE;
+import miscutil.core.util.Utils;
+import miscutil.core.util.item.UtilsItems;
+import miscutil.core.util.recipe.UtilsRecipe;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import cpw.mods.fml.common.registry.GameRegistry;
+
+public class BaseItemRodLong extends Item{
+
+ protected int colour;
+ protected String materialName;
+ protected String unlocalName;
+ private int mTier;
+
+ public BaseItemRodLong(String unlocalizedName, String materialName, int colour, int tier) {
+ setUnlocalizedName(unlocalizedName);
+ this.setCreativeTab(AddToCreativeTab.tabMisc);
+ this.setUnlocalizedName(unlocalizedName);
+ this.unlocalName = unlocalizedName;
+ this.setTextureName(CORE.MODID + ":" + "itemRodLong");
+ this.setMaxStackSize(64);
+ this.colour = colour;
+ this.mTier = tier;
+ this.materialName = materialName;
+ GameRegistry.registerItem(this, unlocalizedName);
+ GT_OreDictUnificator.registerOre(unlocalName.replace("itemRod", "stick"), UtilsItems.getSimpleStack(this));
+ addExtruderRecipe();
+ }
+
+ @Override
+ public String getItemStackDisplayName(ItemStack p_77653_1_) {
+
+ return ("Long "+materialName+ " Rod");
+ }
+
+ @Override
+ public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
+ if (materialName != null && materialName != "" && !materialName.equals("")){
+ list.add(EnumChatFormatting.GRAY+"A 80cm Rod of " + materialName + ".");
+ }
+ super.addInformation(stack, aPlayer, list, bool);
+ }
+
+ public final String getMaterialName() {
+ return materialName;
+ }
+
+ @Override
+ public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) {
+ if (colour == 0){
+ return Utils.generateSingularRandomHexValue();
+ }
+ return colour;
+
+ }
+
+ private void addExtruderRecipe(){
+ Utils.LOG_INFO("Adding recipe for Long "+materialName+" Rods");
+ String tempIngot = unlocalName.replace("itemRodLong", "stick");
+ ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 2);
+ if (null != tempOutputStack){
+ GT_Values.RA.addForgeHammerRecipe(tempOutputStack,
+ UtilsItems.getSimpleStack(this, 1),
+ 12*mTier*20, 24*mTier);
+ }
+ ItemStack rods = UtilsItems.getSimpleStack(this, 1);
+ ItemStack tempOutputStack2 = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1);
+ UtilsRecipe.addShapedGregtechRecipe(
+ tempOutputStack2, "craftingToolHardHammer", tempOutputStack2,
+ null, null, null,
+ null, null, null,
+ rods);
+ }
+
+}
diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java
index 0b686f6ebf..4f1826093f 100644
--- a/src/Java/miscutil/core/lib/CORE.java
+++ b/src/Java/miscutil/core/lib/CORE.java
@@ -35,6 +35,7 @@ public class CORE {
public static final Class<AddToCreativeTab> TAB = AddToCreativeTab.class;
public static Configuration Config;
public static final String GT_Tooltip = "Added by: " + EnumChatFormatting.DARK_GREEN+"Alkalus "+EnumChatFormatting.GRAY+"- "+EnumChatFormatting.RED+"[GT++]";
+ public static final String noItem = "";
/**
* A List containing all the Materials, which are somehow in use by GT and therefor receive a specific Set of Items.
diff --git a/src/Java/miscutil/core/lib/MaterialInfo.java b/src/Java/miscutil/core/lib/MaterialInfo.java
new file mode 100644
index 0000000000..b520af62d0
--- /dev/null
+++ b/src/Java/miscutil/core/lib/MaterialInfo.java
@@ -0,0 +1,67 @@
+package miscutil.core.lib;
+
+import static miscutil.core.lib.CORE.noItem;
+import static miscutil.core.util.item.UtilsItems.getItemStackOfAmountFromOreDict;
+import net.minecraft.item.ItemStack;
+
+public enum MaterialInfo {
+
+ ENERGYCRYSTAL(getStack("dustInfusedFire", 8), getStack("dustInfusedEarth", 8), getStack("dustInfusedEntropy", 8), getStack("dustInfusedOrder", 8), "dustEnergyCrystal", 1, noItem, 0),
+ BLOODSTEEL(null, null, null, null, noItem, 0, noItem, 0),
+ STABALLOY(getStack("dustTitanium", 1), getStack("dustUranium", 8), null, null, "dustStaballoy", 1, noItem, 0),
+ TANTALLOY60(getStack("dustTungsten", 1), getStack("dustTantalum", 8), null, null, "dustTantalloy60", 1, noItem, 0),
+ TANTALLOY61(getStack("dustTantalum", 2), getStack("dustSmallTitanium", 1), getStack("dustSmallTungsten", 2), getStack("dustTantalum", 5), "dustTantalloy61", 1, "dustTantalloy60", 1),
+ QUANTUM(null, null, null, null, noItem, 0, noItem, 0),
+ TUMBAGA(getStack("dustGold", 6), getStack("dustCopper", 3), null, null, "dustTumbaga", 1, noItem, 0),
+ POTIN(getStack("dustBronze", 3), getStack("dustTin", 2), getStack("dustLead", 4), null, "dustPotin", 1, noItem, 0),
+ BEDROCKIUM(null, null, null, null, noItem, 0, noItem, 0),
+ INCONEL625(getStack("dustNickel", 5), getStack("dustChrome", 2), getStack("dustWroughtIron", 1), getStack("dustMolybdenum", 1), "dustInconel625", 4, "dustTinyDarkAsh", 1),
+ INCONEL690(getStack("dustNickel", 5), getStack("dustChrome", 2), getStack("dustNiobium", 1), getStack("dustMolybdenum", 1), "dustInconel690", 2, "dustTinyDarkAsh", 1),
+ INCONEL792(getStack("dustNickel", 5), getStack("dustChrome", 1), getStack("dustAluminium", 2), getStack("dustNiobium", 1), "dustInconel792", 2, "dustTinyDarkAsh", 1),
+ TUNGSTENCARBIDE(getStack("dustTungsten", 16), getStack("dustCarbon", 16), null, null, "dustTungstenCarbide", 4, noItem, 0),
+ SILICONCARBIDE(getStack("dustSilicon", 16), getStack("dustCarbon", 16), null, null, "dustSiliconCarbide", 4, noItem, 0),
+ ZERON100(getStack("dustChrome", 5), getStack("dustSmallNickel", 6), getStack("dustSmallMolybdenum", 3), getStack("dustSteel", 14), "dustZeron100", 4, noItem, 0),
+ MARAGING250(getStack("dustSteel", 4), getStack("dustNickel", 2), getStack("dustCobalt", 1), getStack("dustTinyTitanium", 1), "dustMaragingSteel250", 2, noItem, 0),
+ MARAGING300(getStack("dustSteel", 5), getStack("dustNickel", 2), getStack("dustCobalt", 2), getStack("dustSmallTitanium", 1), "dustMaragingSteel300", 2, noItem, 0),
+ MARAGING350(getStack("dustSteel", 6), getStack("dustNickel", 3), getStack("dustCobalt", 3), getStack("dustTitanium", 1), "dustMaragingSteel350", 2, noItem, 0),
+ STELLITE(getStack("dustCobalt", 4), getStack("dustChrome", 4), getStack("dustManganese", 2), getStack("dustTitanium", 1), "dustStellite", 2, noItem, 0),
+ TALONITE(getStack("dustCobalt", 4), getStack("dustChrome", 4), getStack("dustPhosphorus", 1), getStack("dustMolybdenum", 1), "dustTalonite", 2, noItem, 0);
+
+ private ItemStack input1;
+ private ItemStack input2;
+ private ItemStack input3;
+ private ItemStack input4;
+ private String out1;
+ private String out2;
+ private int outAmount1;
+ private int outAmount2;
+
+ private MaterialInfo (
+ ItemStack inputMaterial_1, ItemStack inputMaterial_2,
+ ItemStack inputMaterial_3, ItemStack inputMaterial_4,
+ String output_A,int amount1, String output_B, int amount2)
+ {
+ this.input1 = inputMaterial_1;
+ this.input2 = inputMaterial_2;
+ this.input3 = inputMaterial_3;
+ this.input4 = inputMaterial_4;
+ this.out1 = output_A;
+ this.out2 = output_B;
+ this.outAmount1 = amount1;
+ this.outAmount2 = amount2;
+ }
+
+ public ItemStack[] getInputs() {
+ return new ItemStack[]{input1, input2, input3, input4};
+ }
+
+ public ItemStack[] getOutputs() {
+ return new ItemStack[]{getStack(out1, outAmount1), getStack(out2, outAmount2)};
+ }
+
+ public static ItemStack getStack(String i, int r){
+ return getItemStackOfAmountFromOreDict(i,r);
+ }
+
+
+}
diff --git a/src/Java/miscutil/core/recipe/RECIPES_Machines.java b/src/Java/miscutil/core/recipe/RECIPES_Machines.java
index 2e104f3e94..dc1f3caabc 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_Machines.java
+++ b/src/Java/miscutil/core/recipe/RECIPES_Machines.java
@@ -70,8 +70,8 @@ public class RECIPES_Machines {
static String wireTier4 = "wireGt08Gold";
static String wireTier5 = "wireGt08Aluminium";
static String wireTier6 = "wireGt08Tungsten";
- static String wireTier7 = "wireGt08Osmium";
- static String wireTier8 = "wireGt08Naquadah";
+ static String wireTier7 = "wireGt08Naquadah";
+ static String wireTier8 = "wireGt08Osmium";
static String wireTier9 = "wireGt08Superconductor";
static String wireTier10 = "wireGt16Superconductor";
@@ -82,8 +82,8 @@ public class RECIPES_Machines {
static String cableTier4 = "cableGt04Gold";
static String cableTier5 = "cableGt04Aluminium";
static String cableTier6 = "cableGt04Tungsten";
- static String cableTier7 = "cableGt04Osmium";
- static String cableTier8 = "cableGt04Naquadah";
+ static String cableTier7 = "cableGt04Naquadah";
+ static String cableTier8 = "cableGt04Osmium";
static String cableTier9 = "cableGt04NiobiumTitanium";
static String cableTier10 = "cableGt08NiobiumTitanium";
@@ -94,10 +94,10 @@ public class RECIPES_Machines {
static String plateTier3 = "plateCopper";
static String plateTier4 = "plateGold";
static String plateTier5 = "plateAluminium";
- static String plateTier6 = "plateThorium";
+ static String plateTier6 = "plateMaragingSteel250";
static String plateTier7 = "plateTungsten";
static String plateTier8 = "plateTungstenSteel";
- static String plateTier9 = "plateOsmium";
+ static String plateTier9 = "plateZeron100";
static String plateTier10 = "plateNaquadah";
static String plateTier11 = "plateNeutronium";
@@ -107,10 +107,10 @@ public class RECIPES_Machines {
static String rodTier3 = "stickCopper";
static String rodTier4 = "stickGold";
static String rodTier5 = "stickAluminium";
- static String rodTier6 = "stickThorium";
+ static String rodTier6 = "stickMaragingSteel250";
static String rodTier7 = "stickTungsten";
static String rodTier8 = "stickTungstenSteel";
- static String rodTier9 = "stickOsmium";
+ static String rodTier9 = "stickZeron100";
static String rodTier10 = "stickNaquadah";
static String rodTier11 = "stickNeutronium";
@@ -337,12 +337,7 @@ public class RECIPES_Machines {
}
private static void runModRecipes(){
- if (LoadedMods.Gregtech){
- //Staballoy Dust - TEMP
- UtilsRecipe.recipeBuilder("dustTitanium", "dustUranium", "dustUranium",
- "dustUranium", "dustUranium", "dustUranium",
- "dustUranium", "dustUranium", "dustUranium",
- RECIPES_Shapeless.dustStaballoy);
+ if (LoadedMods.Gregtech){
UtilsRecipe.addShapedGregtechRecipe(
ItemList.Electric_Piston_EV, GregtechOrePrefixes.circuit.get(Materials.Ultimate), ItemList.Electric_Piston_EV,
@@ -484,6 +479,19 @@ public class RECIPES_Machines {
"plateAnyIron", RECIPES_Tools.craftingToolWrench, "plateAnyIron",
RECIPE_IronPlatedBricks);
+ /*//Electrolyzer Frame Casing
+ UtilsRecipe.addShapedGregtechRecipe(
+ "platePotin", "stickLongChrome", "platePotin",
+ "stickLongPotin", "frameGtPotin", "stickLongPotin",
+ "platePotin", "stickLongPotin", "platePotin",
+ RECIPE_IndustrialCentrifugeCasing);
+ //Industrial Electrolyzer
+ UtilsRecipe.addShapedGregtechRecipe(
+ "plateStellite", circuitTier6, "plateStellite",
+ machineCasing_EV, IV_MACHINE_Electrolyzer, machineCasing_EV,
+ "plateStellite", "rotorStellite", "plateStellite",
+ RECIPE_IndustrialCentrifugeController);*/
+
//Industrial Centrifuge
UtilsRecipe.addShapedGregtechRecipe(
circuitTier6, pipeHugeStainlessSteel, circuitTier6,
@@ -492,9 +500,9 @@ public class RECIPES_Machines {
RECIPE_IndustrialCentrifugeController);
//Centrifuge Casing
UtilsRecipe.addShapedGregtechRecipe(
- plateTier6, "stickElectrum", plateTier6,
- plateTier8, "stickElectrum", plateTier8,
- plateTier6, "stickElectrum", plateTier6,
+ plateTier6, "stickTumbaga", plateTier6,
+ plateTier8, "stickTumbaga", plateTier8,
+ plateTier6, "stickTumbaga", plateTier6,
RECIPE_IndustrialCentrifugeCasing);
if (LoadedMods.Railcraft){
@@ -516,7 +524,7 @@ public class RECIPES_Machines {
//Coke Oven Frame Casing
UtilsRecipe.addShapedGregtechRecipe(
plateTier8, rodTier8, plateTier8,
- rodTier8, "frameGtCobalt", rodTier8,
+ rodTier8, "frameGtTantalloy61", rodTier8,
plateTier8, rodTier8, plateTier8,
RECIPE_IndustrialCokeOvenFrame);
//Coke Oven Coil 1
@@ -534,22 +542,22 @@ public class RECIPES_Machines {
//Electrolyzer Frame Casing
UtilsRecipe.addShapedGregtechRecipe(
- "plateSterlingSilver", "stickLongChrome", "plateSterlingSilver",
- "stickLongSterlingSilver", "frameGtSterlingSilver", "stickLongSterlingSilver",
- "plateSterlingSilver", "stickLongSterlingSilver", "plateSterlingSilver",
+ "platePotin", "stickLongChrome", "platePotin",
+ "stickLongPotin", "frameGtPotin", "stickLongPotin",
+ "platePotin", "stickLongPotin", "platePotin",
RECIPE_IndustrialElectrolyzerFrame);
//Industrial Electrolyzer
UtilsRecipe.addShapedGregtechRecipe(
- "plateSterlingSilver", circuitTier6, "plateSterlingSilver",
+ "plateStellite", circuitTier6, "plateStellite",
machineCasing_EV, IV_MACHINE_Electrolyzer, machineCasing_EV,
- "plateSterlingSilver", "rotorSterlingSilver", "plateSterlingSilver",
+ "plateStellite", "rotorStellite", "plateStellite",
RECIPE_IndustrialElectrolyzerController);
//Material Press Frame Casing
UtilsRecipe.addShapedGregtechRecipe(
- "plateTitanium", "stickLongTitanium", "plateTitanium",
- "stickMagnesium", "frameGtTitanium", "stickMagnesium",
- "plateTitanium", "stickLongTitanium", "plateTitanium",
+ "plateTitanium", "stickLongTumbaga", "plateTitanium",
+ "stickTantalloy60", "frameGtTumbaga", "stickTantalloy60",
+ "plateTitanium", "stickLongTumbaga", "plateTitanium",
RECIPE_IndustrialMaterialPressFrame);
//Industrial Material Press
UtilsRecipe.addShapedGregtechRecipe(
@@ -561,14 +569,14 @@ public class RECIPES_Machines {
//Maceration Frame Casing
UtilsRecipe.addShapedGregtechRecipe(
"platePalladium", "platePalladium", "platePalladium",
- "stickPlatinum", "frameGtPalladium", "stickPlatinum",
+ "stickPlatinum", "frameGtInconel625", "stickPlatinum",
"platePalladium", "stickLongPalladium", "platePalladium",
RECIPE_IndustrialMacerationStackFrame);
//Industrial Maceration stack
UtilsRecipe.addShapedGregtechRecipe(
- "plateDenseCarbon", IV_MACHINE_Macerator, "plateDenseCarbon",
+ "plateTungstenCarbide", IV_MACHINE_Macerator, "plateTungstenCarbide",
IV_MACHINE_Macerator, circuitTier8, IV_MACHINE_Macerator,
- "plateDenseCarbon", machineCasing_IV, "plateDenseCarbon",
+ "plateTungstenCarbide", machineCasing_IV, "plateTungstenCarbide",
RECIPE_IndustrialMacerationStackController);
//Wire Factory Frame Casing
@@ -579,9 +587,9 @@ public class RECIPES_Machines {
RECIPE_IndustrialWireFactoryFrame);
//Industrial Wire Factory
UtilsRecipe.addShapedGregtechRecipe(
- "plateOsmium", machineCasing_IV, "plateOsmium",
+ "plateZeron100", machineCasing_IV, "plateZeron100",
circuitTier6, IV_MACHINE_Wiremill, circuitTier6,
- "plateOsmium", machineCasing_IV, "plateOsmium",
+ "plateZeron100", machineCasing_IV, "plateZeron100",
RECIPE_IndustrialWireFactoryController);
diff --git a/src/Java/miscutil/core/util/item/UtilsItems.java b/src/Java/miscutil/core/util/item/UtilsItems.java
index 37be076562..6d05352990 100644
--- a/src/Java/miscutil/core/util/item/UtilsItems.java
+++ b/src/Java/miscutil/core/util/item/UtilsItems.java
@@ -16,10 +16,12 @@ import miscutil.core.item.base.ingots.BaseItemIngotHot;
import miscutil.core.item.base.plates.BaseItemPlate;
import miscutil.core.item.base.rings.BaseItemRing;
import miscutil.core.item.base.rods.BaseItemRod;
+import miscutil.core.item.base.rods.BaseItemRodLong;
import miscutil.core.item.base.rotors.BaseItemRotor;
import miscutil.core.item.base.screws.BaseItemScrew;
import miscutil.core.lib.CORE;
import miscutil.core.lib.LoadedMods;
+import miscutil.core.lib.MaterialInfo;
import miscutil.core.util.Utils;
import miscutil.core.util.wrapper.var;
import net.minecraft.block.Block;
@@ -237,7 +239,7 @@ public class UtilsItems {
return getSimpleStack(ModItems.AAA_Broken, amount);
}
- public static void generateItemsFromMaterial(String unlocalizedName, String materialName, int materialTier, int Colour, boolean hotIngot){
+ public static void generateItemsFromMaterial(String unlocalizedName, String materialName, int materialTier, MaterialInfo matInfo, int Colour, boolean hotIngot){
if (materialTier > 10 || materialTier <= 0){
materialTier = 2;
}
@@ -250,12 +252,13 @@ public class UtilsItems {
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 BaseItemDust("itemDust"+unlocalizedName, materialName, matInfo, Colour, "Dust", hotIngot, materialTier);
+ temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, matInfo, Colour, "Tiny", hotIngot, materialTier);
+ temp = new BaseItemDust("itemDustSmall"+unlocalizedName, materialName, matInfo, Colour, "Small", hotIngot, materialTier);
temp = new BaseItemPlate("itemPlate"+unlocalizedName, materialName, Colour, materialTier);
temp = new BaseItemRod("itemRod"+unlocalizedName, materialName, Colour, materialTier);
+ temp = new BaseItemRodLong("itemRodLong"+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);