From 00afa4f58b6159db3f7d805564d71e06896d8926 Mon Sep 17 00:00:00 2001 From: Roelymole Date: Tue, 4 Feb 2025 12:28:39 +0000 Subject: [PATCH 1/6] feat: implement item model override functionality --- .../client/impl/model/MachineModelLoadingPlugin.java | 10 ++++++++-- .../machinelib_testmod/models/machine/mixer.json | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/dev/galacticraft/machinelib/client/impl/model/MachineModelLoadingPlugin.java b/src/main/java/dev/galacticraft/machinelib/client/impl/model/MachineModelLoadingPlugin.java index fbb6a19..0d6f01e 100644 --- a/src/main/java/dev/galacticraft/machinelib/client/impl/model/MachineModelLoadingPlugin.java +++ b/src/main/java/dev/galacticraft/machinelib/client/impl/model/MachineModelLoadingPlugin.java @@ -57,15 +57,21 @@ public class MachineModelLoadingPlugin implements PreparableModelLoadingPlugin> sprites = TextureProvider.CODEC.decode(JsonOps.INSTANCE, json.get("data")); JsonElement baseId = json.get("base"); ResourceLocation base = baseId == null ? context.id().withPath(DEFAULT_MACHINE_BASE) : ResourceLocation.parse(baseId.getAsString()); + ResourceLocation location = ResourceLocation.fromNamespaceAndPath(context.id().getNamespace(), context.id().getPath().replace("machine/", "item/")); MachineUnbakedModel model = new MachineUnbakedModel(sprites.getOrThrow().getFirst(), base); - this.pendingItemModels.put(ResourceLocation.fromNamespaceAndPath(context.id().getNamespace(), context.id().getPath().replace("machine/", "item/")), model); + this.pendingItemModels.put(location, model); + if (json.has("item_override")) { + JsonElement itemOverride = json.get("item_override"); + UnbakedModel unbaked = context.getOrLoadModel(ResourceLocation.parse(itemOverride.getAsString())); + this.pendingItemModels.put(location, unbaked); + } return model; } MachineTextureBase base = this.data.getBase(context.id()); if (base != null) return base; - return this.pendingItemModels.remove(context.id()); //todo: allow overriding item models + return this.pendingItemModels.remove(context.id()); } @Override diff --git a/src/testmod/generated/assets/machinelib_testmod/models/machine/mixer.json b/src/testmod/generated/assets/machinelib_testmod/models/machine/mixer.json index 08a3d4a..5edba4a 100644 --- a/src/testmod/generated/assets/machinelib_testmod/models/machine/mixer.json +++ b/src/testmod/generated/assets/machinelib_testmod/models/machine/mixer.json @@ -1,4 +1,5 @@ { "data": {}, - "machinelib:type": "machine" + "machinelib:type": "machine", + "item_override": "minecraft:block/magenta_glazed_terracotta" } \ No newline at end of file From 5020efaa1ffe07230f264b1372f399add948b60c Mon Sep 17 00:00:00 2001 From: Roelymole Date: Tue, 4 Feb 2025 13:41:58 +0000 Subject: [PATCH 2/6] feat: allow overrides to be specified for the face textures in the side config panel --- .../client/api/screen/MachineScreen.java | 25 +++++++++++++++++-- .../testmod/client/screen/MixerScreen.java | 12 ++++++++- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/src/main/java/dev/galacticraft/machinelib/client/api/screen/MachineScreen.java b/src/main/java/dev/galacticraft/machinelib/client/api/screen/MachineScreen.java index 560e54e..661291e 100644 --- a/src/main/java/dev/galacticraft/machinelib/client/api/screen/MachineScreen.java +++ b/src/main/java/dev/galacticraft/machinelib/client/api/screen/MachineScreen.java @@ -77,7 +77,9 @@ import org.lwjgl.glfw.GLFW; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.UUID; import java.util.concurrent.CompletableFuture; @@ -170,6 +172,10 @@ public class MachineScreen overrides; /** * The skin of the owner of this machine. * Defaults to steve if the skin cannot be found. @@ -201,17 +207,30 @@ public class MachineScreen overrides) { super(menu, menu.playerInventory, title); this.texture = texture; + this.overrides = overrides; UUID owner = this.menu.security.getOwner() == null ? this.menu.player.getUUID() : this.menu.security.getOwner(); this.owner = SkullBlockEntity.fetchGameProfile(owner).thenApply(o -> o.orElse(new GameProfile(owner, "???"))); this.ownerSkin = this.owner.thenCompose(profile -> Minecraft.getInstance().getSkinManager().getOrLoad(profile)); } + /** + * Creates a new screen from the given screen handler. + * + * @param menu The screen handler to create the screen from. + * @param title The title of the screen. + * @param texture The texture of the background screen. + */ + protected MachineScreen(@NotNull Menu menu, @NotNull Component title, @NotNull ResourceLocation texture) { + this(menu, title, texture, new HashMap()); + } + /** * {@return the item requested item, or the fallback item if the item is unavailable} * @@ -382,7 +401,9 @@ protected void drawTitle(@NotNull GuiGraphics graphics) { * @param face the face to draw */ private void drawMachineFace(@NotNull GuiGraphics graphics, int x, int y, @NotNull IOConfig ioConfig, @NotNull BlockFace face) { - if (this.model != null) { + if (this.overrides.containsKey(face)) { + graphics.blitSprite(this.overrides.get(face), x, y, MACHINE_FACE_SIZE, MACHINE_FACE_SIZE); + } else if (this.model != null) { graphics.blit(x, y, 0, MACHINE_FACE_SIZE, MACHINE_FACE_SIZE, this.model.getSprite(this.menu.be.getBlockState(), face, ioConfig)); } } diff --git a/src/testmod/java/dev/galacticraft/machinelib/testmod/client/screen/MixerScreen.java b/src/testmod/java/dev/galacticraft/machinelib/testmod/client/screen/MixerScreen.java index 7921105..2b373bd 100644 --- a/src/testmod/java/dev/galacticraft/machinelib/testmod/client/screen/MixerScreen.java +++ b/src/testmod/java/dev/galacticraft/machinelib/testmod/client/screen/MixerScreen.java @@ -23,6 +23,7 @@ package dev.galacticraft.machinelib.testmod.client.screen; import dev.galacticraft.machinelib.api.menu.MachineMenu; +import dev.galacticraft.machinelib.api.util.BlockFace; import dev.galacticraft.machinelib.client.api.screen.MachineScreen; import dev.galacticraft.machinelib.testmod.Constant; import dev.galacticraft.machinelib.testmod.block.entity.MixerBlockEntity; @@ -31,12 +32,21 @@ import net.minecraft.world.entity.player.Inventory; import org.jetbrains.annotations.NotNull; +import java.util.HashMap; +import java.util.Map; + public class MixerScreen extends MachineScreen> { private static final ResourceLocation TEXTURE = Constant.id("textures/gui/mixer_screen.png"); public MixerScreen(@NotNull MachineMenu menu, @NotNull Inventory inv, @NotNull Component title) { - super(menu, title, TEXTURE); + super(menu, title, TEXTURE, faceOverrides()); this.capacitorX = 8; this.capacitorY = 30; } + + private static Map faceOverrides() { + Map overrides = new HashMap(); + overrides.put(BlockFace.TOP, ResourceLocation.withDefaultNamespace("container/beacon/confirm")); + return overrides; + } } From 59a97405293a83f8e244fe61df1de325ab07f22a Mon Sep 17 00:00:00 2001 From: Roelymole Date: Tue, 4 Feb 2025 16:21:16 +0000 Subject: [PATCH 3/6] refactor: improve the way overrides are specified --- .../client/api/model/TextureProvider.java | 52 +++++++++++++++---- .../client/api/screen/MachineScreen.java | 25 ++------- .../client/impl/model/MachineBakedModel.java | 9 ++++ .../models/machine/mixer.json | 7 +-- .../testmod/client/screen/MixerScreen.java | 8 +-- 5 files changed, 61 insertions(+), 40 deletions(-) diff --git a/src/main/java/dev/galacticraft/machinelib/client/api/model/TextureProvider.java b/src/main/java/dev/galacticraft/machinelib/client/api/model/TextureProvider.java index 496fe6d..7066df2 100644 --- a/src/main/java/dev/galacticraft/machinelib/client/api/model/TextureProvider.java +++ b/src/main/java/dev/galacticraft/machinelib/client/api/model/TextureProvider.java @@ -42,7 +42,7 @@ public record TextureProvider(@Nullable Material front, @Nullable Material back, @Nullable Material left, @Nullable Material right, @Nullable Material top, @Nullable Material bottom, - @Nullable Material particle) { + @Nullable Material particle, @Nullable Material topOverride) { public static final Codec MATERIAL_CODEC = Codec.withAlternative( ResourceLocation.CODEC.flatComapMap(tex -> new Material(TextureAtlas.LOCATION_BLOCKS, tex), mat -> mat.atlasLocation().equals(TextureAtlas.LOCATION_BLOCKS) ? DataResult.success(mat.texture()) : DataResult.error(() -> "not block", mat.texture())), RecordCodecBuilder.create(instance -> instance.group( @@ -57,15 +57,17 @@ public record TextureProvider(@Nullable Material front, @Nullable Material back, MATERIAL_CODEC.optionalFieldOf("right").forGetter(t -> Optional.ofNullable(t.right)), MATERIAL_CODEC.optionalFieldOf("top").forGetter(t -> Optional.ofNullable(t.top)), MATERIAL_CODEC.optionalFieldOf("bottom").forGetter(t -> Optional.ofNullable(t.bottom)), - MATERIAL_CODEC.optionalFieldOf("particle").forGetter(t -> Optional.ofNullable(t.particle)) - ).apply(instance, (a, b, c, d, e, f, g) -> new TextureProvider( + MATERIAL_CODEC.optionalFieldOf("particle").forGetter(t -> Optional.ofNullable(t.particle)), + MATERIAL_CODEC.optionalFieldOf("top_item_override").forGetter(t -> Optional.ofNullable(t.topOverride)) + ).apply(instance, (a, b, c, d, e, f, g, h) -> new TextureProvider( a.orElse(null), b.orElse(null), c.orElse(null), d.orElse(null), e.orElse(null), f.orElse(null), - g.orElse(null) + g.orElse(null), + h.orElse(null) ))); public BoundTextureProvider bind(Function atlas) { @@ -76,7 +78,8 @@ public BoundTextureProvider bind(Function atlas) { this.right != null ? atlas.apply(this.right) : null, this.top != null ? atlas.apply(this.top) : null, this.bottom != null ? atlas.apply(this.bottom) : null, - this.particle != null ? atlas.apply(this.particle) : null + this.particle != null ? atlas.apply(this.particle) : null, + this.topOverride != null ? atlas.apply(this.topOverride) : null ); } @@ -89,11 +92,11 @@ public static TextureProvider.Builder builder(String modId) { } public static TextureProvider none() { - return new TextureProvider(null, null, null, null, null, null, null); + return new TextureProvider(null, null, null, null, null, null, null, null); } public static TextureProvider all(Material material) { - return new TextureProvider(material, material, material, material, material, material, material); + return new TextureProvider(material, material, material, material, material, material, material, null); } public static TextureProvider all(ResourceLocation material) { @@ -113,6 +116,7 @@ public static class Builder { private @Nullable Material top = null; private @Nullable Material bottom = null; private @Nullable Material particle = null; + private @Nullable Material topOverride = null; private Builder(@Nullable String modId) { this.modId = modId; @@ -153,6 +157,11 @@ public Builder particle(String texture) { return this.particle(ResourceLocation.fromNamespaceAndPath(this.modId, texture)); } + public Builder topOverride(String texture) { + Preconditions.checkNotNull(this.modId); + return this.topOverride(ResourceLocation.fromNamespaceAndPath(this.modId, texture)); + } + public Builder all(String texture) { Preconditions.checkNotNull(this.modId); return this.all(ResourceLocation.fromNamespaceAndPath(this.modId, texture)); @@ -191,6 +200,10 @@ public Builder particle(ResourceLocation texture) { return this.particle(new Material(TextureAtlas.LOCATION_BLOCKS, texture)); } + public Builder topOverride(ResourceLocation texture) { + return this.topOverride(new Material(TextureAtlas.LOCATION_BLOCKS, texture)); + } + public Builder all(ResourceLocation texture) { return this.all(new Material(TextureAtlas.LOCATION_BLOCKS, texture)); } @@ -227,6 +240,10 @@ public Builder particle(Block texture) { return this.particle(TextureMapping.getBlockTexture(texture)); } + public Builder topOverride(Block texture) { + return this.topOverride(TextureMapping.getBlockTexture(texture)); + } + public Builder all(Block texture) { return this.all(TextureMapping.getBlockTexture(texture)); } @@ -270,6 +287,11 @@ public Builder particle(Material material) { return this; } + public Builder topOverride(Material material) { + this.topOverride = material; + return this; + } + public Builder all(Material material) { this.front = material; this.back = material; @@ -290,14 +312,14 @@ public Builder sides(Material material) { } public TextureProvider build() { - return new TextureProvider(this.front, this.back, this.left, this.right, this.top, this.bottom, this.particle); + return new TextureProvider(this.front, this.back, this.left, this.right, this.top, this.bottom, this.particle, this.topOverride); } } public record BoundTextureProvider(@Nullable TextureAtlasSprite front, @Nullable TextureAtlasSprite back, @Nullable TextureAtlasSprite left, @Nullable TextureAtlasSprite right, @Nullable TextureAtlasSprite top, @Nullable TextureAtlasSprite bottom, - @Nullable TextureAtlasSprite particle) { + @Nullable TextureAtlasSprite particle, @Nullable TextureAtlasSprite topOverride) { @Nullable public TextureAtlasSprite getSprite(@NotNull BlockFace face) { return switch (face) { @@ -314,5 +336,17 @@ public TextureAtlasSprite getSprite(@NotNull BlockFace face) { public TextureAtlasSprite getParticle() { return this.particle; } + + @Nullable + public TextureAtlasSprite getItemOverride(@NotNull BlockFace face) { + return switch (face) { + case FRONT -> null; + case BACK -> null; + case LEFT -> null; + case RIGHT -> null; + case TOP -> this.topOverride; + case BOTTOM -> null; + }; + } } } diff --git a/src/main/java/dev/galacticraft/machinelib/client/api/screen/MachineScreen.java b/src/main/java/dev/galacticraft/machinelib/client/api/screen/MachineScreen.java index 661291e..123b32c 100644 --- a/src/main/java/dev/galacticraft/machinelib/client/api/screen/MachineScreen.java +++ b/src/main/java/dev/galacticraft/machinelib/client/api/screen/MachineScreen.java @@ -55,6 +55,7 @@ import net.minecraft.client.gui.components.PlayerFaceRenderer; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.client.resources.PlayerSkin; import net.minecraft.client.resources.sounds.SimpleSoundInstance; @@ -172,10 +173,6 @@ public class MachineScreen overrides; /** * The skin of the owner of this machine. * Defaults to steve if the skin cannot be found. @@ -209,28 +206,16 @@ public class MachineScreen overrides) { + protected MachineScreen(@NotNull Menu menu, @NotNull Component title, @NotNull ResourceLocation texture) { super(menu, menu.playerInventory, title); this.texture = texture; - this.overrides = overrides; UUID owner = this.menu.security.getOwner() == null ? this.menu.player.getUUID() : this.menu.security.getOwner(); this.owner = SkullBlockEntity.fetchGameProfile(owner).thenApply(o -> o.orElse(new GameProfile(owner, "???"))); this.ownerSkin = this.owner.thenCompose(profile -> Minecraft.getInstance().getSkinManager().getOrLoad(profile)); } - /** - * Creates a new screen from the given screen handler. - * - * @param menu The screen handler to create the screen from. - * @param title The title of the screen. - * @param texture The texture of the background screen. - */ - protected MachineScreen(@NotNull Menu menu, @NotNull Component title, @NotNull ResourceLocation texture) { - this(menu, title, texture, new HashMap()); - } - /** * {@return the item requested item, or the fallback item if the item is unavailable} * @@ -401,10 +386,8 @@ protected void drawTitle(@NotNull GuiGraphics graphics) { * @param face the face to draw */ private void drawMachineFace(@NotNull GuiGraphics graphics, int x, int y, @NotNull IOConfig ioConfig, @NotNull BlockFace face) { - if (this.overrides.containsKey(face)) { - graphics.blitSprite(this.overrides.get(face), x, y, MACHINE_FACE_SIZE, MACHINE_FACE_SIZE); - } else if (this.model != null) { - graphics.blit(x, y, 0, MACHINE_FACE_SIZE, MACHINE_FACE_SIZE, this.model.getSprite(this.menu.be.getBlockState(), face, ioConfig)); + if (this.model != null) { + graphics.blit(x, y, 0, MACHINE_FACE_SIZE, MACHINE_FACE_SIZE, this.model.getItemOverride(this.menu.be.getBlockState(), face, ioConfig)); } } diff --git a/src/main/java/dev/galacticraft/machinelib/client/impl/model/MachineBakedModel.java b/src/main/java/dev/galacticraft/machinelib/client/impl/model/MachineBakedModel.java index f610d04..e051650 100644 --- a/src/main/java/dev/galacticraft/machinelib/client/impl/model/MachineBakedModel.java +++ b/src/main/java/dev/galacticraft/machinelib/client/impl/model/MachineBakedModel.java @@ -154,10 +154,19 @@ public TextureAtlasSprite getSprite(@Nullable BlockState state, @NotNull BlockFa } } + if (state == null) { + TextureAtlasSprite override = this.provider.getItemOverride(face); + if (override != null) return override; + } TextureAtlasSprite sprite = this.provider.getSprite(face); return sprite == null ? this.base.base() : sprite; } + public TextureAtlasSprite getItemOverride(@Nullable BlockState state, @NotNull BlockFace face, @Nullable IOConfig config) { + TextureAtlasSprite override = this.provider.getItemOverride(face); + return override != null ? override : this.getSprite(state, face, config); + } + public TextureProvider.BoundTextureProvider getProvider() { return provider; } diff --git a/src/testmod/generated/assets/machinelib_testmod/models/machine/mixer.json b/src/testmod/generated/assets/machinelib_testmod/models/machine/mixer.json index 5edba4a..8e69ec8 100644 --- a/src/testmod/generated/assets/machinelib_testmod/models/machine/mixer.json +++ b/src/testmod/generated/assets/machinelib_testmod/models/machine/mixer.json @@ -1,5 +1,6 @@ { - "data": {}, - "machinelib:type": "machine", - "item_override": "minecraft:block/magenta_glazed_terracotta" + "data": { + "top_item_override": "minecraft:block/magenta_glazed_terracotta" + }, + "machinelib:type": "machine" } \ No newline at end of file diff --git a/src/testmod/java/dev/galacticraft/machinelib/testmod/client/screen/MixerScreen.java b/src/testmod/java/dev/galacticraft/machinelib/testmod/client/screen/MixerScreen.java index 2b373bd..6843f79 100644 --- a/src/testmod/java/dev/galacticraft/machinelib/testmod/client/screen/MixerScreen.java +++ b/src/testmod/java/dev/galacticraft/machinelib/testmod/client/screen/MixerScreen.java @@ -39,14 +39,8 @@ public class MixerScreen extends MachineScreen menu, @NotNull Inventory inv, @NotNull Component title) { - super(menu, title, TEXTURE, faceOverrides()); + super(menu, title, TEXTURE); this.capacitorX = 8; this.capacitorY = 30; } - - private static Map faceOverrides() { - Map overrides = new HashMap(); - overrides.put(BlockFace.TOP, ResourceLocation.withDefaultNamespace("container/beacon/confirm")); - return overrides; - } } From ed6ffca30cfb4d30179f763f413951ba38e7ed14 Mon Sep 17 00:00:00 2001 From: Roelymole Date: Tue, 4 Feb 2025 16:31:40 +0000 Subject: [PATCH 4/6] refactor: removed unused imports and replaced magenta glazed terracotta texture for testing with something less jarring --- .../machinelib/client/api/screen/MachineScreen.java | 4 ---- .../assets/machinelib_testmod/models/machine/mixer.json | 2 +- .../machinelib/testmod/client/screen/MixerScreen.java | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/main/java/dev/galacticraft/machinelib/client/api/screen/MachineScreen.java b/src/main/java/dev/galacticraft/machinelib/client/api/screen/MachineScreen.java index 8af8608..5731670 100644 --- a/src/main/java/dev/galacticraft/machinelib/client/api/screen/MachineScreen.java +++ b/src/main/java/dev/galacticraft/machinelib/client/api/screen/MachineScreen.java @@ -55,7 +55,6 @@ import net.minecraft.client.gui.components.PlayerFaceRenderer; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.client.resources.PlayerSkin; import net.minecraft.client.resources.sounds.SimpleSoundInstance; @@ -78,9 +77,7 @@ import org.lwjgl.glfw.GLFW; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.UUID; import java.util.concurrent.CompletableFuture; @@ -208,7 +205,6 @@ public class MachineScreen> { private static final ResourceLocation TEXTURE = Constant.id("textures/gui/mixer_screen.png"); From 90c235ca8bbbd3198fc62c7568efcbc7814b0451 Mon Sep 17 00:00:00 2001 From: Roelymole Date: Tue, 4 Feb 2025 16:41:41 +0000 Subject: [PATCH 5/6] refactor: updated TestModModelProvider to test that TextureProvider.Builder works --- .../assets/machinelib_testmod/models/machine/generator.json | 3 ++- .../assets/machinelib_testmod/models/machine/mixer.json | 4 +--- .../machinelib/testmod/data/TestModModelProvider.java | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/testmod/generated/assets/machinelib_testmod/models/machine/generator.json b/src/testmod/generated/assets/machinelib_testmod/models/machine/generator.json index 6302ed7..6471185 100644 --- a/src/testmod/generated/assets/machinelib_testmod/models/machine/generator.json +++ b/src/testmod/generated/assets/machinelib_testmod/models/machine/generator.json @@ -1,6 +1,7 @@ { "data": { - "front": "minecraft:block/furnace_front" + "front": "minecraft:block/furnace_front", + "top_item_override": "minecraft:block/furnace_top" }, "machinelib:type": "machine" } \ No newline at end of file diff --git a/src/testmod/generated/assets/machinelib_testmod/models/machine/mixer.json b/src/testmod/generated/assets/machinelib_testmod/models/machine/mixer.json index f778c1e..08a3d4a 100644 --- a/src/testmod/generated/assets/machinelib_testmod/models/machine/mixer.json +++ b/src/testmod/generated/assets/machinelib_testmod/models/machine/mixer.json @@ -1,6 +1,4 @@ { - "data": { - "top_item_override": "minecraft:block/furnace_top" - }, + "data": {}, "machinelib:type": "machine" } \ No newline at end of file diff --git a/src/testmod/java/dev/galacticraft/machinelib/testmod/data/TestModModelProvider.java b/src/testmod/java/dev/galacticraft/machinelib/testmod/data/TestModModelProvider.java index cf25fc0..62e228b 100644 --- a/src/testmod/java/dev/galacticraft/machinelib/testmod/data/TestModModelProvider.java +++ b/src/testmod/java/dev/galacticraft/machinelib/testmod/data/TestModModelProvider.java @@ -67,6 +67,7 @@ public void generateBlockStateModels(BlockModelGenerators gen) { MachineModelGenerator.createTrivialMachine(gen, TestModBlocks.GENERATOR, TextureProvider.builder() .front(TextureMapping.getBlockTexture(Blocks.FURNACE, "_front")) + .topOverride(TextureMapping.getBlockTexture(Blocks.FURNACE, "_top")) .build()); MachineModelGenerator.createTrivialMachine(gen, TestModBlocks.MIXER, TextureProvider.none()); } From 8315257a090fb28009ae5116816a51b02ec9b427 Mon Sep 17 00:00:00 2001 From: Roelymole Date: Tue, 4 Feb 2025 19:54:28 +0000 Subject: [PATCH 6/6] fix: removed unnecessary block of code --- .../machinelib/client/impl/model/MachineBakedModel.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/dev/galacticraft/machinelib/client/impl/model/MachineBakedModel.java b/src/main/java/dev/galacticraft/machinelib/client/impl/model/MachineBakedModel.java index e051650..48d7261 100644 --- a/src/main/java/dev/galacticraft/machinelib/client/impl/model/MachineBakedModel.java +++ b/src/main/java/dev/galacticraft/machinelib/client/impl/model/MachineBakedModel.java @@ -154,10 +154,6 @@ public TextureAtlasSprite getSprite(@Nullable BlockState state, @NotNull BlockFa } } - if (state == null) { - TextureAtlasSprite override = this.provider.getItemOverride(face); - if (override != null) return override; - } TextureAtlasSprite sprite = this.provider.getSprite(face); return sprite == null ? this.base.base() : sprite; }