Merge branch 'master' of github.com:GTNewHorizons/GT5-Unofficial

.github/workflows/labels.yml

@@ -0,0 +1,41 @@
+# Credit to TechLord22 for writting this for the GTCEu repo
+
+# Manages labels on PRs before allowing merging
+name: Pull Request Labels
+
+on:
+  pull_request:
+    types:
+      - opened
+      - labeled
+      - unlabeled
+      - synchronize
+
+# if a second commit is pushed quickly after the first, cancel the first one's build
+concurrency:
+  group: pr-labels-${{ github.head_ref }}
+  cancel-in-progress: true
+
+jobs:
+  Labels:
+    runs-on: ubuntu-latest
+
+    permissions:
+      pull-requests: read # needed to utilize required-labels
+
+    steps:
+      - name: Check for Merge-Blocking Labels # blocks merge if present
+        uses: mheap/github-action-required-labels@v5
+        with:
+          mode: exactly
+          count: 0
+          labels: 'ongoing freeze - do not merge'
+          exit_type: failure
+
+      - name: Check for Required Labels # require at least one of these labels
+        uses: mheap/github-action-required-labels@v5
+        with:
+          mode: minimum
+          count: 1
+          labels: 'Affects Balance, bug fix, chore, enhancement, MuTE, new feature, refactor'
+          exit_type: failure

.github/workflows/test-forbidden-getmoditems.yml

@@ -0,0 +1,18 @@
+name: Forbidden getModItems
+
+on:
+  pull_request:
+    branches: [ master, main ]
+  push:
+    branches: [ master, main ]
+
+jobs:
+  test-forbidden-getmoditems:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Detect forbidden getModItem calls
+        shell: bash
+        run: |
+          ! grep -E -r 'getModItem\(("(bartworks|galacticgreg|ggfab|GoodGenerator|gregtech|gtnhlanth|miscutils|kekztech|kubatech|tectech|gtneioreplugin)"|.*(BartWorks|GalactiGreg|GGFab|GoodGenerator|GregTech|GTNHLanthanides|GTPlusPlus|KekzTech|KubaTech|TecTech|NEIOrePlugin)\.ID)' src/main/java

.github/workflows/test-forbidden-ismodloaded.yml

@@ -0,0 +1,18 @@
+name: Forbidden isModLoaded
+
+on:
+  pull_request:
+    branches: [ master, main ]
+  push:
+    branches: [ master, main ]
+
+jobs:
+  test-forbidden-ismodloaded:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Detect forbidden isModLoaded calls
+        shell: bash
+        run: |
+          ! grep -E -r '(BartWorks|GalactiGreg|GGFab|GoodGenerator|GTNHLanthanides|GregTech|GTPlusPlus|KekzTech|KubaTech|TecTech|NEIOrePlugin)\.isModLoaded' src/main/java

.github/workflows/test-scala-presence.yml

@@ -11,8 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - name: Check file content
-        uses: mattsb42-meta/[email protected]
-        with:
-          config-file: ./.github/test-scala-presence.toml
+        uses: actions/checkout@v4
+      - name: Detect scala presence
+        shell: bash
+        run: |
+          ! grep -E -r 'import scala\.' src/main/java
+

README.md

@@ -40,6 +40,22 @@ the chance of strange errors.
 Some textures/ideas have been taken from future versions of GT and texture pack authors for GTNH. Credit goes to Jimbno
 for the UU-Tex texture pack and its contributions to the base pack here: https://github.com/Jimbno/UU-Tex.
 
+## Music duration metadata
+
+The electric jukebox requires duration metadata to specify how many milliseconds each disk plays for.
+These can be included in mods' jar resources under `soundmeta/durations.json`, or in the pack config directory at `config/soundmeta/durations.json`.
+The format is a simple key-value map of sound IDs mapping to millisecond counts, and can be generated from the client automatically using `/gt dump_music_durations`.
+
+```json
+{
+  "soundDurationsMs": {
+    "minecraft:11": 71112,
+    "minecraft:13": 178086,
+    "minecraft:blocks": 345914
+  }
+}
+```
+
 ## License
 
 GT5-Unofficial is free software: you can redistribute it and/or modify it under the terms of the

dependencies.gradle

