Merge branch 'master' into scala3

CleanroomMC · Jan 25, 2025 · e4daee1 · e4daee1
2 parents 35cbc87 + ff5c665
commit e4daee1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ Use with experimental branch Cleanroom (3025+)
 - [Scala 2.11.x](https://github.com/CleanroomMC/Scalar/releases/tag/2.11.1), used by non-Cleanroom-based Scala mod
 - [Scala 3.x](https://github.com/CleanroomMC/Scalar/releases/tag/3.4.1), used by Cleanroom-based new mod or forks
 - You can't install them together!
-- There are 0 Scala 3 mods! (for now)
+- There is only 1 Scala 3 mods in 1.12.2! (OpenComputer CRL edition)
 
 ### Development (temporary):
 
@@ -25,12 +25,12 @@ to your repositories
 2. Add `implementation "com.cleanroommc:scalar:3.5.1:api"` to your dependencies
 3. Add
 ```groovy
-    implementation 'org.scala-lang:scala3-compiler_3:3.6.2'
-    implementation 'org.scala-lang:scala3-library_3:3.6.2'
+    implementation 'org.scala-lang:scala3-compiler_3:3.6.3'
+    implementation 'org.scala-lang:scala3-library_3:3.6.3'
     implementation 'com.typesafe:config:1.4.3'
-    implementation 'org.typelevel:cats-core_3:2.12.0'
-    implementation 'org.typelevel:cats-kernel_3:2.12.0'
-    implementation 'org.typelevel:cats-free_3:2.12.0'
+    implementation 'org.typelevel:cats-core_3:2.13.0'
+    implementation 'org.typelevel:cats-kernel_3:2.13.0'
+    implementation 'org.typelevel:cats-free_3:2.13.0'
 ```
 to your dependencies (Yes you need to declare them yourself)
 

diff --git a/build.gradle b/build.gradle
@@ -244,7 +244,8 @@ tasks.register('apiJar', Jar){
                 'Specification-Title': mod_id,
                 'Specification-Vendor': "kappa-maintainer",
                 'Specification-Version': '1', // We are version 1 of ourselves
-                'FMLCorePlugin': project.coremod_plugin_class_name
+                'FMLCorePlugin': project.coremod_plugin_class_name,
+                'ModType': "CRL"
         ])
     }
     from sourceSets.main.output

diff --git a/src/main/java/com/cleanroommc/scalar/ScalarLoadingPlugin.java b/src/main/java/com/cleanroommc/scalar/ScalarLoadingPlugin.java
@@ -16,7 +16,7 @@ public ScalarLoadingPlugin() {
         try {
             Class.forName("com.cleanroommc.loader.LanguageAdapterRegistry").getDeclaredMethod("registerLanguageAdapter", String.class, ILanguageAdapter.class).invoke(null, "scala", new ScalaLanguageAdapter());
         } catch (Throwable ex) {
-            LOGGER.fatal("Not running on Cleanroom! Cause by {}", ex);
+            LOGGER.fatal("Scalar was loaded in non-Cleanroom environment. This shouldn't be possible, please re-download the mod file.");
         }
     }