Skip to content

Running on java 8+ #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 42 commits into from
Mar 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
41afb86
Bump version from 1.3.17 to 1.3.17-SNAPSHOT0
Mar 4, 2025
4dc7800
Fixed scoreboard on FUll Game is showing waiting stage instead of sta…
Tigerpanzer02 Mar 4, 2025
5e127dc
Bump version from 1.3.17-SNAPSHOT0 to 1.3.17-SNAPSHOT1
Mar 4, 2025
e8feb02
Fixed leaving while full game stopped the game
Tigerpanzer02 Mar 4, 2025
0eef54a
Bump version from 1.3.17-SNAPSHOT1 to 1.3.17-SNAPSHOT2
Mar 4, 2025
327153f
Attempt to switch to java 8
Tigerpanzer02 Mar 12, 2025
087accd
Attempt to switch to java 8
Tigerpanzer02 Mar 12, 2025
9fa28a8
Attempt to switch to java 8
Tigerpanzer02 Mar 12, 2025
839f6d9
Bump version from 1.3.17-SNAPSHOT2 to 1.3.17-SNAPSHOT3
Mar 12, 2025
17cd823
Attempt to switch to maven
Tigerpanzer02 Mar 12, 2025
60fa68d
Attempt to switch to maven
Tigerpanzer02 Mar 12, 2025
cf631d6
Bump version from 1.3.17-SNAPSHOT3 to 1.3.17-SNAPSHOT4
Mar 12, 2025
c2d9151
Revert "Bump version from 1.3.17-SNAPSHOT3 to 1.3.17-SNAPSHOT4"
Tigerpanzer02 Mar 12, 2025
e254490
Revert "Attempt to switch to maven"
Tigerpanzer02 Mar 12, 2025
b33bb56
Revert "Attempt to switch to maven"
Tigerpanzer02 Mar 12, 2025
4429804
Revert "Bump version from 1.3.17-SNAPSHOT2 to 1.3.17-SNAPSHOT3"
Tigerpanzer02 Mar 12, 2025
1bc9298
Revert "Attempt to switch to java 8"
Tigerpanzer02 Mar 12, 2025
28d82ab
Revert "Attempt to switch to java 8"
Tigerpanzer02 Mar 12, 2025
f5e5ad8
Revert "Attempt to switch to java 8"
Tigerpanzer02 Mar 12, 2025
ea48307
Bump version from 1.3.17-SNAPSHOT2 to 1.3.17-SNAPSHOT3
Mar 12, 2025
dcbe843
Removed usage of org.apache.commons.lang
Tigerpanzer02 Mar 12, 2025
22d3aac
Fixed config saving on FileStats which caused player names to be empty
Tigerpanzer02 Mar 12, 2025
8f31aca
Bump version from 1.3.17-SNAPSHOT3 to 1.3.17-SNAPSHOT4
Mar 12, 2025
fe3d78c
Switch from gradle to maven attempt 2
Tigerpanzer02 Mar 12, 2025
8050307
Switch from gradle to maven attempt 2
Tigerpanzer02 Mar 12, 2025
6b94f8d
Bump version from 1.3.17-SNAPSHOT4 to 1.3.17-SNAPSHOT5
Mar 12, 2025
6626531
Switch from gradle to maven attempt 2
Tigerpanzer02 Mar 12, 2025
ca77ca4
Bump version from 1.3.17-SNAPSHOT5 to 1.3.17-SNAPSHOT6
Mar 12, 2025
5d3518d
Switch from gradle to maven attempt 2
Tigerpanzer02 Mar 12, 2025
f7ce240
Bump version from 1.3.17-SNAPSHOT6 to 1.3.17-SNAPSHOT7
Mar 12, 2025
ac8d4e6
Use newer deploy plugin
Tigerpanzer02 Mar 12, 2025
be76c3b
Bump version from 1.3.17-SNAPSHOT7 to 1.3.17-SNAPSHOT8
Mar 12, 2025
6e20586
Fixed papi repo
Tigerpanzer02 Mar 12, 2025
5a24866
Bump version from 1.3.17-SNAPSHOT8 to 1.3.17-SNAPSHOT9
Mar 12, 2025
cb1e026
Updated deploy-master.yml to match maven building
Tigerpanzer02 Mar 12, 2025
0132e1f
Bump version from 1.3.17-SNAPSHOT9 to 1.3.17-SNAPSHOT10
Mar 12, 2025
838006a
Updated deploy-master.yml to match maven building
Tigerpanzer02 Mar 12, 2025
ad2fc10
Bump version from 1.3.17-SNAPSHOT10 to 1.3.17-SNAPSHOT11
Mar 12, 2025
5094f20
Updated poms to save some bytes on build
Tigerpanzer02 Mar 13, 2025
e145ba5
Bump version from 1.3.17-SNAPSHOT11 to 1.3.17-SNAPSHOT12
Mar 13, 2025
cd2be32
Updated CHANGELOG.md
Tigerpanzer02 Mar 13, 2025
054d102
Bump version from 1.3.17-SNAPSHOT12 to 1.3.17-SNAPSHOT13
Mar 13, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .github/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
### 1.3.16 Release (04.03.2025)
### 1.4.0 Release (13.03.2025)
* Fixed scoreboard on FUll Game is showing waiting stage instead of starting
* Fixed leaving while full game stopped the game
* Changed java compatibility backport to 1.8

