Merge branch 'GregTechCEu:master' into exnihilo

Irgendwer01 · web-flow · commit 669420995930 · 2025-12-06T02:08:04.000+01:00
diff --git a/src/main/java/gregtech/api/capability/impl/GTFluidHandlerItemStack.java b/src/main/java/gregtech/api/capability/impl/GTFluidHandlerItemStack.java
@@ -69,22 +69,11 @@ public IFluidTankProperties[] getTankProperties() {
     }
 
     @Override
-    public FluidStack drain(FluidStack resource, boolean doDrain) {
-        FluidStack drained = super.drain(resource, doDrain);
-        this.removeTagWhenEmpty(doDrain);
-        return drained;
-    }
-
-    @Override
-    public FluidStack drain(int maxDrain, boolean doDrain) {
-        FluidStack drained = super.drain(maxDrain, doDrain);
-        this.removeTagWhenEmpty(doDrain);
-        return drained;
-    }
-
-    private void removeTagWhenEmpty(boolean doDrain) {
-        if (doDrain && this.getFluid() == null) {
-            this.container.setTagCompound(null);
+    protected void setContainerToEmpty() {
+        super.setContainerToEmpty();
+        var tag = container.getTagCompound();
+        if (tag != null && tag.isEmpty()) {
+            container.setTagCompound(null);
         }
     }
 
diff --git a/src/main/java/gregtech/api/capability/impl/GTSimpleFluidHandlerItemStack.java b/src/main/java/gregtech/api/capability/impl/GTSimpleFluidHandlerItemStack.java
@@ -68,26 +68,6 @@ public IFluidTankProperties[] getTankProperties() {
         return properties;
     }
 
-    @Override
-    public FluidStack drain(FluidStack resource, boolean doDrain) {
-        FluidStack drained = super.drain(resource, doDrain);
-        this.removeTagWhenEmpty(doDrain);
-        return drained;
-    }
-
-    @Override
-    public FluidStack drain(int maxDrain, boolean doDrain) {
-        FluidStack drained = super.drain(maxDrain, doDrain);
-        this.removeTagWhenEmpty(doDrain);
-        return drained;
-    }
-
-    private void removeTagWhenEmpty(boolean doDrain) {
-        if (doDrain && this.getFluid() == null) {
-            this.container.setTagCompound(null);
-        }
-    }
-
     @Override
     public boolean canFillFluidType(FluidStack fluid) {
         return canFill() && (this.filter == null || this.filter.test(fluid));
@@ -98,6 +78,15 @@ public boolean canDrainFluidType(FluidStack fluid) {
         return canDrain();
     }
 
+    @Override
+    protected void setContainerToEmpty() {
+        super.setContainerToEmpty();
+        var tag = container.getTagCompound();
+        if (tag != null && tag.isEmpty()) {
+            container.setTagCompound(null);
+        }
+    }
+
     private final class TankProperties implements IFluidTankProperties {
 
         @Nullable
diff --git a/src/main/java/gregtech/api/cover/CoverWithUI.java b/src/main/java/gregtech/api/cover/CoverWithUI.java
@@ -33,6 +33,9 @@
 import com.cleanroommc.modularui.widgets.ToggleButton;
 import com.cleanroommc.modularui.widgets.layout.Flow;
 import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.function.BooleanSupplier;
 
 public interface CoverWithUI extends Cover, IUIHolder, IGuiHolder<SidedPosGuiData> {
 
@@ -117,6 +120,18 @@ default ParentWidget<?> createSettingsRow() {
         return new ParentWidget<>().height(16).widthRel(1.0f).marginBottom(2);
     }
 
+    /**
+     * Create a dynamic lang key that switches between {@code cover.generic.enabled} and {@code cover.generic.disabled}
+     * depending on the result of the given boolean supplier. <br/>
+     * 
+     * @param keyBase the base of the lang key to use. {@code .enabled} and {@code .disabled} will be appended.
+     */
+    default IKey createEnabledKey(@NotNull String keyBase, @NotNull BooleanSupplier enabledState) {
+        String enabled = keyBase + ".enabled";
+        String disabled = keyBase + ".disabled";
+        return IKey.lang(() -> enabledState.getAsBoolean() ? enabled : disabled);
+    }
+
     default int getIncrementValue(MouseData data) {
         int adjust = 1;
         if (data.shift) adjust *= 4;
diff --git a/src/main/java/gregtech/api/items/toolitem/ItemGTToolbelt.java b/src/main/java/gregtech/api/items/toolitem/ItemGTToolbelt.java
@@ -264,6 +264,14 @@ public boolean shouldCauseReequipAnimation(@NotNull ItemStack oldStack, @NotNull
         return false;
     }
 
+    @Override
+    public int getMetadata(ItemStack stack) {
+        ItemStack selected = getHandler(stack).getSelectedStack();
+        if (!selected.isEmpty()) {
+            return selected.getItem().getMetadata(selected);
+        } else return super.getMetadata(stack);
+    }
+
     @Override
     public boolean isDamaged(@NotNull ItemStack stack) {
         ItemStack selected = getHandler(stack).getSelectedStack();
diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/MultiblockControllerBase.java b/src/main/java/gregtech/api/metatileentity/multiblock/MultiblockControllerBase.java
@@ -600,7 +600,8 @@ private List<MultiblockShapeInfo> repetitionDFS(List<MultiblockShapeInfo> pages,
 
     @SideOnly(Side.CLIENT)
     public String[] getDescription() {
-        String key = String.format("gregtech.multiblock.%s.description", metaTileEntityId.getPath());
+        String key = String.format("%s.multiblock.%s.description", metaTileEntityId.getNamespace(),
+                metaTileEntityId.getPath());
         return I18n.hasKey(key) ? new String[] { I18n.format(key) } : new String[0];
     }
 
diff --git a/src/main/java/gregtech/api/util/CapesRegistry.java b/src/main/java/gregtech/api/util/CapesRegistry.java
@@ -59,6 +59,20 @@ public static void registerDevCapes() {
         unlockCape(UUID.fromString("e6e784af-bd04-46ad-8141-47b8b9102cb9"), Textures.GREGTECH_CAPE_TEXTURE); // Tictim
         unlockCape(UUID.fromString("2fa297a6-7803-4629-8360-7059155cf43e"), Textures.GREGTECH_CAPE_TEXTURE); // KilaBash
         unlockCape(UUID.fromString("56bd41d0-06ef-4ed7-ab48-926ce45651f9"), Textures.GREGTECH_CAPE_TEXTURE); // Zalgo239
+        unlockCape(UUID.fromString("2c69579f-a7fa-46ad-814e-9837e01215c1"), Textures.GREGTECH_CAPE_TEXTURE); // Z_orbatron
+        unlockCape(UUID.fromString("3dbb689e-edcf-41b9-9c09-6ae4ebb6ca5b"), Textures.GREGTECH_CAPE_TEXTURE); // M_W_K
+
+        // GT:CEu Modern devs
+        unlockCape(UUID.fromString("274846e6-1d07-4e59-8dea-f4f73e76f9fb"), Textures.GREGTECH_CAPE_TEXTURE); // DilithiumThoride
+        unlockCape(UUID.fromString("c43b3c3d-7da6-4c2b-b335-703fce2ed795"), Textures.GREGTECH_CAPE_TEXTURE); // Ghostipedia
+        unlockCape(UUID.fromString("fe4bafe8-8ea9-494a-b4e9-29397cea89fc"), Textures.GREGTECH_CAPE_TEXTURE); // Gustavo
+        unlockCape(UUID.fromString("c18c1d7f-3174-42c6-81dc-3c7ff9f720c3"), Textures.GREGTECH_CAPE_TEXTURE); // jurrejelle
+        unlockCape(UUID.fromString("29f1e04c-58d8-4a3b-9eff-f85be7825256"), Textures.GREGTECH_CAPE_TEXTURE); // kross000
+        unlockCape(UUID.fromString("5cb66945-2ca4-498d-8c9a-29a676769363"), Textures.GREGTECH_CAPE_TEXTURE); // omergunr100
+        unlockCape(UUID.fromString("f76fc8b3-ac6b-44b9-9023-76edaf3d5909"), Textures.GREGTECH_CAPE_TEXTURE); // spicierspace153
+        unlockCape(UUID.fromString("24ab5496-0c9d-45d7-bfa6-c57760263be6"), Textures.GREGTECH_CAPE_TEXTURE); // TarLaboratories
+        unlockCape(UUID.fromString("60057953-6a71-4f11-9e72-bb0c81fa0085"), Textures.GREGTECH_CAPE_TEXTURE); // ursamina
+        unlockCape(UUID.fromString("3a27782d-6864-4814-a9fe-7c6931f29a8a"), Textures.GREGTECH_CAPE_TEXTURE); // YoungOnion
         save();
     }
 
diff --git a/src/main/java/gregtech/common/covers/CoverFluidFilter.java b/src/main/java/gregtech/common/covers/CoverFluidFilter.java
@@ -166,10 +166,9 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan
                                 .coverChildrenHeight()
                                 .setEnabledIf(b -> getFilterMode() != FluidFilterMode.FILTER_BOTH)
                                 .child(new ToggleButton()
-                                        .overlay(IKey.dynamic(() -> IKey.lang(allowFlow ?
-                                                "cover.generic.enabled" :
-                                                "cover.generic.disabled").get())
-                                                .color(Color.WHITE.main).shadow(false))
+                                        .overlay(createEnabledKey("cover.generic", () -> this.allowFlow)
+                                                .color(Color.WHITE.main)
+                                                .shadow(false))
                                         .tooltip(tooltip -> tooltip
                                                 .addLine(IKey.lang("cover.filter.allow_flow.tooltip")))
                                         .size(72, 18)
diff --git a/src/main/java/gregtech/common/covers/CoverFluidVoiding.java b/src/main/java/gregtech/common/covers/CoverFluidVoiding.java
@@ -24,7 +24,6 @@
 import codechicken.lib.render.pipeline.IVertexOperation;
 import codechicken.lib.vec.Cuboid6;
 import codechicken.lib.vec.Matrix4;
-import com.cleanroommc.modularui.api.drawable.IKey;
 import com.cleanroommc.modularui.factory.GuiData;
 import com.cleanroommc.modularui.factory.SidedPosGuiData;
 import com.cleanroommc.modularui.screen.ModularPanel;
@@ -79,16 +78,14 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan
 
     @Override
     protected ParentWidget<?> createUI(GuiData data, PanelSyncManager syncManager) {
-        var isWorking = new BooleanSyncValue(this::isWorkingEnabled, this::setWorkingEnabled);
+        BooleanSyncValue isWorking = new BooleanSyncValue(this::isWorkingEnabled, this::setWorkingEnabled);
 
         return super.createUI(data, syncManager)
                 .child(Flow.row().height(18).widthRel(1f)
                         .marginBottom(2)
                         .child(new ToggleButton()
                                 .value(isWorking)
-                                .overlay(IKey.dynamic(() -> IKey.lang(this.isWorkingAllowed ?
-                                        "behaviour.soft_hammer.enabled" :
-                                        "behaviour.soft_hammer.disabled").get())
+                                .overlay(createEnabledKey("behaviour.soft_hammer", () -> this.isWorkingAllowed)
                                         .color(Color.WHITE.darker(1)))
                                 .widthRel(0.6f)
                                 .left(0)));
diff --git a/src/main/java/gregtech/common/covers/CoverItemFilter.java b/src/main/java/gregtech/common/covers/CoverItemFilter.java
@@ -168,10 +168,9 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan
                                 .coverChildrenHeight()
                                 .setEnabledIf(b -> getFilterMode() != ItemFilterMode.FILTER_BOTH)
                                 .child(new ToggleButton()
-                                        .overlay(IKey.dynamic(() -> IKey.lang(allowFlow ?
-                                                "cover.generic.enabled" :
-                                                "cover.generic.disabled").get())
-                                                .color(Color.WHITE.main).shadow(false))
+                                        .overlay(createEnabledKey("cover.generic", () -> this.allowFlow)
+                                                .color(Color.WHITE.main)
+                                                .shadow(false))
                                         .tooltip(tooltip -> tooltip
                                                 .addLine(IKey.lang("cover.filter.allow_flow.tooltip")))
                                         .size(72, 18)
diff --git a/src/main/java/gregtech/common/covers/CoverItemVoiding.java b/src/main/java/gregtech/common/covers/CoverItemVoiding.java
@@ -21,7 +21,6 @@
 import codechicken.lib.render.pipeline.IVertexOperation;
 import codechicken.lib.vec.Cuboid6;
 import codechicken.lib.vec.Matrix4;
-import com.cleanroommc.modularui.api.drawable.IKey;
 import com.cleanroommc.modularui.factory.GuiData;
 import com.cleanroommc.modularui.factory.SidedPosGuiData;
 import com.cleanroommc.modularui.screen.ModularPanel;
@@ -80,16 +79,14 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan
 
     @Override
     protected ParentWidget<Flow> createUI(GuiData data, PanelSyncManager guiSyncManager) {
-        var isWorking = new BooleanSyncValue(this::isWorkingEnabled, this::setWorkingEnabled);
+        BooleanSyncValue isWorking = new BooleanSyncValue(this::isWorkingEnabled, this::setWorkingEnabled);
 
         return super.createUI(data, guiSyncManager)
                 .child(Flow.row().height(18).widthRel(1f)
                         .marginBottom(2)
                         .child(new ToggleButton()
                                 .value(isWorking)
-                                .overlay(IKey.dynamic(() -> IKey.lang(this.isWorkingAllowed ?
-                                        "behaviour.soft_hammer.enabled" :
-                                        "behaviour.soft_hammer.disabled").get())
+                                .overlay(createEnabledKey("behaviour.soft_hammer", () -> this.isWorkingAllowed)
                                         .color(Color.WHITE.darker(1)))
                                 .widthRel(0.6f)
                                 .left(0)));
diff --git a/src/main/java/gregtech/common/gui/widget/prospector/ProspectingTexture.java b/src/main/java/gregtech/common/gui/widget/prospector/ProspectingTexture.java
@@ -14,12 +14,13 @@
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
+import it.unimi.dsi.fastutil.bytes.Byte2ObjectOpenHashMap;
 import org.jetbrains.annotations.Nullable;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.awt.image.WritableRaster;
-import java.util.HashMap;
+import java.util.Map;
 
 public class ProspectingTexture extends AbstractTexture {
 
@@ -29,8 +30,8 @@ public class ProspectingTexture extends AbstractTexture {
     private boolean darkMode;
     private int imageWidth = -1;
     private int imageHeight = -1;
-    public final HashMap<Byte, String>[][] map;
-    public static HashMap<Byte, String> emptyTag = new HashMap<>();
+    public final Map<Byte, String>[][] map;
+    public static Map<Byte, String> emptyTag = new Byte2ObjectOpenHashMap<>();
     private int playerXGui;
     private int playerYGui;
     private final ProspectorMode mode;
@@ -42,10 +43,10 @@ public ProspectingTexture(ProspectorMode mode, int radius, boolean darkMode) {
         this.mode = mode;
         if (this.mode == ProspectorMode.FLUID) {
             // noinspection unchecked
-            map = new HashMap[(radius * 2 - 1)][(radius * 2 - 1)];
+            map = new Byte2ObjectOpenHashMap[(radius * 2 - 1)][(radius * 2 - 1)];
         } else {
             // noinspection unchecked
-            map = new HashMap[(radius * 2 - 1) * 16][(radius * 2 - 1) * 16];
+            map = new Byte2ObjectOpenHashMap[(radius * 2 - 1) * 16][(radius * 2 - 1) * 16];
         }
     }
 
@@ -102,7 +103,7 @@ private BufferedImage getImage() {
 
         for (int i = 0; i < wh; i++) {
             for (int j = 0; j < wh; j++) {
-                HashMap<Byte, String> data = this.map[this.mode == ProspectorMode.ORE ? i : i / 16][this.mode ==
+                Map<Byte, String> data = this.map[this.mode == ProspectorMode.ORE ? i : i / 16][this.mode ==
                         ProspectorMode.ORE ? j : j / 16];
                 // draw bg
                 image.setRGB(i, j, ((data == null) ^ darkMode) ? Color.darkGray.getRGB() : Color.WHITE.getRGB());
diff --git a/src/main/java/gregtech/common/gui/widget/prospector/widget/WidgetProspectingMap.java b/src/main/java/gregtech/common/gui/widget/prospector/widget/WidgetProspectingMap.java
@@ -271,7 +271,7 @@ public void drawInForeground(int mouseX, int mouseY) {
                                 if (ProspectingTexture.SELECTED_ALL.equals(texture.getSelected()) ||
                                         texture.getSelected().equals(dict)) {
                                     oreInfo.put(name, oreInfo.getOrDefault(name, 0) + 1);
-                                    oreHeight.put(name, oreHeight.getOrDefault(name, 0) + height.intValue());
+                                    oreHeight.put(name, oreHeight.getOrDefault(name, 0) + Byte.toUnsignedInt(height));
                                     if (oreInfo.get(name) > maxAmount[0]) {
                                         maxAmount[0] = oreInfo.get(name);
                                         MaterialStack m = OreDictUnifier.getMaterial(OreDictUnifier.get(dict));
diff --git a/src/main/java/gregtech/common/items/ToolItems.java b/src/main/java/gregtech/common/items/ToolItems.java
@@ -9,6 +9,7 @@
 import gregtech.core.sound.GTSoundEvents;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.block.model.ModelBakery;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.enchantment.EnumEnchantmentType;
 import net.minecraft.entity.monster.EntityGolem;
@@ -374,7 +375,14 @@ public static IGTTool register(@NotNull IGTTool tool) {
     }
 
     public static void registerModels() {
-        TOOLS.forEach(tool -> ModelLoader.setCustomModelResourceLocation(tool.get(), 0, tool.getModelLocation()));
+        for (IGTTool tool : TOOLS) {
+            if (tool == TOOLBELT) {
+                ModelLoader.setCustomMeshDefinition(tool.get(), s -> tool.getModelLocation());
+                ModelBakery.registerItemVariants(tool.get(), tool.getModelLocation());
+            } else {
+                ModelLoader.setCustomModelResourceLocation(tool.get(), 0, tool.getModelLocation());
+            }
+        }
     }
 
     @SideOnly(Side.CLIENT)
diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang
@@ -877,7 +877,7 @@ metaitem.smart_item_filter.tooltip=Filters §fItem§7 I/O with §fMachine Recipe
 behaviour.filter_ui_manager=§fRight-Click§7 to configure, §fShift Right-Click§7 to clear configuration
 
 metaitem.cover.controller.name=Machine Controller
-metaitem.cover.controller.tooltip=Turns Machines §fON/OFF§7 as §fCover§7.
+metaitem.cover.controller.tooltip=Turns Machines §fON/OFF§7 using Redstone as §fCover§7.
 metaitem.cover.activity.detector.name=Activity Detector
 metaitem.cover.activity.detector.tooltip=Gives out §fActivity Status§7 as Redstone as §fCover§7.
 metaitem.cover.activity.detector_advanced.name=Advanced Activity Detector
diff --git a/src/main/resources/assets/gregtech/lang/zh_cn.lang b/src/main/resources/assets/gregtech/lang/zh_cn.lang

Original file line number	Diff line number	Diff line change
`@@ -600,7 +600,8 @@ private List<MultiblockShapeInfo> repetitionDFS(List<MultiblockShapeInfo> pages,`
`600`	`600`
`601`	`601`	`@SideOnly(Side.CLIENT)`
`602`	`602`	`public String[] getDescription() {`
`603`		`- String key = String.format("gregtech.multiblock.%s.description", metaTileEntityId.getPath());`
	`603`	`+ String key = String.format("%s.multiblock.%s.description", metaTileEntityId.getNamespace(),`
	`604`	`+ metaTileEntityId.getPath());`
`604`	`605`	`return I18n.hasKey(key) ? new String[] { I18n.format(key) } : new String[0];`
`605`	`606`	`}`
`606`	`607`