Bump NeoGradle, fix access-modifier misplacement. UserDev will now al…

…so require a recent NG to align with this. (#1068)
neoforged · Jun 8, 2024 · 696c4a4 · 696c4a4
1 parent a5c0363
commit 696c4a4
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 17 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -19,7 +19,7 @@ accesstransformers_version=10.0.1
 coremods_version=6.0.4
 eventbus_version=8.0.1
 modlauncher_version=11.0.2
-securejarhandler_version=3.0.7
+securejarhandler_version=3.0.8
 bootstraplauncher_version=2.0.2
 asm_version=9.5
 installer_version=2.1.+

diff --git a/patches/com/mojang/blaze3d/vertex/VertexFormatElement.java.patch b/patches/com/mojang/blaze3d/vertex/VertexFormatElement.java.patch
@@ -22,7 +22,7 @@
              GlStateManager._vertexAttribPointer(p_167048_, p_167043_, p_167044_, false, p_167045_, p_167046_);
 @@ -186,6 +_,10 @@
          @OnlyIn(Dist.CLIENT)
-         interface SetupState {
+         public interface SetupState {
              void setupBufferState(int p_167053_, int p_167054_, int p_167055_, long p_167056_, int p_167057_, int p_167058_);
 +        }
 +

diff --git a/patches/net/minecraft/client/gui/Gui.java.patch b/patches/net/minecraft/client/gui/Gui.java.patch
@@ -379,19 +379,18 @@
 +        this.layerManager.initModdedLayers();
 +    }
 +
-     public @OnlyIn(Dist.CLIENT)
--    static enum HeartType {
-+    static enum HeartType implements net.neoforged.neoforge.common.IExtensibleEnum {
+     @OnlyIn(Dist.CLIENT)
+-    public static enum HeartType {
++    public static enum HeartType implements net.neoforged.neoforge.common.IExtensibleEnum {
          CONTAINER(
              new ResourceLocation("hud/heart/container"),
              new ResourceLocation("hud/heart/container_blinking"),
-@@ -1407,7 +_,24 @@
+@@ -1406,8 +_,23 @@
+             } else {
                  gui$hearttype = NORMAL;
              }
-
-+            // Neo: Allow mods to override the heart type with a custom one.
 +            gui$hearttype = net.neoforged.neoforge.event.EventHooks.firePlayerHeartTypeEvent(p_168733_, gui$hearttype);
-+
+ 
              return gui$hearttype;
 +        }
 +

diff --git a/patches/net/minecraft/client/renderer/block/model/ItemOverrides.java.patch b/patches/net/minecraft/client/renderer/block/model/ItemOverrides.java.patch
@@ -47,4 +47,4 @@
 +        return com.google.common.collect.ImmutableList.copyOf(overrides);
      }
 
-     public @OnlyIn(Dist.CLIENT)
+     @OnlyIn(Dist.CLIENT)
diff --git a/projects/neoforge/build.gradle b/projects/neoforge/build.gradle
@@ -16,6 +16,9 @@ installerProfile {
 }
 
 minecraft {
+    // FML looks for this mod id to find the minecraft classes
+    modIdentifier 'minecraft'
+
     accessTransformers {
         file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
     }
@@ -227,10 +230,6 @@ artifacts {
     }
 }
 
-minecraft {
-    modIdentifier 'minecraft'
-}
-
 publishing {
     publications.create('NeoForge', MavenPublication) {
         groupId = project.group

diff --git a/settings.gradle b/settings.gradle
@@ -7,7 +7,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'net.neoforged.gradle.platform' version '7.0.136'
+    id 'net.neoforged.gradle.platform' version '7.0.142'
 }
 
 rootProject.name = rootDir.name

diff --git a/tests/build.gradle b/tests/build.gradle
@@ -109,8 +109,7 @@ afterEvaluate {
         args.set(outputIndex+1, file('src/generated/resources/').absolutePath);
         programArguments.set(args);
     }
-    runs.junit.modSources = runs.junit.modSources.get().stream()
-        .filter { it != sourceSets.main }.toList()
+    runs.junit.modSources.all().get().values().remove(sourceSets.main)
 }
 
 license {