Merge pull request #44 from XTerPL/1.20.2

Scripts Button & Script Ownership fixes

Author: TechStreetDev

src/main/java/io/github/techstreet/dfscript/mixin/render/MMultiplayerScreen.java

@@ -17,9 +17,9 @@
 @Mixin(MultiplayerScreen.class)
 public class MMultiplayerScreen extends Screen {
     @Unique
-    private final Identifier identifier_main = new Identifier(DFScript.MOD_ID + ":scripts.png");
+    private final Identifier identifier_main = new Identifier(DFScript.MOD_ID + ":scripts");
     @Unique
-    private final Identifier identifier_main_highlight = new Identifier(DFScript.MOD_ID + ":scripts_highlight.png");
+    private final Identifier identifier_main_highlight = new Identifier(DFScript.MOD_ID + "dfscript:scripts_highlight");
 
     protected MMultiplayerScreen(Text title) {
         super(title);

src/main/java/io/github/techstreet/dfscript/mixin/render/MOptionsScreen.java

@@ -1,22 +1,35 @@
 package io.github.techstreet.dfscript.mixin.render;
 
+import io.github.techstreet.dfscript.DFScript;
+import io.github.techstreet.dfscript.screen.script.ScriptListScreen;
+import io.github.techstreet.dfscript.util.render.BlendableTexturedButtonWidget;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.option.OptionsScreen;
 import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(OptionsScreen.class)
 public class MOptionsScreen extends Screen {
 
+    @Unique
+    private final Identifier identifier_main = new Identifier(DFScript.MOD_ID + ":scripts");
+    @Unique
+    private final Identifier identifier_main_highlight = new Identifier(DFScript.MOD_ID + "dfscript:scripts_highlight");
+
     public MOptionsScreen(Text literalText) {
         super(literalText);
     }
 
     @Inject(method = "init()V", at = @At("RETURN"))
     protected void init(CallbackInfo callbackInfo) {
-
+        this.addDrawableChild(new BlendableTexturedButtonWidget(5, 5, 20, 20, identifier_main, identifier_main_highlight, (button) -> {
+            ScriptListScreen screen = new ScriptListScreen(DFScript.MC.player != null);
+            DFScript.MC.setScreen(screen);
+        }));
     }
 }

src/main/java/io/github/techstreet/dfscript/screen/script/ScriptListScreen.java

@@ -9,6 +9,7 @@
 import io.github.techstreet.dfscript.script.ScriptManager;
 import io.github.techstreet.dfscript.script.VirtualScript;
 import io.github.techstreet.dfscript.script.util.UploadResponse;
+import io.github.techstreet.dfscript.util.Regex;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
@@ -103,7 +104,7 @@ public boolean mouseClicked(double x, double y, int button) {
             panel.add(enableDisable);
 
             if(allowEditAndUpload) {
-                if (s.getOwner() != null && s.getOwner().equals(DFScript.PLAYER_UUID)) {
+                if (s.getOwner() != null && s.getOwner().replaceAll("-", "").equals(DFScript.PLAYER_UUID.replaceAll("-", ""))) {
                     // Edit Button
                     CButton edit = new CTexturedButton(addedX, y + addedY, 8, 8, DFScript.MOD_ID + ":wrench.png", DFScript.MOD_ID + ":wrench_highlight.png", () -> {
                         DFScript.MC.setScreen(new ScriptEditScreen(s));