more porting to java

Author: lineargraph

common/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
     `maven-publish`
 	id("moulconfig.base")
     id("moulconfig.test")
+    id("moulconfig.manifold")
 }
 
 java.toolchain.languageVersion.set(JavaLanguageVersion.of(8))

common/src/main/java/io/github/notenoughupdates/moulconfig/Social.java

@@ -64,7 +64,7 @@ public void onClick() {
             try {
                 Desktop.getDesktop().browse(url);
             } catch (Exception e) {
-                IMinecraft.instance.sendClickableChatMessage(StructuredText.of("Click here to open ").append(name), url.toString(), ClickType.OPEN_LINK);
+                IMinecraft.INSTANCE.sendClickableChatMessage(StructuredText.of("Click here to open ").append(name), url.toString(), ClickType.OPEN_LINK);
             }
         }
 

common/src/main/java/io/github/notenoughupdates/moulconfig/common/DynamicTextureReference.kt

@@ -35,6 +35,6 @@ abstract class DynamicTextureReference : Closeable {
 
     protected fun finalize() { // TODO: replace with a reference queue and Warnings.warn
         if (!wasDestroyed)
-            IMinecraft.instance.getLogger("DynamicTextureReference").warn("Dangling DynamicTextureReference")
+            IMinecraft.INSTANCE.getLogger("DynamicTextureReference").warn("Dangling DynamicTextureReference")
     }
 }

common/src/main/java/io/github/notenoughupdates/moulconfig/common/IMinecraft.java

@@ -0,0 +1,132 @@
+package io.github.notenoughupdates.moulconfig.common;
+
+import io.github.notenoughupdates.moulconfig.common.text.StructuredText;
+import io.github.notenoughupdates.moulconfig.gui.GuiComponent;
+import io.github.notenoughupdates.moulconfig.gui.GuiContext;
+import io.github.notenoughupdates.moulconfig.gui.GuiElement;
+import io.github.notenoughupdates.moulconfig.internal.InitUtil;
+import io.github.notenoughupdates.moulconfig.internal.MCLogger;
+import io.github.notenoughupdates.moulconfig.internal.Warnings;
+import io.github.notenoughupdates.moulconfig.processor.MoulConfigProcessor;
+import kotlin.Pair;
+import lombok.var;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+import java.awt.image.BufferedImage;
+import java.io.InputStream;
+import java.util.ServiceLoader;
+
+@NullMarked
+public interface IMinecraft {
+    InputStream loadResourceLocation(MyResourceLocation resourceLocation);
+
+    MCLogger getLogger(String label);
+
+    /**
+     * @return if the {@code resourceLocation} is one that is only temporarily used as a generated target by {@link #generateDynamicTexture}.
+     */
+    boolean isGeneratedSentinel(MyResourceLocation resourceLocation);
+
+    /**
+     * Dynamically load a buffered image into a minecraft bindable texture. The returned resource location must be destroyed.
+     */
+    DynamicTextureReference generateDynamicTexture(BufferedImage image);
+
+    Pair<Double, Double> getMousePositionHF();
+
+    default int getMouseX() {
+        return (int) getMouseXHF();
+    }
+
+    default int getMouseY() {
+        return (int) getMouseYHF();
+    }
+
+    default double getMouseXHF() {
+        return getMousePositionHF().getFirst();
+    }
+
+    default double getMouseYHF() {
+        return getMousePositionHF().getSecond();
+    }
+
+    boolean isDevelopmentEnvironment();
+
+    IFontRenderer getDefaultFontRenderer();
+
+    IKeyboardConstants getKeyboardConstants();
+
+    int getScaledWidth();
+
+    int getScaledHeight();
+
+    int getScaleFactor();
+
+    boolean isOnMacOs();
+
+    boolean isMouseButtonDown(int mouseButton);
+
+    boolean isKeyboardKeyDown(int keyCode);
+
+    void addExtraBuiltinConfigProcessors(MoulConfigProcessor<?> processor);
+
+    void sendClickableChatMessage(StructuredText message, String action, @Nullable ClickType clickType);
+
+    default void sendChatMessage(StructuredText message) {
+        sendClickableChatMessage(message, "", null);
+    }
+
+    StructuredText getKeyName(int keyCode);
+
+    StructuredText createLiteral(String text);
+
+    StructuredText createTranslatable(String key, StructuredText... args);
+
+    /**
+     * Create a structured text from an untyped platform object. Must be a platform type exactly, not a string or a structured text.
+     */
+    @ApiStatus.Internal
+    @Nullable
+    StructuredText createStructuredTextInternal(Object object);
+
+    /**
+     * This is a method to provide a render context. Note that constructing this context directly will potentially give
+     * you an incorrect render state, leading to visual glitches. Depending on your platform, this might also require
+     * additional platform specific cleanup / post rendering work to be done. Use only if you know exactly that none
+     * of your rendering requires this extra functionality.
+     *
+     * @deprecated This context will be at the top level, not providing any of the useful translations and scalings that might be needed to render properly. Use with care.
+     */
+    @Deprecated
+    RenderContext provideTopLevelRenderContext();
+
+    void openWrappedScreen(GuiElement guiElement);
+
+    void openWrappedScreen(GuiContext guiContext);
+
+    default void openWrappedScreen(GuiComponent component) {
+        openWrappedScreen(new GuiContext(component));
+    }
+
+    void copyToClipboard(String string);
+
+    String copyFromClipboard();
+
+    IMinecraft INSTANCE = InitUtil.makeUnchecked(() -> {
+        var serviceLoader = ServiceLoader.load(IMinecraft.class);
+        serviceLoader.reload();
+        var iterator = serviceLoader.iterator();
+        var instance = iterator.next();
+        if (iterator.hasNext()) {
+            var duplicate = iterator.next();
+            Warnings.warn("Duplicate IMinecraft class ${duplicate}, ${instance}");
+        }
+        return instance;
+    });
+
+    static IMinecraft getInstance() {
+        return INSTANCE;
+    }
+}

