mirror of
https://github.com/FancyInnovations/FancyPlugins.git
synced 2025-12-06 07:43:36 +00:00
fancynpcs: Use 1.21.11-pre3
This commit is contained in:
@@ -15,12 +15,5 @@ allprojects {
|
|||||||
maven("https://repo.papermc.io/repository/maven-public/")
|
maven("https://repo.papermc.io/repository/maven-public/")
|
||||||
maven("https://repo.fancyinnovations.com/releases")
|
maven("https://repo.fancyinnovations.com/releases")
|
||||||
maven(url = "https://jitpack.io")
|
maven(url = "https://jitpack.io")
|
||||||
maven("https://maven-prs.papermc.io/Paper/pr13194") {
|
|
||||||
name = "Maven for PR #13194" // https://github.com/PaperMC/Paper/pull/13194
|
|
||||||
mavenContent {
|
|
||||||
includeModule("io.papermc.paper", "dev-bundle")
|
|
||||||
includeModule("io.papermc.paper", "paper-api")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
2.8.1
|
2.8.1.313
|
||||||
@@ -95,7 +95,7 @@ paper {
|
|||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
runServer {
|
runServer {
|
||||||
minecraftVersion("1.21.10")
|
minecraftVersion("1.21.11-pre3")
|
||||||
|
|
||||||
downloadPlugins {
|
downloadPlugins {
|
||||||
// hangar("ViaVersion", "5.4.0")
|
// hangar("ViaVersion", "5.4.0")
|
||||||
|
|||||||
@@ -22,7 +22,8 @@
|
|||||||
"1.21.7",
|
"1.21.7",
|
||||||
"1.21.8",
|
"1.21.8",
|
||||||
"1.21.9",
|
"1.21.9",
|
||||||
"1.21.10"
|
"1.21.10",
|
||||||
|
"1.21.11-pre3"
|
||||||
],
|
],
|
||||||
"channel": "BETA",
|
"channel": "BETA",
|
||||||
"loaders": [
|
"loaders": [
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ public class AttributeManagerImpl implements AttributeManager {
|
|||||||
private void init() {
|
private void init() {
|
||||||
String mcVersion = Bukkit.getMinecraftVersion();
|
String mcVersion = Bukkit.getMinecraftVersion();
|
||||||
switch (mcVersion) {
|
switch (mcVersion) {
|
||||||
case "1.21.11" -> attributes = Attributes_1_21_11.getAllAttributes();
|
case "1.21.11 Pre-Release 3" -> attributes = Attributes_1_21_11.getAllAttributes();
|
||||||
case "1.21.9", "1.21.10" -> attributes = Attributes_1_21_9.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.6", "1.21.7", "1.21.8" -> attributes = Attributes_1_21_6.getAllAttributes();
|
||||||
case "1.21.5" -> attributes = Attributes_1_21_5.getAllAttributes();
|
case "1.21.5" -> attributes = Attributes_1_21_5.getAllAttributes();
|
||||||
|
|||||||
@@ -164,7 +164,7 @@ public class FancyNpcs extends JavaPlugin implements FancyNpcsPlugin {
|
|||||||
String mcVersion = Bukkit.getMinecraftVersion();
|
String mcVersion = Bukkit.getMinecraftVersion();
|
||||||
|
|
||||||
switch (mcVersion) {
|
switch (mcVersion) {
|
||||||
case "1.21.11" -> npcAdapter = Npc_1_21_11::new;
|
case "1.21.11 Pre-Release 3" -> npcAdapter = Npc_1_21_11::new;
|
||||||
case "1.21.9", "1.21.10" -> npcAdapter = Npc_1_21_9::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.6", "1.21.7", "1.21.8" -> npcAdapter = Npc_1_21_6::new;
|
||||||
case "1.21.5" -> npcAdapter = Npc_1_21_5::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 PlayerTeleportListener(), instance);
|
||||||
pluginManager.registerEvents(new PlayerChangedWorldListener(), instance);
|
pluginManager.registerEvents(new PlayerChangedWorldListener(), instance);
|
||||||
pluginManager.registerEvents(skinManager, 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").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 Pre-Release 3").contains(Bukkit.getMinecraftVersion())) {
|
||||||
getServer().getPluginManager().registerEvents(new PlayerLoadedListener(), this);
|
getServer().getPluginManager().registerEvents(new PlayerLoadedListener(), this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,8 +33,8 @@ import org.incendo.cloud.parser.standard.EnumParser;
|
|||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
import static org.incendo.cloud.exception.handling.ExceptionHandler.unwrappingHandler;
|
import static org.incendo.cloud.exception.handling.ExceptionHandler.unwrappingHandler;
|
||||||
|
|
||||||
@@ -199,7 +199,7 @@ public final class CloudCommandManager {
|
|||||||
annotationParser.parse(FancyNpcsDebugCMD.INSTANCE);
|
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").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 Pre-Release 3").contains(Bukkit.getMinecraftVersion())) {
|
||||||
annotationParser.parse(ScaleCMD.INSTANCE);
|
annotationParser.parse(ScaleCMD.INSTANCE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user