Skip to content

Commit

Permalink
Fix packages in Fabric 1.21.4 PR...
Browse files Browse the repository at this point in the history
  • Loading branch information
@mikeprimm-mirific
mikeprimm-mirific committed Jan 6, 2025
1 parent 82b4b93 commit c12f4fd
Show file tree
Hide file tree
Showing 36 changed files with 66 additions and 66 deletions.
2 changes: 1 addition & 1 deletion fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/DynmapMod.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
22 changes: 11 additions & 11 deletions fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/DynmapPlugin.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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_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;

Expand Down
2 changes: 1 addition & 1 deletion fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricAdapter.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricCommandSender.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricLogger.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricMapChunkCache.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricPlayer.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricServer.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -28,8 +28,8 @@
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;

Expand Down
2 changes: 1 addition & 1 deletion fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/FabricWorld.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/NBT.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/TaskRecord.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.dynmap.fabric_1_21;
package org.dynmap.fabric_1_21_4;

import java.util.concurrent.FutureTask;

Expand Down
2 changes: 1 addition & 1 deletion fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/VersionCheck.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/access/ProtoChunkAccessor.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.dynmap.fabric_1_21.access;
package org.dynmap.fabric_1_21_4.access;

public interface ProtoChunkAccessor {
boolean getTouchedByWorldGen();
Expand Down
4 changes: 2 additions & 2 deletions fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DmapCommand.java
View file
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DmarkerCommand.java
View file
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DynmapCommand.java
View file
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DynmapCommandExecutor.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -11,7 +11,7 @@

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;
Expand Down
4 changes: 2 additions & 2 deletions fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/command/DynmapExpCommand.java
View file
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/BlockEvents.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/CustomServerChunkEvents.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/CustomServerLifecycleEvents.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/PlayerEvents.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/event/ServerChatEvents.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/BiomeEffectsAccessor.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/ChunkGeneratingMixin.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/MinecraftServerMixin.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/PlayerManagerMixin.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
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;
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;
Expand Down
4 changes: 2 additions & 2 deletions fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/ProtoChunkMixin.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...ic-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/ServerPlayNetworkHandlerMixin.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -17,8 +17,8 @@
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;
Expand Down
4 changes: 2 additions & 2 deletions fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/ServerPlayerEntityMixin.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/mixin/WorldChunkMixin.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/FabricPermissions.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/FilePermissions.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/LuckPermissions.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -9,7 +9,7 @@
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;
Expand Down
4 changes: 2 additions & 2 deletions fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/OpPermissions.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion fabric-1.21.4/src/main/java/org/dynmap/fabric_1_21_4/permissions/PermissionProvider.java
View file
Original file line number Diff line number Diff line change
@@ -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;

Expand Down

0 comments on commit c12f4fd

Please sign in to comment.