Merge remote-tracking branch 'upstream/experimental/foundation'

build.gradle

@@ -48,9 +48,11 @@ def sysProps = System.getProperties()
 def details = versionDetails()
 
 group 'com.cleanroommc'
+
 version details.lastTag + (project.hasProperty("release") ?
         "" : ("+build." + details.commitDistance + (project.hasProperty("run_number") ?
                 (".run." + props.run_number) : "")))
+
 def version_txt = new File(project.projectDir, "version.txt")
 version_txt.write(version.toString())
 def spec_version = details.lastTag
@@ -183,7 +185,7 @@ project(':cleanroom') {
 
             target.withWriter { def writer ->
                 template.eachLine { def line ->
-                    def newLine = line.replace("%VERSION%", versionDetails().lastTag + "-infdev")
+                    def newLine = line.replace("%VERSION%", versionDetails().lastTag)
                             .replace("%BUILD_VERSION%", rootProject.version.toString())
                     writer.write(newLine + "\n");
                 }
@@ -277,7 +279,7 @@ project(':cleanroom') {
 
                 environment 'target', 'fmldevclient'
                 environment 'tweakClass', 'net.minecraftforge.fml.common.launcher.FMLTweaker'
-                environment 'mainClass', 'com.cleanroommc.bouncepad.Bouncepad'
+                environment 'mainClass', 'top.outlands.foundation.boot.Foundation'
                 environment 'assetIndex', '{asset_index}'
                 environment 'assetDirectory', downloadAssets.output
                 environment 'nativesDirectory', extractNatives.output.get().asFile
@@ -288,7 +290,7 @@ project(':cleanroom') {
                 environment 'FORGE_GROUP', project.group
                 environment 'FORGE_VERSION', props.last_forge_version
 
-                jvmArgs jvm_arguments + '-Dmixin.debug.export=true' + '-Dmixin.checks.interfaces=true'
+                jvmArgs jvm_arguments + '-Dmixin.debug.export=true' + '-Dmixin.checks.interfaces=true' + '-Djava.system.class.loader=net.minecraft.launchwrapper.LaunchClassLoader'
                 //jvmArgs jvm_arguments
 
                 // Lazily supply the Mappings target, createSrg2Mcp.getMappings() doesn't get populated until later
@@ -330,7 +332,7 @@ project(':cleanroom') {
 
                 environment 'target', 'fmldevserver'
                 environment 'tweakClass', 'net.minecraftforge.fml.common.launcher.FMLServerTweaker'
-                environment 'mainClass', 'com.cleanroommc.bouncepad.Bouncepad'
+                environment 'mainClass', 'top.outlands.foundation.boot.Foundation'
                 environment 'MC_VERSION', props.minecraft_version
                 environment 'MCP_VERSION', props.mcp_version
                 environment 'MCP_MAPPINGS', '{mcp_mappings}'
@@ -432,14 +434,19 @@ project(':cleanroom') {
         // Added back deprecated features for mods to load up properly
         installer "org.ow2.asm:asm-deprecated:$props.asm_deprecated"
 
-        installer "com.cleanroommc:bouncepad:$props.bouncepad_version"
+        //installer "com.cleanroommc:bouncepad:$props.bouncepad_version"
+        installer "top.outlands:foundation:0.13.5"
+        installer 'org.burningwave:jvm-driver:8.15.0'
+        installer 'io.github.toolfactory:jvm-driver:9.7.0'
+        installer 'io.github.toolfactory:narcissus:1.0.7'
+        installer 'org.javassist:javassist:3.30.2-GA'
+        installer "zone.rong:imaginebreaker:2.1"
 
         installer 'com.ibm.icu:icu4j:75.1'
 
         installer 'org.jline:jline:3.25.0'
-        installer 'com.typesafe.akka:akka-actor_2.12:2.8.5'
-        installer 'com.typesafe:config:1.4.3'
         // TODO: Move scala away from being defaulted when installing (download on-demand?)
+        /*
         installer 'org.scala-lang:scala-actors-migration_2.11:1.1.0'
         installer 'org.scala-lang:scala-compiler:2.11.1'
         // We change the version so old installs don't break, as our clone of the jar is different the maven central
@@ -451,40 +458,63 @@ project(':cleanroom') {
         installer 'org.scala-lang:scala-reflect:2.11.1'
         installer 'org.scala-lang:scala-swing_2.11:1.0.1'
         installer 'org.scala-lang:scala-xml_2.11:1.0.2'
+
+        installer 'com.typesafe.akka:akka-actor_2.12:2.8.5'
+        installer 'com.typesafe:config:1.4.3'
+        */
         installer 'lzma:lzma:0.0.1'
         installer 'java3d:vecmath:1.5.2'
         installer 'net.sf.trove4j:trove4j:3.0.3'
         installer 'org.apache.maven:maven-artifact:3.9.5'
-        installer 'net.sf.jopt-simple:jopt-simple:5.0.3'
-        installer 'org.apache.commons:commons-lang3:3.13.0'
-        installer 'org.apache.commons:commons-compress:1.24.0'
+        installer 'net.sf.jopt-simple:jopt-simple:5.0.4'
+        installer 'org.apache.commons:commons-lang3:3.14.0'
+        installer 'org.apache.commons:commons-compress:1.26.1'
         installer 'org.apache.httpcomponents:httpclient:4.5.14'
         installer 'org.apache.httpcomponents:httpcore:4.4.16'
-        installer 'com.github.oshi:oshi-core:6.4.10'
+        installer 'com.github.oshi:oshi-core:6.5.0'
         installer 'net.java.dev.jna:jna:5.14.0'
         installer 'net.java.dev.jna:jna-platform:5.14.0'
-        installer 'it.unimi.dsi:fastutil:8.5.12'
+        installer 'it.unimi.dsi:fastutil:8.5.13'
         installer 'commons-codec:commons-codec:1.16.0'
-        installer 'commons-io:commons-io:2.15.1'
-        installer 'commons-logging:commons-logging:1.3.0'
-        installer 'com.google.guava:guava:33.0.0-jre'
+        installer 'commons-io:commons-io:2.16.1'
+        installer 'commons-logging:commons-logging:1.3.1'
+        installer 'com.google.guava:guava:33.1.0-jre'
         installer 'com.google.guava:failureaccess:1.0.2'
         installer 'com.google.code.gson:gson:2.10.1'
         installer 'com.google.code.findbugs:jsr305:3.0.2'
 
+        // Netty
+        installer 'io.netty:netty-codec:4.1.109.Final'
+        installer 'io.netty:netty-buffer:4.1.109.Final'
+        installer 'io.netty:netty-common:4.1.109.Final'
+        installer 'io.netty:netty-handler:4.1.109.Final'
+        installer 'io.netty:netty-resolver:4.1.109.Final'
+        installer 'io.netty:netty-transport:4.1.109.Final'
+        installer 'io.netty:netty-transport-native-unix-common:4.1.109.Final'
+        installer 'io.netty:netty-transport-classes-epoll:4.1.109.Final'
+        installer 'io.netty:netty-transport-native-epoll:4.1.109.Final'
+        installer 'io.netty:netty-codec-http:4.1.109.Final'
+        installer 'io.netty:netty-codec-http2:4.1.109.Final'
+        installer 'io.netty:netty-codec-dns:4.1.109.Final'
+        installer 'io.netty:netty-resolver-dns:4.1.109.Final'
+
+        // installer 'io.netty:netty-all:4.1.93.Final'
+
         // TODO: Unpin in 1.18.1 or when Mojang bumps the Log4J version
-        installer 'org.apache.logging.log4j:log4j-api:2.22.1'
-        installer 'org.apache.logging.log4j:log4j-core:2.22.1'
+        installer 'org.apache.logging.log4j:log4j-api:2.23.1'
+        installer 'org.apache.logging.log4j:log4j-core:2.23.1'
+        installer 'org.apache.logging.log4j:log4j-slf4j2-impl:2.23.1'
+        installer 'org.slf4j:slf4j-api:2.0.13'
         installer 'jakarta.annotation:jakarta.annotation-api:2.1.1'
-        installer 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'
+        installer 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
         installer 'jakarta.xml.ws:jakarta.xml.ws-api:4.0.1'
         installer 'jakarta.activation:jakarta.activation-api:2.1.2'
         installer 'org.glassfish.corba:glassfish-corba-omgapi:4.2.5'
         installer 'org.openjdk.nashorn:nashorn-core:15.4'
 
         // Mixin
-        installer 'com.cleanroommc:sponge-mixin:0.16.0+mixin.0.8.5'
-        installer annotationProcessor('io.github.llamalad7:mixinextras-common:0.3.5')
+        installer 'com.cleanroommc:sponge-mixin:0.19.7+mixin.0.8.5'
+        installer annotationProcessor('io.github.llamalad7:mixinextras-common:0.3.6')
 
         testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.1'
         testImplementation 'org.junit.vintage:junit-vintage-engine:5.10.1'
@@ -861,7 +891,7 @@ project(':cleanroom') {
                 time: timestamp,
                 releaseTime: timestamp,
                 type: 'release',
-                mainClass: 'com.cleanroommc.bouncepad.Bouncepad',
+                mainClass: 'top.outlands.foundation.boot.Foundation',
                 inheritsFrom: props.minecraft_version,
                 logging: { },
                 minecraftArguments: [
@@ -1078,7 +1108,7 @@ project(':cleanroom') {
                 main 'com.cleanroommc.boot.MainClient'
 
                 environment 'tweakClass', 'net.minecraftforge.fml.common.launcher.FMLTweaker'
-                environment 'mainClass', 'com.cleanroommc.bouncepad.Bouncepad'
+                environment 'mainClass', 'top.outlands.foundation.boot.Foundation'
                 environment 'assetIndex', '{asset_index}'
                 environment 'assetDirectory', '{assets_root}'
                 environment 'nativesDirectory', '{natives}'
@@ -1093,7 +1123,7 @@ project(':cleanroom') {
                 main 'com.cleanroommc.boot.MainServer'
 
                 environment 'tweakClass', 'net.minecraftforge.fml.common.launcher.FMLServerTweaker'
-                environment 'mainClass', 'com.cleanroommc.bouncepad.Bouncepad'
+                environment 'mainClass', 'top.outlands.foundation.boot.Foundation'
                 environment 'MC_VERSION', props.minecraft_version
                 environment 'MCP_MAPPINGS', '{mcp_mappings}'
                 environment 'MCP_TO_SRG', '{mcp_to_srg}'

gradle.properties

@@ -1,7 +1,6 @@
 title = Cleanroom
 vendor = CleanroomMC
 
-# MAJOR.SPEC_MAJOR.SPEC_MINOR.BUILD
 last_forge_version = 14.23.5.2860
 
 # Minecraft & Mappings
@@ -17,7 +16,7 @@ binary_patcher = net.minecraftforge:binarypatcher:1.1.1:fatjar
 installer_tools_version = 1.4.1
 
 # Libraries
-asm_version = 9.6
+asm_version = 9.7
 asm_deprecated = 7.1
 bouncepad_version = 0.4.40-cursed
 lwjgl_version = 3.3.4-27-CLEANROOM

patches/minecraft/net/minecraft/client/Minecraft.java.patch

@@ -358,7 +358,7 @@
 -        }
 +        Display.setTitle("Cleanroom Loader");
 +
-+        Display.create();
++        Display.create((new PixelFormat()).withDepthBits(24));
 +
      }
 
@@ -1366,7 +1366,23 @@
          }
      }
 
-@@ -2795,10 +2645,7 @@
+@@ -2778,7 +2628,14 @@
+         {
+             public String call()
+             {
+-                return GlStateManager.func_187416_u(7937) + " GL version " + GlStateManager.func_187416_u(7938) + ", " + GlStateManager.func_187416_u(7936);
++                if (Minecraft.func_71410_x().func_152345_ab())
++                {
++                    return GlStateManager.func_187416_u(7937) + " GL version " + GlStateManager.func_187416_u(7938) + ", " + GlStateManager.func_187416_u(7936);
++                }
++                else
++                {
++                    return "No OpenGL context found in the current thread";
++                }
+             }
+         });
+         p_71396_1_.func_85056_g().func_189529_a("GL Caps", new ICrashReportDetail<String>()
+@@ -2795,10 +2652,7 @@
                  return Minecraft.this.field_71474_y.field_178881_t ? "Yes" : "No";
              }
          });
@@ -1378,7 +1394,7 @@
          {
              public String call() throws Exception
              {
-@@ -2810,13 +2657,10 @@
+@@ -2810,13 +2664,10 @@
                  }
                  else
                  {
@@ -1394,7 +1410,7 @@
          p_71396_1_.func_85056_g().func_189529_a("Type", new ICrashReportDetail<String>()
          {
              public String call() throws Exception
-@@ -2883,11 +2727,11 @@
+@@ -2883,11 +2734,11 @@
          return field_71432_P;
      }
 
@@ -1407,7 +1423,7 @@
              public void run()
              {
                  Minecraft.this.func_110436_a();
-@@ -2895,21 +2739,20 @@
+@@ -2895,21 +2746,20 @@
          });
      }
 
@@ -1435,15 +1451,15 @@
          int i = 0;
 
          for (ResourcePackRepository.Entry resourcepackrepository$entry : this.field_110448_aq.func_110613_c())
-@@ -2939,7 +2782,6 @@
+@@ -2939,7 +2789,6 @@
          }
      }
 
 -    @Override
      public void func_70001_b(Snooper p_70001_1_)
      {
          p_70001_1_.func_152767_b("opengl_version", GlStateManager.func_187416_u(7938));
-@@ -2947,110 +2789,110 @@
+@@ -2947,110 +2796,110 @@
          p_70001_1_.func_152767_b("client_brand", ClientBrandRetriever.getClientModName());
          p_70001_1_.func_152767_b("launched_version", this.field_110447_Z);
          ContextCapabilities contextcapabilities = GLContext.getCapabilities();
@@ -1658,7 +1674,7 @@
          GameProfile gameprofile = this.field_71449_j.func_148256_e();
 
          if (gameprofile != null && gameprofile.getId() != null)
-@@ -3061,21 +2903,10 @@
+@@ -3061,21 +2910,10 @@
 
      public static int func_71369_N()
      {
@@ -1682,7 +1698,7 @@
      public boolean func_70002_Q()
      {
          return this.field_71474_y.field_74355_t;
-@@ -3205,6 +3036,9 @@
+@@ -3205,6 +3043,9 @@
          }
          else if (this.field_71439_g != null)
          {
@@ -1692,7 +1708,7 @@
              if (this.field_71439_g.field_70170_p.field_73011_w instanceof WorldProviderHell)
              {
                  return MusicTicker.MusicType.NETHER;
-@@ -3215,9 +3049,7 @@
+@@ -3215,9 +3056,7 @@
              }
              else
              {
@@ -1703,7 +1719,7 @@
              }
          }
          else
-@@ -3236,19 +3068,15 @@
+@@ -3236,19 +3075,15 @@
              {
                  if (Keyboard.getEventKeyState())
                  {
@@ -1727,15 +1743,15 @@
                      {
                          this.field_71474_y.func_74306_a(GameSettings.Options.NARRATOR, 1);
 
-@@ -3258,6 +3086,7 @@
+@@ -3258,6 +3093,7 @@
                          }
                      }
                  }
 +                else if (this.field_71462_r instanceof GuiControls) ((GuiControls)this.field_71462_r).field_146491_f = null;
              }
          }
      }
-@@ -3292,16 +3121,16 @@
+@@ -3292,16 +3128,16 @@
          {
              try
              {
@@ -1755,7 +1771,7 @@
 
              synchronized (this.field_152351_aB)
              {
-@@ -3311,14 +3140,12 @@
+@@ -3311,14 +3147,12 @@
          }
      }
 
@@ -1771,7 +1787,7 @@
      public boolean func_152345_ab()
      {
          return Thread.currentThread() == this.field_152352_aC;
-@@ -3346,7 +3173,7 @@
+@@ -3346,7 +3180,7 @@
 
      public <T> ISearchTree<T> func_193987_a(SearchTreeManager.Key<T> p_193987_1_)
      {
@@ -1780,7 +1796,7 @@
      }
 
      public static int func_175610_ah()
-@@ -3389,6 +3216,12 @@
+@@ -3389,6 +3223,12 @@
          return this.field_184127_aH;
      }
 
@@ -1793,7 +1809,7 @@
      public boolean func_189648_am()
      {
          return this.field_71439_g != null && this.field_71439_g.func_175140_cp() || this.field_71474_y.field_178879_v;
-@@ -3402,5 +3235,10 @@
+@@ -3402,5 +3242,10 @@
      public Tutorial func_193032_ao()
      {
          return this.field_193035_aW;

patches/minecraft/net/minecraft/client/gui/GuiGameOver.java.patch

@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/gui/GuiGameOver.java
++++ after/net/minecraft/client/gui/GuiGameOver.java
+@@ -74,7 +74,7 @@
+
+                 if (this.field_146297_k.field_71441_e.func_72912_H().func_76093_s())
+                 {
+-                    this.field_146297_k.func_147108_a(new GuiMainMenu());
++                    func_73878_a(true, 0); // Forge : Fix MC-30646
+                 }
+                 else
+                 {