Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {

allprojects {
group = "gg.norisk"
version = "0.1.1"
version = "0.2.0"
}

repositories {
Expand Down
2 changes: 1 addition & 1 deletion bungeecord/src/main/resources/bungee.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: NoRiskClientServerAPI
name: NRC-Server-API
version: "${version}"
main: gg.norisk.bungeecord.BungeeCord
author: S42
Expand Down
15 changes: 9 additions & 6 deletions core/src/main/java/gg/norisk/core/models/NrcPlayer.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -48,6 +43,14 @@ public void sendModuleDeactivate(List<Modules> 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 <R extends InPayload> void sendRequest(String channel, OutPayload request, Consumer<R> callback) {
serverAPI.sendRequest(uniqueId, request, callback);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
}
20 changes: 20 additions & 0 deletions core/src/main/java/gg/norisk/core/payloads/out/EmotePayload.java
Original file line number Diff line number Diff line change
@@ -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;
}
32 changes: 23 additions & 9 deletions fabric/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,29 @@ tasks.register<Jar>("javadocJar") {

publishing {
publications {
if (!names.contains("binaryAndSources")) {
create<MavenPublication>("binaryAndSources") {
groupId = project.group.toString()
artifactId = "fabric"
version = project.version.toString()
artifact(tasks["remapJar"])
artifact(tasks["sourcesJar"])
artifact(tasks["javadocJar"])
}
create<MavenPublication>("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()
}
}
}
4 changes: 2 additions & 2 deletions fabric/src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand All @@ -11,7 +11,7 @@
"entrypoints": {
"server": [
"gg.norisk.fabric.Fabric",
"gg.norisk.fabric.FabricServer"
"gg.norisk.fabric.server.FabricServer"
]
},
"depends": {
Expand Down
2 changes: 1 addition & 1 deletion paper/src/main/resources/paper-plugin.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: NoRiskClientServerAPI
name: NRC-Server-API
version: "${version}"
main: gg.norisk.paper.Paper
authors: [ S42 ]
Expand Down
2 changes: 1 addition & 1 deletion spigot/src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: NoRiskClientServerAPI
name: NRC-Server-API
version: "${version}"
main: gg.norisk.spigot.Spigot
authors: [ S42 ]
Expand Down
6 changes: 3 additions & 3 deletions velocity/src/main/java/gg/norisk/velocity/Velocity.java
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
)
Expand Down