diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_bottom.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_bottom.png new file mode 100644 index 00000000..2b123fa6 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_bottom.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_east.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_east.png new file mode 100644 index 00000000..46c77d78 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_east.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_north.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_north.png new file mode 100644 index 00000000..203abe56 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_north.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_south.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_south.png new file mode 100644 index 00000000..dcc2649a Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_south.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_tentacles.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_tentacles.png new file mode 100644 index 00000000..7a2e9001 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_tentacles.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_top.png new file mode 100644 index 00000000..b1b0ca66 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_top.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_west.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_west.png new file mode 100644 index 00000000..129503a3 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_west.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_bottom.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_bottom.png new file mode 100644 index 00000000..ed74597c Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_bottom.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_east.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_east.png new file mode 100644 index 00000000..5c147ec4 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_east.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_north.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_north.png new file mode 100644 index 00000000..a7b07183 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_north.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_south.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_south.png new file mode 100644 index 00000000..19bf2fbc Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_south.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_tentacles.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_tentacles.png new file mode 100644 index 00000000..d015e517 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_tentacles.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_top.png new file mode 100644 index 00000000..07ca827b Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_top.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_west.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_west.png new file mode 100644 index 00000000..dca44419 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_west.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_bottom.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_bottom.png new file mode 100644 index 00000000..d599dd72 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_bottom.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_east.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_east.png new file mode 100644 index 00000000..37624e96 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_east.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_north.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_north.png new file mode 100644 index 00000000..7de7c05e Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_north.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_south.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_south.png new file mode 100644 index 00000000..64a39a78 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_south.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_tentacles.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_tentacles.png new file mode 100644 index 00000000..fbaee6f9 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_tentacles.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_top.png new file mode 100644 index 00000000..d678d156 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_top.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_west.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_west.png new file mode 100644 index 00000000..c9dcd2c8 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_west.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_bottom.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_bottom.png new file mode 100644 index 00000000..b1002283 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_bottom.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_east.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_east.png new file mode 100644 index 00000000..7a9f56fa Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_east.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_north.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_north.png new file mode 100644 index 00000000..08e5af50 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_north.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_south.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_south.png new file mode 100644 index 00000000..6496d6a8 Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_south.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_tentacles.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_tentacles.png new file mode 100644 index 00000000..bde1eaec Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_tentacles.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_top.png new file mode 100644 index 00000000..d7f8be7c Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_top.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_west.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_west.png new file mode 100644 index 00000000..32f239cd Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_west.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_kelp_bottom.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_kelp_bottom.png index 32c3d671..d40eaf8b 100644 Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_kelp_bottom.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_kelp_bottom.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_kelp_side.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_kelp_side.png index 473eb5c5..3cbdbe75 100644 Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_kelp_side.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_kelp_side.png differ diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_kelp_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_kelp_top.png index 18221d43..b6d59c27 100644 Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_kelp_top.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_kelp_top.png differ diff --git a/bukkit-helper-121-7/.gitignore b/bukkit-helper-121-6/.gitignore similarity index 100% rename from bukkit-helper-121-7/.gitignore rename to bukkit-helper-121-6/.gitignore diff --git a/bukkit-helper-121-7/build.gradle b/bukkit-helper-121-6/build.gradle similarity index 100% rename from bukkit-helper-121-7/build.gradle rename to bukkit-helper-121-6/build.gradle diff --git a/bukkit-helper-121-7/src/main/java/org/dynmap/bukkit/helper/v121_7/BukkitVersionHelperSpigot121_7.java b/bukkit-helper-121-6/src/main/java/org/dynmap/bukkit/helper/v121_6/BukkitVersionHelperSpigot121_6.java similarity index 98% rename from bukkit-helper-121-7/src/main/java/org/dynmap/bukkit/helper/v121_7/BukkitVersionHelperSpigot121_7.java rename to bukkit-helper-121-6/src/main/java/org/dynmap/bukkit/helper/v121_6/BukkitVersionHelperSpigot121_6.java index f210799b..7698789d 100644 --- a/bukkit-helper-121-7/src/main/java/org/dynmap/bukkit/helper/v121_7/BukkitVersionHelperSpigot121_7.java +++ b/bukkit-helper-121-6/src/main/java/org/dynmap/bukkit/helper/v121_6/BukkitVersionHelperSpigot121_6.java @@ -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 chunks) { - MapChunkCache121_7 c = new MapChunkCache121_7(gencache); + MapChunkCache121_6 c = new MapChunkCache121_6(gencache); c.setChunks(dw, chunks); return c; } diff --git a/bukkit-helper-121-7/src/main/java/org/dynmap/bukkit/helper/v121_7/MapChunkCache121_7.java b/bukkit-helper-121-6/src/main/java/org/dynmap/bukkit/helper/v121_6/MapChunkCache121_6.java similarity index 96% rename from bukkit-helper-121-7/src/main/java/org/dynmap/bukkit/helper/v121_7/MapChunkCache121_7.java rename to bukkit-helper-121-6/src/main/java/org/dynmap/bukkit/helper/v121_6/MapChunkCache121_6.java index 5d7a00b7..861ab8f8 100644 --- a/bukkit-helper-121-7/src/main/java/org/dynmap/bukkit/helper/v121_7/MapChunkCache121_7.java +++ b/bukkit-helper-121-6/src/main/java/org/dynmap/bukkit/helper/v121_6/MapChunkCache121_6.java @@ -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); } diff --git a/bukkit-helper-121-7/src/main/java/org/dynmap/bukkit/helper/v121_7/NBT.java b/bukkit-helper-121-6/src/main/java/org/dynmap/bukkit/helper/v121_6/NBT.java similarity index 98% rename from bukkit-helper-121-7/src/main/java/org/dynmap/bukkit/helper/v121_7/NBT.java rename to bukkit-helper-121-6/src/main/java/org/dynmap/bukkit/helper/v121_6/NBT.java index b9853097..2c321c5f 100644 --- a/bukkit-helper-121-7/src/main/java/org/dynmap/bukkit/helper/v121_7/NBT.java +++ b/bukkit-helper-121-6/src/main/java/org/dynmap/bukkit/helper/v121_6/NBT.java @@ -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; diff --git a/bukkit-helper/.settings/org.eclipse.buildship.core.prefs b/bukkit-helper/.settings/org.eclipse.buildship.core.prefs index 15b2bc1a..24ef279f 100644 --- a/bukkit-helper/.settings/org.eclipse.buildship.core.prefs +++ b/bukkit-helper/.settings/org.eclipse.buildship.core.prefs @@ -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 diff --git a/fabric-1.21.7/.gitignore b/fabric-1.21.6/.gitignore similarity index 100% rename from fabric-1.21.7/.gitignore rename to fabric-1.21.6/.gitignore diff --git a/fabric-1.21.7/build.gradle b/fabric-1.21.6/build.gradle similarity index 97% rename from fabric-1.21.7/build.gradle rename to fabric-1.21.6/build.gradle index 5a58b8ab..29a366a9 100644 --- a/fabric-1.21.7/build.gradle +++ b/fabric-1.21.6/build.gradle @@ -8,7 +8,7 @@ group = parent.group eclipse { project { - name = "Dynmap(Fabric-1.21.7)" + name = "Dynmap(Fabric-1.21.6)" } } diff --git a/fabric-1.21.6/gradle.properties b/fabric-1.21.6/gradle.properties new file mode 100644 index 00000000..fea2c1bf --- /dev/null +++ b/fabric-1.21.6/gradle.properties @@ -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 diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/DynmapMod.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/DynmapMod.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/DynmapMod.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/DynmapMod.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/DynmapPlugin.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/DynmapPlugin.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/DynmapPlugin.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/DynmapPlugin.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/FabricAdapter.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/FabricAdapter.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/FabricAdapter.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/FabricAdapter.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/FabricCommandSender.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/FabricCommandSender.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/FabricCommandSender.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/FabricCommandSender.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/FabricLogger.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/FabricLogger.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/FabricLogger.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/FabricLogger.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/FabricMapChunkCache.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/FabricMapChunkCache.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/FabricMapChunkCache.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/FabricMapChunkCache.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/FabricPlayer.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/FabricPlayer.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/FabricPlayer.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/FabricPlayer.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/FabricServer.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/FabricServer.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/FabricServer.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/FabricServer.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/FabricWorld.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/FabricWorld.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/FabricWorld.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/FabricWorld.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/NBT.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/NBT.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/NBT.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/NBT.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/TaskRecord.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/TaskRecord.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/TaskRecord.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/TaskRecord.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/VersionCheck.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/VersionCheck.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/VersionCheck.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/VersionCheck.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/access/ProtoChunkAccessor.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/access/ProtoChunkAccessor.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/access/ProtoChunkAccessor.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/access/ProtoChunkAccessor.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/command/DmapCommand.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/command/DmapCommand.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/command/DmapCommand.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/command/DmapCommand.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/command/DmarkerCommand.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/command/DmarkerCommand.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/command/DmarkerCommand.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/command/DmarkerCommand.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/command/DynmapCommand.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/command/DynmapCommand.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/command/DynmapCommand.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/command/DynmapCommand.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/command/DynmapCommandExecutor.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/command/DynmapCommandExecutor.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/command/DynmapCommandExecutor.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/command/DynmapCommandExecutor.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/command/DynmapExpCommand.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/command/DynmapExpCommand.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/command/DynmapExpCommand.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/command/DynmapExpCommand.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/event/BlockEvents.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/event/BlockEvents.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/event/BlockEvents.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/event/BlockEvents.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/event/CustomServerChunkEvents.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/event/CustomServerChunkEvents.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/event/CustomServerChunkEvents.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/event/CustomServerChunkEvents.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/event/CustomServerLifecycleEvents.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/event/CustomServerLifecycleEvents.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/event/CustomServerLifecycleEvents.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/event/CustomServerLifecycleEvents.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/event/PlayerEvents.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/event/PlayerEvents.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/event/PlayerEvents.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/event/PlayerEvents.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/event/ServerChatEvents.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/event/ServerChatEvents.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/event/ServerChatEvents.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/event/ServerChatEvents.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/mixin/BiomeEffectsAccessor.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/mixin/BiomeEffectsAccessor.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/mixin/BiomeEffectsAccessor.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/mixin/BiomeEffectsAccessor.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/mixin/ChunkGeneratingMixin.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/mixin/ChunkGeneratingMixin.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/mixin/ChunkGeneratingMixin.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/mixin/ChunkGeneratingMixin.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/mixin/MinecraftServerMixin.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/mixin/MinecraftServerMixin.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/mixin/MinecraftServerMixin.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/mixin/MinecraftServerMixin.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/mixin/PlayerManagerMixin.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/mixin/PlayerManagerMixin.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/mixin/PlayerManagerMixin.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/mixin/PlayerManagerMixin.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/mixin/ProtoChunkMixin.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/mixin/ProtoChunkMixin.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/mixin/ProtoChunkMixin.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/mixin/ProtoChunkMixin.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/mixin/ServerPlayNetworkHandlerMixin.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/mixin/ServerPlayNetworkHandlerMixin.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/mixin/ServerPlayNetworkHandlerMixin.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/mixin/ServerPlayNetworkHandlerMixin.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/mixin/ServerPlayerEntityMixin.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/mixin/ServerPlayerEntityMixin.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/mixin/ServerPlayerEntityMixin.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/mixin/ServerPlayerEntityMixin.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/mixin/WorldChunkMixin.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/mixin/WorldChunkMixin.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/mixin/WorldChunkMixin.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/mixin/WorldChunkMixin.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/permissions/FabricPermissions.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/permissions/FabricPermissions.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/permissions/FabricPermissions.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/permissions/FabricPermissions.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/permissions/FilePermissions.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/permissions/FilePermissions.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/permissions/FilePermissions.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/permissions/FilePermissions.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/permissions/LuckPermissions.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/permissions/LuckPermissions.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/permissions/LuckPermissions.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/permissions/LuckPermissions.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/permissions/OpPermissions.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/permissions/OpPermissions.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/permissions/OpPermissions.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/permissions/OpPermissions.java diff --git a/fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/permissions/PermissionProvider.java b/fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/permissions/PermissionProvider.java similarity index 100% rename from fabric-1.21.7/src/main/java/org/dynmap/fabric_1_21_7/permissions/PermissionProvider.java rename to fabric-1.21.6/src/main/java/org/dynmap/fabric_1_21_7/permissions/PermissionProvider.java diff --git a/fabric-1.21.7/src/main/resources/assets/dynmap/icon.png b/fabric-1.21.6/src/main/resources/assets/dynmap/icon.png similarity index 100% rename from fabric-1.21.7/src/main/resources/assets/dynmap/icon.png rename to fabric-1.21.6/src/main/resources/assets/dynmap/icon.png diff --git a/fabric-1.21.7/src/main/resources/configuration.txt b/fabric-1.21.6/src/main/resources/configuration.txt similarity index 100% rename from fabric-1.21.7/src/main/resources/configuration.txt rename to fabric-1.21.6/src/main/resources/configuration.txt diff --git a/fabric-1.21.7/src/main/resources/dynmap.accesswidener b/fabric-1.21.6/src/main/resources/dynmap.accesswidener similarity index 100% rename from fabric-1.21.7/src/main/resources/dynmap.accesswidener rename to fabric-1.21.6/src/main/resources/dynmap.accesswidener diff --git a/fabric-1.21.7/src/main/resources/dynmap.mixins.json b/fabric-1.21.6/src/main/resources/dynmap.mixins.json similarity index 100% rename from fabric-1.21.7/src/main/resources/dynmap.mixins.json rename to fabric-1.21.6/src/main/resources/dynmap.mixins.json diff --git a/fabric-1.21.7/src/main/resources/fabric.mod.json b/fabric-1.21.6/src/main/resources/fabric.mod.json similarity index 95% rename from fabric-1.21.7/src/main/resources/fabric.mod.json rename to fabric-1.21.6/src/main/resources/fabric.mod.json index d099cbdd..42c4929e 100644 --- a/fabric-1.21.7/src/main/resources/fabric.mod.json +++ b/fabric-1.21.6/src/main/resources/fabric.mod.json @@ -29,6 +29,6 @@ "depends": { "fabricloader": ">=0.16.9", "fabric": ">=0.108.0", - "minecraft": ["1.21.7"] + "minecraft": ["1.21.6","1.21.7"] } } diff --git a/fabric-1.21.7/src/main/resources/permissions.yml.example b/fabric-1.21.6/src/main/resources/permissions.yml.example similarity index 100% rename from fabric-1.21.7/src/main/resources/permissions.yml.example rename to fabric-1.21.6/src/main/resources/permissions.yml.example diff --git a/fabric-1.21.7/gradle.properties b/fabric-1.21.7/gradle.properties deleted file mode 100644 index 25caa5a5..00000000 --- a/fabric-1.21.7/gradle.properties +++ /dev/null @@ -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 diff --git a/settings.gradle b/settings.gradle index 7a2b7948..4e3557ce 100644 --- a/settings.gradle +++ b/settings.gradle @@ -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 diff --git a/spigot/build.gradle b/spigot/build.gradle index 31775675..824a5687 100644 --- a/spigot/build.gradle +++ b/spigot/build.gradle @@ -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' diff --git a/spigot/src/main/java/org/dynmap/bukkit/Helper.java b/spigot/src/main/java/org/dynmap/bukkit/Helper.java index 45840f9f..9eaf0cd1 100644 --- a/spigot/src/main/java/org/dynmap/bukkit/Helper.java +++ b/spigot/src/main/java/org/dynmap/bukkit/Helper.java @@ -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");