aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/item/init
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2017-03-04 12:58:47 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2017-03-04 12:58:47 +1000
commitae21012d216df71f31aed6fbc9d76215fc24ceed (patch)
treecc89accbe6ce5c04b72ed3c5e46b2a185f88be6a /src/Java/gtPlusPlus/core/item/init
parentba89972a22a316030f8c3bd99974f915b1d7aefc (diff)
downloadGT5-Unofficial-ae21012d216df71f31aed6fbc9d76215fc24ceed.tar.gz
GT5-Unofficial-ae21012d216df71f31aed6fbc9d76215fc24ceed.tar.bz2
GT5-Unofficial-ae21012d216df71f31aed6fbc9d76215fc24ceed.zip
+ New texture for the slow builders ring.
+ Added the Alkalus Disk. $ Fixed Frame Box Assembler Recipes. $ Fixed Missing 7Li material. $ Fixed Tiered Tanks not showing their capacity in the tooltip. $ Fixed tooltips for alloys containing Bronze or Steel. $ Fixed Clay Pipe Extruder Recipes. - Removed a handful of Plasma cells for misc. materials. % Changed the Industrial Coke Oven's tooltip, to better describe the input/output requirements. % Cleaned up The Entire Project.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item/init')
-rw-r--r--src/Java/gtPlusPlus/core/item/init/ItemsFoods.java20
-rw-r--r--src/Java/gtPlusPlus/core/item/init/ItemsMultiTools.java88
2 files changed, 54 insertions, 54 deletions
diff --git a/src/Java/gtPlusPlus/core/item/init/ItemsFoods.java b/src/Java/gtPlusPlus/core/item/init/ItemsFoods.java
index 7fbfca0ac8..bc9fc1167e 100644
--- a/src/Java/gtPlusPlus/core/item/init/ItemsFoods.java
+++ b/src/Java/gtPlusPlus/core/item/init/ItemsFoods.java
@@ -14,30 +14,30 @@ public class ItemsFoods {
public static void load(){
run();
}
-
+
private static void run(){
-
- //Raisin Bread
+
+ //Raisin Bread
ModItems.itemIngotRaisinBread = new BaseItemFood("itemIngotRaisinBread", "Raisin Bread", 3, 1.5f, false, new PotionEffect(Potion.weakness.id, 40, 1)).setAlwaysEdible();
GT_OreDictUnificator.registerOre("foodRaisinBread", ItemUtils.getItemStack(CORE.MODID+":itemIngotRaisinBread", 1));
- //Hot Raisin Bread
+ //Hot Raisin Bread
ModItems.itemHotIngotRaisinBread = new BaseItemHotFood("itemHotIngotRaisinBread", 1, 0.5f, "Raisin Bread", 120, ModItems.itemIngotRaisinBread);
GT_OreDictUnificator.registerOre("foodHotRaisinBread", ItemUtils.getItemStack(CORE.MODID+":itemHotIngotRaisinBread", 1));
- //Raisin Bread
+ //Raisin Bread
ModItems.itemFoodRaisinToast = new BaseItemFood("itemFoodRaisinToast", "Raisin Toast", 1, 0.5f, false).setAlwaysEdible();
GT_OreDictUnificator.registerOre("foodRaisinToast", ItemUtils.getItemStack(CORE.MODID+":itemFoodRaisinToast", 1));
- //Hot Raisin Bread
+ //Hot Raisin Bread
ModItems.itemHotFoodRaisinToast = new BaseItemHotFood("itemHotFoodRaisinToast", 1, 0.5f, "Raisin Toast", 20, ModItems.itemFoodRaisinToast);
GT_OreDictUnificator.registerOre("foodHotRaisinToast", ItemUtils.getItemStack(CORE.MODID+":itemHotFoodRaisinToast", 1));
- //Raisin Bread
+ //Raisin Bread
ModItems.itemFoodCurriedSausages = new BaseItemFood("itemFoodCurriedSausages", "Curried Sausages", 5, 2f, false);
GT_OreDictUnificator.registerOre("foodCurriedSausages", ItemUtils.getItemStack(CORE.MODID+":itemFoodCurriedSausages", 1));
- //Hot Raisin Bread
+ //Hot Raisin Bread
ModItems.itemHotFoodCurriedSausages = new BaseItemHotFood("itemHotFoodCurriedSausages", 1, 0.5f, "Curried Sausages", 240, ModItems.itemFoodCurriedSausages);
GT_OreDictUnificator.registerOre("foodHotCurriedSausages", ItemUtils.getItemStack(CORE.MODID+":itemHotFoodCurriedSausages", 1));
-
+
}
-
+
}
diff --git a/src/Java/gtPlusPlus/core/item/init/ItemsMultiTools.java b/src/Java/gtPlusPlus/core/item/init/ItemsMultiTools.java
index 6a55356f1e..2c6479fbd4 100644
--- a/src/Java/gtPlusPlus/core/item/init/ItemsMultiTools.java
+++ b/src/Java/gtPlusPlus/core/item/init/ItemsMultiTools.java
@@ -14,60 +14,60 @@ public class ItemsMultiTools {
public static void load(){
run();
}
-
+
private static void run(){
-
+
//Load Multitools
- boolean gtStyleTools = LoadedMods.Gregtech;
- if (CORE.configSwitches.enableMultiSizeTools){
-
- //GT Materials
- Materials[] rm = Materials.values();
- for (Materials m : rm){
- toolFactoryGT(m, gtStyleTools);
- }
-
- //GT++ Materials
- toolFactory(ALLOY.HASTELLOY_C276);
- toolFactory(ALLOY.HASTELLOY_N);
- toolFactory(ALLOY.HASTELLOY_W);
- toolFactory(ALLOY.HASTELLOY_X);
- toolFactory(ALLOY.INCOLOY_020);
- toolFactory(ALLOY.INCOLOY_DS);
- toolFactory(ALLOY.INCOLOY_MA956);
- toolFactory(ALLOY.INCONEL_625);
- toolFactory(ALLOY.INCONEL_690);
- toolFactory(ALLOY.INCONEL_792);
- toolFactory(ALLOY.LEAGRISIUM);
- toolFactory(ALLOY.TANTALLOY_60);
- toolFactory(ALLOY.TANTALLOY_61);
- toolFactory(ALLOY.STABALLOY);
- toolFactory(ALLOY.QUANTUM);
- //toolFactory(ALLOY.BEDROCKIUM);
- toolFactory(ALLOY.POTIN);
- toolFactory(ALLOY.TUMBAGA);
- toolFactory(ALLOY.TALONITE);
- toolFactory(ALLOY.STELLITE);
- toolFactory(ALLOY.TUNGSTEN_CARBIDE);
- toolFactory(ALLOY.TANTALUM_CARBIDE);
-
-
- }
-
+ final boolean gtStyleTools = LoadedMods.Gregtech;
+ if (CORE.configSwitches.enableMultiSizeTools){
+
+ //GT Materials
+ final Materials[] rm = Materials.values();
+ for (final Materials m : rm){
+ toolFactoryGT(m, gtStyleTools);
+ }
+
+ //GT++ Materials
+ toolFactory(ALLOY.HASTELLOY_C276);
+ toolFactory(ALLOY.HASTELLOY_N);
+ toolFactory(ALLOY.HASTELLOY_W);
+ toolFactory(ALLOY.HASTELLOY_X);
+ toolFactory(ALLOY.INCOLOY_020);
+ toolFactory(ALLOY.INCOLOY_DS);
+ toolFactory(ALLOY.INCOLOY_MA956);
+ toolFactory(ALLOY.INCONEL_625);
+ toolFactory(ALLOY.INCONEL_690);
+ toolFactory(ALLOY.INCONEL_792);
+ toolFactory(ALLOY.LEAGRISIUM);
+ toolFactory(ALLOY.TANTALLOY_60);
+ toolFactory(ALLOY.TANTALLOY_61);
+ toolFactory(ALLOY.STABALLOY);
+ toolFactory(ALLOY.QUANTUM);
+ //toolFactory(ALLOY.BEDROCKIUM);
+ toolFactory(ALLOY.POTIN);
+ toolFactory(ALLOY.TUMBAGA);
+ toolFactory(ALLOY.TALONITE);
+ toolFactory(ALLOY.STELLITE);
+ toolFactory(ALLOY.TUNGSTEN_CARBIDE);
+ toolFactory(ALLOY.TANTALUM_CARBIDE);
+
+
+ }
+
}
-
-
- private static boolean toolFactoryGT(Materials m, boolean b){
+
+
+ private static boolean toolFactoryGT(final Materials m, final boolean b){
ModItems.MP_GTMATERIAL = ItemUtils.generateMultiPick(b, m);
ModItems.MS_GTMATERIAL = ItemUtils.generateMultiShovel(b, m);
return true;
}
-
- private static boolean toolFactory(Material m){
+
+ private static boolean toolFactory(final Material m){
Utils.LOG_WARNING("Generating Multi-Tools for "+m.getLocalizedName());
ModItems.MP_GTMATERIAL = ItemUtils.generateMultiPick(m);
ModItems.MS_GTMATERIAL = ItemUtils.generateMultiShovel(m);
return true;
}
-
+
}