WIP - Port to 1.20.5

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
           check-latest: true
       - name: Build artifacts
         run: ./gradlew build --stacktrace

build.gradle

@@ -62,7 +62,7 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.release = 17
+	it.options.release = 21
 }
 
 java {
@@ -71,8 +71,8 @@ java {
 	// If you remove this line, sources will not be generated.
 	withSourcesJar()
 
-	sourceCompatibility = JavaVersion.VERSION_17
-	targetCompatibility = JavaVersion.VERSION_17
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {

gradle.properties

@@ -4,17 +4,17 @@ org.gradle.parallel = true
 
 # Fabric Properties
 loom_version = 1.6.11
-minecraft_version = 1.20.2
-yarn_mappings = 1.20.2+build.4
+minecraft_version = 1.20.5
+yarn_mappings = 1.20.5+build.1
 loader_version = 0.15.10
 
 # Mod Properties
 mod_version = 3.0.0-beta.5
-mod_minecraft_version = 1.20.2
+mod_minecraft_version = 1.20.5
 maven_group = me.pepperbell
 archives_base_name = continuity
 
 # Dependencies
-fabric_version = 0.89.0+1.20.2
-modmenu_version = 8.0.1
+fabric_version = 0.97.6+1.20.5
+modmenu_version = 10.0.0-beta.1
 canvas_version = 20.2.2627

src/main/java/me/pepperbell/continuity/client/properties/BaseCtmProperties.java

@@ -81,7 +81,7 @@ public class BaseCtmProperties implements CtmProperties {
 	public BaseCtmProperties(Properties properties, Identifier resourceId, ResourcePack pack, int packPriority, ResourceManager resourceManager, String method) {
 		this.properties = properties;
 		this.resourceId = resourceId;
-		this.packName = pack.getName();
+		this.packName = pack.getId();
 		this.packPriority = packPriority;
 		this.resourceManager = resourceManager;
 		this.method = method;
@@ -605,7 +605,7 @@ protected void parseResourceCondition() {
 						}
 					} else if (packStr.equals("programmer_art")) {
 						Optional<Resource> optionalResource = resourceManager.getResource(resourceId);
-						if (optionalResource.isPresent() && !optionalResource.get().getPack().getName().equals("programmer_art")) {
+						if (optionalResource.isPresent() && !optionalResource.get().getPack().getId().equals("programmer_art")) {
 							valid = false;
 							break;
 						}

src/main/java/me/pepperbell/continuity/client/properties/PropertiesParsingHelper.java

@@ -12,8 +12,6 @@
 import org.apache.commons.io.FilenameUtils;
 import org.jetbrains.annotations.Nullable;
 
-import com.google.common.collect.ImmutableMap;
-
 import it.unimi.dsi.fastutil.Hash;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
@@ -242,7 +240,7 @@ public static Predicate<BlockState> parseBlockStates(Properties properties, Stri
 						}
 
 						predicateMap.put(block, state -> {
-							ImmutableMap<Property<?>, Comparable<?>> targetValueMap = state.getEntries();
+							Map<Property<?>, Comparable<?>> targetValueMap = state.getEntries();
 							for (Map.Entry<Property<?>, ObjectOpenHashSet<Comparable<?>>> entry : entryArray) {
 								Comparable<?> targetValue = targetValueMap.get(entry.getKey());
 								if (targetValue != null) {

src/main/java/me/pepperbell/continuity/client/resource/CtmPropertiesLoader.java

@@ -81,7 +81,7 @@ private void loadAll(ResourcePack pack, int packPriority) {
 						properties.load(stream);
 						load(properties, resourceId, pack, packPriority);
 					} catch (Exception e) {
-						ContinuityClient.LOGGER.error("Failed to load CTM properties from file '" + resourceId + "' in pack '" + pack.getName() + "'", e);
+						ContinuityClient.LOGGER.error("Failed to load CTM properties from file '" + resourceId + "' in pack '" + pack.getId() + "'", e);
 					}
 				}
 			});
@@ -94,7 +94,7 @@ private void load(Properties properties, Identifier resourceId, ResourcePack pac
 		if (loader != null) {
 			load(loader, properties, resourceId, pack, packPriority, method);
 		} else {
-			ContinuityClient.LOGGER.error("Unknown 'method' value '" + method + "' in file '" + resourceId + "' in pack '" + pack.getName() + "'");
+			ContinuityClient.LOGGER.error("Unknown 'method' value '" + method + "' in file '" + resourceId + "' in pack '" + pack.getId() + "'");
 		}
 	}
 

src/main/java/me/pepperbell/continuity/client/resource/CustomBlockLayers.java

@@ -69,9 +69,9 @@ private static void reload(ResourceManager manager) {
 			try (InputStream inputStream = resource.getInputStream()) {
 				Properties properties = new Properties();
 				properties.load(inputStream);
-				reload(properties, LOCATION, resource.getResourcePackName());
+				reload(properties, LOCATION, resource.getPackId());
 			} catch (IOException e) {
-				ContinuityClient.LOGGER.error("Failed to load custom block layers from file '" + LOCATION + "' from pack '" + resource.getResourcePackName() + "'", e);
+				ContinuityClient.LOGGER.error("Failed to load custom block layers from file '" + LOCATION + "' from pack '" + resource.getPackId() + "'", e);
 			}
 		}
 	}

src/main/resources/continuity.mixins.json

@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "me.pepperbell.continuity.client.mixin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "client": [
     "AtlasLoaderMixin",
     "BakedModelManagerMixin",

src/main/resources/fabric.mod.json

@@ -31,9 +31,9 @@
   ],
 
   "depends": {
-    "minecraft": ">=1.20.2 <=1.20.4",
+    "minecraft": ">=1.20.5",
     "fabricloader": ">=0.15.0",
-    "fabric-api": ">=0.89.0"
+    "fabric-api": ">=0.97.6"
   },
 
   "custom": {

src/main/resources/resourcepacks/default/pack.mcmeta

@@ -1,7 +1,7 @@
 {
   "pack": {
-    "pack_format": 18,
-    "supported_formats": [18, 22],
+    "pack_format": 32,
+    "supported_formats": [32, 999],
     "description": {
       "translate": "resourcePack.continuity.default.description"
     }

src/main/resources/resourcepacks/glass_pane_culling_fix/pack.mcmeta

@@ -1,7 +1,7 @@
 {
   "pack": {
-    "pack_format": 18,
-    "supported_formats": [18, 22],
+    "pack_format": 32,
+    "supported_formats": [32, 999],
     "description": {
       "translate": "resourcePack.continuity.glass_pane_culling_fix.description"
     }