Skip to content
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

Update Dependencies #385

Merged
merged 5 commits into from
Sep 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Set up JDK 17
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 17
java-version: 21
- name: Cache SonarCloud packages
uses: actions/cache@v1
with:
Expand Down
37 changes: 19 additions & 18 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.20.4-R0.1-SNAPSHOT</version>
<version>1.20.6-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -88,7 +88,7 @@
<dependency>
<groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId>
<version>3.0.2</version>
<version>3.0.3</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -100,14 +100,14 @@
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.45.3.0</version>
<version>3.46.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<scope>runtime</scope>
<version>8.4.0</version>
<version>9.0.0</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand All @@ -124,25 +124,25 @@
<dependency>
<groupId>org.eclipse.parsson</groupId>
<artifactId>parsson</artifactId>
<version>1.1.6</version>
<version>1.1.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.13</version>
<version>2.0.16</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.github.seeseemelk</groupId>
<artifactId>MockBukkit-v1.20</artifactId>
<version>3.86.0</version>
<version>3.93.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.cryptomorin</groupId>
<artifactId>XSeries</artifactId>
<version>10.0.0</version>
<version>11.2.1</version>
</dependency>
<dependency>
<groupId>net.coreprotect</groupId>
Expand All @@ -152,14 +152,14 @@
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
<version>1.28.3</version>
<artifactId>tika-parsers-standard-package</artifactId>
<version>2.9.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>5.2.5</version>
<version>5.3.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -171,7 +171,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.13</version>
<version>2.0.16</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -189,13 +189,13 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<release>17</release>
<release>21</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.3</version>
<version>3.6.0</version>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<artifactSet>
Expand All @@ -204,8 +204,9 @@
<include>com.zaxxer:HikariCP</include>
<include>com.github.cryptomorin:XSeries</include>
<include>org.slf4j:slf4j-api</include>
<include>org.apache.tika:tika-parsers</include>
<include>org.apache.tika:tika-parsers-standard-package</include>
<include>org.apache.poi:poi</include>
<include>org.apache.tika:tika-parser-text-module</include>
</includes>
</artifactSet>
<relocations>
Expand Down Expand Up @@ -275,7 +276,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.11</version>
<version>0.8.12</version>
<executions>
<execution>
<id>prepare-agent</id>
Expand All @@ -299,12 +300,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>io.github.git-commit-id</groupId>
<artifactId>git-commit-id-maven-plugin</artifactId>
<version>9.0.0</version>
<version>9.0.1</version>
<executions>
<execution>
<id>get-the-git-infos</id>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.sgrewritten.stargate.api.network.portal.formatting;

import com.drew.lang.annotations.NotNull;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
import org.bukkit.block.Sign;
import org.bukkit.entity.Entity;
import org.jetbrains.annotations.NotNull;
import org.sgrewritten.stargate.api.container.Holder;

import java.util.Objects;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.sgrewritten.stargate.api.network.portal.formatting;

import com.drew.lang.annotations.NotNull;
import org.jetbrains.annotations.NotNull;
import org.bukkit.block.Sign;
import org.bukkit.entity.Entity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.sgrewritten.stargate.api.network.portal.formatting;

import com.drew.lang.annotations.NotNull;
import com.drew.lang.annotations.Nullable;
import net.md_5.bungee.api.ChatColor;
import org.bukkit.block.Sign;
import org.bukkit.entity.Entity;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.sgrewritten.stargate.api.container.Holder;

public final class LegacyStargateComponent implements StargateComponent {
Expand All @@ -24,15 +24,15 @@ public static Holder<StargateComponent> of(@Nullable String text) {
}

@Override
public void setSignLine(int index,@NotNull Sign sign) {
if(text != null) {
public void setSignLine(int index, @NotNull Sign sign) {
if (text != null) {
sign.setLine(index, text);
}
}

@Override
public void sendMessage(Entity receiver) {
if(text != null && !text.isEmpty()) {
if (text != null && !text.isEmpty()) {
receiver.sendMessage(text);
}
}
Expand All @@ -42,15 +42,15 @@ public StargateComponent append(StargateComponent value) {
if (value instanceof LegacyStargateComponent legacyStargateComponent) {
return new LegacyStargateComponent(this.getText() + legacyStargateComponent.getText());
}
if (value instanceof EmptyStargateComponent){
if (value instanceof EmptyStargateComponent) {
return new LegacyStargateComponent(this.getText());
}
throw new IllegalArgumentException("Can not combine with AdventureComponent");
}

@Override
public String plainText() {
if(text == null){
if (text == null) {
return "";
}
return ChatColor.stripColor(text);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.sgrewritten.stargate.api.network.portal.formatting;

import com.drew.lang.annotations.NotNull;
import org.bukkit.block.Sign;
import org.bukkit.entity.Entity;
import org.jetbrains.annotations.NotNull;

/**
* An interface for text components, meant to support both spigot and adventure text formats.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ void setUp() throws TranslatableException, NoFormatFoundException, GateConflictE
theEnd.setEnvironment(Environment.THE_END);
Location from = new Location(theEnd, 0, 0, 0);
player = server.addPlayer();
vehicle = (PoweredMinecartMock) theEnd.spawnEntity(from, EntityType.MINECART_FURNACE);
vehicle = (PoweredMinecartMock) theEnd.spawnEntity(from, EntityType.FURNACE_MINECART);
Block sign = PortalBlockGenerator.generatePortal(new Location(theEnd, 0, 10, 0));
StargateAPI stargateAPI = new StargateAPIMock();
portal = new PortalBuilder(stargateAPI, player, "portal").setGateBuilder(new ImplicitGateBuilder(sign.getLocation(), stargateAPI.getRegistry())).setNetwork("network").build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public void setup() throws TranslatableException, InvalidStructureException, Gat
populator = new SynchronousPopulator();
teleporter = new Teleporter(destination, origin, destination.getGate().getFacing(),
origin.getGate().getFacing(), 0, "empty", new LanguageManagerMock(), new StargateEconomyManagerMock());
furnaceMinecart = (PoweredMinecartMock) world.spawnEntity(new Location(world, 0, 0, 0), EntityType.MINECART_FURNACE);
furnaceMinecart = (PoweredMinecartMock) world.spawnEntity(new Location(world, 0, 0, 0), EntityType.FURNACE_MINECART);

}

Expand Down
Loading