aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java9
-rw-r--r--src/main/java/goodgenerator/loader/Loaders.java6
-rw-r--r--src/main/java/goodgenerator/loader/RecipeLoader_02.java407
-rw-r--r--src/main/java/goodgenerator/util/ItemRefer.java4
-rw-r--r--src/main/resources/assets/goodgenerator/lang/en_US.lang12
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/fluidCore/10.pngbin0 -> 1902 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/fluidCore/10.png.mcmeta6
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/fluidCore/7.pngbin0 -> 232 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/fluidCore/8.pngbin0 -> 238 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/fluidCore/9.pngbin0 -> 248 bytes
10 files changed, 352 insertions, 92 deletions
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java b/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java
index 9c4b404fb6..39132cfba9 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java
@@ -139,9 +139,9 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM i
}
private int calGlassTier(int meta) {
- if (meta >= 1 && meta <= 6) return meta;
- if (meta >= 7 && meta <= 12) return 1;
- return 3;
+ if (meta >= 1 && meta <= 6) return meta; // returns correct meta for Tiers 1-6, 7-12 is colour variations of HV
+ if (meta >= 7 && meta <= 12) return 1; // For all the HV Glass colour variations
+ return meta; // returns the rest
}
@Override
@@ -156,6 +156,7 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM i
}
if (cnt > 15 || cnt < 1) return false;
if (!structureCheck_EM(YOTTANK_TOP, 2, cnt + 2, 0)) return false;
+ // maxCell+1 = Tier of highest Cell. maxCell itself just return Tier-1
if (mMaintenanceHatches.size() == 1 && maxCell + 1 <= calGlassTier(glassMeta)) {
if (mStorage.compareTo(mStorageCurrent) < 0) mStorageCurrent = mStorage;
if (FluidRegistry.getFluidStack(mFluidName, 1) == null) {
@@ -184,7 +185,7 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM i
.addElement(
'G',
addTieredBlock(
- ItemRegistry.bw_realglas, YottaFluidTank::setMeta, YottaFluidTank::getMeta, 12))
+ ItemRegistry.bw_realglas, YottaFluidTank::setMeta, YottaFluidTank::getMeta, 14))
.addElement('R', ofChain(cells(10)))
.addElement('F', addFrame(Materials.Steel))
.addElement(
diff --git a/src/main/java/goodgenerator/loader/Loaders.java b/src/main/java/goodgenerator/loader/Loaders.java
index 288c422da2..e2c6a92dbf 100644
--- a/src/main/java/goodgenerator/loader/Loaders.java
+++ b/src/main/java/goodgenerator/loader/Loaders.java
@@ -81,7 +81,11 @@ public class Loaders {
GoodGenerator.MOD_ID + ":fluidCore/3",
GoodGenerator.MOD_ID + ":fluidCore/4",
GoodGenerator.MOD_ID + ":fluidCore/5",
- GoodGenerator.MOD_ID + ":fluidCore/6"
+ GoodGenerator.MOD_ID + ":fluidCore/6",
+ GoodGenerator.MOD_ID + ":fluidCore/7",
+ GoodGenerator.MOD_ID + ":fluidCore/8",
+ GoodGenerator.MOD_ID + ":fluidCore/9",
+ GoodGenerator.MOD_ID + ":fluidCore/10"
});
public static final Item upgradeEssentia = new MyItems("upgradeEssentia", GoodGenerator.GG, new String[] {
GoodGenerator.MOD_ID + ":upgradeEssentia/null",
diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java
index ec2e1a8c0b..8e2e07e24f 100644
--- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java
+++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java
@@ -303,54 +303,6 @@ public class RecipeLoader_02 {
200,
7680);
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- ItemRefer.Fluid_Storage_Core_T2.get(32),
- ItemRefer.Fluid_Storage_Core_T2.get(32),
- GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Iridium, 2),
- GT_Utility.getIntegratedCircuit(10)
- },
- Materials.Polytetrafluoroethylene.getMolten(2304),
- ItemRefer.Fluid_Storage_Core_T3.get(1),
- 800,
- 30720);
-
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- ItemRefer.Fluid_Storage_Core_T3.get(32),
- ItemRefer.Fluid_Storage_Core_T3.get(32),
- GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Osmium, 2),
- GT_Utility.getIntegratedCircuit(10)
- },
- Materials.Polybenzimidazole.getMolten(2304),
- ItemRefer.Fluid_Storage_Core_T4.get(1),
- 3200,
- 491520);
-
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- ItemRefer.Fluid_Storage_Core_T4.get(32),
- ItemRefer.Fluid_Storage_Core_T4.get(32),
- GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 2),
- GT_Utility.getIntegratedCircuit(10)
- },
- Materials.Polybenzimidazole.getMolten(2304),
- ItemRefer.Fluid_Storage_Core_T5.get(1),
- 6400,
- 980290);
-
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- ItemRefer.Fluid_Storage_Core_T5.get(32),
- ItemRefer.Fluid_Storage_Core_T5.get(32),
- GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.DraconiumAwakened, 2),
- GT_Utility.getIntegratedCircuit(10)
- },
- Materials.Polybenzimidazole.getMolten(2304),
- ItemRefer.Fluid_Storage_Core_T6.get(1),
- 12800,
- 1960580);
-
Fluid solderIndalloy = FluidRegistry.getFluid("molten.indalloy140") != null
? FluidRegistry.getFluid("molten.indalloy140")
: FluidRegistry.getFluid("molten.solderingalloy");
@@ -359,38 +311,50 @@ public class RecipeLoader_02 {
ItemRefer.Fluid_Storage_Core_T2.get(1),
20000,
new Object[] {
- ItemList.Super_Tank_IV.get(2L),
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polytetrafluoroethylene, 16),
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polytetrafluoroethylene, 16),
- GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Iridium, 32)
+ GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.StainlessSteel, 4),
+ ItemList.Electric_Pump_HV.get(8),
+ ItemList.Quantum_Tank_LV.get(1),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmium, 8),
+ GT_ModHandler.getModItem("GalacticraftMars", "item.null", 1L, 6),
+ GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polycaprolactam, 16),
+ GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polycaprolactam, 16)
},
new FluidStack[] {new FluidStack(solderIndalloy, 2304), Materials.Lubricant.getFluid(4000)},
ItemRefer.Fluid_Storage_Core_T3.get(1),
- 800,
- 122880);
+ 400,
+ 32000);
GT_Values.RA.addAssemblylineRecipe(
ItemRefer.Fluid_Storage_Core_T3.get(1),
40000,
new Object[] {
- ItemList.Quantum_Tank_MV.get(3L),
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 16),
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 16),
- GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Osmium, 32)
+ GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Titanium, 4),
+ ItemList.Electric_Pump_EV.get(8),
+ ItemList.Quantum_Tank_LV.get(4),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Europium, 12),
+ GT_ModHandler.getModItem("GalacticraftMars", "item.null", 4L, 6),
+ GT_OreDictUnificator.get(OrePrefixes.foil, Materials.StyreneButadieneRubber, 32),
+ GT_OreDictUnificator.get(OrePrefixes.foil, Materials.StyreneButadieneRubber, 32),
+ GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 64)
},
new FluidStack[] {new FluidStack(solderIndalloy, 18432), Materials.Lubricant.getFluid(16000)},
ItemRefer.Fluid_Storage_Core_T4.get(1),
- 3200,
- 1966080);
+ 400,
+ 128000);
GT_Values.RA.addAssemblylineRecipe(
ItemRefer.Fluid_Storage_Core_T4.get(1),
80000,
new Object[] {
- ItemList.Quantum_Tank_EV.get(32L),
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 32),
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 32),
- GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 32),
+ GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.MysteriousCrystal, 4),
+ ItemList.Electric_Pump_IV.get(8),
+ ItemList.Quantum_Tank_HV.get(8),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 12),
+ GT_ModHandler.getModItem("GalacticraftMars", "item.null", 16L, 6),
+ GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Polycaprolactam, 12),
+ GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Polycaprolactam, 12),
+ GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Titanium, 64),
+ GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Titanium, 64)
},
new FluidStack[] {
Materials.Draconium.getMolten(2304),
@@ -398,15 +362,125 @@ public class RecipeLoader_02 {
Materials.Lubricant.getFluid(64000)
},
ItemRefer.Fluid_Storage_Core_T5.get(1),
- 6400,
- 3921160);
+ 400,
+ 520000);
+ GT_Values.RA.addAssemblylineRecipe(
+ ItemRefer.Fluid_Storage_Core_T5.get(1),
+ 160000,
+ new Object[] {
+ GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 4),
+ ItemList.Electric_Pump_LuV.get(8),
+ ItemList.Quantum_Tank_EV.get(16),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 12),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 12),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 32),
+ GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6),
+ ItemList.Machine_IV_Compressor.get(64)
+ },
+ new FluidStack[] {
+ Materials.Draconium.getMolten(2304),
+ Materials.Titanium.getMolten(288),
+ Materials.Lubricant.getFluid(64000)
+ },
+ ItemRefer.Fluid_Storage_Core_T6.get(1),
+ 400,
+ 2090000);
+ GT_Values.RA.addAssemblylineRecipe(
+ ItemRefer.Fluid_Storage_Core_T6.get(1),
+ 320000,
+ new Object[] {
+ GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6),
+ ItemList.Electric_Pump_ZPM.get(8),
+ GT_ModHandler.getModItem("Avaritia", "Neutronium_Compressor", 1L, 0),
+ ItemList.Quantum_Tank_EV.get(32),
+ GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 8),
+ GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.InfinityCatalyst, 8),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 32)
+ },
+ new FluidStack[] {
+ Materials.Draconium.getMolten(23040),
+ new FluidStack(solderIndalloy, 2304),
+ Materials.InfinityCatalyst.getMolten(1140)
+ },
+ ItemRefer.Fluid_Storage_Core_T7.get(1),
+ 400,
+ 8300000);
+ GT_Values.RA.addAssemblylineRecipe(
+ ItemRefer.Fluid_Storage_Core_T7.get(1),
+ 640000,
+ new Object[] {
+ GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6),
+ ItemList.Electric_Pump_UV.get(8),
+ GT_ModHandler.getModItem("Avaritia", "Neutronium_Compressor", 2L, 0),
+ ItemList.Quantum_Tank_EV.get(64),
+ GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 16),
+ GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 12),
+ GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 12),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 32)
+ },
+ new FluidStack[] {
+ Materials.Draconium.getMolten(36864),
+ new FluidStack(solderIndalloy, 30240),
+ Materials.InfinityCatalyst.getMolten(5670)
+ },
+ ItemRefer.Fluid_Storage_Core_T8.get(1),
+ 400,
+ 33554000);
+ GT_Values.RA.addAssemblylineRecipe(
+ ItemRefer.Fluid_Storage_Core_T8.get(1),
+ 12800000,
+ new Object[] {
+ GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6),
+ ItemList.Electric_Pump_UHV.get(8),
+ GT_ModHandler.getModItem("Avaritia", "Neutronium_Compressor", 2L, 0),
+ ItemList.Quantum_Tank_IV.get(8),
+ GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 32),
+ GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 12),
+ GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 12),
+ GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 12),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 32)
+ },
+ new FluidStack[] {
+ Materials.Draconium.getMolten(36864),
+ new FluidStack(solderIndalloy, 30240),
+ Materials.Transcendent.getMolten(1440),
+ Materials.InfinityCatalyst.getMolten(5670)
+ },
+ ItemRefer.Fluid_Storage_Core_T9.get(1),
+ 400,
+ 134217000);
+ GT_Values.RA.addAssemblylineRecipe(
+ ItemRefer.Fluid_Storage_Core_T9.get(1),
+ 25600000,
+ new Object[] {
+ GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6),
+ ItemList.Electric_Pump_UEV.get(8),
+ GT_ModHandler.getModItem("Avaritia", "Neutronium_Compressor", 4L, 0),
+ ItemList.Quantum_Tank_IV.get(16),
+ GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 32),
+ GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.CosmicNeutronium, 12),
+ GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.CosmicNeutronium, 12),
+ GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.SpaceTime, 1),
+ GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.SpaceTime, 1),
+ GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.SpaceTime, 1),
+ GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.SpaceTime, 1)
+ },
+ new FluidStack[] {
+ Materials.Draconium.getMolten(36864),
+ new FluidStack(solderIndalloy, 46080),
+ Materials.Transcendent.getMolten(4320),
+ Materials.InfinityCatalyst.getMolten(17010)
+ },
+ ItemRefer.Fluid_Storage_Core_T10.get(1),
+ 400,
+ 536800000);
GT_Values.RA.addAssemblerRecipe(
new ItemStack[] {
GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1),
ItemRefer.Fluid_Storage_Core_T1.get(10),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 4),
- ItemList.Electric_Pump_HV.get(2),
+ ItemList.Electric_Pump_HV.get(8),
GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 4),
GT_Utility.getIntegratedCircuit(5)
},
@@ -420,13 +494,13 @@ public class RecipeLoader_02 {
GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1),
ItemRefer.Fluid_Storage_Core_T2.get(10),
WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plate, 4),
- ItemList.Electric_Pump_IV.get(2),
+ ItemList.Electric_Pump_IV.get(8),
GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Enderium, 4),
GT_Utility.getIntegratedCircuit(5)
},
Materials.Polytetrafluoroethylene.getMolten(144),
ItemRefer.YOTTank_Cell_T2.get(1),
- 1600,
+ 1000,
7680);
GT_Values.RA.addAssemblylineRecipe(
@@ -438,7 +512,7 @@ public class RecipeLoader_02 {
ItemRefer.Fluid_Storage_Core_T3.get(5),
new Object[] {"circuitUltimate", 4},
new Object[] {"circuitUltimate", 4},
- ItemList.Electric_Pump_ZPM.get(2),
+ ItemList.Electric_Pump_ZPM.get(8),
GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NiobiumTitanium, 4),
GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NiobiumTitanium, 4),
MyMaterial.adamantiumAlloy.get(OrePrefixes.plate, 16),
@@ -450,8 +524,8 @@ public class RecipeLoader_02 {
Materials.Lubricant.getFluid(8000)
},
ItemRefer.YOTTank_Cell_T3.get(1),
- 1600,
- 122880);
+ 1000,
+ 32000);
GT_Values.RA.addAssemblylineRecipe(
ItemRefer.YOTTank_Cell_T3.get(1),
@@ -462,7 +536,7 @@ public class RecipeLoader_02 {
ItemRefer.Fluid_Storage_Core_T4.get(5),
new Object[] {"circuitInfinite", 4},
new Object[] {"circuitInfinite", 4},
- ItemList.Electric_Pump_UHV.get(2),
+ ItemList.Electric_Pump_UHV.get(8),
GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.MysteriousCrystal, 4),
GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.MysteriousCrystal, 4),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ElectrumFlux, 16),
@@ -474,8 +548,8 @@ public class RecipeLoader_02 {
Materials.Lubricant.getFluid(16000)
},
ItemRefer.YOTTank_Cell_T4.get(1),
- 3200,
- 1966080);
+ 1000,
+ 128000);
GT_Values.RA.addAssemblylineRecipe(
ItemRefer.YOTTank_Cell_T4.get(1),
@@ -486,7 +560,7 @@ public class RecipeLoader_02 {
ItemRefer.Fluid_Storage_Core_T5.get(5),
new Object[] {"circuitBio", 4},
new Object[] {"circuitBio", 4},
- ItemList.Electric_Pump_UEV.get(2),
+ ItemList.Electric_Pump_UIV.get(8),
GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.DraconiumAwakened, 4),
GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.DraconiumAwakened, 4),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16),
@@ -500,19 +574,18 @@ public class RecipeLoader_02 {
Materials.Lubricant.getFluid(16000)
},
ItemRefer.YOTTank_Cell_T5.get(1),
- 6400,
- 3921160);
+ 1000,
+ 520000);
GT_Values.RA.addAssemblylineRecipe(
ItemRefer.YOTTank_Cell_T5.get(1),
160000,
new Object[] {
GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1),
- ItemRefer.Fluid_Storage_Core_T6.get(5),
- ItemRefer.Fluid_Storage_Core_T6.get(5),
- ItemList.Field_Generator_UEV.get(4),
- ItemList.Field_Generator_UEV.get(4),
- ItemList.Electric_Pump_UEV.get(16),
+ ItemRefer.Fluid_Storage_Core_T6.get(2),
+ new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 4L},
+ new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 4L},
+ ItemList.Electric_Pump_UMV.get(8),
GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NetherStar, 4),
GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NetherStar, 4),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 16),
@@ -522,12 +595,148 @@ public class RecipeLoader_02 {
},
new FluidStack[] {
Materials.DraconiumAwakened.getMolten(1440),
- FluidRegistry.getFluidStack("ic2coolant", 32000),
+ FluidRegistry.getFluidStack("ic2coolant", 46080),
Materials.Lubricant.getFluid(32000)
},
ItemRefer.YOTTank_Cell_T6.get(1),
- 12800,
- 7842320);
+ 1000,
+ 2090000);
+ GT_Values.RA.addAssemblylineRecipe(
+ ItemRefer.YOTTank_Cell_T6.get(1),
+ 160000,
+ new Object[] {
+ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1),
+ ItemRefer.Fluid_Storage_Core_T7.get(2),
+ new Object[] {OrePrefixes.circuit.get(Materials.Bio), 4L},
+ new Object[] {OrePrefixes.circuit.get(Materials.Bio), 4L},
+ ItemList.Electric_Pump_UMV.get(8),
+ GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NetherStar, 8),
+ GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NetherStar, 8),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 16),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 16),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 16),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 16)
+ },
+ new FluidStack[] {
+ Materials.DraconiumAwakened.getMolten(14400),
+ FluidRegistry.getFluidStack("supercoolant", 46080),
+ Materials.Lubricant.getFluid(46080)
+ },
+ ItemRefer.YOTTank_Cell_T7.get(1),
+ 1000,
+ 8300000);
+ GT_Values.RA.addAssemblylineRecipe(
+ ItemRefer.YOTTank_Cell_T7.get(1),
+ 160000,
+ new Object[] {
+ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1),
+ ItemRefer.Fluid_Storage_Core_T8.get(2),
+ new Object[] {OrePrefixes.circuit.get(Materials.Nano), 4L},
+ new Object[] {OrePrefixes.circuit.get(Materials.Nano), 4L},
+ ItemList.Electric_Pump_UMV.get(8),
+ GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 12),
+ GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12),
+ GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.DraconiumAwakened, 12),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 32),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 32)
+ },
+ new FluidStack[] {
+ Materials.DraconiumAwakened.getMolten(14400),
+ FluidRegistry.getFluidStack("supercoolant", 46080),
+ Materials.Lubricant.getFluid(46080)
+ },
+ ItemRefer.YOTTank_Cell_T8.get(1),
+ 1000,
+ 33554000);
+ GT_Values.RA.addAssemblylineRecipe(
+ ItemRefer.YOTTank_Cell_T8.get(1),
+ 200000,
+ new Object[] {
+ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 2),
+ ItemRefer.Fluid_Storage_Core_T9.get(2),
+ new Object[] {OrePrefixes.circuit.get(Materials.Piko), 4L},
+ new Object[] {OrePrefixes.circuit.get(Materials.Piko), 4L},
+ ItemList.Electric_Pump_UMV.get(8),
+ GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 12),
+ GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12),
+ GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.DraconiumAwakened, 12),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 32),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 32)
+ },
+ new FluidStack[] {
+ Materials.DraconiumAwakened.getMolten(14400),
+ FluidRegistry.getFluidStack("supercoolant", 46080),
+ Materials.Lubricant.getFluid(46080)
+ },
+ ItemRefer.YOTTank_Cell_T9.get(1),
+ 1000,
+ 134217000);
+ GT_Values.RA.addAssemblylineRecipe(
+ ItemRefer.YOTTank_Cell_T9.get(1),
+ 240000,
+ new Object[] {
+ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 2),
+ ItemRefer.Fluid_Storage_Core_T10.get(2),
+ new Object[] {OrePrefixes.circuit.get(Materials.Quantum), 6L},
+ new Object[] {OrePrefixes.circuit.get(Materials.Quantum), 6L},
+ ItemList.Electric_Pump_UMV.get(8),
+ GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 64),
+ GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12),
+ GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.DraconiumAwakened, 12),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 5),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 5)
+ },
+ new FluidStack[] {
+ Materials.DraconiumAwakened.getMolten(14400),
+ Materials.Transcendent.getMolten(1440),
+ FluidRegistry.getFluidStack("supercoolant", 46080),
+ Materials.Lubricant.getFluid(46080)
+ },
+ ItemRefer.YOTTank_Cell_T10.get(1),
+ 1000,
+ 536800000);
+
+ // Craft 2x64X Tier to 1X+1 Tier
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] {
+ ItemRefer.Fluid_Storage_Core_T6.get(64),
+ ItemRefer.Fluid_Storage_Core_T6.get(64),
+ GT_Utility.getIntegratedCircuit(2)
+ },
+ GT_Values.NF,
+ ItemRefer.Fluid_Storage_Core_T7.get(1),
+ 200,
+ 7680);
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] {
+ ItemRefer.Fluid_Storage_Core_T7.get(64),
+ ItemRefer.Fluid_Storage_Core_T7.get(64),
+ GT_Utility.getIntegratedCircuit(2)
+ },
+ GT_Values.NF,
+ ItemRefer.Fluid_Storage_Core_T8.get(1),
+ 200,
+ 7680);
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] {
+ ItemRefer.Fluid_Storage_Core_T8.get(64),
+ ItemRefer.Fluid_Storage_Core_T8.get(64),
+ GT_Utility.getIntegratedCircuit(2)
+ },
+ GT_Values.NF,
+ ItemRefer.Fluid_Storage_Core_T9.get(1),
+ 200,
+ 7680);
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] {
+ ItemRefer.Fluid_Storage_Core_T9.get(64),
+ ItemRefer.Fluid_Storage_Core_T9.get(64),
+ GT_Utility.getIntegratedCircuit(2)
+ },
+ GT_Values.NF,
+ ItemRefer.Fluid_Storage_Core_T10.get(1),
+ 200,
+ 7680);
GT_Values.RA.addUnboxingRecipe(
ItemRefer.YOTTank_Cell_T1.get(1),
@@ -566,10 +775,34 @@ public class RecipeLoader_02 {
GT_Values.RA.addUnboxingRecipe(
ItemRefer.YOTTank_Cell_T6.get(1),
- ItemRefer.Fluid_Storage_Core_T6.get(10),
+ ItemRefer.Fluid_Storage_Core_T6.get(2),
GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1),
100,
480);
+ GT_Values.RA.addUnboxingRecipe(
+ ItemRefer.YOTTank_Cell_T7.get(1),
+ ItemRefer.Fluid_Storage_Core_T7.get(2),
+ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1),
+ 100,
+ 480);
+ GT_Values.RA.addUnboxingRecipe(
+ ItemRefer.YOTTank_Cell_T8.get(1),
+ ItemRefer.Fluid_Storage_Core_T8.get(2),
+ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1),
+ 100,
+ 480);
+ GT_Values.RA.addUnboxingRecipe(
+ ItemRefer.YOTTank_Cell_T9.get(1),
+ ItemRefer.Fluid_Storage_Core_T9.get(2),
+ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1),
+ 100,
+ 480);
+ GT_Values.RA.addUnboxingRecipe(
+ ItemRefer.YOTTank_Cell_T10.get(1),
+ ItemRefer.Fluid_Storage_Core_T10.get(2),
+ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 1),
+ 100,
+ 480);
GT_Values.RA.addAutoclaveRecipe(
WerkstoffLoader.Tiberium.get(OrePrefixes.dust, 1),
diff --git a/src/main/java/goodgenerator/util/ItemRefer.java b/src/main/java/goodgenerator/util/ItemRefer.java
index 86d3e02fdf..3cd1adf25a 100644
--- a/src/main/java/goodgenerator/util/ItemRefer.java
+++ b/src/main/java/goodgenerator/util/ItemRefer.java
@@ -69,6 +69,10 @@ public final class ItemRefer {
public static ItemRefer Fluid_Storage_Core_T4 = getItemStack(fluidCore, 3);
public static ItemRefer Fluid_Storage_Core_T5 = getItemStack(fluidCore, 4);
public static ItemRefer Fluid_Storage_Core_T6 = getItemStack(fluidCore, 5);
+ public static ItemRefer Fluid_Storage_Core_T7 = getItemStack(fluidCore, 6);
+ public static ItemRefer Fluid_Storage_Core_T8 = getItemStack(fluidCore, 7);
+ public static ItemRefer Fluid_Storage_Core_T9 = getItemStack(fluidCore, 8);
+ public static ItemRefer Fluid_Storage_Core_T10 = getItemStack(fluidCore, 9);
public static ItemRefer Essentia_Upgrade_Empty = getItemStack(upgradeEssentia, 0);
public static ItemRefer Essentia_Upgrade_Air = getItemStack(upgradeEssentia, 1);
public static ItemRefer Essentia_Upgrade_Thermal = getItemStack(upgradeEssentia, 2);
diff --git a/src/main/resources/assets/goodgenerator/lang/en_US.lang b/src/main/resources/assets/goodgenerator/lang/en_US.lang
index e5d0b72ca6..87c6fd361c 100644
--- a/src/main/resources/assets/goodgenerator/lang/en_US.lang
+++ b/src/main/resources/assets/goodgenerator/lang/en_US.lang
@@ -100,6 +100,10 @@ item.fluidCore.2.name=Fluid Storage Core T3
item.fluidCore.3.name=Fluid Storage Core T4
item.fluidCore.4.name=Fluid Storage Core T5
item.fluidCore.5.name=Fluid Storage Core T6
+item.fluidCore.6.name=Fluid Storage Core T7
+item.fluidCore.7.name=Fluid Storage Core T8
+item.fluidCore.8.name=Fluid Storage Core T9
+item.fluidCore.9.name=Fluid Storage Core T10
item.upgradeEssentia.0.name=Essentia Generator: Empty
item.upgradeEssentia.1.name=§eEssentia Generator: Air§r
item.upgradeEssentia.2.name=§cEssentia Generator: Thermal§r
@@ -447,6 +451,14 @@ achievement.yottaFluidTankCell.4=Fluid Cell Block T5
achievement.yottaFluidTankCell.4.desc=Pickup this item to see the recipe in NEI
achievement.yottaFluidTankCell.5=Fluid Cell Block T6
achievement.yottaFluidTankCell.5.desc=Pickup this item to see the recipe in NEI
+achievement.yottaFluidTankCell.6=Fluid Cell Block T7
+achievement.yottaFluidTankCell.6.desc=Pickup this item to see the recipe in NEI
+achievement.yottaFluidTankCell.7=Fluid Cell Block T8
+achievement.yottaFluidTankCell.7.desc=Pickup this item to see the recipe in NEI
+achievement.yottaFluidTankCell.8=Fluid Cell Block T9
+achievement.yottaFluidTankCell.8.desc=Pickup this item to see the recipe in NEI
+achievement.yottaFluidTankCell.9=Fluid Cell Block T10
+achievement.yottaFluidTankCell.9.desc=The T10 Core of the YOTTANK. The rainbow comes out.
achievement.gt.blockmachines.largefusioncomputer2=Not Enough Fusions
achievement.gt.blockmachines.largefusioncomputer2.desc=Pickup this item to see the recipe in NEI
achievement.gt.blockmachines.largefusioncomputer3=PROJECT MOISS
diff --git a/src/main/resources/assets/goodgenerator/textures/items/fluidCore/10.png b/src/main/resources/assets/goodgenerator/textures/items/fluidCore/10.png
new file mode 100644
index 0000000000..df9f4945f2
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/fluidCore/10.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/items/fluidCore/10.png.mcmeta b/src/main/resources/assets/goodgenerator/textures/items/fluidCore/10.png.mcmeta
new file mode 100644
index 0000000000..b3b9810f7b
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/fluidCore/10.png.mcmeta
@@ -0,0 +1,6 @@
+{
+ "animation":{
+ "frametime":2
+
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/goodgenerator/textures/items/fluidCore/7.png b/src/main/resources/assets/goodgenerator/textures/items/fluidCore/7.png
new file mode 100644
index 0000000000..db313adf79
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/fluidCore/7.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/items/fluidCore/8.png b/src/main/resources/assets/goodgenerator/textures/items/fluidCore/8.png
new file mode 100644
index 0000000000..fce1d1a02e
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/fluidCore/8.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/items/fluidCore/9.png b/src/main/resources/assets/goodgenerator/textures/items/fluidCore/9.png
new file mode 100644
index 0000000000..9fe3454e55
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/fluidCore/9.png
Binary files differ
generated by cgit (git 2.46.0) at 2025-03-06 21:26:08 +0000