feat: update to 1.21

MC-Machinations · Jun 21, 2024 · 7eb2132 · 7eb2132
1 parent 13a2b06
commit 7eb2132
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 16 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 }
 
 group = "me.machinemaker"
-version = "0.6.0"
+version = "0.7.0"
 
 repositories {
     mavenCentral()
@@ -44,18 +44,16 @@ spotless {
     }
 }
 
-tasks {
-    assemble {
-        dependsOn(reobfJar)
-    }
+paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION
 
+tasks {
     shadowJar {
         isEnableRelocation = true
         relocationPrefix = "me.machinemaker.treasuremapsplus.libs"
     }
 
     compileJava {
-        options.release.set(21)
+        options.release = 21
         options.encoding = Charsets.UTF_8.toString()
     }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,8 +1,8 @@
 [versions]
-minecraft = "1.20.6"
+minecraft = "1.21"
 junit = "5.9.1"
 mirror = "0.2.0"
-reflectionRemapper = "0.1.0"
+reflectionRemapper = "0.1.1"
 
 paperweight = "1.7.1"
 runPaper = "2.3.0"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

diff --git a/src/main/java/me/machinemaker/treasuremapsplus/RegistryOverride.java b/src/main/java/me/machinemaker/treasuremapsplus/RegistryOverride.java
@@ -39,7 +39,7 @@ public record RegistryOverride<T>(ResourceKey<? extends Registry<T>> registryKey
 
     static {
         try {
-            final ReflectionRemapper remapper = ReflectionRemapper.forReobfMappingsInPaperJar();
+            final ReflectionRemapper remapper = ReflectionRemapper.noop();
             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);

diff --git a/src/main/java/me/machinemaker/treasuremapsplus/listener/PlayerInteract.java b/src/main/java/me/machinemaker/treasuremapsplus/listener/PlayerInteract.java
@@ -81,7 +81,7 @@ private static List<net.minecraft.world.item.ItemStack> rollLootTable(final Item
         final PersistentDataContainer pdc = item.getItemMeta().getPersistentDataContainer();
         final @Nullable String tagKey = pdc.get(TreasureMapsPlus.MAP_STRUCTURE_TAG_KEY, PersistentDataType.STRING);
         if (tagKey != null) {
-            final TagKey<Structure> structureTagKey = TagKey.create(Registries.STRUCTURE, new ResourceLocation(tagKey));
+            final TagKey<Structure> structureTagKey = TagKey.create(Registries.STRUCTURE, ResourceLocation.parse(tagKey));
             if (structureTagKey == StructureTags.ON_TREASURE_MAPS) {
                 lootTable = BuiltInLootTables.BURIED_TREASURE;
             } else if (structureTagKey == StructureTags.ON_OCEAN_EXPLORER_MAPS) {
@@ -116,8 +116,8 @@ private static LootParams createEntityParams(final ServerPlayer player) {
             .withParameter(LootContextParams.THIS_ENTITY, guardian)
             .withParameter(LootContextParams.ORIGIN, player.position())
             .withParameter(LootContextParams.DAMAGE_SOURCE, player.serverLevel().damageSources().playerAttack(player))
-            .withOptionalParameter(LootContextParams.KILLER_ENTITY, player)
-            .withOptionalParameter(LootContextParams.DIRECT_KILLER_ENTITY, player)
+            .withOptionalParameter(LootContextParams.ATTACKING_ENTITY, player)
+            .withOptionalParameter(LootContextParams.DIRECT_ATTACKING_ENTITY, player)
             .withParameter(LootContextParams.LAST_DAMAGE_PLAYER, player)
             .withLuck(player.getLuck())
             .create(LootContextParamSets.ENTITY);

diff --git a/src/main/java/me/machinemaker/treasuremapsplus/loot/ExplorationMapItemFunctionOverride.java b/src/main/java/me/machinemaker/treasuremapsplus/loot/ExplorationMapItemFunctionOverride.java
@@ -46,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, ResourceLocation.parse("exploration_map"));
     private static final LootItemFunction.Builder SET_PDC_FUNCTION;
 
     static {

diff --git a/src/main/java/me/machinemaker/treasuremapsplus/villager/VillagerTradeOverride.java b/src/main/java/me/machinemaker/treasuremapsplus/villager/VillagerTradeOverride.java
@@ -66,7 +66,7 @@ public class VillagerTradeOverride {
 
 
     static {
-        final ReflectionRemapper remapper = ReflectionRemapper.forReobfMappingsInPaperJar();
+        final ReflectionRemapper remapper = ReflectionRemapper.noop();
         TREASURE_MAP_TRADE_LISTING_CLASS = sneaky(() -> Class.forName(remapper.remapClassName("net.minecraft.world.entity.npc.VillagerTrades$TreasureMapForEmeralds")));
         TYPE_SPECIFIC_TRADE_CLASS = sneaky(() -> Class.forName(remapper.remapClassName("net.minecraft.world.entity.npc.VillagerTrades$TypeSpecificTrade")));