Upstream
/
furniture
mirror of https://github.com/Ste3et/furniture.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update for FurnitureLib #427b17286b

This commit is contained in:
Ste3et_C0st 2020-04-15 17:09:35 +02:00
parent 44e2b93e21
commit 46ddc2ead4
7 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.Ste3et_C0st.furniture</groupId>
<artifactId>DiceFurniture</artifactId>
<version>3.4.2</version>
<version>3.4.3</version>
<build>
<defaultGoal>clean package install</defaultGoal>
<sourceDirectory>src</sourceDirectory>
@ -100,7 +100,7 @@
<dependency>
<groupId>com.github.Ste3et</groupId>
<artifactId>FurnitureLib</artifactId>
<version>0bfb20fa81</version>
<version>427b17286b</version>
</dependency>
</dependencies>
</project>

1
src/Models109/Billboard.yml
View File

@ -1,4 +1,5 @@
Billboard:
enabled: false
system-ID: 'Billboard'
name: '&cBillboard'
material: 383

1
src/Models113/Billboard.dModel
View File

@ -5,6 +5,7 @@
# ------------------------------------ #
Billboard:
enabled: false
system-ID: Billboard
displayName: '&cBillboard'
itemGlowEffect: false

7
src/de/Ste3et_C0st/Furniture/Objects/RPG/weaponStand.java
View File

@ -1,6 +1,7 @@
package de.Ste3et_C0st.Furniture.Objects.RPG;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import org.bukkit.Bukkit;
@ -55,7 +56,7 @@ public class weaponStand extends Furniture implements Listener{
p.closeInventory();
inv = null;
}
List<fEntity> asList = getManager().getfArmorStandByObjectID(getObjID());
HashSet<fEntity> asList = getObjID().getPacketList();
for(fEntity packet : asList){
if(packet.getName()!=null&&!packet.getName().equalsIgnoreCase("")){
if(packet.getInventory().getItemInMainHand()!=null){
@ -104,7 +105,7 @@ public class weaponStand extends Furniture implements Listener{
inv = Bukkit.createInventory(null, 45, "§cWeaponBox");
List<fEntity> asList = getManager().getfArmorStandByObjectID(getObjID());
HashSet<fEntity> asList = getObjID().getPacketList();
int j = 1;
for(int i = 0; i<inv.getSize();i++){
@ -164,7 +165,7 @@ public class weaponStand extends Furniture implements Listener{
if(inv==null){return;}
if(!e.getView().getTopInventory().equals(this.inv)){return;}
List<fEntity> asList = getManager().getfArmorStandByObjectID(getObjID());
HashSet<fEntity> asList = getObjID().getPacketList();
int j = 1;
for(int i = 0; i<inv.getSize();i++){
if(slotList2.contains(i)){

28
src/de/Ste3et_C0st/Furniture/Objects/outdoor/barrels.java
View File

@ -1,5 +1,7 @@
package de.Ste3et_C0st.Furniture.Objects.outdoor;
import java.util.Objects;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
@ -26,13 +28,15 @@ public class barrels extends Furniture{
if(player == null) return;
if(canBuild(player)) {
if(!player.getInventory().getItemInMainHand().getType().isBlock()&&!player.getInventory().getItemInMainHand().getType().equals(Material.AIR)){return;}
fEntity packet = getManager().getfArmorStandByObjectID(getObjID()).get(0);
if(packet.getInventory().getHelmet()!=null&&!packet.getInventory().getHelmet().getType().equals(Material.AIR)){
ItemStack is = packet.getInventory().getHelmet();
is.setAmount(1);
getWorld().dropItem(getLocation(), is);
fEntity packet = getObjID().getPacketList().stream().findFirst().orElse(null);
if(Objects.nonNull(packet)) {
if(packet.getInventory().getHelmet()!=null&&!packet.getInventory().getHelmet().getType().equals(Material.AIR)){
ItemStack is = packet.getInventory().getHelmet();
is.setAmount(1);
getWorld().dropItem(getLocation(), is);
}
packet.getInventory().setHelmet(player.getInventory().getItemInMainHand());
}
packet.getInventory().setHelmet(player.getInventory().getItemInMainHand());
update();
consumeItem(player);
}
@ -44,11 +48,13 @@ public class barrels extends Furniture{
if(getObjID().getSQLAction().equals(SQLAction.REMOVE)) return;
if(player == null) return;
if(canBuild(player)) {
fEntity packet = getManager().getfArmorStandByObjectID(getObjID()).get(0);
if(packet.getInventory().getHelmet()!=null&&!packet.getInventory().getHelmet().getType().equals(Material.AIR)){
ItemStack is = packet.getInventory().getHelmet();
is.setAmount(1);
getWorld().dropItem(getLocation(), is);
fEntity packet = getObjID().getPacketList().stream().findFirst().orElse(null);
if(Objects.nonNull(packet)) {
if(packet.getInventory().getHelmet()!=null&&!packet.getInventory().getHelmet().getType().equals(Material.AIR)){
ItemStack is = packet.getInventory().getHelmet();
is.setAmount(1);
getWorld().dropItem(getLocation(), is);
}
}
this.destroy(player);
}

3
src/de/Ste3et_C0st/Furniture/Objects/outdoor/campfire_1.java
View File

@ -1,5 +1,6 @@
package de.Ste3et_C0st.Furniture.Objects.outdoor;
import java.util.HashSet;
import java.util.List;
import org.bukkit.Bukkit;
@ -43,7 +44,7 @@ public class campfire_1 extends Furniture{
if(getObjID().getSQLAction().equals(SQLAction.REMOVE)) return;
if(player == null) return;
if(canBuild(player)) {
List<fEntity> aspList = getManager().getfArmorStandByObjectID(getObjID());
HashSet<fEntity> aspList = getObjID().getPacketList();
ItemStack is = player.getInventory().getItemInMainHand();
if(is.getType().equals(Material.WATER_BUCKET)){
for(fEntity packet : aspList){

5
src/de/Ste3et_C0st/Furniture/Objects/outdoor/campfire_2.java
View File

@ -2,6 +2,7 @@ package de.Ste3et_C0st.Furniture.Objects.outdoor;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
@ -70,7 +71,7 @@ public class campfire_2 extends Furniture {
if (player == null)
return;
if (canBuild(player, false)) {
List<fEntity> aspList = getManager().getfArmorStandByObjectID(getObjID());
HashSet<fEntity> aspList = getObjID().getPacketList();
final ItemStack itemStack = player.getInventory().getItemInMainHand();
fArmorStand packet = null;
for (fEntity pack : aspList) {
@ -95,7 +96,7 @@ public class campfire_2 extends Furniture {
final ItemStack itemStack = player.getInventory().getItemInMainHand();
fArmorStand packet = null;
List<fEntity> aspList = getManager().getfArmorStandByObjectID(getObjID());
HashSet<fEntity> aspList = getObjID().getPacketList();
for (fEntity pack : aspList) {
if (pack instanceof fArmorStand) {
fArmorStand stand = (fArmorStand) pack;