mirror of
https://github.com/FancyInnovations/FancyPlugins.git
synced 2025-12-06 07:43:36 +00:00
Compare commits
3 Commits
e837ad89d3
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5f5d5302cc | ||
|
|
dc80615146 | ||
|
|
7fb487a344 |
@@ -6,7 +6,7 @@ plugins {
|
|||||||
paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION
|
paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION
|
||||||
|
|
||||||
dependencies {
|
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"))
|
compileOnly(project(":libraries:packets:packets-api"))
|
||||||
|
|
||||||
testImplementation(project(":libraries:packets"))
|
testImplementation(project(":libraries:packets"))
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import java.util.List;
|
|||||||
|
|
||||||
public enum ServerVersion {
|
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_10("1.21.10", 773),
|
||||||
v1_21_9("1.21.9", 773),
|
v1_21_9("1.21.9", 773),
|
||||||
v1_21_8("1.21.8", 772),
|
v1_21_8("1.21.8", 772),
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
1.0.1.35
|
1.0.1.37
|
||||||
@@ -85,7 +85,7 @@ paper {
|
|||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
runServer {
|
runServer {
|
||||||
minecraftVersion("1.21.11-pre3")
|
minecraftVersion("1.21.11-rc2")
|
||||||
|
|
||||||
downloadPlugins {
|
downloadPlugins {
|
||||||
// modrinth("fancynpcs", "2.8.0")
|
// modrinth("fancynpcs", "2.8.0")
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
"1.21.8",
|
"1.21.8",
|
||||||
"1.21.9",
|
"1.21.9",
|
||||||
"1.21.10",
|
"1.21.10",
|
||||||
"1.21.11-pre4"
|
"1.21.11-rc2"
|
||||||
],
|
],
|
||||||
"channel": "beta",
|
"channel": "beta",
|
||||||
"loaders": [
|
"loaders": [
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
2.8.0.163
|
2.8.0.165
|
||||||
@@ -90,7 +90,7 @@ paper {
|
|||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
runServer {
|
runServer {
|
||||||
minecraftVersion("1.21.11-pre3")
|
minecraftVersion("1.21.11-rc2")
|
||||||
|
|
||||||
downloadPlugins {
|
downloadPlugins {
|
||||||
// modrinth("fancynpcs", "2.5.2")
|
// modrinth("fancynpcs", "2.5.2")
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
"1.21.8",
|
"1.21.8",
|
||||||
"1.21.9",
|
"1.21.9",
|
||||||
"1.21.10",
|
"1.21.10",
|
||||||
"1.21.11-pre4"
|
"1.21.11-rc2"
|
||||||
],
|
],
|
||||||
"channel": "beta",
|
"channel": "beta",
|
||||||
"loaders": [
|
"loaders": [
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
3.0.0-SNAPSHOT.14
|
3.0.0-SNAPSHOT.16
|
||||||
@@ -96,7 +96,7 @@ paper {
|
|||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
runServer {
|
runServer {
|
||||||
minecraftVersion("1.21.11-pre3")
|
minecraftVersion("1.21.11-rc2")
|
||||||
|
|
||||||
downloadPlugins {
|
downloadPlugins {
|
||||||
modrinth("fancynpcs", "2.7.0")
|
modrinth("fancynpcs", "2.7.0")
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
"1.21.8",
|
"1.21.8",
|
||||||
"1.21.9",
|
"1.21.9",
|
||||||
"1.21.10",
|
"1.21.10",
|
||||||
"1.21.11-pre4"
|
"1.21.11-rc2"
|
||||||
],
|
],
|
||||||
"channel": "alpha",
|
"channel": "alpha",
|
||||||
"loaders": [
|
"loaders": [
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
2.8.1.315
|
2.8.1.317
|
||||||
@@ -95,7 +95,7 @@ paper {
|
|||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
runServer {
|
runServer {
|
||||||
minecraftVersion("1.21.11-pre3")
|
minecraftVersion("1.21.11-rc2")
|
||||||
|
|
||||||
downloadPlugins {
|
downloadPlugins {
|
||||||
// hangar("ViaVersion", "5.4.0")
|
// hangar("ViaVersion", "5.4.0")
|
||||||
|
|||||||
@@ -6,8 +6,7 @@ plugins {
|
|||||||
paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION
|
paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
paperweight.paperDevBundle("1.21.11-pre4-R0.1-SNAPSHOT")
|
paperweight.paperDevBundle("1.21.11-rc2-R0.1-SNAPSHOT")
|
||||||
// compileOnly("com.fancyinnovations:fancymc:1.21.6-pre2")
|
|
||||||
|
|
||||||
compileOnly(project(":plugins:fancynpcs:fn-api"))
|
compileOnly(project(":plugins:fancynpcs:fn-api"))
|
||||||
compileOnly(project(":libraries:common"))
|
compileOnly(project(":libraries:common"))
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArt
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
paperweight.paperDevBundle("1.21.7-R0.1-SNAPSHOT")
|
paperweight.paperDevBundle("1.21.7-R0.1-SNAPSHOT")
|
||||||
// compileOnly("com.fancyinnovations:fancymc:1.21.6-pre2")
|
|
||||||
|
|
||||||
compileOnly(project(":plugins:fancynpcs:fn-api"))
|
compileOnly(project(":plugins:fancynpcs:fn-api"))
|
||||||
compileOnly(project(":libraries:common"))
|
compileOnly(project(":libraries:common"))
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArt
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
paperweight.paperDevBundle("1.21.9-R0.1-SNAPSHOT")
|
paperweight.paperDevBundle("1.21.9-R0.1-SNAPSHOT")
|
||||||
// compileOnly("com.fancyinnovations:fancymc:1.21.6-pre2")
|
|
||||||
|
|
||||||
compileOnly(project(":plugins:fancynpcs:fn-api"))
|
compileOnly(project(":plugins:fancynpcs:fn-api"))
|
||||||
compileOnly(project(":libraries:common"))
|
compileOnly(project(":libraries:common"))
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
"1.21.8",
|
"1.21.8",
|
||||||
"1.21.9",
|
"1.21.9",
|
||||||
"1.21.10",
|
"1.21.10",
|
||||||
"1.21.11-pre4"
|
"1.21.11-rc2"
|
||||||
],
|
],
|
||||||
"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 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.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 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.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 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);
|
getServer().getPluginManager().registerEvents(new PlayerLoadedListener(), this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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 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);
|
annotationParser.parse(ScaleCMD.INSTANCE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user