Upstream/HolographicDisplays
1
0
Fork 0
mirror of https://github.com/filoghost/HolographicDisplays.git synced 2024-12-30 04:37:42 +01:00
Code Issues Projects Releases Wiki Activity

Support icon amount > 1 for API calls

Browse Source
This commit is contained in:
filoghost 2019-10-17 16:21:20 +02:00
parent 0c0ec27233
commit 8293f8b642
12 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NMS/v1_10_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSItem.java
View File

@ -221,9 +221,8 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
NBTTagList tagList = new NBTTagList(); NBTTagList tagList = new NBTTagList();
tagList.add(new NBTTagString(ItemUtils.ANTISTACK_LORE)); // Antistack lore tagList.add(new NBTTagString(ItemUtils.ANTISTACK_LORE)); // Antistack lore
display.set("Lore", tagList); display.set("Lore", tagList);
newItem.count = 0;
setItemStack(newItem); setItemStack(newItem);
} }

2
NMS/v1_11_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSItem.java
View File

@ -197,8 +197,6 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
NBTTagList tagList = new NBTTagList(); NBTTagList tagList = new NBTTagList();
tagList.add(new NBTTagString(ItemUtils.ANTISTACK_LORE)); // Antistack lore tagList.add(new NBTTagString(ItemUtils.ANTISTACK_LORE)); // Antistack lore
display.set("Lore", tagList); display.set("Lore", tagList);
newItem.setCount(1);
setItemStack(newItem); setItemStack(newItem);
} }

2
NMS/v1_12_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_12_R1/EntityNMSItem.java
View File

@ -197,8 +197,6 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
NBTTagList tagList = new NBTTagList(); NBTTagList tagList = new NBTTagList();
tagList.add(new NBTTagString(ItemUtils.ANTISTACK_LORE)); // Antistack lore tagList.add(new NBTTagString(ItemUtils.ANTISTACK_LORE)); // Antistack lore
display.set("Lore", tagList); display.set("Lore", tagList);
newItem.setCount(1);
setItemStack(newItem); setItemStack(newItem);
} }

2
NMS/v1_13_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_13_R1/EntityNMSItem.java
View File

@ -197,8 +197,6 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
NBTTagList tagList = new NBTTagList(); NBTTagList tagList = new NBTTagList();
tagList.add(new NBTTagString(ItemUtils.ANTISTACK_LORE)); // Antistack lore tagList.add(new NBTTagString(ItemUtils.ANTISTACK_LORE)); // Antistack lore
display.set("Lore", tagList); display.set("Lore", tagList);
newItem.setCount(1);
setItemStack(newItem); setItemStack(newItem);
} }

2
NMS/v1_13_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_13_R2/EntityNMSItem.java
View File

@ -197,8 +197,6 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
NBTTagList tagList = new NBTTagList(); NBTTagList tagList = new NBTTagList();
tagList.add(new NBTTagString(ItemUtils.ANTISTACK_LORE)); // Antistack lore tagList.add(new NBTTagString(ItemUtils.ANTISTACK_LORE)); // Antistack lore
display.set("Lore", tagList); display.set("Lore", tagList);
newItem.setCount(1);
setItemStack(newItem); setItemStack(newItem);
} }

2
NMS/v1_14_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_14_R1/EntityNMSItem.java
View File

@ -199,8 +199,6 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
NBTTagList tagList = new NBTTagList(); NBTTagList tagList = new NBTTagList();
tagList.add(new NBTTagString(ItemUtils.ANTISTACK_LORE)); // Antistack lore tagList.add(new NBTTagString(ItemUtils.ANTISTACK_LORE)); // Antistack lore
display.set("Lore", tagList); display.set("Lore", tagList);
newItem.setCount(1);
setItemStack(newItem); setItemStack(newItem);
} }

5
NMS/v1_8_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R1/EntityNMSItem.java
View File

@ -178,14 +178,13 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
NBTTagCompound display = newItem.getTag().getCompound("display"); NBTTagCompound display = newItem.getTag().getCompound("display");
if (!newItem.getTag().hasKey("display")) { if (!newItem.getTag().hasKey("display")) {
newItem.getTag().set("display", display); newItem.getTag().set("display", display);
} }
NBTTagList tagList = new NBTTagList(); NBTTagList tagList = new NBTTagList();
tagList.add(new NBTTagString(ItemUtils.ANTISTACK_LORE)); // Antistack lore tagList.add(new NBTTagString(ItemUtils.ANTISTACK_LORE)); // Antistack lore
display.set("Lore", tagList); display.set("Lore", tagList);
newItem.count = 0;
setItemStack(newItem); setItemStack(newItem);
} }

