Merge pull request #69 from TeamKun/develop

v1.7.0

Author: PeyaPeyaPeyang

.github/workflows/publish-hangar.yml

@@ -0,0 +1,48 @@
+name: Publish to HangarMC
+on:
+  release:
+    types: [published]
+
+jobs:
+  publish:
+    name: Publish to HangarMC
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Get the url of the artifact url from release assets
+        id: get_asset_url
+        uses: actions/github-script@v7
+        with:
+          result-encoding: string
+          script: |
+            const assets = await github.repos.listReleaseAssets({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              release_id: context.payload.release.id
+            });
+            // Find the asset with the name ending with .jar
+            const asset = assets.data.find(asset => asset.name.endsWith('.jar'));
+            if (!asset) {
+              throw new Error('No asset found');
+            }
+            
+            return asset.browser_download_url;
+
+      - name: Publish to HangarMC
+        uses: benwoo1110/hangar-upload-action@v1
+        with:
+          api_token: ${{ secrets.HANGAR_TOKEN }}
+          slug: Scenamatica
+          version: ${{ github.event.release.tag_name }}
+          channel: ${{ github.event.release.prerelease == true && 'Beta' || 'Release' }}
+          files: |
+            [
+              {
+                "platform": "PAPER",
+                "url": true,
+                "externalUrl": "${{ steps.get_asset_url.outputs.result }}"
+              }
+            ]
+          description: ${{ github.event.release.body }}

.github/workflows/scenamatica-build-and-test.yml

@@ -68,6 +68,6 @@ jobs:
     needs: self-tests
     steps:
       - name: Clean artifacts
-        uses: geekyeggo/delete-artifact@v2
+        uses: geekyeggo/delete-artifact@v5
         with:
           name: scenamatica

Scenamatica/.idea/misc.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.kunlab.scenamatica</groupId>
         <artifactId>NMSBridge</artifactId>
-        <version>1.6.2</version>
+        <version>1.7.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -23,62 +23,62 @@
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>NMSTypes</artifactId>
-            <version>1.6.2</version>
+            <version>1.7.0</version>
         </dependency>
 
         <!-- NMS Implementions -->
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>v1_13_R1</artifactId>
-            <version>1.6.2</version>
+            <version>1.7.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>v1_13_R2</artifactId>
-            <version>1.6.2</version>
+            <version>1.7.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>v1_14_R1</artifactId>
-            <version>1.6.2</version>
+            <version>1.7.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>v1_15_R1</artifactId>
-            <version>1.6.2</version>
+            <version>1.7.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>v1_16_R1</artifactId>
-            <version>1.6.2</version>
+            <version>1.7.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>v1_16_R2</artifactId>
-            <version>1.6.2</version>
+            <version>1.7.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>v1_16_R3</artifactId>
-            <version>1.6.2</version>
+            <version>1.7.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>v1_17_R1</artifactId>
-            <version>1.6.2</version>
+            <version>1.7.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>v1_18_R1</artifactId>
-            <version>1.6.2</version>
+            <version>1.7.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

Scenamatica/NMSBridge/NMSCore/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.kunlab.scenamatica</groupId>
         <artifactId>NMSBridge</artifactId>
-        <version>1.6.2</version>
+        <version>1.7.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

Scenamatica/NMSBridge/NMSTypes/pom.xml

@@ -6,6 +6,7 @@
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Item;
+import org.bukkit.entity.LightningStrike;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -16,6 +17,7 @@
 import org.kunlab.scenamatica.nms.types.entity.NMSEntityItem;
 import org.kunlab.scenamatica.nms.types.entity.NMSEntityLiving;
 import org.kunlab.scenamatica.nms.types.entity.NMSEntityPlayer;
+import org.kunlab.scenamatica.nms.types.entity.NMSLightningStrike;
 import org.kunlab.scenamatica.nms.types.item.NMSItemStack;
 import org.kunlab.scenamatica.nms.types.world.NMSWorldServer;
 
@@ -35,6 +37,8 @@ public interface WrapperProvider
 
     NMSEntityPlayer wrap(Player bukkitEntity);
 
+    NMSLightningStrike wrap(LightningStrike bukkitLightningStrike);
+
     // ==================[ ITEMS ]==================
 
     NMSItemStack wrap(ItemStack bukkitItemStack);

Scenamatica/NMSBridge/NMSTypes/src/main/java/org/kunlab/scenamatica/nms/WrapperProvider.java

@@ -0,0 +1,49 @@
+package org.kunlab.scenamatica.nms.enums.entity;
+
+import org.bukkit.event.weather.LightningStrikeEvent;
+
+public enum NMSLightningStrikeCause
+{
+    COMMAND,
+    TRIDENT,
+    TRAP,
+    WEATHER,
+    UNKNOWN;
+
+    public static NMSLightningStrikeCause fromBukkit(LightningStrikeEvent.Cause cause)
+    {
+        if (cause == null)
+            return null;
+
+        switch (cause)
+        {
+            case COMMAND:
+                return COMMAND;
+            case TRIDENT:
+                return TRIDENT;
+            case TRAP:
+                return TRAP;
+            case WEATHER:
+                return WEATHER;
+            default:
+                return UNKNOWN;
+        }
+    }
+
+    public static LightningStrikeEvent.Cause toBukkit(NMSLightningStrikeCause cause)
+    {
+        switch (cause)
+        {
+            case COMMAND:
+                return LightningStrikeEvent.Cause.COMMAND;
+            case TRIDENT:
+                return LightningStrikeEvent.Cause.TRIDENT;
+            case TRAP:
+                return LightningStrikeEvent.Cause.TRAP;
+            case WEATHER:
+                return LightningStrikeEvent.Cause.WEATHER;
+            default:
+                return null;
+        }
+    }
+}