From d018b8d97bd98ec1295e2e3b8fef70444b39ac9c Mon Sep 17 00:00:00 2001 From: Jitse Boonstra Date: Fri, 15 Feb 2019 20:18:00 +0100 Subject: [PATCH] For v1.4 (#10) (added support for 1.7.10). --- .travis.yml | 2 ++ README.md | 9 ++++++--- api/pom.xml | 2 +- commons/pom.xml | 2 +- nms/pom.xml | 2 +- nms/v1_10_R1/pom.xml | 2 +- nms/v1_11_R1/pom.xml | 2 +- nms/v1_12_R1/pom.xml | 2 +- nms/v1_13_R1/pom.xml | 2 +- nms/v1_13_R2/pom.xml | 2 +- nms/v1_7_R4/pom.xml | 8 +------- .../java/net/jitse/npclib/nms/v1_7_R4/NPC_v1_7_R4.java | 1 + nms/v1_8_R1/pom.xml | 2 +- nms/v1_8_R2/pom.xml | 2 +- nms/v1_8_R3/pom.xml | 2 +- nms/v1_9_R1/pom.xml | 2 +- nms/v1_9_R2/pom.xml | 2 +- plugin/pom.xml | 2 +- pom.xml | 2 +- 19 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index b81ba3c..b3d3c84 100755 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,8 @@ cache: - $HOME/.m2/ install: - wget https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar +- wget http://central.maven.org/maven2/io/netty/netty-all/4.1.33.Final/netty-all-4.1.33.Final.jar + mvn install:install-file -Dfile=netty-all-4.1.33.Final.jar -DgroupId=io.netty -DartifactId=netty-all -Dversion=4.1.33.Final -Dpackaging=jar - wget https://github.com/Sarabveer/CraftBukkit-Spigot-Binary/blob/master/spigot-1.7.10-R0.1/spigot-1.7.10-R0.1-1649.jar - mvn install:install-file -Dfile=spigot-1.7.10-R0.1-1649.jar -DgroupId=org.spigotmc -DartifactId=spigot -Dversion=1.7.10-R0.1-SNAPSHOT -Dpackaging=jar - ls $HOME/.m2/repository/org/spigotmc/spigot/1.8-R0.1-SNAPSHOT >> /dev/null 2>&1 || java -jar BuildTools.jar --rev 1.8 >> /dev/null 2>&1 diff --git a/README.md b/README.md index 99feee9..979f825 100755 --- a/README.md +++ b/README.md @@ -3,12 +3,12 @@ NPCLib – Basic non-player character library.
[![Release](https://jitpack.io/v/JitseB/NPCLib.svg)](https://github.com/JitseB/NPCLib/releases) [![Build Status](https://travis-ci.com/JitseB/NPCLib.svg?branch=master)](https://travis-ci.com/JitseB/NPCLib) [![JDK](https://img.shields.io/badge/Using-Java%208-blue.svg)](http://jdk.java.net/8/) -[![Versions](https://img.shields.io/badge/MC-1.8%20--%201.13.2-blue.svg)](https://github.com/JitseB/NPCLib/releases) +[![Versions](https://img.shields.io/badge/MC-1.7.10%20--%201.13.2-blue.svg)](https://github.com/JitseB/NPCLib/releases) [![Thread](https://img.shields.io/badge/SpigotMC-Resource-orange.svg)](https://www.spigotmc.org/resources/npclib.55884/) [![Thread](https://img.shields.io/badge/SpigotMC-Thread-orange.svg)](https://www.spigotmc.org/threads/npclib-–-basic-non-player-character-library.314460/) = -This is an API made specifically for spigot servers (Minecraft). Current supported versions: **1.8 - 1.13.2**. Lightweight replacement for Citizens. NPCLib only uses packets instead of registering the entity in the actual Minecraft server. +This is an API made specifically for spigot servers (Minecraft). Current supported versions: **1.7.10 - 1.13.2**. Lightweight replacement for Citizens. NPCLib only uses packets instead of registering the entity in the actual Minecraft server. ### Preview (click to play video) [![YouTube Video](http://img.youtube.com/vi/LqwdqIxPIvE/0.jpg)](http://www.youtube.com/watch?v=LqwdqIxPIvE "NPCLib – Basic non-player character library (Minecraft).") @@ -23,9 +23,11 @@ Alternatively, you can help the project by starring the repository or telling ot - :heavy_check_mark: Spawn and destroy NPC (version 1.8 - latest). - :heavy_check_mark: Autohide NPC when out of range. +- :heavy_check_mark: Add support for 1.7.10 (1.7 R4). - :construction: Option to rotate head to player (when nearby). -- :construction: Add support for 1.7.10 (1.7 R4). +- :construction: Add support for animated text (update-able holograms). - :x: Give NPC armor and items in hand. +- :x: Multi-line text support for 1.7.10 (1.7 R4). ### Roadmad Legend :heavy_check_mark: Feature is fully implemented and functional.
@@ -51,6 +53,7 @@ Alternatively, you can put `npclib-plugin-v*.jar` under your `plugins` folder. B ```Java // Creating a new NPC instance. + // MC 1.7.10 (1.7 R4) only supports single-line text. NPC npc = lib.createNPC(skin, lines); // Then let the library generate the necessary packets. diff --git a/api/pom.xml b/api/pom.xml index 3f4c2b3..0404f9c 100755 --- a/api/pom.xml +++ b/api/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib - 1.3 + 1.4 npclib-api diff --git a/commons/pom.xml b/commons/pom.xml index 952033b..ee0e809 100755 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib - 1.3 + 1.4 npclib-commons diff --git a/nms/pom.xml b/nms/pom.xml index 39613f0..7aa51d8 100755 --- a/nms/pom.xml +++ b/nms/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib - 1.3 + 1.4 npclib-nms diff --git a/nms/v1_10_R1/pom.xml b/nms/v1_10_R1/pom.xml index d59f6a9..30ace41 100755 --- a/nms/v1_10_R1/pom.xml +++ b/nms/v1_10_R1/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib-nms - 1.3 + 1.4 npclib-nms-v1_10_R1 diff --git a/nms/v1_11_R1/pom.xml b/nms/v1_11_R1/pom.xml index e38a305..98a3ee5 100755 --- a/nms/v1_11_R1/pom.xml +++ b/nms/v1_11_R1/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib-nms - 1.3 + 1.4 npclib-nms-v1_11_R1 diff --git a/nms/v1_12_R1/pom.xml b/nms/v1_12_R1/pom.xml index 09b3df4..1203094 100755 --- a/nms/v1_12_R1/pom.xml +++ b/nms/v1_12_R1/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib-nms - 1.3 + 1.4 npclib-nms-v1_12_R1 diff --git a/nms/v1_13_R1/pom.xml b/nms/v1_13_R1/pom.xml index 45a1e74..271c83d 100755 --- a/nms/v1_13_R1/pom.xml +++ b/nms/v1_13_R1/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib-nms - 1.3 + 1.4 npclib-nms-v1_13_R1 diff --git a/nms/v1_13_R2/pom.xml b/nms/v1_13_R2/pom.xml index c3651fc..f7d67a5 100755 --- a/nms/v1_13_R2/pom.xml +++ b/nms/v1_13_R2/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib-nms - 1.3 + 1.4 npclib-nms-v1_13_R2 diff --git a/nms/v1_7_R4/pom.xml b/nms/v1_7_R4/pom.xml index 5324123..9cbf492 100755 --- a/nms/v1_7_R4/pom.xml +++ b/nms/v1_7_R4/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib-nms - 1.3 + 1.4 npclib-nms-v1_7_R4 @@ -25,11 +25,5 @@ 2.8.5 compile - - io.netty - netty-all - 4.0.23.Final - compile - diff --git a/nms/v1_7_R4/src/main/java/net/jitse/npclib/nms/v1_7_R4/NPC_v1_7_R4.java b/nms/v1_7_R4/src/main/java/net/jitse/npclib/nms/v1_7_R4/NPC_v1_7_R4.java index 1cfbdc1..bb5cd9d 100755 --- a/nms/v1_7_R4/src/main/java/net/jitse/npclib/nms/v1_7_R4/NPC_v1_7_R4.java +++ b/nms/v1_7_R4/src/main/java/net/jitse/npclib/nms/v1_7_R4/NPC_v1_7_R4.java @@ -36,6 +36,7 @@ public class NPC_v1_7_R4 extends NPC { public NPC_v1_7_R4(JavaPlugin plugin, Skin skin, double autoHideDistance, List lines) { super(plugin, skin, autoHideDistance, lines); + // TODO: Add multi-line text support. this.name = lines.get(0); } diff --git a/nms/v1_8_R1/pom.xml b/nms/v1_8_R1/pom.xml index 25d62d1..7adb9ec 100755 --- a/nms/v1_8_R1/pom.xml +++ b/nms/v1_8_R1/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib-nms - 1.3 + 1.4 npclib-nms-v1_8_R1 diff --git a/nms/v1_8_R2/pom.xml b/nms/v1_8_R2/pom.xml index 4936191..feda596 100755 --- a/nms/v1_8_R2/pom.xml +++ b/nms/v1_8_R2/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib-nms - 1.3 + 1.4 npclib-nms-v1_8_R2 diff --git a/nms/v1_8_R3/pom.xml b/nms/v1_8_R3/pom.xml index 3445740..cfdf521 100755 --- a/nms/v1_8_R3/pom.xml +++ b/nms/v1_8_R3/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib-nms - 1.3 + 1.4 npclib-nms-v1_8_R3 diff --git a/nms/v1_9_R1/pom.xml b/nms/v1_9_R1/pom.xml index 1e450c9..550baf2 100755 --- a/nms/v1_9_R1/pom.xml +++ b/nms/v1_9_R1/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib-nms - 1.3 + 1.4 npclib-nms-v1_9_R1 diff --git a/nms/v1_9_R2/pom.xml b/nms/v1_9_R2/pom.xml index 62d69bc..e5aaeb3 100755 --- a/nms/v1_9_R2/pom.xml +++ b/nms/v1_9_R2/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib-nms - 1.3 + 1.4 npclib-nms-v1_9_R2 diff --git a/plugin/pom.xml b/plugin/pom.xml index f9f3393..8e2e1fc 100755 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib - 1.3 + 1.4 npclib-plugin diff --git a/pom.xml b/pom.xml index 2987d62..5e9bb07 100755 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib - 1.3 + 1.4 NPCLib https://github.com/JitseB/NPCLib