From 9a0286853499a89201e838619e7ba701440e7dbc Mon Sep 17 00:00:00 2001 From: Michael Primm Date: Thu, 16 Mar 2023 17:46:18 -0500 Subject: [PATCH] Update Forge 1.19.3 to also work with Forge 1.19.4 --- .../ClientProxy.java | 2 +- .../DynmapMod.java | 4 ++-- .../DynmapPlugin.java | 16 ++++++++-------- .../ForgeMapChunkCache.java | 2 +- .../ForgeWorld.java | 2 +- .../{forge_1_19_2 => forge_1_19_3}/NBT.java | 2 +- .../{forge_1_19_2 => forge_1_19_3}/Proxy.java | 2 +- .../VersionCheck.java | 2 +- .../permissions/FilePermissions.java | 4 ++-- .../permissions/OpPermissions.java | 4 ++-- .../permissions/PermissionProvider.java | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) rename forge-1.19.3/src/main/java/org/dynmap/{forge_1_19_2 => forge_1_19_3}/ClientProxy.java (68%) rename forge-1.19.3/src/main/java/org/dynmap/{forge_1_19_2 => forge_1_19_3}/DynmapMod.java (98%) rename forge-1.19.3/src/main/java/org/dynmap/{forge_1_19_2 => forge_1_19_3}/DynmapPlugin.java (99%) rename forge-1.19.3/src/main/java/org/dynmap/{forge_1_19_2 => forge_1_19_3}/ForgeMapChunkCache.java (99%) rename forge-1.19.3/src/main/java/org/dynmap/{forge_1_19_2 => forge_1_19_3}/ForgeWorld.java (99%) rename forge-1.19.3/src/main/java/org/dynmap/{forge_1_19_2 => forge_1_19_3}/NBT.java (98%) rename forge-1.19.3/src/main/java/org/dynmap/{forge_1_19_2 => forge_1_19_3}/Proxy.java (93%) rename forge-1.19.3/src/main/java/org/dynmap/{forge_1_19_2 => forge_1_19_3}/VersionCheck.java (99%) rename forge-1.19.3/src/main/java/org/dynmap/{forge_1_19_2 => forge_1_19_3}/permissions/FilePermissions.java (97%) rename forge-1.19.3/src/main/java/org/dynmap/{forge_1_19_2 => forge_1_19_3}/permissions/OpPermissions.java (94%) rename forge-1.19.3/src/main/java/org/dynmap/{forge_1_19_2 => forge_1_19_3}/permissions/PermissionProvider.java (89%) diff --git a/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/ClientProxy.java b/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/ClientProxy.java similarity index 68% rename from forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/ClientProxy.java rename to forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/ClientProxy.java index a9fd707c..7895d868 100644 --- a/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/ClientProxy.java +++ b/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/ClientProxy.java @@ -1,4 +1,4 @@ -package org.dynmap.forge_1_19_2; +package org.dynmap.forge_1_19_3; public class ClientProxy extends Proxy { public ClientProxy() { diff --git a/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/DynmapMod.java b/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/DynmapMod.java similarity index 98% rename from forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/DynmapMod.java rename to forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/DynmapMod.java index f355331b..4b292b61 100644 --- a/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/DynmapMod.java +++ b/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/DynmapMod.java @@ -1,4 +1,4 @@ -package org.dynmap.forge_1_19_2; +package org.dynmap.forge_1_19_3; import java.io.File; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.tuple.Pair; import org.dynmap.DynmapCommonAPI; import org.dynmap.DynmapCommonAPIListener; import org.dynmap.Log; -import org.dynmap.forge_1_19_2.DynmapPlugin.OurLog; +import org.dynmap.forge_1_19_3.DynmapPlugin.OurLog; import net.minecraft.server.MinecraftServer; import net.minecraftforge.fml.common.Mod; diff --git a/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/DynmapPlugin.java b/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/DynmapPlugin.java similarity index 99% rename from forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/DynmapPlugin.java rename to forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/DynmapPlugin.java index af3c10cf..c314aa76 100644 --- a/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/DynmapPlugin.java +++ b/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/DynmapPlugin.java @@ -1,4 +1,4 @@ -package org.dynmap.forge_1_19_2; +package org.dynmap.forge_1_19_3; import java.io.File; import java.io.InputStream; @@ -98,12 +98,12 @@ import org.dynmap.common.DynmapPlayer; import org.dynmap.common.DynmapServerInterface; import org.dynmap.common.DynmapListenerManager.EventType; import org.dynmap.common.chunk.GenericChunkCache; -import org.dynmap.forge_1_19_2.DmapCommand; -import org.dynmap.forge_1_19_2.DmarkerCommand; -import org.dynmap.forge_1_19_2.DynmapCommand; -import org.dynmap.forge_1_19_2.permissions.FilePermissions; -import org.dynmap.forge_1_19_2.permissions.OpPermissions; -import org.dynmap.forge_1_19_2.permissions.PermissionProvider; +import org.dynmap.forge_1_19_3.DmapCommand; +import org.dynmap.forge_1_19_3.DmarkerCommand; +import org.dynmap.forge_1_19_3.DynmapCommand; +import org.dynmap.forge_1_19_3.permissions.FilePermissions; +import org.dynmap.forge_1_19_3.permissions.OpPermissions; +import org.dynmap.forge_1_19_3.permissions.PermissionProvider; import org.dynmap.permissions.PermissionsHandler; import org.dynmap.renderer.DynmapBlockState; import org.dynmap.utils.DynmapLogger; @@ -1415,7 +1415,7 @@ public class DynmapPlugin ResourceLocation regid = getBiomeReg().getKey(bb); String id = regid.getPath(); String rl = regid.toString(); - float tmp = bb.getBaseTemperature(), hum = bb.getDownfall(); + float tmp = bb.getBaseTemperature(), hum = bb.getModifiedClimateSettings().downfall(); int watermult = bb.getWaterColor(); Log.verboseinfo("biome[" + i + "]: hum=" + hum + ", tmp=" + tmp + ", mult=" + Integer.toHexString(watermult)); diff --git a/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/ForgeMapChunkCache.java b/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/ForgeMapChunkCache.java similarity index 99% rename from forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/ForgeMapChunkCache.java rename to forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/ForgeMapChunkCache.java index 0f9d7f2d..07c4cd2b 100644 --- a/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/ForgeMapChunkCache.java +++ b/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/ForgeMapChunkCache.java @@ -1,4 +1,4 @@ -package org.dynmap.forge_1_19_2; +package org.dynmap.forge_1_19_3; import java.util.List; import java.util.NoSuchElementException; diff --git a/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/ForgeWorld.java b/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/ForgeWorld.java similarity index 99% rename from forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/ForgeWorld.java rename to forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/ForgeWorld.java index fd3c6de2..22c17a1b 100644 --- a/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/ForgeWorld.java +++ b/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/ForgeWorld.java @@ -1,4 +1,4 @@ -package org.dynmap.forge_1_19_2; +package org.dynmap.forge_1_19_3; /** * Forge specific implementation of DynmapWorld */ diff --git a/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/NBT.java b/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/NBT.java similarity index 98% rename from forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/NBT.java rename to forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/NBT.java index 9d4958f0..c5ddc97d 100644 --- a/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/NBT.java +++ b/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/NBT.java @@ -1,4 +1,4 @@ -package org.dynmap.forge_1_19_2; +package org.dynmap.forge_1_19_3; import org.dynmap.common.chunk.GenericBitStorage; import org.dynmap.common.chunk.GenericNBTCompound; diff --git a/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/Proxy.java b/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/Proxy.java similarity index 93% rename from forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/Proxy.java rename to forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/Proxy.java index 52bbf140..3701bd0a 100644 --- a/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/Proxy.java +++ b/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/Proxy.java @@ -1,4 +1,4 @@ -package org.dynmap.forge_1_19_2; +package org.dynmap.forge_1_19_3; import net.minecraft.server.MinecraftServer; diff --git a/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/VersionCheck.java b/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/VersionCheck.java similarity index 99% rename from forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/VersionCheck.java rename to forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/VersionCheck.java index b069fbc7..70ad2c4b 100644 --- a/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/VersionCheck.java +++ b/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/VersionCheck.java @@ -1,4 +1,4 @@ -package org.dynmap.forge_1_19_2; +package org.dynmap.forge_1_19_3; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/permissions/FilePermissions.java b/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/permissions/FilePermissions.java similarity index 97% rename from forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/permissions/FilePermissions.java rename to forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/permissions/FilePermissions.java index b8f0c75b..0f857bab 100644 --- a/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/permissions/FilePermissions.java +++ b/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/permissions/FilePermissions.java @@ -1,4 +1,4 @@ -package org.dynmap.forge_1_19_2.permissions; +package org.dynmap.forge_1_19_3.permissions; import java.io.File; import java.util.HashMap; @@ -8,7 +8,7 @@ import java.util.Set; import org.dynmap.ConfigurationNode; import org.dynmap.Log; -import org.dynmap.forge_1_19_2.DynmapPlugin; +import org.dynmap.forge_1_19_3.DynmapPlugin; import net.minecraft.server.level.ServerPlayer; diff --git a/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/permissions/OpPermissions.java b/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/permissions/OpPermissions.java similarity index 94% rename from forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/permissions/OpPermissions.java rename to forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/permissions/OpPermissions.java index 33c2373c..3b12c9ef 100644 --- a/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/permissions/OpPermissions.java +++ b/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/permissions/OpPermissions.java @@ -1,10 +1,10 @@ -package org.dynmap.forge_1_19_2.permissions; +package org.dynmap.forge_1_19_3.permissions; import java.util.HashSet; import java.util.Set; import org.dynmap.Log; -import org.dynmap.forge_1_19_2.DynmapPlugin; +import org.dynmap.forge_1_19_3.DynmapPlugin; import net.minecraft.server.level.ServerPlayer; diff --git a/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/permissions/PermissionProvider.java b/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/permissions/PermissionProvider.java similarity index 89% rename from forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/permissions/PermissionProvider.java rename to forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/permissions/PermissionProvider.java index 46962227..18cdca46 100644 --- a/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_2/permissions/PermissionProvider.java +++ b/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/permissions/PermissionProvider.java @@ -1,4 +1,4 @@ -package org.dynmap.forge_1_19_2.permissions; +package org.dynmap.forge_1_19_3.permissions; import java.util.Set;