update repo

.github/FUNDING.yml

@@ -3,7 +3,7 @@
 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
-ko_fi: wurgo
+ko_fi: quesia
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
 liberapay: # Replace with a single Liberapay username

README.md

@@ -1,5 +1,7 @@
 # Advancementroll
 
-Check out [the document](https://docs.google.com/document/d/1Dm5KMR1KKV4ajmrvrwG__Wjf5Zyu9H29LPuMhjjLzIY/edit) for all the features and download.
+There is a config file (`.minecraft/config/advancementroll.json`) where you can disable certain settings to make it easier.
 
-### Made by Maya & Quid 🥰
+Check out [the document](https://docs.google.com/document/d/1Dm5KMR1KKV4ajmrvrwG__Wjf5Zyu9H29LPuMhjjLzIY/edit) for all the features.
+
+### Made by falu & Quidvio 🥰

build.gradle

@@ -1,6 +1,6 @@
 plugins {
-	id 'fabric-loom' version '0.12-SNAPSHOT'
-	id 'maven-publish'
+	id "fabric-loom" version "1.3-SNAPSHOT"
+	id "maven-publish"
 }
 
 sourceCompatibility = JavaVersion.VERSION_1_9
@@ -10,14 +10,6 @@ archivesBaseName = project.archives_base_name
 version = "${project.mod_version}+${project.minecraft_version}"
 group = project.maven_group
 
-repositories {
-	// Add repositories to retrieve artifacts from in here.
-	// You should only use this when depending on other mods because
-	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
-	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
-	// for more information about repositories.
-}
-
 loom {
 	accessWidenerPath = file("src/main/resources/advancementroll.accesswidener")
 }

gradle.properties

@@ -5,10 +5,10 @@ org.gradle.jvmargs=-Xmx2G
 # check these on https://fabricmc.net/develop
 minecraft_version=1.16.1
 yarn_mappings=1.16.1+build.21
-loader_version=0.12.12
+loader_version=0.14.23
 fabric_version=0.42.0+1.16
 
 # Mod Properties
-mod_version=1.4.0
-maven_group=me.wurgo
+mod_version=1.5
+maven_group=me.falu
 archives_base_name=advancementroll

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 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.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #
@@ -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,10 @@ 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"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
 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=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=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# 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, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +210,12 @@ set -- \
         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,7 +41,7 @@ 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.
@@ -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/me/wurgo/advancementroll/Advancementroll.java → src/main/java/me/falu/advancementroll/Advancementroll.java

@@ -1,24 +1,24 @@
-package me.wurgo.advancementroll;
+package me.falu.advancementroll;
 
 import com.google.gson.GsonBuilder;
-import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.api.ModInitializer;
 
 import java.io.FileWriter;
 import java.io.IOException;
 
-public class Advancementroll implements ClientModInitializer {
+public class Advancementroll implements ModInitializer {
     public static int screenSeed = 0;
 
     @Override
-    public void onInitializeClient() {
+    public void onInitialize() {
         try {
-            FileWriter writer = new FileWriter(MixinPlugin.configFile);
+            FileWriter writer = new FileWriter(MixinPlugin.CONFIG_FILE);
 
-            writer.write(new GsonBuilder().setPrettyPrinting().create().toJson(MixinPlugin.config));
+            writer.write(new GsonBuilder().setPrettyPrinting().create().toJson(MixinPlugin.CONFIG));
             writer.flush();
             writer.close();
 
-            MixinPlugin.config = null;
+            MixinPlugin.CONFIG = null;
         } catch (IOException ignored) {}
     }
 }

src/main/java/me/wurgo/advancementroll/MixinPlugin.java → src/main/java/me/falu/advancementroll/MixinPlugin.java

@@ -1,4 +1,4 @@
-package me.wurgo.advancementroll;
+package me.falu.advancementroll;
 
 import com.google.gson.JsonNull;
 import com.google.gson.JsonObject;
@@ -15,31 +15,31 @@
 import java.util.Set;
 
 public class MixinPlugin implements IMixinConfigPlugin {
-    public static final File configFile = FabricLoader.getInstance().getConfigDir().resolve("advancementroll.json").toFile();
-    public static JsonObject config;
+    public static final File CONFIG_FILE = FabricLoader.getInstance().getConfigDir().resolve("advancementroll.json").toFile();
+    public static JsonObject CONFIG;
 
     private static void getConfig() {
-        if (config != null) { return; }
+        if (CONFIG != null) { return; }
 
         try {
-            FileReader reader = new FileReader(configFile);
+            FileReader reader = new FileReader(CONFIG_FILE);
             JsonParser parser = new JsonParser();
 
             Object obj = parser.parse(reader);
-            config = obj.equals(JsonNull.INSTANCE) ? new JsonObject() : (JsonObject) obj;
+            CONFIG = obj.equals(JsonNull.INSTANCE) ? new JsonObject() : (JsonObject) obj;
 
             reader.close();
         } catch (IOException ignored) {
-            config = new JsonObject();
+            CONFIG = new JsonObject();
         }
     }
 
     private static boolean getConfigValue(String feature) {
-        if (config.has(feature)) {
-            return config.get(feature).getAsBoolean();
+        if (CONFIG.has(feature)) {
+            return CONFIG.get(feature).getAsBoolean();
         }
 
-        config.addProperty(feature, true);
+        CONFIG.addProperty(feature, true);
         return true;
     }
 
@@ -55,7 +55,7 @@ public String getRefMapperConfig() {
     public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
         getConfig();
 
-        if (mixinClassName.startsWith("me.wurgo.advancementroll.mixin.features")) {
+        if (mixinClassName.startsWith("me.falu.advancementroll.mixin.features")) {
             String[] packageNames = mixinClassName.split("\\.");
             if (packageNames.length > 5) {
                 String featureName = packageNames[5];

src/main/java/me/wurgo/advancementroll/mixin/blocks/BeehiveBlockMixin.java → src/main/java/me/falu/advancementroll/mixin/blocks/BeehiveBlockMixin.java

@@ -1,4 +1,4 @@
-package me.wurgo.advancementroll.mixin.blocks;
+package me.falu.advancementroll.mixin.blocks;
 
 import net.minecraft.block.BeehiveBlock;
 import net.minecraft.block.BlockState;

src/main/java/me/wurgo/advancementroll/mixin/blocks/RespawnAnchorBlockMixin.java → src/main/java/me/falu/advancementroll/mixin/blocks/RespawnAnchorBlockMixin.java

@@ -1,4 +1,4 @@
-package me.wurgo.advancementroll.mixin.blocks;
+package me.falu.advancementroll.mixin.blocks;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.block.RespawnAnchorBlock;

src/main/java/me/wurgo/advancementroll/mixin/client/ReloadableResourceManagerImplMixin.java → src/main/java/me/falu/advancementroll/mixin/client/ReloadableResourceManagerImplMixin.java

@@ -1,4 +1,4 @@
-package me.wurgo.advancementroll.mixin.client;
+package me.falu.advancementroll.mixin.client;
 
 import net.minecraft.resource.ReloadableResourceManagerImpl;
 import net.minecraft.resource.ResourcePack;

src/main/java/me/wurgo/advancementroll/mixin/features/aggressiveBees/BeeEntityMixin.java → src/main/java/me/falu/advancementroll/mixin/features/aggressiveBees/BeeEntityMixin.java

@@ -1,4 +1,4 @@
-package me.wurgo.advancementroll.mixin.features.aggressiveBees;
+package me.falu.advancementroll.mixin.features.aggressiveBees;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;

src/main/java/me/wurgo/advancementroll/mixin/features/aggressiveIronGolems/IronGolemEntityMixin.java → src/main/java/me/falu/advancementroll/mixin/features/aggressiveIronGolems/IronGolemEntityMixin.java

@@ -1,4 +1,4 @@
-package me.wurgo.advancementroll.mixin.features.aggressiveIronGolems;
+package me.falu.advancementroll.mixin.features.aggressiveIronGolems;
 
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.ai.goal.FollowTargetGoal;

src/main/java/me/wurgo/advancementroll/mixin/features/allPotionsClearEffects/ClientAdvancementManagerMixin.java → src/main/java/me/falu/advancementroll/mixin/features/allPotionsClearEffects/ClientAdvancementManagerMixin.java

@@ -1,4 +1,4 @@
-package me.wurgo.advancementroll.mixin.features.allPotionsClearEffects;
+package me.falu.advancementroll.mixin.features.allPotionsClearEffects;
 
 import net.minecraft.advancement.AdvancementProgress;
 import net.minecraft.client.MinecraftClient;

src/main/java/me/wurgo/advancementroll/mixin/features/alwaysInvisibleSpiders/SpiderEntityMixin.java → src/main/java/me/falu/advancementroll/mixin/features/alwaysInvisibleSpiders/SpiderEntityMixin.java

@@ -1,4 +1,4 @@
-package me.wurgo.advancementroll.mixin.features.alwaysInvisibleSpiders;
+package me.falu.advancementroll.mixin.features.alwaysInvisibleSpiders;
 
 import net.minecraft.entity.EntityData;
 import net.minecraft.entity.EntityType;

src/main/java/me/wurgo/advancementroll/mixin/features/biggerSleepDangerRange/ServerPlayerEntityMixin.java → src/main/java/me/falu/advancementroll/mixin/features/biggerSleepDangerRange/ServerPlayerEntityMixin.java

@@ -1,4 +1,4 @@
-package me.wurgo.advancementroll.mixin.features.biggerSleepDangerRange;
+package me.falu.advancementroll.mixin.features.biggerSleepDangerRange;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.server.network.ServerPlayerEntity;

src/main/java/me/wurgo/advancementroll/mixin/features/boxConduit/ConduitBlockEntityMixin.java → src/main/java/me/falu/advancementroll/mixin/features/boxConduit/ConduitBlockEntityMixin.java

@@ -1,4 +1,4 @@
-package me.wurgo.advancementroll.mixin.features.boxConduit;
+package me.falu.advancementroll.mixin.features.boxConduit;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;

src/main/java/me/wurgo/advancementroll/mixin/features/crossEyedGhasts/ShootFireballGoalMixin.java → src/main/java/me/falu/advancementroll/mixin/features/crossEyedGhasts/ShootFireballGoalMixin.java

@@ -1,4 +1,4 @@
-package me.wurgo.advancementroll.mixin.features.crossEyedGhasts;
+package me.falu.advancementroll.mixin.features.crossEyedGhasts;
 
 import net.minecraft.entity.mob.GhastEntity;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/me/wurgo/advancementroll/mixin/features/delayedPiglins/PiglinBrainMixin.java → src/main/java/me/falu/advancementroll/mixin/features/delayedPiglins/PiglinBrainMixin.java

@@ -1,4 +1,4 @@
-package me.wurgo.advancementroll.mixin.features.delayedPiglins;
+package me.falu.advancementroll.mixin.features.delayedPiglins;
 
 import com.google.common.collect.ImmutableList;
 import net.minecraft.entity.ai.brain.Activity;

src/main/java/me/wurgo/advancementroll/mixin/features/everythingIsBucket/BucketItemMixin.java → src/main/java/me/falu/advancementroll/mixin/features/everythingIsBucket/BucketItemMixin.java

@@ -1,4 +1,4 @@
-package me.wurgo.advancementroll.mixin.features.everythingIsBucket;
+package me.falu.advancementroll.mixin.features.everythingIsBucket;
 
 import net.minecraft.item.BucketItem;
 import net.minecraft.item.Item;

src/main/java/me/wurgo/advancementroll/mixin/features/everythingIsBucket/MilkBucketItemMixin.java → src/main/java/me/falu/advancementroll/mixin/features/everythingIsBucket/MilkBucketItemMixin.java

@@ -1,4 +1,4 @@
-package me.wurgo.advancementroll.mixin.features.everythingIsBucket;
+package me.falu.advancementroll.mixin.features.everythingIsBucket;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

src/main/java/me/wurgo/advancementroll/mixin/features/everythingIsDonkey/HorseEntityRendererMixin.java → src/main/java/me/falu/advancementroll/mixin/features/everythingIsDonkey/HorseEntityRendererMixin.java

@@ -1,4 +1,4 @@
-package me.wurgo.advancementroll.mixin.features.everythingIsDonkey;
+package me.falu.advancementroll.mixin.features.everythingIsDonkey;
 
 import com.google.common.collect.Maps;
 import net.minecraft.client.render.entity.HorseEntityRenderer;

src/main/java/me/wurgo/advancementroll/mixin/features/everythingIsDonkey/HorseMarkingFeatureRendererMixin.java → src/main/java/me/falu/advancementroll/mixin/features/everythingIsDonkey/HorseMarkingFeatureRendererMixin.java

@@ -1,4 +1,4 @@
-package me.wurgo.advancementroll.mixin.features.everythingIsDonkey;
+package me.falu.advancementroll.mixin.features.everythingIsDonkey;
 
 import net.minecraft.client.render.entity.feature.HorseMarkingFeatureRenderer;
 import net.minecraft.entity.passive.HorseEntity;

src/main/java/me/wurgo/advancementroll/mixin/features/everythingIsPotion/LingeringPotionItemMixin.java → src/main/java/me/falu/advancementroll/mixin/features/everythingIsPotion/LingeringPotionItemMixin.java

@@ -1,4 +1,4 @@
-package me.wurgo.advancementroll.mixin.features.everythingIsPotion;
+package me.falu.advancementroll.mixin.features.everythingIsPotion;
 
 import net.minecraft.client.item.TooltipContext;
 import net.minecraft.item.ItemStack;

src/main/java/me/wurgo/advancementroll/mixin/features/everythingIsPotion/PotionItemMixin.java → src/main/java/me/falu/advancementroll/mixin/features/everythingIsPotion/PotionItemMixin.java

@@ -1,4 +1,4 @@
-package me.wurgo.advancementroll.mixin.features.everythingIsPotion;
+package me.falu.advancementroll.mixin.features.everythingIsPotion;
 
 import net.minecraft.client.item.TooltipContext;
 import net.minecraft.item.ItemStack;

src/main/java/me/wurgo/advancementroll/mixin/features/explosionDropChance/ExplosionMixin.java → src/main/java/me/falu/advancementroll/mixin/features/explosionDropChance/ExplosionMixin.java

@@ -1,4 +1,4 @@
-package me.wurgo.advancementroll.mixin.features.explosionDropChance;
+package me.falu.advancementroll.mixin.features.explosionDropChance;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;