Merge branch 'master' into gh-port-qstorage-mui2

Zorbatron · web-flow · commit 66e9517ff62a · 2025-08-07T22:37:57.000-04:00
diff --git a/build.gradle b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1743737794
+//version: 1753288091
 /*
  * DO NOT CHANGE THIS FILE!
  * Also, you may replace this file at any time if there is an update available.
@@ -50,6 +50,8 @@ def out = services.get(StyledTextOutputFactory).create('an-output')
 
 
 // Project properties
+loadProjectProperties()
+
 
 // Required properties: we don't know how to handle these being missing gracefully
 checkPropertyExists("modName")
@@ -870,10 +872,10 @@ if (enableJava17RunTasks.toBoolean()) {
 
     dependencies {
         if (modId != 'lwjgl3ify') {
-            java17Dependencies("io.github.twilightflower:lwjgl3ify:1.0.0")
-        }
-        java17PatchDependencies("io.github.twilightflower:lwjgl3ify:1.0.0:forgePatches") {
+            java17Dependencies("io.github.twilightflower:lwjgl3ify:1.0.1")
+            java17PatchDependencies("io.github.twilightflower:lwjgl3ify:1.0.1:forgePatches") {
             transitive = false
+            }
         }
     }
 
@@ -1009,7 +1011,7 @@ abstract class RunHotswappableMinecraftTask extends RunMinecraftTask {
 
         if (project.usesMixins.toBoolean()) {
             this.extraJvmArgs.addAll(project.provider(() -> {
-                def mixinCfg = project.configurations.detachedConfiguration(project.dependencies.create(mixinProviderSpec))
+                def mixinCfg = project.configurations.detachedConfiguration(project.dependencies.create(project.mixinProviderSpec))
                 mixinCfg.canBeConsumed = false
                 mixinCfg.canBeResolved = true
                 mixinCfg.transitive = false
@@ -1475,14 +1477,28 @@ tasks.register('faq') {
                 "To add new dependencies to your project, place them in 'dependencies.gradle', NOT in 'build.gradle' as they would be replaced when the script updates.\n" +
                 "To add new repositories to your project, place them in 'repositories.gradle'.\n" +
                 "If you need additional gradle code to run, you can place it in a file named 'addon.gradle' (or either of the above, up to you for organization).\n\n" +
-                "If your build fails to recognize the syntax of newer Java versions, enable Jabel in your 'gradle.properties' under the option name 'enableModernJavaSyntax'.\n" +
+                "If your build fails to recognize the syntax of newer Java versions, enable Jabel in your 'buildscript.properties' under the option name 'enableModernJavaSyntax'.\n" +
                 "To see information on how to configure your IDE properly for Java 17, see https://github.com/GregTechCEu/Buildscripts/blob/master/docs/jabel.md\n\n" +
                 "Report any issues or feature requests you have for this build script to https://github.com/GregTechCEu/Buildscripts/issues\n")
     }
 }
 
 
 // Helpers
+def loadProjectProperties() {
+    def configFile = file("buildscript.properties")
+    if (configFile.exists()) {
+        configFile.withReader {
+            def prop = new Properties()
+            prop.load(it)
+            new ConfigSlurper().parse(prop).forEach { String k, def v ->
+                project.ext.setProperty(k, v)
+            }
+        }
+    } else {
+        print("Failed to read from buildscript.properties, as it did not exist!")
+    }
+}
 
 def getDefaultArtifactGroup() {
     def lastIndex = project.modGroup.lastIndexOf('.')
@@ -1495,7 +1511,7 @@ def getFile(String relativePath) {
 
 def checkPropertyExists(String propertyName) {
     if (!project.hasProperty(propertyName)) {
-        throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/GregTechCEu/Buildscripts/blob/main/gradle.properties")
+        throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"buildscript.properties\" or \"gradle.properties\". You can find all properties and their description here: https://github.com/GregTechCEu/Buildscripts/blob/main/buildscript.properties and https://github.com/GregTechCEu/Buildscripts/blob/main/gradle.properties")
     }
 }
 
diff --git a/src/api/java/dev/redstudio/alfheim/lighting/LightingEngine.java b/src/api/java/dev/redstudio/alfheim/lighting/LightingEngine.java
@@ -0,0 +1,5 @@
+package dev.redstudio.alfheim.lighting;
+
+// stub class to appease javac
+public class LightingEngine {
+}
diff --git a/src/main/java/gregtech/api/metatileentity/NeighborCacheTileEntityBase.java b/src/main/java/gregtech/api/metatileentity/NeighborCacheTileEntityBase.java
@@ -11,11 +11,17 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.lang.ref.WeakReference;
 import java.util.Arrays;
+import java.util.List;
 
 public abstract class NeighborCacheTileEntityBase extends SyncedTileEntityBase implements INeighborCache {
 
-    private final TileEntity[] neighbors = new TileEntity[6];
+    private static final WeakReference<TileEntity> NULL = new WeakReference<>(null);
+    private static final WeakReference<TileEntity> INVALID = new WeakReference<>(null);
+
+    private final List<WeakReference<TileEntity>> neighbors = Arrays.asList(
+            INVALID, INVALID, INVALID, INVALID, INVALID, INVALID);
     private boolean neighborsInvalidated = false;
 
     public NeighborCacheTileEntityBase() {
@@ -24,7 +30,9 @@ public NeighborCacheTileEntityBase() {
 
     protected void invalidateNeighbors() {
         if (!this.neighborsInvalidated) {
-            Arrays.fill(this.neighbors, this);
+            for (EnumFacing value : EnumFacing.VALUES) {
+                this.neighbors.set(value.getIndex(), INVALID);
+            }
             this.neighborsInvalidated = true;
         }
     }
@@ -60,17 +68,34 @@ public void onChunkUnload() {
     @Override
     public @Nullable TileEntity getNeighbor(@NotNull EnumFacing facing) {
         if (world == null || pos == null) return null;
-        int i = facing.getIndex();
-        TileEntity neighbor = this.neighbors[i];
-        if (neighbor == this || (neighbor != null && neighbor.isInvalid())) {
-            neighbor = world.getTileEntity(pos.offset(facing));
-            this.neighbors[i] = neighbor;
-            this.neighborsInvalidated = false;
-        }
-        return neighbor;
+        // if the ref is INVALID, compute neighbor, otherwise, return TE or null
+        WeakReference<TileEntity> ref = invalidRef(facing) ? computeNeighbor(facing) : getRef(facing);
+        return ref.get();
+    }
+
+    private boolean invalidRef(EnumFacing facing) {
+        WeakReference<TileEntity> ref = getRef(facing);
+        if (ref == INVALID) return true;
+        TileEntity te = ref.get();
+        return te != null && te.isInvalid();
+    }
+
+    @NotNull
+    private WeakReference<TileEntity> computeNeighbor(EnumFacing facing) {
+        TileEntity te = super.getNeighbor(facing);
+        // avoid making new references to null TEs
+        WeakReference<TileEntity> ref = te == null ? NULL : new WeakReference<>(te);
+        this.neighbors.set(facing.getIndex(), ref);
+        this.neighborsInvalidated = false;
+        return ref;
+    }
+
+    @NotNull
+    private WeakReference<TileEntity> getRef(EnumFacing facing) {
+        return this.neighbors.get(facing.getIndex());
     }
 
     public void onNeighborChanged(@NotNull EnumFacing facing) {
-        this.neighbors[facing.getIndex()] = this;
+        this.neighbors.set(facing.getIndex(), INVALID);
     }
 }
diff --git a/src/main/java/gregtech/api/metatileentity/SyncedTileEntityBase.java b/src/main/java/gregtech/api/metatileentity/SyncedTileEntityBase.java
@@ -13,6 +13,7 @@
 import net.minecraft.network.play.server.SPacketUpdateTileEntity;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.world.WorldServer;
 import net.minecraftforge.common.util.Constants;
 
 import io.netty.buffer.ByteBuf;
@@ -25,6 +26,7 @@
 
 public abstract class SyncedTileEntityBase extends BlockStateTileEntity implements ISyncedTileEntity {
 
+    public static final int SIZE_THRESHOLD = 10;
     private final PacketDataList updates = new PacketDataList();
 
     public @Nullable TileEntity getNeighbor(EnumFacing facing) {
@@ -57,7 +59,26 @@ public void addPacketsFrom(SyncedTileEntityBase syncedTileEntityBase) {
     private void notifyWorld() {
         @SuppressWarnings("deprecation")
         IBlockState blockState = getBlockType().getStateFromMeta(getBlockMetadata());
-        world.notifyBlockUpdate(getPos(), blockState, blockState, 0);
+        if (canNotifyWorld()) {
+            world.notifyBlockUpdate(getPos(), blockState, blockState, 0);
+        }
+    }
+
+    private boolean canNotifyWorld() {
+        // short circuit with packet size to avoid too many hash lookups and instanceof casts
+        if (updates.size() > SIZE_THRESHOLD && getWorld() instanceof WorldServer server) {
+            int x = getPos().getX() >> 4;
+            int z = getPos().getZ() >> 4;
+            if (server.getPlayerChunkMap().contains(x, z)) {
+                return true;
+            } else {
+                // cannot send, so clear
+                updates.clear();
+                return false;
+            }
+        }
+        // assume we can send data regardless
+        return true;
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/network/PacketDataList.java b/src/main/java/gregtech/api/network/PacketDataList.java
@@ -5,6 +5,8 @@
 
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Arrays;
+
 /**
  * An optimised data structure backed by two arrays.
  * This is essentially equivalent to <code>List<Pair<Integer, byte[]>></code>, but more efficient.
@@ -84,9 +86,8 @@ public boolean isEmpty() {
      * remove all data packets
      */
     public void clear() {
-        for (int i = 0; i < this.size; i++) {
-            this.data[i] = null;
-        }
+        Arrays.fill(this.discriminators, 0);
+        Arrays.fill(this.data, null);
         this.size = 0;
     }
 
