Skip to content

Commit

Permalink
Update pom.xml & maven.yml & fixed compile
Browse files Browse the repository at this point in the history
  • Loading branch information
andrew121410 committed Jul 28, 2024
1 parent 20ad4c2 commit 5d60bbb
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 16 deletions.
11 changes: 4 additions & 7 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# 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://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven

name: Java CI with Maven

on:
Expand All @@ -13,12 +10,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4 # https://github.com/actions/checkout

- name: Set up JDK 17
uses: actions/setup-java@v3
- name: Set up JDK 21 # https://github.com/actions/setup-java
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'
cache: maven

Expand Down
22 changes: 14 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,23 @@
<artifactId>world1-6trafficlights</artifactId>
<version>1.0-SNAPSHOT</version>

<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
</properties>

<build>
<plugins>
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-compiler-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<source>21</source>
<target>21</target>
</configuration>
</plugin>
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-shade-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.4.1</version>
<version>3.6.0</version>
<executions>
<execution>
<phase>package</phase>
Expand Down Expand Up @@ -51,14 +57,14 @@
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.19.3-R0.1-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.github.World1-6.World1-6Utils</groupId>
<artifactId>World1-6Utils-Plugin</artifactId>
<version>0edba07f</version>
<version>634da50bcc</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public boolean yellow() {
if (isBanner()) {
Banner banner = (Banner) location.getBlock().getState();
List<Pattern> patterns = new ArrayList<>();
patterns.add(new Pattern(DyeColor.YELLOW, PatternType.CIRCLE_MIDDLE));
patterns.add(new Pattern(DyeColor.YELLOW, PatternType.GLOBE)); // CIRCLE_MIDDLE
banner.setPatterns(patterns);
banner.update();
} else {
Expand Down

0 comments on commit 5d60bbb

Please sign in to comment.