aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-09-10 17:00:42 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-09-10 17:00:42 +1000
commit8931cf08cc1710c018bc332974306d623dfac03f (patch)
tree6fb59caf22fd46f8074919ea6158a6fca857aed1 /src
parenta5ab04af307c9ff03a47461afeadc5256d97fd89 (diff)
downloadGT5-Unofficial-8931cf08cc1710c018bc332974306d623dfac03f.tar.gz
GT5-Unofficial-8931cf08cc1710c018bc332974306d623dfac03f.tar.bz2
GT5-Unofficial-8931cf08cc1710c018bc332974306d623dfac03f.zip
+ Added the first proper chemical dehydrator recipes, for Lithium carbonate.
+ Added methods to UtilsItems to check if something is radioactive and how radioactive it is 0-3. - Removed all old dehydrator recipes used in testing. - Removed some old hard-coded items now generated by the material handler. (No items will be lost, as I doubt anyone ever obtained them.) $ Fixed some broken textures after refactoring the entire project a few commits ago.
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java4
-rw-r--r--src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java11
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java81
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java67
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java2
-rw-r--r--src/Java/gtPlusPlus/core/util/item/UtilsItems.java49
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java4
8 files changed, 76 insertions, 146 deletions
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java
index c77f1475b9..5e21c432b5 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java
@@ -1,7 +1,5 @@
package gtPlusPlus.core.common.compat;
-import gregtech.api.util.GT_OreDictUnificator;
-import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.lib.CORE.configSwitches;
import gtPlusPlus.core.recipe.RECIPES_Tools;
import gtPlusPlus.core.util.item.UtilsItems;
@@ -18,7 +16,7 @@ public class COMPAT_ExtraUtils {
private static final void run(){
UtilsItems.getItemForOreDict("ExtraUtilities:bedrockiumIngot", "ingotBedrockium", "Bedrockium Ingot", 0);
- GT_OreDictUnificator.registerOre("plateBedrockium", new ItemStack(ModItems.itemPlateBedrockium));
+ //GT_OreDictUnificator.registerOre("plateBedrockium", new ItemStack(ModItems.itemPlateBedrockium));
if (configSwitches.enableAlternativeDivisionSigilRecipe){
//Division Sigil
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 8391829ac2..22a69e2468 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -60,17 +60,6 @@ public class COMPAT_HANDLER {
//tools
GT_OreDictUnificator.registerOre("craftingToolSandHammer", new ItemStack(ModItems.itemSandstoneHammer));
- GT_OreDictUnificator.registerOre("ingotBloodSteel", new ItemStack(ModItems.itemIngotBloodSteel));
- GT_OreDictUnificator.registerOre("ingotStaballoy", new ItemStack(ModItems.itemIngotStaballoy));
-
- //Plates
- GT_OreDictUnificator.registerOre("plateBloodSteel", new ItemStack(ModItems.itemPlateBloodSteel));
- GT_OreDictUnificator.registerOre("plateStaballoy", new ItemStack(ModItems.itemPlateStaballoy));
-
- //Blocks
- //GT_OreDictUnificator.registerOre("blockStaballoy", new ItemStack(Item.getItemFromBlock(ModBlocks.blockStaballoy)));
- //OreDictionary.registerOre("blockBloodSteel", new ItemStack(ModBlocks.blockBloodSteel));
-
for(int i=1; i<=10; i++){
GT_OreDictUnificator.registerOre("bufferCore_"+CORE.VOLTAGES[i-1], new ItemStack(UtilsItems.getItem("miscutils:item.itemBufferCore"+i)));
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 3ceaf84228..6af9d23600 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -7,17 +7,10 @@ import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.item.base.BaseItemBackpack;
import gtPlusPlus.core.item.base.CoreItem;
-import gtPlusPlus.core.item.base.bolts.BaseItemBolt;
import gtPlusPlus.core.item.base.foods.BaseItemFood;
import gtPlusPlus.core.item.base.foods.BaseItemHotFood;
-import gtPlusPlus.core.item.base.gears.BaseItemGear;
import gtPlusPlus.core.item.base.ingots.BaseItemIngot;
-import gtPlusPlus.core.item.base.ingots.BaseItemIngotHot;
import gtPlusPlus.core.item.base.plates.BaseItemPlate;
-import gtPlusPlus.core.item.base.rings.BaseItemRing;
-import gtPlusPlus.core.item.base.rods.BaseItemRod;
-import gtPlusPlus.core.item.base.rotors.BaseItemRotor;
-import gtPlusPlus.core.item.base.screws.BaseItemScrew;
import gtPlusPlus.core.item.effects.RarityUncommon;
import gtPlusPlus.core.item.general.BufferCore;
import gtPlusPlus.core.item.general.ItemCloakingDevice;
@@ -30,9 +23,9 @@ import gtPlusPlus.core.item.tool.staballoy.MultiPickaxeBase;
import gtPlusPlus.core.item.tool.staballoy.StaballoyAxe;
import gtPlusPlus.core.item.tool.staballoy.StaballoyPickaxe;
import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.CORE.configSwitches;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.lib.MaterialInfo;
-import gtPlusPlus.core.lib.CORE.configSwitches;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.debug.DEBUG_INIT;
import gtPlusPlus.core.util.item.UtilsItems;
@@ -71,28 +64,15 @@ public final class ModItems {
public static Item itemPlateLudicrite;
//Thaumcraft
public static Item itemPlateVoidMetal;
- //ExtraUtils
- public static Item itemPlateBedrockium;
//Pneumaticraft
public static Item itemPlateCompressedIron;
//SimplyJetpacks
public static Item itemPlateEnrichedSoularium;
//rfTools
public static Item itemPlateDimensionShard;
- //Blood Steel Items
- public static Item itemIngotBloodSteel;
- public static Item itemPlateBloodSteel;
//Staballoy
public static Item itemStaballoyPickaxe;
public static Item itemStaballoyAxe;
- public static Item itemPlateStaballoy;
- public static Item itemIngotStaballoy;
- public static Item itemDustStaballoy;
- public static Item itemDustTinyStaballoy;
- public static Item itemDustSmallStaballoy;
- public static Item itemDustBloodSteel;
- public static Item itemDustTinyBloodSteel;
- public static Item itemDustSmallBloodSteel;
//Tools
public static Item itemSandstoneHammer;
//Machine Related
@@ -112,61 +92,14 @@ public final class ModItems {
public static Item itemBedLocator_Base;
public static Item itemBaseItemWithCharge;
- public static Item itemHotIngotStaballoy;
-
public static Item itemIngotRaisinBread;
public static Item itemHotIngotRaisinBread;
- public static BaseItemIngot itemIngotTantalloy60;
- public static BaseItemIngotHot itemHotIngotTantalloy60;
- public static BaseItemPlate itemPlateTantalloy60;
- public static BaseItemIngot itemIngotTantalloy61;
- public static BaseItemIngotHot itemHotIngotTantalloy61;
- public static BaseItemPlate itemPlateTantalloy61;
-
public static ItemFood itemFoodRaisinToast;
public static BaseItemHotFood itemHotFoodRaisinToast;
public static BaseItemFood itemFoodCurriedSausages;
public static BaseItemHotFood itemHotFoodCurriedSausages;
- public static Item itemDustTantalloy60;
- public static Item itemDustSmallTantalloy60;
- public static Item itemDustTinyTantalloy60;
-
- public static Item itemDustTantalloy61;
- public static Item itemDustSmallTantalloy61;
- public static Item itemDustTinyTantalloy61;
-
- public static BaseItemGear itemGearStaballoy;
- public static BaseItemGear itemGearBloodSteel;
- public static BaseItemGear itemGearTantalloy60;
- public static BaseItemGear itemGearTantalloy61;
-
- public static BaseItemRotor itemRotorStaballoy;
- public static BaseItemRotor itemRotorBloodSteel;
- public static BaseItemRotor itemRotorTantalloy60;
- public static BaseItemRotor itemRotorTantalloy61;
-
- public static BaseItemRod itemRodStaballoy;
- public static BaseItemRod itemRodBloodSteel;
- public static BaseItemRod itemRodTantalloy60;
- public static BaseItemRod itemRodTantalloy61;
-
- public static BaseItemScrew itemScrewStaballoy;
- public static BaseItemScrew itemScrewBloodSteel;
- public static BaseItemScrew itemScrewTantalloy60;
- public static BaseItemScrew itemScrewTantalloy61;
-
- public static BaseItemRing itemRingStaballoy;
- public static BaseItemRing itemRingBloodSteel;
- public static BaseItemRing itemRingTantalloy60;
- public static BaseItemRing itemRingTantalloy61;
-
- public static BaseItemBolt itemBoltStaballoy;
- public static BaseItemBolt itemBoltBloodSteel;
- public static BaseItemBolt itemBoltTantalloy60;
- public static BaseItemBolt itemBoltTantalloy61;
-
public static Item RfEuBattery;
public static Item itemPersonalCloakingDevice;
public static Item itemPersonalCloakingDeviceCharged;
@@ -179,8 +112,7 @@ public final class ModItems {
public static MultiPickaxeBase MP_Stone;
public static MultiPickaxeBase MP_Quartz;
public static MultiPickaxeBase MP_Obsidian;
- public static MultiPickaxeBase MP_Redstone;
-
+ public static MultiPickaxeBase MP_Redstone;
public static BaseItemBackpack backpack_Red;
public static BaseItemBackpack backpack_Green;
@@ -188,20 +120,18 @@ public final class ModItems {
public static BaseItemBackpack backpack_Yellow;
public static BaseItemBackpack backpack_Purple;
public static BaseItemBackpack backpack_Cyan;
-
-
public static BaseItemBackpack backpack_Maroon;
public static BaseItemBackpack backpack_Olive;
public static BaseItemBackpack backpack_DarkGreen;
public static BaseItemBackpack backpack_DarkPurple;
public static BaseItemBackpack backpack_Teal;
public static BaseItemBackpack backpack_Navy;
-
-
public static BaseItemBackpack backpack_Silver;
public static BaseItemBackpack backpack_Gray;
public static BaseItemBackpack backpack_Black;
public static BaseItemBackpack backpack_White;
+
+ public static Item dustLithiumCarbonate;
//@SuppressWarnings("unused")
@@ -299,6 +229,9 @@ public final class ModItems {
//Uranium-233if
UtilsItems.generateItemsFromMaterial("Uranium233", "Uranium 233", 4, MaterialInfo.INCONEL792, Utils.rgbtoHexValue(73, 220, 83), false); //Uranium-233 is a fissile isotope of uranium that is bred from thorium-232 as part of the thorium fuel cycle.
+ dustLithiumCarbonate = UtilsItems.generateSpecialUseDusts("LithiumCarbonate", "Lithium Carbonate", Utils.rgbtoHexValue(137, 139, 142))[0];
+
+
MP_Wood = new MultiPickaxeBase("Wooden Multipick", ToolMaterial.WOOD, ToolMaterial.WOOD.getMaxUses(), Utils.rgbtoHexValue(139,90,43));
MP_Stone = new MultiPickaxeBase("Cobblestone Multipick", ToolMaterial.STONE, ToolMaterial.STONE.getMaxUses(), Utils.rgbtoHexValue(161,161,161));
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index addeb8b74a..02b7f1bbc8 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -114,7 +114,7 @@ public class RECIPES_GREGTECH {
private static void dehydratorRecipes(){
Utils.LOG_INFO("Loading Recipes for Chemical Dehydrator.");
- try {
+ /*try {
//Makes Lithium Carbonate
CORE.RA.addDehydratorRecipe(
@@ -127,62 +127,23 @@ public class RECIPES_GREGTECH {
}, //Output Array of Items - Upto 9
10*20, //Time in ticks
30); //EU
- }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+ }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}*/
try {
-
CORE.RA.addDehydratorRecipe(
- UtilsItems.getItemStackOfAmountFromOreDict("cellEmpty", 1), //Item input (slot 1)
- FluidUtils.getFluidStack("sulfuriclithium", 1000), //Fluid Input
+ UtilsItems.getItemStackOfAmountFromOreDict("dustLepidolite", 20), //Item input (slot 1)
+ UtilsItems.getItemStackOfAmountFromOreDict("cellEmpty", 12), //Item input (slot 2)
+ FluidUtils.getFluidStack("sulfuricacid", 10000), //Fluid input (slot 1)
+ FluidUtils.getFluidStack("sulfuriclithium", 10000), //Fluid output (slot 1)
new ItemStack[]{
- UtilsItems.getItemStackOfAmountFromOreDict("dustSodium", 1),
- UtilsItems.getItemStackOfAmountFromOreDict("dustCarbon", 1),
- UtilsItems.getItemStackOfAmountFromOreDict("dustLithium", 1)
- }, //Output Array of Items - Upto 9
- 10*20, //Time in ticks
- 30); //EU
- }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
- try {
- CORE.RA.addDehydratorRecipe(
- UtilsItems.getItemStackOfAmountFromOreDict("cellEmpty", 1), //Item input (slot 1)
- UtilsItems.getItemStackOfAmountFromOreDict("cellWater", 1), //Item input (slot 2)
- new ItemStack[]{
- UtilsItems.getItemStackOfAmountFromOreDict("dustSodium", 1),
- UtilsItems.getItemStackOfAmountFromOreDict("dustCarbon", 1),
- UtilsItems.getItemStackOfAmountFromOreDict("dustLithium", 1)
- }, //Output Array of Items - Upto 9
- 10*20, //Time in ticks
- 30); //EU
- }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
- try {
- CORE.RA.addDehydratorRecipe(
- UtilsItems.getItemStackOfAmountFromOreDict("cellEmpty", 1),
- null,
- FluidUtils.getFluidStack("sulfuriclithium", 1000),
- new ItemStack[]{
- UtilsItems.getItemStackOfAmountFromOreDict("dustSodium", 1),
- UtilsItems.getItemStackOfAmountFromOreDict("dustCarbon", 1),
- UtilsItems.getItemStackOfAmountFromOreDict("dustLithium", 1)
- }, //Output Array of Items - Upto 9
- FluidUtils.getFluidStack("water", 1000),
- 10*20, //Time in ticks
- 30); //EU
-
- }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
-
- try {
- CORE.RA.addDehydratorRecipe(
- null, //Item input (slot 1)
- null, //Item input (slot 2)
- FluidUtils.getFluidStack("sulfuriclithium", 1000), //Fluid input (slot 1)
- null, //Fluid output (slot 1)
- new ItemStack[]{
- UtilsItems.getItemStackOfAmountFromOreDict("dustSodium", 1),
- UtilsItems.getItemStackOfAmountFromOreDict("dustCarbon", 1),
- UtilsItems.getItemStackOfAmountFromOreDict("dustLithium", 1)
- }, //Output Array of Items - Upto 9,
+ UtilsItems.getItemStackOfAmountFromOreDict("dustPotassium", 1),
+ UtilsItems.getItemStackOfAmountFromOreDict("dustAluminium", 4),
+ UtilsItems.getItemStackOfAmountFromOreDict("cellOxygen", 10),
+ UtilsItems.getItemStackOfAmountFromOreDict("cellFluorine", 2),
+ UtilsItems.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 3), //LithiumCarbonate
+ }, //Output Array of Items - Upto 9,
new int[]{0},
- 10*20, //Time in ticks
- 30); //EU
+ 90*20, //Time in ticks
+ 2000); //EU
}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java
index 2f97d7e7ff..0ff5ce44c3 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java
@@ -16,7 +16,7 @@ public class RECIPES_Tools {
public static ItemStack RECIPE_StaballoyPickaxe = new ItemStack(ModItems.itemStaballoyPickaxe);
public static ItemStack RECIPE_StaballoyAxe = new ItemStack(ModItems.itemStaballoyAxe);
public static ItemStack RECIPE_SandstoneHammer = new ItemStack(ModItems.itemSandstoneHammer);
- public static ItemStack RECIPE_StaballoyIngot = new ItemStack(ModItems.itemIngotStaballoy);
+ //public static ItemStack RECIPE_StaballoyIngot = new ItemStack(ModItems.itemIngotStaballoy);
public static ItemStack RECIPE_SandStone = new ItemStack(Blocks.sandstone, 2);
public static ItemStack RECIPE_Sand = new ItemStack(Blocks.sand, 4);
diff --git a/src/Java/gtPlusPlus/core/util/item/UtilsItems.java b/src/Java/gtPlusPlus/core/util/item/UtilsItems.java
index 6eb5335035..478e707782 100644
--- a/src/Java/gtPlusPlus/core/util/item/UtilsItems.java
+++ b/src/Java/gtPlusPlus/core/util/item/UtilsItems.java
@@ -8,6 +8,7 @@ import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.item.base.BasicSpawnEgg;
import gtPlusPlus.core.item.base.bolts.BaseItemBolt;
import gtPlusPlus.core.item.base.dusts.BaseItemDust;
+import gtPlusPlus.core.item.base.dusts.BaseItemDustSpecialUse;
import gtPlusPlus.core.item.base.gears.BaseItemGear;
import gtPlusPlus.core.item.base.ingots.BaseItemIngot;
import gtPlusPlus.core.item.base.ingots.BaseItemIngotHot;
@@ -327,6 +328,23 @@ public class UtilsItems {
}
+ public static Item[] generateDusts(String unlocalizedName, String materialName, int materialTier, MaterialInfo matInfo, int Colour, boolean hotIngot){
+ int radioactive = getRadioactivityLevel(materialName);
+ Item[] output = {
+ new BaseItemDust("itemDust"+unlocalizedName, materialName, matInfo, Colour, "Dust", hotIngot, materialTier, radioactive),
+ new BaseItemDust("itemDustSmall"+unlocalizedName, materialName, matInfo, Colour, "Small", hotIngot, materialTier, radioactive),
+ new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, matInfo, Colour, "Tiny", hotIngot, materialTier, radioactive)};
+ return output;
+ }
+
+ public static Item[] generateSpecialUseDusts(String unlocalizedName, String materialName, int Colour){
+ Item[] output = {
+ new BaseItemDustSpecialUse("itemDust"+unlocalizedName, materialName, Colour, "Dust"),
+ new BaseItemDustSpecialUse("itemDustSmall"+unlocalizedName, materialName, Colour, "Small"),
+ new BaseItemDustSpecialUse("itemDustTiny"+unlocalizedName, materialName, Colour, "Tiny")};
+ return output;
+ }
+
public static MultiPickaxeBase generateMultiPick(Materials material){
ToolMaterial customMaterial = Utils.generateMaterialFromGT(material);
short[] rgb;
@@ -348,6 +366,37 @@ public class UtilsItems {
}
+ public static boolean isRadioactive(String materialName){
+ int sRadiation = 0;
+ if (materialName.toLowerCase().contains("uranium")){
+ sRadiation = 2;
+ }
+ else if (materialName.toLowerCase().contains("plutonium")){
+ sRadiation = 4;
+ }
+ else if (materialName.toLowerCase().contains("thorium")){
+ sRadiation = 1;
+ }
+ if (sRadiation >= 1){
+ return true;
+ }
+ return false;
+ }
+
+ public static int getRadioactivityLevel(String materialName){
+ int sRadiation = 0;
+ if (materialName.toLowerCase().contains("uranium")){
+ sRadiation = 2;
+ }
+ else if (materialName.toLowerCase().contains("plutonium")){
+ sRadiation = 4;
+ }
+ else if (materialName.toLowerCase().contains("thorium")){
+ sRadiation = 1;
+ }
+ return sRadiation;
+ }
+
public static String getArrayStackNames(ItemStack[] aStack){
String itemNames = "Item Array: ";
for (ItemStack alph : aStack){
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
index fbba69bf93..7693407936 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
@@ -109,13 +109,13 @@ public class GregtechFluidHandler {
UtilsItems.getItemStackOfAmountFromOreDict("dustSmallSulfur", 1),
20*20);
- GT_Values.RA.addChemicalRecipe(
+ /*GT_Values.RA.addChemicalRecipe(
UtilsItems.getItemStackOfAmountFromOreDict("dustLithium", 8),
null,
FluidUtils.getFluidStack("sulfuricacid", 133*32),
FluidUtils.getFluidStack("sulfuriclithium", 133*4),
UtilsItems.getItemStackOfAmountFromOreDict("dustSmallLithium", 2),
- 20*20);
+ 20*20);*/
GT_Values.RA.addChemicalRecipe(
UtilsItems.getItemStackOfAmountFromOreDict("cellOxygen", 1),
diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
index 86037d3a0c..880bad71cc 100644
--- a/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
+++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
@@ -32,8 +32,8 @@ public class TF_Items {
public static void preInit(){
- itemBucket = (ItemBucket)new ItemBucket("GTplusplus").setUnlocalizedName("bucket").setCreativeTab(AddToCreativeTab.tabMisc);
- itemMaterial = (ItemBase)new ItemBase("GTplusplus").setUnlocalizedName("material").setCreativeTab(AddToCreativeTab.tabMisc);
+ itemBucket = (ItemBucket)new ItemBucket("MiscUtils").setUnlocalizedName("bucket").setCreativeTab(AddToCreativeTab.tabMisc);
+ itemMaterial = (ItemBase)new ItemBase("MiscUtils").setUnlocalizedName("material").setCreativeTab(AddToCreativeTab.tabMisc);
bucketPyrotheum = itemBucket.addOreDictItem(1, "bucketPyrotheum");