Misc 1.13 progress

src/main/java/com/replaymod/core/ReplayMod.java

@@ -19,6 +19,7 @@ import org.apache.commons.io.Charsets;
 import org.apache.commons.io.FileUtils;
 
 //#if MC>=11300
+import com.replaymod.core.versions.LangResourcePack;
 import net.minecraft.resources.FolderPack;
 import net.minecraft.resources.IResourcePack;
 import net.minecraftforge.fml.javafmlmod.FMLModLoadingContext;
@@ -168,6 +169,9 @@ public class ReplayMod {
         OpenGLUtils.init();
 
         I18n.setI18n(net.minecraft.client.resources.I18n::format);
+        //#if MC>=11300
+        MCVer.getMinecraft().resourcePackRepository.addPackFinder(new LangResourcePack.Finder());
+        //#endif
 
         //#if MC>=11300
         config = new Configuration(new File(mcDataDir(mc), "configs/replaymod.cfg")); // FIXME where'd the suggestion go?

src/main/java/com/replaymod/core/versions/LangResourcePack.java

@@ -0,0 +1,146 @@
+//#if MC>=11300
+package com.replaymod.core.versions;
+
+import com.google.gson.Gson;
+import com.replaymod.core.ReplayMod;
+import net.minecraft.resources.AbstractResourcePack;
+import net.minecraft.resources.IPackFinder;
+import net.minecraft.resources.IResourcePack;
+import net.minecraft.resources.ResourcePackFileNotFoundException;
+import net.minecraft.resources.ResourcePackInfo;
+import net.minecraft.resources.ResourcePackType;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.fml.loading.moddiscovery.ModFile;
+import net.minecraftforge.fml.packs.ModFileResourcePack;
+import net.minecraftforge.fml.packs.ResourcePackLoader;
+import org.apache.commons.io.IOUtils;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringBufferInputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+/**
+ * Resource pack which on-the-fly converts pre-1.13 language files into 1.13 json format.
+ */
+public class LangResourcePack extends AbstractResourcePack {
+    private static final Gson GSON = new Gson();
+    private static final String NAME = "replaymod_lang";
+    private static final Pattern JSON_FILE_PATTERN = Pattern.compile("^assets/" + ReplayMod.MOD_ID + "/lang/([a-z][a-z])_([a-z][a-z]).json$");
+    private static final Pattern LANG_FILE_NAME_PATTERN = Pattern.compile("^([a-z][a-z])_([a-z][a-z]).lang$");
+
+    LangResourcePack() {
+        super(new File(NAME));
+    }
+
+    private ModFileResourcePack getParent() {
+        return (ModFileResourcePack) ResourcePackLoader.getResourcePackFor(ReplayMod.MOD_ID);
+    }
+
+    private String langName(String path) {
+        Matcher matcher = JSON_FILE_PATTERN.matcher(path);
+        if (!matcher.matches()) return null;
+        return String.format("%s_%s.lang", matcher.group(1), matcher.group(2).toUpperCase());
+    }
+
+    private Path langPath(String path) {
+        ModFileResourcePack parent = getParent();
+        if (parent == null) return null;
+        ModFile modFile = parent.getModFile();
+
+        String langName = langName(path);
+        if (langName == null) return null;
+        return modFile.getLocator().findPath(modFile, "assets", ReplayMod.MOD_ID, "lang", langName);
+    }
+
+    private String convertValue(String value) {
+        return value;
+    }
+
+    @Override
+    protected InputStream getInputStream(String path) throws IOException {
+        if ("pack.mcmeta".equals(path)) {
+            return new StringBufferInputStream("{\"pack\": {\"description\": \"ReplayMod language files\", \"pack_format\": 4}}");
+        }
+
+        Path langPath = langPath(path);
+        if (langPath == null) throw new ResourcePackFileNotFoundException(file, path);
+
+        String langFile;
+        try (InputStream in = Files.newInputStream(langPath)) {
+            langFile = IOUtils.toString(in);
+        }
+
+        Map<String, String> properties = new HashMap<>();
+        for (String line : langFile.split("\n")) {
+            if (line.trim().isEmpty() || line.trim().startsWith("#")) continue;
+            int i = line.indexOf('=');
+            String key = line.substring(0, i);
+            String value = line.substring(i + 1);
+            value = convertValue(value);
+            properties.put(key, value);
+        }
+
+        return new ByteArrayInputStream(GSON.toJson(properties).getBytes(StandardCharsets.UTF_8));
+    }
+
+    @Override
+    protected boolean resourceExists(String path) {
+        Path langPath = langPath(path);
+        return langPath != null && Files.exists(langPath);
+    }
+
+    @Override
+    public Collection<ResourceLocation> getAllResourceLocations(ResourcePackType resourcePackType, String path, int maxDepth, Predicate<String> filter) {
+        if (resourcePackType == ResourcePackType.CLIENT_RESOURCES && "lang".equals(path)) {
+            IResourcePack parent = getParent();
+            if (parent == null) return Collections.emptyList();
+            return parent.getAllResourceLocations(resourcePackType, path, maxDepth, name -> {
+                Matcher matcher = LANG_FILE_NAME_PATTERN.matcher(name);
+                if (matcher.matches()) {
+                    return filter.test(String.format("%s_%s.json", matcher.group(1), matcher.group(1)));
+                } else {
+                    return false;
+                }
+            }).stream().map(resourceLocation -> {
+                String p = resourceLocation.getPath().substring(0, "assets/lang/xx_XX".length()) + ".json";
+                return new ResourceLocation(resourceLocation.getNamespace(), p);
+            }).collect(Collectors.toList());
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
+    @Override
+    public Set<String> getResourceNamespaces(ResourcePackType resourcePackType) {
+        if (resourcePackType == ResourcePackType.CLIENT_RESOURCES) {
+            return Collections.singleton("replaymod");
+        } else {
+            return Collections.emptySet();
+        }
+    }
+
+    @Override
+    public void close() {}
+
+    public static class Finder implements IPackFinder {
+        @Override
+        public <T extends ResourcePackInfo> void addPackInfosToMap(Map<String, T> packList, ResourcePackInfo.IFactory<T> factory) {
+            packList.put(NAME, ResourcePackInfo.func_195793_a(NAME, true, LangResourcePack::new, factory, ResourcePackInfo.Priority.BOTTOM));
+        }
+    }
+}
+//#endif

src/main/java/com/replaymod/core/versions/MCVer.java

@@ -120,6 +120,22 @@ public class MCVer {
         //#endif
     }
 
+    public static void addButton(GuiScreenEvent.InitGuiEvent event, GuiButton button) {
+        //#if MC>=11300
+        event.addButton(button);
+        //#else
+        //$$ getButtonList(event).add(button);
+        //#endif
+    }
+
+    public static void removeButton(GuiScreenEvent.InitGuiEvent event, GuiButton button) {
+        //#if MC>=11300
+        event.removeButton(button);
+        //#else
+        //$$ getButtonList(event).remove(button);
+        //#endif
+    }
+
     @SuppressWarnings("unchecked")
     public static List<GuiButton> getButtonList(GuiScreenEvent.InitGuiEvent event) {
         //#if MC>=10904

src/main/java/com/replaymod/replay/FullReplaySender.java

@@ -383,7 +383,6 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
                                     //$$ if (entity.addedToChunk && world.getChunkProvider().chunkExists(chunkX, chunkY)) {
                                     //#endif
                                         //#if MC>=11300
-                                        //#else
                                         world.getChunk(chunkX, chunkY).removeEntity(entity);
                                         //#else
                                         //$$ world.getChunkFromChunkCoords(chunkX, chunkY).removeEntity(entity);

src/main/java/com/replaymod/replay/handler/GuiHandler.java

@@ -66,18 +66,25 @@ public class GuiHandler {
                 switch (b.id) {
                     // Replace "Exit Server" button with "Exit Replay" button
                     case BUTTON_EXIT_SERVER:
-                        b.displayString = I18n.format("replaymod.gui.exit");
+                        removeButton(event, b);
-                        b.id = BUTTON_EXIT_REPLAY;
+                        addButton(event, new GuiButton(BUTTON_EXIT_REPLAY, b.x, b.y, b.width, b.height, I18n.format("replaymod.gui.exit")) {
+                            //#if MC>=11300
+                            @Override
+                            public void onClick(double mouseX, double mouseY) {
+                                onButton(new GuiScreenEvent.ActionPerformedEvent.Pre(getGui(event), this, new ArrayList<>()));
+                            }
+                            //#endif
+                        });
                         break;
                     // Remove "Advancements", "Stats" and "Open to LAN" buttons
                     case BUTTON_ADVANCEMENTS:
-                        buttonList.remove(achievements = b);
+                        removeButton(event, achievements = b);
                         break;
                     case BUTTON_STATS:
-                        buttonList.remove(stats = b);
+                        removeButton(event, stats = b);
                         break;
                     case BUTTON_OPEN_TO_LAN:
-                        buttonList.remove(openToLan = b);
+                        removeButton(event, openToLan = b);
                         break;
                 }
             }
@@ -135,9 +142,16 @@ public class GuiHandler {
             return;
         }
         GuiButton button = new GuiButton(BUTTON_REPLAY_VIEWER, getGui(event).width / 2 - 100,
-                getGui(event).height / 4 + 10 + 3 * 24, I18n.format("replaymod.gui.replayviewer")){};
+                getGui(event).height / 4 + 10 + 3 * 24, I18n.format("replaymod.gui.replayviewer")) {
+            //#if MC>=11300
+            @Override
+            public void onClick(double mouseX, double mouseY) {
+                onButton(new GuiScreenEvent.ActionPerformedEvent.Pre(getGui(event), this, new ArrayList<>()));
+            }
+            //#endif
+        };
         button.width = button.width / 2 - 2;
-        getButtonList(event).add(button);
+        addButton(event, button);
     }
 
     @SubscribeEvent

src/main/java/com/replaymod/replay/mixin/MixinTileEntityEndPortalRenderer.java

@@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 //#if MC>=11300
 import net.minecraft.util.Util;
 //#else
-import net.minecraft.client.Minecraft;
+//$$ import net.minecraft.client.Minecraft;
 //#endif
 
 //#if MC>=10800

versions/common.gradle

@@ -121,6 +121,7 @@ minecraft {
 
 afterEvaluate {
     if (mcVersion >= 11300) {
+        // FIXME
     } else {
         // Note cannot use minecraft.replace because that has already been forwarded to the task by FG by now
         tasks.sourceMainJava.replace '@MOD_VERSION@', project.version