Skip to content
This repository has been archived by the owner on Nov 5, 2024. It is now read-only.

fixes #190

Merged
merged 4 commits into from
Sep 5, 2023
Merged

fixes #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f3fa4e
too much aaa and netherized diamond recipe
kotelkonrad Sep 3, 2023
f7981be
Merge pull request #1 from GregTech-Intergalactical/dev-1.18
kotelkonrad Sep 4, 2023
4251f86
replaced multi smelter model json files to model json files from pyro…
kotelkonrad Sep 4, 2023
3821331
changed blue vitriol color
kotelkonrad Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions common/src/main/java/muramasa/gregtech/data/Materials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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));
Expand Down
1 change: 1 addition & 0 deletions common/src/main/java/muramasa/gregtech/datagen/GregTechLocalizations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
9 changes: 8 additions & 1 deletion common/src/main/java/muramasa/gregtech/loader/machines/ChemicalBath.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand All @@ -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();
}
Expand Down
15 changes: 9 additions & 6 deletions common/src/main/resources/assets/gti/models/block/machine/overlay/multi_smelter/north.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
}
}
]
Expand Down
184 changes: 104 additions & 80 deletions common/src/main/resources/assets/gti/models/block/machine/overlay/multi_smelter/south.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
}
}
]
Expand Down
Loading