Merge remote-tracking branch 'origin/main'

Layers-of-Railways · Nov 16, 2023 · 1c4131d · 1c4131d
2 parents f29ac79 + 5692c3b
commit 1c4131d
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
         with:
           java-version: ${{ matrix.java }}
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches
@@ -36,4 +36,4 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: Artifacts
-          path: build/libs/
+          path: fabric/build/libs/
diff --git a/common/build.gradle b/common/build.gradle
@@ -31,7 +31,7 @@ dependencies {
     // required for proper remapping and compiling
     modCompileOnly("net.fabricmc.fabric-api:fabric-api:${fabric_api_version}")
 
-    implementation(annotationProcessor("com.github.LlamaLad7:MixinExtras:0.1.1"))
+    implementation(annotationProcessor("com.github.LlamaLad7:MixinExtras:0.2.0"))
 }
 
 sourceSets.main {

diff --git a/...in/client/MixinGoogleOverlayRenderer.java → ...in/client/MixinGoggleOverlayRenderer.java b/...in/client/MixinGoogleOverlayRenderer.java → ...in/client/MixinGoggleOverlayRenderer.java
@@ -11,7 +11,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 
 @Mixin(GoggleOverlayRenderer.class)
-public class MixinGoogleOverlayRenderer {
+public class MixinGoggleOverlayRenderer {
     @SuppressWarnings("unused")
     @WrapOperation(
             method = "renderOverlay",

diff --git a/common/src/main/resources/numismatics-common.mixins.json b/common/src/main/resources/numismatics-common.mixins.json
@@ -4,7 +4,7 @@
   "package": "dev.ithundxr.createnumismatics.mixin",
   "compatibilityLevel": "JAVA_17",
   "client": [
-    "client.MixinGoogleOverlayRenderer",
+    "client.MixinGoggleOverlayRenderer",
     "client.MixinModelBakery"
   ],
   "mixins": [

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -78,7 +78,7 @@ dependencies {
     modLocalRuntime("net.fabricmc.fabric-api:fabric-api-deprecated:$fabric_api_version")
 
     // because create fabric is a bit broken I think
-    modApi "net.minecraftforge:forgeconfigapiport-fabric:4.2.9"
+    modApi "net.minecraftforge:forgeconfigapiport-fabric:4.2.11"
 
     // Development QOL
     modLocalRuntime("maven.modrinth:lazydfu:${lazydfu_version}")
@@ -100,8 +100,8 @@ dependencies {
 //    modCompileOnly("me.shedaniel:RoughlyEnoughItems-default-plugin-fabric:${rei_version}")
 //    modCompileOnly("dev.emi:emi:${emi_version}")
 
-    implementation(annotationProcessor("com.github.LlamaLad7:MixinExtras:0.1.1"))
-    implementation(include("com.github.LlamaLad7:MixinExtras:0.1.1"))
+    implementation(annotationProcessor("com.github.LlamaLad7:MixinExtras:0.2.0"))
+    implementation(include("com.github.LlamaLad7:MixinExtras:0.2.0"))
 }
 
 processResources {

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -62,8 +62,8 @@ dependencies {
     // if you would like to add integration with JEI, uncomment this line.
 //    modCompileOnly("mezz.jei:jei-${minecraft_version}:${jei_version}:api")
 
-    implementation(annotationProcessor("com.github.LlamaLad7:MixinExtras:0.1.1"))
-    implementation(include("com.github.LlamaLad7:MixinExtras:0.1.1"))
+    implementation(annotationProcessor("com.github.LlamaLad7:MixinExtras:0.2.0"))
+    implementation(include("com.github.LlamaLad7:MixinExtras:0.2.0"))
 }
 
 processResources {

diff --git a/gradle.properties b/gradle.properties
@@ -12,7 +12,7 @@ enabled_platforms = fabric,forge
 # https://lambdaurora.dev/tools/import_quilt.html
 qm_version = 23
 # https://parchmentmc.org/docs/getting-started
-parchment_version = 2023.07.16
+parchment_version = 2023.09.03
 
 # Fabric
 # https://fabricmc.net/develop/
@@ -25,7 +25,7 @@ forge_version = 47.1.43
 
 # Create - Fabric
 # https://modrinth.com/mod/create-fabric/versions
-create_fabric_version = 0.5.1-d-build.1122+mc1.20.1
+create_fabric_version = 0.5.1-d-build.1161+mc1.20.1
 
 # Create - Forge
 # https://github.com/Creators-of-Create/Create/wiki/Depending-on-Create
@@ -39,13 +39,13 @@ flywheel_forge_version = 0.6.9-4
 # set to disabled to have none of them.
 recipe_viewer = emi
 # JEI - https://www.curseforge.com/minecraft/mc-mods/jei/files
-jei_version = 15.2.0.23
+jei_version = 15.2.0.27
 # REI - https://modrinth.com/mod/rei/versions
-rei_version = 12.0.634
+rei_version = 12.0.674
 # EMI - https://modrinth.com/mod/emi/versions
-emi_version = 1.0.12+1.20.1
+emi_version = 1.0.24+1.20.2
 
 # Mod Menu - https://modrinth.com/mod/modmenu/versions
-modmenu_version = 7.2.1
+modmenu_version = 7.2.2
 # LazyDFU - https://modrinth.com/mod/lazydfu/versions
 lazydfu_version = 0.1.3
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists