Skip to content

Commit b8acf90

Browse files
eygwieygwi
committed
Support Slimefun experimental and mc version 1.21.4
1 parent c61222f commit b8acf90

11 files changed

Lines changed: 142 additions & 142 deletions

File tree

‎.github/workflows/maven.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616

1717
steps:
1818
- uses: actions/checkout@v3.0.2
19-
- name: Set up JDK 16
19+
- name: Set up JDK 21
2020
uses: actions/setup-java@v3
2121
with:
2222
distribution: 'temurin'
23-
java-version: 16
23+
java-version: 21
2424
cache: 'maven'
2525
- name: Build with Maven
2626
run: mvn package --file pom.xml

‎dependency-reduced-pom.xml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<plugins>
2222
<plugin>
2323
<artifactId>maven-shade-plugin</artifactId>
24-
<version>3.3.0</version>
24+
<version>3.6.0</version>
2525
<executions>
2626
<execution>
2727
<phase>package</phase>
@@ -61,10 +61,10 @@
6161
</plugin>
6262
<plugin>
6363
<artifactId>maven-compiler-plugin</artifactId>
64-
<version>3.10.1</version>
64+
<version>3.14.0</version>
6565
<configuration>
66-
<source>16</source>
67-
<target>16</target>
66+
<source>21</source>
67+
<target>21</target>
6868
</configuration>
6969
</plugin>
7070
</plugins>
@@ -91,41 +91,41 @@
9191
<dependency>
9292
<groupId>org.spigotmc</groupId>
9393
<artifactId>spigot-api</artifactId>
94-
<version>1.19-R0.1-SNAPSHOT</version>
94+
<version>1.21.4-R0.1-SNAPSHOT</version>
9595
<scope>provided</scope>
9696
</dependency>
9797
<dependency>
9898
<groupId>com.github.Slimefun</groupId>
9999
<artifactId>Slimefun4</artifactId>
100-
<version>b8f7dc</version>
100+
<version>experimental-SNAPSHOT</version>
101101
<scope>provided</scope>
102102
</dependency>
103103
<dependency>
104-
<groupId>io.github.sefiraat</groupId>
104+
<groupId>dev.sefiraat</groupId>
105105
<artifactId>networks</artifactId>
106-
<version>MODIFIED_1.0.7</version>
106+
<version>1.0.0</version>
107107
<scope>provided</scope>
108108
</dependency>
109109
<dependency>
110-
<groupId>me.clip</groupId>
110+
<groupId>com.github.placeholderapi</groupId>
111111
<artifactId>placeholderapi</artifactId>
112-
<version>2.11.1</version>
112+
<version>2.11.6</version>
113113
<scope>provided</scope>
114114
</dependency>
115115
</dependencies>
116116
<properties>
117117
<sonar.issue.ignore.multicriteria.e3.ruleKey>java:S2245</sonar.issue.ignore.multicriteria.e3.ruleKey>
118-
<sonar.issue.ignore.multicriteria.e3.resourceKey>**</sonar.issue.ignore.multicriteria.e3.resourceKey>
119118
<sonar.issue.ignore.multicriteria>e1,e2,e3</sonar.issue.ignore.multicriteria>
120-
<maven.compiler.source>1.8</maven.compiler.source>
121119
<sonar.issue.ignore.multicriteria.e2.ruleKey>java:S125</sonar.issue.ignore.multicriteria.e2.ruleKey>
122120
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
123-
<sonar.organization>sefiraat</sonar.organization>
124-
<sonar.projectKey>EMCTech</sonar.projectKey>
125-
<maven.compiler.target>1.8</maven.compiler.target>
126121
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
127122
<sonar.issue.ignore.multicriteria.e1.resourceKey>**</sonar.issue.ignore.multicriteria.e1.resourceKey>
128123
<sonar.issue.ignore.multicriteria.e2.resourceKey>**</sonar.issue.ignore.multicriteria.e2.resourceKey>
129124
<sonar.issue.ignore.multicriteria.e1.ruleKey>java:S6212</sonar.issue.ignore.multicriteria.e1.ruleKey>
125+
<sonar.issue.ignore.multicriteria.e3.resourceKey>**</sonar.issue.ignore.multicriteria.e3.resourceKey>
126+
<maven.compiler.source>21</maven.compiler.source>
127+
<sonar.organization>sefiraat</sonar.organization>
128+
<sonar.projectKey>EMCTech</sonar.projectKey>
129+
<maven.compiler.target>21</maven.compiler.target>
130130
</properties>
131131
</project>

‎pom.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<plugin>
1515
<groupId>org.apache.maven.plugins</groupId>
1616
<artifactId>maven-shade-plugin</artifactId>
17-
<version>3.3.0</version>
17+
<version>3.6.0</version>
1818
<configuration>
1919
<relocations>
2020
<relocation>
@@ -55,10 +55,10 @@
5555
<plugin>
5656
<groupId>org.apache.maven.plugins</groupId>
5757
<artifactId>maven-compiler-plugin</artifactId>
58-
<version>3.10.1</version>
58+
<version>3.14.0</version>
5959
<configuration>
60-
<source>16</source>
61-
<target>16</target>
60+
<source>21</source>
61+
<target>21</target>
6262
</configuration>
6363
</plugin>
6464
</plugins>
@@ -78,8 +78,8 @@
7878
</build>
7979

