amalthea-mc/ShopChest
1
0
Fork 0
mirror of https://github.com/amalthea-mc/ShopChest.git synced 2024-11-22 18:32:24 +00:00
Code Issues Projects Releases Wiki Activity

Code Cleanup

Browse Source
This commit is contained in:
Eric Biedert 2016-06-28 21:19:05 +02:00
parent 4470300624
commit 3b734ac429
7 changed files with 73 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/de/epiceric/shopchest/interfaces/Hologram.java
View File

@ -8,18 +8,16 @@ import java.util.List;
public interface Hologram { public interface Hologram {
public Location getLocation(); Location getLocation();
public List<?> getEntities(); void showPlayer(OfflinePlayer p);
public void showPlayer(OfflinePlayer p); void hidePlayer(OfflinePlayer p);
public void hidePlayer(OfflinePlayer p); boolean isVisible(OfflinePlayer p);
public boolean isVisible(OfflinePlayer p); boolean exists();
public boolean exists(); void remove();
public void remove();
} }

33
src/de/epiceric/shopchest/interfaces/hologram/Hologram_1_10_R1.java
View File

@ -1,27 +1,23 @@
package de.epiceric.shopchest.interfaces.hologram; package de.epiceric.shopchest.interfaces.hologram;
import de.epiceric.shopchest.interfaces.Hologram; import de.epiceric.shopchest.interfaces.Hologram;
import net.minecraft.server.v1_10_R1.EntityArmorStand; import net.minecraft.server.v1_10_R1.*;
import net.minecraft.server.v1_10_R1.PacketPlayOutEntityDestroy;
import net.minecraft.server.v1_10_R1.PacketPlayOutSpawnEntityLiving;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.craftbukkit.v1_10_R1.CraftWorld; import org.bukkit.craftbukkit.v1_10_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
public class Hologram_1_10_R1 implements Hologram { public class Hologram_1_10_R1 implements Hologram {
private boolean exists = false; private boolean exists = false;
private int count; private int count;
private List<EntityArmorStand> entitylist = new ArrayList<EntityArmorStand>(); private List<EntityArmorStand> entityList = new ArrayList<>();
private String[] text; private String[] text;
private Location location; private Location location;
private double DISTANCE = 0.25D; private List<OfflinePlayer> visible = new ArrayList<>();
private HashMap<OfflinePlayer, Boolean> visible = new HashMap<OfflinePlayer, Boolean>();
public Hologram_1_10_R1(String[] text, Location location) { public Hologram_1_10_R1(String[] text, Location location) {
this.text = text; this.text = text;
@ -33,31 +29,26 @@ public class Hologram_1_10_R1 implements Hologram {
return location; return location;
} }
public List<EntityArmorStand> getEntities() {
return entitylist;
}
public void showPlayer(OfflinePlayer p) { public void showPlayer(OfflinePlayer p) {
for (Object o : entitylist) { for (Object o : entityList) {
EntityArmorStand armor = (EntityArmorStand) o; EntityArmorStand armor = (EntityArmorStand) o;
PacketPlayOutSpawnEntityLiving packet = new PacketPlayOutSpawnEntityLiving(armor); PacketPlayOutSpawnEntityLiving packet = new PacketPlayOutSpawnEntityLiving(armor);
((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet); ((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet);
} }
visible.put(p, true); visible.add(p);
} }
public void hidePlayer(OfflinePlayer p) { public void hidePlayer(OfflinePlayer p) {
for (Object o : entitylist) { for (Object o : entityList) {
EntityArmorStand armor = (EntityArmorStand) o; EntityArmorStand armor = (EntityArmorStand) o;
PacketPlayOutEntityDestroy packet = new PacketPlayOutEntityDestroy(armor.getId()); PacketPlayOutEntityDestroy packet = new PacketPlayOutEntityDestroy(armor.getId());
((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet); ((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet);
} }
visible.put(p, false); visible.remove(p);
} }
public boolean isVisible(OfflinePlayer p) { public boolean isVisible(OfflinePlayer p) {
if (visible.containsKey(p)) return visible.get(p); return visible.contains(p);
else return false;
} }
private void create() { private void create() {
@ -67,13 +58,13 @@ public class Hologram_1_10_R1 implements Hologram {
entity.setCustomNameVisible(true); entity.setCustomNameVisible(true);
entity.setInvisible(true); entity.setInvisible(true);
entity.setNoGravity(true); entity.setNoGravity(true);
entitylist.add(entity); entityList.add(entity);
this.location.subtract(0, this.DISTANCE, 0); this.location.subtract(0, 0.25, 0);
count++; count++;
} }
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
this.location.add(0, this.DISTANCE, 0); this.location.add(0, 0.25, 0);
} }
count = 0; count = 0;
@ -85,7 +76,7 @@ public class Hologram_1_10_R1 implements Hologram {
} }
public void remove() { public void remove() {
for (EntityArmorStand e : entitylist) { for (EntityArmorStand e : entityList) {
e.die(); e.die();
} }
exists = false; exists = false;

29
src/de/epiceric/shopchest/interfaces/hologram/Hologram_1_8_R1.java
View File

@ -10,18 +10,16 @@ import org.bukkit.craftbukkit.v1_8_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
public class Hologram_1_8_R1 implements Hologram { public class Hologram_1_8_R1 implements Hologram {
private boolean exists = false; private boolean exists = false;
private int count; private int count;
private List<EntityArmorStand> entitylist = new ArrayList<EntityArmorStand>(); private List<EntityArmorStand> entityList = new ArrayList<>();
private String[] text; private String[] text;
private Location location; private Location location;
private double DISTANCE = 0.25D; private List<OfflinePlayer> visible = new ArrayList<>();
private HashMap<OfflinePlayer, Boolean> visible = new HashMap<OfflinePlayer, Boolean>();
public Hologram_1_8_R1(String[] text, Location location) { public Hologram_1_8_R1(String[] text, Location location) {
this.text = text; this.text = text;
@ -33,31 +31,26 @@ public class Hologram_1_8_R1 implements Hologram {
return location; return location;
} }
public List<EntityArmorStand> getEntities() {
return entitylist;
}
public void showPlayer(OfflinePlayer p) { public void showPlayer(OfflinePlayer p) {
for (Object o : entitylist) { for (Object o : entityList) {
EntityArmorStand armor = (EntityArmorStand) o; EntityArmorStand armor = (EntityArmorStand) o;
PacketPlayOutSpawnEntityLiving packet = new PacketPlayOutSpawnEntityLiving(armor); PacketPlayOutSpawnEntityLiving packet = new PacketPlayOutSpawnEntityLiving(armor);
((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet); ((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet);
} }
visible.put(p, true); visible.add(p);
} }
public void hidePlayer(OfflinePlayer p) { public void hidePlayer(OfflinePlayer p) {
for (Object o : entitylist) { for (Object o : entityList) {
EntityArmorStand armor = (EntityArmorStand) o; EntityArmorStand armor = (EntityArmorStand) o;
PacketPlayOutEntityDestroy packet = new PacketPlayOutEntityDestroy(armor.getId()); PacketPlayOutEntityDestroy packet = new PacketPlayOutEntityDestroy(armor.getId());
((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet); ((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet);
} }
visible.put(p, false); visible.remove(p);
} }
public boolean isVisible(OfflinePlayer p) { public boolean isVisible(OfflinePlayer p) {
if (visible.containsKey(p)) return visible.get(p); return visible.contains(p);
else return false;
} }
private void create() { private void create() {
@ -67,13 +60,13 @@ public class Hologram_1_8_R1 implements Hologram {
entity.setCustomNameVisible(true); entity.setCustomNameVisible(true);
entity.setInvisible(true); entity.setInvisible(true);
entity.setGravity(false); entity.setGravity(false);
entitylist.add(entity); entityList.add(entity);
this.location.subtract(0, this.DISTANCE, 0); this.location.subtract(0, 0.25, 0);
count++; count++;
} }
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
this.location.add(0, this.DISTANCE, 0); this.location.add(0, 0.25, 0);
} }
count = 0; count = 0;
@ -85,7 +78,7 @@ public class Hologram_1_8_R1 implements Hologram {
} }
public void remove() { public void remove() {
for (EntityArmorStand e : entitylist) { for (EntityArmorStand e : entityList) {
e.die(); e.die();
} }
exists = false; exists = false;

28
src/de/epiceric/shopchest/interfaces/hologram/Hologram_1_8_R2.java
View File

@ -17,11 +17,10 @@ public class Hologram_1_8_R2 implements Hologram {
private boolean exists = false; private boolean exists = false;
private int count; private int count;
private List<EntityArmorStand> entitylist = new ArrayList<EntityArmorStand>(); private List<EntityArmorStand> entityList = new ArrayList<>();
private String[] text; private String[] text;
private Location location; private Location location;
private double DISTANCE = 0.25D; private List<OfflinePlayer> visible = new ArrayList<>();
private HashMap<OfflinePlayer, Boolean> visible = new HashMap<OfflinePlayer, Boolean>();
public Hologram_1_8_R2(String[] text, Location location) { public Hologram_1_8_R2(String[] text, Location location) {
this.text = text; this.text = text;
@ -33,31 +32,26 @@ public class Hologram_1_8_R2 implements Hologram {
return location; return location;
} }
public List<EntityArmorStand> getEntities() {
return entitylist;
}
public void showPlayer(OfflinePlayer p) { public void showPlayer(OfflinePlayer p) {
for (Object o : entitylist) { for (Object o : entityList) {
EntityArmorStand armor = (EntityArmorStand) o; EntityArmorStand armor = (EntityArmorStand) o;
PacketPlayOutSpawnEntityLiving packet = new PacketPlayOutSpawnEntityLiving(armor); PacketPlayOutSpawnEntityLiving packet = new PacketPlayOutSpawnEntityLiving(armor);
((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet); ((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet);
} }
visible.put(p, true); visible.add(p);
} }
public void hidePlayer(OfflinePlayer p) { public void hidePlayer(OfflinePlayer p) {
for (Object o : entitylist) { for (Object o : entityList) {
EntityArmorStand armor = (EntityArmorStand) o; EntityArmorStand armor = (EntityArmorStand) o;
PacketPlayOutEntityDestroy packet = new PacketPlayOutEntityDestroy(armor.getId()); PacketPlayOutEntityDestroy packet = new PacketPlayOutEntityDestroy(armor.getId());
((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet); ((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet);
} }
visible.put(p, false); visible.remove(p);
} }
public boolean isVisible(OfflinePlayer p) { public boolean isVisible(OfflinePlayer p) {
if (visible.containsKey(p)) return visible.get(p); return visible.contains(p);
else return false;
} }
private void create() { private void create() {
@ -67,13 +61,13 @@ public class Hologram_1_8_R2 implements Hologram {
entity.setCustomNameVisible(true); entity.setCustomNameVisible(true);
entity.setInvisible(true); entity.setInvisible(true);
entity.setGravity(false); entity.setGravity(false);
entitylist.add(entity); entityList.add(entity);
this.location.subtract(0, this.DISTANCE, 0); this.location.subtract(0, 0.25, 0);
count++; count++;
} }
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
this.location.add(0, this.DISTANCE, 0); this.location.add(0, 0.25, 0);
} }
count = 0; count = 0;
@ -85,7 +79,7 @@ public class Hologram_1_8_R2 implements Hologram {
} }
public void remove() { public void remove() {
for (EntityArmorStand e : entitylist) { for (EntityArmorStand e : entityList) {
e.die(); e.die();
} }
exists = false; exists = false;

28
src/de/epiceric/shopchest/interfaces/hologram/Hologram_1_8_R3.java
View File

@ -17,11 +17,10 @@ public class Hologram_1_8_R3 implements Hologram {
private boolean exists = false; private boolean exists = false;
private int count; private int count;
private List<EntityArmorStand> entitylist = new ArrayList<EntityArmorStand>(); private List<EntityArmorStand> entityList = new ArrayList<>();
private String[] text; private String[] text;
private Location location; private Location location;
private double DISTANCE = 0.25D; private List<OfflinePlayer> visible = new ArrayList<>();
private HashMap<OfflinePlayer, Boolean> visible = new HashMap<OfflinePlayer, Boolean>();
public Hologram_1_8_R3(String[] text, Location location) { public Hologram_1_8_R3(String[] text, Location location) {
this.text = text; this.text = text;
@ -33,31 +32,26 @@ public class Hologram_1_8_R3 implements Hologram {
return location; return location;
} }
public List<EntityArmorStand> getEntities() {
return entitylist;
}
public void showPlayer(OfflinePlayer p) { public void showPlayer(OfflinePlayer p) {
for (Object o : entitylist) { for (Object o : entityList) {
EntityArmorStand armor = (EntityArmorStand) o; EntityArmorStand armor = (EntityArmorStand) o;
PacketPlayOutSpawnEntityLiving packet = new PacketPlayOutSpawnEntityLiving(armor); PacketPlayOutSpawnEntityLiving packet = new PacketPlayOutSpawnEntityLiving(armor);
((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet); ((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet);
} }
visible.put(p, true); visible.add(p);
} }
public void hidePlayer(OfflinePlayer p) { public void hidePlayer(OfflinePlayer p) {
for (Object o : entitylist) { for (Object o : entityList) {
EntityArmorStand armor = (EntityArmorStand) o; EntityArmorStand armor = (EntityArmorStand) o;
PacketPlayOutEntityDestroy packet = new PacketPlayOutEntityDestroy(armor.getId()); PacketPlayOutEntityDestroy packet = new PacketPlayOutEntityDestroy(armor.getId());
((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet); ((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet);
} }
visible.put(p, false); visible.remove(p);
} }
public boolean isVisible(OfflinePlayer p) { public boolean isVisible(OfflinePlayer p) {
if (visible.containsKey(p)) return visible.get(p); return visible.contains(p);
else return false;
} }
private void create() { private void create() {
@ -67,13 +61,13 @@ public class Hologram_1_8_R3 implements Hologram {
entity.setCustomNameVisible(true); entity.setCustomNameVisible(true);
entity.setInvisible(true); entity.setInvisible(true);
entity.setGravity(false); entity.setGravity(false);
entitylist.add(entity); entityList.add(entity);
this.location.subtract(0, this.DISTANCE, 0); this.location.subtract(0, 0.25, 0);
count++; count++;
} }
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
this.location.add(0, this.DISTANCE, 0); this.location.add(0, 0.25, 0);
} }
count = 0; count = 0;
@ -85,7 +79,7 @@ public class Hologram_1_8_R3 implements Hologram {
} }
public void remove() { public void remove() {
for (EntityArmorStand e : entitylist) { for (EntityArmorStand e : entityList) {
e.die(); e.die();
} }
exists = false; exists = false;

28
src/de/epiceric/shopchest/interfaces/hologram/Hologram_1_9_R1.java
View File

@ -17,11 +17,10 @@ public class Hologram_1_9_R1 implements Hologram {
private boolean exists = false; private boolean exists = false;
private int count; private int count;
private List<EntityArmorStand> entitylist = new ArrayList<EntityArmorStand>(); private List<EntityArmorStand> entityList = new ArrayList<>();
private String[] text; private String[] text;
private Location location; private Location location;
private double DISTANCE = 0.25D; private List<OfflinePlayer> visible = new ArrayList<>();
private HashMap<OfflinePlayer, Boolean> visible = new HashMap<OfflinePlayer, Boolean>();
public Hologram_1_9_R1(String[] text, Location location) { public Hologram_1_9_R1(String[] text, Location location) {
this.text = text; this.text = text;
@ -33,31 +32,26 @@ public class Hologram_1_9_R1 implements Hologram {
return location; return location;
} }
public List<EntityArmorStand> getEntities() {
return entitylist;
}
public void showPlayer(OfflinePlayer p) { public void showPlayer(OfflinePlayer p) {
for (Object o : entitylist) { for (Object o : entityList) {
EntityArmorStand armor = (EntityArmorStand) o; EntityArmorStand armor = (EntityArmorStand) o;
PacketPlayOutSpawnEntityLiving packet = new PacketPlayOutSpawnEntityLiving(armor); PacketPlayOutSpawnEntityLiving packet = new PacketPlayOutSpawnEntityLiving(armor);
((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet); ((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet);
} }
visible.put(p, true); visible.add(p);
} }
public void hidePlayer(OfflinePlayer p) { public void hidePlayer(OfflinePlayer p) {
for (Object o : entitylist) { for (Object o : entityList) {
EntityArmorStand armor = (EntityArmorStand) o; EntityArmorStand armor = (EntityArmorStand) o;
PacketPlayOutEntityDestroy packet = new PacketPlayOutEntityDestroy(armor.getId()); PacketPlayOutEntityDestroy packet = new PacketPlayOutEntityDestroy(armor.getId());
((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet); ((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet);
} }
visible.put(p, false); visible.remove(p);
} }
public boolean isVisible(OfflinePlayer p) { public boolean isVisible(OfflinePlayer p) {
if (visible.containsKey(p)) return visible.get(p); return visible.contains(p);
else return false;
} }
private void create() { private void create() {
@ -67,13 +61,13 @@ public class Hologram_1_9_R1 implements Hologram {
entity.setCustomNameVisible(true); entity.setCustomNameVisible(true);
entity.setInvisible(true); entity.setInvisible(true);
entity.setGravity(false); entity.setGravity(false);
entitylist.add(entity); entityList.add(entity);
this.location.subtract(0, this.DISTANCE, 0); this.location.subtract(0, 0.25, 0);
count++; count++;
} }
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
this.location.add(0, this.DISTANCE, 0); this.location.add(0, 0.25, 0);
} }
count = 0; count = 0;
@ -85,7 +79,7 @@ public class Hologram_1_9_R1 implements Hologram {
} }
public void remove() { public void remove() {
for (EntityArmorStand e : entitylist) { for (EntityArmorStand e : entityList) {
e.die(); e.die();
} }
exists = false; exists = false;

29
src/de/epiceric/shopchest/interfaces/hologram/Hologram_1_9_R2.java
View File

@ -10,18 +10,16 @@ import org.bukkit.craftbukkit.v1_9_R2.CraftWorld;
import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
public class Hologram_1_9_R2 implements Hologram { public class Hologram_1_9_R2 implements Hologram {
private boolean exists = false; private boolean exists = false;
private int count; private int count;
private List<EntityArmorStand> entitylist = new ArrayList<EntityArmorStand>(); private List<EntityArmorStand> entityList = new ArrayList<>();
private String[] text; private String[] text;
private Location location; private Location location;
private double DISTANCE = 0.25D; private List<OfflinePlayer> visible = new ArrayList<>();
private HashMap<OfflinePlayer, Boolean> visible = new HashMap<OfflinePlayer, Boolean>();
public Hologram_1_9_R2(String[] text, Location location) { public Hologram_1_9_R2(String[] text, Location location) {
this.text = text; this.text = text;
@ -33,31 +31,26 @@ public class Hologram_1_9_R2 implements Hologram {
return location; return location;
} }
public List<EntityArmorStand> getEntities() {
return entitylist;
}
public void showPlayer(OfflinePlayer p) { public void showPlayer(OfflinePlayer p) {
for (Object o : entitylist) { for (Object o : entityList) {
EntityArmorStand armor = (EntityArmorStand) o; EntityArmorStand armor = (EntityArmorStand) o;
PacketPlayOutSpawnEntityLiving packet = new PacketPlayOutSpawnEntityLiving(armor); PacketPlayOutSpawnEntityLiving packet = new PacketPlayOutSpawnEntityLiving(armor);
((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet); ((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet);
} }
visible.put(p, true); visible.add(p);
} }
public void hidePlayer(OfflinePlayer p) { public void hidePlayer(OfflinePlayer p) {
for (Object o : entitylist) { for (Object o : entityList) {
EntityArmorStand armor = (EntityArmorStand) o; EntityArmorStand armor = (EntityArmorStand) o;
PacketPlayOutEntityDestroy packet = new PacketPlayOutEntityDestroy(armor.getId()); PacketPlayOutEntityDestroy packet = new PacketPlayOutEntityDestroy(armor.getId());
((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet); ((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet);
} }
visible.put(p, false); visible.remove(p);
} }
public boolean isVisible(OfflinePlayer p) { public boolean isVisible(OfflinePlayer p) {
if (visible.containsKey(p)) return visible.get(p); return visible.contains(p);
else return false;
} }
private void create() { private void create() {
@ -67,13 +60,13 @@ public class Hologram_1_9_R2 implements Hologram {
entity.setCustomNameVisible(true); entity.setCustomNameVisible(true);
entity.setInvisible(true); entity.setInvisible(true);
entity.setGravity(false); entity.setGravity(false);
entitylist.add(entity); entityList.add(entity);
this.location.subtract(0, this.DISTANCE, 0); this.location.subtract(0, 0.25, 0);
count++; count++;
} }
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
this.location.add(0, this.DISTANCE, 0); this.location.add(0, 0.25, 0);
} }
count = 0; count = 0;
@ -85,7 +78,7 @@ public class Hologram_1_9_R2 implements Hologram {
} }
public void remove() { public void remove() {
for (EntityArmorStand e : entitylist) { for (EntityArmorStand e : entityList) {
e.die(); e.die();
} }
exists = false; exists = false;