### 1.3.17 Release (04.03.2025)
* Changed Scoreboard API (now paket based) (Thanks MrMicky-FR FastBoard)
* Changed Scoreboard on lower 1.12.2 now supports 30 chars
* Changed Scoreboard on 1.13+ now supports unlimited chars
Expand All @@ -9,7 +14,7 @@
* Fixed Progress must be between 0 and 1
* Fixed ItemBuilder.glowEffect

### (1.3.11-)1.3.15 Release (17.02.2025)
### (1.3.11-)1.3.16 Release (17.02.2025)
* Added 1.21.1-4 support
* Added (3) new ConfigOptions for ArmorStands (BLOCK_IN_GAME_ARMOR_STAND_DESTROY, BLOCK_IN_GAME_ARMOR_STAND_CHECK, BLOCK_IN_GAME_ARMOR_STAND_INTERACT)
* Fixed arena start time divider did not match from config.yml
Expand Down
10 changes: 5 additions & 5 deletions .github/maven/api/pom.xml → .github/building/api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>minigamesbox</artifactId>
<groupId>plugily.projects</groupId>
<version>1.3.3.1-java8</version>
<version>1.3.17-SNAPSHOT4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -53,8 +53,8 @@
<url>https://maven.plugily.xyz/releases</url>
</repository>
<repository>
<id>papi-repo</id>
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
<id>placeholderapi</id>
<url>https://repo.extendedclip.com/releases/</url>
</repository>
</repositories>

