fix a couple things

move the workflow back to linux hopefully?
rhysdh540 · Mar 26, 2024 · 37e9283 · 37e9283
1 parent 43be4ec
commit 37e9283
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ on: [ workflow_dispatch, push, pull_request ]
 jobs:
     build:
         if: "!contains(github.event.head_commit.message, '[skip]')"
-        runs-on: windows-latest
+        runs-on: ubuntu-20.04
         steps:
             -   name: checkout
                 uses: actions/checkout@v4
@@ -21,15 +21,15 @@ jobs:
                     cache-read-only: false
 
             -   name: do the build
-                run: .\gradlew.bat assemble
+                run: ./gradlew assemble
 
             -   name: squishy
-                run: .\gradlew.bat squishJar
+                run: ./gradlew squishJar
 
             -   name: upload artifacts
                 uses: actions/upload-artifact@v4
                 with:
-                    name: unlimited-artifacts
+                    name: unlimited-artifacts-${{ github.run_id }}
                     path: |
                         build/libs/merged/*.jar
                         */build/libs/*.jar
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -23,6 +23,11 @@ allprojects {
 	version = "modVersion"()
 	group = "maven_group"()
 
+	java {
+		sourceCompatibility = JavaVersion.VERSION_17
+		targetCompatibility = JavaVersion.VERSION_17
+	}
+
 	tasks.withType<JavaCompile> {
 		options.encoding = "UTF-8"
 		options.release = 17

diff --git a/common/src/main/java/dev/rdh/createunlimited/config/CUConfigs.java b/common/src/main/java/dev/rdh/createunlimited/config/CUConfigs.java
@@ -1,8 +1,6 @@
 package dev.rdh.createunlimited.config;
 
 import com.simibubi.create.foundation.config.ui.BaseConfigScreen;
-import com.simibubi.create.foundation.config.ui.ConfigHelper.ConfigPath;
-import com.simibubi.create.foundation.config.ui.SubMenuConfigScreen;
 
 import dev.rdh.createunlimited.Util;
 
@@ -13,7 +11,6 @@
 
 import net.minecraftforge.common.ForgeConfigSpec;
 import net.minecraftforge.fml.config.ModConfig;
-import net.minecraftforge.fml.config.ModConfig.Type;
 
 import org.jetbrains.annotations.Nullable;
 
@@ -39,7 +36,7 @@ public static void onReload(ModConfig modConfig) {
 			server.onReload();
 	}
 
-	public static Screen createConfigScreen(Screen parent) {
+	public static BaseConfigScreen createConfigScreen(Screen parent) {
 		initBCS();
 		return new BaseConfigScreen(parent, CreateUnlimited.ID);
 	}
@@ -55,7 +52,7 @@ private static void initBCS() {
 		done = true;
 	}
 
-	public static Screen createConfigScreen(@Nullable Minecraft mc, Screen parent) {
+	public static BaseConfigScreen createConfigScreen(@Nullable Minecraft mc, Screen parent) {
 		return createConfigScreen(parent);
 	}
 }
diff --git a/gradle.properties b/gradle.properties
@@ -19,14 +19,14 @@ mcVer = 1.19.2
 minimum_create_version = 0.5.1
 
 # the actual stuff
-mod_version = 0.5.2
+mod_version = 0.6.1
 maven_group = dev.rdh.createunlimited
 archives_base_name = createunlimited
 
 fabric = 0.15.3
 
 # compiler go brrrrr
-manifold_version = 2024.1.1
+manifold_version = 2024.1.9
 strip_lvts = true
 mixin.debug = false