From a3735e8ef75eb98de7493d706d5b8d163fed9d25 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Fri, 2 Jun 2017 11:45:15 +1000 Subject: + Added ULV component Recipes. + Added a small wrought iron gear if it doesn't exist. + Added a Lithium plate if it doesn't exist. --- src/Java/gtPlusPlus/core/item/ModItems.java | 20 ++++++++++++++++---- .../gtPlusPlus/core/item/base/BaseItemComponent.java | 8 ++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) (limited to 'src/Java/gtPlusPlus/core/item') diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index b6953456b1..f093d7bf41 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -13,6 +13,7 @@ import gtPlusPlus.core.item.base.dusts.decimal.BaseItemCentidust; import gtPlusPlus.core.item.base.dusts.decimal.BaseItemDecidust; import gtPlusPlus.core.item.base.foods.BaseItemFood; import gtPlusPlus.core.item.base.foods.BaseItemHotFood; +import gtPlusPlus.core.item.base.gears.BaseItemSmallGear; import gtPlusPlus.core.item.base.ingots.BaseItemIngot_OLD; import gtPlusPlus.core.item.base.misc.BaseItemMisc; import gtPlusPlus.core.item.base.misc.BaseItemMisc.MiscTypes; @@ -199,6 +200,9 @@ public final class ModItems { public static Fluid fluidFLiBeSalt; + public static Item itemSmallWroughtIronGear; + public static Item itemPlateLithium; + public static final void init(){ @@ -429,8 +433,6 @@ public final class ModItems { dustTerra = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().TERRA, true)[0]; dustAqua = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().AQUA, true)[0]; - - //Nuclear Fuel Dusts dustLithiumCarbonate = ItemUtils.generateSpecialUseDusts("LithiumCarbonate", "Lithium Carbonate", Utils.rgbtoHexValue(240, 240, 240))[0]; //https://en.wikipedia.org/wiki/Lithium_carbonate dustLithiumPeroxide = ItemUtils.generateSpecialUseDusts("LithiumPeroxide", "Lithium Peroxide", Utils.rgbtoHexValue(250, 250, 250))[0]; //https://en.wikipedia.org/wiki/Lithium_peroxide @@ -521,7 +523,17 @@ public final class ModItems { //Just an unusual plate needed for some black magic. itemPlateClay = new BaseItemPlate(MaterialUtils.generateMaterialFromGtENUM(Materials.Clay)); itemDoublePlateClay = new BaseItemPlateDouble(MaterialUtils.generateMaterialFromGtENUM(Materials.Clay)); - + + //A small gear needed for wizardry. + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("gearGtSmallWroughtIron", 1) == null){ + itemSmallWroughtIronGear = new BaseItemSmallGear(MaterialUtils.generateMaterialFromGtENUM(Materials.WroughtIron)); + } + + //A plate of Lithium. + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateLithium", 1) == null){ + itemPlateLithium = new BaseItemPlate(MaterialUtils.generateMaterialFromGtENUM(Materials.Lithium)); + } + //Misc Items Item tI; tI = new BaseItemMisc("Chilly", new short[]{0,64,196}, 32, MiscTypes.POTION, new String[]{"It's Blue"}); @@ -660,7 +672,7 @@ public final class ModItems { if (configSwitches.enableAlternativeBatteryAlloy) { //ModItems.itemIngotBatteryAlloy = new BaseItemIngot("itemIngotBatteryAlloy", "Battery Alloy", new short[]{35, 228, 141}, 0); TODO ModItems.itemPlateBatteryAlloy = ItemUtils.generateSpecialUsePlate("itemPlateBatteryAlloy", "Battery Alloy", new short[]{35, 228, 141}, 0); - + } diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java index 4729b2182a..54be041972 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java @@ -64,6 +64,9 @@ public class BaseItemComponent extends Item{ if (this.componentType == ComponentTypes.GEAR){ return "gregtech" + ":" + "materialicons/METALLIC/" + "gearGt"; } + else if (this.componentType == ComponentTypes.SMALLGEAR){ + return "gregtech" + ":" + "materialicons/METALLIC/" + "gearGtSmall"; + } else if (this.componentType == ComponentTypes.ROD){ return "gregtech" + ":" + "materialicons/METALLIC/" + "stick"; } @@ -79,6 +82,10 @@ public class BaseItemComponent extends Item{ @Override public String getItemStackDisplayName(final ItemStack p_77653_1_) { + if (this.componentType == ComponentTypes.SMALLGEAR){ + return "Small " + this.materialName+" Gear"; + } + if (this.componentMaterial != null) { return (this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME); } @@ -181,6 +188,7 @@ public class BaseItemComponent extends Item{ ROD("Rod", " Rod", "stick"), RODLONG("RodLong", " Long Rod", "stickLong"), GEAR("Gear", " Gear", "gear"), + SMALLGEAR("SmallGear", " Gear", "gearGtSmall"), //TODO SCREW("Screw", " Screw", "screw"), BOLT("Bolt", " Bolt", "bolt"), ROTOR("Rotor", " Rotor", "rotor"), -- cgit From 1d49ad58f6ada069813739c985c5e10d21c10a83 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Fri, 2 Jun 2017 12:15:07 +1000 Subject: $ Fixed issue where Sensor recipes wouldn't generate correctly. --- .../gtPlusPlus/core/item/base/gears/BaseItemSmallGear.java | 11 +++++++++++ .../gtPlusPlus/core/recipe/RECIPES_MachineComponents.java | 4 ++-- src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 src/Java/gtPlusPlus/core/item/base/gears/BaseItemSmallGear.java (limited to 'src/Java/gtPlusPlus/core/item') diff --git a/src/Java/gtPlusPlus/core/item/base/gears/BaseItemSmallGear.java b/src/Java/gtPlusPlus/core/item/base/gears/BaseItemSmallGear.java new file mode 100644 index 0000000000..5435c692c6 --- /dev/null +++ b/src/Java/gtPlusPlus/core/item/base/gears/BaseItemSmallGear.java @@ -0,0 +1,11 @@ +package gtPlusPlus.core.item.base.gears; + +import gtPlusPlus.core.item.base.BaseItemComponent; +import gtPlusPlus.core.material.Material; + +public class BaseItemSmallGear extends BaseItemComponent{ + + public BaseItemSmallGear(final Material material) { + super(material, BaseItemComponent.ComponentTypes.SMALLGEAR); + } +} diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java index 17abf3f06e..d18740eeab 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java @@ -334,7 +334,7 @@ public class RECIPES_MachineComponents { wireTier0, circuitTier0, wireTier0, RECIPE_CONSTANTS.fieldGenerator_ULV); - RecipeUtils.addShapedGregtechRecipe( + RecipeUtils.recipeBuilder( plateTier0, null, circuitTier1, plateTier0, rodTier2, null, circuitTier0, plateTier0, plateTier0, @@ -377,7 +377,7 @@ public class RECIPES_MachineComponents { circuitTier10, circuitTier9, circuitTier10, wireTier10, circuitTier10, wireTier10, RECIPE_CONSTANTS.fieldGenerator_MAX); - RecipeUtils.addShapedGregtechRecipe( + RecipeUtils.recipeBuilder( plateTier10, null, circuitTier9, plateTier10, rodTier10c, null, circuitTier10, plateTier10, plateTier10, diff --git a/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java b/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java index f930935f40..e19332e4a9 100644 --- a/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java +++ b/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java @@ -328,7 +328,7 @@ public class RecipeUtils { final Object InputItem1, final Object InputItem2, final Object InputItem3, final Object InputItem4, final Object InputItem5, final Object InputItem6, final Object InputItem7, final Object InputItem8, final Object InputItem9, - final ItemStack OutputItem){ + final ItemStack OutputItem){ if ((!(InputItem1 instanceof ItemStack) && !(InputItem1 instanceof String) && (InputItem1 != null)) || (!(InputItem2 instanceof ItemStack) && !(InputItem2 instanceof String) && (InputItem2 != null)) || -- cgit