Expand All @@ -80,7 +80,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.0</version>
<version>3.11.2</version>
<configuration>
<windowtitle>MiniGamesBox Inventory API docs for v${project.version}</windowtitle>
<description>Library box with massive content that could be seen as minigames core.</description>
Expand All @@ -93,7 +93,7 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>3.5.2</version>
<version>3.5.3</version>
</extension>
</extensions>
</build>
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
//CHECKSTYLE:OFF
import org.gradle.util.GradleVersion;
import org.gradle.groovy.scripts.BasicScript;
import org.gradle.groovy.scripts.ScriptSource;
import org.gradle.groovy.scripts.TextResourceScriptSource;
import org.gradle.internal.resource.StringTextResource;
/**
* Precompiled plugily.projects.java-conventions script plugin.
**/
@SuppressWarnings("DefaultPackage")
public class PlugilyProjectsJavaConventionsPlugin implements org.gradle.api.Plugin<org.gradle.api.internal.project.ProjectInternal> {
private static final String MIN_SUPPORTED_GRADLE_VERSION = "5.0";
@Override
public void apply(org.gradle.api.internal.project.ProjectInternal target) {
assertSupportedByCurrentGradleVersion();
try {
Class<? extends BasicScript> pluginsBlockClass = Class.forName("cp_precompiled_PlugilyProjectsJavaConventions").asSubclass(BasicScript.class);
BasicScript pluginsBlockScript = pluginsBlockClass.getDeclaredConstructor().newInstance();
pluginsBlockScript.setScriptSource(scriptSource(pluginsBlockClass));
pluginsBlockScript.init(target, target.getServices());
pluginsBlockScript.run();
target.getPluginManager().apply("java-library");
target.getPluginManager().apply("signing");
target.getPluginManager().apply("maven-publish");


Class<? extends BasicScript> precompiledScriptClass = Class.forName("precompiled_PlugilyProjectsJavaConventions").asSubclass(BasicScript.class);
BasicScript script = precompiledScriptClass.getDeclaredConstructor().newInstance();
script.setScriptSource(scriptSource(precompiledScriptClass));
script.init(target, target.getServices());
script.run();
} catch (Exception e) {
throw new RuntimeException(e);
}
}
private static ScriptSource scriptSource(Class<?> scriptClass) {
return new TextResourceScriptSource(new StringTextResource(scriptClass.getSimpleName(), ""));
}
private static void assertSupportedByCurrentGradleVersion() {
if (GradleVersion.current().getBaseVersion().compareTo(GradleVersion.version(MIN_SUPPORTED_GRADLE_VERSION)) < 0) {
throw new RuntimeException("Precompiled Groovy script plugins require Gradle "+MIN_SUPPORTED_GRADLE_VERSION+" or higher");
}
}
}
//CHECKSTYLE:ON
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
implementation-class=PlugilyProjectsJavaConventionsPlugin
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
implementation-class=PlugilyProjectsJavaConventionsPlugin
Binary file not shown.
2 changes: 2 additions & 0 deletions .github/building/buildSrc/build/tmp/jar/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Manifest-Version: 1.0

Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ dependencies {
implementation("org.openjdk.nashorn:nashorn-core:15.4")
implementation("org.ow2.asm:asm:9.6")
compileOnly("com.viaversion:viaversion-api:5.2.1")
compileOnly("com.mojang:authlib:3.13.56")
compileOnly("de.simonsator:DevelopmentPAFSpigot:1.0.67")
compileOnly("de.simonsator:Party-and-Friends-MySQL-Edition-Spigot-API:1.5.4-RELEASE")
compileOnly("de.simonsator:Spigot-Party-API-For-RedisBungee:1.0.3-SNAPSHOT")
Expand Down
22 changes: 8 additions & 14 deletions .github/maven/classic/pom.xml → .github/building/classic/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>minigamesbox</artifactId>
<groupId>plugily.projects</groupId>
<version>1.3.3.1-java8</version>
<version>1.3.17-SNAPSHOT4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -51,8 +51,8 @@
<url>https://maven.plugily.xyz/releases</url>
</repository>
<repository>
<id>papi-repo</id>
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
<id>placeholderapi</id>
<url>https://repo.extendedclip.com/releases/</url>
</repository>
<repository>
<id>via-version</id>
Expand All @@ -65,12 +65,6 @@
</repositories>

<dependencies>
<dependency>
<groupId>com.mojang</groupId>
<artifactId>authlib</artifactId>
<version>2.3.31</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>fr.mrmicky</groupId>
<artifactId>fastboard</artifactId>
Expand Down Expand Up @@ -155,7 +149,7 @@
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.11.2</version>
<version>2.11.6</version>
<scope>provided</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -184,12 +178,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
<version>3.4.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.0</version>
<version>3.11.2</version>
<configuration>
<windowtitle>MiniGamesBox Classic API docs for v${project.version}</windowtitle>
<description>Library box with massive content that could be seen as minigames core.</description>
Expand All @@ -200,7 +194,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.3.0</version>
<version>3.6.0</version>
<configuration>
<relocations>
<relocation>
Expand Down Expand Up @@ -244,7 +238,7 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>3.5.2</version>
<version>3.5.3</version>
</extension>
</extensions>
</build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>minigamesbox</artifactId>
<groupId>plugily.projects</groupId>
<version>1.3.3.1-java8</version>
<version>1.3.17-SNAPSHOT4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -41,7 +41,7 @@
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>4.0.3</version>
<version>5.0.1</version>
</dependency>

</dependencies>
Expand All @@ -51,20 +51,18 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.0</version>
<version>3.11.2</version>
<configuration>
<windowtitle>MiniGamesBox Inventory API docs for v${project.version}</windowtitle>
<windowtitle>MiniGamesBox Database API docs for v${project.version}</windowtitle>
<description>Library box with massive content that could be seen as minigames core.</description>
<destDir>minecraft/minigamesbox/inventory</destDir>
<isOffline>false</isOffline>
</configuration>
</plugin>
</plugins>
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>3.5.2</version>
<version>3.5.3</version>
</extension>
</extensions>
</build>
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties → .github/building/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
group=plugily.projects
version=1.3.17
version=1.3.17-SNAPSHOT4
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>minigamesbox</artifactId>
<groupId>plugily.projects</groupId>
<version>1.3.3.1-java8</version>
<version>1.3.17-SNAPSHOT4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -54,7 +54,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.0</version>
<version>3.11.2</version>
<configuration>
<windowtitle>MiniGamesBox Inventory API docs for v${project.version}</windowtitle>
<description>Library box with massive content that could be seen as minigames core.</description>
Expand All @@ -65,7 +65,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.3.0</version>
<version>3.6.0</version>
<configuration>
<relocations>
<relocation>
Expand All @@ -89,7 +89,7 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>3.5.2</version>
<version>3.5.3</version>
</extension>
</extensions>
</build>
Expand Down
2 changes: 1 addition & 1 deletion .github/maven/pom.xml → .github/building/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<groupId>plugily.projects</groupId>
<artifactId>minigamesbox</artifactId>
<version>1.3.3.1-java8</version>
<version>1.3.17-SNAPSHOT4</version>
<packaging>pom</packaging>

<modules>
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>minigamesbox</artifactId>
<groupId>plugily.projects</groupId>
<version>1.3.3.1-java8</version>
<version>1.3.17-SNAPSHOT4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -38,7 +38,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.0</version>
<version>3.11.2</version>
<configuration>
<windowtitle>MiniGamesBox Inventory API docs for v${project.version}</windowtitle>
<description>Library box with massive content that could be seen as minigames core.</description>
Expand All @@ -51,7 +51,7 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>3.5.2</version>
<version>3.5.3</version>
</extension>
</extensions>
</build>
Expand Down
31 changes: 21 additions & 10 deletions .github/workflows/deploy-development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,9 @@ jobs:
steps:
- name: Checkout Latest Commit
uses: actions/[email protected]
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Bump Version
id: bump
uses: Plugily-Projects/version-bump-action@v8
uses: Plugily-Projects/version-bump-action@v10
with:
github-token: ${{ secrets.github_token }}
auto-version-bump: true
Expand All @@ -34,10 +32,23 @@ jobs:
distribution: 'temurin'
java-version: '21'
java-package: jdk
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Publish with Gradle
run: ./gradlew publishMavenPublicationToSnapshotsRepository --info
env:
MAVEN_USERNAME: ${{ secrets.SNAPSHOTSUSERNAME }}
MAVEN_PASSWORD: ${{ secrets.SNAPSHOTSPASSWORD }}
- name: Set up Maven
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.8.2
- name: Cache
uses: actions/[email protected]
with:
path: ~/.m2/repository
key: maven-${{ hashFiles('**/pom.xml') }}
restore-keys: maven-
- name: Publish with Maven
uses: s4u/[email protected]
with:
servers: |
[{
"id": "Snapshot",
"username": "${{ secrets.SNAPSHOTSUSERNAME }}",
"password": "${{ secrets.SNAPSHOTSPASSWORD }}"
}]
- run: mvn clean verify compile package site:site javadoc:javadoc javadoc:jar deploy -DaltDeploymentRepository=Snapshot::https://maven.plugily.xyz/snapshots -f pom.xml
Loading