8080
<properties>
81-
<maven.compiler.source>1.8</maven.compiler.source>
82-
<maven.compiler.target>1.8</maven.compiler.target>
81+
<maven.compiler.source>21</maven.compiler.source>
82+
<maven.compiler.target>21</maven.compiler.target>
8383
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
8484
<sonar.projectKey>EMCTech</sonar.projectKey>
8585
<sonar.organization>sefiraat</sonar.organization>
@@ -120,21 +120,21 @@
120120
<dependency>
121121
<groupId>org.spigotmc</groupId>
122122
<artifactId>spigot-api</artifactId>
123-
<version>1.19-R0.1-SNAPSHOT</version>
123+
<version>1.21.4-R0.1-SNAPSHOT</version>
124124
<scope>provided</scope>
125125
</dependency>
126126
<dependency>
127127
<groupId>com.github.Slimefun</groupId>
128128
<artifactId>Slimefun4</artifactId>
129-
<version>b8f7dc</version>
129+
<version>experimental-SNAPSHOT</version>
130130
<scope>provided</scope>
131131
</dependency>
132132

133133
<!-- Tools etc. -->
134134
<dependency>
135135
<groupId>org.bstats</groupId>
136136
<artifactId>bstats-bukkit</artifactId>
137-
<version>3.0.0</version>
137+
<version>3.1.0</version>
138138
<scope>compile</scope>
139139
</dependency>
140140
<dependency>
@@ -143,9 +143,9 @@
143143
<version>3.0.1u2</version>
144144
</dependency>
145145
<dependency>
146-
<groupId>dev.sefiraat</groupId>
146+
<groupId>com.github.eygwi</groupId>
147147
<artifactId>SefiLib</artifactId>
148-
<version>0.2.6</version>
148+
<version>4e0ab41fb5</version>
149149
<scope>compile</scope>
150150
</dependency>
151151
<dependency>
@@ -178,9 +178,9 @@
178178
<version>1e83e7afa0</version>
179179
</dependency>
180180
<dependency>
181-
<groupId>me.clip</groupId>
181+
<groupId>com.github.placeholderapi</groupId>
182182
<artifactId>placeholderapi</artifactId>
183-
<version>2.11.1</version>
183+
<version>2.11.6</version>
184184
<scope>provided</scope>
185185
</dependency>
186186
</dependencies>

‎src/main/java/io/github/sefiraat/emctech/slimefun/groups/EmcSlimefunDictionaryFlexGroup.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ private ItemStack getPlayerInfoStack(Player player, int size) {
197197
size
198198
));
199199

200-
return new CustomItemStack(
200+
return CustomItemStack.create(
201201
Material.TARGET,
202202
Theme.MAIN.getColor() + "Learned Items",
203203
lore

‎src/main/java/io/github/sefiraat/emctech/slimefun/groups/EmcTechItemGroups.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,39 +16,39 @@ private EmcTechItemGroups() {
1616

1717
public static final MainFlexGroup MAIN = new MainFlexGroup(
1818
Keys.newKey("main"),
19-
new CustomItemStack(
19+
CustomItemStack.create(
2020
new ItemStack(Material.WRITABLE_BOOK),
2121
Theme.MAIN.color("EMCTech")
2222
)
2323
);
2424

2525
public static final DummyItemGroup MATERIALS = new DummyItemGroup(
2626
Keys.newKey("materials"),
27-
new CustomItemStack(
27+
CustomItemStack.create(
2828
new ItemStack(Material.COAL),
2929
Theme.MAIN.color("EMCTech Crafting Materials")
3030
)
3131
);
3232

3333
public static final DummyItemGroup MACHINES = new DummyItemGroup(
3434
Keys.newKey("machines"),
35-
new CustomItemStack(
35+
CustomItemStack.create(
3636
new ItemStack(Material.BUBBLE_CORAL_BLOCK),
3737
Theme.MAIN.color("EMCTech Machinery")
3838
)
3939
);
4040

4141
public static final EmcVanillaDictionaryFlexGroup DICTIONARY_VANILLA = new EmcVanillaDictionaryFlexGroup(
4242
Keys.newKey("dictionary-vanilla"),
43-
new CustomItemStack(
43+
CustomItemStack.create(
4444
new ItemStack(Material.FEATHER),
4545
Theme.MAIN.color("EMC Dictionary (Vanilla)")
4646
)
4747
);
4848

4949
public static final EmcSlimefunDictionaryFlexGroup DICTIONARY_SLIMEFUN = new EmcSlimefunDictionaryFlexGroup(
5050
Keys.newKey("dictionary-slimefun"),
51-
new CustomItemStack(
51+
CustomItemStack.create(
5252
new ItemStack(Material.FEATHER),
5353
Theme.MAIN.color("EMC Dictionary (Slimefun)")
5454
)

‎src/main/java/io/github/sefiraat/emctech/slimefun/groups/EmcVanillaDictionaryFlexGroup.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ private ItemStack getPlayerInfoStack(Player player, int size) {
186186
size
187187
));
188188

189-
return new CustomItemStack(
189+
return CustomItemStack.create(
190190
Material.TARGET,
191191
Theme.MAIN.getColor() + "Learned Items",
192192
lore

0 commit comments

Comments
 (0)