aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGDCloud <93287602+GDCloudstrike@users.noreply.github.com>2023-05-16 21:46:33 +0200
committerGitHub <noreply@github.com>2023-05-16 21:46:33 +0200
commit093985107e8db7ed5640e9cd12728e20ea84fa29 (patch)
tree796961e4162e71c8af9ebf60e0cc1db6973b396b /src
parent686a78b8df700bc69849b36da30cdbcf72513e60 (diff)
downloadGT5-Unofficial-093985107e8db7ed5640e9cd12728e20ea84fa29.tar.gz
GT5-Unofficial-093985107e8db7ed5640e9cd12728e20ea84fa29.tar.bz2
GT5-Unofficial-093985107e8db7ed5640e9cd12728e20ea84fa29.zip
Eternity nanites (#1997)
* generate nanite * textures * recipe * timepiece instead * spotlessApply (#1998) Co-authored-by: GitHub GTNH Actions <> * add primordial matter * texture * add recipe * primordial matter instead of uum --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/api/enums/MaterialsUEVplus.java24
-rw-r--r--src/main/java/gregtech/api/enums/OrePrefixes.java1
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java25
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java16
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java9
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.primordialmatter.pngbin0 -> 35069 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.primordialmatter.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/nanites.pngbin0 -> 378701 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/nanites.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/nanites_OVERLAY.pngbin0 -> 609 bytes
10 files changed, 76 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/enums/MaterialsUEVplus.java b/src/main/java/gregtech/api/enums/MaterialsUEVplus.java
index 37bf63031a..bb385a1c73 100644
--- a/src/main/java/gregtech/api/enums/MaterialsUEVplus.java
+++ b/src/main/java/gregtech/api/enums/MaterialsUEVplus.java
@@ -516,6 +516,30 @@ public class MaterialsUEVplus {
.disableAutoGeneratedVacuumFreezerRecipe()
.setProcessingMaterialTierEU(TierEU.RECIPE_UMV);
+ public static Materials PrimordialMatter = new Materials(
+ 142,
+ TextureSet.SET_FLUID,
+ 1.0F,
+ 0,
+ 2,
+ 16,
+ 255,
+ 255,
+ 255,
+ 0,
+ "PrimordialMatter",
+ "Liquid Primordial Matter",
+ -1,
+ -1,
+ 2_000_000_000,
+ 1,
+ false,
+ true,
+ 1,
+ 1,
+ 1,
+ Dyes.dyeBlue);
+
/**
* 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 c9225aca2d..79ca638bef 100644
--- a/src/main/java/gregtech/api/enums/OrePrefixes.java
+++ b/src/main/java/gregtech/api/enums/OrePrefixes.java
@@ -842,6 +842,7 @@ public enum OrePrefixes {
nanite.mGeneratedItems.add(MaterialsUEVplus.WhiteDwarfMatter);
nanite.mGeneratedItems.add(MaterialsUEVplus.BlackDwarfMatter);
nanite.mGeneratedItems.add(Materials.Glowstone);
+ nanite.mGeneratedItems.add(MaterialsUEVplus.Eternity);
// -----
gear.mGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter);
diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java
index b3ff9af45e..be8130aa7e 100644
--- a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java
+++ b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java
@@ -13,6 +13,8 @@ import net.minecraftforge.fluids.FluidStack;
import gregtech.api.enums.*;
import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_RecipeBuilder;
public class GT_NaniteChain {
@@ -185,7 +187,7 @@ public class GT_NaniteChain {
getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit
},
new FluidStack[] { MaterialsUEVplus.SpaceTime.getMolten(144), Materials.Infinity.getMolten(576),
- Materials.UUMatter.getFluid(1_000_000), },
+ MaterialsUEVplus.PrimordialMatter.getFluid(64_000), },
new ItemStack[] { MaterialsUEVplus.Universium.getNanite(2) },
null,
null,
@@ -193,5 +195,26 @@ public class GT_NaniteChain {
2_000_000_000,
3);
+ // Eternity nanites
+ GT_Values.RA.stdBuilder()
+ .itemInputs(
+ GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Forcicium, 0, false),
+ // Quantum Anomaly
+ getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105),
+ MaterialsUEVplus.TranscendentMetal.getNanite(1),
+ MaterialsUEVplus.Eternity.getBlocks(8),
+ getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32),
+ ItemList.Timepiece.get(4))
+ .itemOutputs(MaterialsUEVplus.Eternity.getNanite(4))
+ .fluidInputs(
+ MaterialsUEVplus.Space.getMolten(1152),
+ MaterialsUEVplus.ExcitedDTSC.getFluid(50000),
+ MaterialsUEVplus.PrimordialMatter.getFluid(64_000))
+ .noFluidOutputs()
+ .duration(750 * GT_RecipeBuilder.SECONDS)
+ .eut(TierEU.RECIPE_MAX)
+ .specialValue(3)
+ .addTo(GT_Recipe.GT_Recipe_Map.sNanoForge);
+
}
}
diff --git a/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java
index a5ce4e3871..a38918ce23 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java
@@ -15,6 +15,8 @@ public class TranscendentPlasmaMixerRecipes implements Runnable {
private static final int EXOTIC_EU_PER_L = 1_073_007_393;
private static final int STELLAR_EU_PER_HALF_L = 2_138_383_760;
+ private static final int PRIMORDIAL_MATTER = 2_000_000_000;
+
@Override
public void run() {
@@ -128,5 +130,19 @@ public class TranscendentPlasmaMixerRecipes implements Runnable {
.noOptimize()
.addTo(sTranscendentPlasmaMixerRecipes);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_Utility.getIntegratedCircuit(24))
+ .noItemOutputs()
+ .fluidInputs(
+ MaterialsUEVplus.RawStarMatter.getFluid(1000L),
+ MaterialsUEVplus.SpaceTime.getMolten(1000L),
+ MaterialsUEVplus.Space.getMolten(1000L),
+ MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(1000L))
+ .fluidOutputs(MaterialsUEVplus.PrimordialMatter.getFluid(1000L))
+ .duration(100)
+ .eut(PRIMORDIAL_MATTER)
+ .noOptimize()
+ .addTo(sTranscendentPlasmaMixerRecipes);
+
}
}
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
index 9cfd57d1e2..0d5322f3ec 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
@@ -1223,6 +1223,15 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.Time, 1L),
ItemList.Cell_Empty.get(1L));
+ GT_FluidFactory.builder("PrimordialMatter")
+ .withLocalizedName(MaterialsUEVplus.PrimordialMatter.mLocalizedName)
+ .withStateAndTemperature(LIQUID, 2_000_000_000)
+ .buildAndRegister()
+ .configureMaterials(MaterialsUEVplus.PrimordialMatter)
+ .registerBContainers(
+ GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.PrimordialMatter, 1L),
+ ItemList.Cell_Empty.get(1L));
+
GT_FluidFactory.builder("fieryblood")
.withLocalizedName("Fiery Blood")
.withStateAndTemperature(LIQUID, 6400)
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.primordialmatter.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.primordialmatter.png
new file mode 100644
index 0000000000..137280d74c
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.primordialmatter.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.primordialmatter.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.primordialmatter.png.mcmeta
new file mode 100644
index 0000000000..cc8a1f3c96
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.primordialmatter.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/eternity/nanites.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/nanites.png
new file mode 100644
index 0000000000..3fed6ae80b
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/nanites.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/nanites.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/nanites.png.mcmeta
new file mode 100644
index 0000000000..cc8a1f3c96
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/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/eternity/nanites_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/nanites_OVERLAY.png
new file mode 100644
index 0000000000..85ab4aed9a
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/nanites_OVERLAY.png
Binary files differ