5
NMS/v1_8_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSItem.java
View File

@ -178,14 +178,13 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
NBTTagCompound display = newItem.getTag().getCompound("display"); NBTTagCompound display = newItem.getTag().getCompound("display");
if (!newItem.getTag().hasKey("display")) { if (!newItem.getTag().hasKey("display")) {
newItem.getTag().set("display", display); newItem.getTag().set("display", display);
} }
NBTTagList tagList = new NBTTagList(); NBTTagList tagList = new NBTTagList();
tagList.add(new NBTTagString(ItemUtils.ANTISTACK_LORE)); // Antistack lore tagList.add(new NBTTagString(ItemUtils.ANTISTACK_LORE)); // Antistack lore
display.set("Lore", tagList); display.set("Lore", tagList);
newItem.count = 0;
setItemStack(newItem); setItemStack(newItem);
} }

5
NMS/v1_8_R3/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSItem.java
View File

@ -178,14 +178,13 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
NBTTagCompound display = newItem.getTag().getCompound("display"); NBTTagCompound display = newItem.getTag().getCompound("display");
if (!newItem.getTag().hasKey("display")) { if (!newItem.getTag().hasKey("display")) {
newItem.getTag().set("display", display); newItem.getTag().set("display", display);
} }
NBTTagList tagList = new NBTTagList(); NBTTagList tagList = new NBTTagList();
tagList.add(new NBTTagString(ItemUtils.ANTISTACK_LORE)); // Antistack lore tagList.add(new NBTTagString(ItemUtils.ANTISTACK_LORE)); // Antistack lore
display.set("Lore", tagList); display.set("Lore", tagList);
newItem.count = 0;
setItemStack(newItem); setItemStack(newItem);
} }

5
NMS/v1_9_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSItem.java
View File

@ -215,14 +215,13 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
NBTTagCompound display = newItem.getTag().getCompound("display"); NBTTagCompound display = newItem.getTag().getCompound("display");
if (!newItem.getTag().hasKey("display")) { if (!newItem.getTag().hasKey("display")) {
newItem.getTag().set("display", display); newItem.getTag().set("display", display);
} }
NBTTagList tagList = new NBTTagList(); NBTTagList tagList = new NBTTagList();
tagList.add(new NBTTagString(ItemUtils.ANTISTACK_LORE)); // Antistack lore tagList.add(new NBTTagString(ItemUtils.ANTISTACK_LORE)); // Antistack lore
display.set("Lore", tagList); display.set("Lore", tagList);
newItem.count = 0;
setItemStack(newItem); setItemStack(newItem);
} }

5
NMS/v1_9_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSItem.java
View File

@ -216,14 +216,13 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
NBTTagCompound display = newItem.getTag().getCompound("display"); NBTTagCompound display = newItem.getTag().getCompound("display");
if (!newItem.getTag().hasKey("display")) { if (!newItem.getTag().hasKey("display")) {
newItem.getTag().set("display", display); newItem.getTag().set("display", display);
} }
NBTTagList tagList = new NBTTagList(); NBTTagList tagList = new NBTTagList();
tagList.add(new NBTTagString(ItemUtils.ANTISTACK_LORE)); // Antistack lore tagList.add(new NBTTagString(ItemUtils.ANTISTACK_LORE)); // Antistack lore
display.set("Lore", tagList); display.set("Lore", tagList);
newItem.count = 0;
setItemStack(newItem); setItemStack(newItem);
} }

1
Plugin/src/main/java/com/gmail/filoghost/holographicdisplays/object/line/CraftItemLine.java
View File

@ -50,6 +50,7 @@ public class CraftItemLine extends CraftTouchableLine implements ItemLine {
@Override @Override
public void setItemStack(ItemStack itemStack) { public void setItemStack(ItemStack itemStack) {
Validator.notNull(itemStack, "itemStack"); Validator.notNull(itemStack, "itemStack");
Validator.isTrue(0 < itemStack.getAmount() && itemStack.getAmount() <= 64, "Item must have amount between 1 and 64");
this.itemStack = itemStack; this.itemStack = itemStack;
if (nmsItem != null) { if (nmsItem != null) {