From 2e09d3aa904c21d8c23a78024f653fe5a38c996c Mon Sep 17 00:00:00 2001 From: Gecolay Date: Thu, 25 Apr 2024 17:54:58 +0200 Subject: [PATCH 1/3] Fix format issues --- core/src/main/java/dev/geco/gsit/events/EntityEvents.java | 4 ++-- .../java/dev/geco/gsit/events/deprecated/EntityEvents.java | 4 ++-- core/src/main/java/dev/geco/gsit/manager/SVManager.java | 2 +- .../src/main/java/dev/geco/gsit/manager/mm/MPaperManager.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/dev/geco/gsit/events/EntityEvents.java b/core/src/main/java/dev/geco/gsit/events/EntityEvents.java index 0b78d110..e6552bc5 100644 --- a/core/src/main/java/dev/geco/gsit/events/EntityEvents.java +++ b/core/src/main/java/dev/geco/gsit/events/EntityEvents.java @@ -25,13 +25,13 @@ public void EDisE(EntityDismountEvent Event) { Player player = (Player) Event.getEntity(); - if (GPM.getSitManager().isSitting(player) && (!GPM.getCManager().GET_UP_SNEAK || (!GPM.getSitManager().removeSeat(player, GetUpReason.GET_UP, true)))) { + if(GPM.getSitManager().isSitting(player) && (!GPM.getCManager().GET_UP_SNEAK || (!GPM.getSitManager().removeSeat(player, GetUpReason.GET_UP, true)))) { Event.setCancelled(true); return; } - if (GPM.getPoseManager().isPosing(player) && (!GPM.getCManager().GET_UP_SNEAK || !GPM.getPoseManager().removePose(player, GetUpReason.GET_UP, true))) { + if(GPM.getPoseManager().isPosing(player) && (!GPM.getCManager().GET_UP_SNEAK || !GPM.getPoseManager().removePose(player, GetUpReason.GET_UP, true))) { Event.setCancelled(true); return; diff --git a/core/src/main/java/dev/geco/gsit/events/deprecated/EntityEvents.java b/core/src/main/java/dev/geco/gsit/events/deprecated/EntityEvents.java index b49780ec..a08cb766 100644 --- a/core/src/main/java/dev/geco/gsit/events/deprecated/EntityEvents.java +++ b/core/src/main/java/dev/geco/gsit/events/deprecated/EntityEvents.java @@ -26,13 +26,13 @@ public void EDisE(EntityDismountEvent Event) { Player player = (Player) Event.getEntity(); - if (GPM.getSitManager().isSitting(player) && (!GPM.getCManager().GET_UP_SNEAK || (!GPM.getSitManager().removeSeat(player, GetUpReason.GET_UP, true)))) { + if(GPM.getSitManager().isSitting(player) && (!GPM.getCManager().GET_UP_SNEAK || (!GPM.getSitManager().removeSeat(player, GetUpReason.GET_UP, true)))) { Event.setCancelled(true); return; } - if (GPM.getPoseManager().isPosing(player) && (!GPM.getCManager().GET_UP_SNEAK || !GPM.getPoseManager().removePose(player, GetUpReason.GET_UP, true))) { + if(GPM.getPoseManager().isPosing(player) && (!GPM.getCManager().GET_UP_SNEAK || !GPM.getPoseManager().removePose(player, GetUpReason.GET_UP, true))) { Event.setCancelled(true); return; diff --git a/core/src/main/java/dev/geco/gsit/manager/SVManager.java b/core/src/main/java/dev/geco/gsit/manager/SVManager.java index 3057a159..37f32c18 100644 --- a/core/src/main/java/dev/geco/gsit/manager/SVManager.java +++ b/core/src/main/java/dev/geco/gsit/manager/SVManager.java @@ -11,7 +11,7 @@ public class SVManager { private final GSitMain GPM; private final String SERVER_VERSION; - private String PACKAGE_PATH; + private final String PACKAGE_PATH; private boolean AVAILABLE = true; protected final HashMap VERSION_MAPPING = new HashMap<>(); { diff --git a/core/src/main/java/dev/geco/gsit/manager/mm/MPaperManager.java b/core/src/main/java/dev/geco/gsit/manager/mm/MPaperManager.java index c2476382..80fdc10f 100644 --- a/core/src/main/java/dev/geco/gsit/manager/mm/MPaperManager.java +++ b/core/src/main/java/dev/geco/gsit/manager/mm/MPaperManager.java @@ -72,12 +72,12 @@ private String replaceLegacyColors(String text) { Matcher matcher = HEX_PATTERN.matcher(text); StringBuilder result = new StringBuilder(text.length()); int lastIndex = 0; - while (matcher.find()) { + while(matcher.find()) { result.append(text, lastIndex, matcher.start()).append(""); lastIndex = matcher.end(); } result.append(text, lastIndex, text.length()); - for (Map.Entry tag : TAGS.entrySet()) { + for(Map.Entry tag : TAGS.entrySet()) { String key = tag.getKey(); String value = tag.getValue(); String upperKey = key.toUpperCase(); From f65d2346855c43080718107e0bbcb1d3b774dc9e Mon Sep 17 00:00:00 2001 From: Gecolay Date: Thu, 25 Apr 2024 18:44:40 +0200 Subject: [PATCH 2/3] Update plugins dependencies --- pom.xml | 2 +- v1_17/pom.xml | 4 ++-- v1_17_1/pom.xml | 4 ++-- v1_18/pom.xml | 4 ++-- v1_18_2/pom.xml | 4 ++-- v1_19/pom.xml | 4 ++-- v1_19_1/pom.xml | 4 ++-- v1_19_3/pom.xml | 4 ++-- v1_19_4/pom.xml | 4 ++-- v1_20/pom.xml | 4 ++-- v1_20_2/pom.xml | 4 ++-- v1_20_3/pom.xml | 4 ++-- v1_20_5/pom.xml | 4 ++-- v1_20_5_m/pom.xml | 2 +- 14 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pom.xml b/pom.xml index 1a5fb981..8d0cc24f 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.5.2 + 3.5.3 true false diff --git a/v1_17/pom.xml b/v1_17/pom.xml index 8c298d19..0633089c 100644 --- a/v1_17/pom.xml +++ b/v1_17/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.5.2 + 3.5.3 false false @@ -55,7 +55,7 @@ net.md-5 specialsource-maven-plugin - 2.0.2 + 2.0.3 package diff --git a/v1_17_1/pom.xml b/v1_17_1/pom.xml index e826dd6d..bb93e34f 100644 --- a/v1_17_1/pom.xml +++ b/v1_17_1/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.5.2 + 3.5.3 false false @@ -55,7 +55,7 @@ net.md-5 specialsource-maven-plugin - 2.0.2 + 2.0.3 package diff --git a/v1_18/pom.xml b/v1_18/pom.xml index 88ac4013..01914184 100644 --- a/v1_18/pom.xml +++ b/v1_18/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.5.2 + 3.5.3 false false @@ -55,7 +55,7 @@ net.md-5 specialsource-maven-plugin - 2.0.2 + 2.0.3 package diff --git a/v1_18_2/pom.xml b/v1_18_2/pom.xml index f03c781a..35ad7180 100644 --- a/v1_18_2/pom.xml +++ b/v1_18_2/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.5.2 + 3.5.3 false false @@ -55,7 +55,7 @@ net.md-5 specialsource-maven-plugin - 2.0.2 + 2.0.3 package diff --git a/v1_19/pom.xml b/v1_19/pom.xml index 4727c581..71e832e4 100644 --- a/v1_19/pom.xml +++ b/v1_19/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.5.2 + 3.5.3 false false @@ -55,7 +55,7 @@ net.md-5 specialsource-maven-plugin - 2.0.2 + 2.0.3 package diff --git a/v1_19_1/pom.xml b/v1_19_1/pom.xml index 04471399..f1e96cc0 100644 --- a/v1_19_1/pom.xml +++ b/v1_19_1/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.5.2 + 3.5.3 false false @@ -55,7 +55,7 @@ net.md-5 specialsource-maven-plugin - 2.0.2 + 2.0.3 package diff --git a/v1_19_3/pom.xml b/v1_19_3/pom.xml index 06261033..1002620a 100644 --- a/v1_19_3/pom.xml +++ b/v1_19_3/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.5.2 + 3.5.3 false false @@ -55,7 +55,7 @@ net.md-5 specialsource-maven-plugin - 2.0.2 + 2.0.3 package diff --git a/v1_19_4/pom.xml b/v1_19_4/pom.xml index 8f3299a7..9ebb2e6f 100644 --- a/v1_19_4/pom.xml +++ b/v1_19_4/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.5.2 + 3.5.3 false false @@ -55,7 +55,7 @@ net.md-5 specialsource-maven-plugin - 2.0.2 + 2.0.3 package diff --git a/v1_20/pom.xml b/v1_20/pom.xml index 701dd9a5..39ce6433 100644 --- a/v1_20/pom.xml +++ b/v1_20/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.5.2 + 3.5.3 false false @@ -55,7 +55,7 @@ net.md-5 specialsource-maven-plugin - 2.0.2 + 2.0.3 package diff --git a/v1_20_2/pom.xml b/v1_20_2/pom.xml index 1b417eb6..978a9287 100644 --- a/v1_20_2/pom.xml +++ b/v1_20_2/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.5.2 + 3.5.3 false false @@ -55,7 +55,7 @@ net.md-5 specialsource-maven-plugin - 2.0.2 + 2.0.3 package diff --git a/v1_20_3/pom.xml b/v1_20_3/pom.xml index 759e2d36..489262ae 100644 --- a/v1_20_3/pom.xml +++ b/v1_20_3/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.5.2 + 3.5.3 false false @@ -55,7 +55,7 @@ net.md-5 specialsource-maven-plugin - 2.0.2 + 2.0.3 package diff --git a/v1_20_5/pom.xml b/v1_20_5/pom.xml index 4cadfc8d..552c914d 100644 --- a/v1_20_5/pom.xml +++ b/v1_20_5/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.5.2 + 3.5.3 false false @@ -55,7 +55,7 @@ net.md-5 specialsource-maven-plugin - 2.0.2 + 2.0.3 package diff --git a/v1_20_5_m/pom.xml b/v1_20_5_m/pom.xml index 6edf1327..e2d3e935 100644 --- a/v1_20_5_m/pom.xml +++ b/v1_20_5_m/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.5.2 + 3.5.3 false false From 5390334e9139eeeb5e78b234fe65ee3f5d513345 Mon Sep 17 00:00:00 2001 From: Gecolay Date: Thu, 25 Apr 2024 19:08:22 +0200 Subject: [PATCH 3/3] Update jitpack file --- jitpack.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/jitpack.yml b/jitpack.yml index 6670db1c..98725928 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,5 +1,6 @@ before_install: - git config --global --unset core.autocrlf + - sdk install maven - sdk install java 16.0.2-open - JAVA_16=/home/jitpack/.sdkman/candidates/java/16.0.2-open/bin/java - sdk install java 17.0.2-open