aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2023-04-20 21:06:46 +0200
committerMartin Robertz <dream-master@gmx.net>2023-04-20 21:06:46 +0200
commitd871420ccc582edd2f652456db2d9f2e5988031c (patch)
treeaab95c5cf01883c8cb524711819c43ba9de64984
parentc7edae3460915e0a3b9173d9cf4b188f1b0a91a7 (diff)
downloadGT5-Unofficial-d871420ccc582edd2f652456db2d9f2e5988031c.tar.gz
GT5-Unofficial-d871420ccc582edd2f652456db2d9f2e5988031c.tar.bz2
GT5-Unofficial-d871420ccc582edd2f652456db2d9f2e5988031c.zip
update bs+sa+material
Diffstat
-rw-r--r--dependencies.gradle12
-rw-r--r--gradle/wrapper/gradle-wrapper.jarbin61574 -> 61608 bytes
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
-rwxr-xr-xgradlew4
-rw-r--r--src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java24
-rw-r--r--src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java365
-rw-r--r--src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java15
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java5
8 files changed, 212 insertions, 215 deletions
diff --git a/dependencies.gradle b/dependencies.gradle
index fdf2ffd155..45733e0f72 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -2,16 +2,16 @@
dependencies {
shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1')
- api("com.github.GTNewHorizons:GT5-Unofficial:5.09.42.49:dev")
- api('com.github.GTNewHorizons:Yamcl:0.5.84:dev')
- api('com.github.GTNewHorizons:ModularUI:1.0.67:dev')
- implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.0.27:dev')
+ api("com.github.GTNewHorizons:GT5-Unofficial:5.09.42.65-pre:dev")
+ api('com.github.GTNewHorizons:Yamcl:0.5.86:dev')
+ api('com.github.GTNewHorizons:ModularUI:1.1.2:dev')
+ implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.0.29:dev')
compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.23:deobf") {transitive = false}
compileOnly('com.github.GTNewHorizons:OpenModularTurrets:2.2.11-247:dev') {transitive=false}
- compileOnly('com.github.GTNewHorizons:OpenComputers:1.8.0.9-GTNH:dev') {transitive=false}
- compileOnly('com.github.GTNewHorizons:GTplusplus:1.8.35:dev') {transitive=false}
+ compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.1-GTNH:dev') {transitive=false}
+ compileOnly('com.github.GTNewHorizons:GTplusplus:1.8.38-pre:dev') {transitive=false}
compileOnly('curse.maven:cofh-lib-220333:2388748') {transitive=false}
compileOnly('curse.maven:computercraft-67504:2269339') {transitive=false}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cbfa7..ccebba7710 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fc10b601f7..bdc9a83b1e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68d65..79a61d421c 100755
--- a/gradlew
+++ b/gradlew
@@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
- # shellcheck disable=SC3045
+ # shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
@@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
- # shellcheck disable=SC3045
+ # shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java b/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java
index 9cfa1718a6..45bfab496f 100644
--- a/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java
+++ b/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java
@@ -295,7 +295,7 @@ public class Assembler implements Runnable {
GT_Values.RA.addAssemblerRecipe(
new ItemStack[] { getItemContainer("Hatch_Dynamo_UMV").get(1),
GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Quantium, 2),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 2) },
+ GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 2) },
Materials.Silver.getMolten(9216),
CustomItemList.eM_dynamoMulti4_UMV.get(1),
100,
@@ -307,7 +307,7 @@ public class Assembler implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.BlackPlutonium, 2),
GT_OreDictUnificator.get(
OrePrefixes.plate,
- Materials.MagnetohydrodynamicallyConstrainedStarMatter,
+ MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter,
1),
GT_OreDictUnificator.get("plateShirabon", 1L) },
Materials.Silver.getMolten(9216),
@@ -411,7 +411,7 @@ public class Assembler implements Runnable {
new ItemStack[] { getItemContainer("Transformer_UXV_UMV").get(1),
CustomItemList.eM_dynamoMulti4_UMV.get(1),
GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Quantium, 2),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 4) },
+ GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 4) },
Materials.Electrum.getMolten(9216),
CustomItemList.eM_dynamoMulti16_UMV.get(1),
200,
@@ -424,7 +424,7 @@ public class Assembler implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.BlackPlutonium, 2),
GT_OreDictUnificator.get(
OrePrefixes.plate,
- Materials.MagnetohydrodynamicallyConstrainedStarMatter,
+ MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter,
2),
GT_OreDictUnificator.get("plateShirabon", 2L) },
Materials.Electrum.getMolten(9216),
@@ -531,7 +531,7 @@ public class Assembler implements Runnable {
new ItemStack[] { getItemContainer("WetTransformer_UXV_UMV").get(1),
CustomItemList.eM_dynamoMulti16_UMV.get(1),
GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Quantium, 2),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 6) },
+ GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 6) },
Materials.Tungsten.getMolten(9216),
CustomItemList.eM_dynamoMulti64_UMV.get(1),
400,
@@ -544,7 +544,7 @@ public class Assembler implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.BlackPlutonium, 2),
GT_OreDictUnificator.get(
OrePrefixes.plate,
- Materials.MagnetohydrodynamicallyConstrainedStarMatter,
+ MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter,
3),
GT_OreDictUnificator.get("plateShirabon", 3L) },
Materials.Tungsten.getMolten(9216),
@@ -649,7 +649,7 @@ public class Assembler implements Runnable {
GT_Values.RA.addAssemblerRecipe(
new ItemStack[] { getItemContainer("Hatch_Energy_UMV").get(1),
GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Quantium, 2),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 2) },
+ GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 2) },
Materials.Silver.getMolten(9216),
CustomItemList.eM_energyMulti4_UMV.get(1),
100,
@@ -661,7 +661,7 @@ public class Assembler implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.BlackPlutonium, 2),
GT_OreDictUnificator.get(
OrePrefixes.plate,
- Materials.MagnetohydrodynamicallyConstrainedStarMatter,
+ MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter,
1),
GT_OreDictUnificator.get("plateShirabon", 1L) },
Materials.Silver.getMolten(9216),
@@ -768,7 +768,7 @@ public class Assembler implements Runnable {
new ItemStack[] { getItemContainer("Transformer_UXV_UMV").get(1),
CustomItemList.eM_energyMulti4_UMV.get(1),
GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Quantium, 2),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 4) },
+ GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 4) },
Materials.Electrum.getMolten(9216),
CustomItemList.eM_energyMulti16_UMV.get(1),
200,
@@ -781,7 +781,7 @@ public class Assembler implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.BlackPlutonium, 2),
GT_OreDictUnificator.get(
OrePrefixes.plate,
- Materials.MagnetohydrodynamicallyConstrainedStarMatter,
+ MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter,
2),
GT_OreDictUnificator.get("plateShirabon", 2L) },
Materials.Electrum.getMolten(9216),
@@ -891,7 +891,7 @@ public class Assembler implements Runnable {
new ItemStack[] { getItemContainer("WetTransformer_UXV_UMV").get(1),
CustomItemList.eM_energyMulti16_UMV.get(1),
GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Quantium, 2),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 6) },
+ GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 6) },
Materials.Tungsten.getMolten(9216),
CustomItemList.eM_energyMulti64_UMV.get(1),
400,
@@ -904,7 +904,7 @@ public class Assembler implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.BlackPlutonium, 2),
GT_OreDictUnificator.get(
OrePrefixes.plate,
- Materials.MagnetohydrodynamicallyConstrainedStarMatter,
+ MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter,
3),
GT_OreDictUnificator.get("plateShirabon", 3L) },
Materials.Tungsten.getMolten(9216),
diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java
index e5e1f54780..477f816a8f 100644
--- a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java
+++ b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java
@@ -27,6 +27,7 @@ import static gregtech.api.enums.Mods.TinkerConstruct;
import static gregtech.api.enums.Mods.TinkersGregworks;
import static gregtech.api.util.GT_ModHandler.getModItem;
+import gregtech.api.enums.*;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
@@ -38,12 +39,6 @@ import vexatos.tgregworks.util.TGregUtils;
import com.github.technus.tectech.recipe.TT_recipeAdder;
import com.github.technus.tectech.thing.CustomItemList;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.MaterialsBotania;
-import gregtech.api.enums.MaterialsKevlar;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.TierEU;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.material.ALLOY;
@@ -138,8 +133,8 @@ public class ResearchStationAssemblyLine implements Runnable {
128_000_000,
1,
new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L },
- GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SpaceTime, 8),
- GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 8),
+ GT_OreDictUnificator.get(OrePrefixes.wireGt02, MaterialsUEVplus.SpaceTime, 8),
+ GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 8),
getModItem(EternalSingularity.ID, "eternal_singularity", 1L),
getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0),
getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0),
@@ -692,7 +687,7 @@ public class ResearchStationAssemblyLine implements Runnable {
ItemList.Circuit_Parts_ResistorXSMD.get(64L), ItemList.Circuit_Chip_QPIC.get(64L),
GT_OreDictUnificator.get("foilShirabon", 64),
GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Indium, 64),
- GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SpaceTime, 8),
+ GT_OreDictUnificator.get(OrePrefixes.wireGt01, MaterialsUEVplus.SpaceTime, 8),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Lanthanum, 16) },
new FluidStack[] { new FluidStack(solderUEV, 3744), Materials.UUMatter.getFluid(24000L),
Materials.Osmium.getMolten(2304L) },
@@ -710,17 +705,17 @@ public class ResearchStationAssemblyLine implements Runnable {
new Object[] { CustomItemList.eM_energyTunnel7_UV.get(32),
new Object[] { OrePrefixes.circuit.get(Materials.Piko), 32L },
ItemList.Electric_Pump_UIV.get(16),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 64),
+ GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.TranscendentMetal, 64),
- GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.TranscendentMetal, 16),
- GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TranscendentMetal, 64),
- GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TranscendentMetal, 64),
+ GT_OreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.TranscendentMetal, 16),
+ GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.TranscendentMetal, 64),
+ GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.TranscendentMetal, 64),
ItemList.EnergisedTesseract.get(32),
ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L),
ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), },
- new FluidStack[] { Materials.ExcitedDTCC.getFluid(2_048_000), Materials.ExcitedDTPC.getFluid(2_048_000),
- Materials.ExcitedDTRC.getFluid(2_048_000), Materials.ExcitedDTEC.getFluid(2_048_000), },
+ new FluidStack[] { MaterialsUEVplus.ExcitedDTCC.getFluid(2_048_000), MaterialsUEVplus.ExcitedDTPC.getFluid(2_048_000),
+ MaterialsUEVplus.ExcitedDTRC.getFluid(2_048_000), MaterialsUEVplus.ExcitedDTEC.getFluid(2_048_000), },
ItemList.Machine_Multi_TranscendentPlasmaMixer.get(1),
36_000,
32_000_000);
@@ -733,7 +728,7 @@ public class ResearchStationAssemblyLine implements Runnable {
// Stargate shield foil
TT_recipeAdder.addResearchableAssemblylineRecipe(
GT_OreDictUnificator
- .get(OrePrefixes.plate, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 1L),
+ .get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 1L),
(int) TierEU.RECIPE_MAX,
32768,
(int) TierEU.RECIPE_UXV,
@@ -742,20 +737,20 @@ public class ResearchStationAssemblyLine implements Runnable {
CustomItemList.StabilisationFieldGeneratorTier8.get(64),
GT_OreDictUnificator.get("blockShirabon", 64L),
GT_OreDictUnificator.get("blockShirabon", 64L),
- GT_OreDictUnificator.get(OrePrefixes.block, Materials.SpaceTime, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.block, MaterialsUEVplus.SpaceTime, 64L),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Quantum, 16L),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 8L),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Universium, 8L),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 8L),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.Universium, 8L),
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 8L),
GT_OreDictUnificator.get("plateDenseShirabon", 8L), ItemList.Sensor_UXV.get(16L),
ItemList.Emitter_UXV.get(16L),
getModItem(EternalSingularity.ID, "eternal_singularity", 16L),
- Materials.Universium.getNanite(16), Materials.BlackDwarfMatter.getNanite(16),
- Materials.WhiteDwarfMatter.getNanite(16) },
+ MaterialsUEVplus.Universium.getNanite(16), MaterialsUEVplus.BlackDwarfMatter.getNanite(16),
+ MaterialsUEVplus.WhiteDwarfMatter.getNanite(16) },
new FluidStack[] { Materials.Neutronium.getMolten(32_768_000L),
- Materials.SpaceTime.getMolten(4 * 36864L),
+ MaterialsUEVplus.SpaceTime.getMolten(4 * 36864L),
Materials.SuperconductorUMVBase.getMolten(4 * 36864L),
- Materials.ExcitedDTEC.getFluid(4 * 36864L) },
+ MaterialsUEVplus.ExcitedDTEC.getFluid(4 * 36864L) },
getItemContainer("StargateShieldingFoil").get(1L),
baseStargateTime,
(int) TierEU.RECIPE_UMV);
@@ -767,15 +762,15 @@ public class ResearchStationAssemblyLine implements Runnable {
32_768,
(int) TierEU.RECIPE_UXV,
64,
- new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.block, Materials.TranscendentMetal, 64L),
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.block, MaterialsUEVplus.TranscendentMetal, 64L),
GT_OreDictUnificator.get("blockShirabon", 64),
CustomItemList.EOH_Reinforced_Spatial_Casing.get(64),
CustomItemList.EOH_Reinforced_Spatial_Casing.get(64),
- GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 16L),
+ GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 16L),
GT_OreDictUnificator.get(
OrePrefixes.frameGt,
- Materials.MagnetohydrodynamicallyConstrainedStarMatter,
+ MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter,
16L),
GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Ruby, 16L),
GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Jasper, 16L),
@@ -784,7 +779,7 @@ public class ResearchStationAssemblyLine implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Sapphire, 16L),
GT_OreDictUnificator.get(
OrePrefixes.plateDense,
- Materials.MagnetohydrodynamicallyConstrainedStarMatter,
+ MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter,
8L),
GT_OreDictUnificator.get("plateDenseShirabon", 8),
@@ -792,25 +787,25 @@ public class ResearchStationAssemblyLine implements Runnable {
ItemList.Field_Generator_UXV.get(16L),
getItemContainer("QuantumCircuit").get(1L).splitStack(32) },
new FluidStack[] { Materials.Neutronium.getMolten(32_768_000L),
- Materials.SpaceTime.getMolten(4 * 36864L),
- Materials.MagnetohydrodynamicallyConstrainedStarMatter.getMolten(36864L),
- Materials.ExcitedDTEC.getFluid(4 * 36864L) },
+ MaterialsUEVplus.SpaceTime.getMolten(4 * 36864L),
+ MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter.getMolten(36864L),
+ MaterialsUEVplus.ExcitedDTEC.getFluid(4 * 36864L) },
getItemContainer("StargateChevron").get(1L),
baseStargateTime,
(int) TierEU.RECIPE_UMV);
// Stargate Frame Part
TT_recipeAdder.addResearchableAssemblylineRecipe(
- GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 1L),
+ GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1L),
(int) TierEU.RECIPE_MAX,
32_768,
500_000_000,
64,
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 64L),
- GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SpaceTime, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.SpaceTime, 64L),
GT_OreDictUnificator.get(
OrePrefixes.stickLong,
- Materials.MagnetohydrodynamicallyConstrainedStarMatter,
+ MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter,
64L),
GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 64L),
@@ -825,12 +820,12 @@ public class ResearchStationAssemblyLine implements Runnable {
getModItem(GTPlusPlus.ID, "itemRodLongAstralTitanium", 64L),
GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SuperconductorUMVBase, 64L),
- GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Universium, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.Universium, 64L),
getModItem(GTPlusPlus.ID, "itemRodLongAbyssalAlloy", 64L),
- GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TranscendentMetal, 64L), },
+ GT_OreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.TranscendentMetal, 64L), },
new FluidStack[] { Materials.Neutronium.getMolten(32_768_000L),
- Materials.SpaceTime.getMolten(4 * 36864L), Materials.Universium.getMolten(4 * 36864L),
- Materials.ExcitedDTEC.getFluid(4 * 36864L) },
+ MaterialsUEVplus.SpaceTime.getMolten(4 * 36864L), MaterialsUEVplus.Universium.getMolten(4 * 36864L),
+ MaterialsUEVplus.ExcitedDTEC.getFluid(4 * 36864L) },
getItemContainer("StargateFramePart").get(1L),
baseStargateTime,
(int) TierEU.RECIPE_UMV);
@@ -995,7 +990,7 @@ public class ResearchStationAssemblyLine implements Runnable {
ItemList.Circuit_Parts_DiodeXSMD.get(32L), ItemList.Circuit_Parts_CapacitorXSMD.get(32L),
ItemList.Circuit_Parts_ResistorXSMD.get(32L),
ItemList.Circuit_Parts_TransistorXSMD.get(32L),
- new Object[] { OrePrefixes.wireGt01.get(Materials.SpaceTime), 12L } },
+ new Object[] { OrePrefixes.wireGt01.get(MaterialsUEVplus.SpaceTime), 12L } },
new FluidStack[] { new FluidStack(solderUEV, 1440) },
ItemList.Energy_Cluster.get(1),
50 * 20,
@@ -1042,10 +1037,10 @@ public class ResearchStationAssemblyLine implements Runnable {
ItemList.Circuit_Parts_DiodeXSMD.get(64L), ItemList.Circuit_Parts_CapacitorXSMD.get(64L),
ItemList.Circuit_Parts_ResistorXSMD.get(64L),
ItemList.Circuit_Parts_TransistorXSMD.get(64L),
- new Object[] { OrePrefixes.bolt.get(Materials.MagnetohydrodynamicallyConstrainedStarMatter),
+ new Object[] { OrePrefixes.bolt.get(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter),
4L } },
- new FluidStack[] { new FluidStack(solderUEV, 2880), Materials.WhiteDwarfMatter.getMolten(576),
- Materials.BlackDwarfMatter.getMolten(576) },
+ new FluidStack[] { new FluidStack(solderUEV, 2880), MaterialsUEVplus.WhiteDwarfMatter.getMolten(576),
+ MaterialsUEVplus.BlackDwarfMatter.getMolten(576) },
ItemList.ZPM2.get(1),
50 * 20,
(int) TierEU.RECIPE_UEV);
@@ -1355,9 +1350,9 @@ public class ResearchStationAssemblyLine implements Runnable {
64,
new Object[] { getModItem(DraconicEvolution.ID, "awakenedCore", 8, 0),
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 4L),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 1L),
+ GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 1L),
new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 }, },
- new FluidStack[] { Materials.SpaceTime.getMolten(14400L), Materials.Void.getMolten(230400L), },
+ new FluidStack[] { MaterialsUEVplus.SpaceTime.getMolten(14400L), Materials.Void.getMolten(230400L), },
getModItem(ElectroMagicTools.ID, "EMTItems", 1, 19),
36000,
32_000_000);
@@ -1848,9 +1843,9 @@ public class ResearchStationAssemblyLine implements Runnable {
research_eu_per_tick,
research_amperage,
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SamariumMagnetic, 16L),
- GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TranscendentMetal, 16L),
- GT_OreDictUnificator.get(OrePrefixes.ring, Materials.TranscendentMetal, 8L),
- GT_OreDictUnificator.get(OrePrefixes.round, Materials.TranscendentMetal, 32L),
+ GT_OreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.TranscendentMetal, 16L),
+ GT_OreDictUnificator.get(OrePrefixes.ring, MaterialsUEVplus.TranscendentMetal, 8L),
+ GT_OreDictUnificator.get(OrePrefixes.round, MaterialsUEVplus.TranscendentMetal, 32L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L),
@@ -1877,10 +1872,10 @@ public class ResearchStationAssemblyLine implements Runnable {
research_amperage,
new Object[] { ItemList.Electric_Motor_UIV.get(1L),
GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.DraconiumAwakened, 2L),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 4L),
- GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TranscendentMetal, 16L),
+ GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.TranscendentMetal, 4L),
+ GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.TranscendentMetal, 16L),
new Object[] { OrePrefixes.ring.get(Materials.AnySyntheticRubber), 64L },
- GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TranscendentMetal, 4L),
+ GT_OreDictUnificator.get(OrePrefixes.rotor, MaterialsUEVplus.TranscendentMetal, 4L),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 2L) },
new FluidStack[] { fluid_0, fluid_1, fluid_2 },
ItemList.Electric_Pump_UIV.get(1),
@@ -1898,9 +1893,9 @@ public class ResearchStationAssemblyLine implements Runnable {
research_eu_per_tick,
research_amperage,
new Object[] { ItemList.Electric_Motor_UIV.get(2L),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 2L),
- GT_OreDictUnificator.get(OrePrefixes.ring, Materials.TranscendentMetal, 8L),
- GT_OreDictUnificator.get(OrePrefixes.round, Materials.TranscendentMetal, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.TranscendentMetal, 2L),
+ GT_OreDictUnificator.get(OrePrefixes.ring, MaterialsUEVplus.TranscendentMetal, 8L),
+ GT_OreDictUnificator.get(OrePrefixes.round, MaterialsUEVplus.TranscendentMetal, 64L),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 2L),
new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 64L },
new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 16L } },
@@ -1919,9 +1914,9 @@ public class ResearchStationAssemblyLine implements Runnable {
comp_per_second,
research_eu_per_tick,
research_amperage,
- new Object[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TranscendentMetal, 8L),
- GT_OreDictUnificator.get(OrePrefixes.gear, Materials.TranscendentMetal, 2L),
- GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TranscendentMetal, 6L),
+ new Object[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.TranscendentMetal, 8L),
+ GT_OreDictUnificator.get(OrePrefixes.gear, MaterialsUEVplus.TranscendentMetal, 2L),
+ GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.TranscendentMetal, 6L),
ItemList.Electric_Motor_UIV.get(2L), ItemList.Electric_Piston_UIV.get(1L),
new Object[] { OrePrefixes.circuit.get(Materials.Optical), 2L },
new Object[] { OrePrefixes.circuit.get(Materials.Bio), 4L },
@@ -1943,12 +1938,12 @@ public class ResearchStationAssemblyLine implements Runnable {
research_eu_per_tick,
research_amperage,
new ItemStack[] { ItemList.Electric_Motor_UIV.get(1L),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 6L),
- GT_OreDictUnificator.get(OrePrefixes.ring, Materials.TranscendentMetal, 8L),
- GT_OreDictUnificator.get(OrePrefixes.round, Materials.TranscendentMetal, 64L),
- GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TranscendentMetal, 8L),
- GT_OreDictUnificator.get(OrePrefixes.gear, Materials.TranscendentMetal, 2L),
- GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TranscendentMetal, 4L),
+ GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.TranscendentMetal, 6L),
+ GT_OreDictUnificator.get(OrePrefixes.ring, MaterialsUEVplus.TranscendentMetal, 8L),
+ GT_OreDictUnificator.get(OrePrefixes.round, MaterialsUEVplus.TranscendentMetal, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.stick, MaterialsUEVplus.TranscendentMetal, 8L),
+ GT_OreDictUnificator.get(OrePrefixes.gear, MaterialsUEVplus.TranscendentMetal, 2L),
+ GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.TranscendentMetal, 4L),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 4L) },
new FluidStack[] { fluid_0, fluid_1, fluid_2 },
ItemList.Electric_Piston_UIV.get(1),
@@ -1965,9 +1960,9 @@ public class ResearchStationAssemblyLine implements Runnable {
comp_per_second,
research_eu_per_tick,
research_amperage,
- new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 1L),
+ new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 1L),
ItemList.Electric_Motor_UIV.get(1L),
- GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TranscendentMetal, 16L),
+ GT_OreDictUnificator.get(OrePrefixes.stick, MaterialsUEVplus.TranscendentMetal, 16L),
ItemList.Gravistar.get(32L), new Object[] { OrePrefixes.circuit.get(Materials.Optical), 4L },
getModItem(GTPlusPlus.ID, "itemFoilArceusAlloy2B", 64, 0),
getModItem(GTPlusPlus.ID, "itemFoilLafiumCompound", 64, 0),
@@ -1989,9 +1984,9 @@ public class ResearchStationAssemblyLine implements Runnable {
comp_per_second,
research_eu_per_tick,
research_amperage,
- new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 1L),
+ new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 1L),
ItemList.Electric_Motor_UIV.get(1),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 8L),
+ GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.TranscendentMetal, 8L),
ItemList.Gravistar.get(32), new Object[] { OrePrefixes.circuit.get(Materials.Optical), 4L },
getModItem(GTPlusPlus.ID, "itemFoilArceusAlloy2B", 64, 0),
getModItem(GTPlusPlus.ID, "itemFoilLafiumCompound", 64, 0),
@@ -2013,8 +2008,8 @@ public class ResearchStationAssemblyLine implements Runnable {
comp_per_second,
research_eu_per_tick,
research_amperage,
- new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 1L),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 6L),
+ new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 1L),
+ GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.TranscendentMetal, 6L),
ItemList.Gravistar.get(16L), ItemList.Emitter_UIV.get(4L),
new Object[] { OrePrefixes.circuit.get(Materials.Piko), 4 },
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L),
@@ -2071,9 +2066,9 @@ public class ResearchStationAssemblyLine implements Runnable {
research_eu_per_tick,
research_amperage,
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SamariumMagnetic, 32L),
- GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SpaceTime, 16L),
- GT_OreDictUnificator.get(OrePrefixes.ring, Materials.SpaceTime, 8L),
- GT_OreDictUnificator.get(OrePrefixes.round, Materials.SpaceTime, 32L),
+ GT_OreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.SpaceTime, 16L),
+ GT_OreDictUnificator.get(OrePrefixes.ring, MaterialsUEVplus.SpaceTime, 8L),
+ GT_OreDictUnificator.get(OrePrefixes.round, MaterialsUEVplus.SpaceTime, 32L),
getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0),
getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0),
getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0),
@@ -2100,10 +2095,10 @@ public class ResearchStationAssemblyLine implements Runnable {
research_amperage,
new Object[] { ItemList.Electric_Motor_UMV.get(1L),
GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Infinity, 2L),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 4L),
- GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 16L),
+ GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 4L),
+ GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 16L),
new Object[] { OrePrefixes.ring.get(Materials.AnySyntheticRubber), 64L },
- GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.SpaceTime, 4L),
+ GT_OreDictUnificator.get(OrePrefixes.rotor, MaterialsUEVplus.SpaceTime, 4L),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 2L) },
new FluidStack[] { fluid_0, fluid_1, fluid_2, fluid_3 },
ItemList.Electric_Pump_UMV.get(1),
@@ -2121,9 +2116,9 @@ public class ResearchStationAssemblyLine implements Runnable {
research_eu_per_tick,
research_amperage,
new Object[] { ItemList.Electric_Motor_UMV.get(2L),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 2L),
- GT_OreDictUnificator.get(OrePrefixes.ring, Materials.SpaceTime, 8L),
- GT_OreDictUnificator.get(OrePrefixes.round, Materials.SpaceTime, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 2L),
+ GT_OreDictUnificator.get(OrePrefixes.ring, MaterialsUEVplus.SpaceTime, 8L),
+ GT_OreDictUnificator.get(OrePrefixes.round, MaterialsUEVplus.SpaceTime, 64L),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 2L),
new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 64L },
new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 16L } },
@@ -2142,9 +2137,9 @@ public class ResearchStationAssemblyLine implements Runnable {
comp_per_second,
research_eu_per_tick,
research_amperage,
- new Object[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SpaceTime, 8L),
- GT_OreDictUnificator.get(OrePrefixes.gear, Materials.SpaceTime, 2L),
- GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.SpaceTime, 6L),
+ new Object[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.SpaceTime, 8L),
+ GT_OreDictUnificator.get(OrePrefixes.gear, MaterialsUEVplus.SpaceTime, 2L),
+ GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.SpaceTime, 6L),
ItemList.Electric_Motor_UMV.get(2L), ItemList.Electric_Piston_UMV.get(1L),
new Object[] { OrePrefixes.circuit.get(Materials.Piko), 2L },
new Object[] { OrePrefixes.circuit.get(Materials.Optical), 4L },
@@ -2166,12 +2161,12 @@ public class ResearchStationAssemblyLine implements Runnable {
research_eu_per_tick,
research_amperage,
new ItemStack[] { ItemList.Electric_Motor_UMV.get(1L),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 6L),
- GT_OreDictUnificator.get(OrePrefixes.ring, Materials.SpaceTime, 8L),
- GT_OreDictUnificator.get(OrePrefixes.round, Materials.SpaceTime, 64L),
- GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SpaceTime, 8L),
- GT_OreDictUnificator.get(OrePrefixes.gear, Materials.SpaceTime, 2L),
- GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.SpaceTime, 4L),
+ GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 6L),
+ GT_OreDictUnificator.get(OrePrefixes.ring, MaterialsUEVplus.SpaceTime, 8L),
+ GT_OreDictUnificator.get(OrePrefixes.round, MaterialsUEVplus.SpaceTime, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.stick, MaterialsUEVplus.SpaceTime, 8L),
+ GT_OreDictUnificator.get(OrePrefixes.gear, MaterialsUEVplus.SpaceTime, 2L),
+ GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.SpaceTime, 4L),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 4L) },
new FluidStack[] { fluid_0, fluid_1, fluid_2, fluid_3 },
ItemList.Electric_Piston_UMV.get(1),
@@ -2188,9 +2183,9 @@ public class ResearchStationAssemblyLine implements Runnable {
comp_per_second,
research_eu_per_tick,
research_amperage,
- new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 1L),
+ new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1L),
ItemList.Electric_Motor_UMV.get(1L),
- GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SpaceTime, 16L),
+ GT_OreDictUnificator.get(OrePrefixes.stick, MaterialsUEVplus.SpaceTime, 16L),
ItemList.Gravistar.get(64), new Object[] { OrePrefixes.circuit.get(Materials.Piko), 4L },
getModItem(GTPlusPlus.ID, "itemFoilCelestialTungsten", 64, 0),
getModItem(GTPlusPlus.ID, "itemFoilQuantum", 64, 0),
@@ -2212,9 +2207,9 @@ public class ResearchStationAssemblyLine implements Runnable {
comp_per_second,
research_eu_per_tick,
research_amperage,
- new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 1L),
+ new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1L),
ItemList.Electric_Motor_UMV.get(1),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 8L),
+ GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 8L),
ItemList.Gravistar.get(64), new Object[] { OrePrefixes.circuit.get(Materials.Piko), 4L },
getModItem(GTPlusPlus.ID, "itemFoilCelestialTungsten", 64, 0),
getModItem(GTPlusPlus.ID, "itemFoilQuantum", 64, 0),
@@ -2236,8 +2231,8 @@ public class ResearchStationAssemblyLine implements Runnable {
comp_per_second,
research_eu_per_tick,
research_amperage,
- new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 1L),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 6L),
+ new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1L),
+ GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 6L),
ItemList.Gravistar.get(32L), ItemList.Emitter_UMV.get(4L),
new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 4 },
getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0),
@@ -2268,9 +2263,9 @@ public class ResearchStationAssemblyLine implements Runnable {
? FluidRegistry.getFluid("molten.mutatedlivingsolder")
: FluidRegistry.getFluid("molten.solderingalloy");
- FluidStack moltenMHDCSM_576 = Materials.MagnetohydrodynamicallyConstrainedStarMatter.getMolten(576);
- FluidStack moltenSpaceTime_576 = Materials.SpaceTime.getMolten(576);
- FluidStack moltenUniversium_576 = Materials.Universium.getMolten(576);
+ FluidStack moltenMHDCSM_576 = MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter.getMolten(576);
+ FluidStack moltenSpaceTime_576 = MaterialsUEVplus.SpaceTime.getMolten(576);
+ FluidStack moltenUniversium_576 = MaterialsUEVplus.Universium.getMolten(576);
FluidStack lubricantFluid_8000 = Materials.Lubricant.getFluid(8000);
FluidStack solderingAlloy_14_400 = new FluidStack(mutatedLivingSolder, 14_400);
@@ -2293,27 +2288,27 @@ public class ResearchStationAssemblyLine implements Runnable {
researchEuPerTick,
researchAmperage,
new ItemStack[] { ItemList.EnergisedTesseract.get(1), GT_OreDictUnificator
- .get(OrePrefixes.stickLong, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 16L),
+ .get(OrePrefixes.stickLong, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 16L),
GT_OreDictUnificator
- .get(OrePrefixes.ring, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 8L),
+ .get(OrePrefixes.ring, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 8L),
GT_OreDictUnificator
- .get(OrePrefixes.round, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 32L),
+ .get(OrePrefixes.round, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 32L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.SuperconductorUMVBase, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.SuperconductorUMVBase, 64L),
GT_OreDictUnificator
- .get(OrePrefixes.wireFine, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 64L),
+ .get(OrePrefixes.wireFine, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 64L),
GT_OreDictUnificator
- .get(OrePrefixes.wireFine, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 64L),
+ .get(OrePrefixes.wireFine, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 64L),
- GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Universium, 64L),
- GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Universium, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.wireFine, MaterialsUEVplus.Universium, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.wireFine, MaterialsUEVplus.Universium, 64L),
GT_OreDictUnificator.get("wireFineShirabon", 64L),
GT_OreDictUnificator.get("wireFineShirabon", 64L),
- GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SpaceTime, 2L),
+ GT_OreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 2L),
GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 2L),
Materials.Neutronium.getNanite(4) },
new FluidStack[] { moltenMHDCSM_576, moltenSpaceTime_576, moltenUniversium_576, lubricantFluid_8000 },
@@ -2332,17 +2327,17 @@ public class ResearchStationAssemblyLine implements Runnable {
researchEuPerTick,
researchAmperage,
new Object[] { ItemList.Electric_Motor_UXV.get(1L),
- GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.SpaceTime, 2L),
+ GT_OreDictUnificator.get(OrePrefixes.pipeLarge, MaterialsUEVplus.SpaceTime, 2L),
GT_OreDictUnificator
- .get(OrePrefixes.plate, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 4L),
+ .get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 4L),
GT_OreDictUnificator
- .get(OrePrefixes.screw, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 16L),
+ .get(OrePrefixes.screw, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 16L),
GT_OreDictUnificator.get(OrePrefixes.ring, MaterialsKevlar.Kevlar, 64L),
GT_OreDictUnificator.get("ringRadoxPoly", 64L),
GT_OreDictUnificator
- .get(OrePrefixes.rotor, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 4L),
+ .get(OrePrefixes.rotor, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 4L),
GT_OreDictUnificator.get("rotorShirabon", 4),
- GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SpaceTime, 2L),
+ GT_OreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 2L),
GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 2L),
Materials.Neutronium.getNanite(4) },
new FluidStack[] { moltenMHDCSM_576, moltenSpaceTime_576, moltenUniversium_576, lubricantFluid_8000 },
@@ -2362,12 +2357,12 @@ public class ResearchStationAssemblyLine implements Runnable {
researchAmperage,
new Object[] { ItemList.Electric_Motor_UXV.get(2L),
GT_OreDictUnificator
- .get(OrePrefixes.plate, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 2L),
+ .get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 2L),
GT_OreDictUnificator
- .get(OrePrefixes.ring, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 8L),
+ .get(OrePrefixes.ring, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 8L),
GT_OreDictUnificator
- .get(OrePrefixes.round, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 64L),
- GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SpaceTime, 2L),
+ .get(OrePrefixes.round, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 2L),
GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 2L),
MaterialsKevlar.Kevlar.getPlates(64), MaterialsKevlar.Kevlar.getPlates(16),
GT_OreDictUnificator.get("plateRadoxPoly", 64L),
@@ -2389,20 +2384,20 @@ public class ResearchStationAssemblyLine implements Runnable {
researchAmperage,
new Object[] {
GT_OreDictUnificator
- .get(OrePrefixes.stickLong, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 8L),
+ .get(OrePrefixes.stickLong, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 8L),
GT_OreDictUnificator
- .get(OrePrefixes.gear, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 2L),
+ .get(OrePrefixes.gear, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 2L),
GT_OreDictUnificator.get("gearGtShirabon", 2L),
GT_OreDictUnificator.get(
OrePrefixes.gearGtSmall,
- Materials.MagnetohydrodynamicallyConstrainedStarMatter,
+ MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter,
6L),
GT_OreDictUnificator.get("gearGtSmallShirabon", 6L), ItemList.Electric_Motor_UXV.get(2L),
ItemList.Electric_Piston_UXV.get(1L),
new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 2L },
new Object[] { OrePrefixes.circuit.get(Materials.Piko), 4L },
new Object[] { OrePrefixes.circuit.get(Materials.Optical), 8L },
- GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SpaceTime, 6L),
+ GT_OreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 6L),
GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 6L),
Materials.Neutronium.getNanite(8) },
new FluidStack[] { moltenMHDCSM_576, moltenSpaceTime_576, moltenUniversium_576, lubricantFluid_8000 },
@@ -2422,22 +2417,22 @@ public class ResearchStationAssemblyLine implements Runnable {
researchAmperage,
new ItemStack[] { ItemList.Electric_Motor_UXV.get(1L),
GT_OreDictUnificator
- .get(OrePrefixes.plate, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 6L),
+ .get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 6L),
GT_OreDictUnificator
- .get(OrePrefixes.ring, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 8L),
+ .get(OrePrefixes.ring, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 8L),
GT_OreDictUnificator
- .get(OrePrefixes.round, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 64L),
+ .get(OrePrefixes.round, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 64L),
GT_OreDictUnificator
- .get(OrePrefixes.stick, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 8L),
+ .get(OrePrefixes.stick, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 8L),
GT_OreDictUnificator
- .get(OrePrefixes.gear, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 2L),
+ .get(OrePrefixes.gear, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 2L),
GT_OreDictUnificator.get("gearGtShirabon", 2L),
GT_OreDictUnificator.get(
OrePrefixes.gearGtSmall,
- Materials.MagnetohydrodynamicallyConstrainedStarMatter,
+ MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter,
4L),
GT_OreDictUnificator.get("gearGtSmallShirabon", 4L),
- GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SpaceTime, 4L),
+ GT_OreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 4L),
GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 4L),
Materials.Neutronium.getNanite(4) },
new FluidStack[] { moltenMHDCSM_576, moltenSpaceTime_576, moltenUniversium_576, lubricantFluid_8000 },
@@ -2457,17 +2452,17 @@ public class ResearchStationAssemblyLine implements Runnable {
researchAmperage,
new Object[] {
GT_OreDictUnificator
- .get(OrePrefixes.frameGt, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 1L),
+ .get(OrePrefixes.frameGt, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 1L),
ItemList.Electric_Motor_UXV.get(1L),
GT_OreDictUnificator
- .get(OrePrefixes.stick, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 16L),
+ .get(OrePrefixes.stick, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 16L),
ItemList.NuclearStar.get(16), new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 4L },
GT_OreDictUnificator
- .get(OrePrefixes.foil, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 64),
+ .get(OrePrefixes.foil, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 64),
GT_OreDictUnificator.get("foilShirabon", 64),
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.SpaceTime, 64),
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Universium, 64),
- GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SpaceTime, 7L),
+ GT_OreDictUnificator.get(OrePrefixes.foil, MaterialsUEVplus.SpaceTime, 64),
+ GT_OreDictUnificator.get(OrePrefixes.foil, MaterialsUEVplus.Universium, 64),
+ GT_OreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 7L),
GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 7L),
Materials.Neutronium.getNanite(8)
@@ -2489,17 +2484,17 @@ public class ResearchStationAssemblyLine implements Runnable {
researchAmperage,
new Object[] {
GT_OreDictUnificator
- .get(OrePrefixes.frameGt, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 1L),
+ .get(OrePrefixes.frameGt, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 1L),
ItemList.Electric_Motor_UXV.get(1L),
GT_OreDictUnificator
- .get(OrePrefixes.plate, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 8L),
+ .get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 8L),
ItemList.NuclearStar.get(16), new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 4L },
GT_OreDictUnificator
- .get(OrePrefixes.foil, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 64),
+ .get(OrePrefixes.foil, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 64),
GT_OreDictUnificator.get("foilShirabon", 64),
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.SpaceTime, 64),
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Universium, 64),
- GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SpaceTime, 7L),
+ GT_OreDictUnificator.get(OrePrefixes.foil, MaterialsUEVplus.SpaceTime, 64),
+ GT_OreDictUnificator.get(OrePrefixes.foil, MaterialsUEVplus.Universium, 64),
+ GT_OreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 7L),
GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 7L),
Materials.Neutronium.getNanite(8) },
new FluidStack[] { moltenMHDCSM_576, moltenSpaceTime_576, moltenUniversium_576, solderingAlloy_14_400 },
@@ -2519,24 +2514,24 @@ public class ResearchStationAssemblyLine implements Runnable {
researchAmperage,
new Object[] {
GT_OreDictUnificator
- .get(OrePrefixes.frameGt, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 1L),
+ .get(OrePrefixes.frameGt, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 1L),
GT_OreDictUnificator
- .get(OrePrefixes.plate, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 6L),
+ .get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 6L),
ItemList.NuclearStar.get(64L), ItemList.Emitter_UXV.get(4L),
new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 8 },
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.SuperconductorUMVBase, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.SuperconductorUMVBase, 64L),
GT_OreDictUnificator
- .get(OrePrefixes.wireFine, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 64L),
+ .get(OrePrefixes.wireFine, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 64L),
GT_OreDictUnificator
- .get(OrePrefixes.wireFine, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 64L),
- GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Universium, 64L),
- GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Universium, 64L),
+ .get(OrePrefixes.wireFine, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.wireFine, MaterialsUEVplus.Universium, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.wireFine, MaterialsUEVplus.Universium, 64L),
GT_OreDictUnificator.get("wireFineShirabon", 64L),
GT_OreDictUnificator.get("wireFineShirabon", 64L),
- GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SpaceTime, 8L),
+ GT_OreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 8L),
GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 8L),
Materials.Neutronium.getNanite(12) },
new FluidStack[] { moltenMHDCSM_576, moltenSpaceTime_576, moltenUniversium_576, solderingAlloy_14_400 },
@@ -2558,23 +2553,23 @@ public class ResearchStationAssemblyLine implements Runnable {
? TGregUtils.newItemStack(Materials.get("Shirabon"), PartTypes.LargePlate, 1)
: GT_OreDictUnificator.get("plateDenseShirabon", 1);
- final FluidStack[] specialFluid = new FluidStack[] { Materials.SpaceTime.getMolten(1_440),
- Materials.SpaceTime.getMolten(1_440), Materials.SpaceTime.getMolten(1_440),
- Materials.SpaceTime.getMolten(1_440), Materials.SpaceTime.getMolten(1_440),
- Materials.SpaceTime.getMolten(1_440), Materials.SpaceTime.getMolten(1_440),
- Materials.SpaceTime.getMolten(1_440), Materials.SpaceTime.getMolten(1_440) };
+ final FluidStack[] specialFluid = new FluidStack[] { MaterialsUEVplus.SpaceTime.getMolten(1_440),
+ MaterialsUEVplus.SpaceTime.getMolten(1_440), MaterialsUEVplus.SpaceTime.getMolten(1_440),
+ MaterialsUEVplus.SpaceTime.getMolten(1_440), MaterialsUEVplus.SpaceTime.getMolten(1_440),
+ MaterialsUEVplus.SpaceTime.getMolten(1_440), MaterialsUEVplus.SpaceTime.getMolten(1_440),
+ MaterialsUEVplus.SpaceTime.getMolten(1_440), MaterialsUEVplus.SpaceTime.getMolten(1_440) };
final ItemStack[] plateList = new ItemStack[] {
// Dense Shirabon plate.
GT_OreDictUnificator.get("boltShirabon", 2),
- GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.WhiteDwarfMatter, 2),
- GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.WhiteDwarfMatter, 8),
- GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.WhiteDwarfMatter, 32),
- GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.BlackDwarfMatter, 2),
- GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.BlackDwarfMatter, 8),
- GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.BlackDwarfMatter, 32),
- GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 2),
- GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 8) };
+ GT_OreDictUnificator.get(OrePrefixes.bolt, MaterialsUEVplus.WhiteDwarfMatter, 2),
+ GT_OreDictUnificator.get(OrePrefixes.bolt, MaterialsUEVplus.WhiteDwarfMatter, 8),
+ GT_OreDictUnificator.get(OrePrefixes.bolt, MaterialsUEVplus.WhiteDwarfMatter, 32),
+ GT_OreDictUnificator.get(OrePrefixes.bolt, MaterialsUEVplus.BlackDwarfMatter, 2),
+ GT_OreDictUnificator.get(OrePrefixes.bolt, MaterialsUEVplus.BlackDwarfMatter, 8),
+ GT_OreDictUnificator.get(OrePrefixes.bolt, MaterialsUEVplus.BlackDwarfMatter, 32),
+ GT_OreDictUnificator.get(OrePrefixes.bolt, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 2),
+ GT_OreDictUnificator.get(OrePrefixes.bolt, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 8) };
// EOH Controller Recipe.
{
@@ -2602,7 +2597,7 @@ public class ResearchStationAssemblyLine implements Runnable {
ItemList.Field_Generator_UMV.get(16), ItemList.Robot_Arm_UMV.get(16), ItemList.ZPM4.get(4),
GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 64) },
- new FluidStack[] { Materials.Time.getMolten(144_000), Materials.Space.getMolten(144_000),
+ new FluidStack[] { MaterialsUEVplus.Time.getMolten(144_000), MaterialsUEVplus.Space.getMolten(144_000),
FluidUtils.getFluidStack("molten.metastable oganesson", 144 * 256 * 4),
FluidUtils.getFluidStack("molten.shirabon", 144 * 256 * 4), },
CustomItemList.Machine_Multi_EyeOfHarmony.get(1),
@@ -2644,7 +2639,7 @@ public class ResearchStationAssemblyLine implements Runnable {
new FluidStack[] { Materials.Neutronium.getMolten(144 * 256 * 4),
Materials.CosmicNeutronium.getMolten(144 * 256 * 4),
- new FluidStack(solderUEV, 144 * 256 * 2), Materials.Space.getMolten(1_440) },
+ new FluidStack(solderUEV, 144 * 256 * 2), MaterialsUEVplus.Space.getMolten(1_440) },
CustomItemList.EOH_Reinforced_Spatial_Casing.get(4),
10_000,
(int) TierEU.RECIPE_UMV);
@@ -2697,7 +2692,7 @@ public class ResearchStationAssemblyLine implements Runnable {
getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.5", tier, 8), ME_Singularity,
plateList[absoluteTier], getItemContainer("QuantumCircuit").get(set) },
new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))),
- Materials.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier] },
+ MaterialsUEVplus.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier] },
CustomItemList.SpacetimeCompressionFieldGeneratorTier0.get(1),
(absoluteTier + 1) * 4_000 * 20,
(int) TierEU.RECIPE_UMV);
@@ -2721,7 +2716,7 @@ public class ResearchStationAssemblyLine implements Runnable {
getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.5", tier, 8), ME_Singularity,
ME_Singularity, plateList[absoluteTier], getItemContainer("QuantumCircuit").get(set) },
new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))),
- Materials.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier] },
+ MaterialsUEVplus.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier] },
CustomItemList.SpacetimeCompressionFieldGeneratorTier1.get(1),
(absoluteTier + 1) * 4_000 * 20,
(int) TierEU.RECIPE_UMV);
@@ -2746,7 +2741,7 @@ public class ResearchStationAssemblyLine implements Runnable {
ME_Singularity, ME_Singularity, plateList[absoluteTier],
getItemContainer("QuantumCircuit").get(set) },
new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))),
- Materials.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], },
+ MaterialsUEVplus.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], },
CustomItemList.SpacetimeCompressionFieldGeneratorTier2.get(1),
(absoluteTier + 1) * 4_000 * 20,
(int) TierEU.RECIPE_UMV);
@@ -2774,7 +2769,7 @@ public class ResearchStationAssemblyLine implements Runnable {
ME_Singularity, ME_Singularity, ME_Singularity, plateList[absoluteTier],
getItemContainer("QuantumCircuit").get(set) },
new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))),
- Materials.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], },
+ MaterialsUEVplus.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], },
CustomItemList.SpacetimeCompressionFieldGeneratorTier3.get(1),
(absoluteTier + 1) * 4_000 * 20,
(int) TierEU.RECIPE_UMV);
@@ -2799,7 +2794,7 @@ public class ResearchStationAssemblyLine implements Runnable {
ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, plateList[absoluteTier],
getItemContainer("QuantumCircuit").get(set) },
new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))),
- Materials.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], },
+ MaterialsUEVplus.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], },
CustomItemList.SpacetimeCompressionFieldGeneratorTier4.get(1),
(absoluteTier + 1) * 4_000 * 20,
(int) TierEU.RECIPE_UMV);
@@ -2824,7 +2819,7 @@ public class ResearchStationAssemblyLine implements Runnable {
ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity,
plateList[absoluteTier], getItemContainer("QuantumCircuit").get(set) },
new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))),
- Materials.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], },
+ MaterialsUEVplus.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], },
CustomItemList.SpacetimeCompressionFieldGeneratorTier5.get(1),
(absoluteTier + 1) * 4_000 * 20,
(int) TierEU.RECIPE_UMV);
@@ -2852,7 +2847,7 @@ public class ResearchStationAssemblyLine implements Runnable {
ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity,
ME_Singularity, plateList[absoluteTier], getItemContainer("QuantumCircuit").get(set) },
new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))),
- Materials.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], },
+ MaterialsUEVplus.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], },
CustomItemList.SpacetimeCompressionFieldGeneratorTier6.get(1),
(absoluteTier + 1) * 4_000 * 20,
(int) TierEU.RECIPE_UMV);
@@ -2878,7 +2873,7 @@ public class ResearchStationAssemblyLine implements Runnable {
ME_Singularity, ME_Singularity, plateList[absoluteTier],
getItemContainer("QuantumCircuit").get(set) },
new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))),
- Materials.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], },
+ MaterialsUEVplus.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], },
CustomItemList.SpacetimeCompressionFieldGeneratorTier7.get(1),
(absoluteTier + 1) * 4_000 * 20,
(int) TierEU.RECIPE_UMV);
@@ -2904,7 +2899,7 @@ public class ResearchStationAssemblyLine implements Runnable {
ME_Singularity, ME_Singularity, ME_Singularity, plateList[absoluteTier],
getItemContainer("QuantumCircuit").get(set) },
new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))),
- Materials.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], },
+ MaterialsUEVplus.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], },
CustomItemList.SpacetimeCompressionFieldGeneratorTier8.get(1),
(absoluteTier + 1) * 4_000 * 20,
(int) TierEU.RECIPE_UMV);
@@ -2990,7 +2985,7 @@ public class ResearchStationAssemblyLine implements Runnable {
},
new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))),
- Materials.Time.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier] },
+ MaterialsUEVplus.Time.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier] },
researchStuff[absoluteTier + 1],
(absoluteTier + 1) * 4_000 * 20,
(int) TierEU.RECIPE_UMV);
@@ -3075,14 +3070,14 @@ public class ResearchStationAssemblyLine implements Runnable {
plateList[absoluteTier],
getItemContainer("QuantumCircuit").get(2 * (absoluteTier + 1)),
- GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.SpaceTime, absoluteTier + 1),
- GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.SpaceTime, absoluteTier + 1)
+ GT_OreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.SpaceTime, absoluteTier + 1),
+ GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.SpaceTime, absoluteTier + 1)
},
new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))),
- Materials.Time.getMolten(1_440 * (absoluteTier + 1)),
- Materials.Space.getMolten(1_440 * (absoluteTier + 1)),
+ MaterialsUEVplus.Time.getMolten(1_440 * (absoluteTier + 1)),
+ MaterialsUEVplus.Space.getMolten(1_440 * (absoluteTier + 1)),
specialFluid[absoluteTier] },
researchStuff[absoluteTier + 1],
(absoluteTier + 1) * 4_000 * 20,
@@ -3127,7 +3122,7 @@ public class ResearchStationAssemblyLine implements Runnable {
new FluidStack[] { Materials.Neutronium.getMolten(144 * 256 * 4),
Materials.CosmicNeutronium.getMolten(144 * 256 * 4),
- new FluidStack(solderUEV, 144 * 256 * 2), Materials.Time.getMolten(1_440) },
+ new FluidStack(solderUEV, 144 * 256 * 2), MaterialsUEVplus.Time.getMolten(1_440) },
CustomItemList.EOH_Reinforced_Temporal_Casing.get(4),
10_000,
(int) TierEU.RECIPE_UMV);
@@ -3167,7 +3162,7 @@ public class ResearchStationAssemblyLine implements Runnable {
new FluidStack[] { Materials.Neutronium.getMolten(144 * 256 * 16),
Materials.CosmicNeutronium.getMolten(144 * 256 * 16),
- new FluidStack(solderUEV, 144 * 256 * 8), Materials.SpaceTime.getMolten(16_000) },
+ new FluidStack(solderUEV, 144 * 256 * 8), MaterialsUEVplus.SpaceTime.getMolten(16_000) },
CustomItemList.EOH_Infinite_Energy_Casing.get(1),
10_000,
(int) TierEU.RECIPE_UMV);
@@ -3296,10 +3291,10 @@ public class ResearchStationAssemblyLine implements Runnable {
new Object[] { energyHatches[i], getModItem(GoodGenerator.ID, "compactFusionCoil", 1),
ItemList.Casing_Coil_Superconductor.get(1), CustomItemList.Machine_Multi_Transformer.get(1),
CustomItemList.eM_Power.get(2),
- GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SpaceTime, 2),
+ GT_OreDictUnificator.get(OrePrefixes.wireGt01, MaterialsUEVplus.SpaceTime, 2),
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 1),
circuitsTierPlusTwo[i], ItemList.EnergisedTesseract.get(1) },
- new FluidStack[] { new FluidStack(solderUEV, 1296), Materials.ExcitedDTEC.getFluid(500L) },
+ new FluidStack[] { new FluidStack(solderUEV, 1296), MaterialsUEVplus.ExcitedDTEC.getFluid(500L) },
wirelessHatches[i],
recipeDurationTicks,
recipeEuPerTick);
@@ -3318,10 +3313,10 @@ public class ResearchStationAssemblyLine implements Runnable {
new Object[] { energyHatches_4A[i], getModItem(GoodGenerator.ID, "compactFusionCoil", 1, 1),
ItemList.Casing_Coil_Superconductor.get(1), CustomItemList.Machine_Multi_Transformer.get(1),
CustomItemList.eM_Power.get(4),
- GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SpaceTime, 4),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.WhiteDwarfMatter, 1),
+ GT_OreDictUnificator.get(OrePrefixes.wireGt01, MaterialsUEVplus.SpaceTime, 4),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.WhiteDwarfMatter, 1),
circuitsTierPlusTwo[i + 4], ItemList.EnergisedTesseract.get(1) },
- new FluidStack[] { new FluidStack(solderUEV, 1_296 * 4), Materials.ExcitedDTEC.getFluid(500L * 4) },
+ new FluidStack[] { new FluidStack(solderUEV, 1_296 * 4), MaterialsUEVplus.ExcitedDTEC.getFluid(500L * 4) },
wirelessHatches_4A[i],
recipeDurationTicks,
recipeEuPerTick);
@@ -3340,11 +3335,11 @@ public class ResearchStationAssemblyLine implements Runnable {
new Object[] { energyHatches_16A[i], getModItem(GoodGenerator.ID, "compactFusionCoil", 1, 2),
ItemList.Casing_Coil_Superconductor.get(1), CustomItemList.Machine_Multi_Transformer.get(1),
CustomItemList.eM_Power.get(16),
- GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SpaceTime, 16),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.BlackDwarfMatter, 1),
+ GT_OreDictUnificator.get(OrePrefixes.wireGt01, MaterialsUEVplus.SpaceTime, 16),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.BlackDwarfMatter, 1),
circuitsTierPlusTwo[i + 4], ItemList.EnergisedTesseract.get(1) },
new FluidStack[] { new FluidStack(solderUEV, 1_296 * 16),
- Materials.ExcitedDTEC.getFluid(500L * 16) },
+ MaterialsUEVplus.ExcitedDTEC.getFluid(500L * 16) },
wirelessHatches_16A[i],
recipeDurationTicks,
recipeEuPerTick);
@@ -3363,11 +3358,11 @@ public class ResearchStationAssemblyLine implements Runnable {
new Object[] { energyHatches_64A[i], getModItem(GoodGenerator.ID, "compactFusionCoil", 1, 3),
ItemList.Casing_Coil_Superconductor.get(1), CustomItemList.Machine_Multi_Transformer.get(1),
CustomItemList.eM_Power.get(64),
- GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SpaceTime, 64),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Universium, 1),
+ GT_OreDictUnificator.get(OrePrefixes.wireGt01, MaterialsUEVplus.SpaceTime, 64),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.Universium, 1),
circuitsTierPlusTwo[i + 4], ItemList.EnergisedTesseract.get(1) },
new FluidStack[] { new FluidStack(solderUEV, 1_296 * 64),
- Materials.ExcitedDTEC.getFluid(500L * 64) },
+ MaterialsUEVplus.ExcitedDTEC.getFluid(500L * 64) },
wirelessHatches_64A[i],
recipeDurationTicks,
recipeEuPerTick);
@@ -3386,10 +3381,10 @@ public class ResearchStationAssemblyLine implements Runnable {
new Object[] { dynamoHatches[i], getModItem(GoodGenerator.ID, "compactFusionCoil", 1),
ItemList.Casing_Coil_Superconductor.get(1), CustomItemList.Machine_Multi_Transformer.get(1),
CustomItemList.eM_Power.get(2),
- GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SpaceTime, 2),
+ GT_OreDictUnificator.get(OrePrefixes.wireGt01, MaterialsUEVplus.SpaceTime, 2),
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 1),
circuitsTierPlusTwo[i], ItemList.EnergisedTesseract.get(1) },
- new FluidStack[] { new FluidStack(solderUEV, 1296), Materials.ExcitedDTEC.getFluid(500L) },
+ new FluidStack[] { new FluidStack(solderUEV, 1296), MaterialsUEVplus.ExcitedDTEC.getFluid(500L) },
wirelessDynamos[i],
recipeDurationTicks,
recipeEuPerTick);
diff --git a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java
index 3e8e591574..45857a7d78 100644
--- a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java
+++ b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java
@@ -16,6 +16,7 @@ import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import gregtech.api.enums.MaterialsUEVplus;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
@@ -37,12 +38,12 @@ import gregtech.api.util.GT_OreDictUnificator;
@SuppressWarnings("SpellCheckingInspection")
public class EyeOfHarmonyRecipe {
- static final FluidStack[] SPECIAL_FLUIDS = new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(1152),
- Materials.WhiteDwarfMatter.getMolten(1152), Materials.WhiteDwarfMatter.getMolten(4_608),
- Materials.WhiteDwarfMatter.getMolten(18_432), Materials.BlackDwarfMatter.getMolten(1152),
- Materials.BlackDwarfMatter.getMolten(4_608), Materials.BlackDwarfMatter.getMolten(18_432),
- Materials.Universium.getMolten(1152), Materials.Universium.getMolten(4_608),
- Materials.Universium.getMolten(18_432) };
+ static final FluidStack[] SPECIAL_FLUIDS = new FluidStack[] { MaterialsUEVplus.WhiteDwarfMatter.getMolten(1152),
+ MaterialsUEVplus.WhiteDwarfMatter.getMolten(1152), MaterialsUEVplus.WhiteDwarfMatter.getMolten(4_608),
+ MaterialsUEVplus.WhiteDwarfMatter.getMolten(18_432), MaterialsUEVplus.BlackDwarfMatter.getMolten(1152),
+ MaterialsUEVplus.BlackDwarfMatter.getMolten(4_608), MaterialsUEVplus.BlackDwarfMatter.getMolten(18_432),
+ MaterialsUEVplus.Universium.getMolten(1152), MaterialsUEVplus.Universium.getMolten(4_608),
+ MaterialsUEVplus.Universium.getMolten(18_432) };
HashingStrategy<ItemStack> itemStackHashingStrategy = new HashingStrategy<>() {
@@ -154,7 +155,7 @@ public class EyeOfHarmonyRecipe {
}
// Add a bonus fluid of compressed star matter.
- fluidStackArrayList.add(Materials.RawStarMatter.getFluid((this.spacetimeCasingTierRequired + 1) * 100_000));
+ fluidStackArrayList.add(MaterialsUEVplus.RawStarMatter.getFluid((this.spacetimeCasingTierRequired + 1) * 100_000));
// Tier 0 & 1 - 576 White
// Tier 2 - 2304 White
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java
index c87e21483e..3d310ff70d 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java
@@ -34,6 +34,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import gregtech.api.enums.MaterialsUEVplus;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -963,7 +964,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl
+ ")^(Recipe tier)"
+ GRAY
+ "L of molten")
- .addInfo(Materials.SpaceTime.getLocalizedNameForItem("%material") + " and return half the start EU.")
+ .addInfo(MaterialsUEVplus.SpaceTime.getLocalizedNameForItem("%material") + " and return half the start EU.")
.addInfo(TOOLTIP_BAR).addInfo("Animations can be disabled by using a screwdriver on the multiblock.")
.addSeparator().addStructureInfo("Eye of Harmony structure is too complex! See schematic for details.")
.addStructureInfo(
@@ -1217,7 +1218,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl
private void outputFailedChance() {
// 2^Tier spacetime released upon recipe failure.
- mOutputFluids = new FluidStack[] { Materials.SpaceTime.getMolten(
+ mOutputFluids = new FluidStack[] { MaterialsUEVplus.SpaceTime.getMolten(
(long) (successChance * MOLTEN_SPACETIME_PER_FAILURE_TIER
* pow(SPACETIME_FAILURE_BASE, currentRecipe.getRocketTier() + 1))) };
super.outputAfterRecipe_EM();
generated by cgit (git 2.46.0) at 2025-03-09 20:18:25 +0000