Add missing textures, shift to 1.21.6 and 1.21.7
Mike Primm
|
After Width: | Height: | Size: 117 B |
|
After Width: | Height: | Size: 139 B |
|
After Width: | Height: | Size: 153 B |
|
After Width: | Height: | Size: 135 B |
|
After Width: | Height: | Size: 142 B |
|
After Width: | Height: | Size: 139 B |
|
After Width: | Height: | Size: 136 B |
|
After Width: | Height: | Size: 120 B |
|
After Width: | Height: | Size: 146 B |
|
After Width: | Height: | Size: 151 B |
|
After Width: | Height: | Size: 156 B |
|
After Width: | Height: | Size: 142 B |
|
After Width: | Height: | Size: 161 B |
|
After Width: | Height: | Size: 147 B |
|
After Width: | Height: | Size: 120 B |
|
After Width: | Height: | Size: 146 B |
|
After Width: | Height: | Size: 152 B |
|
After Width: | Height: | Size: 155 B |
|
After Width: | Height: | Size: 142 B |
|
After Width: | Height: | Size: 161 B |
|
After Width: | Height: | Size: 147 B |
|
After Width: | Height: | Size: 120 B |
|
After Width: | Height: | Size: 140 B |
|
After Width: | Height: | Size: 150 B |
|
After Width: | Height: | Size: 152 B |
|
After Width: | Height: | Size: 142 B |
|
After Width: | Height: | Size: 155 B |
|
After Width: | Height: | Size: 139 B |
|
Before Width: | Height: | Size: 241 B After Width: | Height: | Size: 224 B |
|
Before Width: | Height: | Size: 233 B After Width: | Height: | Size: 223 B |
|
Before Width: | Height: | Size: 238 B After Width: | Height: | Size: 222 B |
|
|
@ -1,4 +1,4 @@
|
|||
package org.dynmap.bukkit.helper.v121_7;
|
||||
package org.dynmap.bukkit.helper.v121_6;
|
||||
|
||||
import org.bukkit.*;
|
||||
import org.bukkit.craftbukkit.v1_21_R5.CraftChunk;
|
||||
|
|
@ -63,7 +63,7 @@ import java.util.Map;
|
|||
/**
|
||||
* Helper for isolation of bukkit version specific issues
|
||||
*/
|
||||
public class BukkitVersionHelperSpigot121_7 extends BukkitVersionHelper {
|
||||
public class BukkitVersionHelperSpigot121_6 extends BukkitVersionHelper {
|
||||
|
||||
@Override
|
||||
public boolean isUnsafeAsync() {
|
||||
|
|
@ -195,7 +195,7 @@ public class BukkitVersionHelperSpigot121_7 extends BukkitVersionHelper {
|
|||
*/
|
||||
@Override
|
||||
public MapChunkCache getChunkCache(BukkitWorld dw, List<DynmapChunk> chunks) {
|
||||
MapChunkCache121_7 c = new MapChunkCache121_7(gencache);
|
||||
MapChunkCache121_6 c = new MapChunkCache121_6(gencache);
|
||||
c.setChunks(dw, chunks);
|
||||
return c;
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.dynmap.bukkit.helper.v121_7;
|
||||
package org.dynmap.bukkit.helper.v121_6;
|
||||
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.level.ChunkCoordIntPair;
|
||||
|
|
@ -27,12 +27,12 @@ import java.util.function.Supplier;
|
|||
/**
|
||||
* Container for managing chunks - dependent upon using chunk snapshots, since rendering is off server thread
|
||||
*/
|
||||
public class MapChunkCache121_7 extends GenericMapChunkCache {
|
||||
public class MapChunkCache121_6 extends GenericMapChunkCache {
|
||||
private World w;
|
||||
/**
|
||||
* Construct empty cache
|
||||
*/
|
||||
public MapChunkCache121_7(GenericChunkCache cc) {
|
||||
public MapChunkCache121_6(GenericChunkCache cc) {
|
||||
super(cc);
|
||||
}
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.dynmap.bukkit.helper.v121_7;
|
||||
package org.dynmap.bukkit.helper.v121_6;
|
||||
|
||||
import org.dynmap.common.chunk.GenericBitStorage;
|
||||
import org.dynmap.common.chunk.GenericNBTCompound;
|
||||
|
|
@ -2,7 +2,7 @@ arguments=
|
|||
auto.sync=false
|
||||
build.scans.enabled=false
|
||||
connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.3))
|
||||
connection.project.dir=../forge-1.21
|
||||
connection.project.dir=..
|
||||
eclipse.preferences.version=1
|
||||
gradle.user.home=
|
||||
java.home=/Library/Java/JavaVirtualMachines/jdk1.8.0_251.jdk/Contents/Home
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ group = parent.group
|
|||
|
||||
eclipse {
|
||||
project {
|
||||
name = "Dynmap(Fabric-1.21.7)"
|
||||
name = "Dynmap(Fabric-1.21.6)"
|
||||
}
|
||||
}
|
||||
|
||||
6
fabric-1.21.6/gradle.properties
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
minecraft_version=1.21.6
|
||||
|
||||
# see https://fabricmc.net/develop/
|
||||
yarn_mappings=1.21.6+build.1
|
||||
loader_version=0.16.14
|
||||
fabric_version=0.128.2+1.21.6
|
||||
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 33 KiB |
|
|
@ -29,6 +29,6 @@
|
|||
"depends": {
|
||||
"fabricloader": ">=0.16.9",
|
||||
"fabric": ">=0.108.0",
|
||||
"minecraft": ["1.21.7"]
|
||||
"minecraft": ["1.21.6","1.21.7"]
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
minecraft_version=1.21.7
|
||||
|
||||
# see https://fabricmc.net/develop/
|
||||
yarn_mappings=1.21.7+build.6
|
||||
loader_version=0.16.14
|
||||
fabric_version=0.128.2+1.21.7
|
||||
|
|
@ -30,7 +30,7 @@ include ':bukkit-helper-121'
|
|||
include ':bukkit-helper-121-3'
|
||||
include ':bukkit-helper-121-4'
|
||||
include ':bukkit-helper-121-5'
|
||||
include ':bukkit-helper-121-7'
|
||||
include ':bukkit-helper-121-6'
|
||||
include ':bukkit-helper'
|
||||
include ':dynmap-api'
|
||||
include ':DynmapCore'
|
||||
|
|
@ -38,7 +38,7 @@ include ':DynmapCoreAPI'
|
|||
include ':fabric-1.21.1'
|
||||
include ':fabric-1.21.3'
|
||||
include ':fabric-1.21.5'
|
||||
include ':fabric-1.21.7'
|
||||
include ':fabric-1.21.6'
|
||||
include ':fabric-1.21'
|
||||
include ':fabric-1.20.6'
|
||||
include ':fabric-1.19.4'
|
||||
|
|
@ -80,7 +80,7 @@ project(':bukkit-helper-121').projectDir = "$rootDir/bukkit-helper-121" as File
|
|||
project(':bukkit-helper-121-3').projectDir = "$rootDir/bukkit-helper-121-3" as File
|
||||
project(':bukkit-helper-121-4').projectDir = "$rootDir/bukkit-helper-121-4" as File
|
||||
project(':bukkit-helper-121-5').projectDir = "$rootDir/bukkit-helper-121-5" as File
|
||||
project(':bukkit-helper-121-7').projectDir = "$rootDir/bukkit-helper-121-7" as File
|
||||
project(':bukkit-helper-121-6').projectDir = "$rootDir/bukkit-helper-121-6" as File
|
||||
project(':bukkit-helper').projectDir = "$rootDir/bukkit-helper" as File
|
||||
project(':dynmap-api').projectDir = "$rootDir/dynmap-api" as File
|
||||
project(':DynmapCore').projectDir = "$rootDir/DynmapCore" as File
|
||||
|
|
@ -88,7 +88,7 @@ project(':DynmapCoreAPI').projectDir = "$rootDir/DynmapCoreAPI" as File
|
|||
project(':fabric-1.21.1').projectDir = "$rootDir/fabric-1.21.1" as File
|
||||
project(':fabric-1.21.3').projectDir = "$rootDir/fabric-1.21.3" as File
|
||||
project(':fabric-1.21.5').projectDir = "$rootDir/fabric-1.21.5" as File
|
||||
project(':fabric-1.21.7').projectDir = "$rootDir/fabric-1.21.7" as File
|
||||
project(':fabric-1.21.6').projectDir = "$rootDir/fabric-1.21.6" as File
|
||||
project(':fabric-1.21').projectDir = "$rootDir/fabric-1.21" as File
|
||||
project(':fabric-1.20.6').projectDir = "$rootDir/fabric-1.20.6" as File
|
||||
project(':fabric-1.19.4').projectDir = "$rootDir/fabric-1.19.4" as File
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ dependencies {
|
|||
implementation(project(':bukkit-helper-121-5')) {
|
||||
transitive = false
|
||||
}
|
||||
implementation(project(':bukkit-helper-121-7')) {
|
||||
implementation(project(':bukkit-helper-121-6')) {
|
||||
transitive = false
|
||||
}
|
||||
}
|
||||
|
|
@ -147,7 +147,7 @@ shadowJar {
|
|||
include(dependency(':bukkit-helper-121-3'))
|
||||
include(dependency(':bukkit-helper-121-4'))
|
||||
include(dependency(':bukkit-helper-121-5'))
|
||||
include(dependency(':bukkit-helper-121-7'))
|
||||
include(dependency(':bukkit-helper-121-6'))
|
||||
}
|
||||
relocate('org.bstats', 'org.dynmap.bstats')
|
||||
destinationDirectory = file '../target'
|
||||
|
|
|
|||
|
|
@ -43,17 +43,17 @@ public class Helper {
|
|||
else if (v.contains("(MC: 1.21)") || v.contains("(MC: 1.21.1)")) {
|
||||
BukkitVersionHelper.helper = loadVersionHelper("org.dynmap.bukkit.helper.v121.BukkitVersionHelperSpigot121");
|
||||
}
|
||||
else if (v.contains("(MC: 1.21.2") || v.contains("(MC: 1.21.3")) {
|
||||
else if (v.contains("(MC: 1.21.2)") || v.contains("(MC: 1.21.3)")) {
|
||||
BukkitVersionHelper.helper = loadVersionHelper("org.dynmap.bukkit.helper.v121_3.BukkitVersionHelperSpigot121_3");
|
||||
}
|
||||
else if (v.contains("(MC: 1.21.4")) {
|
||||
else if (v.contains("(MC: 1.21.4)")) {
|
||||
BukkitVersionHelper.helper = loadVersionHelper("org.dynmap.bukkit.helper.v121_4.BukkitVersionHelperSpigot121_4");
|
||||
}
|
||||
else if (v.contains("(MC: 1.21.5")) {
|
||||
else if (v.contains("(MC: 1.21.5)")) {
|
||||
BukkitVersionHelper.helper = loadVersionHelper("org.dynmap.bukkit.helper.v121_5.BukkitVersionHelperSpigot121_5");
|
||||
}
|
||||
else if (v.contains("(MC: 1.21.")) {
|
||||
BukkitVersionHelper.helper = loadVersionHelper("org.dynmap.bukkit.helper.v121_7.BukkitVersionHelperSpigot121_7");
|
||||
BukkitVersionHelper.helper = loadVersionHelper("org.dynmap.bukkit.helper.v121_6.BukkitVersionHelperSpigot121_6");
|
||||
}
|
||||
else if (v.contains("(MC: 1.20)") || v.contains("(MC: 1.20.1)")) {
|
||||
BukkitVersionHelper.helper = loadVersionHelper("org.dynmap.bukkit.helper.v120.BukkitVersionHelperSpigot120");
|
||||
|
|
|
|||