Sulkta-OSS/dynmap-neoforge
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update 1.12.2

Browse source
This commit is contained in:
Mike Primm 2022-02-21 14:32:14 -06:00
parent f27fbc9f3e
commit 50e6317fa9
3 changed files with 16 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapPlugin.java
View file

@ -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);

2
forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/ForgeWorld.java
View file

@ -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;