diff --git a/changelog.md b/changelog.md index a8736df9..cf7c6329 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,11 @@ +------------------------------------------------------ +Version 1.4.0 +------------------------------------------------------ +Updated to 1.20.4 + +**Mod Interactions** +- REI no longer appears on the RPG dialogue screen variant + ------------------------------------------------------ Version 1.3.1 ------------------------------------------------------ diff --git a/gradle.properties b/gradle.properties index 04a0ac6c..bcea9fdf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,24 +3,24 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://fabricmc.net/versions.html - minecraft_version=1.20.2 - yarn_mappings=1.20.2+build.1 - loader_version=0.14.22 + minecraft_version=1.20.4 + yarn_mappings=1.20.4+build.3 + loader_version=0.15.3 java_version=17 # Mod Properties - mod_version = 1.3.1 + mod_version = 1.4.0 maven_group = org.ladysnake archives_base_name = blabber # Dependencies - fabric_version=0.89.2+1.20.2 + fabric_version=0.92.0+1.20.4 # Publishing license_header = LGPL curseforge_id = 565396 modrinth_id = 2oRMVFgd - curseforge_versions = 1.20.2 + curseforge_versions = 1.20.4 cf_requirements = fabric-api cf_embeddeds = cardinal-components-api release_type = release diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ee9c11aa..4f47a6b3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,11 +1,11 @@ [versions] cca = "5.3.0" elmendorf = "0.12.0" -emi = "1.0.23+1.20.2" +emi = "1.0.29+1.20.4" fpa = "0.2-SNAPSHOT" mcAnnotations = "1.0" -modmenu = "8.0.0-beta.2" -rei = "13.0.666" +modmenu = "9.0.0" +rei = "14.0.688" [libraries] cca-base = { module = "dev.onyxstudios.cardinal-components-api:cardinal-components-base", version.ref = "cca" } diff --git a/src/main/java/org/ladysnake/blabber/impl/common/DialogueScreenHandler.java b/src/main/java/org/ladysnake/blabber/impl/common/DialogueScreenHandler.java index 8bcd15af..75541c6a 100644 --- a/src/main/java/org/ladysnake/blabber/impl/common/DialogueScreenHandler.java +++ b/src/main/java/org/ladysnake/blabber/impl/common/DialogueScreenHandler.java @@ -110,7 +110,7 @@ public boolean makeChoice(ServerPlayerEntity player, int choice) { return true; } catch (IllegalStateException e) { - Blabber.LOGGER.error("{} made invalid choice {} in {}#{}: {}", player.getEntityName(), choice, this.dialogue.getId(), this.getCurrentStateKey(), e.getMessage()); + Blabber.LOGGER.error("{} made invalid choice {} in {}#{}: {}", player.getNameForScoreboard(), choice, this.dialogue.getId(), this.getCurrentStateKey(), e.getMessage()); return false; } } diff --git a/src/main/java/org/ladysnake/blabber/impl/common/model/DialogueChoice.java b/src/main/java/org/ladysnake/blabber/impl/common/model/DialogueChoice.java index e555c8b2..ba215b7a 100644 --- a/src/main/java/org/ladysnake/blabber/impl/common/model/DialogueChoice.java +++ b/src/main/java/org/ladysnake/blabber/impl/common/model/DialogueChoice.java @@ -24,6 +24,7 @@ import net.minecraft.network.PacketByteBuf; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.text.Text; +import net.minecraft.text.TextCodecs; import net.minecraft.text.Texts; import net.minecraft.util.dynamic.Codecs; import org.apache.commons.lang3.StringUtils; @@ -33,7 +34,7 @@ public record DialogueChoice(Text text, String next, Optional condition) { public static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( - Codecs.TEXT.fieldOf("text").forGetter(DialogueChoice::text), + TextCodecs.CODEC.fieldOf("text").forGetter(DialogueChoice::text), Codec.STRING.fieldOf("next").forGetter(DialogueChoice::next), Codecs.createStrictOptionalFieldCodec(DialogueChoiceCondition.CODEC, "only_if").forGetter(DialogueChoice::condition) ).apply(instance, DialogueChoice::new)); diff --git a/src/main/java/org/ladysnake/blabber/impl/common/model/DialogueState.java b/src/main/java/org/ladysnake/blabber/impl/common/model/DialogueState.java index e56b4566..80970c2b 100644 --- a/src/main/java/org/ladysnake/blabber/impl/common/model/DialogueState.java +++ b/src/main/java/org/ladysnake/blabber/impl/common/model/DialogueState.java @@ -24,6 +24,7 @@ import net.minecraft.network.PacketByteBuf; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.text.Text; +import net.minecraft.text.TextCodecs; import net.minecraft.text.Texts; import net.minecraft.util.dynamic.Codecs; import org.apache.commons.lang3.StringUtils; @@ -43,7 +44,7 @@ public record DialogueState( ) { public static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( // Kinda optional, but we still want errors if you got it wrong >:( - Codecs.createStrictOptionalFieldCodec(Codecs.TEXT, "text", Text.empty()).forGetter(DialogueState::text), + Codecs.createStrictOptionalFieldCodec(TextCodecs.CODEC, "text", Text.empty()).forGetter(DialogueState::text), Codecs.createStrictOptionalFieldCodec(Codec.list(DialogueChoice.CODEC), "choices", List.of()).forGetter(DialogueState::choices), Codecs.createStrictOptionalFieldCodec(InstancedDialogueAction.CODEC, "action").forGetter(DialogueState::action), Codecs.createStrictOptionalFieldCodec(Codec.STRING.xmap(s -> Enum.valueOf(ChoiceResult.class, s.toUpperCase(Locale.ROOT)), Enum::name), "type", ChoiceResult.DEFAULT).forGetter(DialogueState::type) diff --git a/src/main/java/org/ladysnake/blabber/impl/common/model/UnavailableAction.java b/src/main/java/org/ladysnake/blabber/impl/common/model/UnavailableAction.java index 3d4ae05b..0b68b652 100644 --- a/src/main/java/org/ladysnake/blabber/impl/common/model/UnavailableAction.java +++ b/src/main/java/org/ladysnake/blabber/impl/common/model/UnavailableAction.java @@ -24,6 +24,7 @@ import net.minecraft.network.PacketByteBuf; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.text.Text; +import net.minecraft.text.TextCodecs; import net.minecraft.text.Texts; import net.minecraft.util.dynamic.Codecs; import org.jetbrains.annotations.Nullable; @@ -33,7 +34,7 @@ public record UnavailableAction(UnavailableDisplay display, Optional message) { public static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( UnavailableDisplay.CODEC.fieldOf("display").forGetter(UnavailableAction::display), - Codecs.createStrictOptionalFieldCodec(Codecs.TEXT, "message").forGetter(UnavailableAction::message) + Codecs.createStrictOptionalFieldCodec(TextCodecs.CODEC, "message").forGetter(UnavailableAction::message) ).apply(instance, UnavailableAction::new)); public UnavailableAction(PacketByteBuf buf) {