aboutsummaryrefslogtreecommitdiff
path: root/src/Java
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-11-23 16:00:06 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-11-23 16:00:06 +1000
commit757d747a2f7a63bec084a48303250af2956876ef (patch)
tree398741c4c5800603c0d4a499bed50fb0f6df4c97 /src/Java
parented52e8c83916cac101e8dd50cfe179c23a6122b2 (diff)
downloadGT5-Unofficial-757d747a2f7a63bec084a48303250af2956876ef.tar.gz
GT5-Unofficial-757d747a2f7a63bec084a48303250af2956876ef.tar.bz2
GT5-Unofficial-757d747a2f7a63bec084a48303250af2956876ef.zip
+ Added some new dust generation code, for cases where I only want generate singular dusts, with small/tiny dusts.
% Added dusts for AER, IGNIS, TERRA & AQUA, which won't require TC and will have alternative recipes.
Diffstat (limited to 'src/Java')
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java10
-rw-r--r--src/Java/gtPlusPlus/core/material/MaterialGenerator.java1
-rw-r--r--src/Java/gtPlusPlus/core/util/item/ItemUtils.java18
3 files changed, 29 insertions, 0 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index f2136c70c6..fa579ddce0 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -140,6 +140,11 @@ public final class ModItems {
public static Item dust2LiOH_CaCO3;
public static Item dustLi2BeF4;
+ public static Item dustAer;
+ public static Item dustIgnis;
+ public static Item dustTerra;
+ public static Item dustAqua;
+
public static BaseEuItem metaItem2;
@@ -275,6 +280,11 @@ public final class ModItems {
}
+ //Energy Crystal Components
+ dustAer = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().AER, true)[0];
+ dustIgnis = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().IGNIS, true)[0];
+ dustTerra = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().TERRA, true)[0];
+ dustAqua = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().AQUA, true)[0];
//Nuclear Fuel Dusts
dustUraniumTetraFluoride = ItemUtils.generateSpecialUseDusts("UraniumTetrafluoride", "Uranium Tetrafluoride", Utils.rgbtoHexValue(17, 179, 42))[0];
diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
index eb34765026..ec6527be50 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -89,6 +89,7 @@ public class MaterialGenerator {
RecipeGen_Extruder.generateRecipes(matInfo);
RecipeGen_ShapedCrafting.generateRecipes(matInfo);
RecipeGen_DustGeneration.generateRecipes(matInfo);
+ if (matInfo != ALLOY.ENERGYCRYSTAL && matInfo != ALLOY.BLOODSTEEL)
RecipeGen_BlastSmelter.generateARecipe(matInfo);
}
diff --git a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
index b67d853ecf..f78c09152e 100644
--- a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
@@ -294,6 +294,24 @@ public class ItemUtils {
new BaseItemDustUnique("itemDustTiny"+unlocalizedName, materialName, Colour, "Tiny")};
return output;
}
+
+ public static Item[] generateSpecialUseDusts(Material material, boolean onlyLargeDust){
+ String unlocalizedName = material.getUnlocalizedName();
+ String materialName = material.getUnlocalizedName();
+ int Colour = material.getRgbAsHex();
+ Item[] output = null;
+ if (onlyLargeDust == false){
+ output = new Item[]{
+ new BaseItemDustUnique("itemDust"+unlocalizedName, materialName, Colour, "Dust"),
+ new BaseItemDustUnique("itemDustSmall"+unlocalizedName, materialName, Colour, "Small"),
+ new BaseItemDustUnique("itemDustTiny"+unlocalizedName, materialName, Colour, "Tiny")};
+ } else{
+ output = new Item[]{
+ new BaseItemDustUnique("itemDust"+unlocalizedName, materialName, Colour, "Dust")
+ };
+ }
+ return output;
+ }
public static MultiPickaxeBase generateMultiPick(boolean GT_Durability, Materials material){
ToolMaterial customMaterial = Utils.generateMaterialFromGT(material);