feat: update to 1.20.6

Author: Machine-Maker

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 }
 
 group = "me.machinemaker"
-version = "0.5.0"
+version = "0.6.0"
 
 repositories {
     mavenCentral()
@@ -29,7 +29,7 @@ dependencies {
 }
 
 java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 }
 
 checkstyle {
@@ -55,7 +55,7 @@ tasks {
     }
 
     compileJava {
-        options.release.set(17)
+        options.release.set(21)
         options.encoding = Charsets.UTF_8.toString()
     }
 
@@ -74,7 +74,7 @@ tasks {
         systemProperty("com.mojang.eula.agree", "true")
 
         downloadPlugins {
-            url("https://download.luckperms.net/1526/bukkit/loader/LuckPerms-Bukkit-5.4.113.jar")
+            url("https://download.luckperms.net/1543/bukkit/loader/LuckPerms-Bukkit-5.4.130.jar")
         }
     }
 

gradle/libs.versions.toml

@@ -1,12 +1,12 @@
 [versions]
-minecraft = "1.20.4"
+minecraft = "1.20.6"
 junit = "5.9.1"
-mirror = "0.1.2"
+mirror = "0.2.0"
 reflectionRemapper = "0.1.0"
 
 paperweight = "1.7.1"
 runPaper = "2.3.0"
-shadow = "8.1.1"
+shadow = "8.1.7"
 spotless = "6.17.0"
 
 [libraries]
@@ -18,5 +18,5 @@ reflectionRemapper = { module = "xyz.jpenilla:reflection-remapper", version.ref
 [plugins]
 paper-userdev = { id = "io.papermc.paperweight.userdev", version.ref = "paperweight" }
 paper-run = { id = "xyz.jpenilla.run-paper", version.ref = "runPaper" }
-shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
+shadow = { id = "io.github.goooler.shadow", version.ref = "shadow" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }

src/main/java/me/machinemaker/treasuremapsplus/RegistryOverride.java

@@ -19,7 +19,6 @@
  */
 package me.machinemaker.treasuremapsplus;
 
-import com.mojang.serialization.Lifecycle;
 import it.unimi.dsi.fastutil.objects.Reference2IntMap;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -35,7 +34,6 @@ public record RegistryOverride<T>(ResourceKey<? extends Registry<T>> registryKey
 
     private static final MethodHandle TO_ID_MAP;
     private static final MethodHandle BY_VALUE_MAP;
-    private static final MethodHandle LIFECYCLES_MAP;
 
     private static final MethodHandle SET_HOLDER_VALUE;
 
@@ -45,7 +43,6 @@ public record RegistryOverride<T>(ResourceKey<? extends Registry<T>> registryKey
             final MethodHandles.Lookup mappedRegistryLookup = MethodHandles.privateLookupIn(MappedRegistry.class, MethodHandles.lookup());
             TO_ID_MAP = mappedRegistryLookup.findGetter(MappedRegistry.class, remapper.remapFieldName(MappedRegistry.class, "toId"), Reference2IntMap.class);
             BY_VALUE_MAP = mappedRegistryLookup.findGetter(MappedRegistry.class, remapper.remapFieldName(MappedRegistry.class, "byValue"), Map.class);
-            LIFECYCLES_MAP = mappedRegistryLookup.findGetter(MappedRegistry.class, remapper.remapFieldName(MappedRegistry.class, "lifecycles"), Map.class);
 
             final MethodHandles.Lookup referenceHolderLookup = MethodHandles.privateLookupIn(Holder.Reference.class, MethodHandles.lookup());
             SET_HOLDER_VALUE = referenceHolderLookup.findSetter(Holder.Reference.class, remapper.remapFieldName(Holder.Reference.class, "value"), Object.class);
@@ -63,7 +60,6 @@ public void override(final RegistryAccess access) {
         final int id = registry.getId(oldValue);
         swapToIdMap(registry, id, oldValue, this.value());
         swapByValueMap(registry, holder, oldValue, this.value());
-        swapLifecyclesMap(registry, oldValue, this.value());
         swapInHolder(holder, this.value());
     }
 
@@ -89,17 +85,6 @@ private static <T> void swapByValueMap(final Registry<T> registry, final Holder.
         }
     }
 
-    @SuppressWarnings("unchecked")
-    private static <T> void swapLifecyclesMap(final Registry<T> registry, final T oldValue, final T newValue) {
-        try {
-            final Map<T, Lifecycle> map = (Map<T, Lifecycle>) LIFECYCLES_MAP.invoke(registry);
-            map.remove(oldValue);
-            map.put(newValue, Lifecycle.experimental());
-        } catch (final Throwable e) {
-            throw new RuntimeException("Could not get lifecycles map from " + registry, e);
-        }
-    }
-
     private static <T> void swapInHolder(final Holder.Reference<T> holder, final T newValue) {
         try {
             SET_HOLDER_VALUE.invoke(holder, newValue);

src/main/java/me/machinemaker/treasuremapsplus/TreasureMapsPlus.java

@@ -22,14 +22,13 @@
 import java.util.Collections;
 import java.util.List;
 import me.machinemaker.treasuremapsplus.listener.PlayerInteract;
-import me.machinemaker.treasuremapsplus.loot.ExplorationMapItemFunctionOverride;
-import me.machinemaker.treasuremapsplus.villager.VillagerTradeOverride;
+import me.machinemaker.treasuremapsplus.listener.ServerLoad;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.TextDecoration;
 import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.minecraft.server.MinecraftServer;
 import org.bukkit.NamespacedKey;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 public final class TreasureMapsPlus extends JavaPlugin {
 
@@ -42,7 +41,7 @@ public final class TreasureMapsPlus extends JavaPlugin {
     private final boolean replaceMonuments;
     private final boolean replaceMansions;
 
-    private final ReplacementResult result;
+    private @MonotonicNonNull ReplacementResult result;
 
     public TreasureMapsPlus() throws Exception {
         this.saveDefaultConfig();
@@ -52,19 +51,12 @@ public TreasureMapsPlus() throws Exception {
         this.replaceChests = this.getConfig().getBoolean("replace.chests", false);
         this.replaceMonuments = this.getConfig().getBoolean("replace.villagers.monument", false);
         this.replaceMansions = this.getConfig().getBoolean("replace.villagers.mansion", false);
-        final ExplorationMapItemFunctionOverride mapFunctionOverride = new ExplorationMapItemFunctionOverride(MinecraftServer.getServer().registryAccess(), this);
-        mapFunctionOverride.override();
-        DatapackOverride.deleteLeftoversAndReload(); // must reload resources override to count how many were changed
-        final VillagerTradeOverride villagerTradeOverride = new VillagerTradeOverride(this);
-        final int replacedTrades = villagerTradeOverride.override();
-        this.result = new ReplacementResult(mapFunctionOverride.replaceCount(), replacedTrades);
     }
 
     @Override
     public void onEnable() {
         this.getServer().getPluginManager().registerEvents(new PlayerInteract(), this);
-        this.getSLF4JLogger().info("Found and replaced {} loot tables with a treasure map", this.result.lootTableCount);
-        this.getSLF4JLogger().info("Found and replaced {} villager trades with a treasure map", this.result.tradeCount);
+        this.getServer().getPluginManager().registerEvents(new ServerLoad(this), this);
 
     }
 

src/main/java/me/machinemaker/treasuremapsplus/Utils.java

@@ -27,7 +27,7 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.storage.loot.functions.LootItemFunction;
-import net.minecraft.world.level.storage.loot.functions.SetNbtFunction;
+import net.minecraft.world.level.storage.loot.functions.SetCustomDataFunction;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
@@ -69,7 +69,7 @@ public static ItemStack getBukkitStackMirror(final net.minecraft.world.item.Item
 
     @SuppressWarnings("deprecation")
     public static LootItemFunction.Builder createSetNbtFunction(final CompoundTag tag) {
-        return SetNbtFunction.setTag(tag);
+        return SetCustomDataFunction.setCustomData(tag);
     }
 
     public static <T, E extends Throwable> T sneaky(final CheckedSupplier<T, E> supplier) {

src/main/java/me/machinemaker/treasuremapsplus/listener/PlayerInteract.java

@@ -24,6 +24,7 @@
 import me.machinemaker.treasuremapsplus.TreasureMapsPlus;
 import me.machinemaker.treasuremapsplus.Utils;
 import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.tags.StructureTags;
@@ -33,6 +34,7 @@
 import net.minecraft.world.level.levelgen.structure.Structure;
 import net.minecraft.world.level.storage.loot.BuiltInLootTables;
 import net.minecraft.world.level.storage.loot.LootParams;
+import net.minecraft.world.level.storage.loot.LootTable;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.phys.Vec3;
@@ -75,7 +77,7 @@ public void onEvent(final PlayerInteractEvent event) {
 
     private static List<net.minecraft.world.item.ItemStack> rollLootTable(final ItemStack item, final ServerPlayer player) {
         boolean isChest = true;
-        @Nullable ResourceLocation lootTable = null;
+        @Nullable ResourceKey<LootTable> lootTable = null;
         final PersistentDataContainer pdc = item.getItemMeta().getPersistentDataContainer();
         final @Nullable String tagKey = pdc.get(TreasureMapsPlus.MAP_STRUCTURE_TAG_KEY, PersistentDataType.STRING);
         if (tagKey != null) {
@@ -95,7 +97,7 @@ private static List<net.minecraft.world.item.ItemStack> rollLootTable(final Item
 
         final LootParams params = isChest ? createChestParams(player) : createEntityParams(player);
         final List<net.minecraft.world.item.ItemStack> items = new ArrayList<>();
-        Utils.getServer().getLootData().getLootTable(lootTable).getRandomItems(params, items::add);
+        Utils.getServer().reloadableRegistries().getLootTable(lootTable).getRandomItems(params, items::add);
         return items;
 
     }

src/main/java/me/machinemaker/treasuremapsplus/listener/ServerLoad.java

@@ -0,0 +1,56 @@
+/*
+ * GNU General Public License v3
+ *
+ * TreasureMapsPlus, a plugin to alter treasure maps
+ *
+ * Copyright (C) 2024 Machine-Maker
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package me.machinemaker.treasuremapsplus.listener;
+
+import me.machinemaker.treasuremapsplus.DatapackOverride;
+import me.machinemaker.treasuremapsplus.TreasureMapsPlus;
+import me.machinemaker.treasuremapsplus.loot.ExplorationMapItemFunctionOverride;
+import me.machinemaker.treasuremapsplus.villager.VillagerTradeOverride;
+import net.minecraft.server.MinecraftServer;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.server.ServerLoadEvent;
+
+public class ServerLoad implements Listener {
+
+    final TreasureMapsPlus plugin;
+
+    public ServerLoad(final TreasureMapsPlus plugin) {
+        this.plugin = plugin;
+    }
+
+    @EventHandler
+    public void onEvent(final ServerLoadEvent event) {
+        if (event.getType() == ServerLoadEvent.LoadType.STARTUP) {
+            try {
+                final ExplorationMapItemFunctionOverride mapFunctionOverride = new ExplorationMapItemFunctionOverride(MinecraftServer.getServer().registryAccess(), this.plugin);
+                mapFunctionOverride.override();
+                this.plugin.getSLF4JLogger().info("Reloading the server resources to apply treasure map changes...");
+                DatapackOverride.deleteLeftoversAndReload();
+                final VillagerTradeOverride villagerTradeOverride = new VillagerTradeOverride(this.plugin);
+                final int replacedTrades = villagerTradeOverride.override();
+                this.plugin.getSLF4JLogger().info("Found and replaced {} loot tables with a treasure map", mapFunctionOverride.replaceCount());
+                this.plugin.getSLF4JLogger().info("Found and replaced {} villager trades with a treasure map", replacedTrades);
+            } catch (final Exception ex) {
+                throw new RuntimeException("Could not load this plugin", ex);
+            }
+        }
+    }
+}

src/main/java/me/machinemaker/treasuremapsplus/loot/ExplorationMapItemFunctionOverride.java

@@ -21,7 +21,6 @@
 
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
-import com.mojang.serialization.Codec;
 import com.mojang.serialization.MapCodec;
 import io.papermc.paper.adventure.PaperAdventure;
 import java.util.List;
@@ -47,7 +46,7 @@
 public class ExplorationMapItemFunctionOverride {
 
     @VisibleForTesting
-    static final ResourceKey<LootItemFunctionType> EXPLORATION_FUNCTION_KEY = ResourceKey.create(Registries.LOOT_FUNCTION_TYPE, new ResourceLocation(ResourceLocation.DEFAULT_NAMESPACE, "exploration_map"));
+    static final ResourceKey<LootItemFunctionType<?>> EXPLORATION_FUNCTION_KEY = ResourceKey.create(Registries.LOOT_FUNCTION_TYPE, new ResourceLocation(ResourceLocation.DEFAULT_NAMESPACE, "exploration_map"));
     private static final LootItemFunction.Builder SET_PDC_FUNCTION;
 
     static {
@@ -61,7 +60,7 @@ public class ExplorationMapItemFunctionOverride {
 
 
     @VisibleForTesting
-    final RegistryOverride<LootItemFunctionType> registryOverride;
+    final RegistryOverride<LootItemFunctionType<?>> registryOverride;
     private final RegistryAccess access;
     private final List<Component> lore;
     private final boolean replaceChests;
@@ -72,17 +71,16 @@ public ExplorationMapItemFunctionOverride(final RegistryAccess registryAccess, f
     }
 
     @VisibleForTesting
-    @SuppressWarnings("unchecked")
     ExplorationMapItemFunctionOverride(final RegistryAccess registryAccess, final List<Component> lore, final boolean replaceChests) {
         this.access = registryAccess;
         this.lore = lore;
         this.replaceChests = replaceChests;
-        final MapCodec.MapCodecCodec<ExplorationMapFunction> mapCodecCodec = (MapCodec.MapCodecCodec<ExplorationMapFunction>) LootItemFunctions.EXPLORATION_MAP.codec();
-        final Codec<? extends LootItemFunction> replacementCodec = mapCodecCodec.codec().xmap(this::createSequenceFunction, this::retrieveExplorationFunction).codec();
+        final MapCodec<ExplorationMapFunction> mapCodecCodec = LootItemFunctions.EXPLORATION_MAP.codec();
+        final MapCodec<? extends LootItemFunction> replacementCodec = mapCodecCodec.xmap(this::createSequenceFunction, this::retrieveExplorationFunction);
         this.registryOverride = new RegistryOverride<>(
             Registries.LOOT_FUNCTION_TYPE,
             EXPLORATION_FUNCTION_KEY,
-            new LootItemFunctionType(replacementCodec));
+            new LootItemFunctionType<>(replacementCodec));
     }
 
     public void override() {

src/main/java/me/machinemaker/treasuremapsplus/villager/VillagerTradeOverride.java

@@ -25,6 +25,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.function.Function;
 import me.machinemaker.treasuremapsplus.TreasureMapsPlus;
 import me.machinemaker.treasuremapsplus.Utils;
@@ -36,6 +37,7 @@
 import net.minecraft.world.entity.npc.VillagerType;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
+import net.minecraft.world.item.trading.ItemCost;
 import net.minecraft.world.item.trading.MerchantOffer;
 import org.bukkit.persistence.PersistentDataType;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -133,7 +135,7 @@ private VillagerTrades.ItemListing createOverride(final VillagerTrades.ItemListi
             return this.replaceMonuments ? new OverrideListing(original, this::createStack) : original;
         } else if (name.endsWith("mansion")) {
             return this.replaceMansions ? new OverrideListing(original, this::createStack) : original;
-        } else if (name.startsWith("filled_map.village_") || name.startsWith("filled_map.explorer_")) {
+        } else if (name.startsWith("filled_map.village_") || name.startsWith("filled_map.explorer_") || name.endsWith(".trial_chambers")) {
             // skip these maps, no point in replacing them, it defeats their whole purpose
             return original;
         } else {
@@ -165,8 +167,8 @@ private record OverrideListing(VillagerTrades.ItemListing original, Function<Vil
                 return null;
             }
             return new MerchantOffer(
-                new ItemStack(Items.EMERALD, TREASURE_MAP_PROXY.emeraldCost(this.original)),
-                new ItemStack(Items.COMPASS),
+                new ItemCost(Items.EMERALD, TREASURE_MAP_PROXY.emeraldCost(this.original)),
+                Optional.of(new ItemCost(Items.COMPASS)),
                 this.mapStackCreator.apply(this.original),
                 TREASURE_MAP_PROXY.maxUses(this.original),
                 TREASURE_MAP_PROXY.villagerXp(this.original),

src/main/resources/paper-plugin.yml

@@ -2,5 +2,5 @@ name: TreasureMapsPlus
 main: me.machinemaker.treasuremapsplus.TreasureMapsPlus
 version: ${version}
 author: Machine_Maker
-api-version: "1.20"
+api-version: "1.20.6"
 load: STARTUP