Merge branch 'master' into zb/block-breaker-improvements

Author: Zorbatron

.github/workflows/format_java.yml

@@ -15,6 +15,8 @@ jobs:
   formatting:
     name: Formatting
     runs-on: ubuntu-latest
+    env:
+      DISABLE_BUILDSCRIPT_UPDATE_CHECK: true
 
     steps:
       - name: Checkout Repository

.github/workflows/nuclear_test_release.yml

@@ -24,6 +24,9 @@ jobs:
     permissions:
       contents: write # needed to create GitHub releases
 
+    env:
+      DISABLE_BUILDSCRIPT_UPDATE_CHECK: true
+
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4

.github/workflows/publish_project.yml

@@ -15,6 +15,8 @@ jobs:
   test:
     name: Tests
     runs-on: ubuntu-latest
+    env:
+      DISABLE_BUILDSCRIPT_UPDATE_CHECK: true
 
     steps:
       - name: Checkout Repository

.github/workflows/test_java.yml

@@ -16,6 +16,8 @@ jobs:
   update-cache:
     name: Update Grade Cache
     runs-on: ubuntu-latest
+    env:
+      DISABLE_BUILDSCRIPT_UPDATE_CHECK: true
 
     steps:
       - name: Checkout Repository

.github/workflows/update_gradle_cache.yml

@@ -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")
     }
 }
 

build.gradle

@@ -0,0 +1,5 @@
+package dev.redstudio.alfheim.lighting;
+
+// stub class to appease javac
+public class LightingEngine {
+}

src/api/java/dev/redstudio/alfheim/lighting/LightingEngine.java

@@ -13,6 +13,7 @@
 import gregtech.api.network.INetworkHandler;
 import gregtech.api.recipes.properties.RecipePropertyRegistry;
 import gregtech.api.sound.ISoundManager;
+import gregtech.api.unification.RecyclingManager;
 import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.registry.IMaterialRegistryManager;
 import gregtech.api.unification.material.registry.MarkerMaterialRegistry;
@@ -58,6 +59,10 @@ public class GregTechAPI {
     /** GT's data migrations API */
     public static final MigrationAPI MIGRATIONS = new MigrationAPI();
     public static final RecipePropertyRegistry RECIPE_PROPERTIES = new RecipePropertyRegistry();
+    /**
+     * Manager for Item Recycling Data
+     */
+    public static final RecyclingManager RECYCLING_MANAGER = new RecyclingManager();
 
     /** Will be available at the Pre-Initialization stage */
     private static boolean highTier;

src/main/java/gregtech/api/GregTechAPI.java

@@ -99,6 +99,7 @@ public static int assignId() {
     public static final int UPDATE_UPWARDS_FACING = assignId();
     public static final int UPDATE_FLIP = assignId();
     public static final int LOCK_FILL = assignId();
+    public static final int MUFFLER_OBSTRUCTED = assignId();
 
     // Item Bus Item Stack Auto Collapsing
     public static final int TOGGLE_COLLAPSE_ITEMS = assignId();

src/main/java/gregtech/api/capability/GregtechDataCodes.java

@@ -1,6 +1,9 @@
 package gregtech.api.capability;
 
-import gregtech.api.gui.resources.TextureArea;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.mui.GTGuiTextures;
+
+import com.cleanroommc.modularui.drawable.UITexture;
 
 public interface IHPCAComponentHatch {
 
@@ -46,5 +49,17 @@ default void setDamaged(boolean damaged) {}
     /**
      * The icon for this component in the HPCA's UI. Should be a 13x13 px sprite.
      */
-    TextureArea getComponentIcon();
+    default UITexture getComponentIcon() {
+        return GTGuiTextures.HPCA_ICON_EMPTY_COMPONENT;
+    }
+
+    /**
+     * The untranslated name of the tile implementing an HPCA component
+     */
+    default String getTileName() {
+        if (this instanceof MetaTileEntity mte) {
+            return mte.getMetaFullName();
+        }
+        return "";
+    }
 }