aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMaya <10861407+serenibyss@users.noreply.github.com>2024-09-12 13:01:25 -0500
committerGitHub <noreply@github.com>2024-09-12 20:01:25 +0200
commit544a7b3aa81a0478faa9de670d12af60ed830d89 (patch)
tree55b27e5aba3ea40aab15f635e26fe852b36d3346 /src
parente003cddca9a3ac0a2d7b5a0b7be79f3cf6e03481 (diff)
downloadGT5-Unofficial-544a7b3aa81a0478faa9de670d12af60ed830d89.tar.gz
GT5-Unofficial-544a7b3aa81a0478faa9de670d12af60ed830d89.tar.bz2
GT5-Unofficial-544a7b3aa81a0478faa9de670d12af60ed830d89.zip
2.7 Stargate (#3105)
Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: NotAPenguin <michiel.vandeginste@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java11
-rw-r--r--src/main/java/gregtech/api/enums/MaterialsUEVplus.java16
-rw-r--r--src/main/java/gregtech/api/enums/OrePrefixes.java2
-rw-r--r--src/main/java/gregtech/api/recipe/maps/TranscendentPlasmaMixerFrontend.java6
-rw-r--r--src/main/java/gregtech/api/util/GTRecipeConstants.java3
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTETranscendentPlasmaMixer.java4
-rw-r--r--src/main/java/gregtech/loaders/materials/MaterialsInit1.java6
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/NaniteChain.java18
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java35
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java14
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java2
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java37
-rw-r--r--src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java10
-rw-r--r--src/main/java/tectech/loader/recipe/Assembler.java12
-rw-r--r--src/main/java/tectech/loader/recipe/Godforge.java16
-rw-r--r--src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java229
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluid.sgcrystalslurry.pngbin0 -> 12893 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluid.sgcrystalslurry.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.infinityplasma.pngbin0 -> 4433 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.infinityplasma.png.mcmeta37
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/nanites.pngbin0 -> 231938 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/nanites.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/nanites_OVERLAY.pngbin0 -> 613 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/sgcrystalfluid/cell.pngbin0 -> 3426 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/sgcrystalfluid/cell.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/sgcrystalfluid/cell_OVERLAY.pngbin0 -> 224 bytes
26 files changed, 314 insertions, 155 deletions
diff --git a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java
index 4822ab6067..36a22a928d 100644
--- a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java
+++ b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java
@@ -33,7 +33,6 @@ import net.minecraftforge.fluids.FluidStack;
import bartworks.system.material.WerkstoffLoader;
import cpw.mods.fml.common.registry.GameRegistry;
-import goodgenerator.items.GGMaterial;
import goodgenerator.util.StackUtils;
import gregtech.api.enums.GTValues;
import gregtech.api.enums.ItemList;
@@ -401,7 +400,8 @@ public class ComponentAssemblyLineMiscRecipes {
.get(OrePrefixes.frameGt, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 1),
GTOreDictUnificator
.get(OrePrefixes.plateDense, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 3),
- GGMaterial.shirabon.get(OrePrefixes.plateDense, 3), ComponentType.Robot_Arm.getComponent(t)
+ GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.MagMatter, 3),
+ ComponentType.Robot_Arm.getComponent(t)
.get(8),
ComponentType.Electric_Piston.getComponent(t)
.get(10),
@@ -409,12 +409,11 @@ public class ComponentAssemblyLineMiscRecipes {
.get(16),
GTOreDictUnificator
.get(OrePrefixes.gearGt, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 2),
- GGMaterial.shirabon.get(OrePrefixes.gearGt, 2),
+ GTOreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.MagMatter, 2),
GTOreDictUnificator
.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 8),
- GGMaterial.shirabon.get(OrePrefixes.gearGtSmall, 8),
- GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 4),
- GTOreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 4), getALCircuit(t, 8),
+ GTOreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.MagMatter, 8),
+ GTOreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 8), getALCircuit(t, 8),
getALCircuit(t - 1, 16) },
new FluidStack[] { new FluidStack(sold, 144 * t * 4),
MaterialsUEVplus.BlackDwarfMatter.getMolten(144 * t * 2), MaterialsUEVplus.Eternity.getMolten(144 * t),
diff --git a/src/main/java/gregtech/api/enums/MaterialsUEVplus.java b/src/main/java/gregtech/api/enums/MaterialsUEVplus.java
index 1fc32cd413..7c14ff2f14 100644
--- a/src/main/java/gregtech/api/enums/MaterialsUEVplus.java
+++ b/src/main/java/gregtech/api/enums/MaterialsUEVplus.java
@@ -644,7 +644,7 @@ public class MaterialsUEVplus {
1.0F,
8 * 2621440,
26,
- 1 | 2 | 64 | 128,
+ 1 | 2 | 32 | 64 | 128,
255,
120,
20,
@@ -664,7 +664,8 @@ public class MaterialsUEVplus {
Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ITER, 1)))
.disableAutoGeneratedBlastFurnaceRecipes()
.disableAutoGeneratedVacuumFreezerRecipe()
- .setProcessingMaterialTierEU(TierEU.RECIPE_UEV);
+ .setProcessingMaterialTierEU(TierEU.RECIPE_UEV)
+ .setHasCorrespondingPlasma(true);
public static Materials Mellion = new Materials(
148,
@@ -888,6 +889,17 @@ public class MaterialsUEVplus {
1,
Dyes._NULL);
+ public static Materials StargateCrystalSlurry = new MaterialBuilder(
+ 160,
+ new TextureSet("sgcrystalfluid", true),
+ "Stargate Crystal Slurry").setName("sgcrystalslurry")
+ .addFluid()
+ .addCell()
+ .setRGBA(255, 255, 255, 0)
+ .setTransparent(false)
+ .constructMaterial()
+ .setProcessingMaterialTierEU(TierEU.RECIPE_MAX);
+
/**
* called by Materials. Can be safely called multiple times. exists to allow Materials ensure this class is
* initialized
diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java
index 7af17351b9..003624007f 100644
--- a/src/main/java/gregtech/api/enums/OrePrefixes.java
+++ b/src/main/java/gregtech/api/enums/OrePrefixes.java
@@ -693,7 +693,6 @@ public enum OrePrefixes {
plateTriple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter);
plateQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter);
plateQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter);
- plateSuperdense.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter);
cell.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter);
ingotDouble.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter);
ingotTriple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter);
@@ -860,6 +859,7 @@ public enum OrePrefixes {
nanite.mGeneratedItems.add(Materials.Glowstone);
nanite.mGeneratedItems.add(MaterialsUEVplus.Eternity);
nanite.mGeneratedItems.add(MaterialsUEVplus.SixPhasedCopper);
+ nanite.mGeneratedItems.add(MaterialsUEVplus.MagMatter);
// -----
gear.mGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter);
diff --git a/src/main/java/gregtech/api/recipe/maps/TranscendentPlasmaMixerFrontend.java b/src/main/java/gregtech/api/recipe/maps/TranscendentPlasmaMixerFrontend.java
index 7a4036e7ba..0e8a3e49fa 100644
--- a/src/main/java/gregtech/api/recipe/maps/TranscendentPlasmaMixerFrontend.java
+++ b/src/main/java/gregtech/api/recipe/maps/TranscendentPlasmaMixerFrontend.java
@@ -1,5 +1,6 @@
package gregtech.api.recipe.maps;
+import static gregtech.api.util.GTRecipeConstants.EU_MULTIPLIER;
import static gregtech.api.util.GTUtility.formatNumbers;
import java.util.List;
@@ -44,12 +45,13 @@ public class TranscendentPlasmaMixerFrontend extends RecipeMapFrontend {
protected void drawEnergyInfo(RecipeDisplayInfo recipeInfo) {
// These look odd because recipeInfo.recipe.mEUt is actually the EU per litre of fluid processed, not
// the EU/t.
+ long multiplier = recipeInfo.recipe.getMetadataOrDefault(EU_MULTIPLIER, 10);
recipeInfo.drawText(
GTUtility.trans("152", "Total: ")
- + formatNumbers(1000L * recipeInfo.recipe.mDuration / 100L * recipeInfo.recipe.mEUt)
+ + formatNumbers(multiplier * recipeInfo.recipe.mDuration * recipeInfo.recipe.mEUt)
+ " EU");
// 1000 / (20 ticks * 5 seconds) = 10L/t. 10L/t * x EU/L = 10 * x EU/t.
- long averageUsage = 10L * recipeInfo.recipe.mEUt;
+ long averageUsage = multiplier * recipeInfo.recipe.mEUt;
recipeInfo.drawText(
"Average: " + formatNumbers(averageUsage) + " EU/t" + GTUtility.getTierNameWithParentheses(averageUsage));
}
diff --git a/src/main/java/gregtech/api/util/GTRecipeConstants.java b/src/main/java/gregtech/api/util/GTRecipeConstants.java
index 82a477756a..98be4718a0 100644
--- a/src/main/java/gregtech/api/util/GTRecipeConstants.java
+++ b/src/main/java/gregtech/api/util/GTRecipeConstants.java
@@ -216,6 +216,9 @@ public class GTRecipeConstants {
public static final RecipeMetadataKey<Boolean> NO_GAS = SimpleRecipeMetadataKey.create(Boolean.class, "no_gas");
+ public static final RecipeMetadataKey<Integer> EU_MULTIPLIER = SimpleRecipeMetadataKey
+ .create(Integer.class, "eu_multiplier");
+
/**
* Add a arc furnace recipe. Adds to both normal arc furnace and plasma arc furnace.
* Will override the fluid input with oxygen/plasma for the respective recipe maps, so there is no point setting it.
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTETranscendentPlasmaMixer.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTETranscendentPlasmaMixer.java
index c6fed966ef..292cfe9a78 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/MTETranscendentPlasmaMixer.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTETranscendentPlasmaMixer.java
@@ -69,6 +69,7 @@ import gregtech.api.recipe.check.CheckRecipeResult;
import gregtech.api.recipe.check.CheckRecipeResultRegistry;
import gregtech.api.render.TextureFactory;
import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTRecipeConstants;
import gregtech.api.util.MultiblockTooltipBuilder;
import gregtech.api.util.OverclockCalculator;
@@ -179,7 +180,8 @@ public class MTETranscendentPlasmaMixer extends MTEEnhancedMultiBlockBase<MTETra
@Override
protected CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) {
BigInteger availableEU = getUserEU(ownerUUID);
- recipeEU = BigInteger.valueOf(10L * recipe.mEUt * recipe.mDuration);
+ long multiplier = (long) recipe.getMetadataOrDefault(GTRecipeConstants.EU_MULTIPLIER, 10);
+ recipeEU = BigInteger.valueOf(multiplier * recipe.mEUt * recipe.mDuration);
if (availableEU.compareTo(recipeEU) < 0) {
finalConsumption = BigInteger.ZERO;
return CheckRecipeResultRegistry.insufficientStartupPower(recipeEU);
diff --git a/src/main/java/gregtech/loaders/materials/MaterialsInit1.java b/src/main/java/gregtech/loaders/materials/MaterialsInit1.java
index 7bf3b1937d..66cd413027 100644
--- a/src/main/java/gregtech/loaders/materials/MaterialsInit1.java
+++ b/src/main/java/gregtech/loaders/materials/MaterialsInit1.java
@@ -403,7 +403,7 @@ public class MaterialsInit1 {
Materials.Naquadah = new Materials( 324, TextureSet.SET_METALLIC , 6.0F, 1280, 4, 1|2 |8 |32|64|128 , 50, 50, 50, 0, "Naquadah" , "Naquadah" , 0, 0, 5400, 5400, true, false, 10, 1, 1, Dyes.dyeBlack , Element.Nq, Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 3), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1), new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
Materials.NaquadahAlloy = new Materials( 325, TextureSet.SET_METALLIC , 8.0F, 5120, 5, 1|2 |64|128 , 40, 40, 40, 0, "NaquadahAlloy" , "Naquadah Alloy" , 0, 0, 7200, 7200, true, false, 10, 1, 1, Dyes.dyeBlack , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4), new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
Materials.NaquadahEnriched = new Materials( 326, TextureSet.SET_METALLIC , 6.0F, 1280, 4, 1|2 |8 |64 , 50, 50, 50, 0, "NaquadahEnriched" , "Enriched Naquadah" , 0, 0, 4500, 4500, true, false, 15, 1, 1, Dyes.dyeBlack , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 3), new TCAspects.TC_AspectStack(TCAspects.RADIO, 2), new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 2))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
- Materials.Naquadria = new Materials( 327, TextureSet.SET_SHINY , 1.0F, 512, 4, 1|2 |8 |64 , 30, 30, 30, 0, "Naquadria" , "Naquadria" , 0, 0, 9000, 9000, true, false, 20, 1, 1, Dyes.dyeBlack , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4), new TCAspects.TC_AspectStack(TCAspects.RADIO, 3), new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 3))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
+ Materials.Naquadria = new Materials( 327, TextureSet.SET_SHINY , 1.0F, 512, 4, 1|2 |8 |32|64 , 30, 30, 30, 0, "Naquadria" , "Naquadria" , 0, 0, 9000, 9000, true, false, 20, 1, 1, Dyes.dyeBlack , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4), new TCAspects.TC_AspectStack(TCAspects.RADIO, 3), new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 3))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe().setHasCorrespondingPlasma(true);
Materials.Nether = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 0 , 255, 255, 255, 0, "Nether" , "Nether" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
Materials.NetherBrick = new Materials( 814, TextureSet.SET_DULL , 1.0F, 0, 1, 1 , 100, 0, 0, 0, "NetherBrick" , "Nether Brick" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeRed , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1)));
Materials.NetherQuartz = new Materials( 522, TextureSet.SET_QUARTZ , 1.0F, 32, 1, 1 |4|8 |64 , 230, 210, 210, 0, "NetherQuartz" , "Nether Quartz" , 0, 0, -1, 0, false, false, 2, 1, 1, Dyes.dyeWhite , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 1), new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1)));
@@ -901,8 +901,8 @@ public class MaterialsInit1 {
Materials.AstralSilver = new Materials( 333, TextureSet.SET_SHINY , 10.0F, 64, 2, 1|2 |64 , 230, 230, 255, 0, "AstralSilver" , "Astral Silver" , 0, 0, -1, 0, false, false, 4, 3, 2, Dyes.dyeWhite , 2, Arrays.asList(new MaterialStack(Silver, 2), new MaterialStack(Thaumium, 1)));
Materials.InfinityCatalyst = new Materials( 394, TextureSet.SET_SHINY , 64.0F,1310720, 10, 1|2 |8 |64|128 , 255, 255, 255, 0, "InfinityCatalyst" , "Infinity Catalyst" , 5, 500000, 10800, 10800, true, false, 20, 1, 1, Dyes.dyeLightGray ).setProcessingMaterialTierEU(TierEU.RECIPE_UV).disableAutoGeneratedVacuumFreezerRecipe();
- Materials.Infinity = new Materials( 397, new TextureSet("infinity", true), 256.0F,2621440, 17, 1|2 |64|128 , 255, 255, 255, 0, "Infinity" , "Infinity" , 5, 5000000, 10800, 10800, true, false, 40, 1, 1, Dyes.dyeLightGray ).setProcessingMaterialTierEU(TierEU.RECIPE_UV).disableAutoGeneratedVacuumFreezerRecipe();
- Materials.Bedrockium = new MaterialBuilder(395,TextureSet.SET_DULL, "Bedrockium").addOreItems().addDustItems().addMetalItems().setDurability(327680).setToolSpeed(8f).setToolQuality(9).setRGB(50,50,50).setName("Bedrockium").setBlastFurnaceRequired(true).setBlastFurnaceTemp(9900).setMeltingPoint(9900).setMaterialList(new MaterialStack(Materials.SiliconDioxide, 26244), new MaterialStack(Materials.Diamond, 9)).setColor(Dyes.dyeBlack).setOreValue(4).setDensityDivider(1).setDensityMultiplier(1).constructMaterial().setProcessingMaterialTierEU(TierEU.RECIPE_EV).disableAutoGeneratedVacuumFreezerRecipe();
+ Materials.Infinity = new Materials( 397, new TextureSet("infinity", true), 256.0F,2621440, 17, 1|2|32|64|128 , 255, 255, 255, 0, "Infinity" , "Infinity" , 5, 5000000, 10800, 10800, true, false, 40, 1, 1, Dyes.dyeLightGray ).setProcessingMaterialTierEU(TierEU.RECIPE_UV).disableAutoGeneratedVacuumFreezerRecipe().setHasCorrespondingPlasma(true);
+ Materials.Bedrockium = new MaterialBuilder(395,TextureSet.SET_DULL, "Bedrockium").addOreItems().addDustItems().addPlasma().addMetalItems().setDurability(327680).setToolSpeed(8f).setToolQuality(9).setRGB(50,50,50).setName("Bedrockium").setBlastFurnaceRequired(true).setBlastFurnaceTemp(9900).setMeltingPoint(9900).setMaterialList(new MaterialStack(Materials.SiliconDioxide, 26244), new MaterialStack(Materials.Diamond, 9)).setColor(Dyes.dyeBlack).setOreValue(4).setDensityDivider(1).setDensityMultiplier(1).constructMaterial().setProcessingMaterialTierEU(TierEU.RECIPE_EV).disableAutoGeneratedVacuumFreezerRecipe().setHasCorrespondingPlasma(true);
Materials.Trinium = new Materials( 868, TextureSet.SET_SHINY , 128.0F, 51200, 8, 1|2 |8 |64|128 , 200, 200, 210, 0, "Trinium" , "Trinium" , 0, 0, 7200, 7200, true, false, 4, 1, 1, Dyes.dyeLightGray ).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
Materials.Ichorium = new Materials( 978, TextureSet.SET_SHINY , 32.0F, 850000, 12, 1|2 |8 |32|64|128 , 211, 120, 6, 0, "Ichorium" , "Ichorium" , 5, 250000, 9000, 9000, true, false, 4, 1, 1, Dyes.dyeOrange ).setTurbineMultipliers(6, 6, 3).setHasCorrespondingPlasma(true);
Materials.CosmicNeutronium = new Materials( 982, TextureSet.SET_SHINY , 96.0F, 163840, 12, 1|2 |8 |32|64|128 , 50, 50, 50, 0, "CosmicNeutronium" , "Cosmic Neutronium" , 0, 0, 9900, 9900, true, false, 4, 1, 1, Dyes.dyeBlack ).setProcessingMaterialTierEU(TierEU.RECIPE_ZPM).disableAutoGeneratedVacuumFreezerRecipe().setHasCorrespondingPlasma(true);
diff --git a/src/main/java/gregtech/loaders/postload/chains/NaniteChain.java b/src/main/java/gregtech/loaders/postload/chains/NaniteChain.java
index 9be7e1b6b6..ab1981ee98 100644
--- a/src/main/java/gregtech/loaders/postload/chains/NaniteChain.java
+++ b/src/main/java/gregtech/loaders/postload/chains/NaniteChain.java
@@ -262,5 +262,23 @@ public class NaniteChain {
.eut(TierEU.RECIPE_MAX)
.addTo(nanoForgeRecipes);
+ // MagMatter nanites, currently only used in the production of Stargates.
+ GTValues.RA.stdBuilder()
+ .itemInputs(
+ GTOreDictUnificator.get(OrePrefixes.lens, Materials.Forcicium, 0, false),
+ GTOreDictUnificator.get(OrePrefixes.lens, Materials.Forcillium, 0, false),
+ MaterialsUEVplus.Universium.getNanite(1),
+ MaterialsUEVplus.MagMatter.getBlocks(8),
+ getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 64),
+ GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, 1))
+ .itemOutputs(MaterialsUEVplus.MagMatter.getNanite(1))
+ .fluidInputs(
+ MaterialsUEVplus.QuarkGluonPlasma.getFluid(100_000),
+ MaterialsUEVplus.PhononMedium.getFluid(64_000),
+ MaterialsUEVplus.PrimordialMatter.getFluid(128_000))
+ .metadata(NANO_FORGE_TIER, 3)
+ .duration(16 * MINUTES + 40 * SECONDS)
+ .eut(TierEU.RECIPE_MAX)
+ .addTo(nanoForgeRecipes);
}
}
diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
index 5972d2d072..f4563a60ce 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
@@ -35,6 +35,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
+import bartworks.common.loaders.ItemRegistry;
import gregtech.GTMod;
import gregtech.api.enums.Dyes;
import gregtech.api.enums.GTValues;
@@ -3600,6 +3601,28 @@ public class AssemblerRecipes implements Runnable {
.duration(5 * SECONDS)
.eut(TierEU.RECIPE_UIV)
.addTo(assemblerRecipes);
+
+ GTValues.RA.stdBuilder()
+ .itemInputs(
+ ItemList.Hull_UV.get(1),
+ GTOreDictUnificator.get(OrePrefixes.stick, Materials.Americium, 2),
+ ItemList.Field_Generator_UV.get(2),
+ GTOreDictUnificator.get(OrePrefixes.wireGt12, Materials.Longasssuperconductornameforuhvwire, 2),
+ GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 2))
+ .itemOutputs(ItemList.Generator_Plasma_UV.get(1))
+ .duration(5 * SECONDS)
+ .eut(TierEU.RECIPE_HV)
+ .addTo(assemblerRecipes);
+
+ GTValues.RA.stdBuilder()
+ .itemInputs(
+ ItemList.Hull_UIV.get(1),
+ GTOreDictUnificator.get(OrePrefixes.plate, Materials.BlackPlutonium, 4),
+ GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.NetherStar, 4))
+ .itemOutputs(ItemRegistry.energyDistributor[11])
+ .duration(5 * SECONDS)
+ .eut(TierEU.RECIPE_HV)
+ .addTo(assemblerRecipes);
}
/**
@@ -7115,18 +7138,6 @@ public class AssemblerRecipes implements Runnable {
.duration(2 * MINUTES + 40 * SECONDS)
.eut(TierEU.RECIPE_UEV)
.addTo(assemblerRecipes);
-
- GTValues.RA.stdBuilder()
- .itemInputs(
- GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMVBase, 33),
- GTOreDictUnificator.get(OrePrefixes.pipeTiny, MaterialsUEVplus.SpaceTime, 22),
- ItemList.Electric_Pump_UMV.get(1),
- GTUtility.getIntegratedCircuit(9))
- .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMV, 33))
- .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 36000))
- .duration(2 * MINUTES + 40 * SECONDS)
- .eut(TierEU.RECIPE_UMV)
- .addTo(assemblerRecipes);
}
public void withGTNHLanthAndGTPP() {
diff --git a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java
index 67719803d5..6d864f56d3 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java
@@ -4,6 +4,7 @@ import static gregtech.api.enums.Mods.AppliedEnergistics2;
import static gregtech.api.enums.Mods.Railcraft;
import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
import static gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator.sapling_Rainforest;
@@ -297,6 +298,19 @@ public class CompressorRecipes implements Runnable {
.addTo(compressorRecipes);
GTValues.RA.stdBuilder()
+ .itemInputs(
+ GTOreDictUnificator
+ .get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 64))
+ .itemOutputs(
+ GTOreDictUnificator
+ .get(OrePrefixes.plateSuperdense, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 1))
+ // Require stabilized black hole
+ .metadata(CompressionTierKey.INSTANCE, 2)
+ .duration(15 * MINUTES)
+ .eut(TierEU.RECIPE_UXV)
+ .addTo(compressorRecipes);
+
+ GTValues.RA.stdBuilder()
.itemInputs(WerkstoffLoader.MagnetoResonaticDust.get(OrePrefixes.gem, 9))
.itemOutputs(WerkstoffLoader.MagnetoResonaticDust.get(OrePrefixes.block, 1))
.duration(15 * SECONDS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java
index de86455665..c311ecd532 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java
@@ -1693,7 +1693,7 @@ public class MixerRecipes implements Runnable {
MaterialsUEVplus.DimensionallyTranscendentExoticCatalyst.getFluid(1000L),
Materials.Lead.getPlasma(1000),
Materials.Thorium.getPlasma(1000),
- Materials.Plutonium241.getPlasma(1000L),
+ Materials.Naquadria.getPlasma(1000L),
MaterialsUEVplus.RawStarMatter.getFluid(25L))
.fluidOutputs(MaterialsUEVplus.DimensionallyTranscendentStellarCatalyst.getFluid(1000L))
.duration(41 * MINUTES + 40 * SECONDS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java
index 07e6f0c4b1..ab40600d49 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java
@@ -8,6 +8,8 @@ import gregtech.api.enums.GTValues;
import gregtech.api.enums.Materials;
import gregtech.api.enums.MaterialsUEVplus;
import gregtech.api.enums.TierEU;
+import gregtech.api.util.GTRecipeBuilder;
+import gregtech.api.util.GTRecipeConstants;
import gregtech.api.util.GTUtility;
import gtPlusPlus.core.material.MaterialsElements;
@@ -121,11 +123,12 @@ public class TranscendentPlasmaMixerRecipes implements Runnable {
Materials.Tin.getPlasma(1000),
Materials.Lead.getPlasma(1000),
Materials.Thorium.getPlasma(1000),
- Materials.Plutonium241.getPlasma(1000L),
+ Materials.Naquadria.getPlasma(1000L),
MaterialsUEVplus.RawStarMatter.getFluid(25L))
.fluidOutputs(MaterialsUEVplus.ExcitedDTSC.getFluid(1000L))
- .duration(200)
+ .duration(100)
.eut(STELLAR_EU_PER_HALF_L)
+ .metadata(GTRecipeConstants.EU_MULTIPLIER, 20)
.noOptimize()
.addTo(transcendentPlasmaMixerRecipes);
@@ -156,5 +159,35 @@ public class TranscendentPlasmaMixerRecipes implements Runnable {
.noOptimize()
.addTo(transcendentPlasmaMixerRecipes);
+ GTValues.RA.stdBuilder()
+ .itemInputs(GTUtility.getIntegratedCircuit(24))
+ .fluidInputs(
+ Materials.Infinity.getPlasma(1000),
+ Materials.Neutronium.getPlasma(1000),
+ Materials.Flerovium.getPlasma(1000),
+ new FluidStack(MaterialsElements.STANDALONE.CHRONOMATIC_GLASS.getPlasma(), 1000),
+ new FluidStack(MaterialsElements.STANDALONE.HYPOGEN.getPlasma(), 1000),
+ Materials.Ichorium.getPlasma(1000),
+ MaterialsUEVplus.SixPhasedCopper.getPlasma(1000),
+ Materials.DraconiumAwakened.getPlasma(1000),
+ new FluidStack(MaterialsElements.STANDALONE.DRAGON_METAL.getPlasma(), 1000),
+ new FluidStack(MaterialsElements.STANDALONE.RHUGNOR.getPlasma(), 1000),
+ Materials.Draconium.getPlasma(1000),
+ MaterialsUEVplus.Creon.getPlasma(1000),
+ Materials.Tritanium.getPlasma(1000),
+ Materials.CosmicNeutronium.getPlasma(1000),
+ Materials.Bedrockium.getPlasma(1000),
+ MaterialsUEVplus.ExcitedDTCC.getFluid(1000),
+ MaterialsUEVplus.ExcitedDTPC.getFluid(1000),
+ MaterialsUEVplus.ExcitedDTRC.getFluid(1000),
+ MaterialsUEVplus.ExcitedDTEC.getFluid(1000),
+ MaterialsUEVplus.ExcitedDTSC.getFluid(1000))
+ .fluidOutputs(MaterialsUEVplus.StargateCrystalSlurry.getFluid(1000L))
+ .duration(100 * GTRecipeBuilder.TICKS)
+ // 1 Trillion EU/t
+ .metadata(GTRecipeConstants.EU_MULTIPLIER, 1000)
+ .eut(1_000_000_000L)
+ .noOptimize()
+ .addTo(transcendentPlasmaMixerRecipes);
}
}
diff --git a/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java b/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java
index f46256e2c5..c4fc6bea26 100644
--- a/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java
+++ b/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java
@@ -3,6 +3,7 @@ package gregtech.loaders.preload;
import static gregtech.api.enums.FluidState.GAS;
import static gregtech.api.enums.FluidState.LIQUID;
import static gregtech.api.enums.FluidState.MOLTEN;
+import static gregtech.api.enums.FluidState.PLASMA;
import static gregtech.api.enums.FluidState.SLURRY;
import static gregtech.api.enums.Mods.AppliedEnergistics2;
import static gregtech.api.enums.Mods.PamsHarvestCraft;
@@ -1315,6 +1316,15 @@ public class LoaderGTBlockFluid implements Runnable {
GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.Protomatter, 1L),
ItemList.Cell_Empty.get(1L));
+ GTFluidFactory.builder("InfinityPlasma")
+ .withLocalizedName("Infinity Plasma")
+ .withStateAndTemperature(PLASMA, 10000)
+ .buildAndRegister()
+ .configureMaterials(Materials.Infinity)
+ .registerBContainers(
+ GTOreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Infinity, 1L),
+ ItemList.Cell_Empty.get(1L));
+
GTFluidFactory.builder("fieryblood")
.withLocalizedName("Fiery Blood")
.withStateAndTemperature(LIQUID, 6400)
diff --git a/src/main/java/tectech/loader/recipe/Assembler.java b/src/main/java/tectech/loader/recipe/Assembler.java
index eee8182184..7965931f5b 100644
--- a/src/main/java/tectech/loader/recipe/Assembler.java
+++ b/src/main/java/tectech/loader/recipe/Assembler.java
@@ -353,7 +353,7 @@ public class Assembler implements Runnable {
GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.BlackPlutonium, 2),
GTOreDictUnificator
.get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 1),
- GTOreDictUnificator.get("plateShirabon", 1L))
+ GTOreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.MagMatter, 1L))
.itemOutputs(CustomItemList.eM_dynamoMulti4_UXV.get(1))
.fluidInputs(Materials.Silver.getMolten(9216))
.duration(5 * SECONDS)
@@ -489,7 +489,7 @@ public class Assembler implements Runnable {
GTOreDictUnificator.get(OrePrefixes.wireGt08, Materials.BlackPlutonium, 2),
GTOreDictUnificator
.get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 2),
- GTOreDictUnificator.get("plateShirabon", 2L))
+ GTOreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.MagMatter, 2L))
.itemOutputs(CustomItemList.eM_dynamoMulti16_UXV.get(1))
.fluidInputs(Materials.Electrum.getMolten(9216))
.duration(10 * SECONDS)
@@ -625,7 +625,7 @@ public class Assembler implements Runnable {
GTOreDictUnificator.get(OrePrefixes.wireGt12, Materials.BlackPlutonium, 2),
GTOreDictUnificator
.get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 3),
- GTOreDictUnificator.get("plateShirabon", 3L))
+ GTOreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.MagMatter, 3L))
.itemOutputs(CustomItemList.eM_dynamoMulti64_UXV.get(1))
.fluidInputs(Materials.Tungsten.getMolten(9216))
.duration(20 * SECONDS)
@@ -754,7 +754,7 @@ public class Assembler implements Runnable {
GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.BlackPlutonium, 2),
GTOreDictUnificator
.get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 1),
- GTOreDictUnificator.get("plateShirabon", 1L))
+ GTOreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.MagMatter, 1L))
.itemOutputs(CustomItemList.eM_energyMulti4_UXV.get(1))
.fluidInputs(Materials.Silver.getMolten(9216))
.duration(5 * SECONDS)
@@ -890,7 +890,7 @@ public class Assembler implements Runnable {
GTOreDictUnificator.get(OrePrefixes.wireGt08, Materials.BlackPlutonium, 2),
GTOreDictUnificator
.get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 2),
- GTOreDictUnificator.get("plateShirabon", 2L))
+ GTOreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.MagMatter, 2L))
.itemOutputs(CustomItemList.eM_energyMulti16_UXV.get(1))
.fluidInputs(Materials.Electrum.getMolten(9216))
.duration(10 * SECONDS)
@@ -1026,7 +1026,7 @@ public class Assembler implements Runnable {
GTOreDictUnificator.get(OrePrefixes.wireGt12, Materials.BlackPlutonium, 2),
GTOreDictUnificator
.get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 3),
- GTOreDictUnificator.get("plateShirabon", 3L))
+ GTOreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.MagMatter, 3L))
.itemOutputs(CustomItemList.eM_energyMulti64_UXV.get(1))
.fluidInputs(Materials.Tungsten.getMolten(9216))
.duration(20 * SECONDS)
diff --git a/src/main/java/tectech/loader/recipe/Godforge.java b/src/main/java/tectech/loader/recipe/Godforge.java
index 20db967ec4..c7e778e49c 100644
--- a/src/main/java/tectech/loader/recipe/Godforge.java
+++ b/src/main/java/tectech/loader/recipe/Godforge.java
@@ -177,9 +177,10 @@ public class Godforge implements Runnable {
{
// Single step
ItemStack[] solids_t1_1step = { Materials.Lead.getDust(1), Materials.Plutonium241.getDust(1),
- Materials.Thorium.getDust(1) };
+ Materials.Thorium.getDust(1), Materials.Naquadria.getDust(1) };
FluidStack[] solid_plasmas_t1_1step = { Materials.Lead.getPlasma(144),
- Materials.Plutonium241.getPlasma(144), Materials.Thorium.getPlasma(144) };
+ Materials.Plutonium241.getPlasma(144), Materials.Thorium.getPlasma(144),
+ Materials.Naquadria.getPlasma(144) };
for (int i = 0; i < solids_t1_1step.length; i++) {
boolean multistep = false;
@@ -221,13 +222,14 @@ public class Godforge implements Runnable {
MaterialsElements.STANDALONE.DRAGON_METAL.getDust(1),
MaterialsElements.STANDALONE.CHRONOMATIC_GLASS.getDust(1), Materials.CosmicNeutronium.getDust(1),
Materials.Draconium.getDust(1), Materials.DraconiumAwakened.getDust(1),
- Materials.Ichorium.getDust(1) };
+ Materials.Ichorium.getDust(1), Materials.Bedrockium.getDust(1) };
FluidStack[] solid_plasmas_t2_1step = {
new FluidStack(MaterialsElements.STANDALONE.RHUGNOR.getPlasma(), 144),
new FluidStack(MaterialsElements.STANDALONE.DRAGON_METAL.getPlasma(), 144),
new FluidStack(MaterialsElements.STANDALONE.CHRONOMATIC_GLASS.getPlasma(), 144),
Materials.CosmicNeutronium.getPlasma(144), Materials.Draconium.getPlasma(144),
- Materials.DraconiumAwakened.getPlasma(144), Materials.Ichorium.getPlasma(144) };
+ Materials.DraconiumAwakened.getPlasma(144), Materials.Ichorium.getPlasma(144),
+ Materials.Bedrockium.getPlasma(144), };
for (int i = 0; i < solids_t2_1step.length; i++) {
boolean multistep = false;
@@ -244,11 +246,13 @@ public class Godforge implements Runnable {
// Multi-step
ItemStack[] solids_t2_xstep = { MaterialsElements.STANDALONE.HYPOGEN.getDust(1),
- Materials.Tritanium.getDust(1), Materials.Flerovium.getDust(1), Materials.Neutronium.getDust(1), };
+ Materials.Tritanium.getDust(1), Materials.Flerovium.getDust(1), Materials.Neutronium.getDust(1),
+ Materials.Infinity.getDust(1), MaterialsUEVplus.SixPhasedCopper.getDust(1), };
FluidStack[] solid_plasmas_t2_xstep = {
new FluidStack(MaterialsElements.STANDALONE.HYPOGEN.getPlasma(), 144),
Materials.Tritanium.getPlasma(144), Materials.Flerovium.getPlasma(144),
- Materials.Neutronium.getPlasma(144), };
+ Materials.Neutronium.getPlasma(144), Materials.Infinity.getPlasma(144),
+ MaterialsUEVplus.SixPhasedCopper.getPlasma(144) };
for (int i = 0; i < solids_t2_xstep.length; i++) {
boolean multistep = true;
diff --git a/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java
index 690ab4de7c..162640e2a9 100644
--- a/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java
+++ b/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java
@@ -3,14 +3,12 @@ package tectech.loader.recipe;
import static com.google.common.math.LongMath.pow;
import static goodgenerator.loader.Loaders.compactFusionCoil;
import static goodgenerator.loader.Loaders.yottaFluidTankCell;
-import static gregtech.api.enums.Mods.*;
import static gregtech.api.enums.Mods.Avaritia;
import static gregtech.api.enums.Mods.AvaritiaAddons;
import static gregtech.api.enums.Mods.BloodMagic;
import static gregtech.api.enums.Mods.DraconicEvolution;
import static gregtech.api.enums.Mods.EternalSingularity;
import static gregtech.api.enums.Mods.ExtraUtilities;
-import static gregtech.api.enums.Mods.GTNHIntergalactic;
import static gregtech.api.enums.Mods.GalacticraftAmunRa;
import static gregtech.api.enums.Mods.GalaxySpace;
import static gregtech.api.enums.Mods.GraviSuite;
@@ -24,7 +22,6 @@ import static gregtech.api.util.GTModHandler.getModItem;
import static gregtech.api.util.GTRecipeBuilder.INGOTS;
import static gregtech.api.util.GTRecipeBuilder.MINUTES;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
-import static gtPlusPlus.core.material.MaterialsAlloy.ABYSSAL;
import static gtPlusPlus.core.material.MaterialsAlloy.CINOBITE;
import static gtPlusPlus.core.material.MaterialsAlloy.LAFIUM;
import static gtPlusPlus.core.material.MaterialsAlloy.LAURENIUM;
@@ -628,70 +625,75 @@ public class ResearchStationAssemblyLine implements Runnable {
// Stargate Recipes
if (EternalSingularity.isModLoaded() && SGCraft.isModLoaded()) {
- final int baseStargateTime = 125_000 * 20;
+ // spotless:off
- // Stargate shield foil
+ final int baseStargateTime = 125_000 * SECONDS;
+
+ // Stargate-Radiation-Containment-Plate
TTRecipeAdder.addResearchableAssemblylineRecipe(
- GTOreDictUnificator
- .get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 1L),
+ GTOreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 1L),
(int) TierEU.RECIPE_MAX,
32768,
(int) TierEU.RECIPE_UXV,
64,
- new ItemStack[] { ItemList.Casing_Dim_Bridge.get(64),
+ new ItemStack[] {
+ CustomItemList.Godforge_MagneticConfinementCasing.get(64),
CustomItemList.StabilisationFieldGeneratorTier8.get(64),
- GTOreDictUnificator.get("blockShirabon", 64L), GTOreDictUnificator.get("blockShirabon", 64L),
- GTOreDictUnificator.get(OrePrefixes.block, MaterialsUEVplus.SpaceTime, 64L),
+ CustomItemList.Godforge_HarmonicPhononTransmissionConduit.get(32),
+ GTOreDictUnificator.get(OrePrefixes.block, MaterialsUEVplus.MagMatter, 64L),
+ GTOreDictUnificator.get(OrePrefixes.plateSuperdense, MaterialsUEVplus.MagMatter, 8L),
+ GTOreDictUnificator.get(OrePrefixes.plateSuperdense, MaterialsUEVplus.Universium, 8L),
+ GTOreDictUnificator.get(OrePrefixes.plateSuperdense, MaterialsUEVplus.Eternity, 8L),
+ GTOreDictUnificator.get(OrePrefixes.plateSuperdense, MaterialsUEVplus.SpaceTime, 8L),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, 16L),
- GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 8L),
- GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.Universium, 8L),
- GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 8L),
- GTOreDictUnificator.get("plateDenseShirabon", 8L), ItemList.Sensor_UXV.get(16L),
- ItemList.Emitter_UXV.get(16L), getModItem(EternalSingularity.ID, "eternal_singularity", 16L),
- MaterialsUEVplus.Universium.getNanite(16), MaterialsUEVplus.BlackDwarfMatter.getNanite(16),
- MaterialsUEVplus.WhiteDwarfMatter.getNanite(16) },
- new FluidStack[] { Materials.Neutronium.getMolten(32_768_000L),
- MaterialsUEVplus.SpaceTime.getMolten(4 * 36864L),
- Materials.SuperconductorUMVBase.getMolten(4 * 36864L),
- MaterialsUEVplus.ExcitedDTEC.getFluid(4 * 36864L) },
+ ItemList.Sensor_UXV.get(16L),
+ ItemList.Emitter_UXV.get(16L),
+ getModItem(EternalSingularity.ID, "combined_singularity", 64, 15), // chronic singularity
+ MaterialsUEVplus.Universium.getNanite(16),
+ MaterialsUEVplus.BlackDwarfMatter.getNanite(16),
+ MaterialsUEVplus.WhiteDwarfMatter.getNanite(16),
+ MaterialsUEVplus.SixPhasedCopper.getNanite(16) },
+ new FluidStack[] {
+ MaterialsUEVplus.QuarkGluonPlasma.getFluid(1_024_000L),
+ MaterialsUEVplus.PhononMedium.getFluid(256_000L),
+ Materials.SuperconductorUMVBase.getMolten(4096 * 144),
+ MaterialsUEVplus.ExcitedDTSC.getFluid(512_000L) },
getItemContainer("StargateShieldingFoil").get(1L),
baseStargateTime,
- (int) TierEU.RECIPE_UMV);
+ (int) TierEU.RECIPE_UXV);
- // Stargate chevron
+ // Stargate Chevron
TTRecipeAdder.addResearchableAssemblylineRecipe(
getItemContainer("StargateShieldingFoil").get(1L),
(int) TierEU.RECIPE_MAX,
- 32_768,
+ 32768,
(int) TierEU.RECIPE_UXV,
64,
- new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.block, MaterialsUEVplus.TranscendentMetal, 64L),
- GTOreDictUnificator.get("blockShirabon", 64), CustomItemList.EOH_Reinforced_Spatial_Casing.get(64),
+ new ItemStack[] {
CustomItemList.EOH_Reinforced_Spatial_Casing.get(64),
-
- GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 16L),
- GTOreDictUnificator
- .get(OrePrefixes.frameGt, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 16L),
- GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Ruby, 16L),
- GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Jasper, 16L),
-
- GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Opal, 16L),
- GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Sapphire, 16L),
- GTOreDictUnificator
- .get(OrePrefixes.plateDense, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 8L),
- GTOreDictUnificator.get("plateDenseShirabon", 8),
-
- ItemList.Electric_Motor_UXV.get(64L), ItemList.Electric_Piston_UXV.get(64L),
+ CustomItemList.EOH_Reinforced_Temporal_Casing.get(64),
+ new ItemStack(BlockGodforgeGlass.INSTANCE, 64),
+ GTOreDictUnificator.get(OrePrefixes.block, MaterialsUEVplus.MagMatter, 64L),
+ GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.MagMatter, 16L),
+ GTOreDictUnificator.get(OrePrefixes.plateSuperdense, MaterialsUEVplus.MagMatter, 8L),
+ GTOreDictUnificator.get(OrePrefixes.plateSuperdense, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 8L),
+ GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 16L),
+ GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Ruby, 64L),
+ GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Jasper, 64L),
+ GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Opal, 64L),
+ GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Sapphire, 64L),
+ ItemList.Electric_Motor_UXV.get(64L),
+ ItemList.Electric_Piston_UXV.get(64L),
ItemList.Field_Generator_UXV.get(16L),
- GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, 1L)
- .splitStack(32) },
- new FluidStack[] { Materials.Neutronium.getMolten(32_768_000L),
- MaterialsUEVplus.SpaceTime.getMolten(4 * 36864L),
- MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter.getMolten(36864L),
- MaterialsUEVplus.ExcitedDTEC.getFluid(4 * 36864L) },
+ GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, 32L) },
+ new FluidStack[] {
+ MaterialsUEVplus.QuarkGluonPlasma.getFluid(1_024_000L),
+ MaterialsUEVplus.PhononMedium.getFluid(256_000L),
+ MaterialsUEVplus.MagMatter.getMolten(8192 * 144),
+ MaterialsUEVplus.ExcitedDTSC.getFluid(512_000L) },
getItemContainer("StargateChevron").get(1L),
baseStargateTime,
- (int) TierEU.RECIPE_UMV);
+ (int) TierEU.RECIPE_UXV);
// Stargate Frame Part
TTRecipeAdder.addResearchableAssemblylineRecipe(
@@ -700,29 +702,33 @@ public class ResearchStationAssemblyLine implements Runnable {
32_768,
(int) TierEU.RECIPE_UXV,
64,
- new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 64L),
+ new ItemStack[] {
+ GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 64L),
+ GTOreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.Mellion, 64L),
+ GTOreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.Universium, 64L),
+ GTOreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.Eternity, 64L),
+ GTOreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.Creon, 64L),
GTOreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.SpaceTime, 64L),
- GTOreDictUnificator
- .get(OrePrefixes.stickLong, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 64L),
- GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 64L),
-
- GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Osmiridium, 64L),
- GTOreDictUnificator.get("stickLongShirabon", 64),
- new ItemStack(WerkstoffLoader.items.get(OrePrefixes.stickLong), 64, 39), QUANTUM.getLongRod(64),
- HYPOGEN.getLongRod(64), CELESTIAL_TUNGSTEN.getLongRod(64),
- new ItemStack(WerkstoffLoader.items.get(OrePrefixes.stickLong), 64, 10106),
- ASTRAL_TITANIUM.getLongRod(64),
-
GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.SuperconductorUMVBase, 64L),
- GTOreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.Universium, 64L),
- ABYSSAL.getLongRod(64),
- GTOreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.TranscendentMetal, 64L), },
- new FluidStack[] { Materials.Neutronium.getMolten(32_768_000L),
- MaterialsUEVplus.SpaceTime.getMolten(4 * 36864L), MaterialsUEVplus.Universium.getMolten(4 * 36864L),
- MaterialsUEVplus.ExcitedDTEC.getFluid(4 * 36864L) },
+ GGMaterial.shirabon.get(OrePrefixes.stickLong, 64),
+ HYPOGEN.getLongRod(64),
+ GTOreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.SixPhasedCopper, 64L),
+ GTOreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 64L),
+ GTOreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.ProtoHalkonite, 64L),
+ GTOreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.WhiteDwarfMatter, 64L),
+ GTOreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.MagMatter, 64L),
+ GTOreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.BlackDwarfMatter, 64L),
+ GTOreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.TranscendentMetal, 64L) },
+ new FluidStack[] {
+ MaterialsUEVplus.QuarkGluonPlasma.getFluid(1_024_000L),
+ MaterialsUEVplus.PhononMedium.getFluid(256_000L),
+ MaterialsUEVplus.Universium.getMolten(1024 * 144),
+ MaterialsUEVplus.ExcitedDTSC.getFluid(512_000L) },
getItemContainer("StargateFramePart").get(1L),
baseStargateTime,
- (int) TierEU.RECIPE_UMV);
+ (int) TierEU.RECIPE_UXV);
+
+ // spotless:on
}
// Dimensionally Transcendent Plasma Forge (DTPF)
@@ -2116,10 +2122,10 @@ public class ResearchStationAssemblyLine implements Runnable {
GTOreDictUnificator.get(OrePrefixes.wireFine, MaterialsUEVplus.Universium, 64L),
GTOreDictUnificator.get(OrePrefixes.wireFine, MaterialsUEVplus.Universium, 64L),
- GTOreDictUnificator.get("wireFineShirabon", 64L), GTOreDictUnificator.get("wireFineShirabon", 64L),
+ GTOreDictUnificator.get(OrePrefixes.wireFine, MaterialsUEVplus.MagMatter, 64L),
+ GTOreDictUnificator.get(OrePrefixes.wireFine, MaterialsUEVplus.MagMatter, 64L),
- GTOreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 2L),
- GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 2L),
+ GTOreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 4L),
Materials.Neutronium.getNanite(4) },
new FluidStack[] { moltenMHDCSM_576, moltenSpaceTime_576, moltenUniversium_576,
dimensionallyShiftedSuperfluid8000 },
@@ -2147,9 +2153,8 @@ public class ResearchStationAssemblyLine implements Runnable {
GTOreDictUnificator.get("ringRadoxPoly", 64L),
GTOreDictUnificator
.get(OrePrefixes.rotor, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 4L),
- GTOreDictUnificator.get("rotorShirabon", 4),
- GTOreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 2L),
- GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 2L),
+ GTOreDictUnificator.get(OrePrefixes.rotor, MaterialsUEVplus.MagMatter, 4L),
+ GTOreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 4L),
Materials.Neutronium.getNanite(4) },
new FluidStack[] { moltenMHDCSM_576, moltenSpaceTime_576, moltenUniversium_576,
dimensionallyShiftedSuperfluid8000 },
@@ -2174,8 +2179,7 @@ public class ResearchStationAssemblyLine implements Runnable {
.get(OrePrefixes.ring, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 8L),
GTOreDictUnificator
.get(OrePrefixes.round, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 64L),
- GTOreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 2L),
- GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 2L),
+ GTOreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 4L),
MaterialsKevlar.Kevlar.getPlates(64), MaterialsKevlar.Kevlar.getPlates(16),
GTOreDictUnificator.get("plateRadoxPoly", 64L), GTOreDictUnificator.get("plateRadoxPoly", 16L),
Materials.Neutronium.getNanite(4) },
@@ -2200,15 +2204,15 @@ public class ResearchStationAssemblyLine implements Runnable {
.get(OrePrefixes.stickLong, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 8L),
GTOreDictUnificator
.get(OrePrefixes.gear, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 2L),
- GTOreDictUnificator.get("gearGtShirabon", 2L),
+ GTOreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.MagMatter, 2L),
GTOreDictUnificator
.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 6L),
- GTOreDictUnificator.get("gearGtSmallShirabon", 6L), ItemList.Electric_Motor_UXV.get(2L),
- ItemList.Electric_Piston_UXV.get(1L), new Object[] { OrePrefixes.circuit.get(Materials.UXV), 2L },
+ GTOreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.MagMatter, 6L),
+ ItemList.Electric_Motor_UXV.get(2L), ItemList.Electric_Piston_UXV.get(1L),
+ new Object[] { OrePrefixes.circuit.get(Materials.UXV), 2L },
new Object[] { OrePrefixes.circuit.get(Materials.UMV), 4L },
new Object[] { OrePrefixes.circuit.get(Materials.UIV), 8L },
- GTOreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 6L),
- GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 6L),
+ GTOreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 12L),
Materials.Neutronium.getNanite(8) },
new FluidStack[] { moltenMHDCSM_576, moltenSpaceTime_576, moltenUniversium_576,
dimensionallyShiftedSuperfluid8000 },
@@ -2237,12 +2241,11 @@ public class ResearchStationAssemblyLine implements Runnable {
.get(OrePrefixes.stick, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 8L),
GTOreDictUnificator
.get(OrePrefixes.gear, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 2L),
- GTOreDictUnificator.get("gearGtShirabon", 2L),
+ GTOreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.MagMatter, 2L),
GTOreDictUnificator
.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 4L),
- GTOreDictUnificator.get("gearGtSmallShirabon", 4L),
- GTOreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 4L),
- GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 4L),
+ GTOreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.MagMatter, 4L),
+ GTOreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 8L),
Materials.Neutronium.getNanite(4) },
new FluidStack[] { moltenMHDCSM_576, moltenSpaceTime_576, moltenUniversium_576,
dimensionallyShiftedSuperfluid8000 },
@@ -2269,11 +2272,11 @@ public class ResearchStationAssemblyLine implements Runnable {
ItemList.NuclearStar.get(16), new Object[] { OrePrefixes.circuit.get(Materials.UXV), 4L },
GTOreDictUnificator
.get(OrePrefixes.foil, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 64),
- GTOreDictUnificator.get("foilShirabon", 64),
+ GTOreDictUnificator.get(OrePrefixes.foil, MaterialsUEVplus.MagMatter, 64L),
GTOreDictUnificator.get(OrePrefixes.foil, MaterialsUEVplus.SpaceTime, 64),
GTOreDictUnificator.get(OrePrefixes.foil, MaterialsUEVplus.Universium, 64),
- GTOreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 7L),
- GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 7L), Materials.Neutronium.getNanite(8)
+ GTOreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 14L),
+ Materials.Neutronium.getNanite(8)
},
new FluidStack[] { moltenMHDCSM_576, moltenSpaceTime_576, moltenUniversium_576, solderingAlloy_14_400 },
@@ -2300,11 +2303,10 @@ public class ResearchStationAssemblyLine implements Runnable {
ItemList.NuclearStar.get(16), new Object[] { OrePrefixes.circuit.get(Materials.UXV), 4L },
GTOreDictUnificator
.get(OrePrefixes.foil, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 64),
- GTOreDictUnificator.get("foilShirabon", 64),
+ GTOreDictUnificator.get(OrePrefixes.foil, MaterialsUEVplus.MagMatter, 64L),
GTOreDictUnificator.get(OrePrefixes.foil, MaterialsUEVplus.SpaceTime, 64),
GTOreDictUnificator.get(OrePrefixes.foil, MaterialsUEVplus.Universium, 64),
- GTOreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 7L),
- GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 7L),
+ GTOreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 14L),
Materials.Neutronium.getNanite(8) },
new FluidStack[] { moltenMHDCSM_576, moltenSpaceTime_576, moltenUniversium_576, solderingAlloy_14_400 },
ItemList.Sensor_UXV.get(1L),
@@ -2337,10 +2339,10 @@ public class ResearchStationAssemblyLine implements Runnable {
.get(OrePrefixes.wireFine, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 64L),
GTOreDictUnificator.get(OrePrefixes.wireFine, MaterialsUEVplus.Universium, 64L),
GTOreDictUnificator.get(OrePrefixes.wireFine, MaterialsUEVplus.Universium, 64L),
- GTOreDictUnificator.get("wireFineShirabon", 64L), GTOreDictUnificator.get("wireFineShirabon", 64L),
+ GTOreDictUnificator.get(OrePrefixes.wireFine, MaterialsUEVplus.MagMatter, 64L),
+ GTOreDictUnificator.get(OrePrefixes.wireFine, MaterialsUEVplus.MagMatter, 64L),
- GTOreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 8L),
- GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 8L),
+ GTOreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 16L),
Materials.Neutronium.getNanite(12) },
new FluidStack[] { moltenMHDCSM_576, moltenSpaceTime_576, moltenUniversium_576, solderingAlloy_14_400 },
ItemList.Field_Generator_UXV.get(1L),
@@ -2387,21 +2389,20 @@ public class ResearchStationAssemblyLine implements Runnable {
2 * 16_384, // comp/s
(int) TierEU.RECIPE_MAX, // eu/t
64, // amperage
- new Object[] {
- // Space elevator controller.
- ItemList.SpaceElevatorController.get(16), ItemList.Machine_Multi_PlasmaForge.get(4),
+ new Object[] { ItemList.SpaceElevatorController.get(16),
+ CustomItemList.Machine_Multi_ForgeOfGods.get(4), ItemList.Machine_Multi_PlasmaForge.get(4),
CustomItemList.EOH_Infinite_Energy_Casing.get(1),
CustomItemList.TimeAccelerationFieldGeneratorTier0.get(1),
CustomItemList.SpacetimeCompressionFieldGeneratorTier0.get(1),
CustomItemList.StabilisationFieldGeneratorTier0.get(1),
- CustomItemList.Machine_Multi_Computer.get(64), ItemList.AcceleratorUV.get(1),
+ CustomItemList.Machine_Multi_Computer.get(64), ItemList.AcceleratorUV.get(64),
ItemList.Quantum_Chest_IV.get(64),
// Void miner III.
- GTUtility.copyAmount(64, ItemRegistry.voidminer[2]),
+ GTUtility.copyAmount(64, ItemRegistry.voidminer[2]), ItemList.OilDrillInfinite.get(64),
- ItemList.Field_Generator_UMV.get(16), ItemList.Robot_Arm_UMV.get(16), ItemList.ZPM4.get(4),
+ ItemList.Field_Generator_UMV.get(16), ItemList.Robot_Arm_UMV.get(16), ItemList.ZPM5.get(4),
GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 64) },
new FluidStack[] { MaterialsUEVplus.Time.getMolten(144_000), MaterialsUEVplus.Space.getMolten(144_000),
FluidUtils.getFluidStack("molten.metastable oganesson", 144 * 256 * 4),
@@ -2420,9 +2421,7 @@ public class ResearchStationAssemblyLine implements Runnable {
16_384, // comp/s
(int) TierEU.RECIPE_MAX, // eu/t
32, // amperage
- new Object[] {
- // Space elevator blocks.
- getModItem(GTNHIntergalactic.ID, "gt.blockcasingsSE", 64, 0),
+ new Object[] { CustomItemList.Godforge_SingularityShieldingCasing.get(64),
// Cosmic neutronium block.
getModItem(Avaritia.ID, "Resource_Block", 64, 0),
GTOreDictUnificator.get(OrePrefixes.block, Materials.Neutronium, 64),
@@ -2893,9 +2892,7 @@ public class ResearchStationAssemblyLine implements Runnable {
16_384, // comp/s
(int) TierEU.RECIPE_MAX, // eu/t
32, // amperage
- new Object[] {
- // Space elevator blocks.
- getModItem(GTNHIntergalactic.ID, "gt.blockcasingsSE", 64, 0),
+ new Object[] { CustomItemList.Godforge_SingularityShieldingCasing.get(64),
// Cosmic neutronium block.
getModItem(Avaritia.ID, "Resource_Block", 64, 0),
GTOreDictUnificator.get(OrePrefixes.block, Materials.Neutronium, 64),
@@ -3694,18 +3691,24 @@ public class ResearchStationAssemblyLine implements Runnable {
(int) TierEU.RECIPE_UMV,
64,
new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SixPhasedCopper, 4),
- GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.CosmicNeutronium, 16),
- GGMaterial.tairitsu.get(OrePrefixes.plateDense, 16),
- GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 16),
- GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 8),
+ GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.Infinity, 2),
+ MaterialsAlloy.QUANTUM.getPlate(16),
+ GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.InfinityCatalyst, 4),
+ GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.BlackPlutonium, 2),
getModItem(EternalSingularity.ID, "combined_singularity", 1L, 2),
- getModItem(EternalSingularity.ID, "combined_singularity", 1L, 4),
- ItemRefer.Advanced_Radiation_Protection_Plate.get(64),
- GTOreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.Mellion, 16),
+ GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.SuperconductorUIVBase, 8),
GTOreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.Creon, 16),
- MaterialsAlloy.QUANTUM.getPlate(16), MaterialsAlloy.ABYSSAL.getFrameBox(4) },
+ GTOreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.Mellion, 16),
+ GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.SuperconductorUEVBase, 8),
+ getModItem(EternalSingularity.ID, "combined_singularity", 1L, 4),
+ GTOreDictUnificator.get(OrePrefixes.plateSuperdense, MaterialsUEVplus.TranscendentMetal, 2),
+ MaterialsAlloy.TITANSTEEL.getFrameBox(4),
+ GTOreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.ProtoHalkonite, 16),
+ GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.CosmicNeutronium, 2),
+ MaterialsAlloy.ABYSSAL.getFrameBox(4) },
new FluidStack[] { MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(128 * 144),
- Materials.Bedrockium.getMolten(16_384 * 144), Materials.Neutronium.getMolten(2_048 * 144) },
+ Materials.Bedrockium.getMolten(16_384 * 144), CELESTIAL_TUNGSTEN.getFluidStack(2_048 * 144),
+ Materials.Neutronium.getMolten(2_048 * 144) },
CustomItemList.Godforge_SingularityShieldingCasing.get(4),
30 * SECONDS,
(int) TierEU.RECIPE_UIV);
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluid.sgcrystalslurry.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluid.sgcrystalslurry.png
new file mode 100644
index 0000000000..f5beb5dfe4
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluid.sgcrystalslurry.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluid.sgcrystalslurry.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluid.sgcrystalslurry.png.mcmeta
new file mode 100644
index 0000000000..0645f48c62
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluid.sgcrystalslurry.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation": {
+ "frametime": 2
+ }
+}
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.infinityplasma.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.infinityplasma.png
new file mode 100644
index 0000000000..27571f5f9c
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.infinityplasma.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.infinityplasma.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.infinityplasma.png.mcmeta
new file mode 100644
index 0000000000..eebd2d1c9f
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.infinityplasma.png.mcmeta
@@ -0,0 +1,37 @@
+{
+ "animation": {
+ "frametime": 1,
+ "frames": [
+ 0,
+ 0,
+ 0,
+ 1,
+ 1,
+ 1,
+ 2,
+ 2,
+ 2,
+ 3,
+ 3,
+ 4,
+ 4,
+ 5,
+ 6,
+ 7,
+ 8,
+ 7,
+ 6,
+ 5,
+ 4,
+ 4,
+ 3,
+ 3,
+ 2,
+ 2,
+ 2,
+ 1,
+ 1,
+ 1
+ ]
+ }
+}
diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/nanites.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/nanites.png
new file mode 100644
index 0000000000..7fec9740ae
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/nanites.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/nanites.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/nanites.png.mcmeta
new file mode 100644
index 0000000000..cc8a1f3c96
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/nanites.png.mcmeta
@@ -0,0 +1 @@
+{"animation": {"frametime": 1}} \ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/nanites_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/nanites_OVERLAY.png
new file mode 100644
index 0000000000..b0ef0371e2
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/nanites_OVERLAY.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/sgcrystalfluid/cell.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/sgcrystalfluid/cell.png
new file mode 100644
index 0000000000..44cee6e7af
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/sgcrystalfluid/cell.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/sgcrystalfluid/cell.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/sgcrystalfluid/cell.png.mcmeta
new file mode 100644
index 0000000000..0645f48c62
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/sgcrystalfluid/cell.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation": {
+ "frametime": 2
+ }
+}
diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/sgcrystalfluid/cell_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/sgcrystalfluid/cell_OVERLAY.png
new file mode 100644
index 0000000000..c005544fb3
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/sgcrystalfluid/cell_OVERLAY.png
Binary files differ