aboutsummaryrefslogtreecommitdiff
path: root/src/Java/miscutil/core/xmod
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-07-22 17:38:02 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-07-22 17:38:02 +1000
commitb5e8f29c2e954f1f03357cd75ad86b08e23d19fb (patch)
tree75c2ffbb04d324bb9fc342b8afe37bdb8560e385 /src/Java/miscutil/core/xmod
parent3334e0f53753abe42d7810b703602039ee6f3b59 (diff)
downloadGT5-Unofficial-b5e8f29c2e954f1f03357cd75ad86b08e23d19fb.tar.gz
GT5-Unofficial-b5e8f29c2e954f1f03357cd75ad86b08e23d19fb.tar.bz2
GT5-Unofficial-b5e8f29c2e954f1f03357cd75ad86b08e23d19fb.zip
+ Redid a lot of recipes.
+ Added Recipes for all Multiblocks and Casings, except the Matter Fabricator.
Diffstat (limited to 'src/Java/miscutil/core/xmod')
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java4
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java4
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java14
3 files changed, 17 insertions, 5 deletions
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java
index 8ae25c1ff1..e7b0a2681b 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java
@@ -68,7 +68,7 @@ public enum GregtechItemList implements GregtechItemContainer {
Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM,
//Unused Machine Casings
- Casing_U4, Casing_MatterGen, Casing_MatterFab, Casing_U7,
+ Casing_MacerationStack, Casing_MatterGen, Casing_MatterFab, Casing_U7,
//Unused Machine Coils
Casing_Coil_U1, Casing_Coil_U2, Casing_Coil_U3, Casing_Coil_U4,
@@ -82,7 +82,7 @@ public enum GregtechItemList implements GregtechItemContainer {
Casing_Electrolyzer, Industrial_Electrolyzer,
//Industrial Maceration Stack
- Casing_Macerator, Industrial_MacerationStack,
+ Casing_WireFactory, Industrial_MacerationStack,
//Industrial Wire Factory
Industrial_WireFactory,
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java b/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
index 36a541c7eb..aa786f44f6 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
@@ -46,8 +46,8 @@ extends GregtechMetaCasingBlocksAbstract {
GregtechItemList.Casing_CokeOven_Coil2.set(new ItemStack(this, 1, 3));
GregtechItemList.Casing_MaterialPress.set(new ItemStack(this, 1, 4));
GregtechItemList.Casing_Electrolyzer.set(new ItemStack(this, 1, 5));
- GregtechItemList.Casing_Macerator.set(new ItemStack(this, 1, 6));
- GregtechItemList.Casing_U4.set(new ItemStack(this, 1, 7));
+ GregtechItemList.Casing_WireFactory.set(new ItemStack(this, 1, 6));
+ GregtechItemList.Casing_MacerationStack.set(new ItemStack(this, 1, 7));
GregtechItemList.Casing_MatterGen.set(new ItemStack(this, 1, 8));
GregtechItemList.Casing_MatterFab.set(new ItemStack(this, 1, 9));
GregtechItemList.Casing_IronPlatedBricks.set(new ItemStack(this, 1, 10));
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index 6f68c3fa27..14f0cc2213 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -139,8 +139,20 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
//Batteries
- GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 50, "Dual Cell Sodium Battery", "Reusable", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L)}));
+ GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 50, "Quad Cell Sodium Battery", "Reusable", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2L)}));
+ setElectricStats(32000 + tLastID, 3200000L, GT_Values.V[2], 4L, -3L, true);
+
+ GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 51, "Quad Cell Cadmium Battery", "Reusable", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L)}));
+ setElectricStats(32000 + tLastID, 480000L, GT_Values.V[2], 4L, -3L, true);
+
+ GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 52, "Quad Cell Lithium Battery", "Reusable", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 3L)}));
+ setElectricStats(32000 + tLastID, 6400000L, GT_Values.V[2], 4L, -3L, true);
+
+ /*GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 50, "Quad Cell Acid Battery", "Reusable", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L)}));
setElectricStats(32000 + tLastID, 5000000L, GT_Values.V[2], 4L, -3L, true);
+
+ GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 50, "Quad Cell Mercury Battery", "Reusable", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L)}));
+ setElectricStats(32000 + tLastID, 5000000L, GT_Values.V[2], 4L, -3L, true);*/