Update for GC release

NotThorny · Jun 2, 2023 · 6e468a6 · 6e468a6
1 parent a7d9e4e
commit 6e468a6
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>xyz.grasscutters</groupId> <!-- Versions below 1.0.3-dev are on 'tech.xigam' -->
             <artifactId>grasscutter</artifactId>
-            <version>1.4.5</version> <!-- Replace with the latest version of the API. -->
+            <version>1.6.1</version> <!-- Replace with the latest version of the API. -->
         </dependency>
     </dependencies>
 </project>
diff --git a/src/main/java/thorny/grasscutters/AttackModifier/AddAttack.java b/src/main/java/thorny/grasscutters/AttackModifier/AddAttack.java
@@ -5,15 +5,14 @@
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.data.excels.AvatarSkillDepotData;
+import emu.grasscutter.data.excels.avatar.AvatarSkillDepotData;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.entity.EntityGadget;
 import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.world.Position;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType;
 import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketSceneEntityDisappearNotify;
-import emu.grasscutter.utils.Position;
 import thorny.grasscutters.AttackModifier.commands.AttackModifierCommand;
 import thorny.grasscutters.AttackModifier.utils.Config;
 import thorny.grasscutters.AttackModifier.utils.Config.characters;
@@ -123,7 +122,6 @@ public static void removeGadgets(Scene scene) {
 
                 // Remove entity
                 scene.removeEntity(gadget, VisionType.VISION_TYPE_REMOVE);
-                //scene.broadcastPacket(new PacketSceneEntityDisappearNotify(gadget, VisionType.VISION_TYPE_REMOVE));
             } // if
         } // for
           // Remove gadgets and clean list
@@ -142,18 +140,19 @@ public static characters getCurrent(String curName)
             return curr;
         }
     }
-    
+
     public static void setGadget(Player targetPlayer, String avatarName, int uid, String attackType, int newGadget) {
         characters avatarToChange = null;
         Config gadgetConfig = AttackModifier.getInstance().config.getGadgetConfig();
         try {
             avatarToChange = AddAttack.getCharacter.getCurrent(avatarName);
             CommandHandler.sendMessage(targetPlayer, "Setting " + attackType + " to " + newGadget);
         } catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
-            CommandHandler.sendMessage(targetPlayer, "Failed to set gadget! Change in plugins/AttackModifier/config.json");
+            CommandHandler.sendMessage(targetPlayer,
+                    "Failed to set gadget! Change in plugins/AttackModifier/config.json");
         }
         switch (attackType) {
-            default ->  CommandHandler.sendMessage(targetPlayer, "/at set n|e|q [gadgetId]");
+            default -> CommandHandler.sendMessage(targetPlayer, "/at set n|e|q [gadgetId]");
             case "n" -> avatarToChange.skill.normalAtk = newGadget; // Normal attack
             case "e" -> avatarToChange.skill.elementalSkill = newGadget; // Elemental skill
             case "q" -> avatarToChange.skill.elementalBurst = newGadget; // Burst

diff --git a/src/main/java/thorny/grasscutters/AttackModifier/utils/Config.java b/src/main/java/thorny/grasscutters/AttackModifier/utils/Config.java
@@ -63,6 +63,12 @@ public final class Config {
     public characters laylaIds = new characters();
     public characters wandererIds = new characters();
     public characters faruzanIds = new characters();
+    public characters yaoyaoIds = new characters();
+    public characters alhathamIds = new characters();
+    public characters dehyaIds = new characters();
+    public characters mikaIds = new characters();
+    public characters kavehIds = new characters();
+    public characters baizhuIds = new characters();
 
     public static class characters {
 

diff --git a/src/main/resources/config.json b/src/main/resources/config.json
@@ -418,5 +418,19 @@
       "elementalSkill": 0,
       "elementalBurst": 0
     }
+  },
+  "alhathamIds": {
+    "skill": {
+      "normalAtk": 0,
+      "elementalSkill": 0,
+      "elementalBurst": 0
+    }
+  },
+  "yaoyaoIds": {
+    "skill": {
+      "normalAtk": 0,
+      "elementalSkill": 0,
+      "elementalBurst": 0
+    }
   }
 }
diff --git a/src/main/resources/plugin.json b/src/main/resources/plugin.json
@@ -3,6 +3,7 @@
   "description": "Make attacks do extra things",
   "version": "1.3.0-dev",
   "authors": [ "NotThorny" ],
+  "api": 2,
 
   "mainClass": "thorny.grasscutters.AttackModifier.AttackModifier",