common/src/main/java/io/github/notenoughupdates/moulconfig/common/IMinecraft.kt

@@ -1,3 +1,3 @@
 package io.github.notenoughupdates.moulconfig.common
 
-object KeyboardConstants : IKeyboardConstants by IMinecraft.instance.keyboardConstants
+object KeyboardConstants : IKeyboardConstants by IMinecraft.getInstance().keyboardConstants

common/src/main/java/io/github/notenoughupdates/moulconfig/common/KeyboardConstants.kt

@@ -57,7 +57,7 @@ default boolean isCmdDown() {
      * Returns whether the control key is held down on Windows and Linux, and for macOS checks if the command key is held down.
      */
     default boolean isLogicalCtrlDown() {
-        if (getMinecraft().isOnMacOS()) {
+        if (getMinecraft().isOnMacOs()) {
             return isCmdDown();
         } else {
             return isPhysicalCtrlDown();
@@ -238,6 +238,6 @@ default void scheduleDrawTooltip(int x, int y, @NotNull List<StructuredText> too
     void renderExtraLayers();
 
     default @NotNull IMinecraft getMinecraft() {
-        return IMinecraft.instance;
+        return IMinecraft.INSTANCE;
     }
 }

common/src/main/java/io/github/notenoughupdates/moulconfig/common/RenderContext.java

@@ -10,15 +10,15 @@
 @ApiStatus.NonExtendable
 public interface StructuredText {
     static @NotNull StructuredText of(@NotNull String text) {
-        return IMinecraft.instance.createLiteral(text);
+        return IMinecraft.INSTANCE.createLiteral(text);
     }
 
     static @NotNull StructuredText empty() {
         return of("");
     }
 
     static @NotNull StructuredText translatable(@NotNull String translationKey, @NotNull StructuredText @NotNull ... args) {
-        return IMinecraft.instance.createTranslatable(translationKey, args);
+        return IMinecraft.INSTANCE.createTranslatable(translationKey, args);
     }
 
     /**

common/src/main/java/io/github/notenoughupdates/moulconfig/common/text/StructuredText.java

@@ -34,7 +34,7 @@
  * Additionally, these elements now properly handle focus.
  */
 public abstract class GuiComponent {
-    protected final IMinecraft mc = IMinecraft.instance;
+    protected final IMinecraft mc = IMinecraft.INSTANCE;
     @Setter
     @Getter
     GuiContext context;

common/src/main/java/io/github/notenoughupdates/moulconfig/gui/GuiComponent.java

@@ -96,7 +96,7 @@ public void render(RenderContext context, int x, int y, int width) {
     public int getHeight() {
         if (option.getConfig().getDescriptionBehaviour(option) != DescriptionRendereringBehaviour.EXPAND_PANEL)
             return HEIGHT;
-        var fr = IMinecraft.instance.getDefaultFontRenderer();
+        var fr = IMinecraft.INSTANCE.getDefaultFontRenderer();
         return Math.max(45, fr.splitText(option.getDescription(), 250 * 2 / 3 - 10).size() * (fr.getHeight() + 1) + 10);
     }