2.15.1 prerelease

.github/workflows/maven.yml

@@ -0,0 +1,31 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ "2.15.1-prerelease" ]
+  pull_request:
+    branches: [ "2.15.1-prerelease" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml

README.md

@@ -1,12 +1,14 @@
-[![GitHub Pre-Release](https://img.shields.io/github/release-pre/CozmycDev/JedCore.svg)](https://github.com/CozmycDev/JedCore/releases)
-[![Github All Releases](https://img.shields.io/github/downloads/CozmycDev/JedCore/total.svg)](https://github.com/CozmycDev/JedCore/releases)
-![Size](https://img.shields.io/github/repo-size/CozmycDev/JedCore.svg)
+[![GitHub Pre-Release](https://img.shields.io/github/release-pre/Hihelloy-main/JedCore.svg)](https://github.com/Hihelloy-main/JedCore/releases)
+[![Github All Releases](https://img.shields.io/github/downloads/Hihelloy-main/JedCore/total.svg)](https://github.com/Hihelloy-main/JedCore/releases)
+![Size](https://img.shields.io/github/repo-size/Hihelloy-main/JedCore.svg)
 
 # JedCore
-This is my fork of plushmonkey's fork of jedk1's JedCore addon for ProjectKorra.  
-Download releases [here](https://github.com/CozmycDev/JedCore/releases).
+This is my fork of Cozymc's fork of plushmonkey's fork of jedk1's JedCore addon for ProjectKorra.  
+Download releases [here](https://github.com/Hihelloy-main/JedCore/releases).
 Join our [Discord](https://discord.gg/gh9MfDmwZm) to discuss the plugin, suggest changes, report bugs, etc.
 
+This fork attempts on adding Folia support.
+
 ## Changelog
 
 ### 2.14.4

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.jedk1</groupId>
   <artifactId>jedcore</artifactId>
-  <version>2.15.0-PK1.11.1</version>
+  <version>2.15.1-PRE-RELEASE-3-PK1.12.1</version>
   <packaging>jar</packaging>
   <name>JedCore</name>
 
@@ -13,22 +13,48 @@
       <id>spigot-repo</id>
       <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
     </repository>
+    <repository>
+      <id>papermc</id>
+      <url>https://repo.papermc.io/repository/maven-public/</url>
+    </repository>
+      <repository>
+          <id>jitpack.io</id>
+          <url>https://jitpack.io</url>
+      </repository>
+
   </repositories>
 
   <dependencies>
-    <!-- Spigot API -->
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot-api</artifactId>
-      <version>1.20.2-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
     <!-- ProjectKorra -->
-    <dependency>
-      <groupId>com.projectkorra</groupId>
-      <artifactId>projectkorra</artifactId>
-      <version>1.11.1</version>
-    </dependency>
+      <dependency>
+          <groupId>com.projectkorra</groupId>
+          <artifactId>projectkorra</artifactId>
+          <version>1.12.1-PRE-RELEASE-1</version>
+          <scope>provided</scope>
+      </dependency>
+    <!-- Paper api -->
+      <dependency>
+          <groupId>org.spigotmc</groupId>
+          <artifactId>spigot-api</artifactId>
+          <version>1.20.2-R0.1-SNAPSHOT</version>
+          <scope>provided</scope>
+      </dependency>
+      <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
+      <dependency>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+          <version>33.5.0-jre</version>
+      </dependency>
+      <dependency>
+          <groupId>com.cjcrafter</groupId>
+          <artifactId>foliascheduler</artifactId>
+          <version>0.7.2</version>
+      </dependency>
+      <dependency>
+          <groupId>org.jetbrains</groupId>
+          <artifactId>annotations</artifactId>
+          <version>26.0.2-1</version>
+      </dependency>
   </dependencies>
 
   <build>
@@ -51,8 +77,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.0</version>
         <configuration>
-          <source>9</source>
-          <target>9</target>
+          <source>17</source>
+          <target>17</target>
         </configuration>
       </plugin>
       <plugin>
@@ -63,6 +89,47 @@
           <outputDirectory>${dir}</outputDirectory>
         </configuration>
       </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-shade-plugin</artifactId>
+            <version>3.4.1</version>
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <goals><goal>shade</goal></goals>
+                    <configuration>
+                        <relocations>
+                            <relocation>
+                                <pattern>com.google.guava</pattern>
+                                <shadedPattern>com.jedk1.jedcore.libs.googleguava</shadedPattern>
+                            </relocation>
+                            <relocation>
+                                <pattern>org.jetbrains.annotations</pattern>
+                                <shadedPattern>com.jedk1.jedcore.libs.jetbrains</shadedPattern>
+                            </relocation>
+                            <relocation>
+                                <pattern>com.cjcrafter.foliascheduler</pattern>
+                                <shadedPattern>com.jedk1.jedcore.libs.foliascheduler</shadedPattern>
+                            </relocation>
+                        </relocations>
+
+                        <filters>
+                            <filter>
+                                <artifact>*:*</artifact>
+                                <excludes>
+                                    <exclude>META-INF/*.SF</exclude>
+                                    <exclude>META-INF/*.DSA</exclude>
+                                    <exclude>META-INF/*.RSA</exclude>
+                                    <exclude>META-INF/versions/**</exclude>
+                                    <exclude>META-INF/*.kotlin_module</exclude>
+                                </excludes>
+                            </filter>
+                        </filters>
+                        <createDependencyReducedPom>false</createDependencyReducedPom>
+                    </configuration>
+                </execution>
+            </executions>
+        </plugin>
     </plugins>
   </build>
 

src/com/jedk1/jedcore/JCManager.java

@@ -1,27 +1,29 @@
 package com.jedk1.jedcore;
 
+import com.jedk1.jedcore.ability.earthbending.EarthPillar;
+import com.jedk1.jedcore.ability.firebending.LightningBurst;
+import com.jedk1.jedcore.ability.waterbending.HealingWaters;
+import com.jedk1.jedcore.ability.waterbending.IcePassive;
+import com.jedk1.jedcore.ability.waterbending.IceWall;
+import com.jedk1.jedcore.util.RegenTempBlock;
 import org.bukkit.Bukkit;
 
- import com.jedk1.jedcore.ability.firebending.LightningBurst;
- import com.jedk1.jedcore.ability.waterbending.HealingWaters;
- import com.jedk1.jedcore.ability.waterbending.IcePassive;
- import com.jedk1.jedcore.util.RegenTempBlock;
-
 public class JCManager implements Runnable {
 
-	public JedCore plugin;
-
-	public JCManager(JedCore plugin) {
-		this.plugin = plugin;
-	}
-
-	public void run() {
-		LightningBurst.progressAll();
-
-		HealingWaters.heal(Bukkit.getServer());
-		IcePassive.handleSkating();
-//		IceWall.progressAll();
-
-		RegenTempBlock.manage();
-	}
+    public JedCore plugin;
+
+    public JCManager(JedCore plugin) {
+        this.plugin = plugin;
+    }
+
+    public void run() {
+        LightningBurst.progressAll();
+
+        HealingWaters.heal(Bukkit.getServer());
+        //IcePassive.handleSkating();
+        IceWall.progressAll();
+        EarthPillar.progressAll();
+
+        RegenTempBlock.manage();
+    }
 }