Upstream
/
dynmap
mirror of https://github.com/webbukkit/dynmap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fabric-1.20: fixup package name

This commit is contained in:
Kosma Moczek 2023-05-22 23:40:50 +02:00
parent 8f10ece108
commit 1d94af6a11
38 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/DynmapMod.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_19_4;
package org.dynmap.fabric_1_20;
import net.fabricmc.api.ModInitializer;
import net.fabricmc.loader.api.FabricLoader;

22
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/DynmapPlugin.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_19_4;
package org.dynmap.fabric_1_20;
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_19_4.command.DmapCommand;
import org.dynmap.fabric_1_19_4.command.DmarkerCommand;
import org.dynmap.fabric_1_19_4.command.DynmapCommand;
import org.dynmap.fabric_1_19_4.command.DynmapExpCommand;
import org.dynmap.fabric_1_19_4.event.BlockEvents;
import org.dynmap.fabric_1_19_4.event.CustomServerChunkEvents;
import org.dynmap.fabric_1_19_4.event.CustomServerLifecycleEvents;
import org.dynmap.fabric_1_19_4.event.PlayerEvents;
import org.dynmap.fabric_1_19_4.mixin.BiomeEffectsAccessor;
import org.dynmap.fabric_1_19_4.permissions.*;
import org.dynmap.fabric_1_20.command.DmapCommand;
import org.dynmap.fabric_1_20.command.DmarkerCommand;
import org.dynmap.fabric_1_20.command.DynmapCommand;
import org.dynmap.fabric_1_20.command.DynmapExpCommand;
import org.dynmap.fabric_1_20.event.BlockEvents;
import org.dynmap.fabric_1_20.event.CustomServerChunkEvents;
import org.dynmap.fabric_1_20.event.CustomServerLifecycleEvents;
import org.dynmap.fabric_1_20.event.PlayerEvents;
import org.dynmap.fabric_1_20.mixin.BiomeEffectsAccessor;
import org.dynmap.fabric_1_20.permissions.*;
import org.dynmap.permissions.PermissionsHandler;
import org.dynmap.renderer.DynmapBlockState;

2
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricAdapter.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_19_4;
package org.dynmap.fabric_1_20;
import net.minecraft.server.world.ServerWorld;
import org.dynmap.DynmapLocation;

2
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricCommandSender.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_19_4;
package org.dynmap.fabric_1_20;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.text.LiteralTextContent;

2
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricLogger.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_19_4;
package org.dynmap.fabric_1_20;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

2
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricMapChunkCache.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_19_4;
package org.dynmap.fabric_1_20;
import net.minecraft.nbt.*;
import net.minecraft.server.world.ServerChunkManager;

2
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricPlayer.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_19_4;
package org.dynmap.fabric_1_20;
import com.google.common.collect.Iterables;
import com.google.gson.Gson;

6
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricServer.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_19_4;
package org.dynmap.fabric_1_20;
import com.mojang.authlib.GameProfile;
import net.fabricmc.loader.api.FabricLoader;
@ -29,8 +29,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_19_4.event.BlockEvents;
import org.dynmap.fabric_1_19_4.event.ServerChatEvents;
import org.dynmap.fabric_1_20.event.BlockEvents;
import org.dynmap.fabric_1_20.event.ServerChatEvents;
import org.dynmap.utils.MapChunkCache;
import org.dynmap.utils.VisibilityLimit;

2
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricWorld.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_19_4;
package org.dynmap.fabric_1_20;
import net.minecraft.registry.RegistryKey;
import net.minecraft.util.math.BlockPos;

2
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/NBT.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_19_4;
package org.dynmap.fabric_1_20;
import org.dynmap.common.chunk.GenericBitStorage;
import org.dynmap.common.chunk.GenericNBTCompound;

2
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/TaskRecord.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_19_4;
package org.dynmap.fabric_1_20;
import java.util.concurrent.FutureTask;

2
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/VersionCheck.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_19_4;
package org.dynmap.fabric_1_20;
import org.dynmap.DynmapCore;
import org.dynmap.Log;