@@ -34,67 +34,81 @@
  * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph
  */
 dependencies {
-    api("com.github.GTNewHorizons:StructureLib:1.3.1:dev")
+    api("com.github.GTNewHorizons:StructureLib:1.3.4:dev")
     api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
-    api("com.github.GTNewHorizons:NotEnoughItems:2.6.5-GTNH:dev")
-    api("com.github.GTNewHorizons:GTNHLib:0.2.11:dev")
-    api("com.github.GTNewHorizons:ModularUI:1.2.0:dev")
-    api("com.github.GTNewHorizons:waila:1.8.0:dev")
-    api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-405-GTNH:dev")
-    api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.4-gtnh:dev")
+    api("com.github.GTNewHorizons:NotEnoughItems:2.6.38-GTNH:dev")
+    api("com.github.GTNewHorizons:NotEnoughIds:2.1.2:dev")
+    api("com.github.GTNewHorizons:GTNHLib:0.5.11:dev")
+    api("com.github.GTNewHorizons:ModularUI:1.2.5:dev")
+    api("com.github.GTNewHorizons:ModularUI2:2.1.8-1.7.10:dev")
+    api("com.github.GTNewHorizons:waila:1.8.1:dev")
+    api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-459-GTNH:dev")
+    api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.36-gtnh:dev")
     api('com.github.GTNewHorizons:Yamcl:0.6.0:dev')
-    api('com.github.GTNewHorizons:ThaumicTinkerer:2.10.0:dev')
-    api("com.github.GTNewHorizons:Mobs-Info:0.2.6-GTNH:dev")
-    api("com.github.GTNewHorizons:ForestryMC:4.9.3:dev")
+    api("com.github.GTNewHorizons:Postea:1.0.10:dev")
 
-    devOnlyNonPublishable("com.github.GTNewHorizons:Infernal-Mobs:1.8.1-GTNH:dev")
-    runtimeOnly("com.github.GTNewHorizons:Draconic-Evolution:1.3.5-GTNH:dev") // needed?
+    compileOnlyApi('com.github.GTNewHorizons:ThaumicTinkerer:2.10.1:dev')
+    compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.6-GTNH:dev")
+    compileOnlyApi("com.github.GTNewHorizons:Navigator:1.0.12:dev")
+    implementation('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false}
+    // Required to prevent an older bauble api from Extra Utilities from loading first in the javac classpath
+    compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false}
+
+    devOnlyNonPublishable("com.github.GTNewHorizons:Infernal-Mobs:1.9.0-GTNH:dev")
 
-    implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.3.0:dev') { transitive = false }
-    implementation("com.github.GTNewHorizons:Avaritia:1.49:dev")
+    compileOnlyApi("com.github.GTNewHorizons:Avaritia:1.52:dev")
 
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha52:api') { transitive = false }
-    compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.3.0:dev") { transitive = false }
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta6:api') { transitive = false }
+    compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.3.2:dev") { transitive = false }
     compileOnlyApi("com.github.GTNewHorizons:BuildCraft:7.1.39:dev") { transitive = false }
-    compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.8.6:dev") { transitive = false }
-    compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.10.0-GTNH:dev") { transitive = false }
-    compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.15.8:dev") { transitive = false }
+    compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.8.17:dev") { transitive = false }
+    compileOnlyApi("com.github.GTNewHorizons:ForestryMC:4.9.16:dev") { transitive = false }
+    compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.10.2-GTNH:dev") { transitive = false }
+    compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.15.14:dev") { transitive = false }
 
-    compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") {transitive = false}
-    compileOnly("com.github.GTNewHorizons:ThaumicBases:1.7.1:dev") { transitive = false }
+    compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.27:deobf") {transitive = false}
+    compileOnly("com.github.GTNewHorizons:ThaumicBases:1.7.5:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:EnderCore:0.4.6:dev") { transitive = false }
-    implementation("com.github.GTNewHorizons:Galacticraft:3.1.5-GTNH:dev") { transitive = false }
-    implementation("com.github.GTNewHorizons:TinkersConstruct:1.12.2-GTNH:dev")
-    compileOnly("com.github.GTNewHorizons:Chisel:2.15.0-GTNH:dev") { transitive = false }
+    compileOnly('com.github.GTNewHorizons:VisualProspecting:1.3.17:dev') { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.94-GTNH:dev") { transitive = false }
+
+    compileOnlyApi("com.github.GTNewHorizons:Galacticraft:3.2.4-GTNH:dev") { transitive = false }
+    implementation("com.github.GTNewHorizons:TinkersConstruct:1.12.9-GTNH:dev")
+
+    compileOnly("com.github.GTNewHorizons:Chisel:2.15.2-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Translocators:1.2.1:dev") { transitive = false }
     compileOnly rfg.deobf("curse.maven:cofh-core-69162:2388751")
-    compileOnly("com.github.GTNewHorizons:Nuclear-Control:2.6.2:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Nuclear-Control:2.6.7:dev") { transitive = false }
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.20:dev") { transitive = false }
-    compileOnly('com.github.GTNewHorizons:Botania:1.11.3-GTNH:dev') { transitive = false }
-    compileOnly('com.github.GTNewHorizons:HoloInventory:2.4.10-GTNH:dev') { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.62:dev") { transitive = false }
+    compileOnly('com.github.GTNewHorizons:Botania:1.11.5-GTNH:dev') { transitive = false }
+    compileOnly('com.github.GTNewHorizons:HoloInventory:2.4.12-GTNH:dev') { transitive = false }
     compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
     compileOnly rfg.deobf('curse.maven:minefactory-reloaded-66672:2366150')
-    compileOnly("com.github.GTNewHorizons:OpenComputers:1.10.11-GTNH:dev") {transitive = false}
+    compileOnly("com.github.GTNewHorizons:OpenComputers:1.10.23-GTNH:dev") {transitive = false}
     // https://www.curseforge.com/minecraft/mc-mods/advancedsolarpanels
-    implementation rfg.deobf('curse.maven:advsolar-362768:2885953')
-    compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.10-GTNH:dev') {transitive =  false}
-    compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.2:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:CraftTweaker:3.3.1:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.6.1-GTNH:dev") { transitive = false }
+    compileOnlyApi rfg.deobf('curse.maven:advsolar-362768:2885953')
+    compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.25-GTNH:dev') {transitive =  false}
+    compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.6:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:CraftTweaker:3.4.0:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.7.0-GTNH:dev") { transitive = false }
+    compileOnly rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612")
 
-    implementation('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false}
-    compileOnly('com.github.GTNewHorizons:SC2:2.1.1:dev') {transitive=false}
-    compileOnly('com.github.GTNewHorizons:Binnie:2.4.0:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:SC2:2.2.0:dev') {transitive=false}
+    compileOnly('com.github.GTNewHorizons:Binnie:2.4.2:dev') {transitive = false}
     compileOnly('curse.maven:PlayerAPI-228969:2248928') {transitive=false}
+    compileOnly('com.github.GTNewHorizons:BlockRenderer6343:1.2.14:dev'){transitive=false}
 
     shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1')
 
     compileOnly("com.google.auto.value:auto-value-annotations:1.10.1") { transitive = false }
     annotationProcessor("com.google.auto.value:auto-value:1.10.1")
 
-    // For testing iApiary
-    //runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.9.3:dev")
+    // For testing forestry integration (iApiary, combs, tree growth simulator)
+    // runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.9.16:dev")
+    // runtimeOnlyNonPublishable('com.github.GTNewHorizons:neiaddons:1.16.0:dev')
+    // runtimeOnlyNonPublishable('com.github.GTNewHorizons:MagicBees:2.8.5-GTNH:dev')
+    // runtimeOnlyNonPublishable('com.github.GTNewHorizons:Binnie:2.4.2:dev')
 
     testImplementation(platform('org.junit:junit-bom:5.9.2'))
     testImplementation('org.junit.jupiter:junit-jupiter')
@@ -106,5 +120,12 @@ dependencies {
     functionalTestImplementation('org.junit.platform:junit-platform-launcher')
     functionalTestImplementation('org.junit.platform:junit-platform-reporting')
 
-    runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.2.3:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.4:dev")
+    runtimeOnlyNonPublishable('com.github.GTNewHorizons:EnderIO:2.8.17:dev')
+
+    // For testing
+    //runtimeOnlyNonPublishable('com.github.GTNewHorizons:TCNEIAdditions:1.4.1:dev')
+
+    // Speeds up mod identification and loading in dev
+    runtimeOnlyNonPublishable(rfg.deobf("CoreTweaks:CoreTweaks:0.3.3.2"))
 }

docs/RecipeBuilder.md

@@ -1,6 +1,6 @@
 # introduction
 
-GT_RecipeBuilder is the replacement of GT_Values.RA.addXXXX for constructing and adding recipes.
+GTRecipeBuilder is the replacement of GT_Values.RA.addXXXX for constructing and adding recipes.
 Compared to the old style, this one utilizes the builder pattern to
 
 1. allow greater flexibility in API.
@@ -29,13 +29,13 @@ being the preferred choice.
 ## complicated recipe adder
 
 1. If one invocation of recipe adder would add multiple recipe to same recipe map, give that recipe map a recipeEmitter
-2. If one invocation of recipe adder would conditionally add recipe, define a new IRecipeMap in GT_RecipeConstants
+2. If one invocation of recipe adder would conditionally add recipe, define a new IRecipeMap in GTRecipeConstants
 3. If one invocation of recipe adder would add recipe to multiple recipe map,
-   1. If all recipe maps involved receive recipe only via this type of adding, use the chaining mechanism offered by GT_RecipeMap, i.e. addDownstream().
+   1. If all recipe maps involved receive recipe only via this type of adding, use the chaining mechanism offered by GTRecipeMap, i.e. addDownstream().
 
       e.g.sMultiblockElectrolyzerRecipes and sElectrolyzerRecipes
-   2. Otherwise, define a new IRecipeMap in GT_RecipeConstants.
-4. If the target isn't a real recipe map (e.g. AssLine stuff), define a new IRecipeMap in GT_RecipeConstants.
+   2. Otherwise, define a new IRecipeMap in GTRecipeConstants.
+4. If the target isn't a real recipe map (e.g. AssLine stuff), define a new IRecipeMap in GTRecipeConstants.
 
 ## Downstream in an addon
 

docs/ResourcePacks_Guide.md

@@ -58,7 +58,7 @@ You can simply add textures named by the following rules:
 - Basically place at `gregtech/textures/gui/progressbar/${unlocalized name of recipemap}`. Unlocalized name can be found on either of:
   - Hold shift while hovering over NEI tab. "HandlerID" indicates unlocalized name.
 ![](/docs/img/recipemap-unlocalized-name.png)
-  - Read code. Usually they're passed as 2nd argument for `GT_Recipe_Map` constructor. Recipemaps are defined at `gregtech.api.util.GT_Recipe`.
+  - Read code. Usually they're passed as 2nd argument for `GTRecipe_Map` constructor. Recipemaps are defined at `gregtech.api.util.GTRecipe`.
 - For steam machines, append `_bronze`, `_steel`, or `_primitive`.
 - Exceptions: Miner: `miner`, Electric Furnace: `E_Furnace`, Electric Oven: `E_Oven`
 

gradle.properties

@@ -80,11 +80,16 @@ apiPackage =
 # Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
 # There can be multiple files in a space-separated list.
 # Example value: mymodid_at.cfg nei_at.cfg
-accessTransformersFile = ggfab_at.cfg tectech_at.cfg
+accessTransformersFile = gregtech_at.cfg
 
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = true
 
+# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
+# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
+# Mixin classes will have access to "main" classes, but not the other way around.
+separateMixinSourceSet = mixin
+
 # Adds some debug arguments like verbose output and class export.
 usesMixinDebug = true
 
@@ -117,9 +122,15 @@ minimizeShadowedDependencies = true
 # If disabled, won't rename the shadowed classes.
 relocateShadowedDependencies = true
 
-# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
+# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
 includeWellKnownRepositories = true
 
+# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
+# list of strings, with the acceptable keys being(case does not matter):
+# cursemaven
+# modrinth
+excludeWellKnownRepositories =
+
 # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
 # Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
 # If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.
@@ -190,3 +201,5 @@ curseForgeRelations =
 # This is meant to be set in $HOME/.gradle/gradle.properties.
 # ideaCheckSpotlessOnBuild = true
 
+# Non-GTNH properties
+org.gradle.jvmargs = -Xmx2g

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

repositories.gradle

@@ -1,6 +1,23 @@
 // Add any additional repositories for your dependencies here
 
 repositories {
+    exclusiveContent {
+        forRepository {
+            ivy {
+                name = 'CoreTweaks releases'
+                url = 'https://github.com/makamys/CoreTweaks/releases/download/'
+                patternLayout {
+                    artifact '[revision]/[module]-1.7.10-[revision]+nomixin(-[classifier])(.[ext])'
+                }
+                metadataSources {
+                    artifact()
+                }
+            }
+        }
+        filter {
+            includeGroup('CoreTweaks')
+        }
+    }
     ivy {
         url 'https://files.vexatos.com/'
         patternLayout {