diff --git a/src/main/java/gregtech/api/pipenet/block/BlockPipe.java b/src/main/java/gregtech/api/pipenet/block/BlockPipe.java
@@ -564,9 +564,9 @@ public BlockFaceShape getBlockFaceShape(@NotNull IBlockAccess worldIn, @NotNull
     }
 
     @Override
-    public boolean recolorBlock(World world, @NotNull BlockPos pos, @NotNull EnumFacing side,
+    public boolean recolorBlock(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing side,
                                 @NotNull EnumDyeColor color) {
-        IPipeTile<PipeType, NodeDataType> tileEntityPipe = (IPipeTile<PipeType, NodeDataType>) world.getTileEntity(pos);
+        IPipeTile<PipeType, NodeDataType> tileEntityPipe = getPipeTileEntity(world, pos);
         if (tileEntityPipe != null && tileEntityPipe.getPipeType() != null &&
                 tileEntityPipe.getPipeType().isPaintable() &&
                 tileEntityPipe.getPaintingColor() != color.colorValue) {
@@ -588,6 +588,7 @@ public IPipeTile<PipeType, NodeDataType> getPipeTileEntity(IBlockAccess world, B
         return getPipeTileEntity(tileEntityAtPos);
     }
 
+    @Nullable
     public IPipeTile<PipeType, NodeDataType> getPipeTileEntity(TileEntity tileEntityAtPos) {
         if (tileEntityAtPos instanceof IPipeTile &&
                 isThisPipeBlock(((IPipeTile<PipeType, NodeDataType>) tileEntityAtPos).getPipeBlock())) {
diff --git a/src/main/java/gregtech/api/pipenet/tile/TileEntityPipeBase.java b/src/main/java/gregtech/api/pipenet/tile/TileEntityPipeBase.java
@@ -81,7 +81,7 @@ public Material getFrameMaterial() {
 
     public void setFrameMaterial(@Nullable Material frameMaterial) {
         this.frameMaterial = frameMaterial;
-        if (world != null && world.isRemote) {
+        if (world != null && !world.isRemote) {
             writeCustomData(UPDATE_FRAME_MATERIAL, buf -> {
                 buf.writeVarInt(frameMaterial == null ? -1 : frameMaterial.getRegistry().getNetworkId());
                 buf.writeVarInt(frameMaterial == null ? -1 : frameMaterial.getId());
@@ -278,6 +278,7 @@ public void setFaceBlocked(EnumFacing side, boolean blocked) {
 
     @Override
     public boolean isFaceBlocked(EnumFacing side) {
+        if (side == null) return true; // says hey, you can't insert from nowhere
         return isFaceBlocked(blockedConnections, side);
     }
 
diff --git a/src/main/java/gregtech/api/util/world/DummyWorld.java b/src/main/java/gregtech/api/util/world/DummyWorld.java
@@ -15,6 +15,7 @@
 import net.minecraftforge.fml.common.Optional.Method;
 import net.minecraftforge.fml.relauncher.FMLLaunchHandler;
 
+import dev.redstudio.alfheim.lighting.LightingEngine;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -116,4 +117,9 @@ public int getLightFromNeighborsFor(EnumSkyBlock type, BlockPos pos) {
     public int alfheim$getLight(BlockPos pos, boolean checkNeighbors) {
         return 15;
     }
+
+    @Method(modid = Mods.Names.ALFHEIM)
+    public LightingEngine getAlfheim$lightingEngine() {
+        return null;
+    }
 }
diff --git a/src/main/java/gregtech/client/model/pipeline/VertexLighterFlatSpecial.java b/src/main/java/gregtech/client/model/pipeline/VertexLighterFlatSpecial.java
@@ -170,16 +170,6 @@ protected void processQuad() {
         tint = -1;
     }
 
-    // This was copied over from VertexLighterFlat because the tint parameter shouldn't be a float
-    protected static void updateColor(float[] normal, float[] color, float x, float y, float z, int tint,
-                                      int multiplier) {
-        if (tint != -1) {
-            color[0] *= (float) (multiplier >> 0x10 & 0xFF) / 0xFF;
-            color[1] *= (float) (multiplier >> 0x8 & 0xFF) / 0xFF;
-            color[2] *= (float) (multiplier & 0xFF) / 0xFF;
-        }
-    }
-
     @Override
     public void setQuadTint(int tint) {
         this.tint = tint;
diff --git a/src/main/java/gregtech/client/renderer/texture/custom/ClipboardRenderer.java b/src/main/java/gregtech/client/renderer/texture/custom/ClipboardRenderer.java
@@ -12,6 +12,7 @@
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
 import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -74,7 +75,8 @@ public static void renderBoard(CCRenderState renderState, Matrix4 translation, I
         translation.translate(0.5, 0.5, 0.5);
         translation.rotate(Math.toRadians(90.0 * rotations.indexOf(rotation)), Rotation.axes[1]);
         translation.translate(-0.5, -0.5, -0.5);
-
+        World world = clipboard.getWorld();
+        if (world != null) renderState.setBrightness(world, clipboard.getPos());
         // Render Clipboard
         for (EnumFacing renderSide : EnumFacing.VALUES) {
             boxTextureMap.forEach((box, sprite) -> Textures.renderFace(renderState, translation, pipeline, renderSide,
@@ -89,7 +91,17 @@ public static void renderGUI(double x, double y, double z, EnumFacing rotation,
         GlStateManager.pushMatrix();
         float lastBrightnessX = OpenGlHelper.lastBrightnessX;
         float lastBrightnessY = OpenGlHelper.lastBrightnessY;
-        OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240.0F, 240.0F);
+
+        float lx = 240, ly = 240;
+        World world = clipboard.getWorld();
+        if (world != null) {
+            int light = world.getCombinedLight(clipboard.getPos(), 0);
+
+            lx = (float) light % 0x10000;
+            ly = (float) light / 0x10000;
+        }
+
+        OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lx, ly);
         RenderHelper.disableStandardItemLighting();
 
         // All of these are done in reverse order, by the way, if you're reviewing this :P
diff --git a/src/main/java/gregtech/common/covers/ender/CoverAbstractEnderLink.java b/src/main/java/gregtech/common/covers/ender/CoverAbstractEnderLink.java
@@ -212,9 +212,9 @@ protected IWidget createIoRow() {
                 .coverChildrenHeight()
                 .child(new ToggleButton()
                         .value(new BooleanSyncValue(this::isIoEnabled, this::setIoEnabled))
-                        .overlay(IKey.dynamic(() -> IKey.lang(this.ioEnabled ?
+                        .overlay(IKey.lang(() -> this.ioEnabled ?
                                 "behaviour.soft_hammer.enabled" :
-                                "behaviour.soft_hammer.disabled").get())
+                                "behaviour.soft_hammer.disabled")
                                 .color(Color.WHITE.darker(1)))
                         .widthRel(0.6f)
                         .left(0));
diff --git a/src/main/java/gregtech/common/covers/filter/BaseFilterContainer.java b/src/main/java/gregtech/common/covers/filter/BaseFilterContainer.java
@@ -97,7 +97,7 @@ public boolean isItemValid(int slot, @NotNull ItemStack stack) {
 
     protected abstract boolean isItemValid(ItemStack stack);
 
-    protected abstract String getFilterName();
+    protected abstract @NotNull IKey getFilterKey();
 
     @Override
     public @NotNull ItemStack insertItem(int slot, @NotNull ItemStack stack, boolean simulate) {
@@ -244,7 +244,7 @@ public IWidget initUI(GuiData data, PanelSyncManager manager) {
                             }
                             return true;
                         }))
-                .child(IKey.dynamic(this::getFilterName)
+                .child(getFilterKey()
                         .color(CoverWithUI.UI_TEXT_COLOR)
                         .shadow(false)
                         .alignment(Alignment.CenterRight).asWidget()
diff --git a/src/main/java/gregtech/common/covers/filter/FluidFilterContainer.java b/src/main/java/gregtech/common/covers/filter/FluidFilterContainer.java
@@ -6,6 +6,7 @@
 
 import com.cleanroommc.modularui.api.drawable.IKey;
 import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
@@ -56,9 +57,9 @@ protected boolean isItemValid(ItemStack stack) {
     }
 
     @Override
-    protected String getFilterName() {
-        return hasFilter() ?
-                getFilterStack().getDisplayName() :
-                IKey.lang("metaitem.fluid_filter.name").get();
+    protected @NotNull IKey getFilterKey() {
+        return IKey.lang(() -> hasFilter() ?
+                getFilterStack().getTranslationKey() + ".name" :
+                "metaitem.fluid_filter.name");
     }
 }
diff --git a/src/main/java/gregtech/common/covers/filter/ItemFilterContainer.java b/src/main/java/gregtech/common/covers/filter/ItemFilterContainer.java
diff --git a/src/main/java/gregtech/common/pipelike/cable/BlockCable.java b/src/main/java/gregtech/common/pipelike/cable/BlockCable.java
diff --git a/src/main/java/gregtech/common/pipelike/fluidpipe/BlockFluidPipe.java b/src/main/java/gregtech/common/pipelike/fluidpipe/BlockFluidPipe.java
diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/logo.json b/src/main/resources/assets/gregtech/models/item/metaitems/logo.json
diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/gregtech_logo.png b/src/main/resources/assets/gregtech/textures/items/metaitems/gregtech_logo.png
diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/gregtech_logo_xmas.png b/src/main/resources/assets/gregtech/textures/items/metaitems/gregtech_logo_xmas.png
