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

fabric-1.18: s/1.17.1/1.18/

This commit is contained in:
Kosma Moczek 2021-11-25 19:00:37 +01:00
parent c62631f67f
commit 73b4bc103c
36 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/ChunkSnapshot.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/ChunkSnapshot.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_17_1;
package org.dynmap.fabric_1_18;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.nbt.NbtList;

2
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/DynmapMod.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/DynmapMod.java
View File

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

30
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/DynmapPlugin.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/DynmapPlugin.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_17_1;
package org.dynmap.fabric_1_18;
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
@ -39,20 +39,20 @@ import org.dynmap.common.BiomeMap;
import org.dynmap.common.DynmapCommandSender;
import org.dynmap.common.DynmapListenerManager;
import org.dynmap.common.DynmapPlayer;
import org.dynmap.fabric_1_17_1.DynmapPlugin.ChatMessage;
import org.dynmap.fabric_1_17_1.command.DmapCommand;
import org.dynmap.fabric_1_17_1.command.DmarkerCommand;
import org.dynmap.fabric_1_17_1.command.DynmapCommand;
import org.dynmap.fabric_1_17_1.command.DynmapExpCommand;
import org.dynmap.fabric_1_17_1.event.BlockEvents;
import org.dynmap.fabric_1_17_1.event.ChunkDataEvents;
import org.dynmap.fabric_1_17_1.event.CustomServerLifecycleEvents;
import org.dynmap.fabric_1_17_1.event.PlayerEvents;
import org.dynmap.fabric_1_17_1.mixin.BiomeEffectsAccessor;
import org.dynmap.fabric_1_17_1.mixin.ThreadedAnvilChunkStorageAccessor;
import org.dynmap.fabric_1_17_1.permissions.FilePermissions;
import org.dynmap.fabric_1_17_1.permissions.OpPermissions;
import org.dynmap.fabric_1_17_1.permissions.PermissionProvider;
import org.dynmap.fabric_1_18.DynmapPlugin.ChatMessage;
import org.dynmap.fabric_1_18.command.DmapCommand;
import org.dynmap.fabric_1_18.command.DmarkerCommand;
import org.dynmap.fabric_1_18.command.DynmapCommand;
import org.dynmap.fabric_1_18.command.DynmapExpCommand;
import org.dynmap.fabric_1_18.event.BlockEvents;
import org.dynmap.fabric_1_18.event.ChunkDataEvents;
import org.dynmap.fabric_1_18.event.CustomServerLifecycleEvents;
import org.dynmap.fabric_1_18.event.PlayerEvents;
import org.dynmap.fabric_1_18.mixin.BiomeEffectsAccessor;
import org.dynmap.fabric_1_18.mixin.ThreadedAnvilChunkStorageAccessor;
import org.dynmap.fabric_1_18.permissions.FilePermissions;
import org.dynmap.fabric_1_18.permissions.OpPermissions;
import org.dynmap.fabric_1_18.permissions.PermissionProvider;
import org.dynmap.permissions.PermissionsHandler;
import org.dynmap.renderer.DynmapBlockState;

2
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricAdapter.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricAdapter.java
View File

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

2
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricCommandSender.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricCommandSender.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_17_1;
package org.dynmap.fabric_1_18;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.text.LiteralText;

2
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricLogger.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricLogger.java
View File

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

2
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricMapChunkCache.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricMapChunkCache.java
View File

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

2
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricPlayer.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricPlayer.java
View File

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

4
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricServer.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricServer.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_17_1;
package org.dynmap.fabric_1_18;
import com.mojang.authlib.GameProfile;
import net.fabricmc.loader.api.FabricLoader;
@ -26,7 +26,7 @@ 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_17_1.event.ServerChatEvents;
import org.dynmap.fabric_1_18.event.ServerChatEvents;
import org.dynmap.utils.MapChunkCache;
import org.dynmap.utils.VisibilityLimit;

2
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/FabricWorld.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricWorld.java
View File

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

2
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/SnapshotCache.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/SnapshotCache.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_17_1;
package org.dynmap.fabric_1_18;
import org.dynmap.utils.DynIntHashMap;

2
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/TaskRecord.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/TaskRecord.java
View File

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

2
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/VersionCheck.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/VersionCheck.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_17_1;
package org.dynmap.fabric_1_18;
import org.dynmap.DynmapCore;
import org.dynmap.Log;

