diff options
Diffstat (limited to 'src/Java/miscutil/core/item')
| -rw-r--r-- | src/Java/miscutil/core/item/ModItems.java | 4 | ||||
| -rw-r--r-- | src/Java/miscutil/core/item/base/dusts/BaseItemDust.java | 17 | ||||
| -rw-r--r-- | src/Java/miscutil/core/item/general/RF2EU_Battery.java | 2 |
3 files changed, 13 insertions, 10 deletions
diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java index 2ce795501e..bf988c7893 100644 --- a/src/Java/miscutil/core/item/ModItems.java +++ b/src/Java/miscutil/core/item/ModItems.java @@ -204,7 +204,9 @@ public final class ModItems { 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("TungstenCarbide", "Tungsten Carbide", 5, MaterialInfo.TUNGSTENCARBIDE, Utils.rgbtoHexValue(44, 44, 44), true); + if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ + 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); diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java index 49fb1ac13d..6402037997 100644 --- a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java +++ b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java @@ -6,7 +6,6 @@ import gregtech.api.enums.ItemList; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; import java.util.List; @@ -183,12 +182,7 @@ public class BaseItemDust extends Item{ else { Utils.LOG_INFO("Generating a Dust recipe for "+materialName+" in the mixer."); - /*GT_Values.RA.addMixerRecipe( - inputStacks[0], inputStacks[1], - inputStacks[2], inputStacks[3], - null, null, - tempOutput, - 8*mTier*20, 8*mTier*2);*/ + int i = 0; for (ItemStack is : inputStacks){ i++; @@ -201,11 +195,18 @@ public class BaseItemDust extends Item{ } GT_Values.RA.addMixerRecipe( + inputStacks[0], inputStacks[1], + inputStacks[2], inputStacks[3], + null, null, + tempOutput, + 8*mTier*20, 8*mTier*2); + + /*GT_Values.RA.addMixerRecipe( GT_Utility.copyAmount(inputStacks[0].stackSize, new Object[]{inputStacks[0]}), GT_Utility.copyAmount(inputStacks[1].stackSize, new Object[]{inputStacks[1]}), GT_Utility.copyAmount(inputStacks[2].stackSize, new Object[]{inputStacks[2]}), GT_Utility.copyAmount(inputStacks[3].stackSize, new Object[]{inputStacks[3]}), null, null, tempOutput, - 8*mTier*20, 8*mTier*2); + 8*mTier*20, 8*mTier*2);*/ } } diff --git a/src/Java/miscutil/core/item/general/RF2EU_Battery.java b/src/Java/miscutil/core/item/general/RF2EU_Battery.java index ae03ea5a06..9c024c27f4 100644 --- a/src/Java/miscutil/core/item/general/RF2EU_Battery.java +++ b/src/Java/miscutil/core/item/general/RF2EU_Battery.java @@ -40,7 +40,7 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem, GameRegistry.registerFuelHandler(this); //this.setMaxDamage(Integer.MAX_VALUE); //this.setDamage(UtilsItems.getSimpleStack(this), 0); - this.setCreativeTab(AddToCreativeTab.tabMisc); + this.setCreativeTab(AddToCreativeTab.tabMachines); this.setUnlocalizedName(unlocalizedName); this.setMaxStackSize(1); this.setTextureName(CORE.MODID + ":" + "itemIngot"); |