diff options
15 files changed, 287 insertions, 16 deletions
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 @@ -649,6 +649,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 */ boolean addFluidSmelterRecipe(ItemStack aInput, ItemStack aRemains, FluidStack aOutput, int aChance, int aDuration, @@ -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. diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java index 06734de49e..486035c206 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -1793,6 +1793,23 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { } @Override + public boolean addFluidSolidifierRecipe(final ItemStack[] itemInputs, final FluidStack[] fluidInputs, + final ItemStack[] itemOutputs, final FluidStack[] fluidOutputs, final int EUPerTick, + final int aDurationInTicks) { + GT_Recipe.GT_Recipe_Map.sFluidSolidficationRecipes.addRecipe( + true, + itemInputs, + itemOutputs, + null, + fluidInputs, + fluidOutputs, + aDurationInTicks, + EUPerTick, + 0); + return true; + } + + @Override public boolean addFluidSolidifierRecipe(ItemStack aMold, FluidStack aInput, ItemStack aOutput, int aDuration, int aEUt) { if ((aMold == null) || (aInput == null) || (aOutput == null)) { 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); + + } } } 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 59da1c074b..9fa931d4a9 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 @@ -606,7 +606,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { "gt.blockmetal9", new Materials[] { Materials.Cryolite, Materials.SiliconSG, MaterialsKevlar.NickelAluminide, Materials.SpaceTime, Materials.TranscendentMetal, Materials.Oriharukon, - Materials.WhiteDwarfMatter, Materials.BlackDwarfMatter }, + Materials.WhiteDwarfMatter, Materials.BlackDwarfMatter, Materials.Universium }, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS12); diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index 91bfc45f65..f8eca60b6c 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -9864,15 +9864,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC gregtech.api.enums.GT_Values.V[11], false, false); - makeWires( - Materials.SuperconductorUMVBase, - 2072, - 2L, - 1048576L, - 32L, - gregtech.api.enums.GT_Values.V[12], - false, - false); + makeWires(Materials.SuperconductorUMVBase, 2072, 2L, 1048576L, 32L, GT_Values.V[12], false, false); // Actual superconductors. makeWires(Materials.SuperconductorMV, 2320, 0L, 0L, 4L, gregtech.api.enums.GT_Values.V[2], false, true); diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.space.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.spatialfluid.png Binary files differindex 70d2960f3d..70d2960f3d 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.space.png +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.spatialfluid.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.space.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.spatialfluid.png.mcmeta index 0645f48c62..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.space.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.spatialfluid.png.mcmeta diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.time.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.temporalfluid.png Binary files differindex bd46a8408c..bd46a8408c 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.time.png +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.temporalfluid.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.time.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.temporalfluid.png.mcmeta index 0645f48c62..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.time.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.temporalfluid.png.mcmeta diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_UNIVERSIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_UNIVERSIUM.png Binary files differnew file mode 100644 index 0000000000..abf2afa6de --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_UNIVERSIUM.png |
