Skip to content

Commit f98919f

Browse files
timbru31timbru31
committed
feat: adds inital support for Minecraft 1.21.4
1 parent eb0ee70 commit f98919f

File tree

10 files changed

+732
-5
lines changed

10 files changed

+732
-5
lines changed

‎.github/workflows/maven-pr.yml

+1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ jobs:
8888
cd BuildTools
8989
[ -f ~/.m2/repository/org/spigotmc/spigot/1.20.6-R0.1-SNAPSHOT/spigot-1.20.6-R0.1-SNAPSHOT-remapped-mojang.jar ] || java -jar BuildTools.jar --rev 1.20.6 --remapped
9090
[ -f ~/.m2/repository/org/spigotmc/spigot/1.21.1-R0.1-SNAPSHOT/spigot-1.21.1-R0.1-SNAPSHOT-remapped-mojang.jar ] || java -jar BuildTools.jar --rev 1.21.1 --remapped
91+
[ -f ~/.m2/repository/org/spigotmc/spigot/1.21.4-R0.1-SNAPSHOT/spigot-1.21.4-R0.1-SNAPSHOT-remapped-mojang.jar ] || java -jar BuildTools.jar --rev 1.21.4 --remapped
9192
9293
- name: Build with Maven
9394
run: mvn -D"http.keepAlive=false" -D"maven.wagon.http.pool=false" -D"maven.wagon.httpconnectionManager.ttlSeconds=120" "-Dhttps.protocols=TLSv1.2" -DskipTests=true "-Dmaven.javadoc.skip=true" -B clean package

