Merge branch 'mc/1.20.2'

nanite · Dec 28, 2023 · 3299f6e · 3299f6e
2 parents c8936db + 38c6582
commit 3299f6e
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,5 @@ classes/
 *.launch
 
 .DS_Store
+
+.architectury-transformer/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Just Hammers Changelog
 
+## [82.0.1]
+
+### Fixed
+
+- Removed mixin debugs
+- Fixed render issues with neoforge
+
 ## [82.0.0]
 
 ### Changed

diff --git a/build.gradle b/build.gradle
@@ -60,7 +60,7 @@ allprojects {
 
 publishMods {
     dryRun = providers.environmentVariable("CURSE_TOKEN").getOrNull() == null
-    changelog = file("./CHANGELOG.md").text
+    changelog = file("./CHANGELOG.md").text.replace("# Just Hammers Changelog", "").trim()
     version = "${mod_version}"
     type = STABLE
 
@@ -146,6 +146,9 @@ publishMods {
     github {
         file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
         additionalFiles.from project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
+        additionalFiles.from project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
+
+        announcementTitle = "[${minecraft_version}] Just Hammers ${mod_version}"
 
         repository = "${project.github_repo}"
         accessToken = providers.environmentVariable("GITHUB_TOKEN")

diff --git a/fabric/src/main/java/pro/mikey/justhammers/fabric/mixin/ServerPlayerGameModeMixinFabric.java b/fabric/src/main/java/pro/mikey/justhammers/fabric/mixin/ServerPlayerGameModeMixinFabric.java
@@ -18,7 +18,6 @@
 /**
  * Forge and fabric seem to have different source sets so this is required... Fun
  */
-@Debug(export = true)
 @Mixin(ServerPlayerGameMode.class)
 public class ServerPlayerGameModeMixinFabric {
     @Shadow @Final protected ServerPlayer player;

diff --git a/forge/src/main/java/pro/mikey/justhammers/forge/mixin/ServerPlayerGameModeMixinForge.java b/forge/src/main/java/pro/mikey/justhammers/forge/mixin/ServerPlayerGameModeMixinForge.java
@@ -18,7 +18,6 @@
 /**
  * Forge and fabric seem to have different source sets so this is required... Fun
  */
-@Debug(export = true)
 @Mixin(ServerPlayerGameMode.class)
 public class ServerPlayerGameModeMixinForge {
     @Shadow @Final protected ServerPlayer player;

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ minecraft_version=1.20.2
 enabled_platforms=fabric,forge,neoforge
 
 archives_base_name=just-hammers
-mod_version=82.0.0
+mod_version=82.0.1
 maven_group=pro.mikey.mods
 
 architectury_version=10.0.17

diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -60,6 +60,8 @@ remapJar {
     dependsOn shadowJar
     setArchiveClassifier null
     setArchivesBaseName("${rootProject.archivesBaseName}-${project.name}") // adds fabric to the maven and curse name
+
+    atAccessWideners.add('justhammers.accesswidener')
 }
 
 jar {

diff --git a/...src/main/java/pro/mikey/justhammers/neoforge/mixin/ServerPlayerGameModeMixinNeoForge.java b/...src/main/java/pro/mikey/justhammers/neoforge/mixin/ServerPlayerGameModeMixinNeoForge.java
@@ -18,7 +18,6 @@
 /**
  * Forge and fabric seem to have different source sets so this is required... Fun
  */
-@Debug(export = true)
 @Mixin(ServerPlayerGameMode.class)
 public class ServerPlayerGameModeMixinNeoForge {
     @Shadow @Final protected ServerPlayer player;