From 6a85dcddf7e5993d7fb8a32ac8943162f7ad0ff9 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Wed, 9 Jul 2025 00:08:41 -0400 Subject: [PATCH] Add missing textures, shift to 1.21.6 and 1.21.7 --- .../block/dried_ghast_hydration_0_bottom.png | Bin 0 -> 117 bytes .../block/dried_ghast_hydration_0_east.png | Bin 0 -> 139 bytes .../block/dried_ghast_hydration_0_north.png | Bin 0 -> 153 bytes .../block/dried_ghast_hydration_0_south.png | Bin 0 -> 135 bytes .../block/dried_ghast_hydration_0_tentacles.png | Bin 0 -> 142 bytes .../block/dried_ghast_hydration_0_top.png | Bin 0 -> 139 bytes .../block/dried_ghast_hydration_0_west.png | Bin 0 -> 136 bytes .../block/dried_ghast_hydration_1_bottom.png | Bin 0 -> 120 bytes .../block/dried_ghast_hydration_1_east.png | Bin 0 -> 146 bytes .../block/dried_ghast_hydration_1_north.png | Bin 0 -> 151 bytes .../block/dried_ghast_hydration_1_south.png | Bin 0 -> 156 bytes .../block/dried_ghast_hydration_1_tentacles.png | Bin 0 -> 142 bytes .../block/dried_ghast_hydration_1_top.png | Bin 0 -> 161 bytes .../block/dried_ghast_hydration_1_west.png | Bin 0 -> 147 bytes .../block/dried_ghast_hydration_2_bottom.png | Bin 0 -> 120 bytes .../block/dried_ghast_hydration_2_east.png | Bin 0 -> 146 bytes .../block/dried_ghast_hydration_2_north.png | Bin 0 -> 152 bytes .../block/dried_ghast_hydration_2_south.png | Bin 0 -> 155 bytes .../block/dried_ghast_hydration_2_tentacles.png | Bin 0 -> 142 bytes .../block/dried_ghast_hydration_2_top.png | Bin 0 -> 161 bytes .../block/dried_ghast_hydration_2_west.png | Bin 0 -> 147 bytes .../block/dried_ghast_hydration_3_bottom.png | Bin 0 -> 120 bytes .../block/dried_ghast_hydration_3_east.png | Bin 0 -> 140 bytes .../block/dried_ghast_hydration_3_north.png | Bin 0 -> 150 bytes .../block/dried_ghast_hydration_3_south.png | Bin 0 -> 152 bytes .../block/dried_ghast_hydration_3_tentacles.png | Bin 0 -> 142 bytes .../block/dried_ghast_hydration_3_top.png | Bin 0 -> 155 bytes .../block/dried_ghast_hydration_3_west.png | Bin 0 -> 139 bytes .../textures/block/dried_kelp_bottom.png | Bin 241 -> 224 bytes .../textures/block/dried_kelp_side.png | Bin 233 -> 223 bytes .../minecraft/textures/block/dried_kelp_top.png | Bin 238 -> 222 bytes .../.gitignore | 0 .../build.gradle | 0 .../v121_6/BukkitVersionHelperSpigot121_6.java | 6 +++--- .../helper/v121_6/MapChunkCache121_6.java | 6 +++--- .../org/dynmap/bukkit/helper/v121_6}/NBT.java | 2 +- .../.settings/org.eclipse.buildship.core.prefs | 2 +- {fabric-1.21.7 => fabric-1.21.6}/.gitignore | 0 {fabric-1.21.7 => fabric-1.21.6}/build.gradle | 2 +- fabric-1.21.6/gradle.properties | 6 ++++++ .../org/dynmap/fabric_1_21_7/DynmapMod.java | 0 .../org/dynmap/fabric_1_21_7/DynmapPlugin.java | 0 .../org/dynmap/fabric_1_21_7/FabricAdapter.java | 0 .../fabric_1_21_7/FabricCommandSender.java | 0 .../org/dynmap/fabric_1_21_7/FabricLogger.java | 0 .../fabric_1_21_7/FabricMapChunkCache.java | 0 .../org/dynmap/fabric_1_21_7/FabricPlayer.java | 0 .../org/dynmap/fabric_1_21_7/FabricServer.java | 0 .../org/dynmap/fabric_1_21_7/FabricWorld.java | 0 .../main/java/org/dynmap/fabric_1_21_7/NBT.java | 0 .../org/dynmap/fabric_1_21_7/TaskRecord.java | 0 .../org/dynmap/fabric_1_21_7/VersionCheck.java | 0 .../access/ProtoChunkAccessor.java | 0 .../fabric_1_21_7/command/DmapCommand.java | 0 .../fabric_1_21_7/command/DmarkerCommand.java | 0 .../fabric_1_21_7/command/DynmapCommand.java | 0 .../command/DynmapCommandExecutor.java | 0 .../fabric_1_21_7/command/DynmapExpCommand.java | 0 .../dynmap/fabric_1_21_7/event/BlockEvents.java | 0 .../event/CustomServerChunkEvents.java | 0 .../event/CustomServerLifecycleEvents.java | 0 .../fabric_1_21_7/event/PlayerEvents.java | 0 .../fabric_1_21_7/event/ServerChatEvents.java | 0 .../mixin/BiomeEffectsAccessor.java | 0 .../mixin/ChunkGeneratingMixin.java | 0 .../mixin/MinecraftServerMixin.java | 0 .../fabric_1_21_7/mixin/PlayerManagerMixin.java | 0 .../fabric_1_21_7/mixin/ProtoChunkMixin.java | 0 .../mixin/ServerPlayNetworkHandlerMixin.java | 0 .../mixin/ServerPlayerEntityMixin.java | 0 .../fabric_1_21_7/mixin/WorldChunkMixin.java | 0 .../permissions/FabricPermissions.java | 0 .../permissions/FilePermissions.java | 0 .../permissions/LuckPermissions.java | 0 .../permissions/OpPermissions.java | 0 .../permissions/PermissionProvider.java | 0 .../src/main/resources/assets/dynmap/icon.png | Bin .../src/main/resources/configuration.txt | 0 .../src/main/resources/dynmap.accesswidener | 0 .../src/main/resources/dynmap.mixins.json | 0 .../src/main/resources/fabric.mod.json | 2 +- .../src/main/resources/permissions.yml.example | 0 fabric-1.21.7/gradle.properties | 6 ------ settings.gradle | 8 ++++---- spigot/build.gradle | 4 ++-- .../src/main/java/org/dynmap/bukkit/Helper.java | 8 ++++---- 86 files changed, 26 insertions(+), 26 deletions(-) create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_bottom.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_east.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_north.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_south.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_tentacles.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_top.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_0_west.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_bottom.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_east.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_north.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_south.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_tentacles.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_top.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_1_west.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_bottom.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_east.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_north.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_south.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_tentacles.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_top.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_2_west.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_bottom.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_east.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_north.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_south.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_tentacles.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_top.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dried_ghast_hydration_3_west.png rename {bukkit-helper-121-7 => bukkit-helper-121-6}/.gitignore (100%) rename {bukkit-helper-121-7 => bukkit-helper-121-6}/build.gradle (100%) rename bukkit-helper-121-7/src/main/java/org/dynmap/bukkit/helper/v121_7/BukkitVersionHelperSpigot121_7.java => bukkit-helper-121-6/src/main/java/org/dynmap/bukkit/helper/v121_6/BukkitVersionHelperSpigot121_6.java (98%) rename bukkit-helper-121-7/src/main/java/org/dynmap/bukkit/helper/v121_7/MapChunkCache121_7.java => bukkit-helper-121-6/src/main/java/org/dynmap/bukkit/helper/v121_6/MapChunkCache121_6.java (96%) rename {bukkit-helper-121-7/src/main/java/org/dynmap/bukkit/helper/v121_7 => bukkit-helper-121-6/src/main/java/org/dynmap/bukkit/helper/v121_6}/NBT.java (98%) rename {fabric-1.21.7 => fabric-1.21.6}/.gitignore (100%) rename {fabric-1.21.7 => fabric-1.21.6}/build.gradle (97%) create mode 100644 fabric-1.21.6/gradle.properties rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/DynmapMod.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/DynmapPlugin.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/FabricAdapter.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/FabricCommandSender.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/FabricLogger.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/FabricMapChunkCache.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/FabricPlayer.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/FabricServer.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/FabricWorld.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/NBT.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/TaskRecord.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/VersionCheck.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/access/ProtoChunkAccessor.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/command/DmapCommand.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/command/DmarkerCommand.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/command/DynmapCommand.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/command/DynmapCommandExecutor.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/command/DynmapExpCommand.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/event/BlockEvents.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/event/CustomServerChunkEvents.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/event/CustomServerLifecycleEvents.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/event/PlayerEvents.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/event/ServerChatEvents.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/mixin/BiomeEffectsAccessor.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/mixin/ChunkGeneratingMixin.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/mixin/MinecraftServerMixin.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/mixin/PlayerManagerMixin.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/mixin/ProtoChunkMixin.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/mixin/ServerPlayNetworkHandlerMixin.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/mixin/ServerPlayerEntityMixin.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/mixin/WorldChunkMixin.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/permissions/FabricPermissions.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/permissions/FilePermissions.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/permissions/LuckPermissions.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/permissions/OpPermissions.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/java/org/dynmap/fabric_1_21_7/permissions/PermissionProvider.java (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/resources/assets/dynmap/icon.png (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/resources/configuration.txt (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/resources/dynmap.accesswidener (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/resources/dynmap.mixins.json (100%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/resources/fabric.mod.json (95%) rename {fabric-1.21.7 => fabric-1.21.6}/src/main/resources/permissions.yml.example (100%) delete mode 100644 fabric-1.21.7/gradle.properties 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 0000000000000000000000000000000000000000..2b123fa61c9d24a14612aae89e9d85ee40749af6 GIT binary patch literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|u5}17bFPqrY7(tCL}zFVpUlZX1PF6fU`qrLXv{wfriNp47*i0!@U+(Ujb@i N@O1TaS?83{1OQ|TAH@Iw literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..46c77d78ba07381b94411259a563bd3cd310e218 GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-uIuK^ncLsr)X-2^P~i5| zYdcWf%G1R$q~ca`f@oqwLI7`RLIQ_BFK=qVS7xDw!kfYjJEEA5Ug3N9|GWZIlBX3@ kWRD&Xk3*BGh&m%fUl6~#^!~+{fu=Bcy85}Sb4q9e01#a$NB{r; literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..203abe56a76dffb323e0feba3431034f63682875 GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!P=HT}>)ihSb#vwv78JOw1!IFxN zBHnzB6C?HSHr-vlV0P$(7bl{W^CzfQ{BVt_;bb^<-FVF_plJ-Au6{1-oD!Mgf)pC<_Qc;%h)uUH@0P8w-QMHx{5tOutjQtNDPZFZwOZ+pVL|G o9eN54D;Sw(a9ojTJIKMX>%64vRLxr@K!X@OUHx3vIVCg!0JpCy@c;k- literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b1b0ca6615fca4aa5cd05ba23ab066d2b16c8d78 GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-uIuK^ncLsr)X-2^P~i5| zYdcWf%G1R$q~cccgEu(|2^02KH#91Kdv`UU?MAhO)4RG1jpjc!>}+i>EEE*QI8|Jn k8(9`}Fn1*I9`$5kP;cY6nZTp)3up?1r>mdKI;Vst08S+=&Hw-a literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..129503a346eaf8ac0a65614791091de9a34b68da GIT binary patch literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-uIuK^ncLsr)X-2^P~i5| zYdcWf+|$J|q~ca`LP=^uf&g!BLITHJNvTr;x?Cx~9;};=^jR4g*lc7eI?C4+k>t=6 g*uvzopr0Hg&dI{*Lx literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ed74597ccc1c508930f49900af05de704657b807 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-t{ayxpEYAfPghrKQ`6}s z8Vi8p>Ygr+Ar-fh3lao)QxkX+6A~W$V^?|d-+F RT7X&@JYD@<);T3K0RVXUBFO*% literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5c147ec4d262ec25944ecbea087cf6828af235b5 GIT binary patch literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJe}GSj>&E5F4{qAj)73R&+O%0S zX3TtOs1B5}^K@|xskpWE)JEP01Azkvia-56?<45i#JJ%mQ%HZEU2cg~!io}Qxo z{Me|d9U`yQfU*vrE{-7;x3=~;@--MR914^8|9{iWNSEGlX+4vcjR{Yid|AcTIZT`2 yx?EqVd2+11*aDXe=cYV+JgM;ix(83h3mMXw7&E5FTbr7Cy1Hh~m@#A8 zw1b;AsjgGV0?N92x;TbZ+}hfEke9)b<1kO=xA>nWOtbP0l+XkK Dby_uu literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d015e5175ea2e1410ffaf3cf3198efa4bdc166d4 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^*PgDfgPS&OT)uq9v}xNW zX&M8?Z9QEaLn>}1C#*^IFi&7$TE?c)ys<6&x|Klk*H!ERf-O=DL}FNcc|*7o`JB#b o@6c0dSi#6NgX4-!+d&S7UFRiTr)u6R0UE^M>FVdQ&MBb@0HZZ3nE(I) literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..07ca827b9751c2f4569614bff044a61afb937056 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!M1W6->%mQ%HZEVjX3?TqGiT14 zF=NKGX+2$CtxZjA<-e?fYFs>B978H@Z9Q|4_kaP1bKrlWM}N)NxwyPwGTrw>cET19 z)rEY&@7(2`V{(M`p}{?a2d!uSM6j_-oqWaMA1Z9}nLDJeQT$RDqmi^cgCfv822WQ% Jmvv4FO#rpkIiLUl literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..dca444199e69f4d65ad6377579427f60c5a02653 GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJe}GSj>%mQ%HZEU2YsQQj)28)w zb>(meHUg#WJzX3_DsF8(<;Zowf#%@$Gm9UaH05lnlgiHq+IFy2&)SwSrV!e u;#_a&FP}QKeCg8lYu9ex zxY6#2#y_Bxou`XqNX4zKr#A977zi9VQ2golc^^U7CdM6?HYx4e!YI3eXC2$xk7lRr uO4|8)BU9Hqf3eLub!V|s?0SYjLUJ|f3>TLl`fms{iNVv=&t;ucLK6U_kv3!i literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7de7c05ee8cdcb03e26aaa90d5f3e43ba61f60cd GIT binary patch literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Xn;?M>*Z6Yj_u#SbH|R&8#gXr zx^(WeX|YjJS?6aw0V=Tbba4!+xV81HBNu}Lhs(vEOYi+ZF;T?h;->c1fik{Na&*o& zADqJ@Rw`NY}V*8@#r@O1TaS?83{1OQfS BI*Z6Yj_u#SdE>_QYu7Gc zx^(WeY0pB}OaRKdc)B=-RNUIzdytpGkmK+phTrRJRy_z%Um?iP!!_w+=9kGLu2Ie+ zvCR?>GnN=XD_yA4m}2a+`gOPAL9RC5sRD1F_5NVklg6kJ`Tfcwpm_|Qu6{1-oD!M< DehxWw literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fbaee6f95b727d2ff7e566360b4551d920d18b36 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^*X2u>UOsi|*#7;SH*P$4 z${M85*3-o?q~ca`!kR=6^8^N_Wo#PF8{4w4TL~n8UBw*Z6Yj_u#ScgvQ|n>KCU zxN-g3wab?-ojYxsZAn`lP>qYHi(^Q|t*vJc@*XhYa1Q)0^yshoIv1B0Os4yO$WGYe zp}LUo_no`Eb4-q~J~X&z@SyeVp9nT~sgti5{6mFJK68iEHHu&AVlhdavv literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c9dcd2c8207e0b514f80aa90614e329eed42c8c4 GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJe}GSj>*Z6Yj_u#SdE>_QYu7Gc zy40?J?MI-Ly{C&~NX4zKryRKsIPe^HIC=8_{g@YR8!i+-Pg7=ajg%{WA7ORDBuhe7 vLVUKtu9m)sGn!U+EKt=6{2{lm&QdPv3d5S(6?Wx7qZmA0{an^LB{Ts5?I$)o literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b1002283c8708d7142d46658a9a775428aeb1997 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-t{*;pc=G7c-CMVAojPUW z`{)!fF{I*FazTOsZ)yThVnV`$f9xtx{#!2)6yWR-nvkTRc%Wf21B0FccP58e RLkmy~gQu&X%Q~loCIEK~CPV-L literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7a9f56fa045b03f150733a2a8ca337eaa6378a56 GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-u0MbN{P5w!lShy4-nw<< z919Cj+}hK{F{I*Fa)M}LLV^KrX+i>rKQC`;z*lCWg~G4?8+Sx89lgT$@BeuPrlgZr n@BW`Z@Z!(`29*fsLLr82llh(8G*KYaLb_tvdjr%uhA zF{8M+_~}ZI$3R(oPZ!6Kid$RH7z!~c@;F_rnescn(mmbx$~|+F00Cy@&Ujwm1#V@A xovL};9LnO3@$R~^&}!3p@1+0h8eg9Lz!+b_usOsf<0sH422WQ%mvv4FO#s2+I6eRX literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6496d6a87c3cd9fac292a4dabfed1e88652605b3 GIT binary patch literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJe}GSj>(8G*KYaM`FVdQ&MBb@0NBSn A5&!@I literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..bde1eaec4b0582902226641acac39779fdb62c92 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^*SoiF{rvg!!-o$~9zD`K zIY$L3ZtLmd7*cU7Ibltrhj{`6(=s-V=8bLH*R2GSzpi2r5NwfJAQHpk%NxR#$meuc odxxGv!wN>G85~z++75Cs>^d*$I#u&l3D6)0Pgg&ebxsLQ0Po8#7ytkO literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d7f8be7c003f434ca33606946759c4f0c724f70d GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VW{rU6fhYuf~K6&!w(WAS! zZrwU{iXk&(H&E8a)5S5Q;#P8kK}kVK0t1tqySqEPfb#`G4i;8cM;>*9Wzopr0P+|w AfdBvi literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..32f239cd628d182f3eafcda5da7a5fafb093df75 GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-u0MbN{P5w!lShy4-nw<< z919Cj+{)9%F{I*FazaUJLV^IV?STUVR^}#C6r;8@Ha>LHnxI;C1<2@DouFMNaH2|y jPesC2!ht1Q!;gufuabAE<%b?VpeYQVu6{1-oD!M<=_oDu literal 0 HcmV?d00001 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 32c3d67197d96d6f6768ab2fe390e4dcb78ae453..d40eaf8b13bf507b3bf6c80af113e9c3b3a2abcc 100644 GIT binary patch delta 208 zcmV;>05AXX0pJ0U7=H)@0000eEe}%w001gbOjJcII3Oc07Z@EB9VZf*mVS_qc8P~^ z6&MkKerXUC4k#)eBrO{=JuN^=IM4@E>i_@%aY;l$RCwAA!U;;m01yPgnogEg;{5-i z0YN<4ElS?Q#5s8x>6Zm)Es33YOfqJoh7yGgWekc`-9W8oF-abHTvv1XIF8rMdBkqa zNrYdc)EbWG^E|REaznq(A3~ylx>d0FVJHD8sMPRQ!wmtS6z~rMKqLuC*_ssq0000< KMNUMnLSTZTrb|`; delta 225 zcmV<703QF~0r3Hl7=Hu<0002(-QrRJ001gbOjJdgmVS_qc8P~^fPQH}N;oq;Ei5=7 zBQF;uEgL8*9UUhU7#$Q97!eQ@4td(ky8r+Hf=NU{RCwAI%FPV{Q51&Z_kPSqA~|Sa zrUIdYSlZCZ}HBwBz|lB>hW1NDJ8=s}jL z4M!eJ$SMDaF|C%v*}QmlkLx0!%I=eArrB+8qqaGyB>0#DtsRJE6zQk#5rBg$T8btR bd~o0kHcBpq+Bl5T00000NkvXXu0mjf9s^q| 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 473eb5c512688f3b1a4895da6a5a534cbd501926..3cbdbe7515aa768f56b6eb41bfb3607e5f5576f6 100644 GIT binary patch delta 207 zcmV;=05JdQ0p9_T7=H)@0000eEe}%w001FSOjJc9FBcOb6Br#7frfLCmVg@~6(}kl z6&e#PI3OuC9Uv+e$NBhF0001aNklu4VP5P=NDM)Nv^0EPg-cA3$wryMV zZsQYR8&%ytbz8#5-Q5?q0VHYC7j+|S(DwZ(a>t)0=}X!s{Rdt_1fk2iIjjHx002ov JPDHLkV1gpdPhbE5 delta 217 zcmV;~04D$60qFsd7=Hu<0002(-QrRJ001FSOjJdXmVkkVb1XO@DK#A`xvj*pAo!w2a znCB&WLeR_jtXboIuus{*M6Z!Sx6@bFt3w;vOrlqEl66nqEIUe@#j%LXrc T89Pp=00000NkvXXu0mjfzrR(J 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 18221d4392ff611c9c231c57a20817a05ac160f6..b6d59c276889895f6d82b25f86f44f16800cdfe9 100644 GIT binary patch delta 153 zcmV;K0A~O00p040@KO0H>i~>$4 z%Ul%-(S4kW0azh~XgxX`5W1j_ zY(M@uw6e$ili41Q*J)EXdfjicYO(HpMU1?kUs>qD$tgP8h#{W|g9lkE3pZ#ZfLawJ X$0#Y2aOBF600000NkvXXu0mjfmA^$n 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");