Get closer to finishing the better saving and loading system
This commit is contained in:
parent
7db8c8b47a
commit
4fa1bef8fb
|
@ -1,7 +1,7 @@
|
|||
package net.seanomilk.tamablefoxes;
|
||||
package net.seanomik.tamablefoxes;
|
||||
|
||||
import net.minecraft.server.v1_15_R1.*;
|
||||
import net.seanomilk.tamablefoxes.pathfinding.*;
|
||||
import net.seanomik.tamablefoxes.pathfinding.*;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.craftbukkit.v1_15_R1.CraftWorld;
|
||||
|
@ -30,11 +30,17 @@ public class EntityTamableFox extends EntityFox {
|
|||
private FoxPathfindGoalSit goalSit;
|
||||
private PathfinderGoalNearestAttackableTarget goalAttack;
|
||||
|
||||
public int databaseID = -1;
|
||||
|
||||
public EntityTamableFox(TamableFoxes plugin, EntityTypes entitytypes, World world) {
|
||||
super(EntityTypes.FOX, world);
|
||||
this.plugin = plugin;
|
||||
thisFox = (Fox) this.getBukkitEntity();
|
||||
plugin.getFoxUUIDs().put(this.getBukkitEntity().getUniqueId(), null);
|
||||
|
||||
if (!plugin.getFoxUUIDs().containsKey(thisFox.getUniqueId())) {
|
||||
plugin.getFoxUUIDs().put(this.getBukkitEntity().getUniqueId(), null);
|
||||
}
|
||||
|
||||
this.setPersistent();
|
||||
}
|
||||
|
||||
|
@ -139,10 +145,11 @@ public class EntityTamableFox extends EntityFox {
|
|||
|
||||
public void setTamed(boolean tamed) {
|
||||
this.isTamed = tamed;
|
||||
|
||||
// Remove attack goal if tamed
|
||||
if (isTamed && plugin.isTamedAttackRabbitChicken()) {
|
||||
this.targetSelector.a(goalAttack);
|
||||
} else {
|
||||
} else { // Adds it
|
||||
this.targetSelector.a(4, goalAttack);
|
||||
}
|
||||
}
|
||||
|
@ -153,7 +160,6 @@ public class EntityTamableFox extends EntityFox {
|
|||
|
||||
public void setChosenName(String chosenName) {
|
||||
this.chosenName = chosenName;
|
||||
plugin.getConfigFoxes().set("Foxes." + getUniqueID() + ".name", chosenName).save();
|
||||
updateFoxVisual();
|
||||
}
|
||||
|
||||
|
@ -163,13 +169,14 @@ public class EntityTamableFox extends EntityFox {
|
|||
|
||||
public void setOwner(EntityLiving owner) {
|
||||
this.owner = owner;
|
||||
plugin.getConfigFoxes().set("Foxes." + getUniqueID() + ".owner", owner.getUniqueIDString()).save();
|
||||
updateFoxVisual();
|
||||
}
|
||||
|
||||
public boolean toggleSitting() {
|
||||
this.sit = !this.sit;
|
||||
updateFoxVisual();
|
||||
|
||||
plugin.sqLiteSetterGetter.saveFox(this);
|
||||
return this.sit;
|
||||
}
|
||||
|
||||
|
@ -238,5 +245,4 @@ public class EntityTamableFox extends EntityFox {
|
|||
getBukkitEntity().setCustomNameVisible(plugin.isShowNameTags());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -1,248 +0,0 @@
|
|||
package net.seanomik.tamablefoxes;
|
||||
|
||||
import net.minecraft.server.v1_15_R1.*;
|
||||
import net.seanomik.tamablefoxes.pathfinding.*;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.craftbukkit.v1_15_R1.CraftWorld;
|
||||
import org.bukkit.craftbukkit.v1_15_R1.event.CraftEventFactory;
|
||||
import org.bukkit.entity.Fox;
|
||||
import org.bukkit.event.entity.EntityTargetEvent;
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
import org.bukkit.util.Vector;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
public class EntityTamableFox extends EntityFox {
|
||||
|
||||
private static Fox thisFox;
|
||||
private final TamableFoxes plugin;
|
||||
|
||||
private boolean isTamed;
|
||||
private EntityLiving owner;
|
||||
private String chosenName;
|
||||
private boolean sit = false;
|
||||
private BukkitTask sittingRunnable;
|
||||
|
||||
private FoxPathfindGoalSit goalSit;
|
||||
private PathfinderGoalNearestAttackableTarget goalAttack;
|
||||
|
||||
public int databaseIndex = -1;
|
||||
|
||||
public EntityTamableFox(TamableFoxes plugin, EntityTypes entitytypes, World world) {
|
||||
super(EntityTypes.FOX, world);
|
||||
this.plugin = plugin;
|
||||
thisFox = (Fox) this.getBukkitEntity();
|
||||
|
||||
if (!plugin.getFoxUUIDs().containsKey(thisFox.getUniqueId())) {
|
||||
plugin.getFoxUUIDs().put(this.getBukkitEntity().getUniqueId(), null);
|
||||
}
|
||||
|
||||
this.setPersistent();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void initPathfinder() {
|
||||
this.goalSit = new FoxPathfindGoalSit(this);
|
||||
this.goalSelector.a(1, new FoxPathfindGoalFloat(this));
|
||||
this.goalSelector.a(2, this.goalSit);
|
||||
this.goalSelector.a(3, new FoxPathfindGoalMeleeAttack(this, 1.2000000476837158D, true));
|
||||
this.goalSelector.a(3, new PathfinderGoalAvoidTarget(this, EntityWolf.class, 8.0F, 1.6D, 1.4D,
|
||||
entityliving -> !((EntityWolf) entityliving).isTamed()));
|
||||
this.goalSelector.a(4, new FoxPathfindGoalFollowOwner(this, 1.35D, 10.0F, 2.0F));
|
||||
this.goalSelector.a(4, new FoxPathfindGoalLungeUNKNOWN_USE(this));
|
||||
this.goalSelector.a(5, new FoxPathfindGoalLunge(this));
|
||||
this.goalSelector.a(5, new FoxPathfindGoalFleeSun(this, 1.25D));
|
||||
this.goalSelector.a(5, new FoxPathfindGoalBreed(this, 1.0D));
|
||||
this.goalSelector.a(7, new PathfinderGoalFollowParent(this, 1.1D));
|
||||
this.goalSelector.a(7, new FoxPathfindGoalBeg(this, 8.0F));
|
||||
this.goalSelector.a(8, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 8.0F));
|
||||
this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
|
||||
this.goalSelector.a(9, new FoxPathfindGoalPickBushes(this, 1.2000000476837158D, 12, 2));
|
||||
this.goalSelector.a(9, new FoxPathfindGoalPickBushes(this, 1.2000000476837158D, 12, 2));
|
||||
this.goalSelector.a(10, new FoxPathfindGoalRandomStrollLand(this, 1.0D));
|
||||
this.targetSelector.a(1, new FoxPathfindGoalHurtByTarget(this));
|
||||
this.targetSelector.a(2, new FoxPathfindGoalOwnerHurtByTarget(this));
|
||||
|
||||
this.goalAttack = new PathfinderGoalNearestAttackableTarget(this, EntityLiving.class, 10, false, false,
|
||||
entityLiving -> !isTamed && (entityLiving instanceof EntityChicken || entityLiving instanceof EntityRabbit));
|
||||
|
||||
if (!isTamed || (plugin.isTamedAttackRabbitChicken() && isTamed)) {
|
||||
this.targetSelector.a(4, goalAttack);
|
||||
}
|
||||
|
||||
this.targetSelector.a(5, new FoxPathfindGoalHurtByTarget(this).a(new Class[0]));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void initAttributes() {
|
||||
this.getAttributeMap().b(GenericAttributes.MAX_HEALTH);
|
||||
this.getAttributeMap().b(GenericAttributes.KNOCKBACK_RESISTANCE);
|
||||
this.getAttributeMap().b(GenericAttributes.MOVEMENT_SPEED);
|
||||
this.getAttributeMap().b(GenericAttributes.ARMOR);
|
||||
this.getAttributeMap().b(GenericAttributes.ARMOR_TOUGHNESS);
|
||||
this.getAttributeMap().b(GenericAttributes.FOLLOW_RANGE).setValue(2.0D);
|
||||
this.getAttributeMap().b(GenericAttributes.ATTACK_KNOCKBACK);
|
||||
this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).setValue(0.30000001192092896D);
|
||||
this.getAttributeInstance(GenericAttributes.MAX_HEALTH).setValue(24.0D);
|
||||
this.getAttributeInstance(GenericAttributes.FOLLOW_RANGE).setValue(32.0D);
|
||||
this.getAttributeMap().b(GenericAttributes.ATTACK_DAMAGE).setValue(3.0D);
|
||||
}
|
||||
|
||||
public EntityFox createChild(EntityAgeable entityageable) {
|
||||
WorldServer world = ((CraftWorld) entityageable.getBukkitEntity().getWorld()).getHandle();
|
||||
Location location = entityageable.getBukkitEntity().getLocation();
|
||||
Entity b = plugin.getCustomType().b(world, null, null, null,
|
||||
new BlockPosition(location.getX(), location.getY(), location.getZ()), null, false, false);
|
||||
EntityFox entityfox = (EntityFox) b;
|
||||
entityfox.setFoxType(this.random.nextBoolean() ? this.getFoxType() : ((EntityFox) entityageable).getFoxType());
|
||||
return entityfox;
|
||||
}
|
||||
|
||||
protected void a(EntityItem entityitem) {
|
||||
ItemStack itemstack = entityitem.getItemStack();
|
||||
if (!this.isTamed() && !CraftEventFactory.callEntityPickupItemEvent(this, entityitem,
|
||||
itemstack.getCount() - 1, !this.g(itemstack)).isCancelled()) {
|
||||
try {
|
||||
int i = itemstack.getCount();
|
||||
Method method;
|
||||
if (i > 1) {
|
||||
method = this.getClass().getSuperclass().getDeclaredMethod("l", ItemStack.class);
|
||||
method.setAccessible(true);
|
||||
method.invoke(this, itemstack.cloneAndSubtract(i - 1));
|
||||
method.setAccessible(false);
|
||||
}
|
||||
|
||||
method = this.getClass().getSuperclass().getDeclaredMethod("k", ItemStack.class);
|
||||
method.setAccessible(true);
|
||||
method.invoke(this, this.getEquipment(EnumItemSlot.MAINHAND));
|
||||
method.setAccessible(false);
|
||||
this.setSlot(EnumItemSlot.MAINHAND, itemstack.cloneAndSubtract(1));
|
||||
this.dropChanceHand[EnumItemSlot.MAINHAND.b()] = 2.0F;
|
||||
this.receive(entityitem, itemstack.getCount());
|
||||
entityitem.die();
|
||||
Field field = this.getClass().getSuperclass().getDeclaredField("bL");
|
||||
field.setAccessible(true);
|
||||
field.set(this, 0);
|
||||
field.setAccessible(false);
|
||||
} catch (NoSuchFieldException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public TamableFoxes getPlugin() {
|
||||
return plugin;
|
||||
}
|
||||
|
||||
public boolean isTamed() {
|
||||
return this.isTamed;
|
||||
}
|
||||
|
||||
public void setTamed(boolean tamed) {
|
||||
this.isTamed = tamed;
|
||||
// Remove attack goal if tamed
|
||||
if (isTamed && plugin.isTamedAttackRabbitChicken()) {
|
||||
this.targetSelector.a(goalAttack);
|
||||
} else {
|
||||
this.targetSelector.a(4, goalAttack);
|
||||
}
|
||||
}
|
||||
|
||||
public String getChosenName() {
|
||||
return chosenName;
|
||||
}
|
||||
|
||||
public void setChosenName(String chosenName) {
|
||||
this.chosenName = chosenName;
|
||||
//plugin.getConfigFoxes().set("Foxes." + getUniqueID() + ".name", chosenName).save();
|
||||
updateFoxVisual();
|
||||
}
|
||||
|
||||
public EntityLiving getOwner() {
|
||||
return this.owner;
|
||||
}
|
||||
|
||||
public void setOwner(EntityLiving owner) {
|
||||
this.owner = owner;
|
||||
//plugin.getConfigFoxes().set("Foxes." + getUniqueID() + ".owner", owner.getUniqueIDString()).save();
|
||||
updateFoxVisual();
|
||||
}
|
||||
|
||||
public boolean toggleSitting() {
|
||||
this.sit = !this.sit;
|
||||
updateFoxVisual();
|
||||
return this.sit;
|
||||
}
|
||||
|
||||
public void updateFox() {
|
||||
updateFoxVisual();
|
||||
}
|
||||
|
||||
public GroupDataEntity prepare(GeneratorAccess generatoraccess, DifficultyDamageScaler difficultydamagescaler,
|
||||
EnumMobSpawn enummobspawn, GroupDataEntity groupdataentity, NBTTagCompound nbttagcompound) {
|
||||
BiomeBase biomebase = generatoraccess.getBiome(new BlockPosition(this));
|
||||
Type entityfox_type = Type.a(biomebase);
|
||||
boolean flag = false;
|
||||
if (groupdataentity instanceof i) {
|
||||
entityfox_type = ((i) groupdataentity).a;
|
||||
if (((i) groupdataentity).a() >= 2) {
|
||||
flag = true;
|
||||
} else {
|
||||
((i) groupdataentity).b();
|
||||
}
|
||||
} else {
|
||||
groupdataentity = new i(entityfox_type);
|
||||
((i) groupdataentity).b();
|
||||
}
|
||||
|
||||
this.setFoxType(entityfox_type);
|
||||
if (flag) {
|
||||
this.setAgeRaw(-24000);
|
||||
}
|
||||
|
||||
this.initPathfinder();
|
||||
this.a(difficultydamagescaler);
|
||||
this.getAttributeInstance(GenericAttributes.FOLLOW_RANGE).addModifier(new AttributeModifier("Random spawn bonus",
|
||||
this.random.nextGaussian() * 0.05D, AttributeModifier.Operation.MULTIPLY_BASE));
|
||||
if (this.random.nextFloat() < 0.05F) {
|
||||
this.p(true);
|
||||
} else {
|
||||
this.p(false);
|
||||
}
|
||||
|
||||
return groupdataentity;
|
||||
}
|
||||
|
||||
public boolean isJumping() {
|
||||
return this.jumping;
|
||||
}
|
||||
|
||||
private void updateFoxVisual() {
|
||||
this.sittingRunnable = new UpdateFoxRunnable(plugin).runTask(plugin);
|
||||
}
|
||||
|
||||
private class UpdateFoxRunnable extends BukkitRunnable {
|
||||
|
||||
private final TamableFoxes plugin;
|
||||
|
||||
UpdateFoxRunnable(TamableFoxes plugin) {
|
||||
this.plugin = plugin;
|
||||
}
|
||||
|
||||
public void run() {
|
||||
goalSit.setSitting(sit);
|
||||
thisFox.setVelocity(new Vector(0, 0, 0));
|
||||
setGoalTarget(null, EntityTargetEvent.TargetReason.CUSTOM, true);
|
||||
|
||||
getBukkitEntity().setCustomName((chosenName != null ? chosenName : "")
|
||||
+ (owner != null && plugin.isShowOwnerFoxName() ? ChatColor.RESET + " (" + owner.getName() + ")" : ""));
|
||||
getBukkitEntity().setCustomNameVisible(plugin.isShowNameTags());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
|
@ -1,242 +0,0 @@
|
|||
package net.seanomilk.tamablefoxes;
|
||||
|
||||
import net.minecraft.server.v1_15_R1.*;
|
||||
import net.seanomilk.tamablefoxes.pathfinding.*;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.craftbukkit.v1_15_R1.CraftWorld;
|
||||
import org.bukkit.craftbukkit.v1_15_R1.event.CraftEventFactory;
|
||||
import org.bukkit.entity.Fox;
|
||||
import org.bukkit.event.entity.EntityTargetEvent;
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
import org.bukkit.util.Vector;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
public class EntityTamableFox extends EntityFox {
|
||||
|
||||
private static Fox thisFox;
|
||||
private final TamableFoxes plugin;
|
||||
|
||||
private boolean isTamed;
|
||||
private EntityLiving owner;
|
||||
private String chosenName;
|
||||
private boolean sit = false;
|
||||
private BukkitTask sittingRunnable;
|
||||
|
||||
private FoxPathfindGoalSit goalSit;
|
||||
private PathfinderGoalNearestAttackableTarget goalAttack;
|
||||
|
||||
public EntityTamableFox(TamableFoxes plugin, EntityTypes entitytypes, World world) {
|
||||
super(EntityTypes.FOX, world);
|
||||
this.plugin = plugin;
|
||||
thisFox = (Fox) this.getBukkitEntity();
|
||||
plugin.getFoxUUIDs().put(this.getBukkitEntity().getUniqueId(), null);
|
||||
this.setPersistent();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void initPathfinder() {
|
||||
this.goalSit = new FoxPathfindGoalSit(this);
|
||||
this.goalSelector.a(1, new FoxPathfindGoalFloat(this));
|
||||
this.goalSelector.a(2, this.goalSit);
|
||||
this.goalSelector.a(3, new FoxPathfindGoalMeleeAttack(this, 1.2000000476837158D, true));
|
||||
this.goalSelector.a(3, new PathfinderGoalAvoidTarget(this, EntityWolf.class, 8.0F, 1.6D, 1.4D,
|
||||
entityliving -> !((EntityWolf) entityliving).isTamed()));
|
||||
this.goalSelector.a(4, new FoxPathfindGoalFollowOwner(this, 1.35D, 10.0F, 2.0F));
|
||||
this.goalSelector.a(4, new FoxPathfindGoalLungeUNKNOWN_USE(this));
|
||||
this.goalSelector.a(5, new FoxPathfindGoalLunge(this));
|
||||
this.goalSelector.a(5, new FoxPathfindGoalFleeSun(this, 1.25D));
|
||||
this.goalSelector.a(5, new FoxPathfindGoalBreed(this, 1.0D));
|
||||
this.goalSelector.a(7, new PathfinderGoalFollowParent(this, 1.1D));
|
||||
this.goalSelector.a(7, new FoxPathfindGoalBeg(this, 8.0F));
|
||||
this.goalSelector.a(8, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 8.0F));
|
||||
this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
|
||||
this.goalSelector.a(9, new FoxPathfindGoalPickBushes(this, 1.2000000476837158D, 12, 2));
|
||||
this.goalSelector.a(9, new FoxPathfindGoalPickBushes(this, 1.2000000476837158D, 12, 2));
|
||||
this.goalSelector.a(10, new FoxPathfindGoalRandomStrollLand(this, 1.0D));
|
||||
this.targetSelector.a(1, new FoxPathfindGoalHurtByTarget(this));
|
||||
this.targetSelector.a(2, new FoxPathfindGoalOwnerHurtByTarget(this));
|
||||
|
||||
this.goalAttack = new PathfinderGoalNearestAttackableTarget(this, EntityLiving.class, 10, false, false,
|
||||
entityLiving -> !isTamed && (entityLiving instanceof EntityChicken || entityLiving instanceof EntityRabbit));
|
||||
|
||||
if (!isTamed || (plugin.isTamedAttackRabbitChicken() && isTamed)) {
|
||||
this.targetSelector.a(4, goalAttack);
|
||||
}
|
||||
|
||||
this.targetSelector.a(5, new FoxPathfindGoalHurtByTarget(this).a(new Class[0]));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void initAttributes() {
|
||||
this.getAttributeMap().b(GenericAttributes.MAX_HEALTH);
|
||||
this.getAttributeMap().b(GenericAttributes.KNOCKBACK_RESISTANCE);
|
||||
this.getAttributeMap().b(GenericAttributes.MOVEMENT_SPEED);
|
||||
this.getAttributeMap().b(GenericAttributes.ARMOR);
|
||||
this.getAttributeMap().b(GenericAttributes.ARMOR_TOUGHNESS);
|
||||
this.getAttributeMap().b(GenericAttributes.FOLLOW_RANGE).setValue(2.0D);
|
||||
this.getAttributeMap().b(GenericAttributes.ATTACK_KNOCKBACK);
|
||||
this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).setValue(0.30000001192092896D);
|
||||
this.getAttributeInstance(GenericAttributes.MAX_HEALTH).setValue(24.0D);
|
||||
this.getAttributeInstance(GenericAttributes.FOLLOW_RANGE).setValue(32.0D);
|
||||
this.getAttributeMap().b(GenericAttributes.ATTACK_DAMAGE).setValue(3.0D);
|
||||
}
|
||||
|
||||
public EntityFox createChild(EntityAgeable entityageable) {
|
||||
WorldServer world = ((CraftWorld) entityageable.getBukkitEntity().getWorld()).getHandle();
|
||||
Location location = entityageable.getBukkitEntity().getLocation();
|
||||
Entity b = plugin.getCustomType().b(world, null, null, null,
|
||||
new BlockPosition(location.getX(), location.getY(), location.getZ()), null, false, false);
|
||||
EntityFox entityfox = (EntityFox) b;
|
||||
entityfox.setFoxType(this.random.nextBoolean() ? this.getFoxType() : ((EntityFox) entityageable).getFoxType());
|
||||
return entityfox;
|
||||
}
|
||||
|
||||
protected void a(EntityItem entityitem) {
|
||||
ItemStack itemstack = entityitem.getItemStack();
|
||||
if (!this.isTamed() && !CraftEventFactory.callEntityPickupItemEvent(this, entityitem,
|
||||
itemstack.getCount() - 1, !this.g(itemstack)).isCancelled()) {
|
||||
try {
|
||||
int i = itemstack.getCount();
|
||||
Method method;
|
||||
if (i > 1) {
|
||||
method = this.getClass().getSuperclass().getDeclaredMethod("l", ItemStack.class);
|
||||
method.setAccessible(true);
|
||||
method.invoke(this, itemstack.cloneAndSubtract(i - 1));
|
||||
method.setAccessible(false);
|
||||
}
|
||||
|
||||
method = this.getClass().getSuperclass().getDeclaredMethod("k", ItemStack.class);
|
||||
method.setAccessible(true);
|
||||
method.invoke(this, this.getEquipment(EnumItemSlot.MAINHAND));
|
||||
method.setAccessible(false);
|
||||
this.setSlot(EnumItemSlot.MAINHAND, itemstack.cloneAndSubtract(1));
|
||||
this.dropChanceHand[EnumItemSlot.MAINHAND.b()] = 2.0F;
|
||||
this.receive(entityitem, itemstack.getCount());
|
||||
entityitem.die();
|
||||
Field field = this.getClass().getSuperclass().getDeclaredField("bL");
|
||||
field.setAccessible(true);
|
||||
field.set(this, 0);
|
||||
field.setAccessible(false);
|
||||
} catch (NoSuchFieldException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public TamableFoxes getPlugin() {
|
||||
return plugin;
|
||||
}
|
||||
|
||||
public boolean isTamed() {
|
||||
return this.isTamed;
|
||||
}
|
||||
|
||||
public void setTamed(boolean tamed) {
|
||||
this.isTamed = tamed;
|
||||
// Remove attack goal if tamed
|
||||
if (isTamed && plugin.isTamedAttackRabbitChicken()) {
|
||||
this.targetSelector.a(goalAttack);
|
||||
} else {
|
||||
this.targetSelector.a(4, goalAttack);
|
||||
}
|
||||
}
|
||||
|
||||
public String getChosenName() {
|
||||
return chosenName;
|
||||
}
|
||||
|
||||
public void setChosenName(String chosenName) {
|
||||
this.chosenName = chosenName;
|
||||
plugin.getConfigFoxes().set("Foxes." + getUniqueID() + ".name", chosenName).save();
|
||||
updateFoxVisual();
|
||||
}
|
||||
|
||||
public EntityLiving getOwner() {
|
||||
return this.owner;
|
||||
}
|
||||
|
||||
public void setOwner(EntityLiving owner) {
|
||||
this.owner = owner;
|
||||
plugin.getConfigFoxes().set("Foxes." + getUniqueID() + ".owner", owner.getUniqueIDString()).save();
|
||||
updateFoxVisual();
|
||||
}
|
||||
|
||||
public boolean toggleSitting() {
|
||||
this.sit = !this.sit;
|
||||
updateFoxVisual();
|
||||
return this.sit;
|
||||
}
|
||||
|
||||
public void updateFox() {
|
||||
updateFoxVisual();
|
||||
}
|
||||
|
||||
public GroupDataEntity prepare(GeneratorAccess generatoraccess, DifficultyDamageScaler difficultydamagescaler,
|
||||
EnumMobSpawn enummobspawn, GroupDataEntity groupdataentity, NBTTagCompound nbttagcompound) {
|
||||
BiomeBase biomebase = generatoraccess.getBiome(new BlockPosition(this));
|
||||
Type entityfox_type = Type.a(biomebase);
|
||||
boolean flag = false;
|
||||
if (groupdataentity instanceof i) {
|
||||
entityfox_type = ((i) groupdataentity).a;
|
||||
if (((i) groupdataentity).a() >= 2) {
|
||||
flag = true;
|
||||
} else {
|
||||
((i) groupdataentity).b();
|
||||
}
|
||||
} else {
|
||||
groupdataentity = new i(entityfox_type);
|
||||
((i) groupdataentity).b();
|
||||
}
|
||||
|
||||
this.setFoxType(entityfox_type);
|
||||
if (flag) {
|
||||
this.setAgeRaw(-24000);
|
||||
}
|
||||
|
||||
this.initPathfinder();
|
||||
this.a(difficultydamagescaler);
|
||||
this.getAttributeInstance(GenericAttributes.FOLLOW_RANGE).addModifier(new AttributeModifier("Random spawn bonus",
|
||||
this.random.nextGaussian() * 0.05D, AttributeModifier.Operation.MULTIPLY_BASE));
|
||||
if (this.random.nextFloat() < 0.05F) {
|
||||
this.p(true);
|
||||
} else {
|
||||
this.p(false);
|
||||
}
|
||||
|
||||
return groupdataentity;
|
||||
}
|
||||
|
||||
public boolean isJumping() {
|
||||
return this.jumping;
|
||||
}
|
||||
|
||||
private void updateFoxVisual() {
|
||||
this.sittingRunnable = new UpdateFoxRunnable(plugin).runTask(plugin);
|
||||
}
|
||||
|
||||
private class UpdateFoxRunnable extends BukkitRunnable {
|
||||
|
||||
private final TamableFoxes plugin;
|
||||
|
||||
UpdateFoxRunnable(TamableFoxes plugin) {
|
||||
this.plugin = plugin;
|
||||
}
|
||||
|
||||
public void run() {
|
||||
goalSit.setSitting(sit);
|
||||
thisFox.setVelocity(new Vector(0, 0, 0));
|
||||
setGoalTarget(null, EntityTargetEvent.TargetReason.CUSTOM, true);
|
||||
|
||||
getBukkitEntity().setCustomName((chosenName != null ? chosenName : "")
|
||||
+ (owner != null && plugin.isShowOwnerFoxName() ? ChatColor.RESET + " (" + owner.getName() + ")" : ""));
|
||||
getBukkitEntity().setCustomNameVisible(plugin.isShowNameTags());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
|
@ -1,11 +1,13 @@
|
|||
package net.seanomilk.tamablefoxes;
|
||||
package net.seanomik.tamablefoxes;
|
||||
|
||||
import com.google.common.collect.Maps;
|
||||
import com.mojang.datafixers.DataFixUtils;
|
||||
import com.mojang.datafixers.types.Type;
|
||||
import net.seanomilk.tamablefoxes.command.CommandSpawnTamableFox;
|
||||
import net.seanomilk.tamablefoxes.io.FileManager;
|
||||
import net.seanomik.tamablefoxes.command.CommandSpawnTamableFox;
|
||||
import net.seanomik.tamablefoxes.io.FileManager;
|
||||
import net.minecraft.server.v1_15_R1.*;
|
||||
import net.seanomik.tamablefoxes.sqlite.SQLiteHandler;
|
||||
import net.seanomik.tamablefoxes.sqlite.SQLiteSetterGetter;
|
||||
import net.wesjd.anvilgui.AnvilGUI;
|
||||
import org.bukkit.Chunk;
|
||||
import org.bukkit.Material;
|
||||
|
@ -16,49 +18,48 @@ import org.bukkit.configuration.file.YamlConfiguration;
|
|||
import org.bukkit.craftbukkit.v1_15_R1.CraftWorld;
|
||||
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
|
||||
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftFox;
|
||||
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftItem;
|
||||
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
|
||||
import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.EntityType;
|
||||
import org.bukkit.entity.Fox;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.entity.CreatureSpawnEvent;
|
||||
import org.bukkit.event.entity.EntityDeathEvent;
|
||||
import org.bukkit.event.entity.EntityTargetEvent;
|
||||
import org.bukkit.event.player.*;
|
||||
import org.bukkit.event.world.ChunkLoadEvent;
|
||||
import org.bukkit.inventory.EquipmentSlot;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.inventory.meta.ItemMeta;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
import org.bukkit.util.Vector;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
// @TODO: Add language.yml
|
||||
|
||||
public class TamableFoxes extends JavaPlugin implements Listener {
|
||||
|
||||
public static final String ITEM_INSPECTOR_LORE = ChatColor.BLUE + "Tamable Fox Inspector";
|
||||
public static final String TAG_TAME_FOX = "tameablefox";
|
||||
|
||||
private FileManager fileManager;
|
||||
private FileManager fileManager = new FileManager(this);
|
||||
|
||||
private Map<UUID, UUID> foxUUIDs;
|
||||
private Map<UUID, UUID> foxUUIDs = Maps.newHashMap(); // FoxUUID, OwnerUUID
|
||||
private EntityTypes customType;
|
||||
|
||||
private boolean isOnLoad = true;
|
||||
|
||||
private Map<UUID, Entity> lookupCache;
|
||||
|
||||
private FileManager.Config config, configFoxes;
|
||||
|
||||
private Map<Player, UUID> waitingName;
|
||||
private Map<UUID, Entity> lookupCache = Maps.newHashMap();
|
||||
private List<EntityTamableFox> spawnedFoxes;
|
||||
private FileManager.Config config;//, configFoxes;
|
||||
public static SQLiteHandler sqLiteHandler = new SQLiteHandler();
|
||||
public static SQLiteSetterGetter sqLiteSetterGetter = new SQLiteSetterGetter();
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
|
@ -69,19 +70,15 @@ public class TamableFoxes extends JavaPlugin implements Listener {
|
|||
return;
|
||||
}
|
||||
|
||||
fileManager = new FileManager(this);
|
||||
this.config = fileManager.getConfig("config.yml");
|
||||
this.config.copyDefaults(true).save();
|
||||
this.configFoxes = fileManager.getConfig("foxes.yml");
|
||||
this.configFoxes.copyDefaults(true).save();
|
||||
|
||||
sqLiteHandler.connect();
|
||||
sqLiteSetterGetter.createTablesIfNotExist();
|
||||
|
||||
this.getServer().getPluginManager().registerEvents(this, this);
|
||||
this.getCommand("spawntamablefox").setExecutor(new CommandSpawnTamableFox(this));
|
||||
|
||||
this.foxUUIDs = Maps.newHashMap();
|
||||
this.lookupCache = Maps.newHashMap();
|
||||
this.waitingName = Maps.newHashMap();
|
||||
|
||||
final Map<String, Type<?>> types = (Map<String, Type<?>>) DataConverterRegistry.a()
|
||||
.getSchema(DataFixUtils.makeKey(SharedConstants.getGameVersion().getWorldVersion()))
|
||||
.findChoiceType(DataConverterTypes.ENTITY).types();
|
||||
|
@ -96,11 +93,21 @@ public class TamableFoxes extends JavaPlugin implements Listener {
|
|||
|
||||
@Override
|
||||
public void onDisable() {
|
||||
try {
|
||||
for (EntityTamableFox fox : spawnedFoxes) {
|
||||
sqLiteSetterGetter.saveFox(fox);
|
||||
|
||||
fox.getBukkitEntity().remove();
|
||||
}
|
||||
|
||||
getServer().getConsoleSender().sendMessage(getPrefix() + ChatColor.GREEN + "Saved all foxes successfully!");
|
||||
} catch (Exception e) {
|
||||
getServer().getConsoleSender().sendMessage(getPrefix() + ChatColor.RED + "Failed to save foxes!");
|
||||
}
|
||||
}
|
||||
|
||||
private void replaceFoxesOnLoad() {
|
||||
int amountReplaced = 0;
|
||||
/*int amountReplaced = 0;
|
||||
|
||||
for (World world : Bukkit.getWorlds()) {
|
||||
Chunk[] loadedChunks = world.getLoadedChunks();
|
||||
|
@ -113,7 +120,7 @@ public class TamableFoxes extends JavaPlugin implements Listener {
|
|||
continue;
|
||||
EntityTamableFox tamableFox = (EntityTamableFox) spawnTamableFox(entity.getLocation(), ((CraftFox) entity).getHandle().getFoxType());
|
||||
|
||||
final YamlConfiguration configuration = configFoxes.get();
|
||||
//final YamlConfiguration configuration = configFoxes.get();
|
||||
// get living entity data
|
||||
if (configuration.isConfigurationSection("Foxes." + entity.getUniqueId())) {
|
||||
String owner = configuration.getString("Foxes." + entity.getUniqueId() + ".owner");
|
||||
|
@ -142,8 +149,10 @@ public class TamableFoxes extends JavaPlugin implements Listener {
|
|||
tamableFox.updateFox();
|
||||
tamableFox.setAge(((CraftFox) entity).getAge());
|
||||
ItemStack entityMouthItem = ((CraftFox) entity).getEquipment().getItemInMainHand();
|
||||
entityMouthItem.setAmount(1);
|
||||
|
||||
if (entityMouthItem.getType() != Material.AIR) {
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, CraftItemStack.asNMSCopy(new ItemStack(entityMouthItem.getType(), 1)));
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, CraftItemStack.asNMSCopy(entityMouthItem));
|
||||
} else {
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, new net.minecraft.server.v1_15_R1.ItemStack(Items.AIR));
|
||||
}
|
||||
|
@ -153,8 +162,10 @@ public class TamableFoxes extends JavaPlugin implements Listener {
|
|||
|
||||
tamableFox.setAge(((CraftFox) entity).getAge());
|
||||
ItemStack entityMouthItem = ((CraftFox) entity).getEquipment().getItemInMainHand();
|
||||
entityMouthItem.setAmount(1);
|
||||
|
||||
if (entityMouthItem.getType() != Material.AIR) {
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, CraftItemStack.asNMSCopy(new ItemStack(entityMouthItem.getType(), 1)));
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, CraftItemStack.asNMSCopy(entityMouthItem));
|
||||
} else {
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, new net.minecraft.server.v1_15_R1.ItemStack(Items.AIR));
|
||||
}
|
||||
|
@ -166,83 +177,44 @@ public class TamableFoxes extends JavaPlugin implements Listener {
|
|||
}
|
||||
}
|
||||
|
||||
configFoxes.save();
|
||||
configFoxes.save();*/
|
||||
|
||||
spawnedFoxes = sqLiteSetterGetter.spawnFoxes();
|
||||
this.isOnLoad = false;
|
||||
}
|
||||
|
||||
public net.minecraft.server.v1_15_R1.Entity spawnTamableFox(Location location, net.minecraft.server.v1_15_R1.EntityFox.Type type) {
|
||||
WorldServer world = ((CraftWorld) location.getWorld()).getHandle();
|
||||
net.minecraft.server.v1_15_R1.Entity spawnedEntity = customType.b(world, null, null, null,
|
||||
EntityTamableFox spawnedFox = (EntityTamableFox) customType.b(world, null, null, null,
|
||||
new BlockPosition(location.getX(), location.getY(), location.getZ()), null, false, false);
|
||||
|
||||
world.addEntity(spawnedEntity);
|
||||
EntityFox fox = (EntityFox) spawnedEntity;
|
||||
fox.setFoxType(type);
|
||||
|
||||
configFoxes.get().set("Foxes." + spawnedEntity.getUniqueID() + ".owner", "none");
|
||||
fileManager.saveConfig("foxes.yml");
|
||||
|
||||
return fox;
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onChunkLoad(ChunkLoadEvent event) {
|
||||
if (isOnLoad)
|
||||
return;
|
||||
Chunk chunk = event.getChunk();
|
||||
Entity[] entities = chunk.getEntities();
|
||||
|
||||
for (Entity entity : entities) {
|
||||
if (entity instanceof Fox && !this.isTamableFox(entity)) {
|
||||
EntityTamableFox tamableFox = (EntityTamableFox) spawnTamableFox(entity.getLocation(), ((CraftFox) entity).getHandle().getFoxType());
|
||||
final YamlConfiguration configuration = configFoxes.get();
|
||||
// if has data
|
||||
if (configuration.isConfigurationSection("Foxes." + entity.getUniqueId())) {
|
||||
String owner = configuration.getString("Foxes." + entity.getUniqueId() + ".owner", "none");
|
||||
|
||||
// if has owner
|
||||
if (!owner.equals("none")) {
|
||||
foxUUIDs.replace(tamableFox.getUniqueID(), UUID.fromString(owner));
|
||||
configuration.set("Foxes." + tamableFox.getUniqueID() + ".owner", owner);
|
||||
|
||||
// set name
|
||||
if (configuration.isSet("Foxes." + entity.getUniqueId() + ".name")) {
|
||||
String name = configuration.getString("Foxes." + entity.getUniqueId() + ".name");
|
||||
|
||||
configuration.set("Foxes." + tamableFox.getUniqueID() + ".name", name);
|
||||
tamableFox.setChosenName(name);
|
||||
}
|
||||
|
||||
// remove old data
|
||||
configuration.set("Foxes." + entity.getUniqueId(), null);
|
||||
|
||||
tamableFox.setTamed(true);
|
||||
tamableFox.setSitting(((EntityFox) ((CraftEntity) entity).getHandle()).isSitting());
|
||||
tamableFox.updateFox();
|
||||
tamableFox.setAge(((CraftFox) entity).getAge());
|
||||
ItemStack entityMouthItem = ((CraftFox) entity).getEquipment().getItemInMainHand();
|
||||
if (entityMouthItem.getType() != Material.AIR) {
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, CraftItemStack.asNMSCopy(new ItemStack(entityMouthItem.getType(), 1)));
|
||||
} else {
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, new net.minecraft.server.v1_15_R1.ItemStack(Items.AIR));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
configuration.set("Foxes." + tamableFox.getUniqueID() + ".owner", "none");
|
||||
|
||||
tamableFox.setAge(((CraftFox) entity).getAge());
|
||||
ItemStack entityMouthItem = ((CraftFox) entity).getEquipment().getItemInMainHand();
|
||||
if (entityMouthItem.getType() != Material.AIR) {
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, CraftItemStack.asNMSCopy(new ItemStack(entityMouthItem.getType(), 1)));
|
||||
} else {
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, new net.minecraft.server.v1_15_R1.ItemStack(Items.AIR));
|
||||
}
|
||||
}
|
||||
|
||||
entity.remove();
|
||||
}
|
||||
if (!world.addEntity(spawnedFox)) { // Throw a error if the fox failed to spawn
|
||||
throw new RuntimeException("Failed to spawn fox!");
|
||||
}
|
||||
|
||||
spawnedFox.setFoxType(type);
|
||||
|
||||
sqLiteSetterGetter.saveFox((EntityTamableFox) spawnedFox);
|
||||
|
||||
return spawnedFox;
|
||||
}
|
||||
|
||||
private class SaveFoxRunnable extends BukkitRunnable {
|
||||
private final TamableFoxes plugin;
|
||||
|
||||
SaveFoxRunnable(TamableFoxes plugin) {
|
||||
this.plugin = plugin;
|
||||
}
|
||||
|
||||
public void run() {
|
||||
try {
|
||||
sqLiteSetterGetter.saveFoxes(spawnedFoxes);
|
||||
|
||||
getServer().getConsoleSender().sendMessage(getPrefix() + ChatColor.GREEN + "Saved all foxes successfully!");
|
||||
} catch (Exception e) {
|
||||
getServer().getConsoleSender().sendMessage(getPrefix() + ChatColor.RED + "Failed to save foxes!");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
|
@ -250,7 +222,7 @@ public class TamableFoxes extends JavaPlugin implements Listener {
|
|||
Player player = event.getPlayer();
|
||||
|
||||
getFoxesOf(player).forEach(uuid -> {
|
||||
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) this.getEntityByUniqueId(uuid)).getHandle();
|
||||
EntityTamableFox tamableFox = getSpawnedFox(uuid);
|
||||
tamableFox.setOwner(((CraftPlayer) player).getHandle());
|
||||
tamableFox.setTamed(true);
|
||||
foxUUIDs.replace(tamableFox.getUniqueID(), player.getUniqueId());
|
||||
|
@ -275,26 +247,19 @@ public class TamableFoxes extends JavaPlugin implements Listener {
|
|||
if (!this.isTamableFox(entity)) {
|
||||
lore = Arrays.asList(ITEM_INSPECTOR_LORE,
|
||||
"UUID: " + entity.getUniqueId(),
|
||||
"Entity ID: " + entity.getEntityId());
|
||||
"Entity ID: " + entity.getEntityId(),
|
||||
"Entity type: " + ((CraftEntity) entity).getHandle());
|
||||
} else {
|
||||
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) entity).getHandle();
|
||||
|
||||
if (tamableFox.getOwner() == null) {
|
||||
lore = Arrays.asList(ITEM_INSPECTOR_LORE,
|
||||
"UUID: " + entity.getUniqueId(),
|
||||
"Entity ID: " + entity.getEntityId(),
|
||||
"Tamable",
|
||||
"Owner: None");
|
||||
} else {
|
||||
lore = Arrays.asList(ITEM_INSPECTOR_LORE,
|
||||
"UUID: " + entity.getUniqueId(),
|
||||
"Entity ID: " + entity.getEntityId(),
|
||||
"Tamable",
|
||||
"Owner: " + tamableFox.getOwner().getName());
|
||||
}
|
||||
lore = Arrays.asList(ITEM_INSPECTOR_LORE,
|
||||
"UUID: " + entity.getUniqueId(),
|
||||
"Entity ID: " + entity.getEntityId(),
|
||||
"Tamable",
|
||||
"Owner: " + ((tamableFox.getOwner() == null) ? "none" : tamableFox.getOwner().getName()));
|
||||
}
|
||||
|
||||
// update item
|
||||
// Update item
|
||||
itemMeta.setLore(lore);
|
||||
playerHand.setItemMeta(itemMeta);
|
||||
player.getInventory().setItemInMainHand(playerHand);
|
||||
|
@ -358,22 +323,22 @@ public class TamableFoxes extends JavaPlugin implements Listener {
|
|||
player.sendMessage(ChatColor.RED + "What do you want to call it?");
|
||||
tamableFox.setChosenName("???");
|
||||
|
||||
event.setCancelled(true);
|
||||
new AnvilGUI.Builder()
|
||||
.onComplete((plr, text) -> { // Called when the inventory output slot is clicked
|
||||
if(!text.equals("")) {
|
||||
tamableFox.setChosenName(text);
|
||||
plr.sendMessage(getPrefix() + ChatColor.GREEN + text + " is perfect!");
|
||||
return AnvilGUI.Response.close();
|
||||
} else {
|
||||
return AnvilGUI.Response.text("Insert a name for your fox!");
|
||||
}
|
||||
|
||||
return AnvilGUI.Response.close();
|
||||
})
|
||||
.preventClose() // Prevents the inventory from being closed
|
||||
//.preventClose() // Prevents the inventory from being closed
|
||||
.text("Fox name") // Sets the text the GUI should start with
|
||||
.plugin(this) // Set the plugin instance
|
||||
.open(player); // Opens the GUI for the player provided
|
||||
|
||||
} else {
|
||||
} else { // Failed to tame
|
||||
player.getWorld().spawnParticle(Particle.SMOKE_NORMAL, entity.getLocation(), 10, 0.3D, 0.3D, 0.3D, 0.15D);
|
||||
}
|
||||
|
||||
|
@ -389,27 +354,23 @@ public class TamableFoxes extends JavaPlugin implements Listener {
|
|||
@EventHandler
|
||||
public void onPlayerBedEnterEvent(PlayerBedEnterEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
List<UUID> dogsToSleep = getFoxesOf(player);
|
||||
|
||||
for (UUID uuid : dogsToSleep) {
|
||||
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftFox) this.getEntityByUniqueId(uuid)).getHandle();
|
||||
getFoxesOf(player).forEach(uuid -> {
|
||||
EntityTamableFox tamableFox = getSpawnedFox(uuid);
|
||||
if (player.getWorld().getTime() > 12541L && player.getWorld().getTime() < 23460L) {
|
||||
tamableFox.setSleeping(true);
|
||||
}
|
||||
}
|
||||
|
||||
} else return; // Stop the loop, no point of iterating through all the foxes if the condition will be the same.
|
||||
});
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerBedLeaveEvent(PlayerBedLeaveEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
final List<UUID> foxesOf = getFoxesOf(player);
|
||||
|
||||
for (UUID uuid : foxesOf) {
|
||||
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftFox) this.getEntityByUniqueId(uuid)).getHandle();
|
||||
getFoxesOf(player).forEach(uuid -> {
|
||||
EntityTamableFox tamableFox = getSpawnedFox(uuid);
|
||||
tamableFox.setSleeping(false);
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
|
@ -420,59 +381,45 @@ public class TamableFoxes extends JavaPlugin implements Listener {
|
|||
spawnTamableFox(entity.getLocation(), foxType);
|
||||
event.setCancelled(true);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public Entity getEntityByUniqueId(UUID uniqueId) {
|
||||
final Entity cacheEntity = lookupCache.get(uniqueId);
|
||||
if (cacheEntity != null) {
|
||||
if (cacheEntity.isDead())
|
||||
lookupCache.remove(uniqueId);
|
||||
else return cacheEntity;
|
||||
@EventHandler
|
||||
public void onEntityDeathEvent(EntityDeathEvent event) {
|
||||
Entity entity = event.getEntity();
|
||||
if (!this.isTamableFox(entity)) return; // Is the entity a tamable fox?
|
||||
|
||||
// Remove the fox from storage
|
||||
lookupCache.remove(entity.getUniqueId());
|
||||
foxUUIDs.remove(entity.getUniqueId());
|
||||
spawnedFoxes.remove(entity.getUniqueId());
|
||||
|
||||
// Notify the owner
|
||||
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) entity).getHandle();
|
||||
if (tamableFox.getOwner() != null) {
|
||||
Player owner = ((EntityPlayer)tamableFox.getOwner()).getBukkitEntity();
|
||||
owner.sendMessage(getPrefix() + ChatColor.RED + tamableFox.getChosenName() + " was killed!");
|
||||
}
|
||||
|
||||
for (World world : Bukkit.getWorlds()) {
|
||||
for (Chunk loadedChunk : world.getLoadedChunks()) {
|
||||
for (Entity entity : loadedChunk.getEntities()) {
|
||||
if (entity.getUniqueId().equals(uniqueId)) {
|
||||
this.lookupCache.put(uniqueId, entity);
|
||||
return entity;
|
||||
}
|
||||
}
|
||||
// Remove the fox from database
|
||||
sqLiteSetterGetter.removeFox(tamableFox);
|
||||
}
|
||||
|
||||
public EntityTamableFox getSpawnedFox(UUID uniqueId) {
|
||||
for (EntityTamableFox fox : spawnedFoxes) {
|
||||
if (fox.getUniqueID() == uniqueId) {
|
||||
return fox;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onEntityDeathEvent(EntityDeathEvent event) {
|
||||
Entity entity = event.getEntity();
|
||||
if (!this.isTamableFox(entity))
|
||||
return;
|
||||
this.lookupCache.remove(entity.getUniqueId());
|
||||
foxUUIDs.remove(entity.getUniqueId());
|
||||
|
||||
if (configFoxes.get().getConfigurationSection("Foxes").contains(entity.getUniqueId().toString())) {
|
||||
/*EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) entity).getHandle();
|
||||
if (tamableFox.getOwner() != null && tamableFox.getOwner() instanceof Player) {
|
||||
Player owner = (Player) tamableFox.getOwner();
|
||||
owner.sendMessage(getPrefix() + ChatColor.RED + tamableFox.getChosenName() + " was killed!");
|
||||
}*/
|
||||
|
||||
configFoxes.get().set("Foxes." + entity.getUniqueId(), null);
|
||||
fileManager.saveConfig("foxes.yml");
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isTamableFox(org.bukkit.entity.Entity entity) {
|
||||
return ((CraftEntity) entity).getHandle().getClass().getName().contains("TamableFox")
|
||||
|| ((CraftEntity) entity).getHandle() instanceof EntityTamableFox;
|
||||
return ((CraftEntity) entity).getHandle().getClass().getName().contains("TamableFox") || ((CraftEntity) entity).getHandle() instanceof EntityTamableFox;
|
||||
}
|
||||
|
||||
public List<UUID> getFoxesOf(Player player) {
|
||||
return foxUUIDs.entrySet().stream().filter(foxPlayer -> foxPlayer.getValue() != null && foxPlayer.getValue().equals(player.getUniqueId()))
|
||||
.map(Map.Entry::getKey).collect(Collectors.toList());
|
||||
return foxUUIDs.entrySet().stream().filter(foxPlayer -> foxPlayer.getValue() != null && foxPlayer.getValue().equals(player.getUniqueId())).map(Map.Entry::getKey).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
public FileManager getFileManager() {
|
||||
|
@ -483,10 +430,6 @@ public class TamableFoxes extends JavaPlugin implements Listener {
|
|||
return config;
|
||||
}
|
||||
|
||||
public FileManager.Config getConfigFoxes() {
|
||||
return configFoxes;
|
||||
}
|
||||
|
||||
public EntityTypes getCustomType() {
|
||||
return customType;
|
||||
}
|
||||
|
@ -495,6 +438,10 @@ public class TamableFoxes extends JavaPlugin implements Listener {
|
|||
return foxUUIDs;
|
||||
}
|
||||
|
||||
public List<EntityTamableFox> getSpawnedFoxes() {
|
||||
return spawnedFoxes;
|
||||
}
|
||||
|
||||
public static String getPrefix() {
|
||||
//return ChatColor.translateAlternateColorCodes('&', (String) config.get("prefix"));
|
||||
return ChatColor.RED + "[Tamable Foxes] ";
|
||||
|
@ -509,7 +456,7 @@ public class TamableFoxes extends JavaPlugin implements Listener {
|
|||
}
|
||||
|
||||
public boolean isTamedAttackRabbitChicken() {
|
||||
return (boolean) config.get("tamed-behavior.no-attack-chicken-rabbit");
|
||||
return (boolean) config.get("tamed-behavior.attack-chicken-rabbit");
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -1,546 +0,0 @@
|
|||
package net.seanomik.tamablefoxes;
|
||||
|
||||
import com.google.common.collect.Maps;
|
||||
import com.mojang.datafixers.DataFixUtils;
|
||||
import com.mojang.datafixers.types.Type;
|
||||
import net.seanomik.tamablefoxes.command.CommandSpawnTamableFox;
|
||||
import net.seanomik.tamablefoxes.io.FileManager;
|
||||
import net.minecraft.server.v1_15_R1.*;
|
||||
import net.seanomik.tamablefoxes.sqlite.SQLiteHandler;
|
||||
import net.seanomik.tamablefoxes.sqlite.SQLiteSetterGetter;
|
||||
import net.wesjd.anvilgui.AnvilGUI;
|
||||
import org.bukkit.Chunk;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.Particle;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.*;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
import org.bukkit.craftbukkit.v1_15_R1.CraftWorld;
|
||||
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
|
||||
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftFox;
|
||||
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
|
||||
import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Fox;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.entity.CreatureSpawnEvent;
|
||||
import org.bukkit.event.entity.EntityDeathEvent;
|
||||
import org.bukkit.event.player.*;
|
||||
import org.bukkit.event.world.ChunkLoadEvent;
|
||||
import org.bukkit.inventory.EquipmentSlot;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.inventory.meta.ItemMeta;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
// @TODO: Add language.yml
|
||||
|
||||
public class TamableFoxes extends JavaPlugin implements Listener {
|
||||
|
||||
public static final String ITEM_INSPECTOR_LORE = ChatColor.BLUE + "Tamable Fox Inspector";
|
||||
public static final String TAG_TAME_FOX = "tameablefox";
|
||||
|
||||
private FileManager fileManager = new FileManager(this);
|
||||
|
||||
private Map<UUID, UUID> foxUUIDs = Maps.newHashMap(); // FoxUUID, OwnerUUID
|
||||
private EntityTypes customType;
|
||||
private boolean isOnLoad = true;
|
||||
private Map<UUID, Entity> lookupCache = Maps.newHashMap();
|
||||
private List<EntityTamableFox> spawnedFoxes;
|
||||
private FileManager.Config config;//, configFoxes;
|
||||
public static SQLiteHandler sqLiteHandler = new SQLiteHandler();
|
||||
public static SQLiteSetterGetter sqLiteSetterGetter = new SQLiteSetterGetter();
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
String version = Bukkit.getServer().getClass().getPackage().getName();
|
||||
if (!version.equals("org.bukkit.craftbukkit.v1_15_R1")) {
|
||||
Bukkit.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This plugin version only supports 1.15.1!");
|
||||
getServer().getPluginManager().disablePlugin(this);
|
||||
return;
|
||||
}
|
||||
|
||||
sqLiteHandler.connect();
|
||||
sqLiteSetterGetter.createTablesIfNotExist();
|
||||
|
||||
this.config = fileManager.getConfig("config.yml");
|
||||
this.config.copyDefaults(true).save();
|
||||
/*this.configFoxes = fileManager.getConfig("foxes.yml");
|
||||
this.configFoxes.copyDefaults(true).save();*/
|
||||
|
||||
this.getServer().getPluginManager().registerEvents(this, this);
|
||||
this.getCommand("spawntamablefox").setExecutor(new CommandSpawnTamableFox(this));
|
||||
|
||||
final Map<String, Type<?>> types = (Map<String, Type<?>>) DataConverterRegistry.a()
|
||||
.getSchema(DataFixUtils.makeKey(SharedConstants.getGameVersion().getWorldVersion()))
|
||||
.findChoiceType(DataConverterTypes.ENTITY).types();
|
||||
types.put("minecraft:" + TAG_TAME_FOX, types.get("minecraft:fox"));
|
||||
|
||||
EntityTypes.a<net.minecraft.server.v1_15_R1.Entity> a = EntityTypes.a.a((entityTypes, world) ->
|
||||
new EntityTamableFox(this, entityTypes, world), EnumCreatureType.AMBIENT);
|
||||
customType = IRegistry.a(IRegistry.ENTITY_TYPE, "tameablefox", a.a("tameablefox"));
|
||||
|
||||
this.replaceFoxesOnLoad();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisable() {
|
||||
try {
|
||||
for (EntityTamableFox fox : spawnedFoxes) {
|
||||
sqLiteSetterGetter.saveFox(fox);
|
||||
|
||||
fox.getBukkitEntity().remove();
|
||||
}
|
||||
|
||||
getServer().getConsoleSender().sendMessage(getPrefix() + ChatColor.GREEN + "Saved all foxes successfully!");
|
||||
} catch (Exception e) {
|
||||
getServer().getConsoleSender().sendMessage(getPrefix() + ChatColor.RED + "Failed to save foxes!");
|
||||
}
|
||||
}
|
||||
|
||||
private void replaceFoxesOnLoad() {
|
||||
/*int amountReplaced = 0;
|
||||
|
||||
for (World world : Bukkit.getWorlds()) {
|
||||
Chunk[] loadedChunks = world.getLoadedChunks();
|
||||
for (Chunk chunk : loadedChunks) {
|
||||
Entity[] entities = chunk.getEntities();
|
||||
for (Entity entity : entities) {
|
||||
if (!(entity instanceof Fox))
|
||||
continue;
|
||||
if (this.isTamableFox(entity))
|
||||
continue;
|
||||
EntityTamableFox tamableFox = (EntityTamableFox) spawnTamableFox(entity.getLocation(), ((CraftFox) entity).getHandle().getFoxType());
|
||||
|
||||
//final YamlConfiguration configuration = configFoxes.get();
|
||||
// get living entity data
|
||||
if (configuration.isConfigurationSection("Foxes." + entity.getUniqueId())) {
|
||||
String owner = configuration.getString("Foxes." + entity.getUniqueId() + ".owner");
|
||||
|
||||
// make new data
|
||||
if (owner.equals("none")) {
|
||||
foxUUIDs.replace(tamableFox.getUniqueID(), null);
|
||||
configuration.set("Foxes." + tamableFox.getUniqueID() + ".owner", "none");
|
||||
} else {
|
||||
foxUUIDs.replace(tamableFox.getUniqueID(), UUID.fromString(owner));
|
||||
tamableFox.setTamed(true);
|
||||
configuration.set("Foxes." + tamableFox.getUniqueID() + ".owner", owner);
|
||||
}
|
||||
|
||||
// set name
|
||||
if (configuration.isSet("Foxes." + entity.getUniqueId() + ".name")) {
|
||||
final String name = configuration.getString("Foxes." + entity.getUniqueId() + ".name");
|
||||
configuration.set("Foxes." + tamableFox.getUniqueID() + ".name", name);
|
||||
tamableFox.setChosenName(name);
|
||||
}
|
||||
|
||||
// delete old data
|
||||
configuration.set("Foxes." + entity.getUniqueId(), null);
|
||||
|
||||
tamableFox.setSitting(((EntityFox) ((CraftEntity) entity).getHandle()).isSitting());
|
||||
tamableFox.updateFox();
|
||||
tamableFox.setAge(((CraftFox) entity).getAge());
|
||||
ItemStack entityMouthItem = ((CraftFox) entity).getEquipment().getItemInMainHand();
|
||||
entityMouthItem.setAmount(1);
|
||||
|
||||
if (entityMouthItem.getType() != Material.AIR) {
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, CraftItemStack.asNMSCopy(entityMouthItem));
|
||||
} else {
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, new net.minecraft.server.v1_15_R1.ItemStack(Items.AIR));
|
||||
}
|
||||
|
||||
} else {
|
||||
configuration.set("Foxes." + tamableFox.getUniqueID() + ".owner", "none");
|
||||
|
||||
tamableFox.setAge(((CraftFox) entity).getAge());
|
||||
ItemStack entityMouthItem = ((CraftFox) entity).getEquipment().getItemInMainHand();
|
||||
entityMouthItem.setAmount(1);
|
||||
|
||||
if (entityMouthItem.getType() != Material.AIR) {
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, CraftItemStack.asNMSCopy(entityMouthItem));
|
||||
} else {
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, new net.minecraft.server.v1_15_R1.ItemStack(Items.AIR));
|
||||
}
|
||||
}
|
||||
|
||||
entity.remove();
|
||||
++amountReplaced;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
configFoxes.save();*/
|
||||
|
||||
spawnedFoxes = sqLiteSetterGetter.spawnFoxes();
|
||||
this.isOnLoad = false;
|
||||
}
|
||||
|
||||
public net.minecraft.server.v1_15_R1.Entity spawnTamableFox(Location location, net.minecraft.server.v1_15_R1.EntityFox.Type type) {
|
||||
WorldServer world = ((CraftWorld) location.getWorld()).getHandle();
|
||||
net.minecraft.server.v1_15_R1.Entity spawnedEntity = customType.b(world, null, null, null,
|
||||
new BlockPosition(location.getX(), location.getY(), location.getZ()), null, false, false);
|
||||
|
||||
world.addEntity(spawnedEntity);
|
||||
EntityFox fox = (EntityFox) spawnedEntity;
|
||||
fox.setFoxType(type);
|
||||
|
||||
/*configFoxes.get().set("Foxes." + spawnedEntity.getUniqueID() + ".owner", "none");
|
||||
fileManager.saveConfig("foxes.yml");*/
|
||||
|
||||
return fox;
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onChunkLoad(ChunkLoadEvent event) {
|
||||
/*if (isOnLoad)
|
||||
return;
|
||||
Chunk chunk = event.getChunk();
|
||||
Entity[] entities = chunk.getEntities();
|
||||
|
||||
for (Entity entity : entities) {
|
||||
if (entity instanceof Fox && !this.isTamableFox(entity)) {
|
||||
EntityTamableFox tamableFox = (EntityTamableFox) spawnTamableFox(entity.getLocation(), ((CraftFox) entity).getHandle().getFoxType());
|
||||
final YamlConfiguration configuration = configFoxes.get();
|
||||
// if has data
|
||||
if (configuration.isConfigurationSection("Foxes." + entity.getUniqueId())) {
|
||||
String owner = configuration.getString("Foxes." + entity.getUniqueId() + ".owner", "none");
|
||||
|
||||
// if has owner
|
||||
if (!owner.equals("none")) {
|
||||
foxUUIDs.replace(tamableFox.getUniqueID(), UUID.fromString(owner));
|
||||
configuration.set("Foxes." + tamableFox.getUniqueID() + ".owner", owner);
|
||||
|
||||
// set name
|
||||
if (configuration.isSet("Foxes." + entity.getUniqueId() + ".name")) {
|
||||
String name = configuration.getString("Foxes." + entity.getUniqueId() + ".name");
|
||||
|
||||
configuration.set("Foxes." + tamableFox.getUniqueID() + ".name", name);
|
||||
tamableFox.setChosenName(name);
|
||||
}
|
||||
|
||||
// remove old data
|
||||
configuration.set("Foxes." + entity.getUniqueId(), null);
|
||||
|
||||
tamableFox.setTamed(true);
|
||||
tamableFox.setSitting(((EntityFox) ((CraftEntity) entity).getHandle()).isSitting());
|
||||
tamableFox.updateFox();
|
||||
tamableFox.setAge(((CraftFox) entity).getAge());
|
||||
ItemStack entityMouthItem = ((CraftFox) entity).getEquipment().getItemInMainHand();
|
||||
if (entityMouthItem.getType() != Material.AIR) {
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, CraftItemStack.asNMSCopy(new ItemStack(entityMouthItem.getType(), 1)));
|
||||
} else {
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, new net.minecraft.server.v1_15_R1.ItemStack(Items.AIR));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
configuration.set("Foxes." + tamableFox.getUniqueID() + ".owner", "none");
|
||||
|
||||
tamableFox.setAge(((CraftFox) entity).getAge());
|
||||
ItemStack entityMouthItem = ((CraftFox) entity).getEquipment().getItemInMainHand();
|
||||
if (entityMouthItem.getType() != Material.AIR) {
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, CraftItemStack.asNMSCopy(new ItemStack(entityMouthItem.getType(), 1)));
|
||||
} else {
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, new net.minecraft.server.v1_15_R1.ItemStack(Items.AIR));
|
||||
}
|
||||
}
|
||||
|
||||
entity.remove();
|
||||
}
|
||||
}*/
|
||||
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerJoin(PlayerJoinEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
|
||||
getFoxesOf(player).forEach(uuid -> {
|
||||
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) this.getEntityByUniqueId(uuid)).getHandle();
|
||||
tamableFox.setOwner(((CraftPlayer) player).getHandle());
|
||||
tamableFox.setTamed(true);
|
||||
foxUUIDs.replace(tamableFox.getUniqueID(), player.getUniqueId());
|
||||
});
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerInteractEntityEvent(PlayerInteractEntityEvent event) {
|
||||
Entity entity = event.getRightClicked();
|
||||
Player player = event.getPlayer();
|
||||
|
||||
if (event.getHand() != EquipmentSlot.HAND)
|
||||
return;
|
||||
|
||||
final ItemStack playerHand = player.getInventory().getItemInMainHand();
|
||||
ItemMeta itemMeta = playerHand.getItemMeta();
|
||||
|
||||
if (itemMeta != null && playerHand.getType() == Material.REDSTONE_TORCH
|
||||
&& itemMeta.hasLore() && itemMeta.getLore().contains(ITEM_INSPECTOR_LORE)) {
|
||||
List<String> lore;
|
||||
|
||||
if (!this.isTamableFox(entity)) {
|
||||
lore = Arrays.asList(ITEM_INSPECTOR_LORE,
|
||||
"UUID: " + entity.getUniqueId(),
|
||||
"Entity ID: " + entity.getEntityId());
|
||||
} else {
|
||||
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) entity).getHandle();
|
||||
|
||||
if (tamableFox.getOwner() == null) {
|
||||
lore = Arrays.asList(ITEM_INSPECTOR_LORE,
|
||||
"UUID: " + entity.getUniqueId(),
|
||||
"Entity ID: " + entity.getEntityId(),
|
||||
"Tamable",
|
||||
"Owner: None");
|
||||
} else {
|
||||
lore = Arrays.asList(ITEM_INSPECTOR_LORE,
|
||||
"UUID: " + entity.getUniqueId(),
|
||||
"Entity ID: " + entity.getEntityId(),
|
||||
"Tamable",
|
||||
"Owner: " + tamableFox.getOwner().getName());
|
||||
}
|
||||
}
|
||||
|
||||
// update item
|
||||
itemMeta.setLore(lore);
|
||||
playerHand.setItemMeta(itemMeta);
|
||||
player.getInventory().setItemInMainHand(playerHand);
|
||||
|
||||
event.setCancelled(true);
|
||||
player.sendMessage(getPrefix() + "Inspected Entity.");
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.isTamableFox(entity)) {
|
||||
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) entity).getHandle();
|
||||
|
||||
if (tamableFox.isTamed() && tamableFox.getOwner() != null &&
|
||||
playerHand.getType() != Material.SWEET_BERRIES) {
|
||||
// if this fox is theirs
|
||||
if (foxUUIDs.get(entity.getUniqueId()).equals(player.getUniqueId())) {
|
||||
if (player.isSneaking()) {
|
||||
net.minecraft.server.v1_15_R1.ItemStack wolfHolding = tamableFox.getEquipment(EnumItemSlot.MAINHAND);
|
||||
net.minecraft.server.v1_15_R1.ItemStack playerItemInHandNMS;
|
||||
if (wolfHolding.isEmpty()) {
|
||||
if (playerHand.getType() == Material.AIR) {
|
||||
return;
|
||||
}
|
||||
|
||||
playerItemInHandNMS = CraftItemStack.asNMSCopy(playerHand);
|
||||
playerItemInHandNMS.setCount(1);
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, playerItemInHandNMS);
|
||||
playerHand.setAmount(playerHand.getAmount() - 1);
|
||||
player.getInventory().setItemInMainHand(playerHand);
|
||||
} else if (playerHand.getType() == Material.AIR) {
|
||||
entity.getWorld().dropItem(tamableFox.getBukkitEntity().getLocation().add(0.0D, 0.2D, 0.0D),
|
||||
CraftItemStack.asBukkitCopy(wolfHolding));
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, new net.minecraft.server.v1_15_R1.ItemStack(Items.AIR));
|
||||
} else {
|
||||
playerItemInHandNMS = CraftItemStack.asNMSCopy(playerHand);
|
||||
entity.getWorld().dropItem(tamableFox.getBukkitEntity().getLocation().add(0.0D, 0.2D, 0.0D),
|
||||
CraftItemStack.asBukkitCopy(wolfHolding));
|
||||
playerItemInHandNMS.setCount(1);
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, playerItemInHandNMS);
|
||||
playerHand.setAmount(playerHand.getAmount() - 1);
|
||||
player.getInventory().setItemInMainHand(playerHand);
|
||||
}
|
||||
} else if (playerHand.getType() == Material.NAME_TAG) {
|
||||
ItemMeta handMeta = playerHand.getItemMeta();
|
||||
tamableFox.setChosenName(handMeta.getDisplayName());
|
||||
} else {
|
||||
tamableFox.toggleSitting();
|
||||
}
|
||||
|
||||
event.setCancelled(true);
|
||||
}
|
||||
} else if (playerHand.getType() == Material.CHICKEN) {
|
||||
if (Math.random() < 0.33D) {
|
||||
tamableFox.setTamed(true);
|
||||
tamableFox.setOwner(((CraftPlayer) player).getHandle());
|
||||
foxUUIDs.replace(tamableFox.getUniqueID(), null, player.getUniqueId());
|
||||
player.getWorld().spawnParticle(Particle.HEART, entity.getLocation(), 6, 0.5D, 0.5D, 0.5D);
|
||||
|
||||
// Name process
|
||||
player.sendMessage(ChatColor.RED + ChatColor.BOLD.toString() + "You just tamed a wild fox!");
|
||||
player.sendMessage(ChatColor.RED + "What do you want to call it?");
|
||||
tamableFox.setChosenName("???");
|
||||
|
||||
new AnvilGUI.Builder()
|
||||
.onComplete((plr, text) -> { // Called when the inventory output slot is clicked
|
||||
if(!text.equals("")) {
|
||||
tamableFox.setChosenName(text);
|
||||
plr.sendMessage(getPrefix() + ChatColor.GREEN + text + " is perfect!");
|
||||
}
|
||||
|
||||
return AnvilGUI.Response.close();
|
||||
})
|
||||
//.preventClose() // Prevents the inventory from being closed
|
||||
.text("Fox name") // Sets the text the GUI should start with
|
||||
.plugin(this) // Set the plugin instance
|
||||
.open(player); // Opens the GUI for the player provided
|
||||
|
||||
} else {
|
||||
player.getWorld().spawnParticle(Particle.SMOKE_NORMAL, entity.getLocation(), 10, 0.3D, 0.3D, 0.3D, 0.15D);
|
||||
}
|
||||
|
||||
if (!player.getGameMode().equals(GameMode.CREATIVE)) {
|
||||
playerHand.setAmount(playerHand.getAmount() - 1);
|
||||
}
|
||||
|
||||
event.setCancelled(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerBedEnterEvent(PlayerBedEnterEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
List<UUID> dogsToSleep = getFoxesOf(player);
|
||||
|
||||
for (UUID uuid : dogsToSleep) {
|
||||
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftFox) this.getEntityByUniqueId(uuid)).getHandle();
|
||||
if (player.getWorld().getTime() > 12541L && player.getWorld().getTime() < 23460L) {
|
||||
tamableFox.setSleeping(true);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerBedLeaveEvent(PlayerBedLeaveEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
final List<UUID> foxesOf = getFoxesOf(player);
|
||||
|
||||
for (UUID uuid : foxesOf) {
|
||||
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftFox) this.getEntityByUniqueId(uuid)).getHandle();
|
||||
tamableFox.setSleeping(false);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onCreatureSpawnEvent(CreatureSpawnEvent event) {
|
||||
org.bukkit.entity.Entity entity = event.getEntity();
|
||||
if (entity instanceof Fox && !this.isTamableFox(entity)) {
|
||||
net.minecraft.server.v1_15_R1.EntityFox.Type foxType = ((EntityFox) ((CraftEntity) entity).getHandle()).getFoxType();
|
||||
spawnTamableFox(entity.getLocation(), foxType);
|
||||
event.setCancelled(true);
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onEntityDeathEvent(EntityDeathEvent event) {
|
||||
Entity entity = event.getEntity();
|
||||
if (!this.isTamableFox(entity)) {
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
// Remove the fox from storage
|
||||
lookupCache.remove(entity.getUniqueId());
|
||||
foxUUIDs.remove(entity.getUniqueId());
|
||||
spawnedFoxes.remove(entity.getUniqueId());
|
||||
|
||||
//sqLiteSetterGetter.removeFox();
|
||||
|
||||
|
||||
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) entity).getHandle();
|
||||
|
||||
if (tamableFox.getOwner() != null) {
|
||||
Player owner = ((EntityPlayer)tamableFox.getOwner()).getBukkitEntity();
|
||||
owner.sendMessage(getPrefix() + ChatColor.RED + tamableFox.getChosenName() + " was killed!");
|
||||
}
|
||||
|
||||
sqLiteSetterGetter.removeFox(tamableFox);
|
||||
|
||||
/*if (configFoxes.get().getConfigurationSection("Foxes").contains(entity.getUniqueId().toString())) {
|
||||
*//*EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) entity).getHandle();
|
||||
if (tamableFox.getOwner() != null && tamableFox.getOwner() instanceof Player) {
|
||||
Player owner = (Player) tamableFox.getOwner();
|
||||
owner.sendMessage(getPrefix() + ChatColor.RED + tamableFox.getChosenName() + " was killed!");
|
||||
}*//*
|
||||
|
||||
configFoxes.get().set("Foxes." + entity.getUniqueId(), null);
|
||||
fileManager.saveConfig("foxes.yml");
|
||||
}*/
|
||||
}
|
||||
|
||||
public Entity getEntityByUniqueId(UUID uniqueId) {
|
||||
final Entity cacheEntity = lookupCache.get(uniqueId);
|
||||
if (cacheEntity != null) {
|
||||
if (cacheEntity.isDead())
|
||||
lookupCache.remove(uniqueId);
|
||||
else return cacheEntity;
|
||||
}
|
||||
|
||||
for (World world : Bukkit.getWorlds()) {
|
||||
for (Chunk loadedChunk : world.getLoadedChunks()) {
|
||||
for (Entity entity : loadedChunk.getEntities()) {
|
||||
if (entity.getUniqueId().equals(uniqueId)) {
|
||||
this.lookupCache.put(uniqueId, entity);
|
||||
return entity;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public boolean isTamableFox(org.bukkit.entity.Entity entity) {
|
||||
return ((CraftEntity) entity).getHandle().getClass().getName().contains("TamableFox")
|
||||
|| ((CraftEntity) entity).getHandle() instanceof EntityTamableFox;
|
||||
}
|
||||
|
||||
public List<UUID> getFoxesOf(Player player) {
|
||||
return foxUUIDs.entrySet().stream().filter(foxPlayer -> foxPlayer.getValue() != null && foxPlayer.getValue().equals(player.getUniqueId()))
|
||||
.map(Map.Entry::getKey).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
public FileManager getFileManager() {
|
||||
return fileManager;
|
||||
}
|
||||
|
||||
public FileManager.Config getMainConfig() {
|
||||
return config;
|
||||
}
|
||||
|
||||
/*public FileManager.Config getConfigFoxes() {
|
||||
return configFoxes;
|
||||
}*/
|
||||
|
||||
public EntityTypes getCustomType() {
|
||||
return customType;
|
||||
}
|
||||
|
||||
public Map<UUID, UUID> getFoxUUIDs() {
|
||||
return foxUUIDs;
|
||||
}
|
||||
|
||||
public List<EntityTamableFox> getSpawnedFoxes() {
|
||||
return spawnedFoxes;
|
||||
}
|
||||
|
||||
public static String getPrefix() {
|
||||
//return ChatColor.translateAlternateColorCodes('&', (String) config.get("prefix"));
|
||||
return ChatColor.RED + "[Tamable Foxes] ";
|
||||
}
|
||||
|
||||
public boolean isShowOwnerFoxName() {
|
||||
return (boolean) config.get("show-owner-in-fox-name");
|
||||
}
|
||||
|
||||
public boolean isShowNameTags() {
|
||||
return (boolean) config.get("show-nametags");
|
||||
}
|
||||
|
||||
public boolean isTamedAttackRabbitChicken() {
|
||||
return (boolean) config.get("tamed-behavior.no-attack-chicken-rabbit");
|
||||
}
|
||||
|
||||
}
|
|
@ -1,515 +0,0 @@
|
|||
package net.seanomilk.tamablefoxes;
|
||||
|
||||
import com.google.common.collect.Maps;
|
||||
import com.mojang.datafixers.DataFixUtils;
|
||||
import com.mojang.datafixers.types.Type;
|
||||
import net.seanomilk.tamablefoxes.command.CommandSpawnTamableFox;
|
||||
import net.seanomilk.tamablefoxes.io.FileManager;
|
||||
import net.minecraft.server.v1_15_R1.*;
|
||||
import net.wesjd.anvilgui.AnvilGUI;
|
||||
import org.bukkit.Chunk;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.Particle;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.*;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
import org.bukkit.craftbukkit.v1_15_R1.CraftWorld;
|
||||
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
|
||||
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftFox;
|
||||
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftItem;
|
||||
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
|
||||
import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.EntityType;
|
||||
import org.bukkit.entity.Fox;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.entity.CreatureSpawnEvent;
|
||||
import org.bukkit.event.entity.EntityDeathEvent;
|
||||
import org.bukkit.event.player.*;
|
||||
import org.bukkit.event.world.ChunkLoadEvent;
|
||||
import org.bukkit.inventory.EquipmentSlot;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.inventory.meta.ItemMeta;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class TamableFoxes extends JavaPlugin implements Listener {
|
||||
|
||||
public static final String ITEM_INSPECTOR_LORE = ChatColor.BLUE + "Tamable Fox Inspector";
|
||||
public static final String TAG_TAME_FOX = "tameablefox";
|
||||
|
||||
private FileManager fileManager;
|
||||
|
||||
private Map<UUID, UUID> foxUUIDs;
|
||||
private EntityTypes customType;
|
||||
|
||||
private boolean isOnLoad = true;
|
||||
|
||||
private Map<UUID, Entity> lookupCache;
|
||||
|
||||
private FileManager.Config config, configFoxes;
|
||||
|
||||
private Map<Player, UUID> waitingName;
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
String version = Bukkit.getServer().getClass().getPackage().getName();
|
||||
if (!version.equals("org.bukkit.craftbukkit.v1_15_R1")) {
|
||||
Bukkit.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This plugin version only supports 1.15.1!");
|
||||
getServer().getPluginManager().disablePlugin(this);
|
||||
return;
|
||||
}
|
||||
|
||||
fileManager = new FileManager(this);
|
||||
this.config = fileManager.getConfig("config.yml");
|
||||
this.config.copyDefaults(true).save();
|
||||
this.configFoxes = fileManager.getConfig("foxes.yml");
|
||||
this.configFoxes.copyDefaults(true).save();
|
||||
|
||||
this.getServer().getPluginManager().registerEvents(this, this);
|
||||
this.getCommand("spawntamablefox").setExecutor(new CommandSpawnTamableFox(this));
|
||||
|
||||
this.foxUUIDs = Maps.newHashMap();
|
||||
this.lookupCache = Maps.newHashMap();
|
||||
this.waitingName = Maps.newHashMap();
|
||||
|
||||
final Map<String, Type<?>> types = (Map<String, Type<?>>) DataConverterRegistry.a()
|
||||
.getSchema(DataFixUtils.makeKey(SharedConstants.getGameVersion().getWorldVersion()))
|
||||
.findChoiceType(DataConverterTypes.ENTITY).types();
|
||||
types.put("minecraft:" + TAG_TAME_FOX, types.get("minecraft:fox"));
|
||||
|
||||
EntityTypes.a<net.minecraft.server.v1_15_R1.Entity> a = EntityTypes.a.a((entityTypes, world) ->
|
||||
new EntityTamableFox(this, entityTypes, world), EnumCreatureType.AMBIENT);
|
||||
customType = IRegistry.a(IRegistry.ENTITY_TYPE, "tameablefox", a.a("tameablefox"));
|
||||
|
||||
this.replaceFoxesOnLoad();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisable() {
|
||||
|
||||
}
|
||||
|
||||
private void replaceFoxesOnLoad() {
|
||||
int amountReplaced = 0;
|
||||
|
||||
for (World world : Bukkit.getWorlds()) {
|
||||
Chunk[] loadedChunks = world.getLoadedChunks();
|
||||
for (Chunk chunk : loadedChunks) {
|
||||
Entity[] entities = chunk.getEntities();
|
||||
for (Entity entity : entities) {
|
||||
if (!(entity instanceof Fox))
|
||||
continue;
|
||||
if (this.isTamableFox(entity))
|
||||
continue;
|
||||
EntityTamableFox tamableFox = (EntityTamableFox) spawnTamableFox(entity.getLocation(), ((CraftFox) entity).getHandle().getFoxType());
|
||||
|
||||
final YamlConfiguration configuration = configFoxes.get();
|
||||
// get living entity data
|
||||
if (configuration.isConfigurationSection("Foxes." + entity.getUniqueId())) {
|
||||
String owner = configuration.getString("Foxes." + entity.getUniqueId() + ".owner");
|
||||
|
||||
// make new data
|
||||
if (owner.equals("none")) {
|
||||
foxUUIDs.replace(tamableFox.getUniqueID(), null);
|
||||
configuration.set("Foxes." + tamableFox.getUniqueID() + ".owner", "none");
|
||||
} else {
|
||||
foxUUIDs.replace(tamableFox.getUniqueID(), UUID.fromString(owner));
|
||||
tamableFox.setTamed(true);
|
||||
configuration.set("Foxes." + tamableFox.getUniqueID() + ".owner", owner);
|
||||
}
|
||||
|
||||
// set name
|
||||
if (configuration.isSet("Foxes." + entity.getUniqueId() + ".name")) {
|
||||
final String name = configuration.getString("Foxes." + entity.getUniqueId() + ".name");
|
||||
configuration.set("Foxes." + tamableFox.getUniqueID() + ".name", name);
|
||||
tamableFox.setChosenName(name);
|
||||
}
|
||||
|
||||
// delete old data
|
||||
configuration.set("Foxes." + entity.getUniqueId(), null);
|
||||
|
||||
tamableFox.setSitting(((EntityFox) ((CraftEntity) entity).getHandle()).isSitting());
|
||||
tamableFox.updateFox();
|
||||
tamableFox.setAge(((CraftFox) entity).getAge());
|
||||
ItemStack entityMouthItem = ((CraftFox) entity).getEquipment().getItemInMainHand();
|
||||
if (entityMouthItem.getType() != Material.AIR) {
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, CraftItemStack.asNMSCopy(new ItemStack(entityMouthItem.getType(), 1)));
|
||||
} else {
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, new net.minecraft.server.v1_15_R1.ItemStack(Items.AIR));
|
||||
}
|
||||
|
||||
} else {
|
||||
configuration.set("Foxes." + tamableFox.getUniqueID() + ".owner", "none");
|
||||
|
||||
tamableFox.setAge(((CraftFox) entity).getAge());
|
||||
ItemStack entityMouthItem = ((CraftFox) entity).getEquipment().getItemInMainHand();
|
||||
if (entityMouthItem.getType() != Material.AIR) {
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, CraftItemStack.asNMSCopy(new ItemStack(entityMouthItem.getType(), 1)));
|
||||
} else {
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, new net.minecraft.server.v1_15_R1.ItemStack(Items.AIR));
|
||||
}
|
||||
}
|
||||
|
||||
entity.remove();
|
||||
++amountReplaced;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
configFoxes.save();
|
||||
this.isOnLoad = false;
|
||||
}
|
||||
|
||||
public net.minecraft.server.v1_15_R1.Entity spawnTamableFox(Location location, net.minecraft.server.v1_15_R1.EntityFox.Type type) {
|
||||
WorldServer world = ((CraftWorld) location.getWorld()).getHandle();
|
||||
net.minecraft.server.v1_15_R1.Entity spawnedEntity = customType.b(world, null, null, null,
|
||||
new BlockPosition(location.getX(), location.getY(), location.getZ()), null, false, false);
|
||||
|
||||
world.addEntity(spawnedEntity);
|
||||
EntityFox fox = (EntityFox) spawnedEntity;
|
||||
fox.setFoxType(type);
|
||||
|
||||
configFoxes.get().set("Foxes." + spawnedEntity.getUniqueID() + ".owner", "none");
|
||||
fileManager.saveConfig("foxes.yml");
|
||||
|
||||
return fox;
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onChunkLoad(ChunkLoadEvent event) {
|
||||
if (isOnLoad)
|
||||
return;
|
||||
Chunk chunk = event.getChunk();
|
||||
Entity[] entities = chunk.getEntities();
|
||||
|
||||
for (Entity entity : entities) {
|
||||
if (entity instanceof Fox && !this.isTamableFox(entity)) {
|
||||
EntityTamableFox tamableFox = (EntityTamableFox) spawnTamableFox(entity.getLocation(), ((CraftFox) entity).getHandle().getFoxType());
|
||||
final YamlConfiguration configuration = configFoxes.get();
|
||||
// if has data
|
||||
if (configuration.isConfigurationSection("Foxes." + entity.getUniqueId())) {
|
||||
String owner = configuration.getString("Foxes." + entity.getUniqueId() + ".owner", "none");
|
||||
|
||||
// if has owner
|
||||
if (!owner.equals("none")) {
|
||||
foxUUIDs.replace(tamableFox.getUniqueID(), UUID.fromString(owner));
|
||||
configuration.set("Foxes." + tamableFox.getUniqueID() + ".owner", owner);
|
||||
|
||||
// set name
|
||||
if (configuration.isSet("Foxes." + entity.getUniqueId() + ".name")) {
|
||||
String name = configuration.getString("Foxes." + entity.getUniqueId() + ".name");
|
||||
|
||||
configuration.set("Foxes." + tamableFox.getUniqueID() + ".name", name);
|
||||
tamableFox.setChosenName(name);
|
||||
}
|
||||
|
||||
// remove old data
|
||||
configuration.set("Foxes." + entity.getUniqueId(), null);
|
||||
|
||||
tamableFox.setTamed(true);
|
||||
tamableFox.setSitting(((EntityFox) ((CraftEntity) entity).getHandle()).isSitting());
|
||||
tamableFox.updateFox();
|
||||
tamableFox.setAge(((CraftFox) entity).getAge());
|
||||
ItemStack entityMouthItem = ((CraftFox) entity).getEquipment().getItemInMainHand();
|
||||
if (entityMouthItem.getType() != Material.AIR) {
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, CraftItemStack.asNMSCopy(new ItemStack(entityMouthItem.getType(), 1)));
|
||||
} else {
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, new net.minecraft.server.v1_15_R1.ItemStack(Items.AIR));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
configuration.set("Foxes." + tamableFox.getUniqueID() + ".owner", "none");
|
||||
|
||||
tamableFox.setAge(((CraftFox) entity).getAge());
|
||||
ItemStack entityMouthItem = ((CraftFox) entity).getEquipment().getItemInMainHand();
|
||||
if (entityMouthItem.getType() != Material.AIR) {
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, CraftItemStack.asNMSCopy(new ItemStack(entityMouthItem.getType(), 1)));
|
||||
} else {
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, new net.minecraft.server.v1_15_R1.ItemStack(Items.AIR));
|
||||
}
|
||||
}
|
||||
|
||||
entity.remove();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerJoin(PlayerJoinEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
|
||||
getFoxesOf(player).forEach(uuid -> {
|
||||
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) this.getEntityByUniqueId(uuid)).getHandle();
|
||||
tamableFox.setOwner(((CraftPlayer) player).getHandle());
|
||||
tamableFox.setTamed(true);
|
||||
foxUUIDs.replace(tamableFox.getUniqueID(), player.getUniqueId());
|
||||
});
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerInteractEntityEvent(PlayerInteractEntityEvent event) {
|
||||
Entity entity = event.getRightClicked();
|
||||
Player player = event.getPlayer();
|
||||
|
||||
if (event.getHand() != EquipmentSlot.HAND)
|
||||
return;
|
||||
|
||||
final ItemStack playerHand = player.getInventory().getItemInMainHand();
|
||||
ItemMeta itemMeta = playerHand.getItemMeta();
|
||||
|
||||
if (itemMeta != null && playerHand.getType() == Material.REDSTONE_TORCH
|
||||
&& itemMeta.hasLore() && itemMeta.getLore().contains(ITEM_INSPECTOR_LORE)) {
|
||||
List<String> lore;
|
||||
|
||||
if (!this.isTamableFox(entity)) {
|
||||
lore = Arrays.asList(ITEM_INSPECTOR_LORE,
|
||||
"UUID: " + entity.getUniqueId(),
|
||||
"Entity ID: " + entity.getEntityId());
|
||||
} else {
|
||||
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) entity).getHandle();
|
||||
|
||||
if (tamableFox.getOwner() == null) {
|
||||
lore = Arrays.asList(ITEM_INSPECTOR_LORE,
|
||||
"UUID: " + entity.getUniqueId(),
|
||||
"Entity ID: " + entity.getEntityId(),
|
||||
"Tamable",
|
||||
"Owner: None");
|
||||
} else {
|
||||
lore = Arrays.asList(ITEM_INSPECTOR_LORE,
|
||||
"UUID: " + entity.getUniqueId(),
|
||||
"Entity ID: " + entity.getEntityId(),
|
||||
"Tamable",
|
||||
"Owner: " + tamableFox.getOwner().getName());
|
||||
}
|
||||
}
|
||||
|
||||
// update item
|
||||
itemMeta.setLore(lore);
|
||||
playerHand.setItemMeta(itemMeta);
|
||||
player.getInventory().setItemInMainHand(playerHand);
|
||||
|
||||
event.setCancelled(true);
|
||||
player.sendMessage(getPrefix() + "Inspected Entity.");
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.isTamableFox(entity)) {
|
||||
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) entity).getHandle();
|
||||
|
||||
if (tamableFox.isTamed() && tamableFox.getOwner() != null &&
|
||||
playerHand.getType() != Material.SWEET_BERRIES) {
|
||||
// if this fox is theirs
|
||||
if (foxUUIDs.get(entity.getUniqueId()).equals(player.getUniqueId())) {
|
||||
if (player.isSneaking()) {
|
||||
net.minecraft.server.v1_15_R1.ItemStack wolfHolding = tamableFox.getEquipment(EnumItemSlot.MAINHAND);
|
||||
net.minecraft.server.v1_15_R1.ItemStack playerItemInHandNMS;
|
||||
if (wolfHolding.isEmpty()) {
|
||||
if (playerHand.getType() == Material.AIR) {
|
||||
return;
|
||||
}
|
||||
|
||||
playerItemInHandNMS = CraftItemStack.asNMSCopy(playerHand);
|
||||
playerItemInHandNMS.setCount(1);
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, playerItemInHandNMS);
|
||||
playerHand.setAmount(playerHand.getAmount() - 1);
|
||||
player.getInventory().setItemInMainHand(playerHand);
|
||||
} else if (playerHand.getType() == Material.AIR) {
|
||||
entity.getWorld().dropItem(tamableFox.getBukkitEntity().getLocation().add(0.0D, 0.2D, 0.0D),
|
||||
CraftItemStack.asBukkitCopy(wolfHolding));
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, new net.minecraft.server.v1_15_R1.ItemStack(Items.AIR));
|
||||
} else {
|
||||
playerItemInHandNMS = CraftItemStack.asNMSCopy(playerHand);
|
||||
entity.getWorld().dropItem(tamableFox.getBukkitEntity().getLocation().add(0.0D, 0.2D, 0.0D),
|
||||
CraftItemStack.asBukkitCopy(wolfHolding));
|
||||
playerItemInHandNMS.setCount(1);
|
||||
tamableFox.setSlot(EnumItemSlot.MAINHAND, playerItemInHandNMS);
|
||||
playerHand.setAmount(playerHand.getAmount() - 1);
|
||||
player.getInventory().setItemInMainHand(playerHand);
|
||||
}
|
||||
} else if (playerHand.getType() == Material.NAME_TAG) {
|
||||
ItemMeta handMeta = playerHand.getItemMeta();
|
||||
tamableFox.setChosenName(handMeta.getDisplayName());
|
||||
} else {
|
||||
tamableFox.toggleSitting();
|
||||
}
|
||||
|
||||
event.setCancelled(true);
|
||||
}
|
||||
} else if (playerHand.getType() == Material.CHICKEN) {
|
||||
if (Math.random() < 0.33D) {
|
||||
tamableFox.setTamed(true);
|
||||
tamableFox.setOwner(((CraftPlayer) player).getHandle());
|
||||
foxUUIDs.replace(tamableFox.getUniqueID(), null, player.getUniqueId());
|
||||
player.getWorld().spawnParticle(Particle.HEART, entity.getLocation(), 6, 0.5D, 0.5D, 0.5D);
|
||||
|
||||
// Name process
|
||||
player.sendMessage(ChatColor.RED + ChatColor.BOLD.toString() + "You just tamed a wild fox!");
|
||||
player.sendMessage(ChatColor.RED + "What do you want to call it?");
|
||||
tamableFox.setChosenName("???");
|
||||
|
||||
new AnvilGUI.Builder()
|
||||
.onComplete((plr, text) -> { // Called when the inventory output slot is clicked
|
||||
if(!text.equals("")) {
|
||||
tamableFox.setChosenName(text);
|
||||
plr.sendMessage(getPrefix() + ChatColor.GREEN + text + " is perfect!");
|
||||
return AnvilGUI.Response.close();
|
||||
} else {
|
||||
return AnvilGUI.Response.text("Insert a name for your fox!");
|
||||
}
|
||||
})
|
||||
.preventClose() // Prevents the inventory from being closed
|
||||
.text("Fox name") // Sets the text the GUI should start with
|
||||
.plugin(this) // Set the plugin instance
|
||||
.open(player); // Opens the GUI for the player provided
|
||||
|
||||
} else {
|
||||
player.getWorld().spawnParticle(Particle.SMOKE_NORMAL, entity.getLocation(), 10, 0.3D, 0.3D, 0.3D, 0.15D);
|
||||
}
|
||||
|
||||
if (!player.getGameMode().equals(GameMode.CREATIVE)) {
|
||||
playerHand.setAmount(playerHand.getAmount() - 1);
|
||||
}
|
||||
|
||||
event.setCancelled(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerBedEnterEvent(PlayerBedEnterEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
List<UUID> dogsToSleep = getFoxesOf(player);
|
||||
|
||||
for (UUID uuid : dogsToSleep) {
|
||||
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftFox) this.getEntityByUniqueId(uuid)).getHandle();
|
||||
if (player.getWorld().getTime() > 12541L && player.getWorld().getTime() < 23460L) {
|
||||
tamableFox.setSleeping(true);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerBedLeaveEvent(PlayerBedLeaveEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
final List<UUID> foxesOf = getFoxesOf(player);
|
||||
|
||||
for (UUID uuid : foxesOf) {
|
||||
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftFox) this.getEntityByUniqueId(uuid)).getHandle();
|
||||
tamableFox.setSleeping(false);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onCreatureSpawnEvent(CreatureSpawnEvent event) {
|
||||
org.bukkit.entity.Entity entity = event.getEntity();
|
||||
if (entity instanceof Fox && !this.isTamableFox(entity)) {
|
||||
net.minecraft.server.v1_15_R1.EntityFox.Type foxType = ((EntityFox) ((CraftEntity) entity).getHandle()).getFoxType();
|
||||
spawnTamableFox(entity.getLocation(), foxType);
|
||||
event.setCancelled(true);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public Entity getEntityByUniqueId(UUID uniqueId) {
|
||||
final Entity cacheEntity = lookupCache.get(uniqueId);
|
||||
if (cacheEntity != null) {
|
||||
if (cacheEntity.isDead())
|
||||
lookupCache.remove(uniqueId);
|
||||
else return cacheEntity;
|
||||
}
|
||||
|
||||
for (World world : Bukkit.getWorlds()) {
|
||||
for (Chunk loadedChunk : world.getLoadedChunks()) {
|
||||
for (Entity entity : loadedChunk.getEntities()) {
|
||||
if (entity.getUniqueId().equals(uniqueId)) {
|
||||
this.lookupCache.put(uniqueId, entity);
|
||||
return entity;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onEntityDeathEvent(EntityDeathEvent event) {
|
||||
Entity entity = event.getEntity();
|
||||
if (!this.isTamableFox(entity))
|
||||
return;
|
||||
this.lookupCache.remove(entity.getUniqueId());
|
||||
foxUUIDs.remove(entity.getUniqueId());
|
||||
|
||||
if (configFoxes.get().getConfigurationSection("Foxes").contains(entity.getUniqueId().toString())) {
|
||||
/*EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) entity).getHandle();
|
||||
if (tamableFox.getOwner() != null && tamableFox.getOwner() instanceof Player) {
|
||||
Player owner = (Player) tamableFox.getOwner();
|
||||
owner.sendMessage(getPrefix() + ChatColor.RED + tamableFox.getChosenName() + " was killed!");
|
||||
}*/
|
||||
|
||||
configFoxes.get().set("Foxes." + entity.getUniqueId(), null);
|
||||
fileManager.saveConfig("foxes.yml");
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isTamableFox(org.bukkit.entity.Entity entity) {
|
||||
return ((CraftEntity) entity).getHandle().getClass().getName().contains("TamableFox")
|
||||
|| ((CraftEntity) entity).getHandle() instanceof EntityTamableFox;
|
||||
}
|
||||
|
||||
public List<UUID> getFoxesOf(Player player) {
|
||||
return foxUUIDs.entrySet().stream().filter(foxPlayer -> foxPlayer.getValue() != null && foxPlayer.getValue().equals(player.getUniqueId()))
|
||||
.map(Map.Entry::getKey).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
public FileManager getFileManager() {
|
||||
return fileManager;
|
||||
}
|
||||
|
||||
public FileManager.Config getMainConfig() {
|
||||
return config;
|
||||
}
|
||||
|
||||
public FileManager.Config getConfigFoxes() {
|
||||
return configFoxes;
|
||||
}
|
||||
|
||||
public EntityTypes getCustomType() {
|
||||
return customType;
|
||||
}
|
||||
|
||||
public Map<UUID, UUID> getFoxUUIDs() {
|
||||
return foxUUIDs;
|
||||
}
|
||||
|
||||
public static String getPrefix() {
|
||||
//return ChatColor.translateAlternateColorCodes('&', (String) config.get("prefix"));
|
||||
return ChatColor.RED + "[Tamable Foxes] ";
|
||||
}
|
||||
|
||||
public boolean isShowOwnerFoxName() {
|
||||
return (boolean) config.get("show-owner-in-fox-name");
|
||||
}
|
||||
|
||||
public boolean isShowNameTags() {
|
||||
return (boolean) config.get("show-nametags");
|
||||
}
|
||||
|
||||
public boolean isTamedAttackRabbitChicken() {
|
||||
return (boolean) config.get("tamed-behavior.no-attack-chicken-rabbit");
|
||||
}
|
||||
|
||||
}
|
|
@ -41,18 +41,26 @@ public class CommandSpawnTamableFox implements TabExecutor {
|
|||
if (args.length != 0) {
|
||||
switch (args[0]) {
|
||||
case "red":
|
||||
EntityTamableFox fox = (EntityTamableFox) plugin.spawnTamableFox(player.getLocation(), EntityFox.Type.RED);
|
||||
plugin.getSpawnedFoxes().add(fox);
|
||||
plugin.sqLiteSetterGetter.saveFox(fox);
|
||||
try {
|
||||
EntityTamableFox fox = (EntityTamableFox) plugin.spawnTamableFox(player.getLocation(), EntityFox.Type.RED);
|
||||
plugin.getSpawnedFoxes().add(fox);
|
||||
plugin.sqLiteSetterGetter.saveFox(fox);
|
||||
|
||||
player.sendMessage(plugin.getPrefix() + ChatColor.RESET + "Spawned a " + ChatColor.RED + "Red" + ChatColor.WHITE + " fox.");
|
||||
player.sendMessage(plugin.getPrefix() + ChatColor.RESET + "Spawned a " + ChatColor.RED + "Red" + ChatColor.WHITE + " fox.");
|
||||
} catch (Exception e) {
|
||||
player.sendMessage(plugin.getPrefix() + ChatColor.RED + "Failed to spawn fox, check console!");
|
||||
}
|
||||
break;
|
||||
case "snow":
|
||||
EntityTamableFox spawnedFox = (EntityTamableFox) plugin.spawnTamableFox(player.getLocation(), EntityFox.Type.SNOW);
|
||||
plugin.getSpawnedFoxes().add(spawnedFox);
|
||||
plugin.sqLiteSetterGetter.saveFox(spawnedFox);
|
||||
try {
|
||||
EntityTamableFox spawnedFox = (EntityTamableFox) plugin.spawnTamableFox(player.getLocation(), EntityFox.Type.SNOW);
|
||||
plugin.getSpawnedFoxes().add(spawnedFox);
|
||||
plugin.sqLiteSetterGetter.saveFox(spawnedFox);
|
||||
|
||||
player.sendMessage(plugin.getPrefix() + ChatColor.RESET + "Spawned a " + ChatColor.AQUA + "Snow" + ChatColor.WHITE + " fox.");
|
||||
player.sendMessage(plugin.getPrefix() + ChatColor.RESET + "Spawned a " + ChatColor.AQUA + "Snow" + ChatColor.WHITE + " fox.");
|
||||
} catch (Exception e) {
|
||||
player.sendMessage(plugin.getPrefix() + ChatColor.RED + "Failed to spawn fox, check console!");
|
||||
}
|
||||
break;
|
||||
case "verbose":
|
||||
player.sendMessage(plugin.getFoxUUIDs().toString());
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
package net.seanomik.tamablefoxes.sqllite;
|
||||
package net.seanomik.tamablefoxes.sqlite;
|
||||
|
||||
import net.seanomik.tamablefoxes.TamableFoxes;
|
||||
import org.bukkit.Bukkit;
|
||||
|
@ -18,7 +18,7 @@ public class SQLiteHandler {
|
|||
String url = "jdbc:sqlite:" + baseLoc + "plugins/TamableFoxes/foxes.db";
|
||||
connection = DriverManager.getConnection(url);
|
||||
|
||||
Bukkit.getConsoleSender().sendMessage(TamableFoxes.getPrefix() + "Connection to SQLite has been established.");
|
||||
//Bukkit.getConsoleSender().sendMessage(TamableFoxes.getPrefix() + "Connection to SQLite has been established.");
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
|
|
@ -1,20 +1,26 @@
|
|||
package net.seanomik.tamablefoxes.sqllite;
|
||||
package net.seanomik.tamablefoxes.sqlite;
|
||||
|
||||
import net.minecraft.server.v1_15_R1.EntityFox;
|
||||
import net.minecraft.server.v1_15_R1.EnumItemSlot;
|
||||
import net.seanomik.tamablefoxes.EntityTamableFox;
|
||||
import net.seanomik.tamablefoxes.TamableFoxes;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
import org.apache.commons.lang.ObjectUtils;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.OfflinePlayer;
|
||||
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
|
||||
import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
import java.sql.DatabaseMetaData;
|
||||
import java.sql.PreparedStatement;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.*;
|
||||
|
||||
public class SQLiteSetterGetter {
|
||||
public static Plugin plugin;
|
||||
public static TamableFoxes plugin;
|
||||
public static SQLiteHandler sqLiteHandler;
|
||||
|
||||
public void createTablesIfNotExist() {
|
||||
|
@ -24,9 +30,13 @@ public class SQLiteSetterGetter {
|
|||
|
||||
String foxesTable =
|
||||
"CREATE TABLE IF NOT EXISTS `foxes` ( " +
|
||||
"`OWNER_UUID` TEXT PRIMARY KEY , " +
|
||||
"`NAME` TEXT NOT NULL , " +
|
||||
"`ID` INTEGER PRIMARY KEY AUTOINCREMENT , " +
|
||||
"`OWNER_UUID` TEXT NOT NULL , " +
|
||||
"`NAME` TEXT , " +
|
||||
"`LOCATION` TEXT NOT NULL , " +
|
||||
"`TYPE` TEXT NOT NULL , " +
|
||||
"`SITTING` INTEGER NOT NULL , " +
|
||||
"`SLEEPING` INTEGER NOT NULL , " +
|
||||
"`MOUTH_ITEM` TEXT NOT NULL);";
|
||||
|
||||
try {
|
||||
|
@ -57,14 +67,100 @@ public class SQLiteSetterGetter {
|
|||
plugin = TamableFoxes.getPlugin(TamableFoxes.class);
|
||||
try {
|
||||
sqLiteHandler.connect();
|
||||
PreparedStatement statement = sqLiteHandler.getConnection()
|
||||
.prepareStatement("INSERT INTO foxes (OWNER_UUID,NAME,LOCATION,MOUTH_ITEM) VALUES (?,?,?,?)");
|
||||
|
||||
statement.setString(1, (fox.getOwner().getUniqueID() == null) ? "none" : fox.getOwner().getUniqueID().toString());
|
||||
PreparedStatement statement = sqLiteHandler.getConnection().prepareStatement("INSERT INTO foxes (OWNER_UUID,NAME,LOCATION,TYPE,MOUTH_ITEM,SITTING,SLEEPING) VALUES (?,?,?,?,?,?,?)");
|
||||
if (fox.databaseID != -1) {
|
||||
statement = sqLiteHandler.getConnection().prepareStatement("UPDATE foxes SET OWNER_UUID=?, NAME=?, LOCATION=?, TYPE=?, MOUTH_ITEM=?, SITTING=?, SLEEPING=? WHERE ID=" + fox.databaseID);
|
||||
}
|
||||
|
||||
statement.setString(1, (fox.getOwner() == null) ? "none" : fox.getOwner().getUniqueID().toString());
|
||||
statement.setString(2, fox.getChosenName());
|
||||
statement.setString(3, fox.getWorld().worldData.getName() + "," + fox.locX() + "," + fox.locY() + "," + fox.locZ());
|
||||
statement.setString(4, fox.getFoxType().toString());
|
||||
statement.setString(5, fox.getEquipment(EnumItemSlot.MAINHAND).toString().toUpperCase().substring(fox.getEquipment(EnumItemSlot.MAINHAND).toString().indexOf(' ')+1));
|
||||
statement.setInt(6, (fox.isSitting()) ? 1 : 0);
|
||||
statement.setInt(7, (fox.isSleeping()) ? 1 : 0);
|
||||
statement.executeUpdate();
|
||||
|
||||
statement.setString(3, fox.locX() + "," + fox.locY() + "," + fox.locY());
|
||||
statement.setString(4, fox.getEquipment(EnumItemSlot.MAINHAND).toString());
|
||||
ResultSet result = statement.getGeneratedKeys();
|
||||
while (result.next()) {
|
||||
fox.databaseID = result.getInt(1);
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
if (sqLiteHandler.getConnection() != null) {
|
||||
try {
|
||||
sqLiteHandler.getConnection().close();
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void saveFoxes(List<EntityTamableFox> foxes) { // @TODO: Optimize
|
||||
for (EntityTamableFox fox : foxes) {
|
||||
saveFox(fox);
|
||||
}
|
||||
}
|
||||
|
||||
public List<EntityTamableFox> spawnFoxes() {
|
||||
plugin = TamableFoxes.getPlugin(TamableFoxes.class);
|
||||
try {
|
||||
sqLiteHandler.connect();
|
||||
PreparedStatement statement = sqLiteHandler.getConnection().prepareStatement("SELECT * FROM foxes");
|
||||
ResultSet results = statement.executeQuery();
|
||||
|
||||
List<EntityTamableFox> foxList = new ArrayList<>();
|
||||
while (results.next()) { // Loop through each row
|
||||
List<String> locationList = Arrays.asList(results.getString("LOCATION").split("\\s*,\\s*"));
|
||||
Location loc = new Location(Bukkit.getWorld(locationList.get(0)), Double.parseDouble(locationList.get(1)), Double.parseDouble(locationList.get(2)), Double.parseDouble(locationList.get(3)));
|
||||
|
||||
EntityTamableFox spawnedFox = (EntityTamableFox) plugin.spawnTamableFox(loc, EntityFox.Type.valueOf(results.getString("TYPE")));
|
||||
spawnedFox.databaseID = results.getInt("ID");
|
||||
spawnedFox.setSlot(EnumItemSlot.MAINHAND, CraftItemStack.asNMSCopy(new ItemStack(Material.valueOf(results.getString("MOUTH_ITEM")), 1)));
|
||||
|
||||
spawnedFox.setSitting(results.getInt("SITTING") == 1);
|
||||
spawnedFox.setSleeping(results.getInt("SLEEPING") == 1);
|
||||
|
||||
if (!results.getString("OWNER_UUID").equals("none")) {
|
||||
UUID ownerUUID = UUID.fromString(results.getString("OWNER_UUID"));
|
||||
|
||||
OfflinePlayer owner = plugin.getServer().getOfflinePlayer(ownerUUID);
|
||||
if (owner.isOnline()) {
|
||||
spawnedFox.setOwner(((CraftPlayer) owner.getPlayer()).getHandle());
|
||||
}
|
||||
|
||||
plugin.getFoxUUIDs().put(spawnedFox.getUniqueID(), ownerUUID);
|
||||
spawnedFox.setChosenName(results.getString("NAME"));
|
||||
spawnedFox.setTamed(true);
|
||||
}
|
||||
|
||||
foxList.add(spawnedFox);
|
||||
}
|
||||
|
||||
return foxList;
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
if (sqLiteHandler.getConnection() != null) {
|
||||
try {
|
||||
sqLiteHandler.getConnection().close();
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public void removeFox(int databaseID) {
|
||||
plugin = TamableFoxes.getPlugin(TamableFoxes.class);
|
||||
try {
|
||||
sqLiteHandler.connect();
|
||||
|
||||
PreparedStatement statement = sqLiteHandler.getConnection().prepareStatement("DELETE FROM foxes WHERE ID=" + databaseID);
|
||||
statement.executeUpdate();
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
|
@ -79,42 +175,7 @@ public class SQLiteSetterGetter {
|
|||
}
|
||||
}
|
||||
|
||||
public List<EntityTamableFox> spawnFoxes() {
|
||||
plugin = Dexun.getPlugin(Dexun.class);
|
||||
try {
|
||||
sqLiteHandler.connect();
|
||||
PreparedStatement statement = sqLiteHandler.getConnection()
|
||||
.prepareStatement("SELECT * FROM foxes");
|
||||
ResultSet results = statement.executeQuery();
|
||||
results.next();
|
||||
|
||||
String banReasonsSTR = results.getString("REASONS");
|
||||
String banDatesSTR = results.getString("ON_DATES");
|
||||
String banEndDatesSTR = results.getString("END_DATES");
|
||||
String unbanReasonsSTR = results.getString("UNBAN_REASONS");
|
||||
|
||||
List<String> banReasons = new LinkedList<String>(Arrays.asList(banReasonsSTR.substring(1).split(",")));
|
||||
List<String> banDates = new LinkedList<String>(Arrays.asList(banDatesSTR.substring(1).split(",")));
|
||||
List<String> banEndDates = new LinkedList<String>(Arrays.asList(banEndDatesSTR.substring(1).split(",")));
|
||||
List<String> unbanReasons = new LinkedList<String>(Arrays.asList(unbanReasonsSTR.substring(1).split(",")));
|
||||
|
||||
List<List<String>> bans = new ArrayList<List<String>>();
|
||||
bans.add(banReasons);
|
||||
bans.add(banDates);
|
||||
bans.add(banEndDates);
|
||||
bans.add(unbanReasons);
|
||||
|
||||
return bans;
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
if (sqLiteHandler.getConnection() != null) {
|
||||
try {
|
||||
sqLiteHandler.getConnection().close();
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
public void removeFox(EntityTamableFox fox) {
|
||||
removeFox(fox.databaseID);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,4 +3,4 @@ show-owner-in-fox-name: true
|
|||
show-nametags: true
|
||||
|
||||
tamed-behavior:
|
||||
no-attack-chicken-rabbit: true
|
||||
attack-chicken-rabbit: true
|
|
@ -3,4 +3,4 @@ show-owner-in-fox-name: true
|
|||
show-nametags: true
|
||||
|
||||
tamed-behavior:
|
||||
no-attack-chicken-rabbit: true
|
||||
attack-chicken-rabbit: true
|
|
@ -8,6 +8,7 @@ net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalBeg.class
|
|||
net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalRandomStrollLand.class
|
||||
net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalLunge.class
|
||||
net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalFloat.class
|
||||
net\seanomik\tamablefoxes\TamableFoxes$SaveFoxRunnable.class
|
||||
net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalMeleeAttack.class
|
||||
net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalRandomTargetNonTamed.class
|
||||
net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalFleeSun.class
|
||||
|
|
|
@ -1,21 +1,21 @@
|
|||
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalRandomStrollLand.java
|
||||
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalRandomTargetNonTamed.java
|
||||
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalLunge.java
|
||||
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomik\tamablefoxes\command\CommandSpawnTamableFox.java
|
||||
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomik\tamablefoxes\TamableFoxes.java
|
||||
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalBeg.java
|
||||
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalPickBushes.java
|
||||
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalBreed.java
|
||||
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalMeleeAttack.java
|
||||
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomik\tamablefoxes\EntityTamableFox.java
|
||||
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalFleeSun.java
|
||||
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomik\tamablefoxes\sqlite\SQLiteHandler.java
|
||||
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalLungeUNKNOWN_USE.java
|
||||
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalOwnerHurtByTarget.java
|
||||
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalOwnerHurtTarget.java
|
||||
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalSit.java
|
||||
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomik\tamablefoxes\sqlite\SQLiteSetterGetter.java
|
||||
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalFloat.java
|
||||
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomik\tamablefoxes\io\FileManager.java
|
||||
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalHurtByTarget.java
|
||||
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalFollowOwner.java
|
||||
C:\code\java\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalFloat.java
|
||||
C:\code\java\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalRandomTargetNonTamed.java
|
||||
C:\code\java\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\command\CommandSpawnTamableFox.java
|
||||
C:\code\java\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalOwnerHurtByTarget.java
|
||||
C:\code\java\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\sqlite\SQLiteHandler.java
|
||||
C:\code\java\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\EntityTamableFox.java
|
||||
C:\code\java\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalMeleeAttack.java
|
||||
C:\code\java\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalHurtByTarget.java
|
||||
C:\code\java\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalSit.java
|
||||
C:\code\java\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalOwnerHurtTarget.java
|
||||
C:\code\java\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalPickBushes.java
|
||||
C:\code\java\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalBreed.java
|
||||
C:\code\java\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\io\FileManager.java
|
||||
C:\code\java\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalBeg.java
|
||||
C:\code\java\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalLungeUNKNOWN_USE.java
|
||||
C:\code\java\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\sqlite\SQLiteSetterGetter.java
|
||||
C:\code\java\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\TamableFoxes.java
|
||||
C:\code\java\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalLunge.java
|
||||
C:\code\java\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalRandomStrollLand.java
|
||||
C:\code\java\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalFollowOwner.java
|
||||
C:\code\java\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\pathfinding\FoxPathfindGoalFleeSun.java
|
||||
|
|
Loading…
Reference in New Issue