3 Commits

Author SHA1 Message Date
Oliver
5f5d5302cc fancynpcs: Remove newline in VERSION file 2025-12-05 18:57:22 +01:00
Oliver
dc80615146 Add support for 1.21.11-rc2 2025-12-05 18:51:27 +01:00
Oliver
7fb487a344 Add support for 1.21.11-pre5 2025-12-04 14:32:32 +01:00
20 changed files with 19 additions and 22 deletions

View File

@@ -6,7 +6,7 @@ plugins {
paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION
dependencies {
paperweight.paperDevBundle("1.21.11-pre4-R0.1-SNAPSHOT")
paperweight.paperDevBundle("1.21.11-rc2-R0.1-SNAPSHOT")
compileOnly(project(":libraries:packets:packets-api"))
testImplementation(project(":libraries:packets"))

View File

@@ -7,7 +7,7 @@ import java.util.List;
public enum ServerVersion {
v1_21_11("1.21.11 Pre-Release 4", 774),
v1_21_11("1.21.11 Release Candidate 2", 774),
v1_21_10("1.21.10", 773),
v1_21_9("1.21.9", 773),
v1_21_8("1.21.8", 772),

View File

@@ -1 +1 @@
1.0.1.35
1.0.1.37

View File

@@ -85,7 +85,7 @@ paper {
tasks {
runServer {
minecraftVersion("1.21.11-pre3")
minecraftVersion("1.21.11-rc2")
downloadPlugins {
// modrinth("fancynpcs", "2.8.0")

View File

@@ -11,7 +11,7 @@
"1.21.8",
"1.21.9",
"1.21.10",
"1.21.11-pre4"
"1.21.11-rc2"
],
"channel": "beta",
"loaders": [

View File

@@ -1 +1 @@
2.8.0.163
2.8.0.165

View File

@@ -90,7 +90,7 @@ paper {
tasks {
runServer {
minecraftVersion("1.21.11-pre3")
minecraftVersion("1.21.11-rc2")
downloadPlugins {
// modrinth("fancynpcs", "2.5.2")

View File

@@ -24,7 +24,7 @@
"1.21.8",
"1.21.9",
"1.21.10",
"1.21.11-pre4"
"1.21.11-rc2"
],
"channel": "beta",
"loaders": [

View File

@@ -1 +1 @@
3.0.0-SNAPSHOT.14
3.0.0-SNAPSHOT.16

View File

@@ -96,7 +96,7 @@ paper {
tasks {
runServer {
minecraftVersion("1.21.11-pre3")
minecraftVersion("1.21.11-rc2")
downloadPlugins {
modrinth("fancynpcs", "2.7.0")

View File

@@ -19,7 +19,7 @@
"1.21.8",
"1.21.9",
"1.21.10",
"1.21.11-pre4"
"1.21.11-rc2"
],
"channel": "alpha",
"loaders": [

View File

@@ -1 +1 @@
2.8.1.315
2.8.1.317

View File

@@ -95,7 +95,7 @@ paper {
tasks {
runServer {
minecraftVersion("1.21.11-pre3")
minecraftVersion("1.21.11-rc2")
downloadPlugins {
// hangar("ViaVersion", "5.4.0")

View File

@@ -6,8 +6,7 @@ plugins {
paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION
dependencies {
paperweight.paperDevBundle("1.21.11-pre4-R0.1-SNAPSHOT")
// compileOnly("com.fancyinnovations:fancymc:1.21.6-pre2")
paperweight.paperDevBundle("1.21.11-rc2-R0.1-SNAPSHOT")
compileOnly(project(":plugins:fancynpcs:fn-api"))
compileOnly(project(":libraries:common"))

View File

@@ -7,7 +7,6 @@ paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArt
dependencies {
paperweight.paperDevBundle("1.21.7-R0.1-SNAPSHOT")
// compileOnly("com.fancyinnovations:fancymc:1.21.6-pre2")
compileOnly(project(":plugins:fancynpcs:fn-api"))
compileOnly(project(":libraries:common"))

View File

@@ -7,7 +7,6 @@ paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArt
dependencies {
paperweight.paperDevBundle("1.21.9-R0.1-SNAPSHOT")
// compileOnly("com.fancyinnovations:fancymc:1.21.6-pre2")
compileOnly(project(":plugins:fancynpcs:fn-api"))
compileOnly(project(":libraries:common"))

View File

@@ -24,7 +24,7 @@
"1.21.8",
"1.21.9",
"1.21.10",
"1.21.11-pre4"
"1.21.11-rc2"
],
"channel": "beta",
"loaders": [

View File

@@ -31,7 +31,7 @@ public class AttributeManagerImpl implements AttributeManager {
private void init() {
String mcVersion = Bukkit.getMinecraftVersion();
switch (mcVersion) {
case "1.21.11 Pre-Release 4" -> attributes = Attributes_1_21_11.getAllAttributes();
case "1.21.11 Release Candidate 2" -> attributes = Attributes_1_21_11.getAllAttributes();
case "1.21.9", "1.21.10" -> attributes = Attributes_1_21_9.getAllAttributes();
case "1.21.6", "1.21.7", "1.21.8" -> attributes = Attributes_1_21_6.getAllAttributes();
case "1.21.5" -> attributes = Attributes_1_21_5.getAllAttributes();

View File

@@ -164,7 +164,7 @@ public class FancyNpcs extends JavaPlugin implements FancyNpcsPlugin {
String mcVersion = Bukkit.getMinecraftVersion();
switch (mcVersion) {
case "1.21.11 Pre-Release 4" -> npcAdapter = Npc_1_21_11::new;
case "1.21.11 Release Candidate 2" -> npcAdapter = Npc_1_21_11::new;
case "1.21.9", "1.21.10" -> npcAdapter = Npc_1_21_9::new;
case "1.21.6", "1.21.7", "1.21.8" -> npcAdapter = Npc_1_21_6::new;
case "1.21.5" -> npcAdapter = Npc_1_21_5::new;
@@ -277,7 +277,7 @@ public class FancyNpcs extends JavaPlugin implements FancyNpcsPlugin {
pluginManager.registerEvents(new PlayerTeleportListener(), instance);
pluginManager.registerEvents(new PlayerChangedWorldListener(), instance);
pluginManager.registerEvents(skinManager, instance);
if (Set.of("1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11 Pre-Release 4").contains(Bukkit.getMinecraftVersion())) {
if (Set.of("1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11 Release Candidate 2").contains(Bukkit.getMinecraftVersion())) {
getServer().getPluginManager().registerEvents(new PlayerLoadedListener(), this);
}

View File

@@ -199,7 +199,7 @@ public final class CloudCommandManager {
annotationParser.parse(FancyNpcsDebugCMD.INSTANCE);
}
if (Set.of("1.20.5", "1.20.6", "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11 Pre-Release 4").contains(Bukkit.getMinecraftVersion())) {
if (Set.of("1.20.5", "1.20.6", "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11 Release Candidate 2").contains(Bukkit.getMinecraftVersion())) {
annotationParser.parse(ScaleCMD.INSTANCE);
}