fixed BaseCover not using textures from CoverFactory

GregTech-Intergalactical · Dec 11, 2023 · c092238 · c092238
1 parent 9ac1844
commit c092238
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/common/src/main/java/muramasa/antimatter/cover/BaseCover.java b/common/src/main/java/muramasa/antimatter/cover/BaseCover.java
@@ -180,7 +180,7 @@ public void addInfoFromStack(ItemStack stack) {
 
     @Override
     public void setTextures(BiConsumer<String, Texture> texer) {
-        texer.accept("overlay", new Texture(factory.getDomain(), "block/cover/" + getRenderId()));
+        texer.accept("overlay", factory.getTextures().isEmpty() ? new Texture(factory.getDomain(), "block/cover/" + getRenderId()) : factory.getTextures().get(0));
     }
 
     public Texture[] getTextures() {

diff --git a/common/src/main/java/muramasa/antimatter/cover/CoverFactory.java b/common/src/main/java/muramasa/antimatter/cover/CoverFactory.java
@@ -2,6 +2,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import lombok.Getter;
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.AntimatterRemapping;
 import muramasa.antimatter.Data;
@@ -18,10 +19,7 @@
 import net.minecraft.world.item.Items;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.BiFunction;
 
 public class CoverFactory implements IAntimatterObject {
@@ -32,7 +30,8 @@ public class CoverFactory implements IAntimatterObject {
     private final CoverSupplier supplier;
     private Map<Tier, Item> itemStacks = Collections.emptyMap();
     private Item itemStack;
-    private Iterable<Texture> textures;
+    private List<Texture> textures;
+    @Getter
     private MenuHandler<?> menuHandler = Data.COVER_MENU_HANDLER;
 
     protected boolean gui = false;
@@ -56,26 +55,22 @@ public Tier getValidTier() {
         return itemStacks.size() > 1 ? itemStacks.keySet().iterator().next() : null;
     }
 
-    public Iterable<Texture> getTextures() {
-        return textures == null ? Collections::emptyIterator : textures;
+    public List<Texture> getTextures() {
+        return textures == null ? Collections.emptyList() : textures;
     }
 
     public ItemStack getItem() {
         return itemStack == null ? ItemStack.EMPTY : itemStack.getDefaultInstance();
     }
 
-    public MenuHandler<?> getMenuHandler() {
-        return menuHandler;
-    }
-
     void setItems(Map<Tier, Item> stacks) {
         this.itemStack = stacks.remove(null);
         if (itemStack == null)
             itemStack = Items.AIR;
         this.itemStacks = ImmutableMap.copyOf(stacks);
     }
 
-    void addTextures(Iterable<Texture> textures) {
+    void addTextures(List<Texture> textures) {
         this.textures = textures;
     }
 
@@ -144,7 +139,7 @@ public static class Builder {
         final CoverSupplier supplier;
         BiFunction<CoverFactory, Tier, Item> itemBuilder;
         boolean gui = false;
-        Iterable<Texture> textures;
+        List<Texture> textures;
         MenuHandler<?> menuHandler;
 
         public Builder(final CoverSupplier supplier) {
@@ -171,7 +166,7 @@ public Builder setMenuHandler(MenuHandler<?> handler) {
             return this;
         }
 
-        public Builder addTextures(Iterable<Texture> textures) {
+        public Builder addTextures(List<Texture> textures) {
             this.textures = textures;
             return this;
         }