Skip to content

Commit a1bf50c

Browse files
committed
deepslate ores use the correct texture again
1 parent feebfb3 commit a1bf50c

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

src/client/java/aztech/modern_industrialization/textures/PartTextureGenerator.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,12 @@ private void processHotIngot() {
159159
private void processOre(Block stoneType, MaterialOreSet oreSet) throws IOException {
160160
String template = String.format("modern_industrialization:textures/materialsets/ores/%s.png", oreSet.name);
161161
String stoneId = BuiltInRegistries.BLOCK.getKey(stoneType).getPath();
162-
String prefix = "";
162+
String prefix;
163+
if (stoneId.equals("stone")) {
164+
prefix = "";
165+
} else {
166+
prefix = stoneId + "_";
167+
}
163168

164169
String from = switch (oreSet) {
165170
case IRON -> "%siron_ore".formatted(prefix);
@@ -177,7 +182,6 @@ private void processOre(Block stoneType, MaterialOreSet oreSet) throws IOExcepti
177182
if (!stoneId.equals("stone") && !stoneId.equals("deepslate")) {
178183
from = stoneId;
179184
}
180-
181185
try (NativeImage image = mtm.getAssetAsTexture(String.format("minecraft:textures/block/%s.png", from));
182186
NativeImage top = mtm.getAssetAsTexture(template)) {
183187

src/main/java/aztech/modern_industrialization/compat/kubejs/material/PartJsonCreator.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,15 @@
3232
import aztech.modern_industrialization.materials.set.MaterialOreSet;
3333
import aztech.modern_industrialization.materials.set.MaterialRawSet;
3434
import aztech.modern_industrialization.nuclear.NuclearConstant;
35-
import aztech.modern_industrialization.util.TagHelper;
3635
import com.google.gson.JsonObject;
3736
import net.minecraft.core.registries.BuiltInRegistries;
3837
import net.minecraft.core.registries.Registries;
3938
import net.minecraft.resources.ResourceLocation;
4039
import net.minecraft.tags.BiomeTags;
4140
import net.minecraft.tags.TagKey;
42-
import net.minecraft.tags.TagManager;
4341
import net.minecraft.util.valueproviders.UniformInt;
4442
import net.minecraft.world.level.biome.Biome;
45-
import net.minecraft.world.level.biome.BiomeResolver;
4643
import net.minecraft.world.level.block.Block;
47-
import net.neoforged.neoforge.common.Tags;
48-
import net.neoforged.neoforge.registries.NeoForgeRegistries;
4944

5045
public class PartJsonCreator {
5146

@@ -144,7 +139,7 @@ public PartTemplate orePart(JsonObject json, Block stoneType) {
144139

145140
if (generate) {
146141
TagKey<Biome> biomeTag = BiomeTags.IS_OVERWORLD;
147-
if(json.has("biome_tag")) {
142+
if (json.has("biome_tag")) {
148143
biomeTag = TagKey.create(Registries.BIOME, ResourceLocation.parse(json.get("biome_tag").getAsString()));
149144
}
150145
int veinSize = json.get("vein_size").getAsInt();

src/main/java/aztech/modern_industrialization/materials/part/OrePart.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import net.minecraft.util.valueproviders.UniformInt;
5050
import net.minecraft.world.level.biome.Biome;
5151
import net.minecraft.world.level.block.Block;
52-
import net.minecraft.world.level.dimension.BuiltinDimensionTypes;
5352
import net.minecraft.world.level.levelgen.GenerationStep;
5453
import net.minecraft.world.level.levelgen.VerticalAnchor;
5554
import net.minecraft.world.level.levelgen.feature.Feature;
@@ -223,7 +222,8 @@ public static class OrePartParams {
223222
public final int veinSize;
224223
public final int maxYLevel;
225224

226-
private OrePartParams(UniformInt xpDropped, MaterialOreSet set, boolean generate, int veinsPerChunk, int veinSize, int maxYLevel, TagKey<Biome> biomeTag) {
225+
private OrePartParams(UniformInt xpDropped, MaterialOreSet set, boolean generate, int veinsPerChunk, int veinSize, int maxYLevel,
226+
TagKey<Biome> biomeTag) {
227227
this.xpDropped = xpDropped;
228228
this.set = set;
229229
this.generate = generate;
@@ -241,6 +241,7 @@ public OrePartParams(UniformInt xpDropped, MaterialOreSet set) {
241241
public OrePartParams(UniformInt xpDropped, MaterialOreSet set, int veinsPerChunk, int veinSize, int maxYLevel) {
242242
this(xpDropped, set, true, veinsPerChunk, veinSize, maxYLevel, BiomeTags.IS_OVERWORLD);
243243
}
244+
244245
public OrePartParams(UniformInt xpDropped, MaterialOreSet set, int veinsPerChunk, int veinSize, int maxYLevel, TagKey<Biome> biomeTag) {
245246
this(xpDropped, set, true, veinsPerChunk, veinSize, maxYLevel, biomeTag);
246247
}

0 commit comments

Comments
 (0)