From 88ba53a1af16ff753efdaaddf92d554af22a5794 Mon Sep 17 00:00:00 2001 From: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Date: Tue, 14 Feb 2023 07:14:56 +0000 Subject: 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> --- src/main/java/gregtech/api/enums/ItemList.java | 1 + src/main/java/gregtech/api/enums/Materials.java | 2 ++ src/main/java/gregtech/api/enums/OrePrefixes.java | 4 +++- src/main/java/gregtech/api/enums/Textures.java | 4 +++- .../gregtech/api/interfaces/internal/IGT_RecipeAdder.java | 11 +++++++++-- 5 files changed, 18 insertions(+), 4 deletions(-) (limited to 'src/main/java/gregtech/api') diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index ebd20d48c0..290f4766f7 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -136,6 +136,7 @@ public enum ItemList implements IItemContainer { Arrow_Plastic_Glass_Weakness_Long, Arrow_Plastic_Glass_Holy_Water, Shape_Empty, + Shape_Mold_Bottle, Shape_Mold_Plate, Shape_Mold_Ingot, diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index e22cefe995..4d83c7bdd5 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -1981,6 +1981,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Mercassium, MeteoricIron, BloodInfusedIron, + Universium, + MagnetohydrodynamicallyConstrainedStarMatter, MeteoricSteel, Naquadah, NaquadahAlloy, diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index 08a0c2de8c..070242697c 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -1369,7 +1369,9 @@ public enum OrePrefixes { || aMaterial == Materials.Graphene || aMaterial == Materials.NiobiumTitanium || aMaterial == Materials.YttriumBariumCuprate - || aMaterial == Materials.BloodInfusedIron)) + || aMaterial == Materials.BloodInfusedIron + || aMaterial == Materials.Universium + || aMaterial == Materials.MagnetohydrodynamicallyConstrainedStarMatter)) wireFine.mDisabledItems.add(aMaterial); // Gears if (!enableUnusedGears && !(aMaterial == Materials.Aluminium || aMaterial == Materials.Titanium diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index d3778a6253..ba76816b7a 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -1119,6 +1119,7 @@ public class Textures { BLOCK_NICKELALUMINIUM, BLOCK_SILICONSG, BLOCK_TRANSCENDENTMETAL, + BLOCK_UNIVERSIUM, BLOCK_ORIHARUKON, BLOCK_WHITEDWARFMATTER, @@ -1495,7 +1496,8 @@ public class Textures { STORAGE_BLOCKS11 = { BLOCK_TOPAZ, BLOCK_VINTEUM, BLOCK_YELLOWGARNET, BLOCK_NETHERSTAR, BLOCK_CHARCOAL, BLOCK_BLAZE }, STORAGE_BLOCKS12 = { BLOCK_CRYOLITE, BLOCK_SILICONSG, BLOCK_NICKELALUMINIUM, BLOCK_SPACETIME, - BLOCK_TRANSCENDENTMETAL, BLOCK_ORIHARUKON, BLOCK_WHITEDWARFMATTER, BLOCK_BLACKDWARFMATTER, }; + BLOCK_TRANSCENDENTMETAL, BLOCK_ORIHARUKON, BLOCK_WHITEDWARFMATTER, BLOCK_BLACKDWARFMATTER, + BLOCK_UNIVERSIUM }; public static final ITexture[] HIDDEN_TEXTURE = { TextureFactory.builder().addIcon(HIDDEN_FACE).stdOrient().build() }; diff --git a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java index 342d3a5403..bda2523811 100644 --- a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java +++ b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java @@ -648,6 +648,13 @@ public interface IGT_RecipeAdder { */ boolean addFluidSolidifierRecipe(ItemStack aMold, FluidStack aInput, ItemStack aOutput, int aDuration, int aEUt); + /** + * Adds a Recipe for the Fluid Solidifier + */ + boolean addFluidSolidifierRecipe(final ItemStack[] itemInputs, final FluidStack[] fluidInputs, + final ItemStack[] itemOutputs, final FluidStack[] fluidOutputs, final int EUPerTick, + final int aDurationInTicks); + /** * Adds a Recipe for Fluid Smelting */ @@ -926,7 +933,7 @@ public interface IGT_RecipeAdder { /** * Add a breeder cell. - * + * * @param input raw stack. should be undamaged. * @param output breed output * @param heatMultiplier bonus progress per neutron pulse per heat step @@ -940,7 +947,7 @@ public interface IGT_RecipeAdder { /** * Add a fuel cell. - * + * * @param input raw stack. should be undamaged. * @param output depleted stack * @param aMox true if has mox behavior, false if uranium behavior. -- cgit