diff --git a/CHANGELOG.md b/CHANGELOG.md index 69879c4d..ea6f1725 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,26 +1,5 @@ ### What's New: -So, I may have lied a bit and may or may not have refactored half of the mod's internals. - -[`world/crop_temperature`]: - -`min`, `max`, `aMin`, `aMax` no longer accept string values. `"1.5"` -> `1.5` - -[`entities/boats`]: - -* Added missing dispenser behavior. - [`misc/recipe_advancements_generation`]: -* Reworked advancement generation. More recipe types should be supported by default! - -[`general`]: - -* Switched to Codecs for JSON parsing. -* `ScopedConfigs#get` no longer looks up a `PersistentState`. -* Bumped the minimum loader version to 0.15.6. -* Moved optional module methods to mini events. -* Module construction has been delayed to account for events. -* Added error handling to `BootstrapExtension`. -* Simplified the horrible `Common.bootstrap` and `Keeper` system. Keepers are now initialized by the module's `Main`/`Client`/etc. class constructors. -* Probably fixed a few other things. \ No newline at end of file +* Moved generation to `SERVER_STARTING`. \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 0c414d43..7fae6eb3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ minecraft_version=1.20.1 yarn_mappings=1.20.1+build.2 loader_version=0.15.6 # Mod Properties -mod_version=1.6.0-1.20.1 +mod_version=1.6.1-1.20.1 maven_group=me.melontini archives_base_name=andromeda # Dependencies diff --git a/src/main/java/me/melontini/andromeda/modules/misc/recipe_advancements_generation/Main.java b/src/main/java/me/melontini/andromeda/modules/misc/recipe_advancements_generation/Main.java index 87a5c69d..1e723674 100644 --- a/src/main/java/me/melontini/andromeda/modules/misc/recipe_advancements_generation/Main.java +++ b/src/main/java/me/melontini/andromeda/modules/misc/recipe_advancements_generation/Main.java @@ -8,7 +8,6 @@ import me.melontini.dark_matter.api.base.util.MakeSure; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; import net.minecraft.advancement.Advancement; import net.minecraft.advancement.AdvancementManager; -import net.minecraft.advancement.AdvancementPositioner; import net.minecraft.advancement.AdvancementRewards; import net.minecraft.advancement.criterion.InventoryChangedCriterion; import net.minecraft.advancement.criterion.RecipeUnlockedCriterion; @@ -86,12 +85,6 @@ public class Main { AdvancementManager advancementManager = server.getAdvancementLoader().manager; advancementManager.load(advancementBuilders); - for (Advancement advancement : advancementManager.getRoots()) { - if (advancement.getDisplay() != null) { - AdvancementPositioner.arrangeForTree(advancement); - } - } - AndromedaLog.info("finished generating {} recipe advancements", count.get()); advancementBuilders.clear(); } @@ -158,10 +151,7 @@ public class Main { Main(AdvancementGeneration module) { Main.MODULE.init(module); - ServerLifecycleEvents.SERVER_STARTED.register(server -> { - Main.generateRecipeAdvancements(server); - server.getPlayerManager().getPlayerList().forEach(entity -> server.getPlayerManager().getAdvancementTracker(entity).reload(server.getAdvancementLoader())); - }); + ServerLifecycleEvents.SERVER_STARTING.register(Main::generateRecipeAdvancements); addRecipeTypeHandler(RecipeType.BLASTING, basicConsumer("blasting")); addRecipeTypeHandler(RecipeType.SMOKING, basicConsumer("smoking")); -- 2.51.2 From 8003b1f325a1f47d09b4f5a6e1584b2ea865c41c Mon Sep 17 00:00:00 2001 From: melontini <104443436+melontini@users.noreply.github.com> Date: Sun, 4 Feb 2024 13:42:42 +0700 Subject: [PATCH 2/2] Fix debug splashes --- .../misc/unknown/mixin/useless_info/TitleScreenMixin.java | 4 +++- src/main/resources/andromeda.accesswidener | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/me/melontini/andromeda/modules/misc/unknown/mixin/useless_info/TitleScreenMixin.java b/src/main/java/me/melontini/andromeda/modules/misc/unknown/mixin/useless_info/TitleScreenMixin.java index ca3f2205..53926013 100644 --- a/src/main/java/me/melontini/andromeda/modules/misc/unknown/mixin/useless_info/TitleScreenMixin.java +++ b/src/main/java/me/melontini/andromeda/modules/misc/unknown/mixin/useless_info/TitleScreenMixin.java @@ -3,6 +3,7 @@ package me.melontini.andromeda.modules.misc.unknown.mixin.useless_info; import me.melontini.andromeda.base.Environment; import me.melontini.andromeda.base.annotations.SpecialEnvironment; import me.melontini.andromeda.modules.misc.unknown.Main; +import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.TitleScreen; import net.minecraft.text.Text; @@ -20,6 +21,7 @@ abstract class TitleScreenMixin extends Screen { @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/resource/SplashTextResourceSupplier;get()Lnet/minecraft/client/gui/screen/SplashTextRenderer;"), method = "init") private void andromeda$init(CallbackInfo ci) { - Main.DEBUG_SPLASH = "Welcome to 1.20!"; + var s = MinecraftClient.getInstance().getSplashTextLoader().get(); + if (s != null) Main.DEBUG_SPLASH = s.text; } } diff --git a/src/main/resources/andromeda.accesswidener b/src/main/resources/andromeda.accesswidener index efde8821..386cbc36 100644 --- a/src/main/resources/andromeda.accesswidener +++ b/src/main/resources/andromeda.accesswidener @@ -41,3 +41,6 @@ accessible method net/minecraft/entity/passive/BeeEntity$PollinateGoal completed # world/falling_beenests accessible method net/minecraft/entity/FallingBlockEntity readCustomDataFromNbt (Lnet/minecraft/nbt/NbtCompound;)V accessible method net/minecraft/block/entity/BeehiveBlockEntity removeIrrelevantNbtKeys (Lnet/minecraft/nbt/NbtCompound;)V + +# misc/unknown +accessible field net/minecraft/client/gui/screen/SplashTextRenderer text Ljava/lang/String; \ No newline at end of file