aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2017-07-11 19:55:30 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2017-07-11 19:55:30 +1000
commit120069c619cac42e57dff3c8b0bff1310dc1006e (patch)
tree11a419164155371d80b581a5ed81e9e69c496144 /src/Java/gtPlusPlus
parent126d7be58b0c60715b0528c0b7914880215b3ea8 (diff)
downloadGT5-Unofficial-120069c619cac42e57dff3c8b0bff1310dc1006e.tar.gz
GT5-Unofficial-120069c619cac42e57dff3c8b0bff1310dc1006e.tar.bz2
GT5-Unofficial-120069c619cac42e57dff3c8b0bff1310dc1006e.zip
+ Added a config option for old circuits.
+ Hide all new circuits and components if enabled.
Diffstat (limited to 'src/Java/gtPlusPlus')
-rw-r--r--src/Java/gtPlusPlus/GTplusplus.java2
-rw-r--r--src/Java/gtPlusPlus/core/lib/CORE.java1
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java8
3 files changed, 8 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index 6a2e32860e..ab4bc21bba 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -68,6 +68,8 @@ public class GTplusplus implements ActionListener {
//Circuits
CORE.configSwitches.enableCustomCircuits = config.getBoolean("enableCustomCircuits", "gregtech", true,
"Adds custom circuits to expand past the Master Tier.");
+ CORE.configSwitches.enableOldGTcircuits = config.getBoolean("enableOldGTcircuits", "gregtech", true,
+ "Restores circuits and their recipes from Pre-5.09.28 times.");
// Tools
CORE.configSwitches.enableSkookumChoochers = config.getBoolean("enableSkookumChoochers", "gregtech", true,
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index e218ca5554..f3ffd3ed61 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -117,6 +117,7 @@ public class CORE {
//Feature Related
public static boolean enableCustomAlvearyBlocks = false;
public static boolean enableCustomCircuits = true;
+ public static boolean enableOldGTcircuits = false;
//Single Block Machines
public static boolean enableMachine_SolarGenerators = false;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index 2b50a7832e..426792c268 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -175,7 +175,9 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
GregtechItemList.Food_Baked_Raisin_Bread.set(this.addItem(tLastID = 60, "Raisin Bread", "Extra Raisins, Just for ImQ009", new Object[]{new GT_FoodStat(5, 0.5F, EnumAction.eat, null, false, true, false, new int[0]), getTcAspectStack(TC_Aspects.CORPUS, 1L), getTcAspectStack(TC_Aspects.FAMES, 1L), getTcAspectStack(TC_Aspects.IGNIS, 1L)}));
//Old Circuits
- registerOldCircuits();
+ if (CORE.configSwitches.enableOldGTcircuits){
+ registerOldCircuits();
+ }
if (!CORE.GTNH) {
GregtechItemList.Fluid_Cell_144L.set(this.addItem(tLastID = 61, "144L Invar Fluid Cell", "Holds exactly one dust worth of liquid.", new Object[]{new ItemData(Materials.Invar, (OrePrefixes.plate.mMaterialAmount * 8L) + (4L * OrePrefixes.ring.mMaterialAmount), new MaterialStack[0]), getTcAspectStack(TC_Aspects.VACUOS, 2L), getTcAspectStack(TC_Aspects.AQUA, 1L)}));
@@ -243,7 +245,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
private boolean registerOldCircuits(){
//Enable Old Circuits
-
+
GregtechItemList.Old_Circuit_Primitive.set(this.addItem(200, "NAND Chip", "A very simple Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Primitive)}));
GregtechItemList.Old_Circuit_Basic.set(this.addItem(201, "Basic Electronic Circuit", "A basic Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Basic)}));
GregtechItemList.Old_Circuit_Good.set(this.addItem(202, "Good Electronic Circuit", "A good Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Good)}));
@@ -275,7 +277,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
new RECIPES_Old_Circuits();
RECIPES_Old_Circuits.addCircuitRecipes();
Utils.LOG_INFO("[Old Feature] Enabling Pre 5.09.28 circuits & recipes.");
-
+
return true;
}
}