From 9d38ee4329834321eaedb01f279e74a39a5f046e Mon Sep 17 00:00:00 2001 From: dfsek Date: Thu, 15 Jun 2023 17:18:36 -0700 Subject: [PATCH] repackage NMS 1.20.1 --- .../bukkit/nms/{v1_19_R3 => v1_20_R1}/AwfulBukkitHacks.java | 2 +- .../terra/bukkit/nms/{v1_19_R3 => v1_20_R1}/NMSBiomeInfo.java | 2 +- .../bukkit/nms/{v1_19_R3 => v1_20_R1}/NMSBiomeInjector.java | 2 +- .../bukkit/nms/{v1_19_R3 => v1_20_R1}/NMSBiomeProvider.java | 2 +- .../nms/{v1_19_R3 => v1_20_R1}/NMSChunkGeneratorDelegate.java | 2 +- .../bukkit/nms/{v1_19_R3 => v1_20_R1}/NMSInitializer.java | 2 +- .../bukkit/nms/{v1_19_R3 => v1_20_R1}/NMSInjectListener.java | 2 +- .../bukkit/nms/{v1_19_R3 => v1_20_R1}/NMSWorldProperties.java | 2 +- .../terra/bukkit/nms/{v1_19_R3 => v1_20_R1}/Reflection.java | 4 +--- .../bukkit/nms/{v1_19_R3 => v1_20_R1}/RegistryFetcher.java | 2 +- 10 files changed, 10 insertions(+), 12 deletions(-) rename platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/{v1_19_R3 => v1_20_R1}/AwfulBukkitHacks.java (99%) rename platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/{v1_19_R3 => v1_20_R1}/NMSBiomeInfo.java (83%) rename platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/{v1_19_R3 => v1_20_R1}/NMSBiomeInjector.java (98%) rename platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/{v1_19_R3 => v1_20_R1}/NMSBiomeProvider.java (97%) rename platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/{v1_19_R3 => v1_20_R1}/NMSChunkGeneratorDelegate.java (99%) rename platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/{v1_19_R3 => v1_20_R1}/NMSInitializer.java (90%) rename platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/{v1_19_R3 => v1_20_R1}/NMSInjectListener.java (97%) rename platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/{v1_19_R3 => v1_20_R1}/NMSWorldProperties.java (94%) rename platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/{v1_19_R3 => v1_20_R1}/Reflection.java (96%) rename platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/{v1_19_R3 => v1_20_R1}/RegistryFetcher.java (94%) diff --git a/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/AwfulBukkitHacks.java b/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/AwfulBukkitHacks.java similarity index 99% rename from platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/AwfulBukkitHacks.java rename to platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/AwfulBukkitHacks.java index 6ce0cc9a5..c30882958 100644 --- a/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/AwfulBukkitHacks.java +++ b/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/AwfulBukkitHacks.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_19_R3; +package com.dfsek.terra.bukkit.nms.v1_20_R1; import com.google.common.collect.ImmutableMap; import com.mojang.serialization.Lifecycle; diff --git a/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/NMSBiomeInfo.java b/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeInfo.java similarity index 83% rename from platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/NMSBiomeInfo.java rename to platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeInfo.java index 816d96068..7d8203ce3 100644 --- a/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/NMSBiomeInfo.java +++ b/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeInfo.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_19_R3; +package com.dfsek.terra.bukkit.nms.v1_20_R1; import net.minecraft.resources.ResourceKey; import net.minecraft.world.level.biome.Biome; diff --git a/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/NMSBiomeInjector.java b/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeInjector.java similarity index 98% rename from platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/NMSBiomeInjector.java rename to platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeInjector.java index f7bedfd0f..d0c32c7d5 100644 --- a/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/NMSBiomeInjector.java +++ b/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeInjector.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_19_R3; +package com.dfsek.terra.bukkit.nms.v1_20_R1; import net.minecraft.core.Holder; import java.util.stream.Stream; diff --git a/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/NMSBiomeProvider.java b/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeProvider.java similarity index 97% rename from platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/NMSBiomeProvider.java rename to platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeProvider.java index 52711f0ec..2f29ac3ef 100644 --- a/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/NMSBiomeProvider.java +++ b/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeProvider.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_19_R3; +package com.dfsek.terra.bukkit.nms.v1_20_R1; import com.mojang.serialization.Codec; import net.minecraft.core.Holder; diff --git a/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/NMSChunkGeneratorDelegate.java b/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSChunkGeneratorDelegate.java similarity index 99% rename from platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/NMSChunkGeneratorDelegate.java rename to platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSChunkGeneratorDelegate.java index 985eb4982..f0e929a5b 100644 --- a/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/NMSChunkGeneratorDelegate.java +++ b/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSChunkGeneratorDelegate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_19_R3; +package com.dfsek.terra.bukkit.nms.v1_20_R1; import com.mojang.serialization.Codec; import net.minecraft.core.BlockPos; diff --git a/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/NMSInitializer.java b/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSInitializer.java similarity index 90% rename from platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/NMSInitializer.java rename to platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSInitializer.java index 99797e8ab..6fb689ee7 100644 --- a/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/NMSInitializer.java +++ b/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSInitializer.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_19_R3; +package com.dfsek.terra.bukkit.nms.v1_20_R1; import org.bukkit.Bukkit; diff --git a/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/NMSInjectListener.java b/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSInjectListener.java similarity index 97% rename from platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/NMSInjectListener.java rename to platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSInjectListener.java index 983d117ea..3b2fbb0f8 100644 --- a/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/NMSInjectListener.java +++ b/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSInjectListener.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_19_R3; +package com.dfsek.terra.bukkit.nms.v1_20_R1; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.chunk.ChunkGenerator; diff --git a/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/NMSWorldProperties.java b/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSWorldProperties.java similarity index 94% rename from platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/NMSWorldProperties.java rename to platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSWorldProperties.java index 0c88eec33..9754c7627 100644 --- a/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/NMSWorldProperties.java +++ b/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSWorldProperties.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_19_R3; +package com.dfsek.terra.bukkit.nms.v1_20_R1; import net.minecraft.world.level.LevelHeightAccessor; diff --git a/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/Reflection.java b/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/Reflection.java similarity index 96% rename from platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/Reflection.java rename to platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/Reflection.java index a10837e11..6197e6e01 100644 --- a/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/Reflection.java +++ b/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/Reflection.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_19_R3; +package com.dfsek.terra.bukkit.nms.v1_20_R1; import net.minecraft.core.Holder; import net.minecraft.core.Holder.Reference; @@ -12,8 +12,6 @@ import xyz.jpenilla.reflectionremapper.proxy.annotation.FieldSetter; import xyz.jpenilla.reflectionremapper.proxy.annotation.MethodName; import xyz.jpenilla.reflectionremapper.proxy.annotation.Proxies; -import java.util.Objects; - public class Reflection { public static final MappedRegistryProxy MAPPED_REGISTRY; diff --git a/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/RegistryFetcher.java b/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/RegistryFetcher.java similarity index 94% rename from platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/RegistryFetcher.java rename to platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/RegistryFetcher.java index b7d45ed1d..9c7de5d8a 100644 --- a/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R3/RegistryFetcher.java +++ b/platforms/bukkit/nms/v1_20_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/RegistryFetcher.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_19_R3; +package com.dfsek.terra.bukkit.nms.v1_20_R1; import net.minecraft.core.Registry; import net.minecraft.core.registries.Registries;