2
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/access/ProtoChunkAccessor.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_19_4.access;
package org.dynmap.fabric_1_20.access;
public interface ProtoChunkAccessor {
boolean getTouchedByWorldGen();

4
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DmapCommand.java
View File

@ -1,6 +1,6 @@
package org.dynmap.fabric_1_19_4.command;
package org.dynmap.fabric_1_20.command;
import org.dynmap.fabric_1_19_4.DynmapPlugin;
import org.dynmap.fabric_1_20.DynmapPlugin;
public class DmapCommand extends DynmapCommandExecutor {
public DmapCommand(DynmapPlugin p) {

4
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DmarkerCommand.java
View File

@ -1,6 +1,6 @@
package org.dynmap.fabric_1_19_4.command;
package org.dynmap.fabric_1_20.command;
import org.dynmap.fabric_1_19_4.DynmapPlugin;
import org.dynmap.fabric_1_20.DynmapPlugin;
public class DmarkerCommand extends DynmapCommandExecutor {
public DmarkerCommand(DynmapPlugin p) {

4
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DynmapCommand.java
View File

@ -1,6 +1,6 @@
package org.dynmap.fabric_1_19_4.command;
package org.dynmap.fabric_1_20.command;
import org.dynmap.fabric_1_19_4.DynmapPlugin;
import org.dynmap.fabric_1_20.DynmapPlugin;
public class DynmapCommand extends DynmapCommandExecutor {
public DynmapCommand(DynmapPlugin p) {

4
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DynmapCommandExecutor.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_19_4.command;
package org.dynmap.fabric_1_20.command;
import com.mojang.brigadier.Command;
import com.mojang.brigadier.CommandDispatcher;
@ -8,7 +8,7 @@ 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 org.dynmap.fabric_1_19_4.DynmapPlugin;
import org.dynmap.fabric_1_20.DynmapPlugin;
import java.util.Arrays;

4
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/command/DynmapExpCommand.java
View File

@ -1,6 +1,6 @@
package org.dynmap.fabric_1_19_4.command;
package org.dynmap.fabric_1_20.command;
import org.dynmap.fabric_1_19_4.DynmapPlugin;
import org.dynmap.fabric_1_20.DynmapPlugin;
public class DynmapExpCommand extends DynmapCommandExecutor {
public DynmapExpCommand(DynmapPlugin p) {

2
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/BlockEvents.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_19_4.event;
package org.dynmap.fabric_1_20.event;
import net.fabricmc.fabric.api.event.Event;
import net.fabricmc.fabric.api.event.EventFactory;

2
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/CustomServerChunkEvents.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_19_4.event;
package org.dynmap.fabric_1_20.event;
import net.fabricmc.fabric.api.event.Event;
import net.fabricmc.fabric.api.event.EventFactory;

2
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/CustomServerLifecycleEvents.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_19_4.event;
package org.dynmap.fabric_1_20.event;
import net.fabricmc.fabric.api.event.Event;
import net.fabricmc.fabric.api.event.EventFactory;

2
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/PlayerEvents.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_19_4.event;
package org.dynmap.fabric_1_20.event;
import net.fabricmc.fabric.api.event.Event;
import net.fabricmc.fabric.api.event.EventFactory;

2
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/event/ServerChatEvents.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_19_4.event;
package org.dynmap.fabric_1_20.event;
import net.fabricmc.fabric.api.event.Event;
import net.fabricmc.fabric.api.event.EventFactory;

2
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/BiomeEffectsAccessor.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_19_4.mixin;
package org.dynmap.fabric_1_20.mixin;
import net.minecraft.world.biome.BiomeEffects;
import org.spongepowered.asm.mixin.Mixin;

4
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/MinecraftServerMixin.java
View File

@ -1,7 +1,7 @@
package org.dynmap.fabric_1_19_4.mixin;
package org.dynmap.fabric_1_20.mixin;
import net.minecraft.server.MinecraftServer;
import org.dynmap.fabric_1_19_4.event.CustomServerLifecycleEvents;
import org.dynmap.fabric_1_20.event.CustomServerLifecycleEvents;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;

4
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/PlayerManagerMixin.java
View File

@ -1,9 +1,9 @@
package org.dynmap.fabric_1_19_4.mixin;
package org.dynmap.fabric_1_20.mixin;
import net.minecraft.network.ClientConnection;
import net.minecraft.server.PlayerManager;
import net.minecraft.server.network.ServerPlayerEntity;
import org.dynmap.fabric_1_19_4.event.PlayerEvents;
import org.dynmap.fabric_1_20.event.PlayerEvents;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;

4
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/ProtoChunkMixin.java
View File

@ -1,9 +1,9 @@
package org.dynmap.fabric_1_19_4.mixin;
package org.dynmap.fabric_1_20.mixin;
import net.minecraft.block.BlockState;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.chunk.ProtoChunk;
import org.dynmap.fabric_1_19_4.access.ProtoChunkAccessor;
import org.dynmap.fabric_1_20.access.ProtoChunkAccessor;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;

6
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/ServerPlayNetworkHandlerMixin.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_19_4.mixin;
package org.dynmap.fabric_1_20.mixin;
import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntity;
@ -15,8 +15,8 @@ import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos;
import java.util.List;
import org.dynmap.fabric_1_19_4.event.BlockEvents;
import org.dynmap.fabric_1_19_4.event.ServerChatEvents;
import org.dynmap.fabric_1_20.event.BlockEvents;
import org.dynmap.fabric_1_20.event.ServerChatEvents;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;

4
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/ServerPlayerEntityMixin.java
View File

@ -1,9 +1,9 @@
package org.dynmap.fabric_1_19_4.mixin;
package org.dynmap.fabric_1_20.mixin;
import net.minecraft.entity.Entity;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld;
import org.dynmap.fabric_1_19_4.event.PlayerEvents;
import org.dynmap.fabric_1_20.event.PlayerEvents;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;

6
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/ThreadedAnvilChunkStorageMixin.java
View File

@ -1,11 +1,11 @@
package org.dynmap.fabric_1_19_4.mixin;
package org.dynmap.fabric_1_20.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_19_4.access.ProtoChunkAccessor;
import org.dynmap.fabric_1_19_4.event.CustomServerChunkEvents;
import org.dynmap.fabric_1_20.access.ProtoChunkAccessor;
import org.dynmap.fabric_1_20.event.CustomServerChunkEvents;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;

4
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/mixin/WorldChunkMixin.java
View File

@ -1,10 +1,10 @@
package org.dynmap.fabric_1_19_4.mixin;
package org.dynmap.fabric_1_20.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_19_4.event.BlockEvents;
import org.dynmap.fabric_1_20.event.BlockEvents;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;

4
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/permissions/FabricPermissions.java
View File

@ -1,9 +1,9 @@
package org.dynmap.fabric_1_19_4.permissions;
package org.dynmap.fabric_1_20.permissions;
import me.lucko.fabric.api.permissions.v0.Permissions;
import net.minecraft.entity.player.PlayerEntity;
import org.dynmap.Log;
import org.dynmap.fabric_1_19_4.DynmapPlugin;
import org.dynmap.fabric_1_20.DynmapPlugin;
import org.dynmap.json.simple.parser.JSONParser;
import java.util.Set;

4
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/permissions/FilePermissions.java
View File

@ -1,9 +1,9 @@
package org.dynmap.fabric_1_19_4.permissions;
package org.dynmap.fabric_1_20.permissions;
import net.minecraft.entity.player.PlayerEntity;
import org.dynmap.ConfigurationNode;
import org.dynmap.Log;
import org.dynmap.fabric_1_19_4.DynmapPlugin;
import org.dynmap.fabric_1_20.DynmapPlugin;
import java.io.File;
import java.util.HashMap;

4
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/permissions/LuckPermissions.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_19_4.permissions;
package org.dynmap.fabric_1_20.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_19_4.DynmapPlugin;
import org.dynmap.fabric_1_20.DynmapPlugin;
import org.dynmap.json.simple.JSONArray;
import org.dynmap.json.simple.JSONObject;
import org.dynmap.json.simple.parser.JSONParser;

4
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/permissions/OpPermissions.java
View File

@ -1,8 +1,8 @@
package org.dynmap.fabric_1_19_4.permissions;
package org.dynmap.fabric_1_20.permissions;
import net.minecraft.entity.player.PlayerEntity;
import org.dynmap.Log;
import org.dynmap.fabric_1_19_4.DynmapPlugin;
import org.dynmap.fabric_1_20.DynmapPlugin;
import java.util.HashSet;
import java.util.Set;

2
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/permissions/PermissionProvider.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_19_4.permissions;
package org.dynmap.fabric_1_20.permissions;
import net.minecraft.entity.player.PlayerEntity;

2
fabric-1.20/src/main/resources/dynmap.mixins.json
View File

@ -1,7 +1,7 @@
{
"required": true,
"minVersion": "0.8",
"package": "org.dynmap.fabric_1_19_4.mixin",
"package": "org.dynmap.fabric_1_20.mixin",
"compatibilityLevel": "JAVA_17",
"mixins": [
"BiomeEffectsAccessor",

2
fabric-1.20/src/main/resources/fabric.mod.json
View File

@ -18,7 +18,7 @@
"environment": "*",
"entrypoints": {
"main": [
"org.dynmap.fabric_1_19_4.DynmapMod"
"org.dynmap.fabric_1_20.DynmapMod"
]
},
"mixins": [