diff --git a/common/src/main/java/muramasa/gregtech/data/Materials.java b/common/src/main/java/muramasa/gregtech/data/Materials.java index 50782e94f0..048392595f 100644 --- a/common/src/main/java/muramasa/gregtech/data/Materials.java +++ b/common/src/main/java/muramasa/gregtech/data/Materials.java @@ -337,7 +337,7 @@ public class Materials { public static Material AluminiumTrichloride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "aluminium_trichloride", 0xf0d77d, FINE)); public static Material Aluminosilicate = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "aluminosilicate", 0xbfbdb0, FINE)); - public static Material AmmoniumChloride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "aammonium_chloride", 0xffffff, DULL)); + public static Material AmmoniumChloride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "ammonium_chloride", 0xffffff, DULL)); public static Material AntimonyTrioxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "antimony_trioxide", 0xe6e6f0, DULL)); public static Material ArsenicTrioxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "arsenic_trioxide", 0xffffff, SHINY)); public static Material Ash = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "ash", 0x969696, DULL)); @@ -581,7 +581,7 @@ public class Materials { **/ public static Material Antimatter = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "anti_matter", 0x8000c4, NONE)); - public static Material BlueVitriol = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "blue_vitriol_water_solution", 0xffffff, NONE)); + public static Material BlueVitriol = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "blue_vitriol_water_solution", 0x4242DE, NONE)); public static Material CalciumAcetateSolution = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "calcium_acetate_solution", 0xDCC8B4, NONE)); public static Material Coolant = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "coolant", 0x0506be, NONE)); diff --git a/common/src/main/java/muramasa/gregtech/datagen/GregTechLocalizations.java b/common/src/main/java/muramasa/gregtech/datagen/GregTechLocalizations.java index 4673860f8c..013e83dc64 100644 --- a/common/src/main/java/muramasa/gregtech/datagen/GregTechLocalizations.java +++ b/common/src/main/java/muramasa/gregtech/datagen/GregTechLocalizations.java @@ -64,6 +64,7 @@ protected void english(String domain, String locale) { AntimatterAPI.all(ItemIntCircuit.class, domain).forEach(i -> add(i, "Integrated Circuit (" + i.circuitId + ")")); AntimatterAPI.all(ItemBasic.class, domain).stream().filter(i -> i.getId().startsWith("circuit")).forEach(i -> override(i.getDescriptionId(), lowerUnderscoreToUpperSpacedRotated(i.getId()))); AntimatterAPI.all(ItemBattery.class, domain).stream().filter(i -> i.getId().startsWith("battery")).forEach(i -> override(i.getDescriptionId(), lowerUnderscoreToUpperSpacedRotated(i.getId()))); +// AntimatterAPI.all(ItemPowerUnit.class, domain).stream().filter(i -> i.getId().startsWith("power_unit") || i.getId().startsWith("small_power_unit")).forEach(i -> override(i.getDescriptionId(), lowerUnderscoreToUpperSpaced(i.getId()))); override("machine.large_turbine.hv", "Large Steam Turbine"); override("machine.large_turbine.ev", "Large Gas Turbine"); override("machine.large_turbine.iv", "Large HP Steam Turbine"); diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/ChemicalBath.java b/common/src/main/java/muramasa/gregtech/loader/machines/ChemicalBath.java index bb6b6791d9..59e74eb886 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/ChemicalBath.java +++ b/common/src/main/java/muramasa/gregtech/loader/machines/ChemicalBath.java @@ -5,8 +5,10 @@ import muramasa.gregtech.data.GregTechData; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; - import static muramasa.antimatter.Ref.L; +import static muramasa.antimatter.data.AntimatterMaterialTypes.GEM; +import static muramasa.antimatter.data.AntimatterMaterials.Netherite; +import static muramasa.antimatter.data.AntimatterMaterials.NetherizedDiamond; import static muramasa.gregtech.data.GregTechMaterialTags.CHEMBATH_MERCURY; import static muramasa.gregtech.data.GregTechMaterialTags.CHEMBATH_PERSULFATE; import static muramasa.gregtech.data.Materials.*; @@ -29,6 +31,11 @@ public static void init() { .fi(Radon.getGas(1250)) .io(new ItemStack(GregTechData.QuantumStar)) .add("quantum_star",96*20,384); + CHEMICAL_BATHING.RB() + .ii(RecipeIngredient.of(Items.DIAMOND,1)) + .fi(Netherite.getLiquid(L/4)) + .io(GEM.get(NetherizedDiamond)) + .add("netherized_diamond_recipe",144,384); mercurybathing(); persulfatebathing(); } diff --git a/common/src/main/resources/assets/gti/models/block/machine/overlay/multi_smelter/north.json b/common/src/main/resources/assets/gti/models/block/machine/overlay/multi_smelter/north.json index d279c7a3e7..0e3b89d45b 100644 --- a/common/src/main/resources/assets/gti/models/block/machine/overlay/multi_smelter/north.json +++ b/common/src/main/resources/assets/gti/models/block/machine/overlay/multi_smelter/north.json @@ -1,17 +1,20 @@ { + "credit": "Made with Blockbench", "elements": [ { - "from": [0, 0, 16], - "to": [16, 16, 16], + "from": [0, 0, 0], + "to": [16, 16, 0], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "south": {"uv": [0, 0, 16, 16], "texture": "#base", "tintindex": 0} + "north": {"uv": [0, 0, 16, 16], "texture": "#base", "tintindex": 0} } }, { - "from": [0, 0, 16], - "to": [16, 16, 16], + "from": [0, 0, 0], + "to": [16, 16, 0], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "south": {"uv": [0, 0, 16, 16], "texture": "#overlay", "tintindex": 1} + "north": {"uv": [0, 0, 16, 16], "texture": "#overlay", "tintindex": 1} } } ] diff --git a/common/src/main/resources/assets/gti/models/block/machine/overlay/multi_smelter/south.json b/common/src/main/resources/assets/gti/models/block/machine/overlay/multi_smelter/south.json index 8d2eed3094..b867825f88 100644 --- a/common/src/main/resources/assets/gti/models/block/machine/overlay/multi_smelter/south.json +++ b/common/src/main/resources/assets/gti/models/block/machine/overlay/multi_smelter/south.json @@ -1,175 +1,199 @@ { + "credit": "Made with Blockbench", "elements": [ { - "from": [3, 6, 0.498], - "to": [13, 13, 0.498], + "from": [3, 6, 15.502], + "to": [13, 13, 15.502], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [3, 3, 13, 10], "texture": "#overlay", "tintindex": 1} + "south": {"uv": [3, 3, 13, 10], "texture": "#overlay", "tintindex": 1} } }, { - "from": [9, 13, 0], - "to": [14, 14, 0.5], + "from": [2, 13, 15.5], + "to": [7, 14, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 2, 7, 3], "texture": "#overlay", "tintindex": 1}, - "down": {"uv": [2, 2, 7, 2.5], "texture": "#overlay", "tintindex": 1} + "south": {"uv": [2, 2, 7, 3], "texture": "#overlay", "tintindex": 1}, + "down": {"uv": [2, 2, 7, 2.5], "rotation": 180, "texture": "#overlay", "tintindex": 1} } }, { - "from": [2, 13, 0], - "to": [7, 14, 0.5], + "from": [9, 13, 15.5], + "to": [14, 14, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [9, 2, 14, 3], "texture": "#overlay", "tintindex": 1}, - "down": {"uv": [9, 2, 14, 2.5], "texture": "#overlay", "tintindex": 1} + "south": {"uv": [9, 2, 14, 3], "texture": "#overlay", "tintindex": 1}, + "down": {"uv": [9, 2, 14, 2.5], "rotation": 180, "texture": "#overlay", "tintindex": 1} } }, { - "from": [13, 6, 0], - "to": [14, 13, 0.5], + "from": [2, 6, 15.5], + "to": [3, 13, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 3, 3, 10], "texture": "#overlay", "tintindex": 1}, - "west": {"uv": [2, 3, 2.5, 10], "texture": "#overlay", "tintindex": 1} + "east": {"uv": [2, 3, 2.5, 10], "texture": "#overlay", "tintindex": 1}, + "south": {"uv": [2, 3, 3, 10], "texture": "#overlay", "tintindex": 1} } }, { - "from": [2, 8, 0], - "to": [3, 13, 0.5], + "from": [13, 8, 15.5], + "to": [14, 13, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [13, 3, 14, 8], "texture": "#overlay", "tintindex": 1}, - "east": {"uv": [13, 3, 13.5, 8], "texture": "#overlay", "tintindex": 1} + "south": {"uv": [13, 3, 14, 8], "texture": "#overlay", "tintindex": 1}, + "west": {"uv": [13, 3, 13.5, 8], "texture": "#overlay", "tintindex": 1} } }, { - "from": [2, 7, 0], - "to": [7, 8, 0.5], + "from": [9, 7, 15.5], + "to": [14, 8, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [9, 8, 14, 9], "texture": "#overlay", "tintindex": 1}, - "up": {"uv": [9, 8, 14, 8.5], "texture": "#overlay", "tintindex": 1} + "south": {"uv": [9, 8, 14, 9], "texture": "#overlay", "tintindex": 1}, + "up": {"uv": [9, 8, 14, 8.5], "rotation": 180, "texture": "#overlay", "tintindex": 1} } }, { - "from": [9, 5, 0], - "to": [14, 6, 0.5], + "from": [2, 5, 15.5], + "to": [7, 6, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 10, 7, 11], "texture": "#overlay", "tintindex": 1}, - "up": {"uv": [2, 10, 7, 10.5], "texture": "#overlay", "tintindex": 1} + "south": {"uv": [2, 10, 7, 11], "texture": "#overlay", "tintindex": 1}, + "up": {"uv": [2, 10, 7, 10.5], "rotation": 180, "texture": "#overlay", "tintindex": 1} } }, { - "from": [2, 2, 0], - "to": [14, 4, 0.01], + "from": [2, 2, 15.99], + "to": [14, 4, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 12, 14, 14], "texture": "#overlay", "tintindex": 1} + "south": {"uv": [2, 12, 14, 14], "texture": "#overlay", "tintindex": 1} } }, { - "from": [3, 4, 0], - "to": [4, 7, 0.01], + "from": [12, 4, 15.99], + "to": [13, 7, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [12, 9, 13, 12], "texture": "#overlay", "tintindex": 1} + "south": {"uv": [12, 9, 13, 12], "texture": "#overlay", "tintindex": 1} } }, { - "from": [5, 5, 0], - "to": [6, 7, 0.01], + "from": [10, 5, 15.99], + "to": [11, 7, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [10, 9, 11, 11], "texture": "#overlay", "tintindex": 1} + "south": {"uv": [10, 9, 11, 11], "texture": "#overlay", "tintindex": 1} } }, { - "from": [6, 5, 0], - "to": [9, 6, 0.01], + "from": [7, 5, 15.99], + "to": [10, 6, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [7, 10, 10, 11], "texture": "#overlay", "tintindex": 1} + "south": {"uv": [7, 10, 10, 11], "texture": "#overlay", "tintindex": 1} } }, { - "from": [0, 0, 0], - "to": [16, 2, 0.01], + "from": [0, 0, 15.99], + "to": [16, 2, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#base", "tintindex": 0} + "south": {"uv": [0, 14, 16, 16], "texture": "#base", "tintindex": 0} } }, { - "from": [0, 14, 0], - "to": [16, 16, 0.01], + "from": [0, 14, 15.99], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#base", "tintindex": 0} + "south": {"uv": [0, 0, 16, 2], "texture": "#base", "tintindex": 0} } }, { - "from": [14, 2, 0], - "to": [16, 14, 0.01], + "from": [0, 2, 15.99], + "to": [2, 14, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 2, 2, 14], "texture": "#base", "tintindex": 0} + "south": {"uv": [0, 2, 2, 14], "texture": "#base", "tintindex": 0} } }, { - "from": [0, 2, 0], - "to": [2, 14, 0.01], + "from": [14, 2, 15.99], + "to": [16, 14, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [14, 2, 16, 14], "texture": "#base", "tintindex": 0} + "south": {"uv": [14, 2, 16, 14], "texture": "#base", "tintindex": 0} } }, { - "from": [7, 6, 0], - "to": [9, 14, 0.01], + "from": [7, 6, 15.99], + "to": [9, 14, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [7, 2, 9, 10], "texture": "#base", "tintindex": 0} + "south": {"uv": [7, 2, 9, 10], "texture": "#base", "tintindex": 0} } }, { - "from": [4, 4, 0], - "to": [14, 5, 0.01], + "from": [2, 4, 15.99], + "to": [12, 5, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 11, 12, 12], "texture": "#base", "tintindex": 0} + "south": {"uv": [2, 11, 12, 12], "texture": "#base", "tintindex": 0} } }, { - "from": [2, 4, 0], - "to": [3, 7, 0.01], + "from": [13, 4, 15.99], + "to": [14, 7, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [13, 9, 14, 12], "texture": "#base", "tintindex": 0} + "south": {"uv": [13, 9, 14, 12], "texture": "#base", "tintindex": 0} } }, { - "from": [4, 5, 0], - "to": [5, 7, 0.01], + "from": [11, 5, 15.99], + "to": [12, 7, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [11, 9, 12, 11], "texture": "#base", "tintindex": 0} + "south": {"uv": [11, 9, 12, 11], "texture": "#base", "tintindex": 0} } }, { - "from": [6, 6, 0], - "to": [7, 7, 0.01], + "from": [9, 6, 15.99], + "to": [10, 7, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [9, 9, 10, 10], "texture": "#base", "tintindex": 0} + "south": {"uv": [9, 9, 10, 10], "texture": "#base", "tintindex": 0} } }, { - "from": [6, 8, 0], - "to": [7, 13, 0.5], + "from": [9, 8, 15.5], + "to": [10, 13, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [9, 3, 10, 8], "texture": "#overlay", "tintindex": 1}, - "east": {"uv": [13, 3, 13.5, 8], "texture": "#overlay", "tintindex": 1}, - "west": {"uv": [9, 3, 9.5, 8], "texture": "#overlay", "tintindex": 1} + "east": {"uv": [9, 3, 9.5, 8], "texture": "#overlay", "tintindex": 1}, + "south": {"uv": [9, 3, 10, 8], "texture": "#overlay", "tintindex": 1}, + "west": {"uv": [13, 3, 13.5, 8], "texture": "#overlay", "tintindex": 1} } }, { - "from": [9, 6, 0], - "to": [10, 13, 0.5], + "from": [6, 6, 15.5], + "to": [7, 13, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 3, 3, 10], "texture": "#overlay", "tintindex": 1}, - "east": {"uv": [6, 3, 6.5, 10], "texture": "#overlay", "tintindex": 1}, - "west": {"uv": [2, 3, 2.5, 10], "texture": "#overlay", "tintindex": 1} + "east": {"uv": [2, 3, 2.5, 10], "texture": "#overlay", "tintindex": 1}, + "south": {"uv": [2, 3, 3, 10], "texture": "#overlay", "tintindex": 1}, + "west": {"uv": [6, 3, 6.5, 10], "texture": "#overlay", "tintindex": 1} } }, { - "from": [10, 9, 0], - "to": [13, 10, 0.5], + "from": [3, 9, 15.5], + "to": [6, 10, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [3, 6, 6, 7], "texture": "#overlay", "tintindex": 1}, - "down": {"uv": [2, 2, 7, 2.5], "texture": "#overlay", "tintindex": 1} + "south": {"uv": [3, 6, 6, 7], "texture": "#overlay", "tintindex": 1}, + "down": {"uv": [2, 2, 7, 2.5], "rotation": 180, "texture": "#overlay", "tintindex": 1} } } ]