4
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/command/DmapCommand.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/command/DmapCommand.java
View File

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

4
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/command/DmarkerCommand.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/command/DmarkerCommand.java
View File

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

4
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/command/DynmapCommand.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/command/DynmapCommand.java
View File

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

4
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/command/DynmapCommandExecutor.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/command/DynmapCommandExecutor.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_17_1.command;
package org.dynmap.fabric_1_18.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_17_1.DynmapPlugin;
import org.dynmap.fabric_1_18.DynmapPlugin;
import java.util.Arrays;

4
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/command/DynmapExpCommand.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/command/DynmapExpCommand.java
View File

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

2
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/event/BlockEvents.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/BlockEvents.java
View File

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

2
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/event/ChunkDataEvents.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/ChunkDataEvents.java
View File

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

2
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/event/CustomServerLifecycleEvents.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/CustomServerLifecycleEvents.java
View File

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

2
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/event/PlayerEvents.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/PlayerEvents.java
View File

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

2
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/event/ServerChatEvents.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/ServerChatEvents.java
View File

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

2
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/BiomeEffectsAccessor.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/BiomeEffectsAccessor.java
View File

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

4
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/MinecraftServerMixin.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/MinecraftServerMixin.java
View File

@ -1,7 +1,7 @@
package org.dynmap.fabric_1_17_1.mixin;
package org.dynmap.fabric_1_18.mixin;
import net.minecraft.server.MinecraftServer;
import org.dynmap.fabric_1_17_1.event.CustomServerLifecycleEvents;
import org.dynmap.fabric_1_18.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.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/PlayerManagerMixin.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/PlayerManagerMixin.java
View File

@ -1,9 +1,9 @@
package org.dynmap.fabric_1_17_1.mixin;
package org.dynmap.fabric_1_18.mixin;
import net.minecraft.network.ClientConnection;
import net.minecraft.server.PlayerManager;
import net.minecraft.server.network.ServerPlayerEntity;
import org.dynmap.fabric_1_17_1.event.PlayerEvents;
import org.dynmap.fabric_1_18.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.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/ServerPlayNetworkHandlerMixin.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/ServerPlayNetworkHandlerMixin.java
View File

@ -1,9 +1,9 @@
package org.dynmap.fabric_1_17_1.mixin;
package org.dynmap.fabric_1_18.mixin;
import net.minecraft.server.filter.TextStream;
import net.minecraft.server.network.ServerPlayNetworkHandler;
import net.minecraft.server.network.ServerPlayerEntity;
import org.dynmap.fabric_1_17_1.event.ServerChatEvents;
import org.dynmap.fabric_1_18.event.ServerChatEvents;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;

4
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/ServerPlayerEntityMixin.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/ServerPlayerEntityMixin.java
View File

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

2
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/ThreadedAnvilChunkStorageAccessor.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/ThreadedAnvilChunkStorageAccessor.java
View File

@ -1,4 +1,4 @@
package org.dynmap.fabric_1_17_1.mixin;
package org.dynmap.fabric_1_18.mixin;
import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap;
import net.minecraft.server.world.ChunkHolder;

4
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/ThreadedAnvilChunkStorageMixin.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/ThreadedAnvilChunkStorageMixin.java
View File

@ -1,9 +1,9 @@
package org.dynmap.fabric_1_17_1.mixin;
package org.dynmap.fabric_1_18.mixin;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.server.world.ThreadedAnvilChunkStorage;
import net.minecraft.world.chunk.Chunk;
import org.dynmap.fabric_1_17_1.event.ChunkDataEvents;
import org.dynmap.fabric_1_18.event.ChunkDataEvents;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;

4
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/mixin/WorldChunkMixin.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/WorldChunkMixin.java
View File

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

4
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/permissions/FilePermissions.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/permissions/FilePermissions.java
View File

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

4
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/permissions/OpPermissions.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/permissions/OpPermissions.java
View File

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

2
fabric-1.18/src/main/java/org/dynmap/fabric_1_17_1/permissions/PermissionProvider.java → fabric-1.18/src/main/java/org/dynmap/fabric_1_18/permissions/PermissionProvider.java
View File

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

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

@ -1,7 +1,7 @@
{
"required": true,
"minVersion": "0.8",
"package": "org.dynmap.fabric_1_17_1.mixin",
"package": "org.dynmap.fabric_1_18.mixin",
"compatibilityLevel": "JAVA_16",
"mixins": [
"BiomeEffectsAccessor",

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

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