From c58331f9d32f216bdb2be4ae1cf0d8d324832bd1 Mon Sep 17 00:00:00 2001 From: trinsdar <30245301+Trinsdar@users.noreply.github.com> Date: Thu, 14 Sep 2023 20:09:57 -0400 Subject: [PATCH] added some missing fluid pipes from gt6, made some fluid pipes acid proof, renamed chrome to chromium --- AntimatterAPI | 2 +- .../muramasa/gregtech/data/GregTechData.java | 11 +++--- .../gregtech/data/GregTechMaterialEvents.java | 34 +++++++++---------- .../muramasa/gregtech/data/Materials.java | 2 +- .../java/muramasa/gregtech/data/TierMaps.java | 4 +-- .../gregtech/loader/MachineRecipeLoader.java | 4 +-- .../gregtech/loader/multi/Blasting.java | 12 +++---- .../events/forge/RemappingEvents.java | 14 ++++++++ 8 files changed, 48 insertions(+), 35 deletions(-) diff --git a/AntimatterAPI b/AntimatterAPI index dc73eb5068..b6724f75d5 160000 --- a/AntimatterAPI +++ b/AntimatterAPI @@ -1 +1 @@ -Subproject commit dc73eb5068d0cd33b7dfea97c45b3314f325a826 +Subproject commit b6724f75d56239d7c4b2375df6d3fe246f2c8015 diff --git a/common/src/main/java/muramasa/gregtech/data/GregTechData.java b/common/src/main/java/muramasa/gregtech/data/GregTechData.java index 7c1f064146..7f9630c3f5 100644 --- a/common/src/main/java/muramasa/gregtech/data/GregTechData.java +++ b/common/src/main/java/muramasa/gregtech/data/GregTechData.java @@ -1,8 +1,6 @@ package muramasa.gregtech.data; import muramasa.antimatter.AntimatterAPI; -import muramasa.antimatter.AntimatterConfig; -import muramasa.antimatter.Ref; import muramasa.antimatter.block.BlockBasic; import muramasa.antimatter.cover.CoverFactory; import muramasa.antimatter.data.AntimatterMaterialTypes; @@ -514,14 +512,17 @@ public Texture[] getTextures() { // it's not in gt6, not sure whether to keep it or not //public static final FluidPipe FLUID_PIPE_BISMUTH_BRONZE = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GTIRef.ID, BismuthBronze, 950, true).caps(1).pressures(800)); //public static final FluidPipe FLUID_PIPE_BLACK_STEEL = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GTIRef.ID, BlackSteel, 1200, true).caps(1).pressures(900)); + public static final FluidPipe FLUID_PIPE_GOLD = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GTIRef.ID, AntimatterMaterials.Gold, 1671, true).acidProof(true).pressures(getPressures(300))); public static final FluidPipe FLUID_PIPE_INVAR = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GTIRef.ID, Invar, 2395, true).caps(1).pressures(getPressures(600))); public static final FluidPipe FLUID_PIPE_STEEL = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GTIRef.ID, Steel, 2557, true).caps(1).pressures(getPressures(600))); - public static final FluidPipe FLUID_PIPE_STAINLESS_STEEL = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GTIRef.ID, StainlessSteel, 2428, true).caps(1).pressures(getPressures(750))); - public static final FluidPipe FLUID_PIPE_NETHERRITE = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GTIRef.ID, AntimatterMaterials.Netherite, 2807, true).caps(1).pressures(getPressures(900))); - public static final FluidPipe FLUID_PIPE_TUNGSTEN = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GTIRef.ID, Tungsten, 4618, true).caps(1).pressures(getPressures(1050))); + public static final FluidPipe FLUID_PIPE_CHROMIUM = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GTIRef.ID, Chromium, 2725, true).acidProof(true).pressures(getPressures(600))); + public static final FluidPipe FLUID_PIPE_STAINLESS_STEEL = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GTIRef.ID, StainlessSteel, 2428, true).acidProof(true).caps(1).pressures(getPressures(750))); + public static final FluidPipe FLUID_PIPE_NETHERRITE = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GTIRef.ID, AntimatterMaterials.Netherite, 2807, true).acidProof(true).caps(1).pressures(getPressures(900))); + public static final FluidPipe FLUID_PIPE_TUNGSTEN = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GTIRef.ID, Tungsten, 4618, true).acidProof(true).caps(1).pressures(getPressures(1050))); public static final FluidPipe FLUID_PIPE_TITANIUM = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GTIRef.ID, Titanium, 1668, true).caps(1).pressures(getPressures(900))); public static final FluidPipe FLUID_PIPE_TUNGSTEN_STEEL = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GTIRef.ID, TungstenSteel, 3587, true).caps(1).pressures(getPressures(1200))); public static final FluidPipe FLUID_PIPE_TUNGSTEN_CARBIDE = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GTIRef.ID, TungstenCarbide, 3837, true).caps(1).pressures(getPressures(1350))); + public static final FluidPipe FLUID_PIPE_VANADIUM_STEEL = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GTIRef.ID, VanadiumSteel, 2591, true).acidProof(true).pressures(getPressures(1200))); public static final FluidPipe FLUID_PIPE_RUBBER = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GTIRef.ID, Rubber, 350, true).caps(1).pressures(getPressures(300))); public static final FluidPipe FLUID_PIPE_PLASTIC = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GTIRef.ID, Polyethylene, 370, true).caps(1).pressures(getPressures(300))); public static final FluidPipe FLUID_PIPE_POLY = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GTIRef.ID, Polytetrafluoroethylene, 327, true).caps(1).pressures(getPressures(150))); diff --git a/common/src/main/java/muramasa/gregtech/data/GregTechMaterialEvents.java b/common/src/main/java/muramasa/gregtech/data/GregTechMaterialEvents.java index fad7ed355c..3a08776ad7 100644 --- a/common/src/main/java/muramasa/gregtech/data/GregTechMaterialEvents.java +++ b/common/src/main/java/muramasa/gregtech/data/GregTechMaterialEvents.java @@ -52,7 +52,7 @@ public static void onMaterialEvent(GregTechMaterialEvent event){ //Scandium, not added event.setMaterial(Titanium).asMetal(1941, 1940, PLATE, ROD_LONG, SCREW, BOLT, RING, GEAR, FRAME, GEAR_SMALL, ROTOR, SPRING).asOre(); event.setMaterial(Vanadium).asMetal(2183, 2183); - event.setMaterial(Chrome).asMetal(2180, 1700, SCREW, BOLT, RING, PLATE, ROTOR); //aka Chromium + event.setMaterial(Chromium).asMetal(2180, 1700, SCREW, BOLT, RING, PLATE, ROTOR); //aka Chromium event.setMaterial(Manganese).asMetal(1519, FOIL).asOre(); //Iron, added by vanilla event.setMaterial(Cobalt).asMetal(1768, 0).asOre(); @@ -583,16 +583,16 @@ private static void processInto(GregTechMaterialEvent event){ event.setMaterial(Cupronickel).mats(of(Copper, 1, Nickel, 1)); event.setMaterial(Electrum).mats(of(Silver, 1, Gold, 1)); event.setMaterial(HSSE).mats(of(HSSG, 6, Cobalt, 1, Manganese, 1, Silicon, 1)); - event.setMaterial(HSSG).mats(of(TungstenSteel, 5, Chrome, 1, Molybdenum, 2, Vanadium, 1)); + event.setMaterial(HSSG).mats(of(TungstenSteel, 5, Chromium, 1, Molybdenum, 2, Vanadium, 1)); event.setMaterial(HSSS).mats(of(HSSG, 6, Iridium, 2, Osmium, 1)); event.setMaterial(Invar).mats(of(Iron, 2, Nickel, 1)); event.setMaterial(IronMagnetic).mats(of(Iron, 1)).elecTicks(52); - event.setMaterial(Kanthal).mats(of(Iron, 1, Aluminium, 1, Chrome, 1)); + event.setMaterial(Kanthal).mats(of(Iron, 1, Aluminium, 1, Chromium, 1)); event.setMaterial(Magnalium).mats(of(Magnesium, 1, Aluminium, 2)); event.setMaterial(NeodymiumMagnetic).mats(of(Neodymium, 1)).elecTicks(122); - event.setMaterial(Nichrome).mats(of(Nickel, 4, Chrome, 1)); + event.setMaterial(Nichrome).mats(of(Nickel, 4, Chromium, 1)); event.setMaterial(NickelZincFerrite).mats(of(Nickel, 1, Zinc, 1, Iron, 4, Oxygen, 8)); - event.setMaterial(NiobiumTitanium).mats(of(Nickel, 4, Chrome, 1)); + event.setMaterial(NiobiumTitanium).mats(of(Nickel, 4, Chromium, 1)); event.setMaterial(Osmiridium).mats(of(Iridium, 3, Osmium, 1)).elecTicks(608); event.setMaterial(RedAlloy).mats(of(Copper, 1, Redstone, 4)); event.setMaterial(RedSteel).mats(of(SterlingSilver, 1, BismuthBronze, 1, Steel, 2, BlackSteel, 4)); @@ -601,13 +601,13 @@ private static void processInto(GregTechMaterialEvent event){ event.setMaterial(Steel).mats(of(Iron, 50, Carbon, 1), 50).elecTicks(2600); event.setMaterial(SteelMagnetic).mats(of(Steel, 1)).elecTicks(52); event.setMaterial(SterlingSilver).mats(of(Copper, 1, Silver, 4)); - event.setMaterial(StainlessSteel).mats(of(Iron, 6, Chrome, 1, Manganese, 1, Nickel, 1)).elecTicks(450); + event.setMaterial(StainlessSteel).mats(of(Iron, 6, Chromium, 1, Manganese, 1, Nickel, 1)).elecTicks(450); event.setMaterial(TinAlloy).mats(of(Tin, 1, Iron, 1)); event.setMaterial(TungstenCarbide).mats(of(Tungsten, 1, Carbon, 1)); event.setMaterial(TungstenSteel).mats(of(Steel, 1, Tungsten, 1)); - event.setMaterial(Ultimet).mats(of(Cobalt, 5, Chrome, 2, Nickel, 1, Molybdenum, 1)).elecTicks(504); + event.setMaterial(Ultimet).mats(of(Cobalt, 5, Chromium, 2, Nickel, 1, Molybdenum, 1)).elecTicks(504); event.setMaterial(VanadiumGallium).mats(of(Vanadium, 3, Gallium, 1)); - event.setMaterial(VanadiumSteel).mats(of(Vanadium, 1, Chrome, 1, Steel, 7)); + event.setMaterial(VanadiumSteel).mats(of(Vanadium, 1, Chromium, 1, Steel, 7)); event.setMaterial(WroughtIron).mats(of(Iron, 1)); event.setMaterial(YttriumBariumCuprate).mats(of(Yttrium, 1, Barium, 2, Copper, 3, Oxygen, 7)); /** @@ -687,7 +687,7 @@ private static void processInto(GregTechMaterialEvent event){ event.setMaterial(Cassiterite).mats(of(Tin, 1, Oxygen, 2), 1).elecTicks(132); event.setMaterial(Chalcopyrite).mats(of(Copper, 1, Iron, 1, Sulfur, 2)).elecTicks(168); event.setMaterial(Cinnabar).mats(of(Mercury, 1, Sulfur, 1)); - event.setMaterial(Chromite).mats(of(Iron, 1, Chrome, 2, Oxygen, 4)).elecTicks(210); + event.setMaterial(Chromite).mats(of(Iron, 1, Chromium, 2, Oxygen, 4)).elecTicks(210); event.setMaterial(Cobaltite).mats(of(Cobalt, 1, Arsenic, 1, Sulfur, 1)).elecTicks(150); event.setMaterial(Cooperite).mats(of(Platinum, 3, Nickel, 1, Sulfur, 1, Palladium, 1)); event.setMaterial(Galena).mats(of(Lead, 3, Silver, 3, Sulfur, 2)).elecTicks(832); @@ -720,7 +720,7 @@ private static void processInto(GregTechMaterialEvent event){ event.setMaterial(Tetrahedrite).mats(of(Copper, 3, Antimony, 1, Sulfur, 3, Iron, 1)); event.setMaterial(Tungstate).mats(of(Tungsten, 1, Lithium, 2, Oxygen, 4)).elecTicks(120); event.setMaterial(Uraninite).mats(of(Uranium, 1, Oxygen, 2)); - event.setMaterial(Uvarovite).mats(of(Calcium, 3, Chrome, 2, Silicon, 3, Oxygen, 12)).elecTicks(480); + event.setMaterial(Uvarovite).mats(of(Calcium, 3, Chromium, 2, Silicon, 3, Oxygen, 12)).elecTicks(480); event.setMaterial(VanadiumMagnetite).mats(of(Magnetite, 1, Vanadium, 1)); event.setMaterial(Wulfenite).mats(of(Lead, 1, Molybdenum, 1, Oxygen, 4)); event.setMaterial(YellowLimonite).mats(of(Iron, 1, Hydrogen, 1, Oxygen, 2)); @@ -748,7 +748,7 @@ private static void processInto(GregTechMaterialEvent event){ event.setMaterial(Phosphorus).mats(of(Calcium, 3, Phosphate, 2)); event.setMaterial(MilkyQuartz).mats(of(Silicon, 1, Oxygen, 2)).elecTicks(60); event.setMaterial(RedGarnet).mats(of(Pyrope, 3, Almandine, 5, Spessartine, 8)); - event.setMaterial(Ruby).mats(of(Chrome, 1, Alumina, 5)).elecTicks(144); + event.setMaterial(Ruby).mats(of(Chromium, 1, Alumina, 5)).elecTicks(144); event.setMaterial(Sodalite).mats(of(Alumina, 3, SiliconDioxide, 3, Sodium, 4, Chlorine, 1)).elecTicks(264); event.setMaterial(Tanzanite).mats(of(Alumina, 15, Calcium, 4, SiliconDioxide, 18, DistilledWater, 3, Oxygen, 4)).elecTicks(440); event.setMaterial(Topaz).mats(of(Alumina, 5, SiliconDioxide, 3, Fluorine, 2, DistilledWater, 3)).elecTicks(208); @@ -938,7 +938,7 @@ private static void toolsAndArmor(GregTechMaterialEvent event){ */ event.setMaterial(Beryllium).addTools(2.0F, 14.0F, 64, 2); event.setMaterial(Titanium).addTools(3.0F, 8.0F, 2560, 3, of(Enchantments.SHARPNESS, 3)); - event.setMaterial(Chrome).addTools(3.0F, 11.0F, 256, 3); + event.setMaterial(Chromium).addTools(3.0F, 11.0F, 256, 3); event.setMaterial(Manganese).addTools(2.0F, 7.0F, 256, 2); event.setMaterial(Cobalt).addTools(3.0F, 5.0F, 256, 3); event.setMaterial(Nickel).addTools(2.0F, 6.0F, 64, 2, of(Enchantments.BANE_OF_ARTHROPODS, 2)).harvestLevel(2); @@ -1298,7 +1298,7 @@ public static void byproducts(GregTechMaterialEvent event){ event.setMaterial(Calcite).addByProduct(Andradite, Malachite); event.setMaterial(Cassiterite).addByProduct(Tin); event.setMaterial(Chalcopyrite).addByProduct(Pyrite, Cobalt, Cadmium, Gold); - event.setMaterial(Chrome).addByProduct(Iron, Magnesium); + event.setMaterial(Chromium).addByProduct(Iron, Magnesium); event.setMaterial(Chromite).addByProduct(Iron, Magnesium); event.setMaterial(Cinnabar).addByProduct(Redstone, Sulfur, Glowstone); event.setMaterial(Clay).addByProduct(Clay); @@ -1333,7 +1333,7 @@ public static void byproducts(GregTechMaterialEvent event){ event.setMaterial(Magnesium).addByProduct(Olivine); event.setMaterial(Magnetite).addByProduct(Iron, Gold); event.setMaterial(Malachite).addByProduct(Copper, BrownLimonite, Calcite); - event.setMaterial(Manganese).addByProduct(Chrome, Iron); + event.setMaterial(Manganese).addByProduct(Chromium, Iron); event.setMaterial(Marble).addByProduct(Calcite); event.setMaterial(Molybdenite).addByProduct(Molybdenum); event.setMaterial(Naquadah).addByProduct(EnrichedNaquadah); @@ -1361,7 +1361,7 @@ public static void byproducts(GregTechMaterialEvent event){ event.setMaterial(Redstone).addByProduct(Cinnabar, RareEarth, Glowstone); event.setMaterial(RedGranite).addByProduct(PotassiumFeldspar); event.setMaterial(RockSalt).addByProduct(Salt); - event.setMaterial(Ruby).addByProduct(Chrome, RedGarnet); + event.setMaterial(Ruby).addByProduct(Chromium, RedGarnet); event.setMaterial(Salt).addByProduct(RockSalt); event.setMaterial(Saltpeter).addByProduct(Saltpeter); event.setMaterial(Scheelite).addByProduct(Manganese, Molybdenum, Calcium).elecTicks(120); //1920 eu/tick @@ -1383,7 +1383,7 @@ public static void byproducts(GregTechMaterialEvent event){ event.setMaterial(Tungsten).addByProduct(Manganese, Molybdenum); event.setMaterial(Uraninite).addByProduct(Uranium, Thorium, Plutonium); //event.setMaterial(Uranium).addByProduct(Lead, Thorium, Plutonium); - event.setMaterial(Uvarovite).addByProduct(YellowGarnet, Chrome); + event.setMaterial(Uvarovite).addByProduct(YellowGarnet, Chromium); event.setMaterial(VanadiumMagnetite).addByProduct(Magnetite, Vanadium); event.setMaterial(YellowGarnet).addByProduct(Andradite, Grossular, Uvarovite); event.setMaterial(YellowLimonite).addByProduct(Nickel, BrownLimonite, Cobalt); @@ -1487,7 +1487,7 @@ private static void flags(GregTechMaterialEvent event){ ELEC.add(ELEC90.all().toArray(new Material[0])); ELEC.add(ELEC120.all().toArray(new Material[0])); ELECSEPG.add(VanadiumMagnetite, Magnetite); - ELECSEPI.add(YellowLimonite, BrownLimonite, Tin, Chrome, Ilmenite, BandedIron, Pyrite, Glauconite, Nickel, Chromite, Pentlandite, Manganese); + ELECSEPI.add(YellowLimonite, BrownLimonite, Tin, Chromium, Ilmenite, BandedIron, Pyrite, Glauconite, Nickel, Chromite, Pentlandite, Manganese); ELECSEPN.add(Monazite, Bastnasite); GRINDABLE.add(/* Paper, */Coal, Charcoal, Lignite, Lead, Tin, SolderingAlloy, Flint, Gold, Silver, Iron, IronMagnetic, Steel, SteelMagnetic, Zinc, Antimony, Copper, AnnealedCopper, Bronze, Nickel, Invar, diff --git a/common/src/main/java/muramasa/gregtech/data/Materials.java b/common/src/main/java/muramasa/gregtech/data/Materials.java index 37cb2849ae..9203ce6028 100644 --- a/common/src/main/java/muramasa/gregtech/data/Materials.java +++ b/common/src/main/java/muramasa/gregtech/data/Materials.java @@ -40,7 +40,7 @@ public class Materials { public static Material Calcium = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "calcium", 0xfff5f5, METALLIC, Ca)); public static Material Titanium = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "titanium", 0xdca0f0, METALLIC, Ti)); public static Material Vanadium = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "vanadium", 0x323232, METALLIC, V)); - public static Material Chrome = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "chrome", 0xffe6e6, SHINY, Cr)); + public static Material Chromium = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "chromium", 0xffe6e6, SHINY, Cr)); public static Material Manganese = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "manganese", 0xfafafa, DULL, Mn)); public static Material Cobalt = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "cobalt", 0x5050fa, METALLIC, Co)); public static Material Nickel = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "nickel", 0xc8c8fa, METALLIC, Ni)); diff --git a/common/src/main/java/muramasa/gregtech/data/TierMaps.java b/common/src/main/java/muramasa/gregtech/data/TierMaps.java index a4eb5a6918..61cd7ea0ad 100644 --- a/common/src/main/java/muramasa/gregtech/data/TierMaps.java +++ b/common/src/main/java/muramasa/gregtech/data/TierMaps.java @@ -63,7 +63,7 @@ public class TierMaps { builder.put(Tier.HV, StainlessSteel); builder.put(Tier.EV, Titanium); builder.put(Tier.IV, TungstenSteel); - builder.put(LUV, Chrome); + builder.put(LUV, Chromium); builder.put(ZPM, Iridium); builder.put(UV, Osmium); builder.put(UHV, Neutronium); @@ -165,7 +165,7 @@ public static void providerInit() { ImmutableMap.Builder builder = ImmutableMap.builder(); builder.put(Tier.LV, Brass); builder.put(Tier.MV, Electrum); - builder.put(Tier.HV, Chrome); + builder.put(Tier.HV, Chromium); builder.put(Tier.EV, Platinum); builder.put(Tier.IV, Osmium); EMITTER_RODS = builder.build(); diff --git a/common/src/main/java/muramasa/gregtech/loader/MachineRecipeLoader.java b/common/src/main/java/muramasa/gregtech/loader/MachineRecipeLoader.java index 0f6c9a70f9..6d1d5df683 100644 --- a/common/src/main/java/muramasa/gregtech/loader/MachineRecipeLoader.java +++ b/common/src/main/java/muramasa/gregtech/loader/MachineRecipeLoader.java @@ -88,7 +88,7 @@ public static void init() { //Material Gen Recipes FUSION.RB().fi(Beryllium.getLiquid(16), Tungsten.getLiquid(16)).fo(Platinum.getLiquid(16)).add("beryllium",32, 32768, 150000000); FUSION.RB().fi(Neodymium.getLiquid(16), Hydrogen.getGas(16)).fo(Europium.getLiquid(16)).add("europium",64, 24576, 150000000); - FUSION.RB().fi(Lutetium.getLiquid(16), Chrome.getLiquid(16)).fo(Americium.getLiquid(16)).add("americium",96, 49152, 200000000); + FUSION.RB().fi(Lutetium.getLiquid(16), Chromium.getLiquid(16)).fo(Americium.getLiquid(16)).add("americium",96, 49152, 200000000); FUSION.RB().fi(Plutonium.getLiquid(16), Thorium.getLiquid(16)).fo(Naquadah.getLiquid(16)).add("naquadah",64, 32768, 300000000); FUSION.RB().fi(Americium.getLiquid(16), Naquadria.getLiquid(16)).fo(Neutronium.getLiquid(1)).add("neutronium",1200, 98304, 600000000); FUSION.RB().fi(Lithium.getLiquid(16), Tungsten.getLiquid(16), Iridium.getLiquid(16)).add("iridium",32, 32768, 300000000); @@ -97,7 +97,7 @@ public static void init() { FUSION.RB().fi(Mercury.getLiquid(16), Magnesium.getLiquid(16)).fo(Uranium.getLiquid(16)).add("uranium",64, 49152, 240000000); FUSION.RB().fi(Gold.getLiquid(16), Aluminium.getLiquid(16)).fo(Uranium.getLiquid(16)).add("uranium_2",64, 49152, 240000000); FUSION.RB().fi(Uranium.getLiquid(16), Helium.getGas(16)).fo(Plutonium.getLiquid(16)).add("plutonium",128, 49152, 480000000); - FUSION.RB().fi(Vanadium.getLiquid(16), Hydrogen.getGas(125)).fo(Chrome.getLiquid(16)).add("chrome",64, 24576, 140000000); + FUSION.RB().fi(Vanadium.getLiquid(16), Hydrogen.getGas(125)).fo(Chromium.getLiquid(16)).add("chrome",64, 24576, 140000000); FUSION.RB().fi(Gallium.getLiquid(16), Radon.getGas(125)).fo(Duranium.getLiquid(16)).add("duranium",64, 16384, 140000000); FUSION.RB().fi(Titanium.getLiquid(16), Duranium.getLiquid(125)).fo(Tritanium.getLiquid(16)).add("tritanium",64, 32768, 200000000); FUSION.RB().fi(Gold.getLiquid(16), Mercury.getLiquid(16)).fo(Radon.getGas(125)).add("radon",64, 32768, 200000000); diff --git a/common/src/main/java/muramasa/gregtech/loader/multi/Blasting.java b/common/src/main/java/muramasa/gregtech/loader/multi/Blasting.java index 6b585146f2..eb535a7023 100644 --- a/common/src/main/java/muramasa/gregtech/loader/multi/Blasting.java +++ b/common/src/main/java/muramasa/gregtech/loader/multi/Blasting.java @@ -2,11 +2,9 @@ import muramasa.antimatter.data.AntimatterMaterials; import muramasa.antimatter.material.Material; -import muramasa.antimatter.material.MaterialTags; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import muramasa.gregtech.GTIRef; import muramasa.gregtech.data.GregTechMaterialTags; -import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -123,7 +121,7 @@ public static void init() { .io(NUGGET.get(Aluminium, 3), DUST_TINY.get(DarkAsh, 1)) .add("aluminium_ingot_from_green_sapphire", 400, 100); /* Stainless Steel*/ - BLASTING.RB().temperature(1700).ii(DUST.getMaterialIngredient(AntimatterMaterials.Iron, 6), DUST.getMaterialIngredient(Nickel, 1), DUST.getMaterialIngredient(Manganese, 1), DUST.getMaterialIngredient(Chrome, 1)) + BLASTING.RB().temperature(1700).ii(DUST.getMaterialIngredient(AntimatterMaterials.Iron, 6), DUST.getMaterialIngredient(Nickel, 1), DUST.getMaterialIngredient(Manganese, 1), DUST.getMaterialIngredient(Chromium, 1)) .io(INGOT.get(StainlessSteel, 9), DUST_SMALL.get(DarkAsh, 1)) .add("stainless_steel_ingot", 1000, 120); /* TITANIUM */ @@ -147,15 +145,15 @@ public static void init() { .io(INGOT_HOT.get(VanadiumGallium, 4)) .add("vanadium_gallium_ingot", 225 * 20, 480); /* Vanadium Steel*/ - BLASTING.RB().temperature(1453).ii(DUST.getMaterialIngredient(Vanadium, 1), DUST.getMaterialIngredient(Chrome, 1), DUST.getMaterialIngredient(Steel, 7)) + BLASTING.RB().temperature(1453).ii(DUST.getMaterialIngredient(Vanadium, 1), DUST.getMaterialIngredient(Chromium, 1), DUST.getMaterialIngredient(Steel, 7)) .io(INGOT.get(VanadiumSteel, 9)) .add("vanadium_steel_ingot", 225 * 20, 120); /* Kanthal*/ - BLASTING.RB().temperature(1800).ii(DUST.getMaterialIngredient(AntimatterMaterials.Iron, 1), DUST.getMaterialIngredient(Aluminium, 1), DUST.getMaterialIngredient(Chrome, 1)) + BLASTING.RB().temperature(1800).ii(DUST.getMaterialIngredient(AntimatterMaterials.Iron, 1), DUST.getMaterialIngredient(Aluminium, 1), DUST.getMaterialIngredient(Chromium, 1)) .io(INGOT_HOT.get(Kanthal, 3), DUST_SMALL.get(DarkAsh, 1)) .add("kanthal_ingot", 90 * 20, 120); /* Nichrome*/ - BLASTING.RB().temperature(2700).ii(DUST.getMaterialIngredient(Nickel, 4), DUST.getMaterialIngredient(Chrome, 1)) + BLASTING.RB().temperature(2700).ii(DUST.getMaterialIngredient(Nickel, 4), DUST.getMaterialIngredient(Chromium, 1)) .io(INGOT_HOT.get(Nichrome, 5), DUST_SMALL.get(DarkAsh, 2)) .add("nichrome_ingot", 135 * 20, 480); /* Osmiridium*/ @@ -178,7 +176,7 @@ public static void init() { BLASTING.RB().temperature(1300).ii(DUST.getMaterialIngredient(RoseGold, 1), DUST.getMaterialIngredient(Brass, 1), DUST.getMaterialIngredient(Steel, 2), DUST.getMaterialIngredient(BlackSteel, 4)) .io(INGOT.get(RedSteel, 8)) .add("red_steel_ingot", 65 * 20, 120); - BLASTING.RB().temperature(4500).ii(DUST.getMaterialIngredient(TungstenSteel, 5), DUST.getMaterialIngredient(Chrome, 1), DUST.getMaterialIngredient(Molybdenum, 2), DUST.getMaterialIngredient(Vanadium, 1)) + BLASTING.RB().temperature(4500).ii(DUST.getMaterialIngredient(TungstenSteel, 5), DUST.getMaterialIngredient(Chromium, 1), DUST.getMaterialIngredient(Molybdenum, 2), DUST.getMaterialIngredient(Vanadium, 1)) .io(INGOT_HOT.get(HSSG, 9)) .add("hssg_ingot", 450 * 20, 120); BLASTING.RB().temperature(5400).ii(DUST.getMaterialIngredient(HSSG, 6), DUST.getMaterialIngredient(Cobalt, 1), DUST.getMaterialIngredient(Manganese, 1), DUST.getMaterialIngredient(Silicon, 1)) diff --git a/forge/src/main/java/muramasa/gregtech/events/forge/RemappingEvents.java b/forge/src/main/java/muramasa/gregtech/events/forge/RemappingEvents.java index 7b0bd77a2e..3534323618 100644 --- a/forge/src/main/java/muramasa/gregtech/events/forge/RemappingEvents.java +++ b/forge/src/main/java/muramasa/gregtech/events/forge/RemappingEvents.java @@ -176,6 +176,13 @@ public static void remapMissingBlocks(final RegistryEvent.MissingMappings return; } } + if (id.contains("chrome")){ + Block block = AntimatterAPI.get(Block.class, id.replace("chrome", "chromium").replace("granite_black", "black_granite").replace("granite_red", "red_granite"), Ref.SHARED_ID); + if (block != null){ + map.remap(block); + return; + } + } if (id.contains("aluminium")){ Block block = AntimatterAPI.get(Block.class, id.replace("aluminium", "alumina").replace("granite_black", "black_granite").replace("granite_red", "red_granite"), Ref.SHARED_ID); if (block != null){ @@ -345,6 +352,13 @@ public static void remapMissingItems(final RegistryEvent.MissingMappings e return; } } + if (id.contains("chrome")){ + Item block = AntimatterAPI.get(Item.class, id.replace("chrome", "chromium").replace("granite_black", "black_granite").replace("granite_red", "red_granite"), Ref.SHARED_ID); + if (block != null){ + map.remap(block); + return; + } + } if (id.contains("aluminium")){ Item block = AntimatterAPI.get(Item.class, id.replace("aluminium", "alumina").replace("granite_black", "black_granite").replace("granite_red", "red_granite"), Ref.SHARED_ID); if (block != null){