Merge pull request #99 from DrexHD/Beta

Update to Pre3

Author: DrexHD

gradle.properties

@@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 # check these on https://fabricmc.net/use or on https://modmuss50.me/fabric.html
-minecraft_version=1.16-pre2
-yarn_mappings=1.16-pre2+build.1
+minecraft_version=1.16-pre3
+yarn_mappings=1.16-pre3+build.1
 loader_version=0.8.7+build.201
 
 # Mod Properties

src/main/java/org/kilocraft/essentials/ServerImpl.java

@@ -93,12 +93,12 @@ public void reloadKiloEssentials() {
     public void reloadMinecraftServer(Action<Throwable> fallback) {
         ResourcePackManager<ResourcePackProfile> resourcePackManager = this.server.getDataPackManager();
         SaveProperties saveProperties = this.getMinecraftServer().getSaveProperties();
-        Collection<String> collection = resourcePackManager.method_29210();
+        Collection<String> collection = resourcePackManager.getEnabledNames();
 
         Collection<String> modifiedCollection = Lists.newArrayList(collection);
         resourcePackManager.scanPacks();
-        for (String string : resourcePackManager.method_29206()) {
-            if (!saveProperties.method_29589().method_29550().contains(string) && !modifiedCollection.contains(string)) {
+        for (String string : resourcePackManager.getNames()) {
+            if (!saveProperties.method_29589().getDisabled().contains(string) && !modifiedCollection.contains(string)) {
                 modifiedCollection.add(string);
             }
         }

src/main/java/org/kilocraft/essentials/commands/teleport/RtpCommand.java

@@ -20,6 +20,7 @@
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.Biome.Category;
+import net.minecraft.world.dimension.DimensionType;
 import org.apache.commons.lang3.time.StopWatch;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -255,7 +256,7 @@ static void teleport(ServerCommandSource src, ServerPlayerEntity target, Logger
         BlockState state;
         int tries = 0;
         boolean hasAirSpace;
-        boolean isNether = target.getServerWorld().getDimension().isNether();
+        boolean isNether = RegistryUtils.isNether(world.getDimension());
         boolean safe;
 
         do {

src/main/java/org/kilocraft/essentials/commands/teleport/TeleportCommands.java

@@ -109,7 +109,7 @@ private static int teleportHere(CommandContext<ServerCommandSource> ctx) throws
     }
 
     private static int teleportIn(CommandContext<ServerCommandSource> ctx, ServerPlayerEntity target) throws CommandSyntaxException {
-        ServerWorld targetWorld = KiloServer.getServer().getMinecraftServer().getWorld(DimensionArgumentType.getDimensionArgument(ctx, "dimension"));
+        ServerWorld targetWorld = KiloServer.getServer().getMinecraftServer().getWorld(RegistryUtils.toWorldKey(DimensionArgumentType.getDimensionArgument(ctx, "dimension").getDimension()));
         Vec3d vec = getVec3(ctx, "pos");
 
         KiloServer.getServer().getOnlineUser(target).saveLocation();

src/main/java/org/kilocraft/essentials/mixin/ServerPlayerEntityMixin.java

@@ -20,11 +20,11 @@
 @Mixin(ServerPlayerEntity.class)
 public abstract class ServerPlayerEntityMixin {
 
-    @Inject(method = "changeDimension", cancellable = true, at = @At(value = "HEAD", target = "Lnet/minecraft/server/network/ServerPlayerEntity;changeDimension(Lnet/minecraft/world/dimension/DimensionType;)Lnet/minecraft/entity/Entity;"))
-    private void modify(RegistryKey<World> registryKey, CallbackInfoReturnable<Entity> cir) {
-        if (LocationUtil.shouldBlockAccessTo(RegistryUtils.toDimension(registryKey))) {
+    @Inject(method = "changeDimension", cancellable = true, at = @At(value = "HEAD", target = "Lnet/minecraft/server/network/ServerPlayerEntity;changeDimension(Lnet/minecraft/server/world/ServerWorld;)Lnet/minecraft/entity/Entity;"))
+    private void modify(ServerWorld serverWorld, CallbackInfoReturnable<Entity> cir) {
+        if (LocationUtil.shouldBlockAccessTo(serverWorld.getDimension())) {
             cir.cancel();
-            KiloChat.sendLangMessageTo((ServerPlayerEntity) (Object) this, "general.dimension_not_allowed", RegistryUtils.dimensionToName(registryKey.getValue()));
+            KiloChat.sendLangMessageTo((ServerPlayerEntity) (Object) this, "general.dimension_not_allowed", RegistryUtils.dimensionToName(serverWorld.getDimension()));
         }
 
         ServerUser.saveLocationOf((ServerPlayerEntity) (Object) this);

src/main/java/org/kilocraft/essentials/util/LocationUtil.java

@@ -60,7 +60,7 @@ public static void validateIsSafe(@NotNull final Location loc) throws InsecureDe
         BlockState state;
         int tries = 0;
         boolean hasAirSpace;
-        boolean isNether = loc.getDimensionType().isNether();
+        boolean isNether = RegistryUtils.isNether(loc.getDimensionType());
         boolean safe;
 
         do {

src/main/java/org/kilocraft/essentials/util/registry/RegistryUtils.java

@@ -85,4 +85,17 @@ public static RegistryKey<World> dimensionTypeToRegistryKey(@NotNull final Dimen
     public static Set<RegistryKey<World>> getWorldsKeySet() {
         return server.getWorldRegistryKeys();
     }
+
+    public static boolean isOverworld(@NotNull final DimensionType type) {
+        return type.equals(toDimension(DimensionType.OVERWORLD_REGISTRY_KEY.getValue()));
+    }
+
+    public static boolean isNether(@NotNull final DimensionType type) {
+        return type.equals(toDimension(DimensionType.THE_NETHER_REGISTRY_KEY.getValue()));
+    }
+
+    public static boolean isEnd(@NotNull final DimensionType type) {
+        return type.equals(toDimension(DimensionType.THE_END_REGISTRY_KEY.getValue()));
+    }
+
 }