Merge remote-tracking branch 'origin/1.18' into 1.19.2

common/src/main/java/org/embeddedt/modernfix/ModernFix.java

@@ -6,6 +6,7 @@ import net.minecraft.server.level.ChunkMap;
 import net.minecraft.server.level.ServerLevel;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.embeddedt.modernfix.command.ModernFixCommands;
 import org.embeddedt.modernfix.core.ModernFixMixinPlugin;
 import org.embeddedt.modernfix.platform.ModernFixPlatformHooks;
 import org.embeddedt.modernfix.util.ClassInfoManager;
@@ -43,6 +44,7 @@ public class ModernFix {
 
     public ModernFix() {
         INSTANCE = this;
+        ModernFixPlatformHooks.onServerCommandRegister(ModernFixCommands::register);
     }
 
     public void onServerStarted() {

common/src/main/java/org/embeddedt/modernfix/command/ModernFixCommands.java

@@ -0,0 +1,57 @@
+package org.embeddedt.modernfix.command;
+
+import com.mojang.brigadier.CommandDispatcher;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.packs.resources.Resource;
+import net.minecraft.server.packs.resources.ResourceManager;
+import org.embeddedt.modernfix.structure.CachingStructureManager;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static net.minecraft.commands.Commands.*;
+
+public class ModernFixCommands {
+    public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
+        dispatcher.register(literal("modernfix")
+                        .then(literal("upgradeStructures")
+                        .requires(source -> source.hasPermission(3))
+                        .executes(context -> {
+                            ServerLevel level = context.getSource().getLevel();
+                            if(level == null) {
+                                context.getSource().sendFailure(Component.literal("Couldn't find server level"));
+                                return 0;
+                            }
+
+                            ResourceManager manager = level.getServer().resources.resourceManager();
+                            Map<ResourceLocation, Resource> structures = manager.listResources("structures", p -> p.getPath().endsWith(".nbt"));
+                            int upgradedNum = 0;
+                            Pattern pathPattern = Pattern.compile("^structures/(.*)\\.nbt$");
+                            for(Map.Entry<ResourceLocation, Resource> entry : structures.entrySet()) {
+                                upgradedNum++;
+                                ResourceLocation found = entry.getKey();
+                                Matcher matcher = pathPattern.matcher(found.getPath());
+                                if(!matcher.matches())
+                                    continue;
+                                ResourceLocation structureLocation = new ResourceLocation(found.getNamespace(), matcher.group(1));
+                                try(InputStream resource = entry.getValue().open()) {
+                                    CachingStructureManager.readStructureTag(structureLocation, level.getServer().getFixerUpper(), resource);
+                                    context.getSource().sendSuccess(Component.literal("checked " + structureLocation + " (" + upgradedNum + "/" + structures.size() + ")"), false);
+                                } catch(IOException e) {
+                                    context.getSource().sendFailure(Component.literal("error reading " + structureLocation + " (" + upgradedNum + "/" + structures.size() + ")"));
+                                }
+                            }
+
+                            context.getSource().sendSuccess(Component.literal("All structures upgraded"), false);
+
+                            return 1;
+                        }))
+        );
+    }
+}

common/src/main/java/org/embeddedt/modernfix/platform/ModernFixPlatformHooks.java

@@ -1,9 +1,11 @@
 package org.embeddedt.modernfix.platform;
 
 import com.mojang.blaze3d.platform.NativeImage;
+import com.mojang.brigadier.CommandDispatcher;
 import dev.architectury.injectables.annotations.ExpectPlatform;
 import net.minecraft.client.renderer.texture.TextureAtlas;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.packs.resources.Resource;
@@ -12,6 +14,7 @@ import org.objectweb.asm.tree.ClassNode;
 
 import java.io.IOException;
 import java.nio.file.Path;
+import java.util.function.Consumer;
 
 public class ModernFixPlatformHooks {
     @ExpectPlatform
@@ -78,4 +81,9 @@ public class ModernFixPlatformHooks {
     public static void sendPacket(ServerPlayer player, Object packet) {
         throw new AssertionError();
     }
+
+    @ExpectPlatform
+    public static void onServerCommandRegister(Consumer<CommandDispatcher<CommandSourceStack>> handler) {
+        throw new AssertionError();
+    }
 }

common/src/main/java/org/embeddedt/modernfix/structure/CachingStructureManager.java

@@ -45,7 +45,7 @@ public class CachingStructureManager {
         return sb.toString();
     }
 
-    private static CompoundTag readStructureTag(ResourceLocation location, DataFixer datafixer, InputStream stream) throws IOException {
+    public static CompoundTag readStructureTag(ResourceLocation location, DataFixer datafixer, InputStream stream) throws IOException {
         byte[] structureBytes = toBytes(stream);
         CompoundTag currentTag = NbtIo.readCompressed(new ByteArrayInputStream(structureBytes));
         if (!currentTag.contains("DataVersion", 99)) {

common/src/main/resources/modernfix.accesswidener

@@ -36,3 +36,5 @@ accessible field net/minecraft/client/renderer/block/model/BlockModel GSON Lcom/
 accessible class net/minecraft/server/level/ChunkMap$DistanceManager
 accessible method net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent updateSettings (Lnet/minecraft/client/gui/screens/worldselection/WorldCreationContext;)V
 accessible class net/minecraft/world/level/chunk/PalettedContainer$Data
+accessible field net/minecraft/server/MinecraftServer resources Lnet/minecraft/server/MinecraftServer$ReloadableResources;
+accessible class net/minecraft/server/MinecraftServer$ReloadableResources

fabric/build.gradle

@@ -32,6 +32,7 @@ dependencies {
     modIncludeImplementation(fabricApi.module("fabric-api-base", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
     modIncludeImplementation(fabricApi.module("fabric-lifecycle-events-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
     modIncludeImplementation(fabricApi.module("fabric-screen-api-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
+    modIncludeImplementation(fabricApi.module("fabric-command-api-v2", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
     modImplementation(fabricApi.module("fabric-resource-loader-v0", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
     // Remove the next line if you don't want to depend on the API
     // modApi "me.shedaniel:architectury-fabric:${rootProject.architectury_version}"

fabric/src/main/java/org/embeddedt/modernfix/platform/fabric/ModernFixPlatformHooksImpl.java

@@ -1,11 +1,14 @@
 package org.embeddedt.modernfix.platform.fabric;
 
 import com.mojang.blaze3d.platform.NativeImage;
+import com.mojang.brigadier.CommandDispatcher;
 import net.fabricmc.api.EnvType;
+import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
 import net.minecraft.client.renderer.texture.TextureAtlas;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.packs.resources.Resource;
@@ -15,6 +18,7 @@ import org.objectweb.asm.tree.*;
 
 import java.nio.file.Path;
 import java.util.*;
+import java.util.function.Consumer;
 
 public class ModernFixPlatformHooksImpl {
     public static boolean isClient() {
@@ -74,4 +78,8 @@ public class ModernFixPlatformHooksImpl {
     public static void applyASMTransformers(String mixinClassName, ClassNode targetClass) {
 
     }
+
+    public static void onServerCommandRegister(Consumer<CommandDispatcher<CommandSourceStack>> handler) {
+        CommandRegistrationCallback.EVENT.register((dispatcher, arg, env) -> handler.accept(dispatcher));
+    }
 }

forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java

@@ -1,16 +1,20 @@
 package org.embeddedt.modernfix.platform.forge;
 
 import com.mojang.blaze3d.platform.NativeImage;
+import com.mojang.brigadier.CommandDispatcher;
 import cpw.mods.modlauncher.*;
 import cpw.mods.modlauncher.api.INameMappingService;
 import net.minecraft.client.renderer.texture.TextureAtlas;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.packs.resources.Resource;
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.ForgeHooksClient;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.RegisterCommandsEvent;
 import net.minecraftforge.fml.ModLoader;
 import net.minecraftforge.fml.loading.FMLLoader;
 import net.minecraftforge.fml.loading.FMLPaths;
@@ -35,6 +39,7 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.nio.file.Path;
 import java.util.*;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -173,4 +178,10 @@ public class ModernFixPlatformHooksImpl {
             }
         }
     }
+
+    public static void onServerCommandRegister(Consumer<CommandDispatcher<CommandSourceStack>> handler) {
+        MinecraftForge.EVENT_BUS.addListener((RegisterCommandsEvent event) -> {
+            handler.accept(event.getDispatcher());
+        });
+    }
 }