‎README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ This Bukkit (compatible with CraftBukkit, Spigot, Paper) plugin adds a way to ob
2828
- Shop addon [SilkSpawnersShopAddon](https://spigotmc.org/resources/12028/) (login required, Premium Plugin)
2929
- BossBarAPI support for >= 1.9, otherwise BarAPI can be used
3030
- Mimic support
31-
- Support for multiple Minecraft versions, from 1.8.8 to 1.21.1 (with exlusion of 1.9 and 1.10)
31+
- Support for multiple Minecraft versions, from 1.8.8 to 1.21.4 (with exlusion of 1.9 and 1.10)
3232

3333
_Third party features, all of them can be disabled_
3434

@@ -319,6 +319,7 @@ Unfortunately, I can't give access to https://repo.dustplanet.de/artifactory/pri
319319
mkdir -p BuildTools
320320
cd BuildTools
321321
wget -q https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
322+
java -jar BuildTools.jar --rev 1.21.4 --remapped
322323
java -jar BuildTools.jar --rev 1.21.1 --remapped
323324
java -jar BuildTools.jar --rev 1.20.6 --remapped
324325
java -jar BuildTools.jar --rev 1.20.4 --remapped

‎modules/API/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>org.spigotmc</groupId>
2525
<artifactId>spigot-api</artifactId>
26-
<version>1.21.1-R0.1-SNAPSHOT</version>
26+
<version>1.21.4-R0.1-SNAPSHOT</version>
2727
</dependency>
2828
</dependencies>
2929

‎modules/SilkSpawners/pom.xml

+6-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>org.spigotmc</groupId>
4343
<artifactId>spigot-api</artifactId>
44-
<version>1.21.1-R0.1-SNAPSHOT</version>
44+
<version>1.21.4-R0.1-SNAPSHOT</version>
4545
</dependency>
4646
<dependency>
4747
<groupId>com.sk89q</groupId>
@@ -213,6 +213,11 @@
213213
<artifactId>silkspawners-v1_21_R1</artifactId>
214214
<version>8.1.1-SNAPSHOT</version>
215215
</dependency>
216+
<dependency>
217+
<groupId>de.dustplanet</groupId>
218+
<artifactId>silkspawners-v1_21_R3</artifactId>
219+
<version>8.1.1-SNAPSHOT</version>
220+
</dependency>
216221
<dependency>
217222
<groupId>de.dustplanet</groupId>
218223
<artifactId>silkspawners-API</artifactId>

‎modules/SilkSpawners/src/main/java/de/dustplanet/silkspawners/SilkSpawners.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,13 @@ public class SilkSpawners extends JavaPlugin {
6161
private static final int BSTATS_PLUGIN_ID = 273;
6262
private static final String[] COMPATIBLE_MINECRAFT_VERSIONS = { "v1_8_R3", "v1_11_R1", "v1_12_R1", "v1_13_R2", "v1_14_R1", "v1_15_R1",
6363
"v1_16_R1", "v1_16_R2", "v1_16_R3", "v1_17_R1", "v1_18_R1", "v1_18_R2", "v1_19_R1", "v1_19_R2", "v1_19_R3", "v1_20_R1",
64-
"v1_20_R2", "v1_20_R3", "v1_20_R4", "v1_21_R1" };
64+
"v1_20_R2", "v1_20_R3", "v1_20_R4", "v1_21_R1", "v1_21_R3" };
6565
public static final Map<Integer, String> PROTOCOL_VERSION_PACKAGE_MAP = new HashMap<Integer, String>() {
6666
private static final long serialVersionUID = -5188779509588704507L;
6767
{
6868
put(766, "v1_20_R4");
6969
put(767, "v1_21_R1");
70+
put(769, "v1_21_R3");
7071
}
7172
};
7273
public CommentedConfiguration config;

‎modules/SilkSpawners/src/main/java/de/dustplanet/silkspawners/configs/Mobs.java

+49
Original file line numberDiff line numberDiff line change
@@ -971,6 +971,15 @@ private void loadDefaultMobs() {
971971
config.addDefault("creatures.breeze.displayName", "Breeze");
972972
config.options().copyDefaults(true);
973973
tempList = new ArrayList<>();
974+
// Creaking
975+
tempList.add("groan");
976+
config.addDefault("creatures.creaking.aliases", tempList);
977+
config.addDefault("creatures.creaking.enable", true);
978+
config.addDefault("creatures.creaking.enableCraftingSpawner", true);
979+
config.addDefault("creatures.creaking.enableSpawnEggOverride", true);
980+
config.addDefault("creatures.creaking.displayName", "Creaking");
981+
config.options().copyDefaults(true);
982+
tempList = new ArrayList<>();
974983

975984
// Non-mob vanilla entities below
976985
// Item
@@ -1125,5 +1134,45 @@ private void loadDefaultMobs() {
11251134
config.addDefault("creatures.ominous_item_spawner.enable", false);
11261135
// wind_charge
11271136
config.addDefault("creatures.wind_charge.enable", false);
1137+
// acacia_boat
1138+
config.addDefault("creatures.acacia_boat.enable", false);
1139+
// acacia_chest_boat
1140+
config.addDefault("creatures.acacia_chest_boat.enable", false);
1141+
// bamboo_chest_raft
1142+
config.addDefault("creatures.bamboo_chest_raft.enable", false);
1143+
// bamboo_raft
1144+
config.addDefault("creatures.bamboo_raft.enable", false);
1145+
// birch_boat
1146+
config.addDefault("creatures.birch_boat.enable", false);
1147+
// birch_chest_boat
1148+
config.addDefault("creatures.birch_chest_boat.enable", false);
1149+
// cherry_boat
1150+
config.addDefault("creatures.cherry_boat.enable", false);
1151+
// cherry_chest_boat
1152+
config.addDefault("creatures.cherry_chest_boat.enable", false);
1153+
// dark_oak_boat
1154+
config.addDefault("creatures.dark_oak_boat.enable", false);
1155+
// dark_oak_chest_boat
1156+
config.addDefault("creatures.dark_oak_chest_boat.enable", false);
1157+
// jungle_boat
1158+
config.addDefault("creatures.jungle_boat.enable", false);
1159+
// jungle_chest_boat
1160+
config.addDefault("creatures.jungle_chest_boat.enable", false);
1161+
// mangrove_boat
1162+
config.addDefault("creatures.mangrove_boat.enable", false);
1163+
// mangrove_chest_boat
1164+
config.addDefault("creatures.mangrove_chest_boat.enable", false);
1165+
// oak_boat
1166+
config.addDefault("creatures.oak_boat.enable", false);
1167+
// oak_chest_boat
1168+
config.addDefault("creatures.oak_chest_boat.enable", false);
1169+
// pale_oak_boat
1170+
config.addDefault("creatures.pale_oak_boat.enable", false);
1171+
// pale_oak_chest_boat
1172+
config.addDefault("creatures.pale_oak_chest_boat.enable", false);
1173+
// spruce_boat
1174+
config.addDefault("creatures.spruce_boat.enable", false);
1175+
// spruce_chest_boat
1176+
config.addDefault("creatures.spruce_chest_boat.enable", false);
11281177
}
11291178
}

‎modules/SilkSpawners/src/main/resources/mobs.yml

+47-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# The creatures key is official creature type name (mobID), case-sensitive.
22
# Taken from https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/entity/EntityType.html
33
creatures:
4-
54
# Vanilla mobs, taken from https://minecraft.gamepedia.com/Java_Edition_data_values#Entities for 1.13+
65
# and https://minecraft.gamepedia.com/Java_Edition_data_values/Pre-flattening/Entity_IDs for up to 1.12
76
Creeper:
@@ -890,6 +889,13 @@ creatures:
890889
enableCraftingSpawner: true
891890
enableSpawnEggOverride: true
892891
displayName: Breeze
892+
creaking:
893+
aliases:
894+
- groan
895+
enable: true
896+
enableCraftingSpawner: true
897+
enableSpawnEggOverride: true
898+
displayName: Creaking
893899

894900
# Non-mob vanilla entities
895901
# Enable on your own risk, some might work, some not!
@@ -1079,3 +1085,43 @@ creatures:
10791085
enable: false
10801086
wind_charge:
10811087
enable: false
1088+
acacia_boat:
1089+
enable: false
1090+
acacia_chest_boat:
1091+
enable: false
1092+
bamboo_chest_raft:
1093+
enable: false
1094+
bamboo_raft:
1095+
enable: false
1096+
birch_boat:
1097+
enable: false
1098+
birch_chest_boat:
1099+
enable: false
1100+
cherry_boat:
1101+
enable: false
1102+
cherry_chest_boat:
1103+
enable: false
1104+
dark_oak_boat:
1105+
enable: false
1106+
dark_oak_chest_boat:
1107+
enable: false
1108+
jungle_boat:
1109+
enable: false
1110+
jungle_chest_boat:
1111+
enable: false
1112+
mangrove_boat:
1113+
enable: false
1114+
mangrove_chest_boat:
1115+
enable: false
1116+
oak_boat:
1117+
enable: false
1118+
oak_chest_boat:
1119+
enable: false
1120+
pale_oak_boat:
1121+
enable: false
1122+
pale_oak_chest_boat:
1123+
enable: false
1124+
spruce_boat:
1125+
enable: false
1126+
spruce_chest_boat:
1127+
enable: false

‎modules/v1_21_R3/pom.xml

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<modelVersion>4.0.0</modelVersion>
3+
<artifactId>silkspawners-v1_21_R3</artifactId>
4+
<packaging>jar</packaging>
5+
<name>SilkSpawners for v1_21_R3</name>
6+
7+
<parent>
8+
<groupId>de.dustplanet</groupId>
9+
<artifactId>silkspawners-parent</artifactId>
10+
<version>8.1.1-SNAPSHOT</version>
11+
<relativePath>../../</relativePath>
12+
</parent>
13+
14+
<dependencies>
15+
<dependency>
16+
<groupId>org.spigotmc</groupId>
17+
<artifactId>spigot</artifactId>
18+
<version>1.21.4-R0.1-SNAPSHOT</version>
19+
<scope>provided</scope>
20+
<classifier>remapped-mojang</classifier>
21+
<exclusions>
22+
<exclusion>
23+
<groupId>org.spigotmc</groupId>
24+
<artifactId>minecraft-server</artifactId>
25+
</exclusion>
26+
</exclusions>
27+
</dependency>
28+
<dependency>
29+
<groupId>de.dustplanet</groupId>
30+
<artifactId>silkspawners-API</artifactId>
31+
<version>8.1.1-SNAPSHOT</version>
32+
</dependency>
33+
</dependencies>
34+
35+
<build>
36+
<plugins>
37+
<plugin>
38+
<groupId>net.md-5</groupId>
39+
<artifactId>specialsource-maven-plugin</artifactId>
40+
<version>2.0.3</version>
41+
<executions>
42+
<execution>
43+
<phase>package</phase>
44+
<goals>
45+
<goal>remap</goal>
46+
</goals>
47+
<id>remap-mojang</id>
48+
<configuration>
49+
<srgIn>org.spigotmc:minecraft-server:1.21.4-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
50+
<reverse>true</reverse>
51+
<remappedDependencies>org.spigotmc:spigot:1.21.4-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
52+
<remappedArtifactAttached>true</remappedArtifactAttached>
53+
<remappedClassifierName>remapped-mojang</remappedClassifierName>
54+
</configuration>
55+
</execution>
56+
<execution>
57+
<phase>package</phase>
58+
<goals>
59+
<goal>remap</goal>
60+
</goals>
61+
<id>remap-spigot</id>
62+
<configuration>
63+
<inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-mojang.jar</inputFile>
64+
<srgIn>org.spigotmc:minecraft-server:1.21.4-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
65+
<remappedDependencies>org.spigotmc:spigot:1.21.4-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
66+
</configuration>
67+
</execution>
68+
</executions>
69+
</plugin>
70+
</plugins>
71+
</build>
72+
</project>

0 commit comments

Comments
 (0)