Skip to content
This repository was archived by the owner on Jul 30, 2025. It is now read-only.

Migrate NMS modules to FancySitula #180

Draft
OliverSchlueter wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Migrate NMS modules to FancySitula #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64f8172
Use teams by FancySitula
OliverSchlueter Oct 16, 2024
17ebdf7
Add npc implementation powered by FancySitula
OliverSchlueter Oct 17, 2024
ef728eb
Add skin
OliverSchlueter Oct 17, 2024
6d14517
REmove debug log
OliverSchlueter Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ dependencies {
implementation(project(":implementation_1_19_4", configuration = "reobf"))

implementation("de.oliver:FancyLib:${findProperty("fancyLibVersion")}")
implementation("de.oliver:FancySitula:${findProperty("fancySitulaVersion")}")
compileOnly("org.lushplugins:ChatColorHandler:${findProperty("chatcolorhandlerVersion")}")
implementation("de.oliver.FancyAnalytics:api:${findProperty("fancyAnalyticsVersion")}")
implementation("de.oliver.FancyAnalytics:logger:${findProperty("fancyLoggerVersion")}")
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
minecraftVersion=1.21.1
fancyLibVersion=33
fancySitulaVersion=0.0.10.1
fancyAnalyticsVersion=0.1.3
fancyLoggerVersion=0.0.6
plotsquaredVersion=7.2.0
Expand Down
1 change: 1 addition & 0 deletions implementation_1_21_1/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dependencies {

compileOnly(project(":api"))
compileOnly("de.oliver:FancyLib:${findProperty("fancyLibVersion")}")
compileOnly("de.oliver:FancySitula:${findProperty("fancySitulaVersion")}")
compileOnly("org.lushplugins:ChatColorHandler:${findProperty("chatcolorhandlerVersion")}")
}

Expand Down
9 changes: 5 additions & 4 deletions src/main/java/de/oliver/fancynpcs/FancyNpcs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import de.oliver.fancynpcs.api.utils.SkinCache;
import de.oliver.fancynpcs.api.utils.SkinFetcher;
import de.oliver.fancynpcs.commands.CloudCommandManager;
import de.oliver.fancynpcs.impl.NpcImpl;
import de.oliver.fancynpcs.listeners.*;
import de.oliver.fancynpcs.tracker.TurnToPlayerTracker;
import de.oliver.fancynpcs.tracker.VisibilityTracker;
Expand All @@ -41,8 +42,7 @@
import de.oliver.fancynpcs.v1_20_1.Npc_1_20_1;
import de.oliver.fancynpcs.v1_20_2.Npc_1_20_2;
import de.oliver.fancynpcs.v1_20_4.Npc_1_20_4;
import de.oliver.fancynpcs.v1_20_6.Npc_1_20_6;
import de.oliver.fancynpcs.v1_21_1.Npc_1_21_1;
import de.oliver.fancysitula.api.IFancySitula;
import org.apache.maven.artifact.versioning.ComparableVersion;
import org.bukkit.Bukkit;
import org.bukkit.entity.EntityType;
Expand Down Expand Up @@ -102,6 +102,8 @@ public FancyNpcs() {
JsonAppender jsonAppender = new JsonAppender(false, false, true, logsFile.getPath());
this.fancyLogger = new ExtendedFancyLogger("FancyNpcs", LogLevel.INFO, List.of(consoleAppender, jsonAppender), new ArrayList<>());

IFancySitula.LOGGER.setCurrentLevel(LogLevel.DEBUG);

this.npcThread = Executors.newSingleThreadScheduledExecutor(
new ThreadFactoryBuilder()
.setNameFormat("FancyNpcs-Npcs")
Expand Down Expand Up @@ -133,8 +135,7 @@ public void onLoad() {
String mcVersion = Bukkit.getMinecraftVersion();

switch (mcVersion) {
case "1.21", "1.21.1" -> npcAdapter = Npc_1_21_1::new;
case "1.20.5", "1.20.6" -> npcAdapter = Npc_1_20_6::new;
case "1.20.5", "1.20.6", "1.21", "1.21.1" -> npcAdapter = NpcImpl::new;
case "1.20.3", "1.20.4" -> npcAdapter = Npc_1_20_4::new;
case "1.20.2" -> npcAdapter = Npc_1_20_2::new;
case "1.20.1", "1.20" -> npcAdapter = Npc_1_20_1::new;
Expand Down
Loading