update to 1.20.1

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 }
 
 group = "me.machinemaker"
-version = "0.2.1"
+version = "0.3.0"
 
 repositories {
     mavenCentral()
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    paperweight.paperDevBundle(libs.versions.paper)
+    paperweight.paperDevBundle(libs.versions.minecraft.map { "$it-R0.1-SNAPSHOT" })
     implementation(libs.mirror)
     implementation(libs.reflectionRemapper)
 
@@ -56,7 +56,7 @@ tasks {
 
     processResources {
         filteringCharset = Charsets.UTF_8.toString()
-        filesMatching(listOf("plugin.yml", "paper-plugin.yml")) {
+        filesMatching("paper-plugin.yml") {
             expand("version" to version)
         }
     }
@@ -70,6 +70,6 @@ tasks {
     }
 
     runServer {
-        minecraftVersion("1.19.4")
+        minecraftVersion(libs.versions.minecraft.get())
     }
 }

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-paper = "1.19.4-R0.1-SNAPSHOT"
+minecraft = "1.20.1"
 junit = "5.9.1"
 mirror = "0.1.2"
 reflectionRemapper = "0.1.0-SNAPSHOT"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# 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"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -197,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

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

@@ -104,7 +104,7 @@ private record OverrideListing(VillagerTrades.ItemListing original) implements V
         @SuppressWarnings("unchecked")
         @Override
         public @Nullable MerchantOffer getOffer(final Entity entity, final RandomSource random) {
-            if (!entity.getLevel().paperConfig().environment.treasureMaps.enabled) {
+            if (!entity.level().paperConfig().environment.treasureMaps.enabled) {
                 return null;
             }
             try {

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

@@ -32,7 +32,7 @@
 import net.minecraft.world.entity.monster.ElderGuardian;
 import net.minecraft.world.level.levelgen.structure.Structure;
 import net.minecraft.world.level.storage.loot.BuiltInLootTables;
-import net.minecraft.world.level.storage.loot.LootContext;
+import net.minecraft.world.level.storage.loot.LootParams;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.phys.Vec3;
@@ -91,28 +91,27 @@ private static List<net.minecraft.world.item.ItemStack> rollLootTable(final Item
             lootTable = BuiltInLootTables.BURIED_TREASURE;
         }
 
-        final LootContext context = isChest ? createChestContext(player) : createEntityContext(player);
+        final LootParams params = isChest ? createChestParams(player) : createEntityParams(player);
         final List<net.minecraft.world.item.ItemStack> items = new ArrayList<>();
-        Utils.getServer().getLootTables().get(lootTable).getRandomItems(context, items::add);
+        Utils.getServer().getLootData().getLootTable(lootTable).getRandomItems(params, items::add);
         return items;
 
     }
 
-    private static LootContext createChestContext(final ServerPlayer player) {
-        return new LootContext.Builder(player.getLevel())
+    private static LootParams createChestParams(final ServerPlayer player) {
+        return new LootParams.Builder(player.serverLevel())
             .withParameter(LootContextParams.ORIGIN, Vec3.atCenterOf(player.blockPosition()))
-            .withLuck(player.getLuck())
             .withParameter(LootContextParams.THIS_ENTITY, player)
+            .withLuck(player.getLuck())
             .create(LootContextParamSets.CHEST);
     }
 
-    private static LootContext createEntityContext(final ServerPlayer player) {
-        final ElderGuardian guardian = new ElderGuardian(EntityType.ELDER_GUARDIAN, player.getLevel());
-        return new LootContext.Builder(player.getLevel())
-            .withRandom(guardian.getRandom())
+    private static LootParams createEntityParams(final ServerPlayer player) {
+        final ElderGuardian guardian = new ElderGuardian(EntityType.ELDER_GUARDIAN, player.level());
+        return new LootParams.Builder(player.serverLevel())
             .withParameter(LootContextParams.THIS_ENTITY, guardian)
             .withParameter(LootContextParams.ORIGIN, player.position())
-            .withParameter(LootContextParams.DAMAGE_SOURCE, player.getLevel().damageSources().playerAttack(player))
+            .withParameter(LootContextParams.DAMAGE_SOURCE, player.serverLevel().damageSources().playerAttack(player))
             .withOptionalParameter(LootContextParams.KILLER_ENTITY, player)
             .withOptionalParameter(LootContextParams.DIRECT_KILLER_ENTITY, player)
             .withParameter(LootContextParams.LAST_DAMAGE_PLAYER, player)

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.19
+api-version: 1.20
 load: STARTUP