mirror of
https://github.com/webbukkit/dynmap.git
synced 2025-03-13 23:19:08 +01:00
Fix packages in Fabric 1.21.4 PR...
This commit is contained in:
parent
82b4b93756
commit
c12f4fdf18
@ -1,4 +1,4 @@
|
||||
package org.dynmap.fabric_1_21;
|
||||
package org.dynmap.fabric_1_21_4;
|
||||
|
||||
import net.fabricmc.api.ModInitializer;
|
||||
import net.fabricmc.loader.api.FabricLoader;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.dynmap.fabric_1_21;
|
||||
package org.dynmap.fabric_1_21_4;
|
||||
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
||||
@ -35,16 +35,16 @@ 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_21.command.DmapCommand;
|
||||
import org.dynmap.fabric_1_21.command.DmarkerCommand;
|
||||
import org.dynmap.fabric_1_21.command.DynmapCommand;
|
||||
import org.dynmap.fabric_1_21.command.DynmapExpCommand;
|
||||
import org.dynmap.fabric_1_21.event.BlockEvents;
|
||||
import org.dynmap.fabric_1_21.event.CustomServerChunkEvents;
|
||||
import org.dynmap.fabric_1_21.event.CustomServerLifecycleEvents;
|
||||
import org.dynmap.fabric_1_21.event.PlayerEvents;
|
||||
import org.dynmap.fabric_1_21.mixin.BiomeEffectsAccessor;
|
||||
import org.dynmap.fabric_1_21.permissions.*;
|
||||
import org.dynmap.fabric_1_21_4.command.DmapCommand;
|
||||
import org.dynmap.fabric_1_21_4.command.DmarkerCommand;
|
||||
import org.dynmap.fabric_1_21_4.command.DynmapCommand;
|
||||
import org.dynmap.fabric_1_21_4.command.DynmapExpCommand;
|
||||
import org.dynmap.fabric_1_21_4.event.BlockEvents;
|
||||
import org.dynmap.fabric_1_21_4.event.CustomServerChunkEvents;
|
||||
import org.dynmap.fabric_1_21_4.event.CustomServerLifecycleEvents;
|
||||
import org.dynmap.fabric_1_21_4.event.PlayerEvents;
|
||||
import org.dynmap.fabric_1_21_4.mixin.BiomeEffectsAccessor;
|
||||
import org.dynmap.fabric_1_21_4.permissions.*;
|
||||
import org.dynmap.permissions.PermissionsHandler;
|
||||
import org.dynmap.renderer.DynmapBlockState;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.dynmap.fabric_1_21;
|
||||
package org.dynmap.fabric_1_21_4;
|
||||
|
||||
import net.minecraft.server.world.ServerWorld;
|
||||
import org.dynmap.DynmapLocation;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.dynmap.fabric_1_21;
|
||||
package org.dynmap.fabric_1_21_4;
|
||||
|
||||
import net.minecraft.server.command.ServerCommandSource;
|
||||
import net.minecraft.text.Text;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.dynmap.fabric_1_21;
|
||||
package org.dynmap.fabric_1_21_4;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.dynmap.fabric_1_21;
|
||||
package org.dynmap.fabric_1_21_4;
|
||||
|
||||
import net.minecraft.nbt.*;
|
||||
import net.minecraft.server.world.ServerChunkLoadingManager;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.dynmap.fabric_1_21;
|
||||
package org.dynmap.fabric_1_21_4;
|
||||
|
||||
import com.google.common.collect.Iterables;
|
||||
import com.google.gson.Gson;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.dynmap.fabric_1_21;
|
||||
package org.dynmap.fabric_1_21_4;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import net.fabricmc.loader.api.FabricLoader;
|
||||
@ -28,8 +28,8 @@ 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_21.event.BlockEvents;
|
||||
import org.dynmap.fabric_1_21.event.ServerChatEvents;
|
||||
import org.dynmap.fabric_1_21_4.event.BlockEvents;
|
||||
import org.dynmap.fabric_1_21_4.event.ServerChatEvents;
|
||||
import org.dynmap.utils.MapChunkCache;
|
||||
import org.dynmap.utils.VisibilityLimit;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.dynmap.fabric_1_21;
|
||||
package org.dynmap.fabric_1_21_4;
|
||||
|
||||
import net.minecraft.registry.RegistryKey;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.dynmap.fabric_1_21;
|
||||
package org.dynmap.fabric_1_21_4;
|
||||
|
||||
import org.dynmap.common.chunk.GenericBitStorage;
|
||||
import org.dynmap.common.chunk.GenericNBTCompound;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.dynmap.fabric_1_21;
|
||||
package org.dynmap.fabric_1_21_4;
|
||||
|
||||
import java.util.concurrent.FutureTask;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.dynmap.fabric_1_21;
|
||||
package org.dynmap.fabric_1_21_4;
|
||||
|
||||
import org.dynmap.DynmapCore;
|
||||
import org.dynmap.Log;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.dynmap.fabric_1_21.access;
|
||||
package org.dynmap.fabric_1_21_4.access;
|
||||
|
||||
public interface ProtoChunkAccessor {
|
||||
boolean getTouchedByWorldGen();
|
||||
|
@ -1,6 +1,6 @@
|
||||
package org.dynmap.fabric_1_21.command;
|
||||
package org.dynmap.fabric_1_21_4.command;
|
||||
|
||||
import org.dynmap.fabric_1_21.DynmapPlugin;
|
||||
import org.dynmap.fabric_1_21_4.DynmapPlugin;
|
||||
|
||||
public class DmapCommand extends DynmapCommandExecutor {
|
||||
public DmapCommand(DynmapPlugin p) {
|
||||
|
@ -1,6 +1,6 @@
|
||||
package org.dynmap.fabric_1_21.command;
|
||||
package org.dynmap.fabric_1_21_4.command;
|
||||
|
||||
import org.dynmap.fabric_1_21.DynmapPlugin;
|
||||
import org.dynmap.fabric_1_21_4.DynmapPlugin;
|
||||
|
||||
public class DmarkerCommand extends DynmapCommandExecutor {
|
||||
public DmarkerCommand(DynmapPlugin p) {
|
||||
|
@ -1,6 +1,6 @@
|
||||
package org.dynmap.fabric_1_21.command;
|
||||
package org.dynmap.fabric_1_21_4.command;
|
||||
|
||||
import org.dynmap.fabric_1_21.DynmapPlugin;
|
||||
import org.dynmap.fabric_1_21_4.DynmapPlugin;
|
||||
|
||||
public class DynmapCommand extends DynmapCommandExecutor {
|
||||
public DynmapCommand(DynmapPlugin p) {
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.dynmap.fabric_1_21.command;
|
||||
package org.dynmap.fabric_1_21_4.command;
|
||||
|
||||
import com.mojang.brigadier.Command;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
@ -11,7 +11,7 @@ import net.minecraft.server.command.ServerCommandSource;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
import org.dynmap.fabric_1_21.DynmapPlugin;
|
||||
import org.dynmap.fabric_1_21_4.DynmapPlugin;
|
||||
|
||||
import static com.mojang.brigadier.arguments.StringArgumentType.greedyString;
|
||||
import static net.minecraft.server.command.CommandManager.argument;
|
||||
|
@ -1,6 +1,6 @@
|
||||
package org.dynmap.fabric_1_21.command;
|
||||
package org.dynmap.fabric_1_21_4.command;
|
||||
|
||||
import org.dynmap.fabric_1_21.DynmapPlugin;
|
||||
import org.dynmap.fabric_1_21_4.DynmapPlugin;
|
||||
|
||||
public class DynmapExpCommand extends DynmapCommandExecutor {
|
||||
public DynmapExpCommand(DynmapPlugin p) {
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.dynmap.fabric_1_21.event;
|
||||
package org.dynmap.fabric_1_21_4.event;
|
||||
|
||||
import net.fabricmc.fabric.api.event.Event;
|
||||
import net.fabricmc.fabric.api.event.EventFactory;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.dynmap.fabric_1_21.event;
|
||||
package org.dynmap.fabric_1_21_4.event;
|
||||
|
||||
import net.fabricmc.fabric.api.event.Event;
|
||||
import net.fabricmc.fabric.api.event.EventFactory;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.dynmap.fabric_1_21.event;
|
||||
package org.dynmap.fabric_1_21_4.event;
|
||||
|
||||
import net.fabricmc.fabric.api.event.Event;
|
||||
import net.fabricmc.fabric.api.event.EventFactory;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.dynmap.fabric_1_21.event;
|
||||
package org.dynmap.fabric_1_21_4.event;
|
||||
|
||||
import net.fabricmc.fabric.api.event.Event;
|
||||
import net.fabricmc.fabric.api.event.EventFactory;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.dynmap.fabric_1_21.event;
|
||||
package org.dynmap.fabric_1_21_4.event;
|
||||
|
||||
import net.fabricmc.fabric.api.event.Event;
|
||||
import net.fabricmc.fabric.api.event.EventFactory;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.dynmap.fabric_1_21.mixin;
|
||||
package org.dynmap.fabric_1_21_4.mixin;
|
||||
|
||||
import net.minecraft.world.biome.BiomeEffects;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
|
@ -1,12 +1,12 @@
|
||||
package org.dynmap.fabric_1_21.mixin;
|
||||
package org.dynmap.fabric_1_21_4.mixin;
|
||||
|
||||
import net.minecraft.world.chunk.ChunkGenerating;
|
||||
import net.minecraft.world.chunk.ChunkGenerationContext;
|
||||
import net.minecraft.world.chunk.AbstractChunkHolder;
|
||||
import net.minecraft.world.chunk.Chunk;
|
||||
|
||||
import org.dynmap.fabric_1_21.access.ProtoChunkAccessor;
|
||||
import org.dynmap.fabric_1_21.event.CustomServerChunkEvents;
|
||||
import org.dynmap.fabric_1_21_4.access.ProtoChunkAccessor;
|
||||
import org.dynmap.fabric_1_21_4.event.CustomServerChunkEvents;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
|
@ -1,8 +1,8 @@
|
||||
package org.dynmap.fabric_1_21.mixin;
|
||||
package org.dynmap.fabric_1_21_4.mixin;
|
||||
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
|
||||
import org.dynmap.fabric_1_21.event.CustomServerLifecycleEvents;
|
||||
import org.dynmap.fabric_1_21_4.event.CustomServerLifecycleEvents;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.dynmap.fabric_1_21.mixin;
|
||||
package org.dynmap.fabric_1_21_4.mixin;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.network.ClientConnection;
|
||||
@ -6,7 +6,7 @@ import net.minecraft.server.PlayerManager;
|
||||
import net.minecraft.server.network.ConnectedClientData;
|
||||
import net.minecraft.server.network.ServerPlayerEntity;
|
||||
|
||||
import org.dynmap.fabric_1_21.event.PlayerEvents;
|
||||
import org.dynmap.fabric_1_21_4.event.PlayerEvents;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
|
@ -1,10 +1,10 @@
|
||||
package org.dynmap.fabric_1_21.mixin;
|
||||
package org.dynmap.fabric_1_21_4.mixin;
|
||||
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.chunk.ProtoChunk;
|
||||
|
||||
import org.dynmap.fabric_1_21.access.ProtoChunkAccessor;
|
||||
import org.dynmap.fabric_1_21_4.access.ProtoChunkAccessor;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.dynmap.fabric_1_21.mixin;
|
||||
package org.dynmap.fabric_1_21_4.mixin;
|
||||
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.entity.BlockEntity;
|
||||
@ -17,8 +17,8 @@ import net.minecraft.util.math.BlockPos;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import org.dynmap.fabric_1_21.event.BlockEvents;
|
||||
import org.dynmap.fabric_1_21.event.ServerChatEvents;
|
||||
import org.dynmap.fabric_1_21_4.event.BlockEvents;
|
||||
import org.dynmap.fabric_1_21_4.event.ServerChatEvents;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
|
@ -1,11 +1,11 @@
|
||||
package org.dynmap.fabric_1_21.mixin;
|
||||
package org.dynmap.fabric_1_21_4.mixin;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.server.network.ServerPlayerEntity;
|
||||
import net.minecraft.server.world.ServerWorld;
|
||||
import net.minecraft.world.TeleportTarget;
|
||||
|
||||
import org.dynmap.fabric_1_21.event.PlayerEvents;
|
||||
import org.dynmap.fabric_1_21_4.event.PlayerEvents;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
|
@ -1,11 +1,11 @@
|
||||
package org.dynmap.fabric_1_21.mixin;
|
||||
package org.dynmap.fabric_1_21_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_21.event.BlockEvents;
|
||||
import org.dynmap.fabric_1_21_4.event.BlockEvents;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
|
@ -1,9 +1,9 @@
|
||||
package org.dynmap.fabric_1_21.permissions;
|
||||
package org.dynmap.fabric_1_21_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_21.DynmapPlugin;
|
||||
import org.dynmap.fabric_1_21_4.DynmapPlugin;
|
||||
import org.dynmap.json.simple.parser.JSONParser;
|
||||
|
||||
import java.util.Set;
|
||||
|
@ -1,9 +1,9 @@
|
||||
package org.dynmap.fabric_1_21.permissions;
|
||||
package org.dynmap.fabric_1_21_4.permissions;
|
||||
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import org.dynmap.ConfigurationNode;
|
||||
import org.dynmap.Log;
|
||||
import org.dynmap.fabric_1_21.DynmapPlugin;
|
||||
import org.dynmap.fabric_1_21_4.DynmapPlugin;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.HashMap;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.dynmap.fabric_1_21.permissions;
|
||||
package org.dynmap.fabric_1_21_4.permissions;
|
||||
|
||||
import me.lucko.fabric.api.permissions.v0.Permissions;
|
||||
import net.luckperms.api.LuckPerms;
|
||||
@ -9,7 +9,7 @@ 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_21.DynmapPlugin;
|
||||
import org.dynmap.fabric_1_21_4.DynmapPlugin;
|
||||
import org.dynmap.json.simple.JSONArray;
|
||||
import org.dynmap.json.simple.JSONObject;
|
||||
import org.dynmap.json.simple.parser.JSONParser;
|
||||
|
@ -1,8 +1,8 @@
|
||||
package org.dynmap.fabric_1_21.permissions;
|
||||
package org.dynmap.fabric_1_21_4.permissions;
|
||||
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import org.dynmap.Log;
|
||||
import org.dynmap.fabric_1_21.DynmapPlugin;
|
||||
import org.dynmap.fabric_1_21_4.DynmapPlugin;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.dynmap.fabric_1_21.permissions;
|
||||
package org.dynmap.fabric_1_21_4.permissions;
|
||||
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user