SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update to 1.16.2

Browse Source
This commit is contained in:
libraryaddict 2020-08-18 18:03:22 +12:00
parent c8e08e91ff
commit 0624538774
7 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -83,12 +83,12 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId> <artifactId>spigot-api</artifactId>
<version>1.16.1-R0.1-SNAPSHOT</version> <version>1.16.2-R0.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId> <artifactId>spigot</artifactId>
<version>1.16.1-R0.1-SNAPSHOT</version> <version>1.16.2-R0.1-SNAPSHOT</version>
</dependency> </dependency>
<!-- testing --> <!-- testing -->
<dependency> <dependency>
@ -106,7 +106,7 @@
<dependency> <dependency>
<groupId>net.md-5</groupId> <groupId>net.md-5</groupId>
<artifactId>bungeecord-chat</artifactId> <artifactId>bungeecord-chat</artifactId>
<version>1.16-R0.1</version> <version>1.12-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
src/main/java/me/libraryaddict/disguise/disguisetypes/DisguiseType.java
View File

@ -141,6 +141,8 @@ public enum DisguiseType {
@NmsAddedIn(NmsVersion.v1_16) PIGLIN, @NmsAddedIn(NmsVersion.v1_16) PIGLIN,
@NmsAddedIn(NmsVersion.v1_16) PIGLIN_BRUTE,
@NmsAddedIn(NmsVersion.v1_14) PILLAGER, @NmsAddedIn(NmsVersion.v1_14) PILLAGER,
PLAYER, PLAYER,

2
src/main/java/me/libraryaddict/disguise/disguisetypes/MetaIndex.java
View File

@ -503,7 +503,7 @@ public class MetaIndex<Y> {
public static MetaIndex<Integer> PIG_BOOST = new MetaIndex<>(PigWatcher.class, 1, 0); public static MetaIndex<Integer> PIG_BOOST = new MetaIndex<>(PigWatcher.class, 1, 0);
@NmsAddedIn(NmsVersion.v1_16) @NmsAddedIn(NmsVersion.v1_16)
public static MetaIndex<Boolean> PIGLIN_BABY = new MetaIndex<>(PiglinWatcher.class, 0, false); public static MetaIndex<Boolean> PIGLIN_ABSTRACT_BABY = new MetaIndex<>(PiglinWatcher.class, 0, false);
@NmsAddedIn(NmsVersion.v1_16) @NmsAddedIn(NmsVersion.v1_16)
public static MetaIndex<Boolean> PIGLIN_SHAKING = new MetaIndex<>(PiglinWatcher.class, 1, false); public static MetaIndex<Boolean> PIGLIN_SHAKING = new MetaIndex<>(PiglinWatcher.class, 1, false);

22
src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PiglinAbstractWatcher.java Normal file
View File

@ -0,0 +1,22 @@
package me.libraryaddict.disguise.disguisetypes.watchers;
import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.MetaIndex;
/**
* Created by libraryaddict on 25/06/2020.
*/
public abstract class PiglinAbstractWatcher extends InsentientWatcher {
public PiglinAbstractWatcher(Disguise disguise) {
super(disguise);
}
public boolean isBaby() {
return getData(MetaIndex.PIGLIN_ABSTRACT_BABY);
}
public void setBaby(boolean baby) {
setData(MetaIndex.PIGLIN_ABSTRACT_BABY, baby);
sendData(MetaIndex.PIGLIN_ABSTRACT_BABY);
}
}

12
src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PiglinBruteWatcher.java Normal file
View File

@ -0,0 +1,12 @@
package me.libraryaddict.disguise.disguisetypes.watchers;
import me.libraryaddict.disguise.disguisetypes.Disguise;
/**
* Created by libraryaddict on 18/08/2020.
*/
public class PiglinBruteWatcher extends PiglinAbstractWatcher {
public PiglinBruteWatcher(Disguise disguise) {
super(disguise);
}
}

11
src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PiglinWatcher.java
View File

@ -6,22 +6,13 @@ import me.libraryaddict.disguise.disguisetypes.MetaIndex;
/** /**
* Created by libraryaddict on 25/06/2020. * Created by libraryaddict on 25/06/2020.
*/ */
public class PiglinWatcher extends InsentientWatcher { public class PiglinWatcher extends PiglinAbstractWatcher {
public PiglinWatcher(Disguise disguise) { public PiglinWatcher(Disguise disguise) {
super(disguise); super(disguise);
setShaking(false); setShaking(false);
} }
public boolean isBaby() {
return getData(MetaIndex.PIGLIN_BABY);
}
public void setBaby(boolean baby) {
setData(MetaIndex.PIGLIN_BABY, baby);
sendData(MetaIndex.PIGLIN_BABY);
}
public boolean isDancing() { public boolean isDancing() {
return getData(MetaIndex.PIGLIN_DANCING); return getData(MetaIndex.PIGLIN_DANCING);
} }

3
src/main/java/me/libraryaddict/disguise/utilities/sounds/DisguiseSoundEnums.java
View File

@ -136,6 +136,9 @@ public enum DisguiseSoundEnums {
Sound.ENTITY_PIGLIN_RETREAT, Sound.ENTITY_PIGLIN_JEALOUS, Sound.ENTITY_PIGLIN_ADMIRING_ITEM, Sound.ENTITY_PIGLIN_RETREAT, Sound.ENTITY_PIGLIN_JEALOUS, Sound.ENTITY_PIGLIN_ADMIRING_ITEM,
Sound.ENTITY_PIGLIN_CELEBRATE), Sound.ENTITY_PIGLIN_CELEBRATE),
PIGLIN_BRUTE(Sound.ENTITY_PIGLIN_BRUTE_HURT, Sound.ENTITY_PIGLIN_BRUTE_STEP, Sound.ENTITY_PIGLIN_BRUTE_DEATH, Sound.ENTITY_PIGLIN_BRUTE_AMBIENT,
Sound.ENTITY_PIGLIN_BRUTE_CONVERTED_TO_ZOMBIFIED, Sound.ENTITY_PIGLIN_BRUTE_ANGRY),
PIG_ZOMBIE("ENTITY_ZOMBIE_PIGMAN_HURT", null, "ENTITY_ZOMBIE_PIGMAN_DEATH", "ENTITY_ZOMBIE_PIGMAN_AMBIENT", PIG_ZOMBIE("ENTITY_ZOMBIE_PIGMAN_HURT", null, "ENTITY_ZOMBIE_PIGMAN_DEATH", "ENTITY_ZOMBIE_PIGMAN_AMBIENT",
"ENTITY_ZOMBIE_PIGMAN_ANGRY"), "ENTITY_ZOMBIE_PIGMAN_ANGRY"),