Merge pull request #41 from MoSadie/2.3.0-effects

2.3.0 Effects

Author: MoSadie

.github/workflows/ci.yml

@@ -9,15 +9,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # Setup JDK
       - name: Set up JDK 8
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: adopt
           java-version: 8
-          cache: 'gradle'
+
+      - name: Set up Gradle
+        uses: gradle/gradle-build-action@v2
 
       # Build Core
       - name: Build/Install Core
@@ -48,15 +50,17 @@ jobs:
 
     steps:
       # Checks-out the repository under $GITHUB_WORKSPACE, so the job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # Setup JDK
       - name: Set up JDK 8
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: adopt
           java-version: 8
-          cache: 'gradle'
+      
+      - name: Set up Gradle
+        uses: gradle/gradle-build-action@v2
 
       # Download Core
       - name: Download Core Artifact
@@ -77,7 +81,7 @@ jobs:
 
       # Upload Artifact
       - name: Upload Artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.mod-loader }} ${{ matrix.mc-version }}
           path: ./MinecraftMod/${{ matrix.mod-loader }}/${{ matrix.mc-version }}/build/libs/*.jar
@@ -92,14 +96,14 @@ jobs:
       fail-fast: false
       matrix:
         mod-loader: ['fabric', 'forge']
-        mc-version: ['1.17.1', '1.18.1', '1.18.2', '1.19', '1.19.2', '1.19.3', '1.19.4', '1.20.1']
+        mc-version: ['1.17.1', '1.18.1', '1.18.2', '1.19', '1.19.2', '1.19.3', '1.19.4', '1.20.1', "1.20.2"]
         #exclude:
         #  - mod-loader: 'forge'
         #    mc-version: '1.17'
 
     steps:
       # Checks-out the repository under $GITHUB_WORKSPACE, so the job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # # Setup JDK
       # - name: Set up JDK 1.8
@@ -115,11 +119,13 @@ jobs:
 
       # Setup JDK
       - name: Set up JDK 1.17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: 17
-          cache: 'gradle'
+
+      - name: Set up Gradle
+        uses: gradle/gradle-build-action@v2
 
       # Download Core
       - name: Download Core Artifact
@@ -135,7 +141,7 @@ jobs:
 
       # Upload Artifact
       - name: Upload Artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.mod-loader }} ${{ matrix.mc-version }}
           path: ./MinecraftMod/${{ matrix.mod-loader }}/${{ matrix.mc-version }}/build/libs/*.jar
@@ -147,7 +153,7 @@ jobs:
 
     steps:
       # Checks-out the repository under $GITHUB_WORKSPACE, so the job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # # Setup JDK
       # - name: Set up JDK 1.8
@@ -163,11 +169,13 @@ jobs:
 
       # Setup JDK
       - name: Set up JDK 16
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: microsoft
           java-version: 16
-          cache: 'gradle'
+
+      - name: Set up Gradle
+        uses: gradle/gradle-build-action@v2
 
       # Download Core
       - name: Download Core Artifact
@@ -190,7 +198,7 @@ jobs:
 
       # Upload Artifact
       - name: Upload Artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: Stream Deck Plugin
           path: ./StreamDeckPlugin/*.streamDeckPlugin

MinecraftMod/core/.idea/misc.xml

@@ -3,7 +3,7 @@ plugins {
     id 'maven-publish'
 }
 
-version = 2.2
+version = 2.3
 group = 'com.mosadie.effectmc'
 archivesBaseName = "EffectMC-Core"
 

MinecraftMod/core/build.gradle

@@ -32,6 +32,8 @@ public interface EffectExecutor {
 
     boolean showToast(String title, String subtitle);
 
+    boolean showItemToast(String itemData, String title, String subtitle);
+
     boolean openBook(JsonObject bookJSON);
 
     boolean narrate(String message, boolean interrupt);
@@ -56,5 +58,9 @@ public interface EffectExecutor {
 
     boolean setRenderDistance(int chunks);
 
-//    boolean setGamemode(SetGamemodeHandler.GAMEMODE gamemode);
+    WorldState getWorldState();
+
+    String getSPWorldName();
+
+    String getServerIP();
 }

MinecraftMod/core/src/main/java/com/mosadie/effectmc/core/EffectExecutor.java

@@ -61,6 +61,8 @@ public EffectMCCore(File configFile, File trustFile, EffectExecutor executor) {
         effects.add(new SetGameModeHandler(this));
         effects.add(new ChatVisibilityHandler(this));
         effects.add(new SetRenderDistanceHandler(this));
+        effects.add(new RejoinHandler(this));
+        effects.add(new ShowItemToastHandler(this));
     }
 
     @SuppressWarnings("unused")

MinecraftMod/core/src/main/java/com/mosadie/effectmc/core/EffectMCCore.java

@@ -0,0 +1,7 @@
+package com.mosadie.effectmc.core;
+
+public enum WorldState {
+    MULTIPLAYER,
+    SINGLEPLAYER,
+    OTHER
+}

MinecraftMod/core/src/main/java/com/mosadie/effectmc/core/WorldState.java

@@ -0,0 +1,41 @@
+package com.mosadie.effectmc.core.handler;
+
+import com.mosadie.effectmc.core.EffectMCCore;
+
+public class RejoinHandler extends EffectRequestHandler {
+    public RejoinHandler(EffectMCCore core) {
+        super(core);
+    }
+
+    @Override
+    public String getEffectName() {
+        return "Rejoin";
+    }
+
+    @Override
+    public String getEffectTooltip() {
+        return "Disconnects and rejoins the current server/world.";
+    }
+
+    @Override
+    EffectResult execute() {
+        switch (core.getExecutor().getWorldState()) {
+            case MULTIPLAYER:
+                String server = core.getExecutor().getServerIP();
+                if (core.getExecutor().joinServer(server))
+                    return new EffectResult("Rejoining server...", true);
+                else
+                    return new EffectResult("Something went wrong rejoining server.", false);
+
+            case SINGLEPLAYER:
+                String world = core.getExecutor().getSPWorldName();
+                if (core.getExecutor().loadWorld(world))
+                    return new EffectResult("Rejoining world...", true);
+                else
+                    return new EffectResult("Something went wrong rejoining world.", false);
+
+            default:
+                return new EffectResult("Not currently in a world/server!", false);
+        }
+    }
+}

MinecraftMod/core/src/main/java/com/mosadie/effectmc/core/handler/RejoinHandler.java

@@ -0,0 +1,36 @@
+package com.mosadie.effectmc.core.handler;
+
+import com.mosadie.effectmc.core.EffectMCCore;
+
+public class ShowItemToastHandler extends EffectRequestHandler {
+
+    public ShowItemToastHandler(EffectMCCore core) {
+        super(core);
+        addCommentProperty("You can get item data by holding an item and running /effectmc exportitem");
+        addStringProperty("item", "", true, "Item Data", "{}");
+        addCommentProperty("Set color using § color codes.");
+        addStringProperty("title", "", true, "Title", "Hello");
+        addStringProperty("subtitle", "", true, "Subtitle", "World!");
+        addCommentProperty("For a blank subtitle, use a single space.");
+    }
+
+    @Override
+    public String getEffectName() {
+        return "Show Item Toast";
+    }
+
+    @Override
+    public String getEffectTooltip() {
+        return "Show a toast on screen with a custom message and item.";
+    }
+
+    @Override
+    EffectResult execute() {
+        core.getExecutor().log("Showing item toast with data: " + getProperty("item").getAsString() + " title: " + getProperty("title").getAsString() + " Subtitle: " + getProperty("subtitle").getAsString());
+        if (core.getExecutor().showItemToast(getProperty("item").getAsString(), getProperty("title").getAsString(), getProperty("subtitle").getAsString()))
+            return new EffectResult("Showing item toast with data: " + getProperty("item").getAsString() + " title: " + getProperty("title").getAsString() + " Subtitle: " + getProperty("subtitle").getAsString(), true);
+        else
+            return new EffectResult("Failed to show toast.", false);
+
+    }
+}

MinecraftMod/core/src/main/java/com/mosadie/effectmc/core/handler/ShowItemToastHandler.java

@@ -34,7 +34,7 @@ public String getAsString() {
 
     @Override
     public String getHTMLInput() {
-        return "<label for=\""+ id + "\">" + getLabel() + "</label><input type=\"range\" id=\"" + id + "\" name=\"" + id + "\" value=\"" + getAsString() + "\" min=\"" + min + "\" max=\"" + max + "\" step=\"0.01\">";
+        return "<label for=\""+ id + "\">" + getLabel() + "</label><input type=\"number\" id=\"" + id + "\" name=\"" + id + "\" value=\"" + getAsString() + "\" min=\"" + min + "\" max=\"" + max + "\" step=\"0.01\">";
     }
 
     @Override

MinecraftMod/core/src/main/java/com/mosadie/effectmc/core/property/FloatProperty.java

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.6-SNAPSHOT'
+	id 'fabric-loom' version '0.7-SNAPSHOT'
 	id 'maven-publish'
 }