aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core
diff options
context:
space:
mode:
authorJordan Byrne <draknyte1@hotmail.com>2018-03-03 17:11:22 +1000
committerJordan Byrne <draknyte1@hotmail.com>2018-03-03 17:11:22 +1000
commit94ccfe55a1b65f0c1173cb47fae1a68decb99354 (patch)
treedb72b6bef3756ca9d61d28b992f33641b8a83fd7 /src/Java/gtPlusPlus/core
parent9b90ec63b0eb04c60dfa90791291b8a0174409d6 (diff)
downloadGT5-Unofficial-94ccfe55a1b65f0c1173cb47fae1a68decb99354.tar.gz
GT5-Unofficial-94ccfe55a1b65f0c1173cb47fae1a68decb99354.tar.bz2
GT5-Unofficial-94ccfe55a1b65f0c1173cb47fae1a68decb99354.zip
+ Added Foil base item for future item generation.
+ Added U235 foil, if it is missing. $ Fixed Mutagenic frame recipe not working, due to U235 Foil not existing in .09. $ Fixed naming of Cryo/Pyrotheum fluid blocks. % Tweaked Multi Machine Manual.
Diffstat (limited to 'src/Java/gtPlusPlus/core')
-rw-r--r--src/Java/gtPlusPlus/core/handler/BookHandler.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java30
-rw-r--r--src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java1
-rw-r--r--src/Java/gtPlusPlus/core/item/base/foil/BaseItemFoil.java11
4 files changed, 32 insertions, 14 deletions
diff --git a/src/Java/gtPlusPlus/core/handler/BookHandler.java b/src/Java/gtPlusPlus/core/handler/BookHandler.java
index ca9fffbeb3..d0e04fccc8 100644
--- a/src/Java/gtPlusPlus/core/handler/BookHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/BookHandler.java
@@ -77,8 +77,8 @@ public class BookHandler {
//20/21/22
book_MultiMachineManual = writeBookTemplate(
"Manual_Multi_Machine", "Multi Machine Manual", "Alkalus",
- new String[] {"This Multiblock, depending upon the casings used, can function as a variety of different machines. The idea behind this, was that most of these machines are rather niche compared to any others, as such, not used often.",
- "The Mode for the controller can be set by using a Screwdriver on the controller block. Each mode allows the use of Numbered Circuits, to allow a different machine 'type' for each input bus.",
+ new String[] {"This Multiblock, depending upon the mode used, can function as a variety of different machines. The idea behind this, was that most of these machines are rather niche compared to any others, as such, not used often.",
+ "The Mode can be set by using a Screwdriver on the controller block. Each mode allows the use of Numbered Circuits, to allow a different machine 'type' for each input bus.",
"[Metal Work] Mode A - Allows the multiblock to function as a Compressor, a Lathe or an Electro-Magnet. To allow a hatch to run in Compressor mode, insert a No. 20 circuit. For Lathe, use No. 21 and for Electro-Magnet use No. 22.",
"[Fluid Work] Mode B - Allows the multiblock to function as a Fermenter, a Distillery or an Extractor. To allow a hatch to run in Fermenter mode, insert a No. 20 circuit. For Distillery, use No. 21 and for Extractor use No. 22.",
"[Misc. Work] Mode C - Allows the multiblock to function as a Laser Engraver, a Replicator or an Autoclave. To allow a hatch to run in Laser Engraver mode, insert a No. 20 circuit. For Autoclave, use No. 21 and for Replicator use No. 22.",
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 0481bd23bd..8066409baf 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -18,6 +18,7 @@ import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.item.base.*;
import gtPlusPlus.core.item.base.dusts.decimal.BaseItemCentidust;
import gtPlusPlus.core.item.base.dusts.decimal.BaseItemDecidust;
+import gtPlusPlus.core.item.base.foil.BaseItemFoil;
import gtPlusPlus.core.item.base.foods.BaseItemFood;
import gtPlusPlus.core.item.base.foods.BaseItemHotFood;
import gtPlusPlus.core.item.base.gears.BaseItemSmallGear;
@@ -221,42 +222,42 @@ public final class ModItems {
public static Fluid fluidFLiBeSalt;
+
+ //Possibly missing base items that GT may be missing.
public static Item itemSmallWroughtIronGear;
public static Item itemPlateLithium;
- public static BaseItemPlate itemPlateEuropium;
- public static BaseItemPlateDouble itemDoublePlateEuropium;
+ public static Item itemPlateEuropium;
+ public static Item itemPlateVanadium;
+ public static Item itemDoublePlateEuropium;
+ public static Item itemFoilUranium235;
- public static ItemBoilerChassis itemBoilerChassis;
- public static ItemDehydratorCoilWire itemDehydratorCoilWire;
- public static ItemDehydratorCoil itemDehydratorCoil;
+ public static Item itemBoilerChassis;
+ public static Item itemDehydratorCoilWire;
+ public static Item itemDehydratorCoil;
public static Item itemLavaFilter;
public static Item itemAirFilter;
public static Item itemCoalCoke;
- public static CoreItem itemCircuitLFTR;
+ public static Item itemCircuitLFTR;
public static Item itemDebugAreaClear;
public static Item itemGemShards;
-
public static Item itemHalfCompleteCasings;
- public static Item itemPlateVanadium;
-
public static Item itemSulfuricPotion;
public static Item itemHydrofluoricPotion;
public static Item itemModularBauble;
public static Item itemCustomBook;
-
+
public static Item itemGrindleTablet;
-
public static Item itemRope;
public static Item itemFiber;
-
public static Item itemDragonJar;
+
static {
Logger.INFO("Items!");
@@ -657,6 +658,11 @@ public final class ModItems {
itemDoublePlateClay = new BaseItemPlateDouble(MaterialUtils.generateMaterialFromGtENUM(Materials.Clay));
}
+ //Need this for Mutagenic Frames
+ if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilUranium235", 1) == null){
+ itemFoilUranium235 = new BaseItemFoil(ELEMENT.getInstance().URANIUM235);
+ }
+
//A small gear needed for wizardry.
if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("gearGtSmallWroughtIron", 1) == null){
itemSmallWroughtIronGear = new BaseItemSmallGear(MaterialUtils.generateMaterialFromGtENUM(Materials.WroughtIron));
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
index 57e5a999da..662f6433aa 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -227,6 +227,7 @@ public class BaseItemComponent extends Item{
BOLT("Bolt", " Bolt", "bolt"),
ROTOR("Rotor", " Rotor", "rotor"),
RING("Ring", " Ring", "ring"),
+ FOIL("Foil", " Foil", "foil"),
PLASMACELL("CellPlasma", " Plasma Cell", "cellPlasma"),
CELL("Cell", " Cell", "cell"),
NUGGET("Nugget", " Nugget", "nugget"),
diff --git a/src/Java/gtPlusPlus/core/item/base/foil/BaseItemFoil.java b/src/Java/gtPlusPlus/core/item/base/foil/BaseItemFoil.java
new file mode 100644
index 0000000000..3e2816bf52
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/base/foil/BaseItemFoil.java
@@ -0,0 +1,11 @@
+package gtPlusPlus.core.item.base.foil;
+
+import gtPlusPlus.core.item.base.BaseItemComponent;
+import gtPlusPlus.core.material.Material;
+
+public class BaseItemFoil extends BaseItemComponent{
+
+ public BaseItemFoil(final Material material) {
+ super(material, BaseItemComponent.ComponentTypes.FOIL);
+ }
+}