diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b8c199e5..3a71155a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ dark-matter = "4.0.1-1.20.1-build.76" [libraries] -fabric-loader = { group = "net.fabricmc", name = "fabric-loader", version = "0.15.10" } +fabric-loader = { group = "net.fabricmc", name = "fabric-loader", version = "0.15.11" } fabric-api = { group = "net.fabricmc.fabric-api", name = "fabric-api", version = "0.92.1+1.20.1" } dark-matter-base = { group = "me.melontini", name = "dark-matter-base", version.ref = "dark-matter" } -- 2.51.2 From bc053733b04d694ace540173d2e6cf54882649f3 Mon Sep 17 00:00:00 2001 From: melontini <104443436+melontini@users.noreply.github.com> Date: Wed, 8 May 2024 20:44:45 +0700 Subject: [PATCH 2/8] Enable gradle caching --- gradle.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gradle.properties b/gradle.properties index ff9361ca..66690e95 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,6 +3,8 @@ systemProp.org.gradle.internal.http.connectionTimeout=180000 systemProp.org.gradle.internal.http.socketTimeout=180000 org.gradle.jvmargs=-Xmx2G org.gradle.parallel=true +org.gradle.daemon=true +org.gradle.caching=true # Fabric Properties # check these on https://modmuss50.me/fabric.html minecraft_version=1.20.1 -- 2.51.2 From 6cb3b49363115aa472df234e003635b31a497195 Mon Sep 17 00:00:00 2001 From: melontini <104443436+melontini@users.noreply.github.com> Date: Wed, 8 May 2024 20:53:05 +0700 Subject: [PATCH 3/8] Fix goat horn crash. --- .../mechanics/trading_goat_horn/mixin/GoatHornMixin.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/me/melontini/andromeda/modules/mechanics/trading_goat_horn/mixin/GoatHornMixin.java b/src/main/java/me/melontini/andromeda/modules/mechanics/trading_goat_horn/mixin/GoatHornMixin.java index e62e4cd5..873cc205 100644 --- a/src/main/java/me/melontini/andromeda/modules/mechanics/trading_goat_horn/mixin/GoatHornMixin.java +++ b/src/main/java/me/melontini/andromeda/modules/mechanics/trading_goat_horn/mixin/GoatHornMixin.java @@ -30,6 +30,8 @@ abstract class GoatHornMixin { @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/ItemCooldownManager;set(Lnet/minecraft/item/Item;I)V", shift = At.Shift.BEFORE), method = "use") private void andromeda$wanderingGoatHorn(World world, PlayerEntity user, Hand hand, CallbackInfoReturnable> cir, @Local Optional> optional) { + if (world.isClient()) return; + Identifier identifier = optional.orElseThrow().getKey().orElseThrow().getValue(); if (!Objects.equals(identifier, SING_ID)) return; -- 2.51.2 From 58765384b9ef37615bae5b79dfe75bdac1738922 Mon Sep 17 00:00:00 2001 From: melontini <104443436+melontini@users.noreply.github.com> Date: Wed, 8 May 2024 21:06:43 +0700 Subject: [PATCH 4/8] Fix tests failing for Dependabot Loader updates. This has to be fixed in handy. --- build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 477e18aa..a2e94657 100644 --- a/build.gradle +++ b/build.gradle @@ -72,7 +72,9 @@ dependencies { } testmodImplementation sourceSets.main.output - testmodRemapImplementation libs.handy.tests + testmodRemapImplementation(libs.handy.tests) { + exclude(group: "net.fabricmc", module: "fabric-loader") + } } tasks.register("spotbugs", SpotBugsTask) { task -> -- 2.51.2 From 08e9ebe142c861ec03e788c82403ddfa4c2c03f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 May 2024 21:18:26 +0700 Subject: [PATCH 5/8] Bump com.github.spotbugs-base from 6.0.12 to 6.0.14 (#126) Bumps com.github.spotbugs-base from 6.0.12 to 6.0.14. --- updated-dependencies: - dependency-name: com.github.spotbugs-base dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3a71155a..151cd92b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,6 +23,6 @@ handy-tests = { group = "me.melontini", name = "handy-tests", version = "0.1.0-1 [plugins] fabric-loom = { id = "fabric-loom", version = "1.6.11" } lombok = { id = "io.freefair.lombok", version = "8.6"} -spotbugs-base = { id = "com.github.spotbugs-base", version = "6.0.12" } +spotbugs-base = { id = "com.github.spotbugs-base", version = "6.0.14" } spotless = { id = "com.diffplug.spotless", version = "6.25.0" } modmuss50-publish = { id = "me.modmuss50.mod-publish-plugin", version = "0.5.1" } \ No newline at end of file -- 2.51.2 From 214a2dd7b24eb8c3cc548156d8f6e5d25fd58da8 Mon Sep 17 00:00:00 2001 From: melontini <104443436+melontini@users.noreply.github.com> Date: Thu, 9 May 2024 02:45:57 +0700 Subject: [PATCH 6/8] Update Commander --- gradle/libs.versions.toml | 2 +- .../modules/blocks/incubator/data/EggProcessingData.java | 2 +- .../mechanics/throwable_items/data/ItemBehaviorData.java | 2 +- .../mechanics/throwable_items/data/ItemPlopEffect.java | 4 ++-- .../mechanics/throwable_items/data/ParticleCommand.java | 3 ++- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b8c199e5..bb022161 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ dark-matter-mirage = { group = "me.melontini", name = "dark-matter-mirage", vers dark-matter-glitter = { group = "me.melontini", name = "dark-matter-glitter", version.ref = "dark-matter" } dark-matter-item-group = { group = "me.melontini", name = "dark-matter-item-group", version.ref = "dark-matter" } -commander = { group = "me.melontini", name = "commander", version = "0.3.1-1.20.1-build.3" } +commander = { group = "me.melontini", name = "commander", version = "0.4.0-1.20.1-build.8" } modmenu = { group = "com.terraformersmc", name = "modmenu", version = "7.2.1" } cloth-config = { group = "me.shedaniel.cloth", name = "cloth-config-fabric", version = "11.1.106" } diff --git a/src/main/java/me/melontini/andromeda/modules/blocks/incubator/data/EggProcessingData.java b/src/main/java/me/melontini/andromeda/modules/blocks/incubator/data/EggProcessingData.java index cb969499..fb1ac889 100644 --- a/src/main/java/me/melontini/andromeda/modules/blocks/incubator/data/EggProcessingData.java +++ b/src/main/java/me/melontini/andromeda/modules/blocks/incubator/data/EggProcessingData.java @@ -40,7 +40,7 @@ public record EggProcessingData(Item item, WeightedList entity, Arithmeti public static final Codec CODEC = RecordCodecBuilder.create(data -> data.group( CommonRegistries.entityTypes().getCodec().fieldOf("entity").forGetter(Entry::type), NbtCompound.CODEC.optionalFieldOf("nbt", new NbtCompound()).forGetter(Entry::nbt), - ExtraCodecs.list(Command.CODEC).optionalFieldOf("commands", Collections.emptyList()).forGetter(Entry::commands) + ExtraCodecs.list(Command.CODEC.codec()).optionalFieldOf("commands", Collections.emptyList()).forGetter(Entry::commands) ).apply(data, Entry::new)); } diff --git a/src/main/java/me/melontini/andromeda/modules/mechanics/throwable_items/data/ItemBehaviorData.java b/src/main/java/me/melontini/andromeda/modules/mechanics/throwable_items/data/ItemBehaviorData.java index 300de30e..6f527d22 100644 --- a/src/main/java/me/melontini/andromeda/modules/mechanics/throwable_items/data/ItemBehaviorData.java +++ b/src/main/java/me/melontini/andromeda/modules/mechanics/throwable_items/data/ItemBehaviorData.java @@ -73,7 +73,7 @@ public record ItemBehaviorData(Parameters parameters, List subscri public record Subscription(Main.Event event, List commands) { public static final Codec CODEC = RecordCodecBuilder.create(data -> data.group( ExtraCodecs.enumCodec(Main.Event.class).fieldOf("event").forGetter(Subscription::event), - ExtraCodecs.list(Command.CODEC).fieldOf("commands").forGetter(Subscription::commands) + ExtraCodecs.list(Command.CODEC.codec()).fieldOf("commands").forGetter(Subscription::commands) ).apply(data, Subscription::new)); public static final Codec> LIST_CODEC = ExtraCodecs.list(CODEC); } diff --git a/src/main/java/me/melontini/andromeda/modules/mechanics/throwable_items/data/ItemPlopEffect.java b/src/main/java/me/melontini/andromeda/modules/mechanics/throwable_items/data/ItemPlopEffect.java index c69b2552..e9948163 100644 --- a/src/main/java/me/melontini/andromeda/modules/mechanics/throwable_items/data/ItemPlopEffect.java +++ b/src/main/java/me/melontini/andromeda/modules/mechanics/throwable_items/data/ItemPlopEffect.java @@ -1,6 +1,6 @@ package me.melontini.andromeda.modules.mechanics.throwable_items.data; -import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; import me.melontini.andromeda.modules.mechanics.throwable_items.Main; import me.melontini.commander.api.command.Command; import me.melontini.commander.api.command.CommandType; @@ -18,7 +18,7 @@ import net.minecraft.server.network.ServerPlayerEntity; public record ItemPlopEffect(Selector.Conditioned selector) implements Command { - public static final Codec CODEC = Selector.CODEC.fieldOf("selector").xmap(ItemPlopEffect::new, ItemPlopEffect::selector).codec(); + public static final MapCodec CODEC = Selector.CODEC.fieldOf("selector").xmap(ItemPlopEffect::new, ItemPlopEffect::selector); @Override public boolean execute(EventContext context) { diff --git a/src/main/java/me/melontini/andromeda/modules/mechanics/throwable_items/data/ParticleCommand.java b/src/main/java/me/melontini/andromeda/modules/mechanics/throwable_items/data/ParticleCommand.java index 8a52f896..0b065c9a 100644 --- a/src/main/java/me/melontini/andromeda/modules/mechanics/throwable_items/data/ParticleCommand.java +++ b/src/main/java/me/melontini/andromeda/modules/mechanics/throwable_items/data/ParticleCommand.java @@ -1,6 +1,7 @@ package me.melontini.andromeda.modules.mechanics.throwable_items.data; import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; import me.melontini.andromeda.modules.mechanics.throwable_items.Main; import me.melontini.commander.api.command.Command; @@ -23,7 +24,7 @@ import java.util.Optional; public record ParticleCommand(Selector.Conditioned selector, boolean item, Optional colors) implements Command { - public static final Codec CODEC = RecordCodecBuilder.create(data -> data.group( + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(data -> data.group( Selector.CODEC.fieldOf("selector").forGetter(ParticleCommand::selector), ExtraCodecs.optional("item", Codec.BOOL, true).forGetter(ParticleCommand::item), ExtraCodecs.optional("colors", ExtraCodecs.COLOR).forGetter(ParticleCommand::colors) -- 2.51.2 From 06b3f428cda296ad0b4a67806f34d0fbe47a3dbc Mon Sep 17 00:00:00 2001 From: melontini <104443436+melontini@users.noreply.github.com> Date: Fri, 10 May 2024 03:24:07 +0700 Subject: [PATCH 7/8] Update Commander 2. --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bb022161..63fe29cc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ dark-matter-mirage = { group = "me.melontini", name = "dark-matter-mirage", vers dark-matter-glitter = { group = "me.melontini", name = "dark-matter-glitter", version.ref = "dark-matter" } dark-matter-item-group = { group = "me.melontini", name = "dark-matter-item-group", version.ref = "dark-matter" } -commander = { group = "me.melontini", name = "commander", version = "0.4.0-1.20.1-build.8" } +commander = { group = "me.melontini", name = "commander", version = "0.4.0-1.20.1-build.9" } modmenu = { group = "com.terraformersmc", name = "modmenu", version = "7.2.1" } cloth-config = { group = "me.shedaniel.cloth", name = "cloth-config-fabric", version = "11.1.106" } -- 2.51.2 From 122d56568ffcbde4c70ea9e0c276029b7cb89de3 Mon Sep 17 00:00:00 2001 From: melontini <104443436+melontini@users.noreply.github.com> Date: Fri, 10 May 2024 03:31:00 +0700 Subject: [PATCH 8/8] CHANGELOG.md and bump version. --- CHANGELOG.md | 13 +++---------- gradle.properties | 2 +- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8636cd51..e3cf3f27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,10 @@ ### What's New: -[`entities/ghast_tweaks`]: -* New Module! Currently, adds an option for ghasts to explode on death. +[`mechanics/trading_goat_horn`]: -[`entities/slimes`]: - -* Fixed hyper-speed magma particles. +* Fixed client-side crash. [`general`]: -* Fixed merging of early translations. -* Fixed Lab and Wiki buttons in the config screen. -* Added an option to disable Andromeda's item group. -* Updated Dark Matter. -* Updated Chinese translation. Courtesy of [Rad586](https://github.com/Rad586). \ No newline at end of file +* Updated Commander and Fabric Loader. \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 66690e95..293cd2f0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,6 +10,6 @@ org.gradle.caching=true minecraft_version=1.20.1 yarn_mappings=1.20.1+build.2 # Mod Properties -mod_version=1.11.0 +mod_version=1.11.1 maven_group=me.melontini archives_base_name=andromeda \ No newline at end of file