diff --git a/build.gradle.kts b/build.gradle.kts index 912d3f8..60f23d5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { allprojects { group = "gg.norisk" - version = "0.1.1" + version = "0.2.0" } repositories { diff --git a/bungeecord/src/main/resources/bungee.yml b/bungeecord/src/main/resources/bungee.yml index b95d0eb..8a4dc8c 100644 --- a/bungeecord/src/main/resources/bungee.yml +++ b/bungeecord/src/main/resources/bungee.yml @@ -1,4 +1,4 @@ -name: NoRiskClientServerAPI +name: NRC-Server-API version: "${version}" main: gg.norisk.bungeecord.BungeeCord author: S42 diff --git a/core/src/main/java/gg/norisk/core/models/NrcPlayer.java b/core/src/main/java/gg/norisk/core/models/NrcPlayer.java index 5b56e5f..194ef55 100644 --- a/core/src/main/java/gg/norisk/core/models/NrcPlayer.java +++ b/core/src/main/java/gg/norisk/core/models/NrcPlayer.java @@ -4,12 +4,7 @@ import gg.norisk.core.payloads.InPayload; import gg.norisk.core.payloads.OutPayload; import gg.norisk.core.payloads.models.*; -import gg.norisk.core.payloads.out.ToastPayload; -import gg.norisk.core.payloads.out.InputbarPayload; -import gg.norisk.core.payloads.out.WheelPayload; -import gg.norisk.core.payloads.out.GamemodePayload; -import gg.norisk.core.payloads.out.BeaconBeamPayload; -import gg.norisk.core.payloads.out.ModuleDeactivatePayload; +import gg.norisk.core.payloads.out.*; import java.util.List; import java.util.UUID; @@ -48,6 +43,14 @@ public void sendModuleDeactivate(List modules) { serverAPI.sendPacket(uniqueId, new ModuleDeactivatePayload(modules)); } + public void sendCosmetic(String cosmetic, UUID npc_uuid) { + serverAPI.sendPacket(uniqueId, new CosmeticPayload(npc_uuid, cosmetic)); + } + + public void sendEmote(String emote, UUID npc_uuid) { + serverAPI.sendPacket(uniqueId, new EmotePayload(npc_uuid, emote)); + } + public void sendRequest(String channel, OutPayload request, Consumer callback) { serverAPI.sendRequest(uniqueId, request, callback); } diff --git a/core/src/main/java/gg/norisk/core/payloads/out/CosmeticPayload.java b/core/src/main/java/gg/norisk/core/payloads/out/CosmeticPayload.java new file mode 100644 index 0000000..41292e9 --- /dev/null +++ b/core/src/main/java/gg/norisk/core/payloads/out/CosmeticPayload.java @@ -0,0 +1,20 @@ +package gg.norisk.core.payloads.out; + +import gg.norisk.core.annotations.Payload; +import gg.norisk.core.payloads.OutPayload; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +import java.util.UUID; + +/** + * Abstract payload for equipping NPCs with cosmetics from the NoRisk Client Cosmetic Catalog + */ + +@Getter +@RequiredArgsConstructor +@Payload(type = "cosmetic") +public class CosmeticPayload implements OutPayload { + private final UUID npc_uuid; + private final String cosmetic; +} diff --git a/core/src/main/java/gg/norisk/core/payloads/out/EmotePayload.java b/core/src/main/java/gg/norisk/core/payloads/out/EmotePayload.java new file mode 100644 index 0000000..0b9861c --- /dev/null +++ b/core/src/main/java/gg/norisk/core/payloads/out/EmotePayload.java @@ -0,0 +1,20 @@ +package gg.norisk.core.payloads.out; + +import gg.norisk.core.annotations.Payload; +import gg.norisk.core.payloads.OutPayload; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +import java.util.UUID; + +/** + * Abstract payload for making NPCs perform emotes from the NoRisk Client Emote Catalog + */ + +@Getter +@RequiredArgsConstructor +@Payload(type = "emote") +public class EmotePayload implements OutPayload { + private final UUID npc_uuid; + private final String emote; +} diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts index 9904fdb..828df0f 100644 --- a/fabric/build.gradle.kts +++ b/fabric/build.gradle.kts @@ -40,15 +40,29 @@ tasks.register("javadocJar") { publishing { publications { - if (!names.contains("binaryAndSources")) { - create("binaryAndSources") { - groupId = project.group.toString() - artifactId = "fabric" - version = project.version.toString() - artifact(tasks["remapJar"]) - artifact(tasks["sourcesJar"]) - artifact(tasks["javadocJar"]) - } + create("maven") { + groupId = project.group.toString() + artifactId = "nrc-server-api-fabric" + version = project.version.toString() + artifact(tasks["sourcesJar"]) + artifact(tasks["javadocJar"]) + } + } + + repositories { + fun MavenArtifactRepository.applyCredentials() = credentials { + username = (System.getenv("NORISK_NEXUS_USERNAME") ?: project.findProperty("noriskMavenUsername")).toString() + password = (System.getenv("NORISK_NEXUS_PASSWORD") ?: project.findProperty("noriskMavenPassword")).toString() + } + maven { + name = "production" + url = uri("https://maven.norisk.gg/repository/norisk-production/") + applyCredentials() + } + maven { + name = "dev" + url = uri("https://maven.norisk.gg/repository/maven-releases/") + applyCredentials() } } } \ No newline at end of file diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 7546dcd..7799850 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -2,7 +2,7 @@ "schemaVersion": 1, "id": "noriskclientserverapi", "version": "${version}", - "name": "NoRiskClientServerAPI", + "name": "NRC-Server-API", "description": "API to interact with the NoRisk Client.", "authors": ["S42"], "contact": {}, @@ -11,7 +11,7 @@ "entrypoints": { "server": [ "gg.norisk.fabric.Fabric", - "gg.norisk.fabric.FabricServer" + "gg.norisk.fabric.server.FabricServer" ] }, "depends": { diff --git a/paper/src/main/resources/paper-plugin.yml b/paper/src/main/resources/paper-plugin.yml index 04bb235..ed97122 100644 --- a/paper/src/main/resources/paper-plugin.yml +++ b/paper/src/main/resources/paper-plugin.yml @@ -1,4 +1,4 @@ -name: NoRiskClientServerAPI +name: NRC-Server-API version: "${version}" main: gg.norisk.paper.Paper authors: [ S42 ] diff --git a/spigot/src/main/resources/plugin.yml b/spigot/src/main/resources/plugin.yml index 639516f..720309d 100644 --- a/spigot/src/main/resources/plugin.yml +++ b/spigot/src/main/resources/plugin.yml @@ -1,4 +1,4 @@ -name: NoRiskClientServerAPI +name: NRC-Server-API version: "${version}" main: gg.norisk.spigot.Spigot authors: [ S42 ] diff --git a/velocity/src/main/java/gg/norisk/velocity/Velocity.java b/velocity/src/main/java/gg/norisk/velocity/Velocity.java index ae457ba..85bc306 100644 --- a/velocity/src/main/java/gg/norisk/velocity/Velocity.java +++ b/velocity/src/main/java/gg/norisk/velocity/Velocity.java @@ -23,9 +23,9 @@ import lombok.Getter; @Plugin( - id = "noriskclient-server-api", - name = "NoRiskClient Server API", - version = "0.1.0", + id = "nrc-server-api", + name = "NRC Server API", + version = "0.2.0", description = "API to interact with the NoRisk Client.", authors = {"S42"} )