From 50e6317fa99ef4dad5e114cf85e8ddf69a4f80cb Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Mon, 21 Feb 2022 14:32:14 -0600
Subject: [PATCH] Update 1.12.2

---
 forge-1.12.2/build.gradle                     | 24 +++++++------------
 .../org/dynmap/forge_1_12_2/DynmapPlugin.java | 12 +++++-----
 .../org/dynmap/forge_1_12_2/ForgeWorld.java   |  2 +-
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/forge-1.12.2/build.gradle b/forge-1.12.2/build.gradle
index 46e0a19d..c4daaca3 100644
--- a/forge-1.12.2/build.gradle
+++ b/forge-1.12.2/build.gradle
@@ -1,9 +1,7 @@
 buildscript {
     repositories {
-        maven { url = 'https://files.minecraftforge.net/maven' }
-        jcenter()
-        mavenCentral()        
-        maven {url = "https://oss.sonatype.org/content/repositories/snapshots/"}
+        mavenCentral()
+        maven { url = "https://repo.spongepowered.org/maven" }
     }
     dependencies {
         classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
@@ -16,7 +14,7 @@ apply plugin: 'eclipse'
 
 eclipse {
     project {
-        name = "Dynmap(Forge-1.12.2)"
+        name = "Dynmap(Forge-Legacy-1.12.2)"
     }
 }
 
@@ -32,18 +30,14 @@ targetCompatibility = 1.8
 ext.buildNumber = System.getenv().BUILD_NUMBER ?: "Dev"
 
 repositories {
-    maven {
-        name = 'forge'
-        url = 'http://files.minecraftforge.net/maven'
-    }
-    maven {
-    	name = 'sponge'
-    	url = 'https://repo.spongepowered.org/maven'
-    }    	
+    mavenCentral()                                          // Maven Central
+    maven { url = 'https://repo.spongepowered.org/maven' }  // SpongePowered
+    maven { url = 'https://jitpack.io/' }                   // JitPack
 }
+
 minecraft {
-    version = "1.12.2-14.23.4.2705"
-    mappings = "snapshot_20171031"
+    version = "1.12.2-14.23.5.2847"
+    mappings = "snapshot_20180814"
     runDir = 'run'
     replaceIn "Version.java"
     replace "@VERSION@", project.version + '-' + project.ext.buildNumber
diff --git a/forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapPlugin.java b/forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapPlugin.java
index 9351394e..f02c9579 100644
--- a/forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapPlugin.java
+++ b/forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapPlugin.java
@@ -188,7 +188,7 @@ public class DynmapPlugin
                 Log.warning("Exception caught reading unique ID for block " + i);
             }
             if (ui != null) {
-            	String bn = ui.getResourceDomain() + ":" + ui.getResourcePath();
+            	String bn = ui.getNamespace() + ":" + ui.getPath();
                 // Only do defined names, and not "air"
                 if (!bn.equals(DynmapBlockState.AIR_BLOCK)) {
                     DynmapBlockState basebs = null;
@@ -251,7 +251,7 @@ public class DynmapPlugin
         return Item.getItemById(id);
     }
     public static final String getBlockUnlocalizedName(Block b) {
-        String s = b.getUnlocalizedName();
+        String s = b.getTranslationKey();
         if (s.startsWith("tile.")) {
             s = s.substring(5);
         }
@@ -1057,7 +1057,7 @@ public class DynmapPlugin
         		int i = Block.getIdFromBlock(b);
                 ResourceLocation ui = Block.REGISTRY.getNameForObject(b);
                 if (ui != null) {
-                    map.put(i, ui.getResourceDomain() + ":" + ui.getResourcePath());
+                    map.put(i, ui.getNamespace() + ":" + ui.getPath());
                 }
             }
             return map;
@@ -1103,7 +1103,7 @@ public class DynmapPlugin
                     Log.warning("Exception caught reading unique ID for block " + i);
                 }
                 if (ui != null) {
-                    map.put(ui.getResourceDomain() + ":" + ui.getResourcePath(), i);
+                    map.put(ui.getNamespace() + ":" + ui.getPath(), i);
                 }
             }
             return map;
@@ -1124,7 +1124,7 @@ public class DynmapPlugin
                     Log.warning("Exception caught reading unique ID for item " + i);
                 }
                 if (ui != null) {
-                    map.put(ui.getResourceDomain() + ":" + ui.getResourcePath(), i - 256);
+                    map.put(ui.getNamespace() + ":" + ui.getPath(), i - 256);
                 }
             }
             return map;
@@ -1756,7 +1756,7 @@ public class DynmapPlugin
 			if(!onchunkpopulate) return;
 			World w = event.getWorld();
             if(!(w instanceof WorldServer)) return;
-            Chunk c = w.getChunkFromChunkCoords(event.getChunkX(), event.getChunkZ());
+            Chunk c = w.getChunk(event.getChunkX(), event.getChunkZ());
 			int ymin = 0, ymax = 0;
 			if(c != null) {
                 ForgeWorld fw = getWorld(event.getWorld(), false);
diff --git a/forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/ForgeWorld.java b/forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/ForgeWorld.java
index 37d2269a..165f621b 100644
--- a/forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/ForgeWorld.java
+++ b/forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/ForgeWorld.java
@@ -194,7 +194,7 @@ public class ForgeWorld extends DynmapWorld
     public int getHighestBlockYAt(int x, int z)
     {
     	if(world != null) {
-            return world.getChunkFromChunkCoords(x >> 4, z >> 4).getHeightValue(x & 15, z & 15);
+            return world.getChunk(x >> 4, z >> 4).getHeightValue(x & 15, z & 15);
     	}
     	else
     		return -1;