updated to mc 1.20.6

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
       matrix:
         # Use these Java versions
         java: [
-          17
+          21
         ]
         # and run on both Linux and Windows
         os: [ubuntu-20.04, windows-latest]

.github/workflows/publish.yml

@@ -8,11 +8,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: set up JDK 17
+      - name: set up JDK 21
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt-hotspot'
-          java-version: 17
+          java-version: 21
           cache: 'gradle'
 
       - name: make gradle wrapper executable

CHANGELOG.md

@@ -3,4 +3,4 @@
 ### Fixed:
 - 
 ### Changed:
-- Updated to mc 1.20.1
+- Updated to mc 1.20.6

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.3-SNAPSHOT'
+	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -28,9 +28,9 @@ dependencies {
 		exclude(group: "net.fabricmc.fabric-api")
 	}
 	// REI
-    modCompileOnly "me.shedaniel:RoughlyEnoughItems-fabric:10.0.578"
+    modCompileOnly "me.shedaniel:RoughlyEnoughItems-fabric:15.0.728"
     // EMI
-    modCompileOnly "dev.emi:emi:0.5.0+1.19.3"
+    modCompileOnly "dev.emi:emi-fabric:1.1.6+1.20.6"
 }
 
 processResources {
@@ -42,7 +42,7 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.release = 17
+	it.options.release = 21
 }
 
 java {
@@ -51,8 +51,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

@@ -2,17 +2,19 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-	# check these on https://fabricmc.net/versions.html
-	minecraft_version=1.20.1
-	yarn_mappings=1.20.1+build.10
-	loader_version=0.14.21
+	# check these on https://fabricmc.net/use
+	minecraft_version=1.20.6
+	yarn_mappings=1.20.6+build.3
+	loader_version=0.15.11
 
 # Mod Properties
-	mod_version = 1.0.7
+	mod_version = 1.1.1
 	maven_group = net.revive
 	archives_base_name = revive
 
 # Dependencies
-	fabric_version=0.86.0+1.20.1
-	cloth_config_version=11.0.99
-	mod_menu_version=7.0.0
+	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
+	fabric_version=0.99.4+1.20.6
+	cloth_config_version=14.0.126
+	mod_menu_version=10.0.0-beta.1
+

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

src/main/java/net/revive/ReviveClient.java

@@ -1,16 +1,13 @@
 package net.revive;
 
 import net.fabricmc.api.ClientModInitializer;
-import net.minecraft.client.gui.screen.ingame.HandledScreens;
-import net.revive.gui.DeadPlayerScreen;
-import net.revive.packet.ReviveClientPacket;
+import net.revive.network.ReviveClientPacket;
 
 public class ReviveClient implements ClientModInitializer {
 
     @Override
     public void onInitializeClient() {
         ReviveClientPacket.init();
-        // HandledScreens.register(ReviveMain.DEAD_PLAYER, DeadPlayerScreen::new);
     }
 
 }

src/main/java/net/revive/ReviveMain.java

@@ -5,7 +5,7 @@
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
 import net.fabricmc.fabric.api.object.builder.v1.trade.TradeOfferHelper;
-import net.fabricmc.fabric.api.screenhandler.v1.ScreenHandlerRegistry;
+import net.fabricmc.fabric.api.registry.FabricBrewingRecipeRegistryBuilder;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.entity.attribute.EntityAttributeModifier;
 import net.minecraft.entity.attribute.EntityAttributes;
@@ -17,19 +17,18 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.potion.Potion;
+import net.minecraft.potion.Potions;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
-import net.minecraft.screen.ScreenHandlerType;
+import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.util.Identifier;
 import net.minecraft.village.TradeOffer;
+import net.minecraft.village.TradedItem;
 import net.minecraft.village.VillagerProfession;
 import net.revive.config.ReviveConfig;
 import net.revive.effect.*;
-import net.revive.gui.DeadPlayerScreenHandler;
-import net.revive.packet.ReviveServerPacket;
-
-import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerType;
+import net.revive.network.ReviveServerPacket;
 
 public class ReviveMain implements ModInitializer {
 
@@ -41,16 +40,16 @@ public class ReviveMain implements ModInitializer {
     public static final Identifier REVIVE_SOUND = new Identifier("revive:revive");
     public static SoundEvent REVIVE_SOUND_EVENT = SoundEvent.of(REVIVE_SOUND);
 
-    public static final StatusEffect AFTERMATH_EFFECT = new AftermathEffect(StatusEffectCategory.HARMFUL, 11838975)
-            .addAttributeModifier(EntityAttributes.GENERIC_MOVEMENT_SPEED, "66462626-74d7-42db-858f-2419f1fd711a", -0.30F, EntityAttributeModifier.Operation.MULTIPLY_TOTAL)
-            .addAttributeModifier(EntityAttributes.GENERIC_ATTACK_DAMAGE, "e0a9b1d4-1611-444b-90bf-02aa2638371f", -5.0F, EntityAttributeModifier.Operation.ADDITION);
-    public static final StatusEffect LIVELY_AFTERMATH_EFFECT = new LivelyAftermathEffect(StatusEffectCategory.HARMFUL, 10323199).addAttributeModifier(EntityAttributes.GENERIC_MOVEMENT_SPEED,
-            "6d4a232f-5439-41b1-bfb6-d665beed14e7", -0.15F, EntityAttributeModifier.Operation.MULTIPLY_TOTAL);
+    public static final RegistryEntry<StatusEffect> AFTERMATH_EFFECT = register("revive:aftermath",
+            new AftermathEffect(StatusEffectCategory.HARMFUL, 11838975)
+                    .addAttributeModifier(EntityAttributes.GENERIC_MOVEMENT_SPEED, "66462626-74d7-42db-858f-2419f1fd711a", -0.30F, EntityAttributeModifier.Operation.ADD_MULTIPLIED_TOTAL)
+                    .addAttributeModifier(EntityAttributes.GENERIC_ATTACK_DAMAGE, "e0a9b1d4-1611-444b-90bf-02aa2638371f", -5.0F, EntityAttributeModifier.Operation.ADD_VALUE));
 
-    public static final Potion REVIVIFY_POTION = new Potion(new StatusEffectInstance(AFTERMATH_EFFECT, 600));
-    public static final Potion SUPPORTIVE_REVIVIFY_POTION = new Potion(new StatusEffectInstance(LIVELY_AFTERMATH_EFFECT, 600));
+    public static final RegistryEntry<StatusEffect> LIVELY_AFTERMATH_EFFECT = register("revive:lively_aftermath", new LivelyAftermathEffect(StatusEffectCategory.HARMFUL, 10323199)
+            .addAttributeModifier(EntityAttributes.GENERIC_MOVEMENT_SPEED, "6d4a232f-5439-41b1-bfb6-d665beed14e7", -0.15F, EntityAttributeModifier.Operation.ADD_MULTIPLIED_TOTAL));
 
-    public static final ScreenHandlerType<DeadPlayerScreenHandler> DEAD_PLAYER = new ExtendedScreenHandlerType<>(DeadPlayerScreenHandler::new);
+    public static final RegistryEntry<Potion> REVIVIFY_POTION = register("revivify_potion", new Potion(new StatusEffectInstance(AFTERMATH_EFFECT, 600)));
+    public static final RegistryEntry<Potion> SUPPORTIVE_REVIVIFY_POTION = register("supportive_revivify_potion", new Potion(new StatusEffectInstance(LIVELY_AFTERMATH_EFFECT, 600)));
 
     @Override
     public void onInitialize() {
@@ -60,14 +59,21 @@ public void onInitialize() {
         Registry.register(Registries.ITEM, new Identifier("revive", "revival_star"), REVIVE_ITEM);
         ItemGroupEvents.modifyEntriesEvent(ItemGroups.INGREDIENTS).register(entries -> entries.add(REVIVE_ITEM));
         TradeOfferHelper.registerVillagerOffers(VillagerProfession.CLERIC, 1, (factories -> {
-            factories.add((entity, random) -> new TradeOffer(new ItemStack(Items.EMERALD, 28), new ItemStack(REVIVE_ITEM), 4, 1, 0.4F));
+            factories.add((entity, random) -> new TradeOffer(new TradedItem(Items.EMERALD, 28), new ItemStack(REVIVE_ITEM), 4, 1, 0.4F));
         }));
         Registry.register(Registries.SOUND_EVENT, REVIVE_SOUND, REVIVE_SOUND_EVENT);
-        Registry.register(Registries.STATUS_EFFECT, "revive:aftermath", AFTERMATH_EFFECT);
-        Registry.register(Registries.STATUS_EFFECT, "revive:lively_aftermath", LIVELY_AFTERMATH_EFFECT);
-        Registry.register(Registries.POTION, "revivify_potion", REVIVIFY_POTION);
-        Registry.register(Registries.POTION, "supportive_revivify_potion", SUPPORTIVE_REVIVIFY_POTION);
-        // Registry.register(Registries.SCREEN_HANDLER, "revive:dead_player_inventory", DEAD_PLAYER);
+        FabricBrewingRecipeRegistryBuilder.BUILD.register((builder) -> {
+            builder.registerPotionRecipe(Potions.STRONG_REGENERATION, ReviveMain.REVIVE_ITEM, ReviveMain.SUPPORTIVE_REVIVIFY_POTION);
+            builder.registerPotionRecipe(Potions.MUNDANE, Items.GOLDEN_APPLE, ReviveMain.REVIVIFY_POTION);
+        });
+    }
+
+    private static RegistryEntry<StatusEffect> register(String id, StatusEffect statusEffect) {
+        return Registry.registerReference(Registries.STATUS_EFFECT, new Identifier(id), statusEffect);
+    }
+
+    private static RegistryEntry<Potion> register(String name, Potion potion) {
+        return Registry.registerReference(Registries.POTION, new Identifier(name), potion);
     }
 
 }

src/main/java/net/revive/compat/ReviveReiPlugin.java

@@ -12,7 +12,6 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.nbt.NbtCompound;
-import net.minecraft.potion.PotionUtil;
 import net.minecraft.potion.Potions;
 import net.minecraft.recipe.Ingredient;
 import net.minecraft.recipe.SmithingRecipe;

src/main/java/net/revive/config/ReviveConfig.java

@@ -19,7 +19,7 @@ public class ReviveConfig implements ConfigData {
     @Comment("Chance for each inventory item to drop")
     public float dropChance = 0.3F;
     @Comment("Mainly for compatibility with RpgZ")
-    public boolean allowLootablePlayer = false;
+    public boolean allowLootablePlayer = true;
     @Comment("Revive without a potion")
     public boolean allowReviveWithHand = false;
     public int reviveHealthPoints = 2;