1.20.5

Author: Ivan-1F

.github/workflows/gradle.yml

@@ -16,11 +16,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Cache gradle files
         uses: actions/cache@v2

.github/workflows/release.yml

@@ -42,11 +42,11 @@ jobs:
       - uses: actions/checkout@v3
         with:
           ref: ${{ matrix.branch }}
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Cache gradle files
         uses: actions/cache@v3

build.gradle

@@ -1,10 +1,10 @@
 plugins {
-	id 'fabric-loom' version '0.12-SNAPSHOT'
+	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_21
+targetCompatibility = JavaVersion.VERSION_21
 
 // From Carpet-TIS-Addition
 boolean buildRelease = System.getenv("BUILD_RELEASE") == "true"
@@ -39,14 +39,14 @@ dependencies {
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-	modImplementation 'com.github.Fallen-Breath:conditional-mixin:v0.3.2'
-	include "com.github.Fallen-Breath:conditional-mixin:v0.3.2"
+	modImplementation 'com.github.Fallen-Breath.conditional-mixin:conditional-mixin-fabric:v0.6.2'
+	include "com.github.Fallen-Breath.conditional-mixin:conditional-mixin-fabric:v0.6.2"
 
 	// mods
-	modImplementation "carpet:fabric-carpet:1.20.3-${project.carpet_core_version}"
+	modImplementation "carpet:fabric-carpet:${project.minecraft_version}-${project.carpet_core_version}"
 
 	// runtime mods
-	modRuntimeOnly "com.github.Fallen-Breath:lazydfu:a7cfc44c0c"  // faster startup
+//	modRuntimeOnly "com.github.Fallen-Breath:lazydfu:a7cfc44c0c"  // faster startup
 
 	// libraries
 	implementation "org.yaml:snakeyaml:${project.snakeyaml_version}"

gradle.properties

@@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=1.20.4
-	yarn_mappings=1.20.4+build.1
-	loader_version=0.14.9
+	minecraft_version=1.20.5
+	yarn_mappings=1.20.5+build.1
+	loader_version=0.15.10
 	# check available versions on maven for the given minecraft version you are using
 	# https://masa.dy.fi/maven/carpet/fabric-carpet/
-	carpet_core_version=1.4.128+v231205
+	carpet_core_version=1.4.140+v240423
 
 # Mod Properties
 	mod_version = 2.2.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/me/ivan/ivancarpetaddition/commands/replaceproperties/ReplacePropertiesCommand.java

@@ -16,7 +16,7 @@
 import net.minecraft.util.math.BlockBox;
 import net.minecraft.util.math.BlockPos;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 import java.util.Optional;
 import java.util.function.Predicate;
 

src/main/java/me/ivan/ivancarpetaddition/mixins/rule/creeperIgnitedByFire/CreeperEntityMixin.java

@@ -21,8 +21,8 @@ public CreeperEntityMixin(EntityType<?> type, World world) {
     }
 
     @Override
-    public void setOnFireFor(int seconds) {
-        super.setOnFireFor(seconds);
+    public void setOnFireForTicks(int ticks) {
+        super.setOnFireForTicks(ticks);
         if (IvanCarpetAdditionSettings.creeperIgnitedByFire) {
             this.ignite();
         }

src/main/java/me/ivan/ivancarpetaddition/mixins/rule/flippinCactusSound/BlockRotatorMixin.java

@@ -25,7 +25,7 @@ public class BlockRotatorMixin {
     )
     private static void flip_block(BlockState state, World world, PlayerEntity player, Hand hand, BlockHitResult hit, CallbackInfoReturnable<Boolean> cir) {
         if (IvanCarpetAdditionSettings.flippinCactusSound) {
-            player.playSound(SoundEvents.BLOCK_DISPENSER_LAUNCH, SoundCategory.AMBIENT, 1.0F, 1.0F);
+            player.playSoundToPlayer(SoundEvents.BLOCK_DISPENSER_LAUNCH, SoundCategory.AMBIENT, 1.0F, 1.0F);
         }
     }
 }

src/main/resources/fabric.mod.json

@@ -27,7 +27,7 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.7.4",
+    "fabricloader": ">=0.14.25",
     "carpet": ">=1.4.16",
     "minecraft": "1.20.x"
   },

src/main/resources/ivan-carpet-addition.mixins.json

@@ -3,7 +3,7 @@
   "minVersion": "0.8",
   "package": "me.ivan.ivancarpetaddition.mixins",
   "plugin": "me.ivan.ivancarpetaddition.utils.mixin.ICAMixinPlugin",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_21",
   "mixins": [
     "carpet.HUDControllerMixin",
     "carpet.SettingsManagerMixin",