Crystals 1.3.1

Port to 1.21.6

Author: Killarexe

.architectury-transformer/debug.log

@@ -1 +1 @@
-[Architectury Transformer DEBUG] Closed File Systems for /home/killar/projects/java/Crystals/common/build/libs/common-1.2.3.jar
+[Architectury Transformer DEBUG] Closed File Systems for /home/killar/projects/java/Crystals/common/build/libs/common-1.3.1.jar

.github/workflows/gradle.yml

@@ -10,7 +10,7 @@ permissions:
   contents: read
 
 env:
-  mod_version: 1.2.5
+  mod_version: 1.3.1
 
 jobs:
   build:
@@ -63,4 +63,4 @@ jobs:
         with:
           name: crystals-neoforge-${{ env.mod_version }}-dev-shadow
           path: ./neoforge/build/libs/crystals-neoforge-${{ env.mod_version }}-dev-shadow.jar
-          retention-days: 7
+          retention-days: 7

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
 }
 
 architectury {

fabric/build.gradle

@@ -7,20 +7,33 @@ architectury {
     fabric()
 }
 
+loom {
+    accessWidenerPath = project(":common").loom.accessWidenerPath
+}
+
 configurations {
-    common
-    shadowCommon
+    common {
+        canBeResolved = true
+        canBeConsumed = false
+    }
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
     developmentFabric.extendsFrom common
+
+    shadowBundle {
+        canBeResolved = true
+        canBeConsumed = false
+    }
 }
 
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
 
+    // modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}"
+
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
-    shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
+    shadowBundle project(path: ':common', configuration: 'transformProductionFabric')
 }
 
 processResources {
@@ -41,38 +54,6 @@ processResources {
     }
 }
 
-shadowJar {
-    configurations = [project.configurations.shadowCommon]
-    archiveClassifier = "dev-shadow"
-}
-
-remapJar {
-    input.set shadowJar.archiveFile
-    dependsOn shadowJar
-}
-
-sourcesJar {
-    def commonSources = project(":common").sourcesJar
-    dependsOn commonSources
-    from commonSources.archiveFile.map { zipTree(it) }
-}
-
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
-
-publishing {
-    publications {
-        mavenFabric(MavenPublication) {
-            artifactId = rootProject.archives_base_name + "-" + project.name
-            from components.java
-        }
-    }
-    repositories {}
-}
-
 base {
-    archivesName = rootProject.archives_base_name + "-fabric"
-}
+    archivesName = archives_base_name + "-fabric"
+}

fabric/src/main/java/github/killarexe/crystals/fabric/client/CrystalsModFabricClient.java

@@ -4,16 +4,16 @@
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
-import net.minecraft.client.renderer.RenderType;
+import net.fabricmc.fabric.api.client.rendering.v1.BlockRenderLayerMap;
+import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
 
 @Environment(EnvType.CLIENT)
 public class CrystalsModFabricClient implements ClientModInitializer{
 
 	@Override
 	public void onInitializeClient() {
 		CrystalsModFabricBlocks.BLOCKS.values().forEach(block -> {
-			BlockRenderLayerMap.INSTANCE.putBlock(block, RenderType.cutout());
-		});	
+			BlockRenderLayerMap.putBlock(block, ChunkSectionLayer.CUTOUT);
+		});
 	}
 }

gradle.properties

@@ -1,15 +1,15 @@
-org.gradle.jvmargs=-Xmx4G
+org.gradle.jvmargs=-Xmx8G
 org.gradle.parallel=true
 org.gradle.deamon=false
 
 # Architectury settings
 enabled_platforms=fabric,neoforge
 
 # Common mod settings
-minecraft_version=1.21.4
+minecraft_version=1.21.6
 
 mod_id=crystals
-mod_version=1.3.0
+mod_version=1.3.1
 mod_license=CC-BY-4.0
 mod_name=Crystals
 mod_description=A simple mod witch adds crystals ores.
@@ -20,12 +20,12 @@ archives_base_name=crystals
 maven_group=github.killarexe
 
 # Fabric Settings
-fabric_loader_version=0.16.10
-fabric_api_version=0.114.3+1.21.4
+fabric_loader_version=0.16.14
+fabric_api_version=0.127.1+1.21.6
 
 # Neoforge Settings
-neoforge_version=21.4.0-beta
-neoforge_version_range=[21.4.0-beta,)
-neoforge_loader_version_range=[1,)
+neoforge_version=21.6.0-beta
+neoforge_version_range=[21.6.0-beta,)
+neoforge_loader_version_range=[4,)
 
-minecraft_version_range=[1.21.4,1.22)
+minecraft_version_range=[1.21.6,1.22)

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

neoforge/src/main/java/github/killarexe/crystals/forge/registry/CrystalsModNeoForgeItems.java

@@ -1,6 +1,5 @@
 package github.killarexe.crystals.forge.registry;
 
-
 import github.killarexe.crystals.CrystalsMod;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;

neoforge/update.json

@@ -14,6 +14,9 @@
 		"1.2.5": "Update to Minecraft 1.21.4",
 		"1.3.0": "Add Redstone, Quartz & Glowstone"
 	},
+	"1.21.6": {
+		"1.3.1": "Update to Minecraft 1.21.6"
+	},
 	"promos": {
 		"1.20.6-latest": "1.2.1",
 		"1.20.6-recommended": "1.2.1",
@@ -29,7 +32,7 @@
 		"1.21.4-recommended": "1.3.0",
 		"1.21.5-lastest": "1.3.0",
 		"1.21.5-recommended": "1.3.0",
-		"1.21.6-lastest": "1.3.0",
-		"1.21.6-recommended": "1.3.0"
+		"1.21.6-lastest": "1.3.1",
+		"1.21.6-recommended": "1.3.1"
 	}
 }