From eff2f7c512a7bcc6461d30c06042ba463f129995 Mon Sep 17 00:00:00 2001 From: Kosma Moczek Date: Tue, 14 May 2024 14:23:51 +0200 Subject: [PATCH 1/5] fabric-1.20.6: copy from 1.20.4 --- fabric-1.20.6/.gitignore | 32 + fabric-1.20.6/build.gradle | 73 ++ fabric-1.20.6/gradle.properties | 4 + .../org/dynmap/fabric_1_20_4/DynmapMod.java | 50 ++ .../dynmap/fabric_1_20_4/DynmapPlugin.java | 796 ++++++++++++++++++ .../dynmap/fabric_1_20_4/FabricAdapter.java | 13 + .../fabric_1_20_4/FabricCommandSender.java | 45 + .../dynmap/fabric_1_20_4/FabricLogger.java | 49 ++ .../fabric_1_20_4/FabricMapChunkCache.java | 116 +++ .../dynmap/fabric_1_20_4/FabricPlayer.java | 260 ++++++ .../dynmap/fabric_1_20_4/FabricServer.java | 609 ++++++++++++++ .../org/dynmap/fabric_1_20_4/FabricWorld.java | 236 ++++++ .../java/org/dynmap/fabric_1_20_4/NBT.java | 126 +++ .../org/dynmap/fabric_1_20_4/TaskRecord.java | 38 + .../dynmap/fabric_1_20_4/VersionCheck.java | 98 +++ .../access/ProtoChunkAccessor.java | 5 + .../fabric_1_20_4/command/DmapCommand.java | 9 + .../fabric_1_20_4/command/DmarkerCommand.java | 9 + .../fabric_1_20_4/command/DynmapCommand.java | 9 + .../command/DynmapCommandExecutor.java | 64 ++ .../command/DynmapExpCommand.java | 9 + .../fabric_1_20_4/event/BlockEvents.java | 39 + .../event/CustomServerChunkEvents.java | 21 + .../event/CustomServerLifecycleEvents.java | 14 + .../fabric_1_20_4/event/PlayerEvents.java | 62 ++ .../fabric_1_20_4/event/ServerChatEvents.java | 23 + .../mixin/BiomeEffectsAccessor.java | 11 + .../mixin/MinecraftServerMixin.java | 17 + .../mixin/PlayerManagerMixin.java | 31 + .../fabric_1_20_4/mixin/ProtoChunkMixin.java | 31 + .../mixin/ServerPlayNetworkHandlerMixin.java | 74 ++ .../mixin/ServerPlayerEntityMixin.java | 31 + .../mixin/ThreadedAnvilChunkStorageMixin.java | 33 + .../fabric_1_20_4/mixin/WorldChunkMixin.java | 26 + .../permissions/FabricPermissions.java | 47 ++ .../permissions/FilePermissions.java | 103 +++ .../permissions/LuckPermissions.java | 102 +++ .../permissions/OpPermissions.java | 52 ++ .../permissions/PermissionProvider.java | 16 + .../src/main/resources/assets/dynmap/icon.png | Bin 0 -> 34043 bytes .../src/main/resources/configuration.txt | 498 +++++++++++ .../src/main/resources/dynmap.accesswidener | 3 + .../src/main/resources/dynmap.mixins.json | 19 + .../src/main/resources/fabric.mod.json | 34 + .../main/resources/permissions.yml.example | 27 + 45 files changed, 3964 insertions(+) create mode 100644 fabric-1.20.6/.gitignore create mode 100644 fabric-1.20.6/build.gradle create mode 100644 fabric-1.20.6/gradle.properties create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/DynmapMod.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/DynmapPlugin.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricAdapter.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricCommandSender.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricLogger.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricMapChunkCache.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricPlayer.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricServer.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricWorld.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/NBT.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/TaskRecord.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/VersionCheck.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/access/ProtoChunkAccessor.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DmapCommand.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DmarkerCommand.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapCommand.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapCommandExecutor.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapExpCommand.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/BlockEvents.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/CustomServerChunkEvents.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/CustomServerLifecycleEvents.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/PlayerEvents.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/ServerChatEvents.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/BiomeEffectsAccessor.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/MinecraftServerMixin.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/PlayerManagerMixin.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ProtoChunkMixin.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ServerPlayNetworkHandlerMixin.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ServerPlayerEntityMixin.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ThreadedAnvilChunkStorageMixin.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/WorldChunkMixin.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/FabricPermissions.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/FilePermissions.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/LuckPermissions.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/OpPermissions.java create mode 100644 fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/PermissionProvider.java create mode 100644 fabric-1.20.6/src/main/resources/assets/dynmap/icon.png create mode 100644 fabric-1.20.6/src/main/resources/configuration.txt create mode 100644 fabric-1.20.6/src/main/resources/dynmap.accesswidener create mode 100644 fabric-1.20.6/src/main/resources/dynmap.mixins.json create mode 100644 fabric-1.20.6/src/main/resources/fabric.mod.json create mode 100644 fabric-1.20.6/src/main/resources/permissions.yml.example diff --git a/fabric-1.20.6/.gitignore b/fabric-1.20.6/.gitignore new file mode 100644 index 000000000..8b87af68e --- /dev/null +++ b/fabric-1.20.6/.gitignore @@ -0,0 +1,32 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# eclipse + +*.launch + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# fabric + +run/ + +# other +*.log diff --git a/fabric-1.20.6/build.gradle b/fabric-1.20.6/build.gradle new file mode 100644 index 000000000..8e0752415 --- /dev/null +++ b/fabric-1.20.6/build.gradle @@ -0,0 +1,73 @@ +plugins { + id 'fabric-loom' version '1.1.10' +} + +archivesBaseName = "Dynmap" +version = parent.version +group = parent.group + +eclipse { + project { + name = "Dynmap(Fabric-1.20.4)" + } +} + +sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly. + +configurations { + shadow + implementation.extendsFrom(shadow) +} + +repositories { + mavenCentral() + maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } +} + +dependencies { + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + + compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2' + + shadow project(path: ':DynmapCore', configuration: 'shadow') + + modCompileOnly "me.lucko:fabric-permissions-api:0.1-SNAPSHOT" + compileOnly 'net.luckperms:api:5.4' +} + +loom { + accessWidenerPath = file("src/main/resources/dynmap.accesswidener") +} + +processResources { + filesMatching('fabric.mod.json') { + expand "version": project.version + } +} + +java { + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() +} + +jar { + from "LICENSE" + from { + configurations.shadow.collect { it.toString().contains("guava") ? null : it.isDirectory() ? it : zipTree(it) } + } +} + +remapJar { + archiveFileName = "${archivesBaseName}-${project.version}-fabric-${project.minecraft_version}.jar" + destinationDirectory = file '../target' +} + +remapJar.doLast { + task -> + ant.checksum file: task.archivePath +} diff --git a/fabric-1.20.6/gradle.properties b/fabric-1.20.6/gradle.properties new file mode 100644 index 000000000..2b665a9ac --- /dev/null +++ b/fabric-1.20.6/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=1.20.4 +yarn_mappings=1.20.4+build.1 +loader_version=0.15.2 +fabric_version=0.91.2+1.20.4 diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/DynmapMod.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/DynmapMod.java new file mode 100644 index 000000000..dd89f6b6e --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/DynmapMod.java @@ -0,0 +1,50 @@ +package org.dynmap.fabric_1_20_4; + +import net.fabricmc.api.ModInitializer; +import net.fabricmc.loader.api.FabricLoader; +import net.fabricmc.loader.api.ModContainer; +import org.dynmap.DynmapCore; +import org.dynmap.Log; + +import java.io.File; +import java.net.URISyntaxException; +import java.nio.file.Path; +import java.nio.file.Paths; + +public class DynmapMod implements ModInitializer { + private static final String MODID = "dynmap"; + private static final ModContainer MOD_CONTAINER = FabricLoader.getInstance().getModContainer(MODID) + .orElseThrow(() -> new RuntimeException("Failed to get mod container: " + MODID)); + // The instance of your mod that Fabric uses. + public static DynmapMod instance; + + public static DynmapPlugin plugin; + public static File jarfile; + public static String ver; + public static boolean useforcedchunks; + + @Override + public void onInitialize() { + instance = this; + + Path path = MOD_CONTAINER.getRootPath(); + try { + jarfile = new File(DynmapCore.class.getProtectionDomain().getCodeSource().getLocation().toURI()); + } catch (URISyntaxException e) { + Log.severe("Unable to get DynmapCore jar path", e); + } + + if (path.getFileSystem().provider().getScheme().equals("jar")) { + path = Paths.get(path.getFileSystem().toString()); + jarfile = path.toFile(); + } + + ver = MOD_CONTAINER.getMetadata().getVersion().getFriendlyString(); + + Log.setLogger(new FabricLogger()); + org.dynmap.modsupport.ModSupportImpl.init(); + + // Initialize the plugin, we will enable it fully when the server starts. + plugin = new DynmapPlugin(); + } +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/DynmapPlugin.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/DynmapPlugin.java new file mode 100644 index 000000000..438dc0174 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/DynmapPlugin.java @@ -0,0 +1,796 @@ +package org.dynmap.fabric_1_20_4; + +import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents; +import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.FluidBlock; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.registry.tag.BlockTags; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.Identifier; +import net.minecraft.util.collection.IdList; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.ChunkPos; +import net.minecraft.world.EmptyBlockView; +import net.minecraft.world.World; +import net.minecraft.world.WorldAccess; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.chunk.Chunk; +import net.minecraft.world.chunk.ChunkSection; +import org.dynmap.*; +import org.dynmap.common.BiomeMap; +import org.dynmap.common.DynmapCommandSender; +import org.dynmap.common.DynmapListenerManager; +import org.dynmap.common.DynmapPlayer; +import org.dynmap.common.chunk.GenericChunkCache; +import org.dynmap.fabric_1_20_4.command.DmapCommand; +import org.dynmap.fabric_1_20_4.command.DmarkerCommand; +import org.dynmap.fabric_1_20_4.command.DynmapCommand; +import org.dynmap.fabric_1_20_4.command.DynmapExpCommand; +import org.dynmap.fabric_1_20_4.event.BlockEvents; +import org.dynmap.fabric_1_20_4.event.CustomServerChunkEvents; +import org.dynmap.fabric_1_20_4.event.CustomServerLifecycleEvents; +import org.dynmap.fabric_1_20_4.event.PlayerEvents; +import org.dynmap.fabric_1_20_4.mixin.BiomeEffectsAccessor; +import org.dynmap.fabric_1_20_4.permissions.*; +import org.dynmap.permissions.PermissionsHandler; +import org.dynmap.renderer.DynmapBlockState; + +import java.io.File; +import java.util.*; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.regex.Pattern; + + +public class DynmapPlugin { + // FIXME: Fix package-private fields after splitting is done + DynmapCore core; + private PermissionProvider permissions; + private boolean core_enabled; + public GenericChunkCache sscache; + public PlayerList playerList; + MapManager mapManager; + /** + * Server is set when running and unset at shutdown. + */ + private net.minecraft.server.MinecraftServer server; + public static DynmapPlugin plugin; + ChatHandler chathandler; + private HashMap sortWeights = new HashMap(); + private HashMap worlds = new HashMap(); + private WorldAccess last_world; + private FabricWorld last_fworld; + private Map players = new HashMap(); + private FabricServer fserver; + private boolean tickregistered = false; + // TPS calculator + double tps; + long lasttick; + long avgticklen; + // Per tick limit, in nsec + long perTickLimit = (50000000); // 50 ms + private boolean useSaveFolder = true; + + private static final String[] TRIGGER_DEFAULTS = {"blockupdate", "chunkpopulate", "chunkgenerate"}; + + static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]"); + + DynmapPlugin() { + plugin = this; + // Fabric events persist between server instances + ServerLifecycleEvents.SERVER_STARTING.register(this::serverStart); + CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> registerCommands(dispatcher)); + CustomServerLifecycleEvents.SERVER_STARTED_PRE_WORLD_LOAD.register(this::serverStarted); + ServerLifecycleEvents.SERVER_STOPPING.register(this::serverStop); + } + + int getSortWeight(String name) { + return sortWeights.getOrDefault(name, 0); + } + + void setSortWeight(String name, int wt) { + sortWeights.put(name, wt); + } + + void dropSortWeight(String name) { + sortWeights.remove(name); + } + + public static class BlockUpdateRec { + WorldAccess w; + String wid; + int x, y, z; + } + + ConcurrentLinkedQueue blockupdatequeue = new ConcurrentLinkedQueue(); + + public static DynmapBlockState[] stateByID; + + /** + * Initialize block states (org.dynmap.blockstate.DynmapBlockState) + */ + public void initializeBlockStates() { + stateByID = new DynmapBlockState[512 * 32]; // Simple map - scale as needed + Arrays.fill(stateByID, DynmapBlockState.AIR); // Default to air + + IdList bsids = Block.STATE_IDS; + + DynmapBlockState basebs = null; + Block baseb = null; + int baseidx = 0; + + Iterator iter = bsids.iterator(); + DynmapBlockState.Builder bld = new DynmapBlockState.Builder(); + while (iter.hasNext()) { + BlockState bs = iter.next(); + int idx = bsids.getRawId(bs); + if (idx >= stateByID.length) { + int plen = stateByID.length; + stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10% + Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR); + } + Block b = bs.getBlock(); + // If this is new block vs last, it's the base block state + if (b != baseb) { + basebs = null; + baseidx = idx; + baseb = b; + } + + Identifier ui = Registries.BLOCK.getId(b); + if (ui == null) { + continue; + } + String bn = ui.getNamespace() + ":" + ui.getPath(); + // Only do defined names, and not "air" + if (!bn.equals(DynmapBlockState.AIR_BLOCK)) { + String statename = ""; + for (net.minecraft.state.property.Property p : bs.getProperties()) { + if (statename.length() > 0) { + statename += ","; + } + statename += p.getName() + "=" + bs.get(p).toString(); + } + int lightAtten = bs.isOpaqueFullCube(EmptyBlockView.INSTANCE, BlockPos.ORIGIN) ? 15 : (bs.isTransparent(EmptyBlockView.INSTANCE, BlockPos.ORIGIN) ? 0 : 1); + //Log.info("statename=" + bn + "[" + statename + "], lightAtten=" + lightAtten); + // Fill in base attributes + bld.setBaseState(basebs).setStateIndex(idx - baseidx).setBlockName(bn).setStateName(statename).setLegacyBlockID(idx).setAttenuatesLight(lightAtten); + if (bs.getSoundGroup() != null) { bld.setMaterial(bs.getSoundGroup().toString()); } + if (bs.isSolid()) { bld.setSolid(); } + if (bs.isAir()) { bld.setAir(); } + if (bs.isIn(BlockTags.LOGS)) { bld.setLog(); } + if (bs.isIn(BlockTags.LEAVES)) { bld.setLeaves(); } + if ((!bs.getFluidState().isEmpty()) && !(bs.getBlock() instanceof FluidBlock)) { + bld.setWaterlogged(); + } + DynmapBlockState dbs = bld.build(); // Build state + stateByID[idx] = dbs; + if (basebs == null) { basebs = dbs; } + } + } +// for (int gidx = 0; gidx < DynmapBlockState.getGlobalIndexMax(); gidx++) { +// DynmapBlockState bs = DynmapBlockState.getStateByGlobalIndex(gidx); +// Log.info(gidx + ":" + bs.toString() + ", gidx=" + bs.globalStateIndex + ", sidx=" + bs.stateIndex); +// } + } + + public static final Item getItemByID(int id) { + return Item.byRawId(id); + } + + FabricPlayer getOrAddPlayer(ServerPlayerEntity player) { + String name = player.getName().getString(); + FabricPlayer fp = players.get(name); + if (fp != null) { + fp.player = player; + } else { + fp = new FabricPlayer(this, player); + players.put(name, fp); + } + return fp; + } + + static class ChatMessage { + String message; + ServerPlayerEntity sender; + } + + ConcurrentLinkedQueue msgqueue = new ConcurrentLinkedQueue(); + + public static class ChatHandler { + private final DynmapPlugin plugin; + + ChatHandler(DynmapPlugin plugin) { + this.plugin = plugin; + } + + public void handleChat(ServerPlayerEntity player, String message) { + if (!message.startsWith("/")) { + ChatMessage cm = new ChatMessage(); + cm.message = message; + cm.sender = player; + plugin.msgqueue.add(cm); + } + } + } + + public FabricServer getFabricServer() { + return fserver; + } + + private void serverStart(MinecraftServer server) { + // Set the server so we don't NPE during setup + this.server = server; + this.fserver = new FabricServer(this, server); + this.onEnable(); + } + + private void serverStarted(MinecraftServer server) { + this.onStart(); + if (core != null) { + core.serverStarted(); + } + } + + private void serverStop(MinecraftServer server) { + this.onDisable(); + this.server = null; + } + + public boolean isOp(String player) { + String[] ops = server.getPlayerManager().getOpList().getNames(); + + for (String op : ops) { + if (op.equalsIgnoreCase(player)) { + return true; + } + } + + // TODO: Consider whether cheats are enabled for integrated server + return server.isSingleplayer() && server.isHost(server.getPlayerManager().getPlayer(player).getGameProfile()); + } + + boolean hasPerm(PlayerEntity psender, String permission) { + PermissionsHandler ph = PermissionsHandler.getHandler(); + if ((ph != null) && (psender != null) && ph.hasPermission(psender.getName().getString(), permission)) { + return true; + } + return permissions.has(psender, permission); + } + + boolean hasPermNode(PlayerEntity psender, String permission) { + PermissionsHandler ph = PermissionsHandler.getHandler(); + if ((ph != null) && (psender != null) && ph.hasPermissionNode(psender.getName().getString(), permission)) { + return true; + } + return permissions.hasPermissionNode(psender, permission); + } + + Set hasOfflinePermissions(String player, Set perms) { + Set rslt = null; + PermissionsHandler ph = PermissionsHandler.getHandler(); + if (ph != null) { + rslt = ph.hasOfflinePermissions(player, perms); + } + Set rslt2 = hasOfflinePermissions(player, perms); + if ((rslt != null) && (rslt2 != null)) { + Set newrslt = new HashSet(rslt); + newrslt.addAll(rslt2); + rslt = newrslt; + } else if (rslt2 != null) { + rslt = rslt2; + } + return rslt; + } + + boolean hasOfflinePermission(String player, String perm) { + PermissionsHandler ph = PermissionsHandler.getHandler(); + if (ph != null) { + if (ph.hasOfflinePermission(player, perm)) { + return true; + } + } + return permissions.hasOfflinePermission(player, perm); + } + + void setChatHandler(ChatHandler chatHandler) { + plugin.chathandler = chatHandler; + } + + public class TexturesPayload { + public long timestamp; + public String profileId; + public String profileName; + public boolean isPublic; + public Map textures; + + } + + public class ProfileTexture { + public String url; + } + + public void loadExtraBiomes(String mcver) { + int cnt = 0; + BiomeMap.loadWellKnownByVersion(mcver); + + Registry biomeRegistry = getFabricServer().getBiomeRegistry(); + Biome[] list = getFabricServer().getBiomeList(biomeRegistry); + + for (int i = 0; i < list.length; i++) { + Biome bb = list[i]; + if (bb != null) { + String id = biomeRegistry.getId(bb).getPath(); + String rl = biomeRegistry.getId(bb).toString(); + float tmp = bb.getTemperature(), hum = bb.weather.downfall(); + int watermult = ((BiomeEffectsAccessor) bb.getEffects()).getWaterColor(); + Log.verboseinfo("biome[" + i + "]: hum=" + hum + ", tmp=" + tmp + ", mult=" + Integer.toHexString(watermult)); + + BiomeMap bmap = BiomeMap.NULL; + if (rl != null) { // If resource location, lookup by this + bmap = BiomeMap.byBiomeResourceLocation(rl); + } + else { + bmap = BiomeMap.byBiomeID(i); + } + if (bmap.isDefault() || (bmap == BiomeMap.NULL)) { + bmap = new BiomeMap((rl != null) ? BiomeMap.NO_INDEX : i, id, tmp, hum, rl); + Log.verboseinfo("Add custom biome [" + bmap.toString() + "] (" + i + ")"); + cnt++; + } + else { + bmap.setTemperature(tmp); + bmap.setRainfall(hum); + } + if (watermult != -1) { + bmap.setWaterColorMultiplier(watermult); + Log.verboseinfo("Set watercolormult for " + bmap.toString() + " (" + i + ") to " + Integer.toHexString(watermult)); + } + bmap.setBiomeObject(bb); + } + } + if (cnt > 0) + Log.info("Added " + cnt + " custom biome mappings"); + } + + private String[] getBiomeNames() { + Registry biomeRegistry = getFabricServer().getBiomeRegistry(); + Biome[] list = getFabricServer().getBiomeList(biomeRegistry); + String[] lst = new String[list.length]; + for (int i = 0; i < list.length; i++) { + Biome bb = list[i]; + if (bb != null) { + lst[i] = biomeRegistry.getId(bb).getPath(); + } + } + return lst; + } + + public void onEnable() { + /* Get MC version */ + String mcver = server.getVersion(); + + /* Load extra biomes */ + loadExtraBiomes(mcver); + /* Set up player login/quit event handler */ + registerPlayerLoginListener(); + + /* Initialize permissions handler */ + if (FabricLoader.getInstance().isModLoaded("luckperms")) { + Log.info("Using luckperms for access control"); + permissions = new LuckPermissions(); + } + else if (FabricLoader.getInstance().isModLoaded("fabric-permissions-api-v0")) { + Log.info("Using fabric-permissions-api for access control"); + permissions = new FabricPermissions(); + } else { + /* Initialize permissions handler */ + permissions = FilePermissions.create(); + if (permissions == null) { + permissions = new OpPermissions(new String[]{"webchat", "marker.icons", "marker.list", "webregister", "stats", "hide.self", "show.self"}); + } + } + /* Get and initialize data folder */ + File dataDirectory = new File("dynmap"); + + if (!dataDirectory.exists()) { + dataDirectory.mkdirs(); + } + + /* Instantiate core */ + if (core == null) { + core = new DynmapCore(); + } + + /* Inject dependencies */ + core.setPluginJarFile(DynmapMod.jarfile); + core.setPluginVersion(DynmapMod.ver); + core.setMinecraftVersion(mcver); + core.setDataFolder(dataDirectory); + core.setServer(fserver); + core.setTriggerDefault(TRIGGER_DEFAULTS); + core.setBiomeNames(getBiomeNames()); + + if (!core.initConfiguration(null)) { + return; + } + // Extract default permission example, if needed + File filepermexample = new File(core.getDataFolder(), "permissions.yml.example"); + core.createDefaultFileFromResource("/permissions.yml.example", filepermexample); + + DynmapCommonAPIListener.apiInitialized(core); + } + + private DynmapCommand dynmapCmd; + private DmapCommand dmapCmd; + private DmarkerCommand dmarkerCmd; + private DynmapExpCommand dynmapexpCmd; + + public void registerCommands(CommandDispatcher cd) { + dynmapCmd = new DynmapCommand(this); + dmapCmd = new DmapCommand(this); + dmarkerCmd = new DmarkerCommand(this); + dynmapexpCmd = new DynmapExpCommand(this); + dynmapCmd.register(cd); + dmapCmd.register(cd); + dmarkerCmd.register(cd); + dynmapexpCmd.register(cd); + + Log.info("Register commands"); + } + + public void onStart() { + initializeBlockStates(); + /* Enable core */ + if (!core.enableCore(null)) { + return; + } + core_enabled = true; + VersionCheck.runCheck(core); + // Get per tick time limit + perTickLimit = core.getMaxTickUseMS() * 1000000; + // Prep TPS + lasttick = System.nanoTime(); + tps = 20.0; + + /* Register tick handler */ + if (!tickregistered) { + ServerTickEvents.END_SERVER_TICK.register(server -> fserver.tickEvent(server)); + tickregistered = true; + } + + playerList = core.playerList; + sscache = new GenericChunkCache(core.getSnapShotCacheSize(), core.useSoftRefInSnapShotCache()); + /* Get map manager from core */ + mapManager = core.getMapManager(); + + /* Load saved world definitions */ + loadWorlds(); + + for (FabricWorld w : worlds.values()) { + if (core.processWorldLoad(w)) { /* Have core process load first - fire event listeners if good load after */ + if (w.isLoaded()) { + core.listenerManager.processWorldEvent(DynmapListenerManager.EventType.WORLD_LOAD, w); + } + } + } + core.updateConfigHashcode(); + + /* Register our update trigger events */ + registerEvents(); + Log.info("Register events"); + + //DynmapCommonAPIListener.apiInitialized(core); + + Log.info("Enabled"); + } + + public void onDisable() { + DynmapCommonAPIListener.apiTerminated(); + + //if (metrics != null) { + // metrics.stop(); + // metrics = null; + //} + /* Save worlds */ + saveWorlds(); + + /* Purge tick queue */ + fserver.clearTaskQueue(); + + /* Disable core */ + core.disableCore(); + core_enabled = false; + + if (sscache != null) { + sscache.cleanup(); + sscache = null; + } + + Log.info("Disabled"); + } + + // TODO: Clean a bit + public void handleCommand(ServerCommandSource commandSource, String cmd, String[] args) throws CommandSyntaxException { + DynmapCommandSender dsender; + ServerPlayerEntity psender = null; + + // getPlayer throws a CommandSyntaxException, so getEntity and instanceof for safety + if (commandSource.getEntity() instanceof ServerPlayerEntity) { + psender = commandSource.getPlayerOrThrow(); + } + + if (psender != null) { + // FIXME: New Player? Why not query the current player list. + dsender = new FabricPlayer(this, psender); + } else { + dsender = new FabricCommandSender(commandSource); + } + + core.processCommand(dsender, cmd, cmd, args); + } + + public class PlayerTracker { + public void onPlayerLogin(ServerPlayerEntity player) { + if (!core_enabled) return; + final DynmapPlayer dp = getOrAddPlayer(player); + /* This event can be called from off server thread, so push processing there */ + core.getServer().scheduleServerTask(new Runnable() { + public void run() { + core.listenerManager.processPlayerEvent(DynmapListenerManager.EventType.PLAYER_JOIN, dp); + } + }, 2); + } + + public void onPlayerLogout(ServerPlayerEntity player) { + if (!core_enabled) return; + final DynmapPlayer dp = getOrAddPlayer(player); + final String name = player.getName().getString(); + /* This event can be called from off server thread, so push processing there */ + core.getServer().scheduleServerTask(new Runnable() { + public void run() { + core.listenerManager.processPlayerEvent(DynmapListenerManager.EventType.PLAYER_QUIT, dp); + players.remove(name); + } + }, 0); + } + + public void onPlayerChangedDimension(ServerPlayerEntity player) { + if (!core_enabled) return; + getOrAddPlayer(player); // Freshen player object reference + } + + public void onPlayerRespawn(ServerPlayerEntity player) { + if (!core_enabled) return; + getOrAddPlayer(player); // Freshen player object reference + } + } + + private PlayerTracker playerTracker = null; + + private void registerPlayerLoginListener() { + if (playerTracker == null) { + playerTracker = new PlayerTracker(); + PlayerEvents.PLAYER_LOGGED_IN.register(player -> playerTracker.onPlayerLogin(player)); + PlayerEvents.PLAYER_LOGGED_OUT.register(player -> playerTracker.onPlayerLogout(player)); + PlayerEvents.PLAYER_CHANGED_DIMENSION.register(player -> playerTracker.onPlayerChangedDimension(player)); + PlayerEvents.PLAYER_RESPAWN.register(player -> playerTracker.onPlayerRespawn(player)); + } + } + + public class WorldTracker { + public void handleWorldLoad(MinecraftServer server, ServerWorld world) { + if (!core_enabled) return; + + final FabricWorld fw = getWorld(world); + // This event can be called from off server thread, so push processing there + core.getServer().scheduleServerTask(new Runnable() { + public void run() { + if (core.processWorldLoad(fw)) // Have core process load first - fire event listeners if good load after + core.listenerManager.processWorldEvent(DynmapListenerManager.EventType.WORLD_LOAD, fw); + } + }, 0); + } + + public void handleWorldUnload(MinecraftServer server, ServerWorld world) { + if (!core_enabled) return; + + final FabricWorld fw = getWorld(world); + if (fw != null) { + // This event can be called from off server thread, so push processing there + core.getServer().scheduleServerTask(new Runnable() { + public void run() { + core.listenerManager.processWorldEvent(DynmapListenerManager.EventType.WORLD_UNLOAD, fw); + core.processWorldUnload(fw); + } + }, 0); + // Set world unloaded (needs to be immediate, since it may be invalid after event) + fw.setWorldUnloaded(); + // Clean up tracker + //WorldUpdateTracker wut = updateTrackers.remove(fw.getName()); + //if(wut != null) wut.world = null; + } + } + + public void handleChunkGenerate(ServerWorld world, Chunk chunk) { + if (!onchunkgenerate) return; + + FabricWorld fw = getWorld(world, false); + ChunkPos chunkPos = chunk.getPos(); + + int ymax = Integer.MIN_VALUE; + int ymin = Integer.MAX_VALUE; + ChunkSection[] sections = chunk.getSectionArray(); + for (int i = 0; i < sections.length; i++) { + if ((sections[i] != null) && (!sections[i].isEmpty())) { + int sy = chunk.getBottomY() + i * ChunkSection.field_31407 /* Mojmap: SECTION_HEIGHT */; + if (sy < ymin) ymin = sy; + if ((sy+16) > ymax) ymax = sy + 16; + } + } + if (ymax != Integer.MIN_VALUE) { + mapManager.touchVolume(fw.getName(), + chunkPos.getStartX(), ymin, chunkPos.getStartZ(), + chunkPos.getEndX(), ymax, chunkPos.getEndZ(), + "chunkgenerate"); + //Log.info("New generated chunk detected at %s[%s]".formatted(fw.getName(), chunkPos.getStartPos())); + } + } + + public void handleBlockEvent(World world, BlockPos pos) { + if (!core_enabled) return; + if (!onblockchange) return; + if (!(world instanceof ServerWorld)) return; + + BlockUpdateRec r = new BlockUpdateRec(); + r.w = world; + FabricWorld fw = getWorld(world, false); + if (fw == null) return; + r.wid = fw.getName(); + r.x = pos.getX(); + r.y = pos.getY(); + r.z = pos.getZ(); + blockupdatequeue.add(r); + } + } + + private WorldTracker worldTracker = null; + private boolean onblockchange = false; + private boolean onchunkpopulate = false; + private boolean onchunkgenerate = false; + boolean onblockchange_with_id = false; + + private void registerEvents() { + // To trigger rendering. + onblockchange = core.isTrigger("blockupdate"); + onchunkpopulate = core.isTrigger("chunkpopulate"); + onchunkgenerate = core.isTrigger("chunkgenerate"); + onblockchange_with_id = core.isTrigger("blockupdate-with-id"); + if (onblockchange_with_id) + onblockchange = true; + if (worldTracker == null) + worldTracker = new WorldTracker(); + if (onchunkpopulate || onchunkgenerate) { + CustomServerChunkEvents.CHUNK_GENERATE.register((world, chunk) -> worldTracker.handleChunkGenerate(world, chunk)); + } + if (onblockchange) { + BlockEvents.BLOCK_EVENT.register((world, pos) -> worldTracker.handleBlockEvent(world, pos)); + } + + ServerWorldEvents.LOAD.register((server, world) -> worldTracker.handleWorldLoad(server, world)); + ServerWorldEvents.UNLOAD.register((server, world) -> worldTracker.handleWorldUnload(server, world)); + } + + FabricWorld getWorldByName(String name) { + return worlds.get(name); + } + + FabricWorld getWorld(World w) { + return getWorld(w, true); + } + + private FabricWorld getWorld(World w, boolean add_if_not_found) { + if (last_world == w) { + return last_fworld; + } + String wname = FabricWorld.getWorldName(this, w); + + for (FabricWorld fw : worlds.values()) { + if (fw.getRawName().equals(wname)) { + last_world = w; + last_fworld = fw; + if (!fw.isLoaded()) { + fw.setWorldLoaded(w); + } + fw.updateWorld(w); + return fw; + } + } + FabricWorld fw = null; + if (add_if_not_found) { + /* Add to list if not found */ + fw = new FabricWorld(this, w); + worlds.put(fw.getName(), fw); + } + last_world = w; + last_fworld = fw; + return fw; + } + + private void saveWorlds() { + File f = new File(core.getDataFolder(), FabricWorld.SAVED_WORLDS_FILE); + ConfigurationNode cn = new ConfigurationNode(f); + ArrayList> lst = new ArrayList>(); + for (DynmapWorld fw : core.mapManager.getWorlds()) { + HashMap vals = new HashMap(); + vals.put("name", fw.getRawName()); + vals.put("height", fw.worldheight); + vals.put("miny", fw.minY); + vals.put("sealevel", fw.sealevel); + vals.put("nether", fw.isNether()); + vals.put("the_end", ((FabricWorld) fw).isTheEnd()); + vals.put("title", fw.getTitle()); + lst.add(vals); + } + cn.put("worlds", lst); + cn.put("useSaveFolderAsName", useSaveFolder); + cn.put("maxWorldHeight", FabricWorld.getMaxWorldHeight()); + + cn.save(); + } + + private void loadWorlds() { + File f = new File(core.getDataFolder(), FabricWorld.SAVED_WORLDS_FILE); + if (f.canRead() == false) { + useSaveFolder = true; + return; + } + ConfigurationNode cn = new ConfigurationNode(f); + cn.load(); + // If defined, use maxWorldHeight + FabricWorld.setMaxWorldHeight(cn.getInteger("maxWorldHeight", 256)); + + // If setting defined, use it + if (cn.containsKey("useSaveFolderAsName")) { + useSaveFolder = cn.getBoolean("useSaveFolderAsName", useSaveFolder); + } + List> lst = cn.getMapList("worlds"); + if (lst == null) { + Log.warning(String.format("Discarding bad %s", FabricWorld.SAVED_WORLDS_FILE)); + return; + } + + for (Map world : lst) { + try { + String name = (String) world.get("name"); + int height = (Integer) world.get("height"); + Integer miny = (Integer) world.get("miny"); + int sealevel = (Integer) world.get("sealevel"); + boolean nether = (Boolean) world.get("nether"); + boolean theend = (Boolean) world.get("the_end"); + String title = (String) world.get("title"); + if (name != null) { + FabricWorld fw = new FabricWorld(this, name, height, sealevel, nether, theend, title, (miny != null) ? miny : 0); + fw.setWorldUnloaded(); + core.processWorldLoad(fw); + worlds.put(fw.getName(), fw); + } + } catch (Exception x) { + Log.warning(String.format("Unable to load saved worlds from %s", FabricWorld.SAVED_WORLDS_FILE)); + return; + } + } + } +} \ No newline at end of file diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricAdapter.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricAdapter.java new file mode 100644 index 000000000..ca90c9cf2 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricAdapter.java @@ -0,0 +1,13 @@ +package org.dynmap.fabric_1_20_4; + +import net.minecraft.server.world.ServerWorld; +import org.dynmap.DynmapLocation; + +public final class FabricAdapter { + public static DynmapLocation toDynmapLocation(DynmapPlugin plugin, ServerWorld world, double x, double y, double z) { + return new DynmapLocation(plugin.getWorld(world).getName(), x, y, z); + } + + private FabricAdapter() { + } +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricCommandSender.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricCommandSender.java new file mode 100644 index 000000000..265ab9a36 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricCommandSender.java @@ -0,0 +1,45 @@ +package org.dynmap.fabric_1_20_4; + +import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.text.Text; +import org.dynmap.common.DynmapCommandSender; + +/* Handler for generic console command sender */ +public class FabricCommandSender implements DynmapCommandSender { + private ServerCommandSource sender; + + protected FabricCommandSender() { + sender = null; + } + + public FabricCommandSender(ServerCommandSource send) { + sender = send; + } + + @Override + public boolean hasPrivilege(String privid) { + return true; + } + + @Override + public void sendMessage(String msg) { + if (sender != null) { + sender.sendFeedback(() -> Text.literal(msg), false); + } + } + + @Override + public boolean isConnected() { + return false; + } + + @Override + public boolean isOp() { + return true; + } + + @Override + public boolean hasPermissionNode(String node) { + return true; + } +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricLogger.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricLogger.java new file mode 100644 index 000000000..680b7d45c --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricLogger.java @@ -0,0 +1,49 @@ +package org.dynmap.fabric_1_20_4; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.dynmap.utils.DynmapLogger; + +public class FabricLogger implements DynmapLogger { + Logger log; + public static final String DM = "[Dynmap] "; + + FabricLogger() { + log = LogManager.getLogger("Dynmap"); + } + + @Override + public void info(String s) { + log.info(DM + s); + } + + @Override + public void severe(Throwable t) { + log.fatal(t); + } + + @Override + public void severe(String s) { + log.fatal(DM + s); + } + + @Override + public void severe(String s, Throwable t) { + log.fatal(DM + s, t); + } + + @Override + public void verboseinfo(String s) { + log.info(DM + s); + } + + @Override + public void warning(String s) { + log.warn(DM + s); + } + + @Override + public void warning(String s, Throwable t) { + log.warn(DM + s, t); + } +} \ No newline at end of file diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricMapChunkCache.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricMapChunkCache.java new file mode 100644 index 000000000..91910b635 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricMapChunkCache.java @@ -0,0 +1,116 @@ +package org.dynmap.fabric_1_20_4; + +import net.minecraft.nbt.*; +import net.minecraft.server.world.ServerChunkManager; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.server.world.ThreadedAnvilChunkStorage; +import net.minecraft.util.collection.PackedIntegerArray; +import net.minecraft.util.math.ChunkPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.WordPackedArray; +import net.minecraft.world.ChunkSerializer; +import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.biome.BiomeEffects; +import net.minecraft.world.chunk.ChunkManager; +import net.minecraft.world.chunk.ChunkStatus; + +import org.dynmap.DynmapChunk; +import org.dynmap.DynmapCore; +import org.dynmap.DynmapWorld; +import org.dynmap.Log; +import org.dynmap.common.BiomeMap; +import org.dynmap.common.chunk.GenericChunk; +import org.dynmap.common.chunk.GenericChunkSection; +import org.dynmap.common.chunk.GenericMapChunkCache; +import org.dynmap.hdmap.HDBlockModels; +import org.dynmap.renderer.DynmapBlockState; +import org.dynmap.renderer.RenderPatchFactory; +import org.dynmap.utils.*; + +import java.lang.reflect.Field; +import java.util.*; + +/** + * Container for managing chunks - dependent upon using chunk snapshots, since rendering is off server thread + */ +public class FabricMapChunkCache extends GenericMapChunkCache { + private World w; + private ServerChunkManager cps; + + /** + * Construct empty cache + */ + public FabricMapChunkCache(DynmapPlugin plugin) { + super(plugin.sscache); + } + + public void setChunks(FabricWorld dw, List chunks) { + this.w = dw.getWorld(); + if (dw.isLoaded()) { + /* Check if world's provider is ServerChunkManager */ + ChunkManager cp = this.w.getChunkManager(); + + if (cp instanceof ServerChunkManager) { + cps = (ServerChunkManager) cp; + } else { + Log.severe("Error: world " + dw.getName() + " has unsupported chunk provider"); + } + } + super.setChunks(dw, chunks); + } + + // Load generic chunk from existing and already loaded chunk + protected GenericChunk getLoadedChunk(DynmapChunk chunk) { + GenericChunk gc = null; + if (cps.isChunkLoaded(chunk.x, chunk.z)) { + NbtCompound nbt = null; + try { + nbt = ChunkSerializer.serialize((ServerWorld) w, cps.getWorldChunk(chunk.x, chunk.z, false)); + } catch (NullPointerException e) { + // TODO: find out why this is happening and why it only seems to happen since 1.16.2 + Log.severe("ChunkSerializer.serialize threw a NullPointerException", e); + } + if (nbt != null) { + gc = parseChunkFromNBT(new NBT.NBTCompound(nbt)); + } + } + return gc; + } + + private NbtCompound readChunk(int x, int z) { + try { + ThreadedAnvilChunkStorage acl = cps.threadedAnvilChunkStorage; + + ChunkPos coord = new ChunkPos(x, z); + // Async chunk reading is synchronized here. Perhaps we can do async and improve performance? + return acl.getNbt(coord).join().orElse(null); + } catch (Exception exc) { + Log.severe(String.format("Error reading chunk: %s,%d,%d", dw.getName(), x, z), exc); + return null; + } + } + + // Load generic chunk from unloaded chunk + protected GenericChunk loadChunk(DynmapChunk chunk) { + GenericChunk gc = null; + NbtCompound nbt = readChunk(chunk.x, chunk.z); + // If read was good + if (nbt != null) { + gc = parseChunkFromNBT(new NBT.NBTCompound(nbt)); + } + return gc; + } + + @Override + public int getFoliageColor(BiomeMap bm, int[] colormap, int x, int z) { + return bm.getBiomeObject().map(Biome::getEffects).flatMap(BiomeEffects::getFoliageColor).orElse(colormap[bm.biomeLookup()]); + } + + @Override + public int getGrassColor(BiomeMap bm, int[] colormap, int x, int z) { + BiomeEffects effects = bm.getBiomeObject().map(Biome::getEffects).orElse(null); + if (effects == null) return colormap[bm.biomeLookup()]; + return effects.getGrassColorModifier().getModifiedGrassColor(x, z, effects.getGrassColor().orElse(colormap[bm.biomeLookup()])); + } +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricPlayer.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricPlayer.java new file mode 100644 index 000000000..6755ab7cc --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricPlayer.java @@ -0,0 +1,260 @@ +package org.dynmap.fabric_1_20_4; + +import com.google.common.collect.Iterables; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonParseException; +import com.mojang.authlib.GameProfile; +import com.mojang.authlib.properties.Property; + +import net.minecraft.network.packet.s2c.play.SubtitleS2CPacket; +import net.minecraft.network.packet.s2c.play.TitleFadeS2CPacket; +import net.minecraft.network.packet.s2c.play.TitleS2CPacket; +import net.minecraft.server.network.ServerPlayNetworkHandler; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.text.Text; +import net.minecraft.util.Util; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.World; +import org.dynmap.DynmapLocation; +import org.dynmap.common.DynmapPlayer; + +import java.net.InetSocketAddress; +import java.net.SocketAddress; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.UUID; + +/** + * Player access abstraction class + */ +public class FabricPlayer extends FabricCommandSender implements DynmapPlayer { + private static final Gson GSON = new GsonBuilder().create(); + private final DynmapPlugin plugin; + // FIXME: Proper setter + ServerPlayerEntity player; + private final String skinurl; + private final UUID uuid; + + public FabricPlayer(DynmapPlugin plugin, ServerPlayerEntity player) { + this.plugin = plugin; + this.player = player; + String url = null; + if (this.player != null) { + uuid = this.player.getUuid(); + GameProfile prof = this.player.getGameProfile(); + if (prof != null) { + Property textureProperty = Iterables.getFirst(prof.getProperties().get("textures"), null); + + if (textureProperty != null) { + DynmapPlugin.TexturesPayload result = null; + try { + String json = new String(Base64.getDecoder().decode(textureProperty.value()), StandardCharsets.UTF_8); + result = GSON.fromJson(json, DynmapPlugin.TexturesPayload.class); + } catch (JsonParseException e) { + } + if ((result != null) && (result.textures != null) && (result.textures.containsKey("SKIN"))) { + url = result.textures.get("SKIN").url; + } + } + } + } else { + uuid = null; + } + skinurl = url; + } + + @Override + public boolean isConnected() { + return true; + } + + @Override + public String getName() { + if (player != null) { + String n = player.getName().getString(); + ; + return n; + } else + return "[Server]"; + } + + @Override + public String getDisplayName() { + if (player != null) { + String n = player.getDisplayName().getString(); + return n; + } else + return "[Server]"; + } + + @Override + public boolean isOnline() { + return true; + } + + @Override + public DynmapLocation getLocation() { + if (player == null) { + return null; + } + + Vec3d pos = player.getPos(); + return FabricAdapter.toDynmapLocation(plugin, player.getServerWorld(), pos.getX(), pos.getY(), pos.getZ()); + } + + @Override + public String getWorld() { + if (player == null) { + return null; + } + + World world = player.getWorld(); + if (world != null) { + return plugin.getWorld(world).getName(); + } + + return null; + } + + @Override + public InetSocketAddress getAddress() { + if (player != null) { + ServerPlayNetworkHandler networkHandler = player.networkHandler; + if (networkHandler != null) { + SocketAddress sa = networkHandler.getConnectionAddress(); + if (sa instanceof InetSocketAddress) { + return (InetSocketAddress) sa; + } + } + } + return null; + } + + @Override + public boolean isSneaking() { + if (player != null) { + return player.isSneaking(); + } + + return false; + } + + @Override + public double getHealth() { + if (player != null) { + double h = player.getHealth(); + if (h > 20) h = 20; + return h; // Scale to 20 range + } else { + return 0; + } + } + + @Override + public int getArmorPoints() { + if (player != null) { + return player.getArmor(); + } else { + return 0; + } + } + + @Override + public DynmapLocation getBedSpawnLocation() { + return null; + } + + @Override + public long getLastLoginTime() { + return 0; + } + + @Override + public long getFirstLoginTime() { + return 0; + } + + @Override + public boolean hasPrivilege(String privid) { + if (player != null) + return plugin.hasPerm(player, privid); + return false; + } + + @Override + public boolean isOp() { + return plugin.isOp(player.getName().getString()); + } + + @Override + public void sendMessage(String msg) { + Text ichatcomponent = Text.literal(msg); + player.sendMessage(ichatcomponent); + } + + @Override + public boolean isInvisible() { + if (player != null) { + return player.isInvisible(); + } + return false; + } + @Override + public boolean isSpectator() { + if(player != null) { + return player.isSpectator(); + } + return false; + } + + @Override + public int getSortWeight() { + return plugin.getSortWeight(getName()); + } + + @Override + public void setSortWeight(int wt) { + if (wt == 0) { + plugin.dropSortWeight(getName()); + } else { + plugin.setSortWeight(getName(), wt); + } + } + + @Override + public boolean hasPermissionNode(String node) { + return player != null && plugin.hasPermNode(player, node); + } + + @Override + public String getSkinURL() { + return skinurl; + } + + @Override + public UUID getUUID() { + return uuid; + } + + /** + * Send title and subtitle text (called from server thread) + */ + @Override + public void sendTitleText(String title, String subtitle, int fadeInTicks, int stayTicks, int fadeOutTicks) { + if (player != null) { + ServerPlayerEntity player = this.player; + TitleFadeS2CPacket times = new TitleFadeS2CPacket(fadeInTicks, stayTicks, fadeOutTicks); + player.networkHandler.sendPacket(times); + if (title != null) { + TitleS2CPacket titlepkt = new TitleS2CPacket(Text.literal(title)); + player.networkHandler.sendPacket(titlepkt); + } + + if (subtitle != null) { + SubtitleS2CPacket subtitlepkt = new SubtitleS2CPacket(Text.literal(subtitle)); + player.networkHandler.sendPacket(subtitlepkt); + } + } + } +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricServer.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricServer.java new file mode 100644 index 000000000..24e525b90 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricServer.java @@ -0,0 +1,609 @@ +package org.dynmap.fabric_1_20_4; + +import com.mojang.authlib.GameProfile; +import net.fabricmc.loader.api.FabricLoader; +import net.fabricmc.loader.api.ModContainer; +import net.minecraft.block.AbstractSignBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.network.message.MessageType; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.server.BannedIpList; +import net.minecraft.server.BannedPlayerList; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.PlayerManager; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.text.Text; +import net.minecraft.util.UserCache; +import net.minecraft.util.Util; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; +import org.dynmap.DynmapChunk; +import org.dynmap.DynmapWorld; +import org.dynmap.Log; +import org.dynmap.DynmapCommonAPIListener; +import org.dynmap.common.BiomeMap; +import org.dynmap.common.DynmapListenerManager; +import org.dynmap.common.DynmapPlayer; +import org.dynmap.common.DynmapServerInterface; +import org.dynmap.fabric_1_20_4.event.BlockEvents; +import org.dynmap.fabric_1_20_4.event.ServerChatEvents; +import org.dynmap.utils.MapChunkCache; +import org.dynmap.utils.VisibilityLimit; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.*; +import java.util.concurrent.*; +import java.util.stream.Collectors; + +/** + * Server access abstraction class + */ +public class FabricServer extends DynmapServerInterface { + /* Server thread scheduler */ + private final Object schedlock = new Object(); + private final DynmapPlugin plugin; + private final MinecraftServer server; + private final Registry biomeRegistry; + private long cur_tick; + private long next_id; + private long cur_tick_starttime; + private PriorityQueue runqueue = new PriorityQueue(); + + public FabricServer(DynmapPlugin plugin, MinecraftServer server) { + this.plugin = plugin; + this.server = server; + this.biomeRegistry = server.getRegistryManager().get(RegistryKeys.BIOME); + } + + private Optional getProfileByName(String player) { + UserCache cache = server.getUserCache(); + return cache.findByName(player); + } + + public final Registry getBiomeRegistry() { + return biomeRegistry; + } + + private Biome[] biomelist = null; + + public final Biome[] getBiomeList(Registry biomeRegistry) { + if (biomelist == null) { + biomelist = new Biome[256]; + Iterator iter = biomeRegistry.iterator(); + while (iter.hasNext()) { + Biome b = iter.next(); + int bidx = biomeRegistry.getRawId(b); + if (bidx >= biomelist.length) { + biomelist = Arrays.copyOf(biomelist, bidx + biomelist.length); + } + biomelist[bidx] = b; + } + } + return biomelist; + } + + @Override + public int getBlockIDAt(String wname, int x, int y, int z) { + return -1; + } + + @SuppressWarnings("deprecation") /* Not much I can do... fix this if it breaks. */ + @Override + public int isSignAt(String wname, int x, int y, int z) { + World world = plugin.getWorldByName(wname).getWorld(); + + BlockPos pos = new BlockPos(x, y, z); + if (!world.isChunkLoaded(pos)) + return -1; + + Block block = world.getBlockState(pos).getBlock(); + return (block instanceof AbstractSignBlock ? 1 : 0); + } + + @Override + public void scheduleServerTask(Runnable run, long delay) { + /* Add task record to queue */ + synchronized (schedlock) { + TaskRecord tr = new TaskRecord(cur_tick + delay, next_id++, new FutureTask(run, null)); + runqueue.add(tr); + } + } + + @Override + public DynmapPlayer[] getOnlinePlayers() { + if (server.getPlayerManager() == null) return new DynmapPlayer[0]; + + List players = server.getPlayerManager().getPlayerList(); + int playerCount = players.size(); + DynmapPlayer[] dplay = new DynmapPlayer[players.size()]; + + for (int i = 0; i < playerCount; i++) { + ServerPlayerEntity player = players.get(i); + dplay[i] = plugin.getOrAddPlayer(player); + } + + return dplay; + } + + @Override + public void reload() { + plugin.onDisable(); + plugin.onEnable(); + plugin.onStart(); + } + + @Override + public DynmapPlayer getPlayer(String name) { + List players = server.getPlayerManager().getPlayerList(); + + for (ServerPlayerEntity player : players) { + + if (player.getName().getString().equalsIgnoreCase(name)) { + return plugin.getOrAddPlayer(player); + } + } + + return null; + } + + @Override + public Set getIPBans() { + BannedIpList bl = server.getPlayerManager().getIpBanList(); + Set ips = new HashSet(); + + for (String s : bl.getNames()) { + ips.add(s); + } + + return ips; + } + + @Override + public Future callSyncMethod(Callable task) { + return callSyncMethod(task, 0); + } + + public Future callSyncMethod(Callable task, long delay) { + FutureTask ft = new FutureTask(task); + + /* Add task record to queue */ + synchronized (schedlock) { + TaskRecord tr = new TaskRecord(cur_tick + delay, next_id++, ft); + runqueue.add(tr); + } + + return ft; + } + + void clearTaskQueue() { + this.runqueue.clear(); + } + + @Override + public String getServerName() { + String sn; + if (server.isSingleplayer()) + sn = "Integrated"; + else + sn = server.getServerIp(); + if (sn == null) sn = "Unknown Server"; + return sn; + } + + @Override + public boolean isPlayerBanned(String pid) { + PlayerManager scm = server.getPlayerManager(); + BannedPlayerList bl = scm.getUserBanList(); + try { + return bl.contains(getProfileByName(pid).get()); + } catch (NoSuchElementException e) { + /* If this profile doesn't exist, default to "banned" for good measure. */ + return true; + } + } + + @Override + public String stripChatColor(String s) { + return DynmapPlugin.patternControlCode.matcher(s).replaceAll(""); + } + + private Set registered = new HashSet(); + + @Override + public boolean requestEventNotification(DynmapListenerManager.EventType type) { + if (registered.contains(type)) { + return true; + } + + switch (type) { + case WORLD_LOAD: + case WORLD_UNLOAD: + /* Already called for normal world activation/deactivation */ + break; + + case WORLD_SPAWN_CHANGE: + /*TODO + pm.registerEvents(new Listener() { + @EventHandler(priority=EventPriority.MONITOR) + public void onSpawnChange(SpawnChangeEvent evt) { + DynmapWorld w = new BukkitWorld(evt.getWorld()); + core.listenerManager.processWorldEvent(EventType.WORLD_SPAWN_CHANGE, w); + } + }, DynmapPlugin.this); + */ + break; + + case PLAYER_JOIN: + case PLAYER_QUIT: + /* Already handled */ + break; + + case PLAYER_BED_LEAVE: + /*TODO + pm.registerEvents(new Listener() { + @EventHandler(priority=EventPriority.MONITOR) + public void onPlayerBedLeave(PlayerBedLeaveEvent evt) { + DynmapPlayer p = new BukkitPlayer(evt.getPlayer()); + core.listenerManager.processPlayerEvent(EventType.PLAYER_BED_LEAVE, p); + } + }, DynmapPlugin.this); + */ + break; + + case PLAYER_CHAT: + if (plugin.chathandler == null) { + plugin.setChatHandler(new DynmapPlugin.ChatHandler(plugin)); + ServerChatEvents.EVENT.register((player, message) -> plugin.chathandler.handleChat(player, message)); + } + break; + + case BLOCK_BREAK: + /* Already handled by BlockEvents logic */ + break; + + case SIGN_CHANGE: + BlockEvents.SIGN_CHANGE_EVENT.register((world, pos, lines, player, front) -> { + plugin.core.processSignChange("fabric", FabricWorld.getWorldName(plugin, world), + pos.getX(), pos.getY(), pos.getZ(), lines, player.getName().getString()); + }); + break; + + default: + Log.severe("Unhandled event type: " + type); + return false; + } + + registered.add(type); + return true; + } + + @Override + public boolean sendWebChatEvent(String source, String name, String msg) { + return DynmapCommonAPIListener.fireWebChatEvent(source, name, msg); + } + + @Override + public void broadcastMessage(String msg) { + Text component = Text.literal(msg); + server.getPlayerManager().broadcast(component, false); + Log.info(stripChatColor(msg)); + } + + @Override + public String[] getBiomeIDs() { + BiomeMap[] b = BiomeMap.values(); + String[] bname = new String[b.length]; + + for (int i = 0; i < bname.length; i++) { + bname[i] = b[i].toString(); + } + + return bname; + } + + @Override + public double getCacheHitRate() { + if (plugin.sscache != null) + return plugin.sscache.getHitRate(); + return 0.0; + } + + @Override + public void resetCacheStats() { + if (plugin.sscache != null) + plugin.sscache.resetStats(); + } + + @Override + public DynmapWorld getWorldByName(String wname) { + return plugin.getWorldByName(wname); + } + + @Override + public DynmapPlayer getOfflinePlayer(String name) { + /* + OfflinePlayer op = getServer().getOfflinePlayer(name); + if(op != null) { + return new BukkitPlayer(op); + } + */ + return null; + } + + @Override + public Set checkPlayerPermissions(String player, Set perms) { + if (isPlayerBanned(player)) { + return Collections.emptySet(); + } + Set rslt = plugin.hasOfflinePermissions(player, perms); + if (rslt == null) { + rslt = new HashSet(); + if (plugin.isOp(player)) { + rslt.addAll(perms); + } + } + return rslt; + } + + @Override + public boolean checkPlayerPermission(String player, String perm) { + if (isPlayerBanned(player)) { + return false; + } + return plugin.hasOfflinePermission(player, perm); + } + + /** + * Render processor helper - used by code running on render threads to request chunk snapshot cache from server/sync thread + */ + @Override + public MapChunkCache createMapChunkCache(DynmapWorld w, List chunks, + boolean blockdata, boolean highesty, boolean biome, boolean rawbiome) { + FabricMapChunkCache c = (FabricMapChunkCache) w.getChunkCache(chunks); + if (c == null) { + return null; + } + if (w.visibility_limits != null) { + for (VisibilityLimit limit : w.visibility_limits) { + c.setVisibleRange(limit); + } + + c.setHiddenFillStyle(w.hiddenchunkstyle); + } + + if (w.hidden_limits != null) { + for (VisibilityLimit limit : w.hidden_limits) { + c.setHiddenRange(limit); + } + + c.setHiddenFillStyle(w.hiddenchunkstyle); + } + + if (!c.setChunkDataTypes(blockdata, biome, highesty, rawbiome)) { + Log.severe("CraftBukkit build does not support biome APIs"); + } + + if (chunks.size() == 0) /* No chunks to get? */ { + c.loadChunks(0); + return c; + } + + //Now handle any chunks in server thread that are already loaded (on server thread) + final FabricMapChunkCache cc = c; + Future f = this.callSyncMethod(new Callable() { + public Boolean call() throws Exception { + // Update busy state on world + //FabricWorld fw = (FabricWorld) cc.getWorld(); + //TODO + //setBusy(fw.getWorld()); + cc.getLoadedChunks(); + return true; + } + }, 0); + try { + f.get(); + } catch (CancellationException cx) { + return null; + } catch (InterruptedException cx) { + return null; + } catch (ExecutionException xx) { + Log.severe("Exception while loading chunks", xx.getCause()); + return null; + } catch (Exception ix) { + Log.severe(ix); + return null; + } + if (!w.isLoaded()) { + return null; + } + // Now, do rest of chunk reading from calling thread + c.readChunks(chunks.size()); + + return c; + } + + @Override + public int getMaxPlayers() { + return server.getMaxPlayerCount(); + } + + @Override + public int getCurrentPlayers() { + return server.getPlayerManager().getCurrentPlayerCount(); + } + + public void tickEvent(MinecraftServer server) { + cur_tick_starttime = System.nanoTime(); + long elapsed = cur_tick_starttime - plugin.lasttick; + plugin.lasttick = cur_tick_starttime; + plugin.avgticklen = ((plugin.avgticklen * 99) / 100) + (elapsed / 100); + plugin.tps = (double) 1E9 / (double) plugin.avgticklen; + // Tick core + if (plugin.core != null) { + plugin.core.serverTick(plugin.tps); + } + + boolean done = false; + TaskRecord tr = null; + + while (!plugin.blockupdatequeue.isEmpty()) { + DynmapPlugin.BlockUpdateRec r = plugin.blockupdatequeue.remove(); + BlockState bs = r.w.getBlockState(new BlockPos(r.x, r.y, r.z)); + int idx = Block.STATE_IDS.getRawId(bs); + if (!org.dynmap.hdmap.HDBlockModels.isChangeIgnoredBlock(DynmapPlugin.stateByID[idx])) { + if (plugin.onblockchange_with_id) + plugin.mapManager.touch(r.wid, r.x, r.y, r.z, "blockchange[" + idx + "]"); + else + plugin.mapManager.touch(r.wid, r.x, r.y, r.z, "blockchange"); + } + } + + long now; + + synchronized (schedlock) { + cur_tick++; + now = System.nanoTime(); + tr = runqueue.peek(); + /* Nothing due to run */ + if ((tr == null) || (tr.getTickToRun() > cur_tick) || ((now - cur_tick_starttime) > plugin.perTickLimit)) { + done = true; + } else { + tr = runqueue.poll(); + } + } + while (!done) { + tr.run(); + + synchronized (schedlock) { + tr = runqueue.peek(); + now = System.nanoTime(); + /* Nothing due to run */ + if ((tr == null) || (tr.getTickToRun() > cur_tick) || ((now - cur_tick_starttime) > plugin.perTickLimit)) { + done = true; + } else { + tr = runqueue.poll(); + } + } + } + while (!plugin.msgqueue.isEmpty()) { + DynmapPlugin.ChatMessage cm = plugin.msgqueue.poll(); + DynmapPlayer dp = null; + if (cm.sender != null) + dp = plugin.getOrAddPlayer(cm.sender); + else + dp = new FabricPlayer(plugin, null); + + plugin.core.listenerManager.processChatEvent(DynmapListenerManager.EventType.PLAYER_CHAT, dp, cm.message); + } + // Check for generated chunks + if ((cur_tick % 20) == 0) { + } + } + + private Optional getModContainerById(String id) { + return FabricLoader.getInstance().getModContainer(id); + } + + @Override + public boolean isModLoaded(String name) { + return FabricLoader.getInstance().getModContainer(name).isPresent(); + } + + @Override + public String getModVersion(String name) { + Optional mod = getModContainerById(name); // Try case sensitive lookup + return mod.map(modContainer -> modContainer.getMetadata().getVersion().getFriendlyString()).orElse(null); + } + + @Override + public double getServerTPS() { + return plugin.tps; + } + + @Override + public String getServerIP() { + if (server.isSingleplayer()) + return "0.0.0.0"; + else + return server.getServerIp(); + } + + @Override + public File getModContainerFile(String name) { + Optional container = getModContainerById(name); // Try case sensitive lookup + if (container.isPresent()) { + Path path = container.get().getRootPath(); + if (path.getFileSystem().provider().getScheme().equals("jar")) { + path = Paths.get(path.getFileSystem().toString()); + } + return path.toFile(); + } + return null; + } + + @Override + public List getModList() { + return FabricLoader.getInstance() + .getAllMods() + .stream() + .map(container -> container.getMetadata().getId()) + .collect(Collectors.toList()); + } + + @Override + public Map getBlockIDMap() { + Map map = new HashMap(); + return map; + } + + @Override + public InputStream openResource(String modid, String rname) { + if (modid == null) modid = "minecraft"; + + if ("minecraft".equals(modid)) { + return MinecraftServer.class.getClassLoader().getResourceAsStream(rname); + } else { + if (rname.startsWith("/") || rname.startsWith("\\")) { + rname = rname.substring(1); + } + + final String finalModid = modid; + final String finalRname = rname; + return getModContainerById(modid).map(container -> { + try { + return Files.newInputStream(container.getPath(finalRname)); + } catch (IOException e) { + Log.severe("Failed to load resource of mod :" + finalModid, e); + return null; + } + }).orElse(null); + } + } + + /** + * Get block unique ID map (module:blockid) + */ + @Override + public Map getBlockUniqueIDMap() { + HashMap map = new HashMap(); + return map; + } + + /** + * Get item unique ID map (module:itemid) + */ + @Override + public Map getItemUniqueIDMap() { + HashMap map = new HashMap(); + return map; + } + +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricWorld.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricWorld.java new file mode 100644 index 000000000..132382c78 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricWorld.java @@ -0,0 +1,236 @@ +package org.dynmap.fabric_1_20_4; + +import net.minecraft.registry.RegistryKey; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.world.Heightmap; +import net.minecraft.world.LightType; +import net.minecraft.world.World; +import net.minecraft.world.border.WorldBorder; +import org.dynmap.DynmapChunk; +import org.dynmap.DynmapLocation; +import org.dynmap.DynmapWorld; +import org.dynmap.utils.MapChunkCache; +import org.dynmap.utils.Polygon; + +import java.util.List; + +public class FabricWorld extends DynmapWorld { + // TODO: Store this relative to World saves for integrated server + public static final String SAVED_WORLDS_FILE = "fabricworlds.yml"; + + private final DynmapPlugin plugin; + private World world; + private final boolean skylight; + private final boolean isnether; + private final boolean istheend; + private final String env; + private DynmapLocation spawnloc = new DynmapLocation(); + private static int maxWorldHeight = 320; // Maximum allows world height + + public static int getMaxWorldHeight() { + return maxWorldHeight; + } + + public static void setMaxWorldHeight(int h) { + maxWorldHeight = h; + } + + public static String getWorldName(DynmapPlugin plugin, World w) { + RegistryKey rk = w.getRegistryKey(); + if (rk == World.OVERWORLD) { // Overworld? + return w.getServer().getSaveProperties().getLevelName(); + } else if (rk == World.END) { + return "DIM1"; + } else if (rk == World.NETHER) { + return "DIM-1"; + } else { + return rk.getValue().getNamespace() + "_" + rk.getValue().getPath(); + } + } + + public void updateWorld(World w) { + this.updateWorldHeights(w.getHeight(), w.getBottomY(), w.getSeaLevel()); + } + + public FabricWorld(DynmapPlugin plugin, World w) { + this(plugin, getWorldName(plugin, w), w.getHeight(), + w.getSeaLevel(), + w.getRegistryKey() == World.NETHER, + w.getRegistryKey() == World.END, + w.getRegistryKey().getValue().getPath(), + w.getBottomY()); + setWorldLoaded(w); + } + + public FabricWorld(DynmapPlugin plugin, String name, int height, int sealevel, boolean nether, boolean the_end, String deftitle, int miny) { + super(name, (height > maxWorldHeight) ? maxWorldHeight : height, sealevel, miny); + this.plugin = plugin; + world = null; + setTitle(deftitle); + isnether = nether; + istheend = the_end; + skylight = !(isnether || istheend); + + if (isnether) { + env = "nether"; + } else if (istheend) { + env = "the_end"; + } else { + env = "normal"; + } + + } + + /* Test if world is nether */ + @Override + public boolean isNether() { + return isnether; + } + + public boolean isTheEnd() { + return istheend; + } + + /* Get world spawn location */ + @Override + public DynmapLocation getSpawnLocation() { + if (world != null) { + spawnloc.x = world.getLevelProperties().getSpawnX(); + spawnloc.y = world.getLevelProperties().getSpawnY(); + spawnloc.z = world.getLevelProperties().getSpawnZ(); + spawnloc.world = this.getName(); + } + return spawnloc; + } + + /* Get world time */ + @Override + public long getTime() { + if (world != null) + return world.getTimeOfDay(); + else + return -1; + } + + /* World is storming */ + @Override + public boolean hasStorm() { + if (world != null) + return world.isRaining(); + else + return false; + } + + /* World is thundering */ + @Override + public boolean isThundering() { + if (world != null) + return world.isThundering(); + else + return false; + } + + /* World is loaded */ + @Override + public boolean isLoaded() { + return (world != null); + } + + /* Set world to unloaded */ + @Override + public void setWorldUnloaded() { + getSpawnLocation(); + world = null; + } + + /* Set world to loaded */ + public void setWorldLoaded(World w) { + world = w; + this.sealevel = w.getSeaLevel(); // Read actual current sealevel from world + // Update lighting table + for (int lightLevel = 0; lightLevel < 16; lightLevel++) { + // Algorithm based on LightmapTextureManager.getBrightness() + // We can't call that method because it's client-only. + // This means the code below can stop being correct if Mojang ever + // updates the curve; in that case we should reflect the changes. + float value = (float) lightLevel / 15.0f; + float brightness = value / (4.0f - 3.0f * value); + this.setBrightnessTableEntry(lightLevel, MathHelper.lerp(w.getDimension().ambientLight(), brightness, 1.0F)); + } + } + + /* Get light level of block */ + @Override + public int getLightLevel(int x, int y, int z) { + if (world != null) + return world.getLightLevel(new BlockPos(x, y, z)); + else + return -1; + } + + /* Get highest Y coord of given location */ + @Override + public int getHighestBlockYAt(int x, int z) { + if (world != null) { + return world.getChunk(x >> 4, z >> 4).getHeightmap(Heightmap.Type.MOTION_BLOCKING).get(x & 15, z & 15); + } else + return -1; + } + + /* Test if sky light level is requestable */ + @Override + public boolean canGetSkyLightLevel() { + return skylight; + } + + /* Return sky light level */ + @Override + public int getSkyLightLevel(int x, int y, int z) { + if (world != null) { + return world.getLightLevel(LightType.SKY, new BlockPos(x, y, z)); + } else + return -1; + } + + /** + * Get world environment ID (lower case - normal, the_end, nether) + */ + @Override + public String getEnvironment() { + return env; + } + + /** + * Get map chunk cache for world + */ + @Override + public MapChunkCache getChunkCache(List chunks) { + if (world != null) { + FabricMapChunkCache c = new FabricMapChunkCache(plugin); + c.setChunks(this, chunks); + return c; + } + return null; + } + + public World getWorld() { + return world; + } + + @Override + public Polygon getWorldBorder() { + if (world != null) { + WorldBorder wb = world.getWorldBorder(); + if ((wb != null) && (wb.getSize() < 5.9E7)) { + Polygon p = new Polygon(); + p.addVertex(wb.getBoundWest(), wb.getBoundNorth()); + p.addVertex(wb.getBoundWest(), wb.getBoundSouth()); + p.addVertex(wb.getBoundEast(), wb.getBoundSouth()); + p.addVertex(wb.getBoundEast(), wb.getBoundNorth()); + return p; + } + } + return null; + } +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/NBT.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/NBT.java new file mode 100644 index 000000000..deaac1d62 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/NBT.java @@ -0,0 +1,126 @@ +package org.dynmap.fabric_1_20_4; + +import org.dynmap.common.chunk.GenericBitStorage; +import org.dynmap.common.chunk.GenericNBTCompound; +import org.dynmap.common.chunk.GenericNBTList; + +import java.util.Set; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.nbt.NbtList; +import net.minecraft.util.collection.PackedIntegerArray; + +public class NBT { + + public static class NBTCompound implements GenericNBTCompound { + private final NbtCompound obj; + public NBTCompound(NbtCompound t) { + this.obj = t; + } + @Override + public Set getAllKeys() { + return obj.getKeys(); + } + @Override + public boolean contains(String s) { + return obj.contains(s); + } + @Override + public boolean contains(String s, int i) { + return obj.contains(s, i); + } + @Override + public byte getByte(String s) { + return obj.getByte(s); + } + @Override + public short getShort(String s) { + return obj.getShort(s); + } + @Override + public int getInt(String s) { + return obj.getInt(s); + } + @Override + public long getLong(String s) { + return obj.getLong(s); + } + @Override + public float getFloat(String s) { + return obj.getFloat(s); + } + @Override + public double getDouble(String s) { + return obj.getDouble(s); + } + @Override + public String getString(String s) { + return obj.getString(s); + } + @Override + public byte[] getByteArray(String s) { + return obj.getByteArray(s); + } + @Override + public int[] getIntArray(String s) { + return obj.getIntArray(s); + } + @Override + public long[] getLongArray(String s) { + return obj.getLongArray(s); + } + @Override + public GenericNBTCompound getCompound(String s) { + return new NBTCompound(obj.getCompound(s)); + } + @Override + public GenericNBTList getList(String s, int i) { + return new NBTList(obj.getList(s, i)); + } + @Override + public boolean getBoolean(String s) { + return obj.getBoolean(s); + } + @Override + public String getAsString(String s) { + return obj.get(s).asString(); + } + @Override + public GenericBitStorage makeBitStorage(int bits, int count, long[] data) { + return new OurBitStorage(bits, count, data); + } + public String toString() { + return obj.toString(); + } + } + public static class NBTList implements GenericNBTList { + private final NbtList obj; + public NBTList(NbtList t) { + obj = t; + } + @Override + public int size() { + return obj.size(); + } + @Override + public String getString(int idx) { + return obj.getString(idx); + } + @Override + public GenericNBTCompound getCompound(int idx) { + return new NBTCompound(obj.getCompound(idx)); + } + public String toString() { + return obj.toString(); + } + } + public static class OurBitStorage implements GenericBitStorage { + private final PackedIntegerArray bs; + public OurBitStorage(int bits, int count, long[] data) { + bs = new PackedIntegerArray(bits, count, data); + } + @Override + public int get(int idx) { + return bs.get(idx); + } + } +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/TaskRecord.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/TaskRecord.java new file mode 100644 index 000000000..f3f3d7b85 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/TaskRecord.java @@ -0,0 +1,38 @@ +package org.dynmap.fabric_1_20_4; + +import java.util.concurrent.FutureTask; + +class TaskRecord implements Comparable { + TaskRecord(long ticktorun, long id, FutureTask future) { + this.ticktorun = ticktorun; + this.id = id; + this.future = future; + } + + private final long ticktorun; + private final long id; + private final FutureTask future; + + void run() { + this.future.run(); + } + + long getTickToRun() { + return this.ticktorun; + } + + @Override + public int compareTo(TaskRecord o) { + if (this.ticktorun < o.ticktorun) { + return -1; + } else if (this.ticktorun > o.ticktorun) { + return 1; + } else if (this.id < o.id) { + return -1; + } else if (this.id > o.id) { + return 1; + } else { + return 0; + } + } +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/VersionCheck.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/VersionCheck.java new file mode 100644 index 000000000..ecbda3697 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/VersionCheck.java @@ -0,0 +1,98 @@ +package org.dynmap.fabric_1_20_4; + +import org.dynmap.DynmapCore; +import org.dynmap.Log; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; + +public class VersionCheck { + private static final String VERSION_URL = "http://mikeprimm.com/dynmap/releases.php"; + + public static void runCheck(final DynmapCore core) { + new Thread(new Runnable() { + public void run() { + doCheck(core); + } + }).start(); + } + + private static int getReleaseVersion(String s) { + int index = s.lastIndexOf('-'); + if (index < 0) + index = s.lastIndexOf('.'); + if (index >= 0) + s = s.substring(0, index); + String[] split = s.split("\\."); + int v = 0; + try { + for (int i = 0; (i < split.length) && (i < 3); i++) { + v += Integer.parseInt(split[i]) << (8 * (2 - i)); + } + } catch (NumberFormatException nfx) { + } + return v; + } + + private static int getBuildNumber(String s) { + int index = s.lastIndexOf('-'); + if (index < 0) + index = s.lastIndexOf('.'); + if (index >= 0) + s = s.substring(index + 1); + try { + return Integer.parseInt(s); + } catch (NumberFormatException nfx) { + return 99999999; + } + } + + private static void doCheck(DynmapCore core) { + String pluginver = core.getDynmapPluginVersion(); + String platform = core.getDynmapPluginPlatform(); + String platver = core.getDynmapPluginPlatformVersion(); + if ((pluginver == null) || (platform == null) || (platver == null)) + return; + HttpURLConnection conn = null; + String loc = VERSION_URL; + int cur_ver = getReleaseVersion(pluginver); + int cur_bn = getBuildNumber(pluginver); + try { + while ((loc != null) && (!loc.isEmpty())) { + URL url = new URL(loc); + conn = (HttpURLConnection) url.openConnection(); + conn.setRequestProperty("User-Agent", "Dynmap (" + platform + "/" + platver + "/" + pluginver); + conn.connect(); + loc = conn.getHeaderField("Location"); + } + BufferedReader rdr = new BufferedReader(new InputStreamReader(conn.getInputStream())); + String line = null; + while ((line = rdr.readLine()) != null) { + String[] split = line.split(":"); + if (split.length < 4) continue; + /* If our platform and version, or wildcard platform version */ + if (split[0].equals(platform) && (split[1].equals("*") || split[1].equals(platver))) { + int recommended_ver = getReleaseVersion(split[2]); + int recommended_bn = getBuildNumber(split[2]); + if ((recommended_ver > cur_ver) || ((recommended_ver == cur_ver) && (recommended_bn > cur_bn))) { /* Newer recommended build */ + Log.info("Version obsolete: new recommended version " + split[2] + " is available."); + } else if (cur_ver > recommended_ver) { /* Running dev or prerelease? */ + int prerel_ver = getReleaseVersion(split[3]); + int prerel_bn = getBuildNumber(split[3]); + if ((prerel_ver > cur_ver) || ((prerel_ver == cur_ver) && (prerel_bn > cur_bn))) { + Log.info("Version obsolete: new prerelease version " + split[3] + " is available."); + } + } + } + } + } catch (Exception x) { + Log.info("Error checking for latest version"); + } finally { + if (conn != null) { + conn.disconnect(); + } + } + } +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/access/ProtoChunkAccessor.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/access/ProtoChunkAccessor.java new file mode 100644 index 000000000..7ef7654ea --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/access/ProtoChunkAccessor.java @@ -0,0 +1,5 @@ +package org.dynmap.fabric_1_20_4.access; + +public interface ProtoChunkAccessor { + boolean getTouchedByWorldGen(); +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DmapCommand.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DmapCommand.java new file mode 100644 index 000000000..f27998672 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DmapCommand.java @@ -0,0 +1,9 @@ +package org.dynmap.fabric_1_20_4.command; + +import org.dynmap.fabric_1_20_4.DynmapPlugin; + +public class DmapCommand extends DynmapCommandExecutor { + public DmapCommand(DynmapPlugin p) { + super("dmap", p); + } +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DmarkerCommand.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DmarkerCommand.java new file mode 100644 index 000000000..798e4d0c0 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DmarkerCommand.java @@ -0,0 +1,9 @@ +package org.dynmap.fabric_1_20_4.command; + +import org.dynmap.fabric_1_20_4.DynmapPlugin; + +public class DmarkerCommand extends DynmapCommandExecutor { + public DmarkerCommand(DynmapPlugin p) { + super("dmarker", p); + } +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapCommand.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapCommand.java new file mode 100644 index 000000000..0d87c8957 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapCommand.java @@ -0,0 +1,9 @@ +package org.dynmap.fabric_1_20_4.command; + +import org.dynmap.fabric_1_20_4.DynmapPlugin; + +public class DynmapCommand extends DynmapCommandExecutor { + public DynmapCommand(DynmapPlugin p) { + super("dynmap", p); + } +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapCommandExecutor.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapCommandExecutor.java new file mode 100644 index 000000000..86bb94b9d --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapCommandExecutor.java @@ -0,0 +1,64 @@ +package org.dynmap.fabric_1_20_4.command; + +import com.mojang.brigadier.Command; +import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.context.CommandContext; +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import com.mojang.brigadier.tree.ArgumentCommandNode; +import com.mojang.brigadier.tree.LiteralCommandNode; +import com.mojang.brigadier.tree.RootCommandNode; +import net.minecraft.server.command.ServerCommandSource; + +import java.util.Arrays; + +import org.dynmap.fabric_1_20_4.DynmapPlugin; + +import static com.mojang.brigadier.arguments.StringArgumentType.greedyString; +import static net.minecraft.server.command.CommandManager.argument; +import static net.minecraft.server.command.CommandManager.literal; + +public class DynmapCommandExecutor implements Command { + private final String cmd; + private final DynmapPlugin plugin; + + DynmapCommandExecutor(String cmd, DynmapPlugin plugin) { + this.cmd = cmd; + this.plugin = plugin; + } + + public void register(CommandDispatcher dispatcher) { + final RootCommandNode root = dispatcher.getRoot(); + + final LiteralCommandNode command = literal(this.cmd) + .executes(this) + .build(); + + final ArgumentCommandNode args = argument("args", greedyString()) + .executes(this) + .build(); + + // So this becomes "cmd" [args] + command.addChild(args); + + // Add command to the command dispatcher via root node. + root.addChild(command); + } + + @Override + public int run(CommandContext context) throws CommandSyntaxException { + // Commands in brigadier may be proxied in Minecraft via a syntax like `/execute ... ... run dmap [args]` + // Dynmap will fail to parse this properly, so we find the starting position of the actual command being parsed after any forks or redirects. + // The start position of the range specifies where the actual command dynmap has registered starts + int start = context.getRange().getStart(); + String dynmapInput = context.getInput().substring(start); + + String[] args = dynmapInput.split("\\s+"); + plugin.handleCommand(context.getSource(), cmd, Arrays.copyOfRange(args, 1, args.length)); + return 1; + } + + // @Override // TODO: Usage? + public String getUsage(ServerCommandSource commandSource) { + return "Run /" + cmd + " help for details on using command"; + } +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapExpCommand.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapExpCommand.java new file mode 100644 index 000000000..81f016bb8 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapExpCommand.java @@ -0,0 +1,9 @@ +package org.dynmap.fabric_1_20_4.command; + +import org.dynmap.fabric_1_20_4.DynmapPlugin; + +public class DynmapExpCommand extends DynmapCommandExecutor { + public DynmapExpCommand(DynmapPlugin p) { + super("dynmapexp", p); + } +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/BlockEvents.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/BlockEvents.java new file mode 100644 index 000000000..0ba347b58 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/BlockEvents.java @@ -0,0 +1,39 @@ +package org.dynmap.fabric_1_20_4.event; + +import net.fabricmc.fabric.api.event.Event; +import net.fabricmc.fabric.api.event.EventFactory; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class BlockEvents { + private BlockEvents() { + } + + public static Event BLOCK_EVENT = EventFactory.createArrayBacked(BlockCallback.class, + (listeners) -> (world, pos) -> { + for (BlockCallback callback : listeners) { + callback.onBlockEvent(world, pos); + } + } + ); + + public static Event SIGN_CHANGE_EVENT = EventFactory.createArrayBacked(SignChangeCallback.class, + (listeners) -> (world, pos, lines, player, front) -> { + for (SignChangeCallback callback : listeners) { + callback.onSignChange(world, pos, lines, player, front); + } + } + ); + + @FunctionalInterface + public interface BlockCallback { + void onBlockEvent(World world, BlockPos pos); + } + + @FunctionalInterface + public interface SignChangeCallback { + void onSignChange(ServerWorld world, BlockPos pos, String[] lines, ServerPlayerEntity player, boolean front); + } +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/CustomServerChunkEvents.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/CustomServerChunkEvents.java new file mode 100644 index 000000000..21aa84771 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/CustomServerChunkEvents.java @@ -0,0 +1,21 @@ +package org.dynmap.fabric_1_20_4.event; + +import net.fabricmc.fabric.api.event.Event; +import net.fabricmc.fabric.api.event.EventFactory; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.world.chunk.Chunk; + +public class CustomServerChunkEvents { + public static Event CHUNK_GENERATE = EventFactory.createArrayBacked(ChunkGenerate.class, + (listeners) -> (world, chunk) -> { + for (ChunkGenerate callback : listeners) { + callback.onChunkGenerate(world, chunk); + } + } + ); + + @FunctionalInterface + public interface ChunkGenerate { + void onChunkGenerate(ServerWorld world, Chunk chunk); + } +} \ No newline at end of file diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/CustomServerLifecycleEvents.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/CustomServerLifecycleEvents.java new file mode 100644 index 000000000..b15c1ba7c --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/CustomServerLifecycleEvents.java @@ -0,0 +1,14 @@ +package org.dynmap.fabric_1_20_4.event; + +import net.fabricmc.fabric.api.event.Event; +import net.fabricmc.fabric.api.event.EventFactory; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; + +public class CustomServerLifecycleEvents { + public static final Event SERVER_STARTED_PRE_WORLD_LOAD = + EventFactory.createArrayBacked(ServerLifecycleEvents.ServerStarted.class, (callbacks) -> (server) -> { + for (ServerLifecycleEvents.ServerStarted callback : callbacks) { + callback.onServerStarted(server); + } + }); +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/PlayerEvents.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/PlayerEvents.java new file mode 100644 index 000000000..1e27cf741 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/PlayerEvents.java @@ -0,0 +1,62 @@ +package org.dynmap.fabric_1_20_4.event; + +import net.fabricmc.fabric.api.event.Event; +import net.fabricmc.fabric.api.event.EventFactory; +import net.minecraft.server.network.ServerPlayerEntity; + +public class PlayerEvents { + private PlayerEvents() { + } + + public static Event PLAYER_LOGGED_IN = EventFactory.createArrayBacked(PlayerLoggedIn.class, + (listeners) -> (player) -> { + for (PlayerLoggedIn callback : listeners) { + callback.onPlayerLoggedIn(player); + } + } + ); + + public static Event PLAYER_LOGGED_OUT = EventFactory.createArrayBacked(PlayerLoggedOut.class, + (listeners) -> (player) -> { + for (PlayerLoggedOut callback : listeners) { + callback.onPlayerLoggedOut(player); + } + } + ); + + public static Event PLAYER_CHANGED_DIMENSION = EventFactory.createArrayBacked(PlayerChangedDimension.class, + (listeners) -> (player) -> { + for (PlayerChangedDimension callback : listeners) { + callback.onPlayerChangedDimension(player); + } + } + ); + + public static Event PLAYER_RESPAWN = EventFactory.createArrayBacked(PlayerRespawn.class, + (listeners) -> (player) -> { + for (PlayerRespawn callback : listeners) { + callback.onPlayerRespawn(player); + } + } + ); + + @FunctionalInterface + public interface PlayerLoggedIn { + void onPlayerLoggedIn(ServerPlayerEntity player); + } + + @FunctionalInterface + public interface PlayerLoggedOut { + void onPlayerLoggedOut(ServerPlayerEntity player); + } + + @FunctionalInterface + public interface PlayerChangedDimension { + void onPlayerChangedDimension(ServerPlayerEntity player); + } + + @FunctionalInterface + public interface PlayerRespawn { + void onPlayerRespawn(ServerPlayerEntity player); + } +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/ServerChatEvents.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/ServerChatEvents.java new file mode 100644 index 000000000..25d8c5ca1 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/ServerChatEvents.java @@ -0,0 +1,23 @@ +package org.dynmap.fabric_1_20_4.event; + +import net.fabricmc.fabric.api.event.Event; +import net.fabricmc.fabric.api.event.EventFactory; +import net.minecraft.server.network.ServerPlayerEntity; + +public class ServerChatEvents { + private ServerChatEvents() { + } + + public static Event EVENT = EventFactory.createArrayBacked(ServerChatCallback.class, + (listeners) -> (player, message) -> { + for (ServerChatCallback callback : listeners) { + callback.onChatMessage(player, message); + } + } + ); + + @FunctionalInterface + public interface ServerChatCallback { + void onChatMessage(ServerPlayerEntity player, String message); + } +} \ No newline at end of file diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/BiomeEffectsAccessor.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/BiomeEffectsAccessor.java new file mode 100644 index 000000000..192507b47 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/BiomeEffectsAccessor.java @@ -0,0 +1,11 @@ +package org.dynmap.fabric_1_20_4.mixin; + +import net.minecraft.world.biome.BiomeEffects; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(BiomeEffects.class) +public interface BiomeEffectsAccessor { + @Accessor + int getWaterColor(); +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/MinecraftServerMixin.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/MinecraftServerMixin.java new file mode 100644 index 000000000..1c76a8ec2 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/MinecraftServerMixin.java @@ -0,0 +1,17 @@ +package org.dynmap.fabric_1_20_4.mixin; + +import net.minecraft.server.MinecraftServer; + +import org.dynmap.fabric_1_20_4.event.CustomServerLifecycleEvents; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(MinecraftServer.class) +public class MinecraftServerMixin { + @Inject(method = "loadWorld", at = @At("HEAD")) + protected void loadWorld(CallbackInfo info) { + CustomServerLifecycleEvents.SERVER_STARTED_PRE_WORLD_LOAD.invoker().onServerStarted((MinecraftServer) (Object) this); + } +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/PlayerManagerMixin.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/PlayerManagerMixin.java new file mode 100644 index 000000000..2bb586ad9 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/PlayerManagerMixin.java @@ -0,0 +1,31 @@ +package org.dynmap.fabric_1_20_4.mixin; + +import net.minecraft.network.ClientConnection; +import net.minecraft.server.PlayerManager; +import net.minecraft.server.network.ConnectedClientData; +import net.minecraft.server.network.ServerPlayerEntity; + +import org.dynmap.fabric_1_20_4.event.PlayerEvents; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(PlayerManager.class) +public class PlayerManagerMixin { + @Inject(method = "onPlayerConnect", at = @At("TAIL")) + public void onPlayerConnect(ClientConnection connection, ServerPlayerEntity player, ConnectedClientData ccd, CallbackInfo info) { + PlayerEvents.PLAYER_LOGGED_IN.invoker().onPlayerLoggedIn(player); + } + + @Inject(method = "remove", at = @At("HEAD")) + public void remove(ServerPlayerEntity player, CallbackInfo info) { + PlayerEvents.PLAYER_LOGGED_OUT.invoker().onPlayerLoggedOut(player); + } + + @Inject(method = "respawnPlayer", at = @At("RETURN")) + public void respawnPlayer(ServerPlayerEntity player, boolean alive, CallbackInfoReturnable info) { + PlayerEvents.PLAYER_RESPAWN.invoker().onPlayerRespawn(info.getReturnValue()); + } +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ProtoChunkMixin.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ProtoChunkMixin.java new file mode 100644 index 000000000..d19d0ab17 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ProtoChunkMixin.java @@ -0,0 +1,31 @@ +package org.dynmap.fabric_1_20_4.mixin; + +import net.minecraft.block.BlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.chunk.ProtoChunk; + +import org.dynmap.fabric_1_20_4.access.ProtoChunkAccessor; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(ProtoChunk.class) +public class ProtoChunkMixin implements ProtoChunkAccessor { + private boolean touchedByWorldGen = false; + + @Inject( + method = "setBlockState", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/world/chunk/ChunkSection;setBlockState(IIILnet/minecraft/block/BlockState;)Lnet/minecraft/block/BlockState;" + ) + ) + public void setBlockState(BlockPos pos, BlockState state, boolean moved, CallbackInfoReturnable info) { + touchedByWorldGen = true; + } + + public boolean getTouchedByWorldGen() { + return touchedByWorldGen; + } +} \ No newline at end of file diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ServerPlayNetworkHandlerMixin.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ServerPlayNetworkHandlerMixin.java new file mode 100644 index 000000000..bc130d1fe --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ServerPlayNetworkHandlerMixin.java @@ -0,0 +1,74 @@ +package org.dynmap.fabric_1_20_4.mixin; + +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.SignBlockEntity; +import net.minecraft.network.message.FilterMask; +import net.minecraft.network.message.SignedMessage; +import net.minecraft.network.packet.c2s.play.UpdateSignC2SPacket; +import net.minecraft.server.filter.FilteredMessage; +import net.minecraft.server.filter.TextStream; +import net.minecraft.server.network.ServerPlayNetworkHandler; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.text.Text; +import net.minecraft.util.math.BlockPos; + +import java.util.Arrays; +import java.util.List; + +import org.dynmap.fabric_1_20_4.event.BlockEvents; +import org.dynmap.fabric_1_20_4.event.ServerChatEvents; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.LocalCapture; + +@Mixin(ServerPlayNetworkHandler.class) +public abstract class ServerPlayNetworkHandlerMixin { + @Shadow + public ServerPlayerEntity player; + + @Inject( + method = "handleDecoratedMessage", + at = @At( + value = "HEAD" + ) + ) + public void onGameMessage(SignedMessage signedMessage, CallbackInfo ci) { + ServerChatEvents.EVENT.invoker().onChatMessage(player, signedMessage.getContent().getString()); + } + + @Inject( + method = "onSignUpdate", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/block/entity/SignBlockEntity;tryChangeText(Lnet/minecraft/entity/player/PlayerEntity;ZLjava/util/List;)V", + shift = At.Shift.BEFORE + ), + locals = LocalCapture.CAPTURE_FAILHARD, + cancellable = true + ) + public void onSignUpdate(UpdateSignC2SPacket packet, List signText, CallbackInfo ci, + ServerWorld serverWorld, BlockPos blockPos, BlockEntity blockEntity, SignBlockEntity signBlockEntity) + { + // Pull the raw text from the input. + String[] rawTexts = new String[4]; + for (int i=0; i newSignText = Arrays.stream(rawTexts).map((raw) -> new FilteredMessage(raw, FilterMask.PASS_THROUGH)).toList(); + + // Execute the setting of the texts with the edited values. + signBlockEntity.tryChangeText(this.player, packet.isFront(), newSignText); + + // Cancel the original tryChangeText() since we're calling it ourselves above. + ci.cancel(); + } +} \ No newline at end of file diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ServerPlayerEntityMixin.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ServerPlayerEntityMixin.java new file mode 100644 index 000000000..6cd4e3ca8 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ServerPlayerEntityMixin.java @@ -0,0 +1,31 @@ +package org.dynmap.fabric_1_20_4.mixin; + +import net.minecraft.entity.Entity; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; + +import org.dynmap.fabric_1_20_4.event.PlayerEvents; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(ServerPlayerEntity.class) +public class ServerPlayerEntityMixin { + @Inject(method = "teleport(Lnet/minecraft/server/world/ServerWorld;DDDFF)V", at = @At("RETURN")) + public void teleport(ServerWorld targetWorld, double x, double y, double z, float yaw, float pitch, CallbackInfo info) { + ServerPlayerEntity player = (ServerPlayerEntity) (Object) this; + if (targetWorld != player.getServerWorld()) { + PlayerEvents.PLAYER_CHANGED_DIMENSION.invoker().onPlayerChangedDimension(player); + } + } + + @Inject(method = "moveToWorld", at = @At("RETURN")) + public void moveToWorld(ServerWorld destination, CallbackInfoReturnable info) { + ServerPlayerEntity player = (ServerPlayerEntity) (Object) this; + if (player.getRemovalReason() == null) { + PlayerEvents.PLAYER_CHANGED_DIMENSION.invoker().onPlayerChangedDimension(player); + } + } +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ThreadedAnvilChunkStorageMixin.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ThreadedAnvilChunkStorageMixin.java new file mode 100644 index 000000000..1675f19de --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ThreadedAnvilChunkStorageMixin.java @@ -0,0 +1,33 @@ +package org.dynmap.fabric_1_20_4.mixin; + +import net.minecraft.server.world.ChunkHolder; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.server.world.ThreadedAnvilChunkStorage; +import net.minecraft.world.chunk.Chunk; + +import org.dynmap.fabric_1_20_4.access.ProtoChunkAccessor; +import org.dynmap.fabric_1_20_4.event.CustomServerChunkEvents; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(value = ThreadedAnvilChunkStorage.class, priority = 666 /* fire before Fabric API CHUNK_LOAD event */) +public abstract class ThreadedAnvilChunkStorageMixin { + @Final + @Shadow + ServerWorld world; + + @Inject( + /* Same place as fabric-lifecycle-events-v1 event CHUNK_LOAD (we will fire before it) */ + method = "method_17227", + at = @At("TAIL") + ) + private void onChunkGenerate(ChunkHolder chunkHolder, Chunk protoChunk, CallbackInfoReturnable callbackInfoReturnable) { + if (((ProtoChunkAccessor)protoChunk).getTouchedByWorldGen()) { + CustomServerChunkEvents.CHUNK_GENERATE.invoker().onChunkGenerate(this.world, callbackInfoReturnable.getReturnValue()); + } + } +} \ No newline at end of file diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/WorldChunkMixin.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/WorldChunkMixin.java new file mode 100644 index 000000000..71a0f1079 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/WorldChunkMixin.java @@ -0,0 +1,26 @@ +package org.dynmap.fabric_1_20_4.mixin; + +import net.minecraft.block.BlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.chunk.WorldChunk; + +import org.dynmap.fabric_1_20_4.event.BlockEvents; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(WorldChunk.class) +public abstract class WorldChunkMixin { + @Shadow + public abstract World getWorld(); + + @Inject(method = "setBlockState", at = @At("RETURN")) + public void setBlockState(BlockPos pos, BlockState state, boolean moved, CallbackInfoReturnable info) { + if (info.getReturnValue() != null) { + BlockEvents.BLOCK_EVENT.invoker().onBlockEvent(this.getWorld(), pos); + } + } +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/FabricPermissions.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/FabricPermissions.java new file mode 100644 index 000000000..11dc53821 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/FabricPermissions.java @@ -0,0 +1,47 @@ +package org.dynmap.fabric_1_20_4.permissions; + +import me.lucko.fabric.api.permissions.v0.Permissions; +import net.minecraft.entity.player.PlayerEntity; +import org.dynmap.Log; +import org.dynmap.fabric_1_20_4.DynmapPlugin; +import org.dynmap.json.simple.parser.JSONParser; + +import java.util.Set; +import java.util.stream.Collectors; + +public class FabricPermissions implements PermissionProvider { + + private String permissionKey(String perm) { + return "dynmap." + perm; + } + + @Override + public Set hasOfflinePermissions(String player, Set perms) { + return perms.stream() + .filter(perm -> hasOfflinePermission(player, perm)) + .collect(Collectors.toSet()); + } + + @Override + public boolean hasOfflinePermission(String player, String perm) { + return DynmapPlugin.plugin.isOp(player.toLowerCase()); + } + + @Override + public boolean has(PlayerEntity player, String permission) { + if (player == null) return false; + String name = player.getName().getString().toLowerCase(); + if (DynmapPlugin.plugin.isOp(name)) return true; + return Permissions.check(player, permissionKey(permission)); + } + + @Override + public boolean hasPermissionNode(PlayerEntity player, String permission) { + if (player != null) { + String name = player.getName().getString().toLowerCase(); + return DynmapPlugin.plugin.isOp(name); + } + return false; + } + +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/FilePermissions.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/FilePermissions.java new file mode 100644 index 000000000..58374d563 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/FilePermissions.java @@ -0,0 +1,103 @@ +package org.dynmap.fabric_1_20_4.permissions; + +import net.minecraft.entity.player.PlayerEntity; +import org.dynmap.ConfigurationNode; +import org.dynmap.Log; +import org.dynmap.fabric_1_20_4.DynmapPlugin; + +import java.io.File; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +public class FilePermissions implements PermissionProvider { + private HashMap> perms; + private Set defperms; + + public static FilePermissions create() { + File f = new File("dynmap/permissions.yml"); + if (!f.exists()) + return null; + ConfigurationNode cfg = new ConfigurationNode(f); + cfg.load(); + + Log.info("Using permissions.yml for access control"); + + return new FilePermissions(cfg); + } + + private FilePermissions(ConfigurationNode cfg) { + perms = new HashMap>(); + for (String k : cfg.keySet()) { + List p = cfg.getStrings(k, null); + if (p != null) { + k = k.toLowerCase(); + HashSet pset = new HashSet(); + for (String perm : p) { + pset.add(perm.toLowerCase()); + } + perms.put(k, pset); + if (k.equals("defaultuser")) { + defperms = pset; + } + } + } + } + + private boolean hasPerm(String player, String perm) { + Set ps = perms.get(player); + if ((ps != null) && (ps.contains(perm))) { + return true; + } + if (defperms.contains(perm)) { + return true; + } + return false; + } + + @Override + public Set hasOfflinePermissions(String player, Set perms) { + player = player.toLowerCase(); + HashSet rslt = new HashSet(); + if (DynmapPlugin.plugin.isOp(player)) { + rslt.addAll(perms); + } else { + for (String p : perms) { + if (hasPerm(player, p)) { + rslt.add(p); + } + } + } + return rslt; + } + + @Override + public boolean hasOfflinePermission(String player, String perm) { + player = player.toLowerCase(); + if (DynmapPlugin.plugin.isOp(player)) { + return true; + } else { + return hasPerm(player, perm); + } + } + + @Override + public boolean has(PlayerEntity psender, String permission) { + if (psender != null) { + String n = psender.getName().getString().toLowerCase(); + return hasPerm(n, permission); + } + return true; + } + + @Override + public boolean hasPermissionNode(PlayerEntity psender, String permission) { + if (psender != null) { + String player = psender.getName().getString().toLowerCase(); + return DynmapPlugin.plugin.isOp(player); + } + return false; + } + +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/LuckPermissions.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/LuckPermissions.java new file mode 100644 index 000000000..a86c26744 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/LuckPermissions.java @@ -0,0 +1,102 @@ +package org.dynmap.fabric_1_20_4.permissions; + +import me.lucko.fabric.api.permissions.v0.Permissions; +import net.luckperms.api.LuckPerms; +import net.luckperms.api.LuckPermsProvider; +import net.luckperms.api.cacheddata.CachedPermissionData; +import net.luckperms.api.model.user.User; +import net.luckperms.api.util.Tristate; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.server.MinecraftServer; +import org.dynmap.Log; +import org.dynmap.fabric_1_20_4.DynmapPlugin; +import org.dynmap.json.simple.JSONArray; +import org.dynmap.json.simple.JSONObject; +import org.dynmap.json.simple.parser.JSONParser; +import org.dynmap.json.simple.parser.ParseException; + +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; +import java.util.Optional; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; + +public class LuckPermissions implements PermissionProvider { + + private final JSONParser parser = new JSONParser(); + private LuckPerms api = null; + + private Optional getApi() { + if (api != null) return Optional.of(api); + try { + api = LuckPermsProvider.get(); + return Optional.of(api); + } catch (Exception ex) { + Log.warning("Trying to access LuckPerms before it has loaded"); + return Optional.empty(); + } + } + + private Optional cachedUUID(String username) { + try { + BufferedReader reader = new BufferedReader(new FileReader("usercache.json")); + JSONArray cache = (JSONArray) parser.parse(reader); + for (Object it : cache) { + JSONObject user = (JSONObject) it; + if (user.get("name").toString().equalsIgnoreCase(username)) { + String uuid = user.get("uuid").toString(); + return Optional.of(UUID.fromString(uuid)); + } + } + + reader.close(); + } catch (IOException | ParseException ex) { + Log.warning("Unable to read usercache.json"); + } + + return Optional.empty(); + } + + private String permissionKey(String perm) { + return "dynmap." + perm; + } + + @Override + public Set hasOfflinePermissions(String player, Set perms) { + return perms.stream() + .filter(perm -> hasOfflinePermission(player, perm)) + .collect(Collectors.toSet()); + } + + @Override + public boolean hasOfflinePermission(String player, String perm) { + if (DynmapPlugin.plugin.isOp(player.toLowerCase())) return true; + Optional api = getApi(); + Optional uuid = cachedUUID(player); + if (!uuid.isPresent() || !api.isPresent()) return false; + User user = api.get().getUserManager().loadUser(uuid.get()).join(); + CachedPermissionData permissions = user.getCachedData().getPermissionData(); + Tristate state = permissions.checkPermission(permissionKey(perm)); + return state.asBoolean(); + } + + @Override + public boolean has(PlayerEntity player, String permission) { + if (player == null) return false; + String name = player.getName().getString().toLowerCase(); + if (DynmapPlugin.plugin.isOp(name)) return true; + return Permissions.check(player, permissionKey(permission)); + } + + @Override + public boolean hasPermissionNode(PlayerEntity player, String permission) { + if (player != null) { + String name = player.getName().getString().toLowerCase(); + return DynmapPlugin.plugin.isOp(name); + } + return false; + } + +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/OpPermissions.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/OpPermissions.java new file mode 100644 index 000000000..6d90b10bb --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/OpPermissions.java @@ -0,0 +1,52 @@ +package org.dynmap.fabric_1_20_4.permissions; + +import net.minecraft.entity.player.PlayerEntity; +import org.dynmap.Log; +import org.dynmap.fabric_1_20_4.DynmapPlugin; + +import java.util.HashSet; +import java.util.Set; + +public class OpPermissions implements PermissionProvider { + public HashSet usrCommands = new HashSet(); + + public OpPermissions(String[] usrCommands) { + for (String usrCommand : usrCommands) { + this.usrCommands.add(usrCommand); + } + Log.info("Using ops.txt for access control"); + } + + @Override + public Set hasOfflinePermissions(String player, Set perms) { + HashSet rslt = new HashSet(); + if (DynmapPlugin.plugin.isOp(player)) { + rslt.addAll(perms); + } + return rslt; + } + + @Override + public boolean hasOfflinePermission(String player, String perm) { + return DynmapPlugin.plugin.isOp(player); + } + + @Override + public boolean has(PlayerEntity psender, String permission) { + if (psender != null) { + if (usrCommands.contains(permission)) { + return true; + } + return DynmapPlugin.plugin.isOp(psender.getName().getString()); + } + return true; + } + + @Override + public boolean hasPermissionNode(PlayerEntity psender, String permission) { + if (psender != null) { + return DynmapPlugin.plugin.isOp(psender.getName().getString()); + } + return true; + } +} diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/PermissionProvider.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/PermissionProvider.java new file mode 100644 index 000000000..68e5169d6 --- /dev/null +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/PermissionProvider.java @@ -0,0 +1,16 @@ +package org.dynmap.fabric_1_20_4.permissions; + +import net.minecraft.entity.player.PlayerEntity; + +import java.util.Set; + +public interface PermissionProvider { + boolean has(PlayerEntity sender, String permission); + + boolean hasPermissionNode(PlayerEntity sender, String permission); + + Set hasOfflinePermissions(String player, Set perms); + + boolean hasOfflinePermission(String player, String perm); + +} diff --git a/fabric-1.20.6/src/main/resources/assets/dynmap/icon.png b/fabric-1.20.6/src/main/resources/assets/dynmap/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d18f3e145d02440b065b2365ff14b9261b5877c4 GIT binary patch literal 34043 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%0AL%*pBb$DiCiIy`b6`#WF% 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" + #aws_secret_access_key: "" + #prefix: "" + #override_endpoint: "" + +components: + - class: org.dynmap.ClientConfigurationComponent + + # Remember to change the following class to org.dynmap.JsonFileClientUpdateComponent when using an external web server. + - class: org.dynmap.InternalClientUpdateComponent + sendhealth: true + sendposition: true + allowwebchat: true + webchat-interval: 5 + hidewebchatip: false + trustclientname: false + includehiddenplayers: false + # (optional) if true, color codes in player display names are used + use-name-colors: false + # (optional) if true, player login IDs will be used for web chat when their IPs match + use-player-login-ip: true + # (optional) if use-player-login-ip is true, setting this to true will cause chat messages not matching a known player IP to be ignored + require-player-login-ip: false + # (optional) block player login IDs that are banned from chatting + block-banned-player-chat: true + # Require login for web-to-server chat (requires login-enabled: true) + webchat-requires-login: false + # If set to true, users must have dynmap.webchat permission in order to chat + webchat-permissions: false + # Limit length of single chat messages + chatlengthlimit: 256 + # # Optional - make players hidden when they are inside/underground/in shadows (#=light level: 0=full shadow,15=sky) + # hideifshadow: 4 + # # Optional - make player hidden when they are under cover (#=sky light level,0=underground,15=open to sky) + # hideifundercover: 14 + # # (Optional) if true, players that are crouching/sneaking will be hidden + hideifsneaking: false + # optional, if true, players that are in spectator mode will be hidden + hideifspectator: false + # If true, player positions/status is protected (login with ID with dynmap.playermarkers.seeall permission required for info other than self) + protected-player-info: false + # If true, hide players with invisibility potion effects active + hide-if-invisiblity-potion: true + # If true, player names are not shown on map, chat, list + hidenames: false + #- class: org.dynmap.JsonFileClientUpdateComponent + # writeinterval: 1 + # sendhealth: true + # sendposition: true + # allowwebchat: true + # webchat-interval: 5 + # hidewebchatip: false + # includehiddenplayers: false + # use-name-colors: false + # use-player-login-ip: false + # require-player-login-ip: false + # block-banned-player-chat: true + # hideifshadow: 0 + # hideifundercover: 0 + # hideifsneaking: false + # # Require login for web-to-server chat (requires login-enabled: true) + # webchat-requires-login: false + # # If set to true, users must have dynmap.webchat permission in order to chat + # webchat-permissions: false + # # Limit length of single chat messages + # chatlengthlimit: 256 + # hide-if-invisiblity-potion: true + # hidenames: false + + - class: org.dynmap.SimpleWebChatComponent + allowchat: true + # If true, web UI users can supply name for chat using 'playername' URL parameter. 'trustclientname' must also be set true. + allowurlname: false + + # Note: this component is needed for the dmarker commands, and for the Marker API to be available to other plugins + - class: org.dynmap.MarkersComponent + type: markers + showlabel: false + enablesigns: false + # Default marker set for sign markers + default-sign-set: markers + # (optional) add spawn point markers to standard marker layer + showspawn: true + spawnicon: world + spawnlabel: "Spawn" + # (optional) layer for showing offline player's positions (for 'maxofflinetime' minutes after logoff) + showofflineplayers: false + offlinelabel: "Offline" + offlineicon: offlineuser + offlinehidebydefault: true + offlineminzoom: 0 + maxofflinetime: 30 + # (optional) layer for showing player's spawn beds + showspawnbeds: false + spawnbedlabel: "Spawn Beds" + spawnbedicon: bed + spawnbedhidebydefault: true + spawnbedminzoom: 0 + spawnbedformat: "%name%'s bed" + # (optional) Show world border (vanilla 1.8+) + showworldborder: true + worldborderlabel: "Border" + + - class: org.dynmap.ClientComponent + type: chat + allowurlname: false + - class: org.dynmap.ClientComponent + type: chatballoon + focuschatballoons: false + - class: org.dynmap.ClientComponent + type: chatbox + showplayerfaces: true + messagettl: 5 + # Optional: set number of lines in scrollable message history: if set, messagettl is not used to age out messages + #scrollback: 100 + # Optional: set maximum number of lines visible for chatbox + #visiblelines: 10 + # Optional: send push button + sendbutton: false + - class: org.dynmap.ClientComponent + type: playermarkers + showplayerfaces: true + showplayerhealth: true + # If true, show player body too (only valid if showplayerfaces=true) + showplayerbody: false + # Option to make player faces small - don't use with showplayerhealth or largeplayerfaces + smallplayerfaces: false + # Option to make player faces larger - don't use with showplayerhealth or smallplayerfaces + largeplayerfaces: false + # Optional - make player faces layer hidden by default + hidebydefault: false + # Optional - ordering priority in layer menu (low goes before high - default is 0) + layerprio: 0 + # Optional - label for player marker layer (default is 'Players') + label: "Players" + + #- class: org.dynmap.ClientComponent + # type: digitalclock + - class: org.dynmap.ClientComponent + type: link + + - class: org.dynmap.ClientComponent + type: timeofdayclock + showdigitalclock: true + #showweather: true + # Mouse pointer world coordinate display + - class: org.dynmap.ClientComponent + type: coord + label: "Location" + hidey: false + show-mcr: false + show-chunk: false + + # Note: more than one logo component can be defined + #- class: org.dynmap.ClientComponent + # type: logo + # text: "Dynmap" + # #logourl: "images/block_surface.png" + # linkurl: "http://forums.bukkit.org/threads/dynmap.489/" + # # Valid positions: top-left, top-right, bottom-left, bottom-right + # position: bottom-right + + #- class: org.dynmap.ClientComponent + # type: inactive + # timeout: 1800 # in seconds (1800 seconds = 30 minutes) + # redirecturl: inactive.html + # #showmessage: 'You were inactive for too long.' + + #- class: org.dynmap.TestComponent + # stuff: "This is some configuration-value" + +# Treat hiddenplayers.txt as a whitelist for players to be shown on the map? (Default false) +display-whitelist: false + +# How often a tile gets rendered (in seconds). +renderinterval: 1 + +# How many tiles on update queue before accelerate render interval +renderacceleratethreshold: 60 + +# How often to render tiles when backlog is above renderacceleratethreshold +renderaccelerateinterval: 0.2 + +# How many update tiles to work on at once (if not defined, default is 1/2 the number of cores) +tiles-rendered-at-once: 2 + +# If true, use normal priority threads for rendering (versus low priority) - this can keep rendering +# from starving on busy Windows boxes (Linux JVMs pretty much ignore thread priority), but may result +# in more competition for CPU resources with other processes +usenormalthreadpriority: true + +# Save and restore pending tile renders - prevents their loss on server shutdown or /reload +saverestorepending: true + +# Save period for pending jobs (in seconds): periodic saving for crash recovery of jobs +save-pending-period: 900 + +# Zoom-out tile update period - how often to scan for and process tile updates into zoom-out tiles (in seconds) +zoomoutperiod: 30 + +# Control whether zoom out tiles are validated on startup (can be needed if zoomout processing is interrupted, but can be expensive on large maps) +initial-zoomout-validate: true + +# Default delay on processing of updated tiles, in seconds. This can reduce potentially expensive re-rendering +# of frequently updated tiles (such as due to machines, pistons, quarries or other automation). Values can +# also be set on individual worlds and individual maps. +tileupdatedelay: 30 + +# Tile hashing is used to minimize tile file updates when no changes have occurred - set to false to disable +enabletilehash: true + +# Optional - hide ores: render as normal stone (so that they aren't revealed by maps) +#hideores: true + +# Optional - enabled BetterGrass style rendering of grass and snow block sides +#better-grass: true + +# Optional - enable smooth lighting by default on all maps supporting it (can be set per map as lighting option) +smooth-lighting: true + +# Optional - use world provider lighting table (good for custom worlds with custom lighting curves, like nether) +# false=classic Dynmap lighting curve +use-brightness-table: true + +# Optional - render specific block names using the textures and models of another block name: can be used to hide/disguise specific +# blocks (e.g. make ores look like stone, hide chests) or to provide simple support for rendering unsupported custom blocks +block-alias: +# "minecraft:quartz_ore": "stone" +# "diamond_ore": "coal_ore" + +# Default image format for HDMaps (png, jpg, jpg-q75, jpg-q80, jpg-q85, jpg-q90, jpg-q95, jpg-q100, webp, webp-q75, webp-q80, webp-q85, webp-q90, webp-q95, webp-q100, webp-l), +# Note: any webp format requires the presence of the 'webp command line tools' (cwebp, dwebp) (https://developers.google.com/speed/webp/download) +# +# Has no effect on maps with explicit format settings +image-format: jpg-q90 + +# If cwebp or dwebp are not on the PATH, use these settings to provide their full path. Do not use these settings if the tools are on the PATH +# For Windows, include .exe +# +#cwebpPath: /usr/bin/cwebp +#dwebpPath: /usr/bin/dwebp + +# use-generated-textures: if true, use generated textures (same as client); false is static water/lava textures +# correct-water-lighting: if true, use corrected water lighting (same as client); false is legacy water (darker) +# transparent-leaves: if true, leaves are transparent (lighting-wise): false is needed for some Spout versions that break lighting on leaf blocks +use-generated-textures: true +correct-water-lighting: true +transparent-leaves: true + +# ctm-support: if true, Connected Texture Mod (CTM) in texture packs is enabled (default) +ctm-support: true +# custom-colors-support: if true, Custom Colors in texture packs is enabled (default) +custom-colors-support: true + +# Control loading of player faces (if set to false, skins are never fetched) +#fetchskins: false + +# Control updating of player faces, once loaded (if faces are being managed by other apps or manually) +#refreshskins: false + +# Customize URL used for fetching player skins (%player% is macro for name, %uuid% for UUID) +skin-url: "http://skins.minecraft.net/MinecraftSkins/%player%.png" + +# Control behavior for new (1.0+) compass orientation (sunrise moved 90 degrees: east is now what used to be south) +# default is 'newrose' (preserve pre-1.0 maps, rotate rose) +# 'newnorth' is used to rotate maps and rose (requires fullrender of any HDMap map - same as 'newrose' for FlatMap or KzedMap) +compass-mode: newnorth + +# Triggers for automatic updates : blockupdate-with-id is debug for breaking down updates by ID:meta +# To disable, set just 'none' and comment/delete the rest +render-triggers: + - blockupdate + #- blockupdate-with-id + - chunkgenerate + #- none + +# Title for the web page - if not specified, defaults to the server's name (unless it is the default of 'Unknown Server') +#webpage-title: "My Awesome Server Map" + +# The path where the tile-files are placed. +tilespath: web/tiles + +# The path where the web-files are located. +webpath: web + +# If set to false, disable extraction of webpath content (good if using custom web UI or 3rd party web UI) +# Note: web interface is unsupported in this configuration - you're on your own +update-webpath-files: true + +# The path were the /dynmapexp command exports OBJ ZIP files +exportpath: export + +# The path where files can be imported for /dmarker commands +importpath: import + +# The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access). +# If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified) +#webserver-bindaddress: 0.0.0.0 + +# The TCP-port the webserver will listen on. +webserver-port: 8123 + +# Maximum concurrent session on internal web server - limits resources used in Bukkit server +max-sessions: 30 + +# Disables Webserver portion of Dynmap (Advanced users only) +disable-webserver: false + +# Enable/disable having the web server allow symbolic links (true=compatible with existing code, false=more secure (default)) +allow-symlinks: true + +# Enable login support +login-enabled: false +# Require login to access website (requires login-enabled: true) +login-required: false + +# Period between tile renders for fullrender, in seconds (non-zero to pace fullrenders, lessen CPU load) +timesliceinterval: 0.0 + +# Maximum chunk loads per server tick (1/20th of a second) - reducing this below 90 will impact render performance, but also will reduce server thread load +maxchunkspertick: 200 + +# Progress report interval for fullrender/radiusrender, in tiles. Must be 100 or greater +progressloginterval: 100 + +# Parallel fullrender: if defined, number of concurrent threads used for fullrender or radiusrender +# Note: setting this will result in much more intensive CPU use, some additional memory use. Caution should be used when +# setting this to equal or exceed the number of physical cores on the system. +#parallelrendercnt: 4 + +# Interval the browser should poll for updates. +updaterate: 2000 + +# If nonzero, server will pause fullrender/radiusrender processing when 'fullrenderplayerlimit' or more users are logged in +fullrenderplayerlimit: 0 +# If nonzero, server will pause update render processing when 'updateplayerlimit' or more users are logged in +updateplayerlimit: 0 +# Target limit on server thread use - msec per tick +per-tick-time-limit: 50 +# If TPS of server is below this setting, update renders processing is paused +update-min-tps: 18.0 +# If TPS of server is below this setting, full/radius renders processing is paused +fullrender-min-tps: 18.0 +# If TPS of server is below this setting, zoom out processing is paused +zoomout-min-tps: 18.0 + +showplayerfacesinmenu: true + +# Control whether players that are hidden or not on current map are grayed out (true=yes) +grayplayerswhenhidden: true + +# Set sidebaropened: 'true' to pin menu sidebar opened permanently, 'pinned' to default the sidebar to pinned, but allow it to unpin +#sidebaropened: true + +# Customized HTTP response headers - add 'id: value' pairs to all HTTP response headers (internal web server only) +#http-response-headers: +# Access-Control-Allow-Origin: "my-domain.com" +# X-Custom-Header-Of-Mine: "MyHeaderValue" + +# Trusted proxies for web server - which proxy addresses are trusted to supply valid X-Forwarded-For fields +# This now supports both IP address, and subnet ranges (e.g. 192.168.1.0/24 or 202.24.0.0/14 ) +trusted-proxies: + - "127.0.0.1" + - "0:0:0:0:0:0:0:1" + +joinmessage: "%playername% joined" +quitmessage: "%playername% quit" +spammessage: "You may only chat once every %interval% seconds." +# format for messages from web: %playername% substitutes sender ID (typically IP), %message% includes text +webmsgformat: "&color;2[WEB] %playername%: &color;f%message%" + +# Control whether layer control is presented on the UI (default is true) +showlayercontrol: true + +# Enable checking for banned IPs via banned-ips.txt (internal web server only) +check-banned-ips: true + +# Default selection when map page is loaded +defaultzoom: 0 +defaultworld: world +defaultmap: flat +# (optional) Zoom level and map to switch to when following a player, if possible +#followzoom: 3 +#followmap: surface + +# If true, make persistent record of IP addresses used by player logins, to support web IP to player matching +persist-ids-by-ip: true + +# If true, map text to cyrillic +cyrillic-support: false + +# Messages to customize +msg: + maptypes: "Map Types" + players: "Players" + chatrequireslogin: "Chat Requires Login" + chatnotallowed: "You are not permitted to send chat messages" + hiddennamejoin: "Player joined" + hiddennamequit: "Player quit" + +# URL for client configuration (only need to be tailored for proxies or other non-standard configurations) +url: + # configuration URL + #configuration: "up/configuration" + # update URL + #update: "up/world/{world}/{timestamp}" + # sendmessage URL + #sendmessage: "up/sendmessage" + # login URL + #login: "up/login" + # register URL + #register: "up/register" + # tiles base URL + #tiles: "tiles/" + # markers base URL + #markers: "tiles/" + # Snapshot cache size, in chunks +snapshotcachesize: 500 +# Snapshot cache uses soft references (true), else weak references (false) +soft-ref-cache: true + +# Player enter/exit title messages for map markers +# +# Processing period - how often to check player positions vs markers - default is 1000ms (1 second) +#enterexitperiod: 1000 +# Title message fade in time, in ticks (0.05 second intervals) - default is 10 (1/2 second) +#titleFadeIn: 10 +# Title message stay time, in ticks (0.05 second intervals) - default is 70 (3.5 seconds) +#titleStay: 70 +# Title message fade out time, in ticks (0.05 seocnd intervals) - default is 20 (1 second) +#titleFadeOut: 20 +# Enter/exit messages use on screen titles (true - default), if false chat messages are sent instead +#enterexitUseTitle: true +# Set true if new enter messages should supercede pending exit messages (vs being queued in order), default false +#enterReplacesExits: true + +# Published public URL for Dynmap server (allows users to use 'dynmap url' command to get public URL usable to access server +# If not set, 'dynmap url' will not return anything. URL should be fully qualified (e.g. https://mc.westeroscraft.com/) +#publicURL: http://my.greatserver.com/dynmap + +# Set to true to enable verbose startup messages - can help with debugging map configuration problems +# Set to false for a much quieter startup log +verbose: false + +# Enables debugging. +#debuggers: +# - class: org.dynmap.debug.LogDebugger +# Debug: dump blocks missing render data +dump-missing-blocks: false + +# Log4J defense: string substituted for attempts to use macros in web chat +hackAttemptBlurb: "(IaM5uchA1337Haxr-Ban Me!)" diff --git a/fabric-1.20.6/src/main/resources/dynmap.accesswidener b/fabric-1.20.6/src/main/resources/dynmap.accesswidener new file mode 100644 index 000000000..053a61109 --- /dev/null +++ b/fabric-1.20.6/src/main/resources/dynmap.accesswidener @@ -0,0 +1,3 @@ +accessWidener v1 named +accessible class net/minecraft/world/biome/Biome$Weather +accessible field net/minecraft/world/biome/Biome weather Lnet/minecraft/world/biome/Biome$Weather; \ No newline at end of file diff --git a/fabric-1.20.6/src/main/resources/dynmap.mixins.json b/fabric-1.20.6/src/main/resources/dynmap.mixins.json new file mode 100644 index 000000000..8c2450b7a --- /dev/null +++ b/fabric-1.20.6/src/main/resources/dynmap.mixins.json @@ -0,0 +1,19 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "org.dynmap.fabric_1_20_4.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + "BiomeEffectsAccessor", + "MinecraftServerMixin", + "PlayerManagerMixin", + "ProtoChunkMixin", + "ServerPlayerEntityMixin", + "ServerPlayNetworkHandlerMixin", + "ThreadedAnvilChunkStorageMixin", + "WorldChunkMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/fabric-1.20.6/src/main/resources/fabric.mod.json b/fabric-1.20.6/src/main/resources/fabric.mod.json new file mode 100644 index 000000000..b9890cef5 --- /dev/null +++ b/fabric-1.20.6/src/main/resources/fabric.mod.json @@ -0,0 +1,34 @@ +{ + "schemaVersion": 1, + "id": "dynmap", + "version": "${version}", + "name": "Dynmap", + "description": "Dynamic, Google-maps style rendered maps for your Minecraft server", + "authors": [ + "mikeprimm", + "LolHens", + "i509VCB" + ], + "contact": { + "homepage": "https://github.com/webbukkit/dynmap", + "sources": "https://github.com/webbukkit/dynmap" + }, + "license": "Apache-2.0", + "icon": "assets/dynmap/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "org.dynmap.fabric_1_20_4.DynmapMod" + ] + }, + "mixins": [ + "dynmap.mixins.json" + ], + "accessWidener" : "dynmap.accesswidener", + + "depends": { + "fabricloader": ">=0.15.2", + "fabric": ">=0.91.0", + "minecraft": ["1.20.3", "1.20.4"] + } +} diff --git a/fabric-1.20.6/src/main/resources/permissions.yml.example b/fabric-1.20.6/src/main/resources/permissions.yml.example new file mode 100644 index 000000000..a25f9adca --- /dev/null +++ b/fabric-1.20.6/src/main/resources/permissions.yml.example @@ -0,0 +1,27 @@ +# +# Sample permissions.yml for dynmap - trivial, flat-file based permissions for dynmap features +# To use, copy this file to dynmap/permissions.yml, and edit appropriate. File is YAML format. +# +# All operators have full permissions to all functions. +# All users receive the permissions under the 'defaultuser' section +# Specific users can be given more permissions by defining a section with their name containing their permisssions +# All permissions correspond to those documented here (https://github.com/webbukkit/dynmap/wiki/Permissions), but +# do NOT have the 'dynmap.' prefix when used here (e.g. 'dynmap.fullrender' permission is just 'fullrender' here). +# +defaultuser: + - render + - show.self + - hide.self + - sendtoweb + - stats + - marker.list + - marker.listsets + - marker.icons + - webregister + - webchat + #- marker.sign + +#playername1: +# - fullrender +# - cancelrender +# - radiusrender From d90fd79c4724c6ae632a13ebfce30016d9a5df90 Mon Sep 17 00:00:00 2001 From: Kosma Moczek Date: Tue, 14 May 2024 14:26:34 +0200 Subject: [PATCH 2/5] fabric-1.20.6: rename from 1.20.4 --- fabric-1.20.6/build.gradle | 2 +- .../DynmapMod.java | 2 +- .../DynmapPlugin.java | 22 +++++++++---------- .../FabricAdapter.java | 2 +- .../FabricCommandSender.java | 2 +- .../FabricLogger.java | 2 +- .../FabricMapChunkCache.java | 2 +- .../FabricPlayer.java | 2 +- .../FabricServer.java | 6 ++--- .../FabricWorld.java | 2 +- .../{fabric_1_20_4 => fabric_1_20_6}/NBT.java | 2 +- .../TaskRecord.java | 2 +- .../VersionCheck.java | 2 +- .../access/ProtoChunkAccessor.java | 2 +- .../command/DmapCommand.java | 4 ++-- .../command/DmarkerCommand.java | 4 ++-- .../command/DynmapCommand.java | 4 ++-- .../command/DynmapCommandExecutor.java | 4 ++-- .../command/DynmapExpCommand.java | 4 ++-- .../event/BlockEvents.java | 2 +- .../event/CustomServerChunkEvents.java | 2 +- .../event/CustomServerLifecycleEvents.java | 2 +- .../event/PlayerEvents.java | 2 +- .../event/ServerChatEvents.java | 2 +- .../mixin/BiomeEffectsAccessor.java | 2 +- .../mixin/MinecraftServerMixin.java | 4 ++-- .../mixin/PlayerManagerMixin.java | 4 ++-- .../mixin/ProtoChunkMixin.java | 4 ++-- .../mixin/ServerPlayNetworkHandlerMixin.java | 6 ++--- .../mixin/ServerPlayerEntityMixin.java | 4 ++-- .../mixin/ThreadedAnvilChunkStorageMixin.java | 6 ++--- .../mixin/WorldChunkMixin.java | 4 ++-- .../permissions/FabricPermissions.java | 4 ++-- .../permissions/FilePermissions.java | 4 ++-- .../permissions/LuckPermissions.java | 4 ++-- .../permissions/OpPermissions.java | 4 ++-- .../permissions/PermissionProvider.java | 2 +- .../src/main/resources/dynmap.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- 39 files changed, 69 insertions(+), 69 deletions(-) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/DynmapMod.java (98%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/DynmapPlugin.java (98%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/FabricAdapter.java (91%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/FabricCommandSender.java (96%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/FabricLogger.java (96%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/FabricMapChunkCache.java (99%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/FabricPlayer.java (99%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/FabricServer.java (99%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/FabricWorld.java (99%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/NBT.java (98%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/TaskRecord.java (96%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/VersionCheck.java (99%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/access/ProtoChunkAccessor.java (65%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/command/DmapCommand.java (60%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/command/DmarkerCommand.java (61%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/command/DynmapCommand.java (61%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/command/DynmapCommandExecutor.java (96%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/command/DynmapExpCommand.java (62%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/event/BlockEvents.java (97%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/event/CustomServerChunkEvents.java (94%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/event/CustomServerLifecycleEvents.java (93%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/event/PlayerEvents.java (98%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/event/ServerChatEvents.java (94%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/mixin/BiomeEffectsAccessor.java (86%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/mixin/MinecraftServerMixin.java (84%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/mixin/PlayerManagerMixin.java (93%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/mixin/ProtoChunkMixin.java (91%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/mixin/ServerPlayNetworkHandlerMixin.java (95%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/mixin/ServerPlayerEntityMixin.java (93%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/mixin/ThreadedAnvilChunkStorageMixin.java (88%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/mixin/WorldChunkMixin.java (90%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/permissions/FabricPermissions.java (93%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/permissions/FilePermissions.java (96%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/permissions/LuckPermissions.java (97%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/permissions/OpPermissions.java (93%) rename fabric-1.20.6/src/main/java/org/dynmap/{fabric_1_20_4 => fabric_1_20_6}/permissions/PermissionProvider.java (89%) diff --git a/fabric-1.20.6/build.gradle b/fabric-1.20.6/build.gradle index 8e0752415..b21c36a38 100644 --- a/fabric-1.20.6/build.gradle +++ b/fabric-1.20.6/build.gradle @@ -8,7 +8,7 @@ group = parent.group eclipse { project { - name = "Dynmap(Fabric-1.20.4)" + name = "Dynmap(Fabric-1.20.6)" } } diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/DynmapMod.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/DynmapMod.java similarity index 98% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/DynmapMod.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/DynmapMod.java index dd89f6b6e..e8f3ebb2e 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/DynmapMod.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/DynmapMod.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4; +package org.dynmap.fabric_1_20_6; import net.fabricmc.api.ModInitializer; import net.fabricmc.loader.api.FabricLoader; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/DynmapPlugin.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/DynmapPlugin.java similarity index 98% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/DynmapPlugin.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/DynmapPlugin.java index 438dc0174..3f6264564 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/DynmapPlugin.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/DynmapPlugin.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4; +package org.dynmap.fabric_1_20_6; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.exceptions.CommandSyntaxException; @@ -35,16 +35,16 @@ import org.dynmap.common.DynmapListenerManager; import org.dynmap.common.DynmapPlayer; import org.dynmap.common.chunk.GenericChunkCache; -import org.dynmap.fabric_1_20_4.command.DmapCommand; -import org.dynmap.fabric_1_20_4.command.DmarkerCommand; -import org.dynmap.fabric_1_20_4.command.DynmapCommand; -import org.dynmap.fabric_1_20_4.command.DynmapExpCommand; -import org.dynmap.fabric_1_20_4.event.BlockEvents; -import org.dynmap.fabric_1_20_4.event.CustomServerChunkEvents; -import org.dynmap.fabric_1_20_4.event.CustomServerLifecycleEvents; -import org.dynmap.fabric_1_20_4.event.PlayerEvents; -import org.dynmap.fabric_1_20_4.mixin.BiomeEffectsAccessor; -import org.dynmap.fabric_1_20_4.permissions.*; +import org.dynmap.fabric_1_20_6.command.DmapCommand; +import org.dynmap.fabric_1_20_6.command.DmarkerCommand; +import org.dynmap.fabric_1_20_6.command.DynmapCommand; +import org.dynmap.fabric_1_20_6.command.DynmapExpCommand; +import org.dynmap.fabric_1_20_6.event.BlockEvents; +import org.dynmap.fabric_1_20_6.event.CustomServerChunkEvents; +import org.dynmap.fabric_1_20_6.event.CustomServerLifecycleEvents; +import org.dynmap.fabric_1_20_6.event.PlayerEvents; +import org.dynmap.fabric_1_20_6.mixin.BiomeEffectsAccessor; +import org.dynmap.fabric_1_20_6.permissions.*; import org.dynmap.permissions.PermissionsHandler; import org.dynmap.renderer.DynmapBlockState; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricAdapter.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricAdapter.java similarity index 91% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricAdapter.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricAdapter.java index ca90c9cf2..0e7b0d839 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricAdapter.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricAdapter.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4; +package org.dynmap.fabric_1_20_6; import net.minecraft.server.world.ServerWorld; import org.dynmap.DynmapLocation; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricCommandSender.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricCommandSender.java similarity index 96% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricCommandSender.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricCommandSender.java index 265ab9a36..7a88d409d 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricCommandSender.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricCommandSender.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4; +package org.dynmap.fabric_1_20_6; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.text.Text; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricLogger.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricLogger.java similarity index 96% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricLogger.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricLogger.java index 680b7d45c..2d7c873a0 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricLogger.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricLogger.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4; +package org.dynmap.fabric_1_20_6; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricMapChunkCache.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricMapChunkCache.java similarity index 99% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricMapChunkCache.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricMapChunkCache.java index 91910b635..c24717307 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricMapChunkCache.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricMapChunkCache.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4; +package org.dynmap.fabric_1_20_6; import net.minecraft.nbt.*; import net.minecraft.server.world.ServerChunkManager; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricPlayer.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricPlayer.java similarity index 99% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricPlayer.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricPlayer.java index 6755ab7cc..19e696537 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricPlayer.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricPlayer.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4; +package org.dynmap.fabric_1_20_6; import com.google.common.collect.Iterables; import com.google.gson.Gson; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricServer.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricServer.java similarity index 99% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricServer.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricServer.java index 24e525b90..ddada1e6a 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricServer.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricServer.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4; +package org.dynmap.fabric_1_20_6; import com.mojang.authlib.GameProfile; import net.fabricmc.loader.api.FabricLoader; @@ -28,8 +28,8 @@ import org.dynmap.common.DynmapListenerManager; import org.dynmap.common.DynmapPlayer; import org.dynmap.common.DynmapServerInterface; -import org.dynmap.fabric_1_20_4.event.BlockEvents; -import org.dynmap.fabric_1_20_4.event.ServerChatEvents; +import org.dynmap.fabric_1_20_6.event.BlockEvents; +import org.dynmap.fabric_1_20_6.event.ServerChatEvents; import org.dynmap.utils.MapChunkCache; import org.dynmap.utils.VisibilityLimit; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricWorld.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricWorld.java similarity index 99% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricWorld.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricWorld.java index 132382c78..0093aacde 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/FabricWorld.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricWorld.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4; +package org.dynmap.fabric_1_20_6; import net.minecraft.registry.RegistryKey; import net.minecraft.util.math.BlockPos; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/NBT.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/NBT.java similarity index 98% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/NBT.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/NBT.java index deaac1d62..51a58e41c 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/NBT.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/NBT.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4; +package org.dynmap.fabric_1_20_6; import org.dynmap.common.chunk.GenericBitStorage; import org.dynmap.common.chunk.GenericNBTCompound; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/TaskRecord.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/TaskRecord.java similarity index 96% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/TaskRecord.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/TaskRecord.java index f3f3d7b85..5570150a3 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/TaskRecord.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/TaskRecord.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4; +package org.dynmap.fabric_1_20_6; import java.util.concurrent.FutureTask; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/VersionCheck.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/VersionCheck.java similarity index 99% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/VersionCheck.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/VersionCheck.java index ecbda3697..f687f2e4f 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/VersionCheck.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/VersionCheck.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4; +package org.dynmap.fabric_1_20_6; import org.dynmap.DynmapCore; import org.dynmap.Log; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/access/ProtoChunkAccessor.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/access/ProtoChunkAccessor.java similarity index 65% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/access/ProtoChunkAccessor.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/access/ProtoChunkAccessor.java index 7ef7654ea..acb68e5a4 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/access/ProtoChunkAccessor.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/access/ProtoChunkAccessor.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4.access; +package org.dynmap.fabric_1_20_6.access; public interface ProtoChunkAccessor { boolean getTouchedByWorldGen(); diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DmapCommand.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DmapCommand.java similarity index 60% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DmapCommand.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DmapCommand.java index f27998672..53c6235df 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DmapCommand.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DmapCommand.java @@ -1,6 +1,6 @@ -package org.dynmap.fabric_1_20_4.command; +package org.dynmap.fabric_1_20_6.command; -import org.dynmap.fabric_1_20_4.DynmapPlugin; +import org.dynmap.fabric_1_20_6.DynmapPlugin; public class DmapCommand extends DynmapCommandExecutor { public DmapCommand(DynmapPlugin p) { diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DmarkerCommand.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DmarkerCommand.java similarity index 61% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DmarkerCommand.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DmarkerCommand.java index 798e4d0c0..859a57996 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DmarkerCommand.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DmarkerCommand.java @@ -1,6 +1,6 @@ -package org.dynmap.fabric_1_20_4.command; +package org.dynmap.fabric_1_20_6.command; -import org.dynmap.fabric_1_20_4.DynmapPlugin; +import org.dynmap.fabric_1_20_6.DynmapPlugin; public class DmarkerCommand extends DynmapCommandExecutor { public DmarkerCommand(DynmapPlugin p) { diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapCommand.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DynmapCommand.java similarity index 61% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapCommand.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DynmapCommand.java index 0d87c8957..f961015b1 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapCommand.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DynmapCommand.java @@ -1,6 +1,6 @@ -package org.dynmap.fabric_1_20_4.command; +package org.dynmap.fabric_1_20_6.command; -import org.dynmap.fabric_1_20_4.DynmapPlugin; +import org.dynmap.fabric_1_20_6.DynmapPlugin; public class DynmapCommand extends DynmapCommandExecutor { public DynmapCommand(DynmapPlugin p) { diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapCommandExecutor.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DynmapCommandExecutor.java similarity index 96% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapCommandExecutor.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DynmapCommandExecutor.java index 86bb94b9d..783365be5 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapCommandExecutor.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DynmapCommandExecutor.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4.command; +package org.dynmap.fabric_1_20_6.command; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; @@ -11,7 +11,7 @@ import java.util.Arrays; -import org.dynmap.fabric_1_20_4.DynmapPlugin; +import org.dynmap.fabric_1_20_6.DynmapPlugin; import static com.mojang.brigadier.arguments.StringArgumentType.greedyString; import static net.minecraft.server.command.CommandManager.argument; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapExpCommand.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DynmapExpCommand.java similarity index 62% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapExpCommand.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DynmapExpCommand.java index 81f016bb8..389c5873b 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/command/DynmapExpCommand.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/command/DynmapExpCommand.java @@ -1,6 +1,6 @@ -package org.dynmap.fabric_1_20_4.command; +package org.dynmap.fabric_1_20_6.command; -import org.dynmap.fabric_1_20_4.DynmapPlugin; +import org.dynmap.fabric_1_20_6.DynmapPlugin; public class DynmapExpCommand extends DynmapCommandExecutor { public DynmapExpCommand(DynmapPlugin p) { diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/BlockEvents.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/BlockEvents.java similarity index 97% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/BlockEvents.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/BlockEvents.java index 0ba347b58..cff4c3837 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/BlockEvents.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/BlockEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4.event; +package org.dynmap.fabric_1_20_6.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/CustomServerChunkEvents.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/CustomServerChunkEvents.java similarity index 94% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/CustomServerChunkEvents.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/CustomServerChunkEvents.java index 21aa84771..8c845949f 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/CustomServerChunkEvents.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/CustomServerChunkEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4.event; +package org.dynmap.fabric_1_20_6.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/CustomServerLifecycleEvents.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/CustomServerLifecycleEvents.java similarity index 93% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/CustomServerLifecycleEvents.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/CustomServerLifecycleEvents.java index b15c1ba7c..7356aa38a 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/CustomServerLifecycleEvents.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/CustomServerLifecycleEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4.event; +package org.dynmap.fabric_1_20_6.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/PlayerEvents.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/PlayerEvents.java similarity index 98% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/PlayerEvents.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/PlayerEvents.java index 1e27cf741..70bcca258 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/PlayerEvents.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/PlayerEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4.event; +package org.dynmap.fabric_1_20_6.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/ServerChatEvents.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/ServerChatEvents.java similarity index 94% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/ServerChatEvents.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/ServerChatEvents.java index 25d8c5ca1..05f47672a 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/event/ServerChatEvents.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/event/ServerChatEvents.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4.event; +package org.dynmap.fabric_1_20_6.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/BiomeEffectsAccessor.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/BiomeEffectsAccessor.java similarity index 86% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/BiomeEffectsAccessor.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/BiomeEffectsAccessor.java index 192507b47..3b8d6224a 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/BiomeEffectsAccessor.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/BiomeEffectsAccessor.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4.mixin; +package org.dynmap.fabric_1_20_6.mixin; import net.minecraft.world.biome.BiomeEffects; import org.spongepowered.asm.mixin.Mixin; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/MinecraftServerMixin.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/MinecraftServerMixin.java similarity index 84% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/MinecraftServerMixin.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/MinecraftServerMixin.java index 1c76a8ec2..a125b20ea 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/MinecraftServerMixin.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/MinecraftServerMixin.java @@ -1,8 +1,8 @@ -package org.dynmap.fabric_1_20_4.mixin; +package org.dynmap.fabric_1_20_6.mixin; import net.minecraft.server.MinecraftServer; -import org.dynmap.fabric_1_20_4.event.CustomServerLifecycleEvents; +import org.dynmap.fabric_1_20_6.event.CustomServerLifecycleEvents; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/PlayerManagerMixin.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/PlayerManagerMixin.java similarity index 93% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/PlayerManagerMixin.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/PlayerManagerMixin.java index 2bb586ad9..f45257de8 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/PlayerManagerMixin.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/PlayerManagerMixin.java @@ -1,11 +1,11 @@ -package org.dynmap.fabric_1_20_4.mixin; +package org.dynmap.fabric_1_20_6.mixin; import net.minecraft.network.ClientConnection; import net.minecraft.server.PlayerManager; import net.minecraft.server.network.ConnectedClientData; import net.minecraft.server.network.ServerPlayerEntity; -import org.dynmap.fabric_1_20_4.event.PlayerEvents; +import org.dynmap.fabric_1_20_6.event.PlayerEvents; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ProtoChunkMixin.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/ProtoChunkMixin.java similarity index 91% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ProtoChunkMixin.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/ProtoChunkMixin.java index d19d0ab17..b7684a1a3 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ProtoChunkMixin.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/ProtoChunkMixin.java @@ -1,10 +1,10 @@ -package org.dynmap.fabric_1_20_4.mixin; +package org.dynmap.fabric_1_20_6.mixin; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.chunk.ProtoChunk; -import org.dynmap.fabric_1_20_4.access.ProtoChunkAccessor; +import org.dynmap.fabric_1_20_6.access.ProtoChunkAccessor; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ServerPlayNetworkHandlerMixin.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/ServerPlayNetworkHandlerMixin.java similarity index 95% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ServerPlayNetworkHandlerMixin.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/ServerPlayNetworkHandlerMixin.java index bc130d1fe..ceb4eced3 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ServerPlayNetworkHandlerMixin.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/ServerPlayNetworkHandlerMixin.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4.mixin; +package org.dynmap.fabric_1_20_6.mixin; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; @@ -17,8 +17,8 @@ import java.util.Arrays; import java.util.List; -import org.dynmap.fabric_1_20_4.event.BlockEvents; -import org.dynmap.fabric_1_20_4.event.ServerChatEvents; +import org.dynmap.fabric_1_20_6.event.BlockEvents; +import org.dynmap.fabric_1_20_6.event.ServerChatEvents; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ServerPlayerEntityMixin.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/ServerPlayerEntityMixin.java similarity index 93% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ServerPlayerEntityMixin.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/ServerPlayerEntityMixin.java index 6cd4e3ca8..0adfe9dd2 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ServerPlayerEntityMixin.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/ServerPlayerEntityMixin.java @@ -1,10 +1,10 @@ -package org.dynmap.fabric_1_20_4.mixin; +package org.dynmap.fabric_1_20_6.mixin; import net.minecraft.entity.Entity; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; -import org.dynmap.fabric_1_20_4.event.PlayerEvents; +import org.dynmap.fabric_1_20_6.event.PlayerEvents; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ThreadedAnvilChunkStorageMixin.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/ThreadedAnvilChunkStorageMixin.java similarity index 88% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ThreadedAnvilChunkStorageMixin.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/ThreadedAnvilChunkStorageMixin.java index 1675f19de..0adfbb768 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/ThreadedAnvilChunkStorageMixin.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/ThreadedAnvilChunkStorageMixin.java @@ -1,12 +1,12 @@ -package org.dynmap.fabric_1_20_4.mixin; +package org.dynmap.fabric_1_20_6.mixin; import net.minecraft.server.world.ChunkHolder; import net.minecraft.server.world.ServerWorld; import net.minecraft.server.world.ThreadedAnvilChunkStorage; import net.minecraft.world.chunk.Chunk; -import org.dynmap.fabric_1_20_4.access.ProtoChunkAccessor; -import org.dynmap.fabric_1_20_4.event.CustomServerChunkEvents; +import org.dynmap.fabric_1_20_6.access.ProtoChunkAccessor; +import org.dynmap.fabric_1_20_6.event.CustomServerChunkEvents; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/WorldChunkMixin.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/WorldChunkMixin.java similarity index 90% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/WorldChunkMixin.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/WorldChunkMixin.java index 71a0f1079..3e5b9fb67 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/mixin/WorldChunkMixin.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/mixin/WorldChunkMixin.java @@ -1,11 +1,11 @@ -package org.dynmap.fabric_1_20_4.mixin; +package org.dynmap.fabric_1_20_6.mixin; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.WorldChunk; -import org.dynmap.fabric_1_20_4.event.BlockEvents; +import org.dynmap.fabric_1_20_6.event.BlockEvents; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/FabricPermissions.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/FabricPermissions.java similarity index 93% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/FabricPermissions.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/FabricPermissions.java index 11dc53821..42409e1bf 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/FabricPermissions.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/FabricPermissions.java @@ -1,9 +1,9 @@ -package org.dynmap.fabric_1_20_4.permissions; +package org.dynmap.fabric_1_20_6.permissions; import me.lucko.fabric.api.permissions.v0.Permissions; import net.minecraft.entity.player.PlayerEntity; import org.dynmap.Log; -import org.dynmap.fabric_1_20_4.DynmapPlugin; +import org.dynmap.fabric_1_20_6.DynmapPlugin; import org.dynmap.json.simple.parser.JSONParser; import java.util.Set; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/FilePermissions.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/FilePermissions.java similarity index 96% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/FilePermissions.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/FilePermissions.java index 58374d563..44c015c37 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/FilePermissions.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/FilePermissions.java @@ -1,9 +1,9 @@ -package org.dynmap.fabric_1_20_4.permissions; +package org.dynmap.fabric_1_20_6.permissions; import net.minecraft.entity.player.PlayerEntity; import org.dynmap.ConfigurationNode; import org.dynmap.Log; -import org.dynmap.fabric_1_20_4.DynmapPlugin; +import org.dynmap.fabric_1_20_6.DynmapPlugin; import java.io.File; import java.util.HashMap; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/LuckPermissions.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/LuckPermissions.java similarity index 97% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/LuckPermissions.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/LuckPermissions.java index a86c26744..48f93c7ec 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/LuckPermissions.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/LuckPermissions.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4.permissions; +package org.dynmap.fabric_1_20_6.permissions; import me.lucko.fabric.api.permissions.v0.Permissions; import net.luckperms.api.LuckPerms; @@ -9,7 +9,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.MinecraftServer; import org.dynmap.Log; -import org.dynmap.fabric_1_20_4.DynmapPlugin; +import org.dynmap.fabric_1_20_6.DynmapPlugin; import org.dynmap.json.simple.JSONArray; import org.dynmap.json.simple.JSONObject; import org.dynmap.json.simple.parser.JSONParser; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/OpPermissions.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/OpPermissions.java similarity index 93% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/OpPermissions.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/OpPermissions.java index 6d90b10bb..d74e2a05b 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/OpPermissions.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/OpPermissions.java @@ -1,8 +1,8 @@ -package org.dynmap.fabric_1_20_4.permissions; +package org.dynmap.fabric_1_20_6.permissions; import net.minecraft.entity.player.PlayerEntity; import org.dynmap.Log; -import org.dynmap.fabric_1_20_4.DynmapPlugin; +import org.dynmap.fabric_1_20_6.DynmapPlugin; import java.util.HashSet; import java.util.Set; diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/PermissionProvider.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/PermissionProvider.java similarity index 89% rename from fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/PermissionProvider.java rename to fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/PermissionProvider.java index 68e5169d6..d17c0d509 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_4/permissions/PermissionProvider.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/permissions/PermissionProvider.java @@ -1,4 +1,4 @@ -package org.dynmap.fabric_1_20_4.permissions; +package org.dynmap.fabric_1_20_6.permissions; import net.minecraft.entity.player.PlayerEntity; diff --git a/fabric-1.20.6/src/main/resources/dynmap.mixins.json b/fabric-1.20.6/src/main/resources/dynmap.mixins.json index 8c2450b7a..21f208131 100644 --- a/fabric-1.20.6/src/main/resources/dynmap.mixins.json +++ b/fabric-1.20.6/src/main/resources/dynmap.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "org.dynmap.fabric_1_20_4.mixin", + "package": "org.dynmap.fabric_1_20_6.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ "BiomeEffectsAccessor", diff --git a/fabric-1.20.6/src/main/resources/fabric.mod.json b/fabric-1.20.6/src/main/resources/fabric.mod.json index b9890cef5..73ef11460 100644 --- a/fabric-1.20.6/src/main/resources/fabric.mod.json +++ b/fabric-1.20.6/src/main/resources/fabric.mod.json @@ -18,7 +18,7 @@ "environment": "*", "entrypoints": { "main": [ - "org.dynmap.fabric_1_20_4.DynmapMod" + "org.dynmap.fabric_1_20_6.DynmapMod" ] }, "mixins": [ From f38e638d2242329e690facbb3796e753df9560e7 Mon Sep 17 00:00:00 2001 From: Kosma Moczek Date: Tue, 14 May 2024 14:29:29 +0200 Subject: [PATCH 3/5] fabric-1.20.6: add to settings.gradle --- settings.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/settings.gradle b/settings.gradle index c6b526789..1bd0059d3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -30,6 +30,7 @@ include ':bukkit-helper' include ':dynmap-api' include ':DynmapCore' include ':DynmapCoreAPI' +include ':fabric-1.20.6' include ':fabric-1.20.4' include ':fabric-1.20.2' include ':fabric-1.20' @@ -70,6 +71,7 @@ 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 project(':DynmapCoreAPI').projectDir = "$rootDir/DynmapCoreAPI" as File +project(':fabric-1.20.6').projectDir = "$rootDir/fabric-1.20.6" as File project(':fabric-1.20.4').projectDir = "$rootDir/fabric-1.20.4" as File project(':fabric-1.20.2').projectDir = "$rootDir/fabric-1.20.2" as File project(':fabric-1.20').projectDir = "$rootDir/fabric-1.20" as File From 4d7d66f199357656b9cc21205243db68ed3b985b Mon Sep 17 00:00:00 2001 From: Kosma Moczek Date: Sun, 2 Jun 2024 12:05:55 +0200 Subject: [PATCH 4/5] fabric: update Loom to 1.6.11 --- fabric-1.14.4/build.gradle | 2 +- fabric-1.15.2/build.gradle | 2 +- fabric-1.16.4/build.gradle | 2 +- fabric-1.17.1/build.gradle | 2 +- fabric-1.18.2/build.gradle | 2 +- fabric-1.19.4/build.gradle | 2 +- fabric-1.20.2/build.gradle | 2 +- fabric-1.20.4/build.gradle | 2 +- fabric-1.20.6/build.gradle | 2 +- fabric-1.20/build.gradle | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/fabric-1.14.4/build.gradle b/fabric-1.14.4/build.gradle index af1921653..6c68b0e10 100644 --- a/fabric-1.14.4/build.gradle +++ b/fabric-1.14.4/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.1.10' + id 'fabric-loom' version '1.6.11' } apply plugin: 'eclipse' diff --git a/fabric-1.15.2/build.gradle b/fabric-1.15.2/build.gradle index 5e59b85b5..def51de86 100644 --- a/fabric-1.15.2/build.gradle +++ b/fabric-1.15.2/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.1.10' + id 'fabric-loom' version '1.6.11' } archivesBaseName = "Dynmap" diff --git a/fabric-1.16.4/build.gradle b/fabric-1.16.4/build.gradle index a762478ba..d299efd14 100644 --- a/fabric-1.16.4/build.gradle +++ b/fabric-1.16.4/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.1.10' + id 'fabric-loom' version '1.6.11' } archivesBaseName = "Dynmap" diff --git a/fabric-1.17.1/build.gradle b/fabric-1.17.1/build.gradle index 3209c77d2..7ad5187f5 100644 --- a/fabric-1.17.1/build.gradle +++ b/fabric-1.17.1/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.1.10' + id 'fabric-loom' version '1.6.11' } archivesBaseName = "Dynmap" diff --git a/fabric-1.18.2/build.gradle b/fabric-1.18.2/build.gradle index 07e071588..4896dae31 100644 --- a/fabric-1.18.2/build.gradle +++ b/fabric-1.18.2/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'fabric-loom' version '1.1.10' + id 'fabric-loom' version '1.6.11' } archivesBaseName = "Dynmap" diff --git a/fabric-1.19.4/build.gradle b/fabric-1.19.4/build.gradle index 082eec146..8c7cffe03 100644 --- a/fabric-1.19.4/build.gradle +++ b/fabric-1.19.4/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.1.10' + id 'fabric-loom' version '1.6.11' } archivesBaseName = "Dynmap" diff --git a/fabric-1.20.2/build.gradle b/fabric-1.20.2/build.gradle index 901ae39cf..5824667af 100644 --- a/fabric-1.20.2/build.gradle +++ b/fabric-1.20.2/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.1.10' + id 'fabric-loom' version '1.6.11' } archivesBaseName = "Dynmap" diff --git a/fabric-1.20.4/build.gradle b/fabric-1.20.4/build.gradle index 8e0752415..afd195432 100644 --- a/fabric-1.20.4/build.gradle +++ b/fabric-1.20.4/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.1.10' + id 'fabric-loom' version '1.6.11' } archivesBaseName = "Dynmap" diff --git a/fabric-1.20.6/build.gradle b/fabric-1.20.6/build.gradle index b21c36a38..eeb71c885 100644 --- a/fabric-1.20.6/build.gradle +++ b/fabric-1.20.6/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.1.10' + id 'fabric-loom' version '1.6.11' } archivesBaseName = "Dynmap" diff --git a/fabric-1.20/build.gradle b/fabric-1.20/build.gradle index f174f26f5..fbbbc68c4 100644 --- a/fabric-1.20/build.gradle +++ b/fabric-1.20/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.1.10' + id 'fabric-loom' version '1.6.11' } archivesBaseName = "Dynmap" From 788addccdeda95e9ca32606a6d9d362fa676a224 Mon Sep 17 00:00:00 2001 From: Kosma Moczek Date: Sun, 2 Jun 2024 12:06:56 +0200 Subject: [PATCH 5/5] fabric-1.20.6: update to 1.20.6 --- fabric-1.20.6/build.gradle | 2 +- fabric-1.20.6/gradle.properties | 8 ++++---- .../main/java/org/dynmap/fabric_1_20_6/FabricWorld.java | 7 ++++--- fabric-1.20.6/src/main/resources/fabric.mod.json | 6 +++--- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/fabric-1.20.6/build.gradle b/fabric-1.20.6/build.gradle index eeb71c885..eea83fed9 100644 --- a/fabric-1.20.6/build.gradle +++ b/fabric-1.20.6/build.gradle @@ -12,7 +12,7 @@ eclipse { } } -sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly. +sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(21) // Need this here so eclipse task generates correctly. configurations { shadow diff --git a/fabric-1.20.6/gradle.properties b/fabric-1.20.6/gradle.properties index 2b665a9ac..c0365ab5b 100644 --- a/fabric-1.20.6/gradle.properties +++ b/fabric-1.20.6/gradle.properties @@ -1,4 +1,4 @@ -minecraft_version=1.20.4 -yarn_mappings=1.20.4+build.1 -loader_version=0.15.2 -fabric_version=0.91.2+1.20.4 +minecraft_version=1.20.6 +yarn_mappings=1.20.6+build.1 +loader_version=0.15.11 +fabric_version=0.98.0+1.20.6 diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricWorld.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricWorld.java index 0093aacde..00c60811d 100644 --- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricWorld.java +++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricWorld.java @@ -96,9 +96,10 @@ public boolean isTheEnd() { @Override public DynmapLocation getSpawnLocation() { if (world != null) { - spawnloc.x = world.getLevelProperties().getSpawnX(); - spawnloc.y = world.getLevelProperties().getSpawnY(); - spawnloc.z = world.getLevelProperties().getSpawnZ(); + BlockPos spawnPos = world.getLevelProperties().getSpawnPos(); + spawnloc.x = spawnPos.getX(); + spawnloc.y = spawnPos.getY(); + spawnloc.z = spawnPos.getZ(); spawnloc.world = this.getName(); } return spawnloc; diff --git a/fabric-1.20.6/src/main/resources/fabric.mod.json b/fabric-1.20.6/src/main/resources/fabric.mod.json index 73ef11460..ea83e0e60 100644 --- a/fabric-1.20.6/src/main/resources/fabric.mod.json +++ b/fabric-1.20.6/src/main/resources/fabric.mod.json @@ -27,8 +27,8 @@ "accessWidener" : "dynmap.accesswidener", "depends": { - "fabricloader": ">=0.15.2", - "fabric": ">=0.91.0", - "minecraft": ["1.20.3", "1.20.4"] + "fabricloader": ">=0.15.11", + "fabric": ">=0.98.0", + "minecraft": ["1.20.5", "1.20.6"] } }