aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/postload
diff options
context:
space:
mode:
authorConnor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>2023-02-14 07:14:56 +0000
committerGitHub <noreply@github.com>2023-02-14 08:14:56 +0100
commit88ba53a1af16ff753efdaaddf92d554af22a5794 (patch)
tree6c755e05971ca840a112363422d4b7242a4fed7f /src/main/java/gregtech/loaders/postload
parent7a41e4ebce3b712011d6e1495b6c368cc1f4bebf (diff)
downloadGT5-Unofficial-88ba53a1af16ff753efdaaddf92d554af22a5794.tar.gz
GT5-Unofficial-88ba53a1af16ff753efdaaddf92d554af22a5794.tar.bz2
GT5-Unofficial-88ba53a1af16ff753efdaaddf92d554af22a5794.zip
Fix missing textures (#1732)
* New texture * Blade * Change molten space and time names. * Update fluid names * Bump dep of AE2 * Bump dep of AE2 * spotlessApply (#1733) Co-authored-by: GitHub GTNH Actions <> * New fluid solidifer method * Space * Spotless * New recipes for new white dwarf matter shapes. * Universium block * Universium nanites * Spotless * Add some fine wires --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/loaders/postload')
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java23
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java229
2 files changed, 250 insertions, 2 deletions
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 0146f3a10e..f5dd2dcc05 100644
--- a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java
+++ b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java
@@ -151,7 +151,7 @@ public class GT_NaniteChain {
getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit
},
new FluidStack[] { Materials.UUMatter.getFluid(500_000), Materials.RawStarMatter.getFluid(50_000),
- FluidRegistry.getFluidStack("spatialFluid", 720), },
+ Materials.Space.getMolten(720), },
new ItemStack[] { Materials.WhiteDwarfMatter.getNanite(4) },
null,
null,
@@ -169,12 +169,31 @@ public class GT_NaniteChain {
getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit
},
new FluidStack[] { Materials.UUMatter.getFluid(500_000), Materials.RawStarMatter.getFluid(50_000),
- FluidRegistry.getFluidStack("temporalFluid", 720), },
+ Materials.Time.getMolten(720), },
new ItemStack[] { Materials.BlackDwarfMatter.getNanite(4) },
null,
null,
750 * 20,
2_000_000_000,
3);
+
+ // Universium nanites.
+ GT_Values.RA.addNanoForgeRecipe(
+ new ItemStack[] { aUMVTierLens,
+ // Quantum Anomaly, couldn't find any better naming.
+ getModItem(MOD_ID_GTPP, "MU-metaitem.01", 0, 32105), Materials.Universium.getBlocks(8),
+
+ ItemList.Optically_Perfected_CPU.get(16), ItemList.Optically_Compatible_Memory.get(16),
+ getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit
+ },
+ new FluidStack[] { Materials.SpaceTime.getMolten(144), Materials.Infinity.getMolten(576),
+ Materials.UUMatter.getFluid(1_000_000), },
+ new ItemStack[] { Materials.Universium.getNanite(2) },
+ null,
+ null,
+ 750 * 20,
+ 2_000_000_000,
+ 3);
+
}
}
diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java
index 352b860724..f269344b46 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java
@@ -252,5 +252,234 @@ public class FluidSolidifierRecipes implements Runnable {
getModItem(MOD_ID_RC, "tile.railcraft.anvil", 1L, 0),
128,
16);
+
+ final int whiteDwarfShapeSolidifierTime = 10 * 20;
+ final int fluidPerShapeSolidifierRecipe = 576;
+ {
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Bottle.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Bottle.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Plate.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Plate.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Cell.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Cell.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Ring.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Ring.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Rod.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Rod.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Bolt.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Bolt.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Ingot.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Ingot.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Wire.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Wire.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Casing.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Casing.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Pipe_Tiny.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Pipe_Tiny.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Pipe_Small.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Pipe_Small.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Pipe_Medium.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Pipe_Medium.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Pipe_Large.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Pipe_Large.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Pipe_Huge.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Pipe_Huge.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Block.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Block.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Sword.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Sword.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Pickaxe.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Pickaxe.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Shovel.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Shovel.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Axe.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Axe.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Hoe.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Hoe.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Hammer.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Hammer.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_File.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_File.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Saw.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Saw.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Gear.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Gear.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Rotor.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Rotor.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Turbine_Blade.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Turbine_Blade.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_Small_Gear.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Small_Gear.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ new ItemStack[] { ItemList.Shape_Extruder_ToolHeadDrill.get(1) },
+ new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) },
+ new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_ToolHeadDrill.get(1) },
+ new FluidStack[] { GT_Values.NF },
+ (int) TierEU.RECIPE_UMV,
+ whiteDwarfShapeSolidifierTime);
+
+ }
}
}