merge commits from catroom's bouncedpad branch. so, i believe it will works

Author: funkyra

.github/workflows/BuildTest.yml

@@ -94,6 +94,7 @@ jobs:
         with:
           name: installer-jar-${{ env.CLEANROOM_VERSION }}
           path: projects/cleanroom/build/libs/*-installer.jar
+          if-no-files-found: error
 
 #      - name: Upload MMC pack zip
 #        uses: actions/upload-artifact@v4.6.2

FIXED_UPSTREAM_ISSUES.md

@@ -0,0 +1,13 @@
+## Fixed upstream issues
+
+### Modpacks
+
+- Cannot launch MC Eternal[(CatServer#904)](https://github.com/Luohuayu/CatServer/issues/904)
+
+### Forge-Bukkit
+
+- Some mod explosions cannot be handled by Bukkit plugins(e.g. Tinkers' Construct EFLN)
+
+## More
+
+- It is recommended to install [HybridFix](https://github.com/HaHaWTH/HybridFix), which aims to improve Forge+Bukkit compatibility and fix behaviour inconsistencies.

README.md

@@ -1,22 +1,18 @@
-# Cleanroom Minecraft
+<img src="./images/catroom.png" height="160" alt="CatRoom" align="right">
 
-## Features
-### Implemented
+# CatRoom
 
-- 1.12.2 on Java 21
-- *Latest* LWJGL3
-- A working *mod development template/kit*
-- Patches for loading incompatible mods
-- Built-in Mixin w/ handy bootstrapping
-- Develop using Scala 3 + Kotlin 2
-- Compatibility to 99% of Forge mods
+CatRoom is a Cleanroom+Bukkit+Spigot server software forked from [CatServer](https://github.com/Luohuayu/CatServer).
 
-### Planning
+## Features:
 
-- CleanroomGradle to replace ForgeGradle
-- Classfile API
-- Actually useful APIs (See [here](https://github.com/orgs/CleanroomMC/projects/4/))
-- Optimized
+- Replaced Forge with Cleanroom
+- Enhanced mod compatibility
+- Built-in Forge-Bukkit permission bridge
+- Make use of modern Java features
+- Optimized plugin performance
+
+For all fixes, see [fixed upstream issues](FIXED_UPSTREAM_ISSUES.md)
 
 ## Components:
 
@@ -30,29 +26,6 @@
 - [Scalar](https://www.curseforge.com/minecraft/mc-mods/scalar-legacy), a Scala provider. We made Scala libraries become a standalone mod so it can be updated.
 - [Forgelin-Continuous](https://www.curseforge.com/minecraft/mc-mods/forgelin-continuous) and [LibrarianLib-Continuous](https://www.curseforge.com/minecraft/mc-mods/librarianlib-continuous)
 
-## Download & Installation:
-
-- For MultiMC-based launchers (PolyMC, PrismLauncher), download the MMC instance from [release](https://github.com/CleanroomMC/Cleanroom/releases), import it in your launcher(alternatively unzip patches and json inside to your 1.12 instance).
-- For regular launcher (official launcher, AT launcher, FTB, HMCL), install the [relauncher](https://www.curseforge.com/minecraft/mc-mods/cleanroom-relauncher), launch the game and follow instructions.
-- **WARNING:** Only MultiMC-based launchers are officially supported. This is because of the limit on removing vanilla libraries in other launchers.
-- **Remember to install [Fugue](https://www.curseforge.com/minecraft/mc-mods/fugue)!**
-- **And [Scalar](https://www.curseforge.com/minecraft/mc-mods/scalar-legacy)!**
-- If you were told to use **action builds** (aka bleeding edge), here: [Cleanroom](https://github.com/CleanroomMC/Cleanroom/actions), [Fugue](https://github.com/CleanroomMC/Fugue/actions)
-- You need to log in your GitHub account to download action artifacts. 
-
-## Cleanroom on Server
-
-- Cleanroom can be installed on server.
-- Just use the installer mentioned in previous section, and run the jar with `--intallServer`. See [this page](https://minecraft.fandom.com/wiki/Tutorials/Setting_up_a_Minecraft_Forge_server) for more detail. 
-
-## Pack-making with Cleanroom
-
-### Steps of Migrating to Cleanroom
-
-1. Add Scalar and Fugue in your pack.
-2. Add Relauncher (optional, this will make your pack a full Cleanroom pack)
-3. Test launching and remove incompatible mods
-
 ### About Cross-compat Between Forge and Cleanroom
 
 - Cleanroom mods (Fugue, Scalar) will be ignored by Forge, so then won't crash existed players

build.gradle

@@ -82,7 +82,9 @@ def jvm_arguments = [
 
 def compiler_jvm_arguments = [
         '--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED',
-        '--add-exports=java.base/jdk.internal.reflect=ALL-UNNAMED'
+        '--add-exports=java.base/jdk.internal.reflect=ALL-UNNAMED',
+        '-Xlint:-removal', // Suppress Timings deprecation warnings
+        '--add-modules=jdk.incubator.vector' // CatRoom - SIMD support
 ]
 // Projects
 
@@ -528,6 +530,7 @@ project(':cleanroom') {
         installer 'net.openhft:affinity:3.23.3'
         installer 'org.slf4j:slf4j-api:2.1.0-alpha1' // Affinity
         installer 'org.slf4j:slf4j-simple:2.1.0-alpha1' // Affinity
+        installer 'com.github.ben-manes.caffeine:caffeine:3.2.2'
 
         /*
         forgeGradleMcDeps

gradle.properties

@@ -33,3 +33,8 @@ org.gradle.caching=true
 # org.gradle.java.home=/usr/lib/jvm/java-1.17.0-openjdk-amd64
 # Daemon
 org.gradle.daemon=false
+
+#systemProp.http.proxyHost=127.0.0.1
+#systemProp.http.proxyPort=7890
+#systemProp.https.proxyHost=127.0.0.1
+#systemProp.https.proxyPort=7890

images/catroom.png

@@ -48,7 +48,7 @@
                              if (this.func_176369_e(p_180650_1_, blockpos))
                              {
 -                                p_180650_1_.func_175656_a(blockpos, Blocks.field_150480_ab.func_176223_P());
-+                                if (p_180650_1_.func_180495_p(blockpos) != Blocks.field_150480_ab) {
++                                if (p_180650_1_.func_180495_p(blockpos).func_177230_c() != Blocks.field_150480_ab) {
 +                                    if (CraftEventFactory.callBlockIgniteEvent(p_180650_1_, blockpos.func_177958_n(), blockpos.func_177956_o(), blockpos.func_177952_p(), p_180650_2_.func_177958_n(), p_180650_2_.func_177956_o(), p_180650_2_.func_177952_p()).isCancelled()) {
 +                                        continue;
 +                                    }

patches/minecraft/net/minecraft/block/BlockStaticLiquid.java.patch

@@ -1,14 +1,20 @@
 --- before/net/minecraft/entity/ai/EntityAIMate.java
 +++ after/net/minecraft/entity/ai/EntityAIMate.java
-@@ -6,6 +6,7 @@
+@@ -2,10 +2,13 @@
+ 
+ import java.util.List;
+ import java.util.Random;
++
++import catserver.server.utils.ModFixUtils;
+ import net.minecraft.advancements.CriteriaTriggers;
  import net.minecraft.entity.EntityAgeable;
  import net.minecraft.entity.item.EntityXPOrb;
  import net.minecraft.entity.passive.EntityAnimal;
 +import net.minecraft.entity.passive.EntityTameable;
  import net.minecraft.entity.player.EntityPlayerMP;
  import net.minecraft.stats.StatList;
  import net.minecraft.util.EnumParticleTypes;
-@@ -22,7 +23,7 @@
+@@ -22,7 +25,7 @@
 
      public EntityAIMate(EntityAnimal p_i1619_1_, double p_i1619_2_)
      {
@@ -17,15 +23,15 @@
      }
 
      public EntityAIMate(EntityAnimal p_i47306_1_, double p_i47306_2_, Class <? extends EntityAnimal > p_i47306_4_)
-@@ -34,7 +35,6 @@
+@@ -34,7 +37,6 @@
          this.func_75248_a(3);
      }
 
 -    @Override
      public boolean func_75250_a()
      {
          if (!this.field_75390_d.func_70880_s())
-@@ -48,27 +48,24 @@
+@@ -48,27 +50,24 @@
          }
      }
 
@@ -55,7 +61,7 @@
          {
              this.func_75388_i();
          }
-@@ -76,7 +73,7 @@
+@@ -76,7 +75,7 @@
 
      private EntityAnimal func_75389_f()
      {
@@ -64,7 +70,7 @@
          double d0 = Double.MAX_VALUE;
          EntityAnimal entityanimal = null;
 
-@@ -96,8 +93,23 @@
+@@ -96,8 +95,23 @@
      {
          EntityAgeable entityageable = this.field_75390_d.func_90011_a(this.field_75391_e);
 
@@ -88,11 +94,11 @@
              EntityPlayerMP entityplayermp = this.field_75390_d.func_191993_do();
 
              if (entityplayermp == null && this.field_75391_e.func_191993_do() != null)
-@@ -105,6 +117,13 @@
+@@ -105,6 +119,13 @@
                  entityplayermp = this.field_75391_e.func_191993_do();
              }
 
-+            int experience = this.field_75390_d.func_70681_au().nextInt(7) + 1;
++            int experience = this.field_75390_d.func_70681_au().nextInt(ModFixUtils.fixNetherAPI()) + 1; // CatRoom - Fix NetherAPI
 +            org.bukkit.event.entity.EntityBreedEvent entityBreedEvent = org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory.callEntityBreedEvent(entityageable, field_75390_d, field_75391_e, entityplayermp, this.field_75390_d.breedItem, experience);
 +            if (entityBreedEvent.isCancelled()) {
 +                return;
@@ -102,7 +108,7 @@
              if (entityplayermp != null)
              {
                  entityplayermp.func_71029_a(StatList.field_151186_x);
-@@ -117,41 +136,24 @@
+@@ -117,41 +138,24 @@
              this.field_75391_e.func_70875_t();
              entityageable.func_70873_a(-24000);
              entityageable.func_70012_b(this.field_75390_d.field_70165_t, this.field_75390_d.field_70163_u, this.field_75390_d.field_70161_v, 0.0F, 0.0F);