Upstream/furniture
1
0
Fork 0
mirror of https://github.com/Ste3et/furniture.git synced 2025-02-16 20:31:26 +01:00
Code Issues Projects Releases Wiki Activity

Add Support for the new FurnitureLib(1.9)

Browse Source
This commit is contained in:
BuildTools 2016-03-05 20:16:46 +01:00
parent 0df6cb1fc7
commit 20c0aa71af
42 changed files with 300 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.classpath
View File

@ -2,8 +2,8 @@
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="lib" path="C:/Plugins/jars/spigot.jar"/>
<classpathentry kind="lib" path="C:/Plugins/jars/FurnitureLib.jar"/> <classpathentry kind="lib" path="C:/Plugins/jars/FurnitureLib.jar"/>
<classpathentry kind="lib" path="C:/Plugins/jars/PostalService-1.0.6.jar"/> <classpathentry kind="lib" path="C:/Plugins/jars/PostalService-1.0.6.jar"/>
<classpathentry kind="lib" path="C:/Plugins/jars/spigot_server.jar"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

13
src/de/Ste3et_C0st/Furniture/Camera/Utils/GetBlocks.java
View File

@ -1,19 +1,21 @@
package de.Ste3et_C0st.Furniture.Camera.Utils; package de.Ste3et_C0st.Furniture.Camera.Utils;
import java.awt.Color;
import java.util.HashMap; import java.util.HashMap;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.map.MapPalette;
import de.Ste3et_C0st.Furniture.Main.main; import de.Ste3et_C0st.Furniture.Main.main;
public class GetBlocks { public class GetBlocks {
public HashMap<Integer, HashMap<Integer, Byte>> returnBlocks(Location location, int höhe, int links){ public HashMap<Integer, HashMap<Integer, Byte>> returnBlocks(Location location, int höhe, int links){
HashMap<Integer, HashMap<Integer, Byte>> blockList = new HashMap<Integer, HashMap<Integer, Byte>>(); HashMap<Integer, HashMap<Integer, Byte>> blockList = new HashMap<Integer, HashMap<Integer, Byte>>();
BlockFace b = main.getLocationUtil().yawToFace(location.getYaw()); BlockFace b = main.getLocationUtil().yawToFace(location.getYaw());
höhe = höhe/2; höhe = höhe/2;
//links = links/2; //links = links/2;
location = main.getLocationUtil().getRelativ(location, b, 0D,- (double) (links/2)); location = main.getLocationUtil().getRelativ(location, b, 0D,- (double) (links/2));
Integer tiefe = 24; Integer tiefe = 24;
@ -22,7 +24,7 @@ public class GetBlocks {
HashMap<Integer, Byte> layerlist = new HashMap<Integer, Byte>(); HashMap<Integer, Byte> layerlist = new HashMap<Integer, Byte>();
Integer blockindex = 0; Integer blockindex = 0;
for(int y = 0;y<=links;y++){ for(int y = 0;y<=links;y++){
for(int z = 0;z<=höhe;z++){ for(int z = 0;z<=höhe;z++){
Block b1 = main.getLocationUtil().getRelativ(location, b,(double) x, (double) y).add(0,z,0).getBlock(); Block b1 = main.getLocationUtil().getRelativ(location, b,(double) x, (double) y).add(0,z,0).getBlock();
byte byte1 = getByteFromBlock(b1); byte byte1 = getByteFromBlock(b1);
layerlist.put(blockindex, byte1); layerlist.put(blockindex, byte1);
@ -37,6 +39,11 @@ public class GetBlocks {
return blockList; return blockList;
} }
@SuppressWarnings("deprecation")
public Color getRedByte(Block b){
return MapPalette.getColor((byte) b.getTypeId());
}
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public Byte getByteFromBlock(Block b){ public Byte getByteFromBlock(Block b){
Material m = b.getType(); Material m = b.getType();

2
src/de/Ste3et_C0st/Furniture/Camera/Utils/RenderClass.java
View File

@ -67,7 +67,7 @@ public class RenderClass extends MapRenderer {
} }
} }
//mapCanvas.drawText(10, 10, font, "§18;TESTPHASE"); //mapCanvas.drawText(10, 10, font, "<EFBFBD>18;TESTPHASE");
hasRendered = false; hasRendered = false;
}catch(Exception e){e.printStackTrace();} }catch(Exception e){e.printStackTrace();}

38
src/de/Ste3et_C0st/Furniture/Objects/RPG/Crossbow.java
View File

@ -58,7 +58,7 @@ public class Crossbow extends Furniture implements Listener {
Location loc = getLutil().getRelativ(getCenter().add(0, -1.7, 0), getLutil().yawToFace(yaw), .34, .4); Location loc = getLutil().getRelativ(getCenter().add(0, -1.7, 0), getLutil().yawToFace(yaw), .34, .4);
loc.setYaw(yaw+45); loc.setYaw(yaw+45);
fArmorStand stand = spawnArmorStand(loc); fArmorStand stand = spawnArmorStand(loc);
stand.setItemInHand(new ItemStack(Material.STICK)); stand.setItemInMainHand(new ItemStack(Material.STICK));
stand.setMarker(false); stand.setMarker(false);
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(90,270,135))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(90,270,135)));
asList.add(stand); asList.add(stand);
@ -73,7 +73,7 @@ public class Crossbow extends Furniture implements Listener {
Location loc = getRelative(getCenter().add(0, -.74, 0), getBlockFace(), -.6, .48); Location loc = getRelative(getCenter().add(0, -.74, 0), getBlockFace(), -.6, .48);
loc.setYaw(getYaw()-90); loc.setYaw(getYaw()-90);
stand = spawnArmorStand(loc); stand = spawnArmorStand(loc);
stand.setItemInHand(new ItemStack(Material.STICK)); stand.setItemInMainHand(new ItemStack(Material.STICK));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(80,0,90))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(80,0,90)));
stand.setMarker(false); stand.setMarker(false);
asList.add(stand); asList.add(stand);
@ -81,7 +81,7 @@ public class Crossbow extends Furniture implements Listener {
loc = getRelative(getCenter().add(0, -.62, 0),getBlockFace(), -.4,.07); loc = getRelative(getCenter().add(0, -.62, 0),getBlockFace(), -.4,.07);
loc.setYaw(getYaw()-90); loc.setYaw(getYaw()-90);
stand = spawnArmorStand(loc); stand = spawnArmorStand(loc);
stand.setItemInHand(new ItemStack(Material.BOW)); stand.setItemInMainHand(new ItemStack(Material.BOW));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(0,10,90))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(0,10,90)));
stand.setMarker(false); stand.setMarker(false);
asList.add(stand); asList.add(stand);
@ -134,11 +134,11 @@ public class Crossbow extends Furniture implements Listener {
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
fArmorStand stand = getArmorStand(); fArmorStand stand = getArmorStand();
if(stand==null){return;} if(stand==null){return;}
ItemStack is = e.getPlayer().getItemInHand(); ItemStack is = e.getPlayer().getInventory().getItemInMainHand();
if(!hasArrow()||(is!=null&&is.getType()!=null&&is.getType().equals(Material.ARROW))){ if(!hasArrow()||(is!=null&&is.getType()!=null&&is.getType().equals(Material.ARROW))){
if(e.getPlayer().getItemInHand()==null){return;} if(e.getPlayer().getInventory().getItemInMainHand()==null){return;}
if(e.getPlayer().getItemInHand().getType()==null){return;} if(e.getPlayer().getInventory().getItemInMainHand().getType()==null){return;}
if(!e.getPlayer().getItemInHand().getType().equals(Material.ARROW)){return;} if(!e.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.ARROW)){return;}
addArmor(is, stand); addArmor(is, stand);
}else{ }else{
spawnArrow(); spawnArrow();
@ -155,11 +155,11 @@ public class Crossbow extends Furniture implements Listener {
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
fArmorStand stand = getArmorStand(); fArmorStand stand = getArmorStand();
if(stand==null){return;} if(stand==null){return;}
ItemStack is = e.getPlayer().getItemInHand(); ItemStack is = e.getPlayer().getInventory().getItemInMainHand();
if(!hasArrow()||(is!=null&&is.getType()!=null&&is.getType().equals(Material.ARROW))){ if(!hasArrow()||(is!=null&&is.getType()!=null&&is.getType().equals(Material.ARROW))){
if(e.getPlayer().getItemInHand()==null){return;} if(e.getPlayer().getInventory().getItemInMainHand()==null){return;}
if(e.getPlayer().getItemInHand().getType()==null){return;} if(e.getPlayer().getInventory().getItemInMainHand().getType()==null){return;}
if(!e.getPlayer().getItemInHand().getType().equals(Material.ARROW)){return;} if(!e.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.ARROW)){return;}
addArmor(is, stand); addArmor(is, stand);
}else{ }else{
spawnArrow(); spawnArrow();
@ -178,7 +178,7 @@ public class Crossbow extends Furniture implements Listener {
case WEST: v= new Vector(1.2, 0.5, 0);break; case WEST: v= new Vector(1.2, 0.5, 0);break;
default:break; default:break;
} }
getWorld().playSound(getLocation(), Sound.SHOOT_ARROW, 1, 1); getWorld().playSound(getLocation(), Sound.ENTITY_ARROW_SHOOT, 1, 1);
Location start = getRelative(getCenter(), getBlockFace(), 0,0); Location start = getRelative(getCenter(), getBlockFace(), 0,0);
start.setYaw(getYaw()); start.setYaw(getYaw());
start = start.add(0, 1.8, 0); start = start.add(0, 1.8, 0);
@ -200,20 +200,20 @@ public class Crossbow extends Furniture implements Listener {
} }
private void removeArrow(fArmorStand stand){ private void removeArrow(fArmorStand stand){
ItemStack is = stand.getItemInHand(); ItemStack is = stand.getItemInMainHand();
if(is.getAmount()-1<=0){ if(is.getAmount()-1<=0){
stand.setItemInHand(new ItemStack(Material.AIR)); stand.setItemInMainHand(new ItemStack(Material.AIR));
update(); update();
return; return;
} }
is.setAmount(is.getAmount()-1); is.setAmount(is.getAmount()-1);
stand.setItemInHand(is); stand.setItemInMainHand(is);
update(); update();
} }
private void addArmor(ItemStack is, fArmorStand stand){ private void addArmor(ItemStack is, fArmorStand stand){
if(getArrow()!=null){is.setAmount(getArrow().getAmount());} if(getArrow()!=null){is.setAmount(getArrow().getAmount());}
stand.setItemInHand(is); stand.setItemInMainHand(is);
update(); update();
} }
@ -231,8 +231,8 @@ public class Crossbow extends Furniture implements Listener {
private ItemStack getArrow(){ private ItemStack getArrow(){
for(fArmorStand stand : getfAsList()){ for(fArmorStand stand : getfAsList()){
if(stand.getName().equalsIgnoreCase("#ARROW#")){ if(stand.getName().equalsIgnoreCase("#ARROW#")){
if(!(stand.getItemInHand()==null||stand.getItemInHand().getType()==null||stand.getItemInHand().getType().equals(Material.AIR))){ if(!(stand.getItemInMainHand()==null||stand.getItemInMainHand().getType()==null||stand.getItemInMainHand().getType().equals(Material.AIR))){
return stand.getItemInHand(); return stand.getItemInMainHand();
} }
} }
} }
@ -242,7 +242,7 @@ public class Crossbow extends Furniture implements Listener {
private boolean hasArrow(){ private boolean hasArrow(){
for(fArmorStand stand : getfAsList()){ for(fArmorStand stand : getfAsList()){
if(stand.getName().equalsIgnoreCase("#ARROW#")){ if(stand.getName().equalsIgnoreCase("#ARROW#")){
if(stand.getItemInHand()==null||stand.getItemInHand().getType()==null||stand.getItemInHand().getType().equals(Material.AIR)){ if(stand.getItemInMainHand()==null||stand.getItemInMainHand().getType()==null||stand.getItemInMainHand().getType().equals(Material.AIR)){
return false; return false;
}else{ }else{
return true; return true;

12
src/de/Ste3et_C0st/Furniture/Objects/RPG/HumanSkeleton.java
View File

@ -35,32 +35,32 @@ public class HumanSkeleton extends Furniture implements Listener {
public void spawn(Location paramLocation) { public void spawn(Location paramLocation) {
List<fArmorStand> asList = new ArrayList<fArmorStand>(); List<fArmorStand> asList = new ArrayList<fArmorStand>();
fArmorStand stand = spawnArmorStand(getRelative(getLocation().add(0, -1.4, 0), -.25, 0)); fArmorStand stand = spawnArmorStand(getRelative(getLocation().add(0, -1.4, 0), -.25, 0));
stand.setItemInHand(new ItemStack(Material.BONE)); stand.setItemInMainHand(new ItemStack(Material.BONE));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-40,0,90))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-40,0,90)));
asList.add(stand); asList.add(stand);
stand = spawnArmorStand(getRelative(getLocation().add(0, -1.4, 0), .2, 1.2)); stand = spawnArmorStand(getRelative(getLocation().add(0, -1.4, 0), .2, 1.2));
stand.setItemInHand(new ItemStack(Material.BONE)); stand.setItemInMainHand(new ItemStack(Material.BONE));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(40,0,90))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(40,0,90)));
asList.add(stand); asList.add(stand);
stand = spawnArmorStand(getRelative(getLocation().add(0, -1.4, 0), .3, .75)); stand = spawnArmorStand(getRelative(getLocation().add(0, -1.4, 0), .3, .75));
stand.setItemInHand(new ItemStack(Material.BONE)); stand.setItemInMainHand(new ItemStack(Material.BONE));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(0,0,90))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(0,0,90)));
asList.add(stand); asList.add(stand);
stand = spawnArmorStand(getRelative(getLocation().add(0, -1.4, 0), .9, .42)); stand = spawnArmorStand(getRelative(getLocation().add(0, -1.4, 0), .9, .42));
stand.setItemInHand(new ItemStack(Material.BONE)); stand.setItemInMainHand(new ItemStack(Material.BONE));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-30,0,90))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-30,0,90)));
asList.add(stand); asList.add(stand);
stand = spawnArmorStand(getRelative(getLocation().add(0, -1.4, 0), 1.1, -.6)); stand = spawnArmorStand(getRelative(getLocation().add(0, -1.4, 0), 1.1, -.6));
stand.setItemInHand(new ItemStack(Material.BONE)); stand.setItemInMainHand(new ItemStack(Material.BONE));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-80,0,90))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-80,0,90)));
asList.add(stand); asList.add(stand);
stand = spawnArmorStand(getRelative(getLocation().add(0, -1.4, 0), 1.6, 1.3)); stand = spawnArmorStand(getRelative(getLocation().add(0, -1.4, 0), 1.6, 1.3));
stand.setItemInHand(new ItemStack(Material.BONE)); stand.setItemInMainHand(new ItemStack(Material.BONE));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(30,0,90))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(30,0,90)));
asList.add(stand); asList.add(stand);

33
src/de/Ste3et_C0st/Furniture/Objects/RPG/catapult.java
View File

@ -19,6 +19,7 @@ import org.bukkit.entity.TNTPrimed;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityChangeBlockEvent; import org.bukkit.event.entity.EntityChangeBlockEvent;
import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.util.EulerAngle; import org.bukkit.util.EulerAngle;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
@ -84,28 +85,28 @@ public class catapult extends Furniture implements Listener {
Location loc = getRelative(getCenter(), getBlockFace(), .15, -.2).add(0, -1.6, 0); Location loc = getRelative(getCenter(), getBlockFace(), .15, -.2).add(0, -1.6, 0);
fArmorStand stand = spawnArmorStand(loc); fArmorStand stand = spawnArmorStand(loc);
stand.setItemInHand(new ItemStack(Material.STICK)); stand.setItemInMainHand(new ItemStack(Material.STICK));
stand.setMarker(false); stand.setMarker(false);
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(80,0,90))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(80,0,90)));
asList.add(stand); asList.add(stand);
loc = getRelative(getCenter(), getBlockFace(), 2.8-.12, -.2).add(0, -1.6, 0); loc = getRelative(getCenter(), getBlockFace(), 2.8-.12, -.2).add(0, -1.6, 0);
stand = spawnArmorStand(loc); stand = spawnArmorStand(loc);
stand.setItemInHand(new ItemStack(Material.STICK)); stand.setItemInMainHand(new ItemStack(Material.STICK));
stand.setMarker(false); stand.setMarker(false);
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(80,0,90))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(80,0,90)));
asList.add(stand); asList.add(stand);
loc = getRelative(getCenter(), getBlockFace(), 1.5-.12, -.2).add(0, -1.6, 0); loc = getRelative(getCenter(), getBlockFace(), 1.5-.12, -.2).add(0, -1.6, 0);
stand = spawnArmorStand(loc); stand = spawnArmorStand(loc);
stand.setItemInHand(new ItemStack(Material.STICK)); stand.setItemInMainHand(new ItemStack(Material.STICK));
stand.setMarker(false); stand.setMarker(false);
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(80,0,90))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(80,0,90)));
asList.add(stand); asList.add(stand);
loc = getRelative(getCenter(), getBlockFace(), 1.5-.12, -.2).add(0, 0, 0); loc = getRelative(getCenter(), getBlockFace(), 1.5-.12, -.2).add(0, 0, 0);
stand = spawnArmorStand(loc); stand = spawnArmorStand(loc);
stand.setItemInHand(new ItemStack(Material.STICK)); stand.setItemInMainHand(new ItemStack(Material.STICK));
stand.setMarker(false); stand.setMarker(false);
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(80,0,90))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(80,0,90)));
asList.add(stand); asList.add(stand);
@ -113,7 +114,7 @@ public class catapult extends Furniture implements Listener {
loc = getRelative(getCenter(), getBlockFace(), 1.5-.3, -1.4).add(0, -1.1, 0); loc = getRelative(getCenter(), getBlockFace(), 1.5-.3, -1.4).add(0, -1.1, 0);
loc.setYaw(getYaw()+180); loc.setYaw(getYaw()+180);
stand = spawnArmorStand(loc); stand = spawnArmorStand(loc);
stand.setItemInHand(new ItemStack(Material.STICK)); stand.setItemInMainHand(new ItemStack(Material.STICK));
stand.setMarker(false); stand.setMarker(false);
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(335,0,0))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(335,0,0)));
asList.add(stand); asList.add(stand);
@ -121,7 +122,7 @@ public class catapult extends Furniture implements Listener {
loc = getRelative(getCenter(), getBlockFace(), .4, -1.4).add(0, -.9, 0); loc = getRelative(getCenter(), getBlockFace(), .4, -1.4).add(0, -.9, 0);
loc.setYaw(getYaw()+180); loc.setYaw(getYaw()+180);
stand = spawnArmorStand(loc); stand = spawnArmorStand(loc);
stand.setItemInHand(new ItemStack(Material.STICK)); stand.setItemInMainHand(new ItemStack(Material.STICK));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(335,0,0))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(335,0,0)));
stand.setMarker(false); stand.setMarker(false);
asList.add(stand); asList.add(stand);
@ -165,6 +166,25 @@ public class catapult extends Furniture implements Listener {
Block b = entity.getLocation().getBlock().getRelative(BlockFace.DOWN); Block b = entity.getLocation().getBlock().getRelative(BlockFace.DOWN);
if(!FurnitureLib.getInstance().getPermManager().canBuild(p, b.getLocation())){ if(!FurnitureLib.getInstance().getPermManager().canBuild(p, b.getLocation())){
e.setCancelled(true); e.setCancelled(true);
e.getEntity().remove();
}
}
}
}
@EventHandler
public void onPrimedTnt(EntityExplodeEvent e){
if(e.getEntity()==null) return;
if(e.getEntity() instanceof TNTPrimed){
if(fallingSandList.containsKey(e.getEntity())){
Entity entity = e.getEntity();
Player p = fallingSandList.get(e.getEntity());
fallingSandList.remove(e.getEntity());
Block b = entity.getLocation().getBlock().getRelative(BlockFace.DOWN);
if(!FurnitureLib.getInstance().getPermManager().canBuild(p, b.getLocation())){
e.setCancelled(true);
e.blockList().clear();
e.getEntity().remove();
} }
} }
} }
@ -196,6 +216,7 @@ public class catapult extends Furniture implements Listener {
} }
tnt.playEffect(EntityEffect.WITCH_MAGIC); tnt.playEffect(EntityEffect.WITCH_MAGIC);
tnt.setVelocity(v.multiply(1)); tnt.setVelocity(v.multiply(1));
fallingSandList.put(tnt, e.getPlayer());
}else{ }else{
FallingBlock block = getWorld().spawnFallingBlock(loc, stack.getType().getId(), (byte) stack.getDurability()); FallingBlock block = getWorld().spawnFallingBlock(loc, stack.getType().getId(), (byte) stack.getDurability());
Vector v=null; Vector v=null;

18
src/de/Ste3et_C0st/Furniture/Objects/RPG/flag.java
View File

@ -55,7 +55,7 @@ public class flag extends Furniture implements Listener {
Location loc = getLutil().getRelativ(center.clone(), getBlockFace(), .47, .38).add(0, .88*i, 0); Location loc = getLutil().getRelativ(center.clone(), getBlockFace(), .47, .38).add(0, .88*i, 0);
loc.setYaw(getYaw()); loc.setYaw(getYaw());
fArmorStand packet = spawnArmorStand(loc); fArmorStand packet = spawnArmorStand(loc);
packet.getInventory().setItemInHand(new ItemStack(Material.STICK)); packet.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
packet.setPose(new EulerAngle(1.39, 0, 0), BodyPart.RIGHT_ARM); packet.setPose(new EulerAngle(1.39, 0, 0), BodyPart.RIGHT_ARM);
asList.add(packet); asList.add(packet);
} }
@ -146,12 +146,12 @@ public class flag extends Furniture implements Listener {
if(e.isCancelled()){return;} if(e.isCancelled()){return;}
if(!e.getID().equals(getObjID())){return;} if(!e.getID().equals(getObjID())){return;}
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
if(e.getPlayer().getItemInHand()!=null&&e.getPlayer().getItemInHand().getType()!=null){ if(e.getPlayer().getInventory().getItemInMainHand()!=null&&e.getPlayer().getInventory().getItemInMainHand().getType()!=null){
if(e.getPlayer().getItemInHand().getType().equals(Material.BANNER)){ if(e.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.BANNER)){
getStand().setHelmet(e.getPlayer().getItemInHand());update(); getStand().setHelmet(e.getPlayer().getInventory().getItemInMainHand());update();
if(e.getPlayer().getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) return; if(e.getPlayer().getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) return;
Integer i = e.getPlayer().getInventory().getHeldItemSlot(); Integer i = e.getPlayer().getInventory().getHeldItemSlot();
ItemStack is = e.getPlayer().getItemInHand(); ItemStack is = e.getPlayer().getInventory().getItemInMainHand();
is.setAmount(is.getAmount()-1); is.setAmount(is.getAmount()-1);
e.getPlayer().getInventory().setItem(i, is); e.getPlayer().getInventory().setItem(i, is);
e.getPlayer().updateInventory(); e.getPlayer().updateInventory();
@ -186,12 +186,12 @@ public class flag extends Furniture implements Listener {
if(e.isCancelled()){return;} if(e.isCancelled()){return;}
if(!e.getID().equals(getObjID())){return;} if(!e.getID().equals(getObjID())){return;}
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
if(e.getPlayer().getItemInHand()!=null&&e.getPlayer().getItemInHand().getType()!=null){ if(e.getPlayer().getInventory().getItemInMainHand()!=null&&e.getPlayer().getInventory().getItemInMainHand().getType()!=null){
if(e.getPlayer().getItemInHand().getType().equals(Material.BANNER)){ if(e.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.BANNER)){
getStand().setHelmet(e.getPlayer().getItemInHand());update(); getStand().setHelmet(e.getPlayer().getInventory().getItemInMainHand());update();
if(e.getPlayer().getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) return; if(e.getPlayer().getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) return;
Integer i = e.getPlayer().getInventory().getHeldItemSlot(); Integer i = e.getPlayer().getInventory().getHeldItemSlot();
ItemStack is = e.getPlayer().getItemInHand(); ItemStack is = e.getPlayer().getInventory().getItemInMainHand();
is.setAmount(is.getAmount()-1); is.setAmount(is.getAmount()-1);
e.getPlayer().getInventory().setItem(i, is); e.getPlayer().getInventory().setItem(i, is);
e.getPlayer().updateInventory(); e.getPlayer().updateInventory();

52
src/de/Ste3et_C0st/Furniture/Objects/RPG/guillotine.java
View File

@ -72,7 +72,7 @@ public class guillotine extends Furniture implements Listener{
pane = new ItemStack(Material.STAINED_GLASS_PANE); pane = new ItemStack(Material.STAINED_GLASS_PANE);
pane.setDurability((short) 15); pane.setDurability((short) 15);
ItemMeta im = pane.getItemMeta(); ItemMeta im = pane.getItemMeta();
im.setDisplayName("§c"); im.setDisplayName("<EFBFBD>c");
pane.setItemMeta(im); pane.setItemMeta(im);
@ -111,19 +111,27 @@ public class guillotine extends Furniture implements Listener{
} }
} }
if(packet3.getHelmet()!=null){ if(packet3!=null){
packet2.setHelmet(packet3.getHelmet()); if(packet3.getHelmet()!=null){
packet3.setHelmet(new ItemStack(Material.AIR)); packet2.setHelmet(packet3.getHelmet());
packet3.setHelmet(new ItemStack(Material.AIR));
}
} }
soundPlaying = false; soundPlaying = false;
packet1.setPose(getLutil().degresstoRad(new EulerAngle(190,0,329)), BodyPart.RIGHT_ARM); if(packet1!=null){
packet1.setLeftArmPose(BodyPart.LEFT_ARM.getDefAngle()); packet1.setPose(getLutil().degresstoRad(new EulerAngle(190,0,329)), BodyPart.RIGHT_ARM);
Location loc13 = getStartLocation(packet2.getName()); packet1.setLeftArmPose(BodyPart.LEFT_ARM.getDefAngle());
packet2.teleport(loc13); }
packet2.setPose(getLutil().degresstoRad(new EulerAngle(40,0,320)), BodyPart.RIGHT_ARM);
packet2.setPose(getLutil().degresstoRad(new EulerAngle(33,0,41)), BodyPart.LEFT_ARM); if(packet2!=null){
packet2.setPose(getLutil().degresstoRad(new EulerAngle(40,25,0)), BodyPart.HEAD); Location loc13 = getStartLocation(packet2.getName());
packet2.teleport(loc13);
packet2.setPose(getLutil().degresstoRad(new EulerAngle(40,0,320)), BodyPart.RIGHT_ARM);
packet2.setPose(getLutil().degresstoRad(new EulerAngle(33,0,41)), BodyPart.LEFT_ARM);
packet2.setPose(getLutil().degresstoRad(new EulerAngle(40,25,0)), BodyPart.HEAD);
}
timer = Bukkit.getScheduler().scheduleSyncRepeatingTask(getPlugin(), new Runnable() { timer = Bukkit.getScheduler().scheduleSyncRepeatingTask(getPlugin(), new Runnable() {
int x = 0; int x = 0;
@Override @Override
@ -220,7 +228,7 @@ public class guillotine extends Furniture implements Listener{
packList.add(packet); packList.add(packet);
packet = getManager().createArmorStand(getObjID(), loc7); packet = getManager().createArmorStand(getObjID(), loc7);
packet.getInventory().setItemInHand(new ItemStack(Material.STICK)); packet.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
packet.setPose(new EulerAngle(1.39, 0, 0), BodyPart.RIGHT_ARM); packet.setPose(new EulerAngle(1.39, 0, 0), BodyPart.RIGHT_ARM);
packList.add(packet); packList.add(packet);
@ -309,7 +317,7 @@ public class guillotine extends Furniture implements Listener{
if(canDrop(packet1.getChestPlate())){getWorld().dropItem(getLocation(), packet1.getChestPlate());} if(canDrop(packet1.getChestPlate())){getWorld().dropItem(getLocation(), packet1.getChestPlate());}
if(canDrop(packet1.getLeggings())){getWorld().dropItem(getLocation(), packet1.getLeggings());} if(canDrop(packet1.getLeggings())){getWorld().dropItem(getLocation(), packet1.getLeggings());}
if(canDrop(packet1.getBoots())){getWorld().dropItem(getLocation(), packet1.getBoots());} if(canDrop(packet1.getBoots())){getWorld().dropItem(getLocation(), packet1.getBoots());}
if(canDrop(packet1.getItemInHand())){getWorld().dropItem(getLocation(), packet1.getItemInHand());} if(canDrop(packet1.getItemInMainHand())){getWorld().dropItem(getLocation(), packet1.getItemInMainHand());}
if(canDrop(packet2.getHelmet())){getWorld().dropItem(getLocation(), packet2.getHelmet());} if(canDrop(packet2.getHelmet())){getWorld().dropItem(getLocation(), packet2.getHelmet());}
if(canDrop(packet2.getChestPlate())){getWorld().dropItem(getLocation(), packet2.getChestPlate());} if(canDrop(packet2.getChestPlate())){getWorld().dropItem(getLocation(), packet2.getChestPlate());}
if(canDrop(packet2.getLeggings())){getWorld().dropItem(getLocation(), packet2.getLeggings());} if(canDrop(packet2.getLeggings())){getWorld().dropItem(getLocation(), packet2.getLeggings());}
@ -346,14 +354,14 @@ public class guillotine extends Furniture implements Listener{
ItemStack is = new ItemStack(Material.SKULL_ITEM); ItemStack is = new ItemStack(Material.SKULL_ITEM);
is.setDurability((short) 1); is.setDurability((short) 1);
ItemMeta im = is.getItemMeta(); ItemMeta im = is.getItemMeta();
im.setDisplayName("§2Executioner"); im.setDisplayName("<EFBFBD>2Executioner");
is.setItemMeta(im); is.setItemMeta(im);
invI.setItem(2, is); invI.setItem(2, is);
is = new ItemStack(Material.SKULL_ITEM); is = new ItemStack(Material.SKULL_ITEM);
is.setDurability((short) 3); is.setDurability((short) 3);
im = is.getItemMeta(); im = is.getItemMeta();
im.setDisplayName("§cOblation"); im.setDisplayName("<EFBFBD>cOblation");
is.setItemMeta(im); is.setItemMeta(im);
invI.setItem(6, is); invI.setItem(6, is);
this.p = p; this.p = p;
@ -442,7 +450,7 @@ public class guillotine extends Furniture implements Listener{
boolean a = false,b = false,c = false; boolean a = false,b = false,c = false;
a = !packet1.isVisible(); a = !packet1.isVisible();
b = !packet2.isVisible(); b = !packet2.isVisible();
if(packet1.getItemInHand()!=null&&!packet1.getItemInHand().equals(Material.AIR)){ if(packet1.getItemInMainHand()!=null&&!packet1.getItemInMainHand().equals(Material.AIR)){
c = true; c = true;
} }
@ -566,12 +574,12 @@ public class guillotine extends Furniture implements Listener{
} }
if(invII.getItem(16)!=null){ if(invII.getItem(16)!=null){
packet1.getInventory().setItemInHand(invII.getItem(16)); packet1.getInventory().setItemInMainHand(invII.getItem(16));
} }
}else{ }else{
if(invII.getItem(43)!=null&&!invII.getItem(43).getType().equals(Material.AIR)){getWorld().dropItem(getLocation().clone().add(0, 1, 0), invII.getItem(43));} if(invII.getItem(43)!=null&&!invII.getItem(43).getType().equals(Material.AIR)){getWorld().dropItem(getLocation().clone().add(0, 1, 0), invII.getItem(43));}
if(invII.getItem(16)!=null&&!invII.getItem(16).getType().equals(Material.AIR)){getWorld().dropItem(getLocation().clone().add(0, 1, 0), invII.getItem(16));} if(invII.getItem(16)!=null&&!invII.getItem(16).getType().equals(Material.AIR)){getWorld().dropItem(getLocation().clone().add(0, 1, 0), invII.getItem(16));}
packet1.getInventory().setItemInHand(new ItemStack(Material.AIR)); packet1.getInventory().setItemInMainHand(new ItemStack(Material.AIR));
packet1.setName("#Executioner#"); packet1.setName("#Executioner#");
packet1.setNameVasibility(!invisible); packet1.setNameVasibility(!invisible);
} }
@ -602,9 +610,9 @@ public class guillotine extends Furniture implements Listener{
private void playSound(){ private void playSound(){
if(!soundPlaying){ if(!soundPlaying){
getWorld().playSound(getLocation(), Sound.GHAST_DEATH, 2, 1); getWorld().playSound(getLocation(), Sound.ENTITY_GHAST_DEATH, 2, 1);
getWorld().playSound(getLocation(), Sound.GHAST_SCREAM, 1, 1); getWorld().playSound(getLocation(), Sound.ENTITY_GHAST_SCREAM, 1, 1);
getWorld().playSound(getLocation(), Sound.GHAST_MOAN, 1, 1); getWorld().playSound(getLocation(), Sound.ENTITY_GHAST_WARN, 1, 1);
soundPlaying= true; soundPlaying= true;
} }
} }
@ -638,7 +646,7 @@ public class guillotine extends Furniture implements Listener{
case 19:inv.setItem(j, packet.getChestPlate());break; case 19:inv.setItem(j, packet.getChestPlate());break;
case 28:inv.setItem(j, packet.getLeggings());break; case 28:inv.setItem(j, packet.getLeggings());break;
case 37:inv.setItem(j, packet.getBoots());break; case 37:inv.setItem(j, packet.getBoots());break;
case 16:if(i==1){inv.setItem(j, packet.getItemInHand());break;} case 16:if(i==1){inv.setItem(j, packet.getItemInMainHand());break;}
case 43:if(i==1){inv.setItem(j, stack);break;} case 43:if(i==1){inv.setItem(j, stack);break;}
default: inv.setItem(j, pane);break; default: inv.setItem(j, pane);break;
} }

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

@ -62,9 +62,9 @@ public class weaponStand extends Furniture {
List<fArmorStand> asList = getManager().getfArmorStandByObjectID(getObjID()); List<fArmorStand> asList = getManager().getfArmorStandByObjectID(getObjID());
for(fArmorStand packet : asList){ for(fArmorStand packet : asList){
if(packet.getName()!=null&&!packet.getName().equalsIgnoreCase("")){ if(packet.getName()!=null&&!packet.getName().equalsIgnoreCase("")){
if(packet.getInventory().getItemInHand()!=null){ if(packet.getInventory().getItemInMainHand()!=null){
if(!packet.getInventory().getItemInHand().getType().equals(Material.AIR)){ if(!packet.getInventory().getItemInMainHand().getType().equals(Material.AIR)){
getWorld().dropItem(getLocation(), packet.getInventory().getItemInHand()); getWorld().dropItem(getLocation(), packet.getInventory().getItemInMainHand());
} }
} }
} }
@ -84,7 +84,7 @@ public class weaponStand extends Furniture {
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
this.p = e.getPlayer(); this.p = e.getPlayer();
ItemStack itemstack = p.getItemInHand(); ItemStack itemstack = p.getInventory().getItemInMainHand();
if(itemstack!=null&&matList.contains(itemstack.getType())){ if(itemstack!=null&&matList.contains(itemstack.getType())){
for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){
if(packet.getInventory().getHelmet()!=null){ if(packet.getInventory().getHelmet()!=null){
@ -104,12 +104,12 @@ public class weaponStand extends Furniture {
ItemMeta im1 = is1.getItemMeta(); ItemMeta im1 = is1.getItemMeta();
ItemMeta im3 = is3.getItemMeta(); ItemMeta im3 = is3.getItemMeta();
im1.setDisplayName("§c"); im1.setDisplayName("<EFBFBD>c");
im3.setDisplayName("§c"); im3.setDisplayName("<EFBFBD>c");
is1.setItemMeta(im1); is1.setItemMeta(im1);
is3.setItemMeta(im3); is3.setItemMeta(im3);
inv = Bukkit.createInventory(null, 45, "§cWeaponBox"); inv = Bukkit.createInventory(null, 45, "<EFBFBD>cWeaponBox");
List<fArmorStand> asList = getManager().getfArmorStandByObjectID(getObjID()); List<fArmorStand> asList = getManager().getfArmorStandByObjectID(getObjID());
int j = 1; int j = 1;
@ -122,7 +122,7 @@ public class weaponStand extends Furniture {
if(packet.getName()!=null&&!packet.getName().equalsIgnoreCase("")){ if(packet.getName()!=null&&!packet.getName().equalsIgnoreCase("")){
if(packet.getName().equalsIgnoreCase("#SLOT"+j+"#")){ if(packet.getName().equalsIgnoreCase("#SLOT"+j+"#")){
ItemStack is = new ItemStack(Material.AIR); ItemStack is = new ItemStack(Material.AIR);
if(packet.getInventory().getItemInHand()!=null){is = packet.getInventory().getItemInHand();} if(packet.getInventory().getItemInMainHand()!=null){is = packet.getInventory().getItemInMainHand();}
inv.setItem(i, is); inv.setItem(i, is);
} }
} }
@ -178,7 +178,7 @@ public class weaponStand extends Furniture {
if(packet.getName().equalsIgnoreCase("#SLOT"+j+"#")){ if(packet.getName().equalsIgnoreCase("#SLOT"+j+"#")){
ItemStack is = inv.getItem(i); ItemStack is = inv.getItem(i);
if(is==null){is = new ItemStack(Material.AIR);} if(is==null){is = new ItemStack(Material.AIR);}
packet.getInventory().setItemInHand(is); packet.getInventory().setItemInMainHand(is);
} }
} }
} }

12
src/de/Ste3et_C0st/Furniture/Objects/School/BlackBoard.java
View File

@ -89,20 +89,20 @@ public class BlackBoard extends Furniture implements Listener {
Player p = e.getPlayer(); Player p = e.getPlayer();
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
e.setCancelled(true); e.setCancelled(true);
if(p.getItemInHand().getType().isBlock()&&!p.getItemInHand().getType().equals(Material.AIR)){return;} if(p.getInventory().getItemInMainHand().getType().isBlock()&&!p.getInventory().getItemInMainHand().getType().equals(Material.AIR)){return;}
for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){
if(packet.getName().equalsIgnoreCase("#ITEM#")){ if(packet.getName().equalsIgnoreCase("#ITEM#")){
ItemStack Itemstack = p.getItemInHand().clone(); ItemStack Itemstack = p.getInventory().getItemInMainHand().clone();
Itemstack.setAmount(1); Itemstack.setAmount(1);
if(packet.getInventory().getItemInHand()!=null&&!packet.getInventory().getItemInHand().getType().equals(Material.AIR)){ if(packet.getInventory().getItemInMainHand()!=null&&!packet.getInventory().getItemInMainHand().getType().equals(Material.AIR)){
ItemStack is = packet.getInventory().getItemInHand(); ItemStack is = packet.getInventory().getItemInMainHand();
is.setAmount(1); is.setAmount(1);
getWorld().dropItem(getLocation(), is); getWorld().dropItem(getLocation(), is);
} }
packet.getInventory().setItemInHand(Itemstack); packet.getInventory().setItemInMainHand(Itemstack);
if(p.getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) break; if(p.getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) break;
Integer i = p.getInventory().getHeldItemSlot(); Integer i = p.getInventory().getHeldItemSlot();
ItemStack is = p.getItemInHand(); ItemStack is = p.getInventory().getItemInMainHand();
is.setAmount(is.getAmount()-1); is.setAmount(is.getAmount()-1);
p.getInventory().setItem(i, is); p.getInventory().setItem(i, is);
p.updateInventory(); p.updateInventory();

9
src/de/Ste3et_C0st/Furniture/Objects/School/SchoolChair.java
View File

@ -44,25 +44,25 @@ public class SchoolChair extends Furniture implements Listener {
loc4.setYaw(getYaw()+90); loc4.setYaw(getYaw()+90);
fArmorStand stand = spawnArmorStand(loc1); fArmorStand stand = spawnArmorStand(loc1);
stand.setItemInHand(new ItemStack(Material.STICK)); stand.setItemInMainHand(new ItemStack(Material.STICK));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-100, 0, 0))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-100, 0, 0)));
stand.setMarker(false); stand.setMarker(false);
asList.add(stand); asList.add(stand);
stand = spawnArmorStand(loc2); stand = spawnArmorStand(loc2);
stand.setItemInHand(new ItemStack(Material.STICK)); stand.setItemInMainHand(new ItemStack(Material.STICK));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-100, 0, 0))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-100, 0, 0)));
stand.setMarker(false); stand.setMarker(false);
asList.add(stand); asList.add(stand);
stand = spawnArmorStand(loc3); stand = spawnArmorStand(loc3);
stand.setItemInHand(new ItemStack(Material.STICK)); stand.setItemInMainHand(new ItemStack(Material.STICK));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-100, 0, 0))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-100, 0, 0)));
stand.setMarker(false); stand.setMarker(false);
asList.add(stand); asList.add(stand);
stand = spawnArmorStand(loc4); stand = spawnArmorStand(loc4);
stand.setItemInHand(new ItemStack(Material.STICK)); stand.setItemInMainHand(new ItemStack(Material.STICK));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-100, 0, 0))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-100, 0, 0)));
stand.setMarker(false); stand.setMarker(false);
asList.add(stand); asList.add(stand);
@ -93,6 +93,7 @@ public class SchoolChair extends Furniture implements Listener {
if(getObjID()==null){return;} if(getObjID()==null){return;}
if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;}
if(e.isCancelled()){return;} if(e.isCancelled()){return;}
if(e.getID()==null) return;
if(!e.getID().equals(getObjID())){return;} if(!e.getID().equals(getObjID())){return;}
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
delete(); delete();

24
src/de/Ste3et_C0st/Furniture/Objects/School/SchoolTable.java
View File

@ -43,8 +43,8 @@ public class SchoolTable extends Furniture implements Listener {
e.setCancelled(true); e.setCancelled(true);
for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){
if(packet.getName().equalsIgnoreCase("#ITEM#")){ if(packet.getName().equalsIgnoreCase("#ITEM#")){
if(packet.getInventory().getItemInHand()!=null&&!packet.getInventory().getItemInHand().getType().equals(Material.AIR)){ if(packet.getInventory().getItemInMainHand()!=null&&!packet.getInventory().getItemInMainHand().getType().equals(Material.AIR)){
ItemStack is = packet.getInventory().getItemInHand(); ItemStack is = packet.getInventory().getItemInMainHand();
getWorld().dropItem(getLocation(), is); getWorld().dropItem(getLocation(), is);
} }
} }
@ -62,20 +62,20 @@ public class SchoolTable extends Furniture implements Listener {
Player p = e.getPlayer(); Player p = e.getPlayer();
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
e.setCancelled(true); e.setCancelled(true);
if(p.getItemInHand().getType().isBlock()&&!p.getItemInHand().getType().equals(Material.AIR)){return;} if(p.getInventory().getItemInMainHand().getType().isBlock()&&!p.getInventory().getItemInMainHand().getType().equals(Material.AIR)){return;}
for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){
if(packet.getName().equalsIgnoreCase("#ITEM#")){ if(packet.getName().equalsIgnoreCase("#ITEM#")){
ItemStack Itemstack = p.getItemInHand().clone(); ItemStack Itemstack = p.getInventory().getItemInMainHand().clone();
Itemstack.setAmount(1); Itemstack.setAmount(1);
if(packet.getInventory().getItemInHand()!=null&&!packet.getInventory().getItemInHand().getType().equals(Material.AIR)){ if(packet.getInventory().getItemInMainHand()!=null&&!packet.getInventory().getItemInMainHand().getType().equals(Material.AIR)){
ItemStack is = packet.getInventory().getItemInHand(); ItemStack is = packet.getInventory().getItemInMainHand();
is.setAmount(1); is.setAmount(1);
getWorld().dropItem(getLocation(), is); getWorld().dropItem(getLocation(), is);
} }
packet.getInventory().setItemInHand(Itemstack); packet.getInventory().setItemInMainHand(Itemstack);
if(p.getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) break; if(p.getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) break;
Integer i = p.getInventory().getHeldItemSlot(); Integer i = p.getInventory().getHeldItemSlot();
ItemStack is = p.getItemInHand(); ItemStack is = p.getInventory().getItemInMainHand();
is.setAmount(is.getAmount()-1); is.setAmount(is.getAmount()-1);
p.getInventory().setItem(i, is); p.getInventory().setItem(i, is);
p.updateInventory(); p.updateInventory();
@ -102,25 +102,25 @@ public class SchoolTable extends Furniture implements Listener {
loc5.setYaw(getYaw()+90); loc5.setYaw(getYaw()+90);
fArmorStand stand = spawnArmorStand(loc1); fArmorStand stand = spawnArmorStand(loc1);
stand.setItemInHand(new ItemStack(Material.STICK)); stand.setItemInMainHand(new ItemStack(Material.STICK));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-100, 0, 0))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-100, 0, 0)));
stand.setMarker(false); stand.setMarker(false);
asList.add(stand); asList.add(stand);
stand = spawnArmorStand(loc2); stand = spawnArmorStand(loc2);
stand.setItemInHand(new ItemStack(Material.STICK)); stand.setItemInMainHand(new ItemStack(Material.STICK));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-100, 0, 0))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-100, 0, 0)));
stand.setMarker(false); stand.setMarker(false);
asList.add(stand); asList.add(stand);
stand = spawnArmorStand(loc3); stand = spawnArmorStand(loc3);
stand.setItemInHand(new ItemStack(Material.STICK)); stand.setItemInMainHand(new ItemStack(Material.STICK));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-100, 0, 0))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-100, 0, 0)));
stand.setMarker(false); stand.setMarker(false);
asList.add(stand); asList.add(stand);
stand = spawnArmorStand(loc4); stand = spawnArmorStand(loc4);
stand.setItemInHand(new ItemStack(Material.STICK)); stand.setItemInMainHand(new ItemStack(Material.STICK));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-100, 0, 0))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-100, 0, 0)));
stand.setMarker(false); stand.setMarker(false);
asList.add(stand); asList.add(stand);

10
src/de/Ste3et_C0st/Furniture/Objects/School/TrashCan.java
View File

@ -48,7 +48,7 @@ public class TrashCan extends Furniture implements Listener {
if(e.isCancelled()) return; if(e.isCancelled()) return;
if(!e.getID().equals(getObjID())) return; if(!e.getID().equals(getObjID())) return;
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
ItemStack is = e.getPlayer().getItemInHand(); ItemStack is = e.getPlayer().getInventory().getItemInMainHand();
fArmorStand stand = null; fArmorStand stand = null;
for(fArmorStand s : getfAsList()){ for(fArmorStand s : getfAsList()){
if(s.getName().equalsIgnoreCase("#TRASH#")){ if(s.getName().equalsIgnoreCase("#TRASH#")){
@ -57,14 +57,14 @@ public class TrashCan extends Furniture implements Listener {
} }
if(stand==null){return;} if(stand==null){return;}
if(is==null||is.getType()==null||is.getType().equals(Material.AIR)){ if(is==null||is.getType()==null||is.getType().equals(Material.AIR)){
if(stand.getItemInHand()!=null&&!stand.getItemInHand().getType().equals(Material.AIR)){ if(stand.getItemInMainHand()!=null&&!stand.getItemInMainHand().getType().equals(Material.AIR)){
getWorld().dropItem(getCenter(), stand.getItemInHand()); getWorld().dropItem(getCenter(), stand.getItemInMainHand());
stand.setItemInHand(new ItemStack(Material.AIR)); stand.setItemInMainHand(new ItemStack(Material.AIR));
update(); update();
return; return;
} }
} }
stand.setItemInHand(is); stand.setItemInMainHand(is);
e.getPlayer().getInventory().clear(e.getPlayer().getInventory().getHeldItemSlot()); e.getPlayer().getInventory().clear(e.getPlayer().getInventory().getHeldItemSlot());
e.getPlayer().updateInventory(); e.getPlayer().updateInventory();
update(); update();

12
src/de/Ste3et_C0st/Furniture/Objects/christmas/AdventCalender.java
View File

@ -14,6 +14,8 @@ import java.util.List;
import java.util.Random; import java.util.Random;
import java.util.UUID; import java.util.UUID;
import net.md_5.bungee.api.ChatColor;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
@ -101,7 +103,7 @@ public class AdventCalender extends Furniture implements Listener {
if(e.isCancelled()){return;} if(e.isCancelled()){return;}
if(e.getID() == null || getObjID() == null) return; if(e.getID() == null || getObjID() == null) return;
if(!e.getID().equals(getObjID())){return;} if(!e.getID().equals(getObjID())){return;}
ItemStack is = e.getPlayer().getItemInHand(); ItemStack is = e.getPlayer().getInventory().getItemInMainHand();
if(is==null){open(e.getPlayer()); return;} if(is==null){open(e.getPlayer()); return;}
if(is.getType()==null){open(e.getPlayer()); return;} if(is.getType()==null){open(e.getPlayer()); return;}
if(is.getType().equals(Material.ARROW)){ if(is.getType().equals(Material.ARROW)){
@ -142,10 +144,12 @@ public class AdventCalender extends Furniture implements Listener {
if(name.startsWith("@PLAYER ")){ if(name.startsWith("@PLAYER ")){
name = name.replace("%player%", p.getName()); name = name.replace("%player%", p.getName());
name = name.replace("@PLAYER ", ""); name = name.replace("@PLAYER ", "");
name = ChatColor.translateAlternateColorCodes('&', name);
p.sendMessage(name); p.sendMessage(name);
}else if(name.startsWith("@BROADCAST ")){ }else if(name.startsWith("@BROADCAST ")){
name = name.replace("%player%", p.getName()); name = name.replace("%player%", p.getName());
name = name.replace("@BROADCAST ", ""); name = name.replace("@BROADCAST ", "");
name = ChatColor.translateAlternateColorCodes('&', name);
getLib().getServer().broadcastMessage(name); getLib().getServer().broadcastMessage(name);
} }
} }
@ -291,7 +295,7 @@ public class AdventCalender extends Furniture implements Listener {
} }
private void openInventory(ItemStack[] is){ private void openInventory(ItemStack[] is){
inv = Bukkit.createInventory(null, 54, "§8Christmas Reward [§c" + i + "§8]"); inv = Bukkit.createInventory(null, 54, "<EFBFBD>8Christmas Reward [<5B>c" + i + "<EFBFBD>8]");
if(is!=null) inv.setContents(is); if(is!=null) inv.setContents(is);
p.openInventory(inv); p.openInventory(inv);
} }
@ -309,7 +313,7 @@ public class AdventCalender extends Furniture implements Listener {
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(210, 190, 305))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(210, 190, 305)));
stand.setHeadPose(getLutil().degresstoRad(new EulerAngle(60, 0, 0))); stand.setHeadPose(getLutil().degresstoRad(new EulerAngle(60, 0, 0)));
stand.setHelmet(new ItemStack(Material.GOLD_BLOCK)); stand.setHelmet(new ItemStack(Material.GOLD_BLOCK));
stand.setItemInHand(new ItemStack(Material.LEAVES)); stand.setItemInMainHand(new ItemStack(Material.LEAVES));
asList.add(stand); asList.add(stand);
l+=o; l+=o;
} }
@ -322,7 +326,7 @@ public class AdventCalender extends Furniture implements Listener {
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(210, 190, 305))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(210, 190, 305)));
stand.setHeadPose(getLutil().degresstoRad(new EulerAngle(60, 0, 0))); stand.setHeadPose(getLutil().degresstoRad(new EulerAngle(60, 0, 0)));
stand.setHelmet(new ItemStack(Material.LEAVES)); stand.setHelmet(new ItemStack(Material.LEAVES));
stand.setItemInHand(new ItemStack(Material.LEAVES)); stand.setItemInMainHand(new ItemStack(Material.LEAVES));
stand.setSmall(true); stand.setSmall(true);
asList.add(stand); asList.add(stand);
l+=o; l+=o;

5
src/de/Ste3et_C0st/Furniture/Objects/christmas/AdventWreath.java
View File

@ -55,6 +55,7 @@ public class AdventWreath extends Furniture implements Listener {
public void onFurnitureClick(FurnitureClickEvent e) { public void onFurnitureClick(FurnitureClickEvent e) {
if(getObjID()==null){return;} if(getObjID()==null){return;}
if(e.isCancelled()){return;} if(e.isCancelled()){return;}
if(e.getID()==null) return;
if(!e.getID().equals(getObjID())){return;} if(!e.getID().equals(getObjID())){return;}
if(e.getID() == null || getObjID() == null) return; if(e.getID() == null || getObjID() == null) return;
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
@ -102,7 +103,7 @@ public class AdventWreath extends Furniture implements Listener {
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(210, 190, 305))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(210, 190, 305)));
stand.setHeadPose(getLutil().degresstoRad(new EulerAngle(60, 0, 0))); stand.setHeadPose(getLutil().degresstoRad(new EulerAngle(60, 0, 0)));
stand.setHelmet(new ItemStack(Material.GOLD_BLOCK)); stand.setHelmet(new ItemStack(Material.GOLD_BLOCK));
stand.setItemInHand(new ItemStack(Material.LEAVES)); stand.setItemInMainHand(new ItemStack(Material.LEAVES));
asList.add(stand); asList.add(stand);
l+=o; l+=o;
@ -116,7 +117,7 @@ public class AdventWreath extends Furniture implements Listener {
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(210, 190, 305))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(210, 190, 305)));
stand.setHeadPose(getLutil().degresstoRad(new EulerAngle(60, 0, 0))); stand.setHeadPose(getLutil().degresstoRad(new EulerAngle(60, 0, 0)));
stand.setHelmet(new ItemStack(Material.LEAVES)); stand.setHelmet(new ItemStack(Material.LEAVES));
stand.setItemInHand(new ItemStack(Material.LEAVES)); stand.setItemInMainHand(new ItemStack(Material.LEAVES));
stand.setSmall(true); stand.setSmall(true);
asList.add(stand); asList.add(stand);
l+=o; l+=o;

4
src/de/Ste3et_C0st/Furniture/Objects/christmas/ChristmasTree.java
View File

@ -74,12 +74,12 @@ public class ChristmasTree extends Furniture implements Listener{
asList.add(stand); asList.add(stand);
stand = spawnArmorStand(getRelative(getCenter(), getBlockFace(), .5, .4).add(0, d+.2, 0)); stand = spawnArmorStand(getRelative(getCenter(), getBlockFace(), .5, .4).add(0, d+.2, 0));
stand.setItemInHand(new ItemStack(Material.STICK)); stand.setItemInMainHand(new ItemStack(Material.STICK));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(80, 0, 0))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(80, 0, 0)));
asList.add(stand); asList.add(stand);
stand = spawnArmorStand(getRelative(getCenter(), getBlockFace(), .5, .4).add(0, d+3.3, 0)); stand = spawnArmorStand(getRelative(getCenter(), getBlockFace(), .5, .4).add(0, d+3.3, 0));
stand.setItemInHand(new ItemStack(Material.STICK)); stand.setItemInMainHand(new ItemStack(Material.STICK));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(80, 0, 0))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(80, 0, 0)));
asList.add(stand); asList.add(stand);

32
src/de/Ste3et_C0st/Furniture/Objects/christmas/FireworkLauncher.java
View File

@ -44,8 +44,8 @@ public class FireworkLauncher extends Furniture implements Listener {
if(!canBuild(e.getPlayer())){return;} if(!canBuild(e.getPlayer())){return;}
for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){
if(packet.getName().equalsIgnoreCase("#FIREWORK#")){ if(packet.getName().equalsIgnoreCase("#FIREWORK#")){
if(packet.getInventory().getItemInHand()!=null&&!packet.getInventory().getItemInHand().getType().equals(Material.AIR)){ if(packet.getInventory().getItemInMainHand()!=null&&!packet.getInventory().getItemInMainHand().getType().equals(Material.AIR)){
ItemStack is = packet.getInventory().getItemInHand(); ItemStack is = packet.getInventory().getItemInMainHand();
getWorld().dropItem(getLocation(), is); getWorld().dropItem(getLocation(), is);
} }
} }
@ -71,11 +71,11 @@ public class FireworkLauncher extends Furniture implements Listener {
} }
} }
if(stand == null) return; if(stand == null) return;
if(p.getItemInHand()!=null){ if(p.getInventory().getItemInMainHand()!=null){
if(p.getItemInHand().getType()!=null){ if(p.getInventory().getItemInMainHand().getType()!=null){
if(p.getItemInHand().getType().equals(Material.FIREWORK)){ if(p.getInventory().getItemInMainHand().getType().equals(Material.FIREWORK)){
drop(stand); drop(stand);
setItem(stand, p.getItemInHand()); setItem(stand, p.getInventory().getItemInMainHand());
Bukkit.getScheduler().runTaskLater(getPlugin(), new Runnable() { Bukkit.getScheduler().runTaskLater(getPlugin(), new Runnable() {
@ -88,7 +88,7 @@ public class FireworkLauncher extends Furniture implements Listener {
if(e.getPlayer().getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) return; if(e.getPlayer().getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) return;
Integer i = e.getPlayer().getInventory().getHeldItemSlot(); Integer i = e.getPlayer().getInventory().getHeldItemSlot();
ItemStack is = e.getPlayer().getItemInHand(); ItemStack is = e.getPlayer().getInventory().getItemInMainHand();
is.setAmount(is.getAmount()-1); is.setAmount(is.getAmount()-1);
p.getInventory().setItem(i, is); p.getInventory().setItem(i, is);
p.updateInventory(); p.updateInventory();
@ -99,7 +99,7 @@ public class FireworkLauncher extends Furniture implements Listener {
if(canLaunch(stand)){ if(canLaunch(stand)){
Firework fw = (Firework) getWorld().spawnEntity(getCenter(), EntityType.FIREWORK); Firework fw = (Firework) getWorld().spawnEntity(getCenter(), EntityType.FIREWORK);
FireworkMeta meta = (FireworkMeta) stand.getItemInHand().getItemMeta(); FireworkMeta meta = (FireworkMeta) stand.getItemInMainHand().getItemMeta();
fw.setFireworkMeta(meta); fw.setFireworkMeta(meta);
setItem(stand, new ItemStack(Material.AIR)); setItem(stand, new ItemStack(Material.AIR));
} }
@ -110,8 +110,8 @@ public class FireworkLauncher extends Furniture implements Listener {
} }
public boolean canLaunch(fArmorStand stand){ public boolean canLaunch(fArmorStand stand){
if(stand.getItemInHand()!=null){ if(stand.getItemInMainHand()!=null){
if(stand.getItemInHand().getType().equals(Material.FIREWORK)){ if(stand.getItemInMainHand().getType().equals(Material.FIREWORK)){
return true; return true;
} }
} }
@ -121,14 +121,14 @@ public class FireworkLauncher extends Furniture implements Listener {
public void setItem(fArmorStand stand, ItemStack is){ public void setItem(fArmorStand stand, ItemStack is){
ItemStack stack = is.clone(); ItemStack stack = is.clone();
stack.setAmount(1); stack.setAmount(1);
stand.setItemInHand(stack); stand.setItemInMainHand(stack);
update(); update();
} }
public void drop(fArmorStand stand){ public void drop(fArmorStand stand){
if(stand.getItemInHand()!=null){ if(stand.getItemInMainHand()!=null){
getWorld().dropItem(getCenter(), stand.getItemInHand()); getWorld().dropItem(getCenter(), stand.getItemInMainHand());
stand.setItemInHand(new ItemStack(Material.AIR)); stand.setItemInMainHand(new ItemStack(Material.AIR));
update(); update();
} }
} }
@ -139,12 +139,12 @@ public class FireworkLauncher extends Furniture implements Listener {
double d = -1.2; double d = -1.2;
fArmorStand stand = spawnArmorStand(getRelative(getCenter(), getBlockFace(), .5, .4).add(0, d+.2, 0)); fArmorStand stand = spawnArmorStand(getRelative(getCenter(), getBlockFace(), .5, .4).add(0, d+.2, 0));
stand.setItemInHand(new ItemStack(Material.STICK)); stand.setItemInMainHand(new ItemStack(Material.STICK));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(80, 0, 0))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(80, 0, 0)));
asList.add(stand); asList.add(stand);
stand = spawnArmorStand(getRelative(getCenter(), getBlockFace(), .5, .4).add(0, d+.9, 0)); stand = spawnArmorStand(getRelative(getCenter(), getBlockFace(), .5, .4).add(0, d+.9, 0));
stand.setItemInHand(new ItemStack(Material.STICK)); stand.setItemInMainHand(new ItemStack(Material.STICK));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(80, 0, 0))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(80, 0, 0)));
asList.add(stand); asList.add(stand);

14
src/de/Ste3et_C0st/Furniture/Objects/christmas/SnowGolem.java
View File

@ -83,7 +83,7 @@ public class SnowGolem extends Furniture implements Listener{
Location loc = getRelative(getCenter().add(0, -.25, 0), -.18, -.54); Location loc = getRelative(getCenter().add(0, -.25, 0), -.18, -.54);
loc.setYaw(getYaw()+90); loc.setYaw(getYaw()+90);
stand = spawnArmorStand(loc); stand = spawnArmorStand(loc);
stand.setItemInHand(new ItemStack(Material.CARROT_ITEM)); stand.setItemInMainHand(new ItemStack(Material.CARROT_ITEM));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(90, 0, -40))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(90, 0, -40)));
stand.setMarker(false); stand.setMarker(false);
asList.add(stand); asList.add(stand);
@ -91,7 +91,7 @@ public class SnowGolem extends Furniture implements Listener{
loc = getRelative(getCenter().add(0, .2, 0), .05, -.15); loc = getRelative(getCenter().add(0, .2, 0), .05, -.15);
loc.setYaw(getYaw()+90); loc.setYaw(getYaw()+90);
stand = spawnArmorStand(loc); stand = spawnArmorStand(loc);
stand.setItemInHand(new ItemStack(Material.COAL_BLOCK)); stand.setItemInMainHand(new ItemStack(Material.COAL_BLOCK));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(70f, 0f, 45f))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(70f, 0f, 45f)));
stand.setSmall(true); stand.setSmall(true);
asList.add(stand); asList.add(stand);
@ -99,7 +99,7 @@ public class SnowGolem extends Furniture implements Listener{
loc = getRelative(getCenter().add(0, .2, 0), .05, -.45); loc = getRelative(getCenter().add(0, .2, 0), .05, -.45);
loc.setYaw(getYaw()+90); loc.setYaw(getYaw()+90);
stand = spawnArmorStand(loc); stand = spawnArmorStand(loc);
stand.setItemInHand(new ItemStack(Material.COAL_BLOCK)); stand.setItemInMainHand(new ItemStack(Material.COAL_BLOCK));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(70f, 0f, 45f))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(70f, 0f, 45f)));
stand.setSmall(true); stand.setSmall(true);
asList.add(stand); asList.add(stand);
@ -107,7 +107,7 @@ public class SnowGolem extends Furniture implements Listener{
loc = getRelative(getCenter().add(0, -.55, 0), -.15, -.28); loc = getRelative(getCenter().add(0, -.55, 0), -.15, -.28);
loc.setYaw(getYaw()+90); loc.setYaw(getYaw()+90);
stand = spawnArmorStand(loc); stand = spawnArmorStand(loc);
stand.setItemInHand(new ItemStack(Material.COAL_BLOCK)); stand.setItemInMainHand(new ItemStack(Material.COAL_BLOCK));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(70f, 0f, 45f))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(70f, 0f, 45f)));
stand.setSmall(true); stand.setSmall(true);
asList.add(stand); asList.add(stand);
@ -115,7 +115,7 @@ public class SnowGolem extends Furniture implements Listener{
loc = getRelative(getCenter().add(0, -.95, 0), -.15, -.28); loc = getRelative(getCenter().add(0, -.95, 0), -.15, -.28);
loc.setYaw(getYaw()+90); loc.setYaw(getYaw()+90);
stand = spawnArmorStand(loc); stand = spawnArmorStand(loc);
stand.setItemInHand(new ItemStack(Material.COAL_BLOCK)); stand.setItemInMainHand(new ItemStack(Material.COAL_BLOCK));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(70f, 0f, 45f))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(70f, 0f, 45f)));
stand.setSmall(true); stand.setSmall(true);
asList.add(stand); asList.add(stand);
@ -123,14 +123,14 @@ public class SnowGolem extends Furniture implements Listener{
loc = getRelative(getCenter().add(0, -.45, 0), .0, 1.22); loc = getRelative(getCenter().add(0, -.45, 0), .0, 1.22);
loc.setYaw(getYaw()); loc.setYaw(getYaw());
stand = spawnArmorStand(loc); stand = spawnArmorStand(loc);
stand.setItemInHand(new ItemStack(Material.STICK)); stand.setItemInMainHand(new ItemStack(Material.STICK));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(90f,90f,70f))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(90f,90f,70f)));
asList.add(stand); asList.add(stand);
loc = getRelative(getCenter().add(0, -.45, 0), -.1, -1.22); loc = getRelative(getCenter().add(0, -.45, 0), -.1, -1.22);
loc.setYaw(getYaw()+180); loc.setYaw(getYaw()+180);
stand = spawnArmorStand(loc); stand = spawnArmorStand(loc);
stand.setItemInHand(new ItemStack(Material.STICK)); stand.setItemInMainHand(new ItemStack(Material.STICK));
stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(90f,90f,70f))); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(90f,90f,70f)));
asList.add(stand); asList.add(stand);

8
src/de/Ste3et_C0st/Furniture/Objects/electric/billboard.java
View File

@ -41,7 +41,7 @@ public class billboard extends Furniture implements Listener{
Location loc = getLutil().getRelativ(center.clone(), getBlockFace(), -.1, -.5).add(0, .88*i, 0); Location loc = getLutil().getRelativ(center.clone(), getBlockFace(), -.1, -.5).add(0, .88*i, 0);
loc.setYaw(loc.getYaw()+90); loc.setYaw(loc.getYaw()+90);
fArmorStand packet = getManager().createArmorStand(getObjID(), loc); fArmorStand packet = getManager().createArmorStand(getObjID(), loc);
packet.getInventory().setItemInHand(new ItemStack(Material.STICK)); packet.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
packet.setPose(new EulerAngle(1.39, 0, 0), BodyPart.RIGHT_ARM); packet.setPose(new EulerAngle(1.39, 0, 0), BodyPart.RIGHT_ARM);
asList.add(packet); asList.add(packet);
} }
@ -50,7 +50,7 @@ public class billboard extends Furniture implements Listener{
Location loc = getLutil().getRelativ(center2.clone(), getBlockFace(), -.1, -.5).add(0, .88*i, 0); Location loc = getLutil().getRelativ(center2.clone(), getBlockFace(), -.1, -.5).add(0, .88*i, 0);
loc.setYaw(loc.getYaw()+90); loc.setYaw(loc.getYaw()+90);
fArmorStand packet = getManager().createArmorStand(getObjID(), loc); fArmorStand packet = getManager().createArmorStand(getObjID(), loc);
packet.getInventory().setItemInHand(new ItemStack(Material.STICK)); packet.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
packet.setPose(new EulerAngle(1.39, 0, 0), BodyPart.RIGHT_ARM); packet.setPose(new EulerAngle(1.39, 0, 0), BodyPart.RIGHT_ARM);
asList.add(packet); asList.add(packet);
} }
@ -59,7 +59,7 @@ public class billboard extends Furniture implements Listener{
Location loc = getLutil().getRelativ(center3.clone(), getBlockFace(), -.1, .88*i).add(0, .7D, 0); Location loc = getLutil().getRelativ(center3.clone(), getBlockFace(), -.1, .88*i).add(0, .7D, 0);
loc.setYaw(loc.getYaw()+90); loc.setYaw(loc.getYaw()+90);
fArmorStand packet = getManager().createArmorStand(getObjID(), loc); fArmorStand packet = getManager().createArmorStand(getObjID(), loc);
packet.getInventory().setItemInHand(new ItemStack(Material.STICK)); packet.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
packet.setPose(new EulerAngle(-.17, 0, 0), BodyPart.RIGHT_ARM); packet.setPose(new EulerAngle(-.17, 0, 0), BodyPart.RIGHT_ARM);
asList.add(packet); asList.add(packet);
} }
@ -68,7 +68,7 @@ public class billboard extends Furniture implements Listener{
Location loc = getLutil().getRelativ(center3.clone(), getBlockFace(), -.1, .88*i).add(0, 2.9D, 0); Location loc = getLutil().getRelativ(center3.clone(), getBlockFace(), -.1, .88*i).add(0, 2.9D, 0);
loc.setYaw(loc.getYaw()+90); loc.setYaw(loc.getYaw()+90);
fArmorStand packet = getManager().createArmorStand(getObjID(), loc); fArmorStand packet = getManager().createArmorStand(getObjID(), loc);
packet.getInventory().setItemInHand(new ItemStack(Material.STICK)); packet.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
packet.setPose(new EulerAngle(-.17, 0, 0), BodyPart.RIGHT_ARM); packet.setPose(new EulerAngle(-.17, 0, 0), BodyPart.RIGHT_ARM);
asList.add(packet); asList.add(packet);
} }

16
src/de/Ste3et_C0st/Furniture/Objects/electric/camera.java
View File

@ -40,8 +40,8 @@ public class camera extends Furniture implements Listener{
List<fArmorStand> aspList = new ArrayList<fArmorStand>(); List<fArmorStand> aspList = new ArrayList<fArmorStand>();
BlockFace b = getLutil().yawToFace(location.getYaw()).getOppositeFace(); BlockFace b = getLutil().yawToFace(location.getYaw()).getOppositeFace();
Location center = getLutil().getCenter(location); Location center = getLutil().getCenter(location);
Location gehäuse = getLutil().getRelativ(center, b, 0D, 0D).add(0,-1.0,0); Location gehäuse = getLutil().getRelativ(center, b, 0D, 0D).add(0,-1.0,0);
Location gehäuse2 = getLutil().getRelativ(center, b, 0D, 0D).add(0,-0.4,0); Location gehäuse2 = getLutil().getRelativ(center, b, 0D, 0D).add(0,-0.4,0);
Location fokus = getLutil().getRelativ(center, b, .15D, 0D).add(0,-.24,0); Location fokus = getLutil().getRelativ(center, b, .15D, 0D).add(0,-.24,0);
Location search = getLutil().getRelativ(center, b, .15D, 0D).add(0,-.7,0); Location search = getLutil().getRelativ(center, b, .15D, 0D).add(0,-.7,0);
Location button = getLutil().getRelativ(center, b, -.15D, -.15D).add(0,.08,0); Location button = getLutil().getRelativ(center, b, -.15D, -.15D).add(0,.08,0);
@ -50,7 +50,7 @@ public class camera extends Furniture implements Listener{
Location feet2 = getLutil().getRelativ(center, b, -.2D, -.7D).add(0,-.9,0); Location feet2 = getLutil().getRelativ(center, b, -.2D, -.7D).add(0,-.9,0);
Location feet3 = getLutil().getRelativ(center, b, -.7D, .2D).add(0,-.9,0); Location feet3 = getLutil().getRelativ(center, b, -.7D, .2D).add(0,-.9,0);
gehäuse.setYaw(getLutil().FaceToYaw(b)); gehäuse.setYaw(getLutil().FaceToYaw(b));
fokus.setYaw(getLutil().FaceToYaw(b)); fokus.setYaw(getLutil().FaceToYaw(b));
search.setYaw(getLutil().FaceToYaw(b)); search.setYaw(getLutil().FaceToYaw(b));
button.setYaw(getLutil().FaceToYaw(b)); button.setYaw(getLutil().FaceToYaw(b));
@ -58,11 +58,11 @@ public class camera extends Furniture implements Listener{
feet2.setYaw(getLutil().FaceToYaw(b) + 180 - 45); feet2.setYaw(getLutil().FaceToYaw(b) + 180 - 45);
feet3.setYaw(getLutil().FaceToYaw(b) + 180 + 45); feet3.setYaw(getLutil().FaceToYaw(b) + 180 + 45);
fArmorStand as = getManager().createArmorStand(getObjID(), gehäuse); fArmorStand as = getManager().createArmorStand(getObjID(), gehäuse);
as.getInventory().setHelmet(new ItemStack(Material.WOOL, 1, (short) 15)); as.getInventory().setHelmet(new ItemStack(Material.WOOL, 1, (short) 15));
aspList.add(as); aspList.add(as);
as = getManager().createArmorStand(getObjID(), gehäuse2); as = getManager().createArmorStand(getObjID(), gehäuse2);
as.getInventory().setHelmet(new ItemStack(Material.WOOL, 1, (short) 15)); as.getInventory().setHelmet(new ItemStack(Material.WOOL, 1, (short) 15));
as.setSmall(true); as.setSmall(true);
aspList.add(as); aspList.add(as);
@ -82,17 +82,17 @@ public class camera extends Furniture implements Listener{
aspList.add(as); aspList.add(as);
as = getManager().createArmorStand(getObjID(), feet1); as = getManager().createArmorStand(getObjID(), feet1);
as.getInventory().setItemInHand(new ItemStack(Material.STICK)); as.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
as.setPose(new EulerAngle(1.2, 0, 0), BodyPart.RIGHT_ARM); as.setPose(new EulerAngle(1.2, 0, 0), BodyPart.RIGHT_ARM);
aspList.add(as); aspList.add(as);
as = getManager().createArmorStand(getObjID(), feet2); as = getManager().createArmorStand(getObjID(), feet2);
as.getInventory().setItemInHand(new ItemStack(Material.STICK)); as.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
as.setPose(new EulerAngle(1.2, 0, 0), BodyPart.RIGHT_ARM); as.setPose(new EulerAngle(1.2, 0, 0), BodyPart.RIGHT_ARM);
aspList.add(as); aspList.add(as);
as = getManager().createArmorStand(getObjID(), feet3); as = getManager().createArmorStand(getObjID(), feet3);
as.getInventory().setItemInHand(new ItemStack(Material.STICK)); as.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
as.setPose(new EulerAngle(1.2, 0, 0), BodyPart.RIGHT_ARM); as.setPose(new EulerAngle(1.2, 0, 0), BodyPart.RIGHT_ARM);
aspList.add(as); aspList.add(as);

6
src/de/Ste3et_C0st/Furniture/Objects/electric/streetlamp.java
View File

@ -64,21 +64,21 @@ public class streetlamp extends Furniture implements Listener{
for(int i = 0; i<=3;i++){ for(int i = 0; i<=3;i++){
Location loc = getLutil().getRelativ(center.clone(), getBlockFace(), .47, .38).add(0, .88*i, 0); Location loc = getLutil().getRelativ(center.clone(), getBlockFace(), .47, .38).add(0, .88*i, 0);
fArmorStand packet = getManager().createArmorStand(getObjID(), loc); fArmorStand packet = getManager().createArmorStand(getObjID(), loc);
packet.getInventory().setItemInHand(new ItemStack(Material.STICK)); packet.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
packet.setPose(new EulerAngle(1.39, 0, 0), BodyPart.RIGHT_ARM); packet.setPose(new EulerAngle(1.39, 0, 0), BodyPart.RIGHT_ARM);
asList.add(packet); asList.add(packet);
} }
fArmorStand packet = getManager().createArmorStand(getObjID(), getLutil().getRelativ(center, getBlockFace(), -.9, .38).add(0, 3.1, 0)); fArmorStand packet = getManager().createArmorStand(getObjID(), getLutil().getRelativ(center, getBlockFace(), -.9, .38).add(0, 3.1, 0));
packet.getInventory().setItemInHand(new ItemStack(Material.STICK)); packet.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
packet.setPose(new EulerAngle(-.17, 0, 0), BodyPart.RIGHT_ARM); packet.setPose(new EulerAngle(-.17, 0, 0), BodyPart.RIGHT_ARM);
asList.add(packet); asList.add(packet);
float yaw = getLutil().FaceToYaw(getBlockFace()); float yaw = getLutil().FaceToYaw(getBlockFace());
BlockFace face = getLutil().yawToFace(yaw +90); BlockFace face = getLutil().yawToFace(yaw +90);
packet = getManager().createArmorStand(getObjID(), getLutil().getRelativ(center, getBlockFace(), -.4, .38).add(0, 2.68, 0)); packet = getManager().createArmorStand(getObjID(), getLutil().getRelativ(center, getBlockFace(), -.4, .38).add(0, 2.68, 0));
packet.getInventory().setItemInHand(new ItemStack(Material.STICK)); packet.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
packet.setPose(new EulerAngle(1.39, 0, 0), BodyPart.RIGHT_ARM); packet.setPose(new EulerAngle(1.39, 0, 0), BodyPart.RIGHT_ARM);
asList.add(packet); asList.add(packet);

2
src/de/Ste3et_C0st/Furniture/Objects/garden/TFlowerPot.java
View File

@ -53,7 +53,7 @@ public class TFlowerPot extends Furniture implements Listener {
fArmorStand asp = getManager().createArmorStand(getObjID(), location); fArmorStand asp = getManager().createArmorStand(getObjID(), location);
asp.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-115,45,0))); asp.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-115,45,0)));
asp.getInventory().setItemInHand(new ItemStack(Material.STICK)); asp.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
packetList.add(asp); packetList.add(asp);
yaw+=90; yaw+=90;

8
src/de/Ste3et_C0st/Furniture/Objects/garden/Trunk.java
View File

@ -49,11 +49,11 @@ public class Trunk extends Furniture implements Listener {
if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;}
if(e.isCancelled()){return;} if(e.isCancelled()){return;}
if(!e.getID().equals(getObjID())){return;} if(!e.getID().equals(getObjID())){return;}
if(!e.getPlayer().getItemInHand().getType().isBlock()|| if(!e.getPlayer().getInventory().getItemInMainHand().getType().isBlock()||
e.getPlayer().getItemInHand().getType().equals(Material.AIR)){setPassanger(e.getfArmorStand(), e.getPlayer());return;} e.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.AIR)){setPassanger(e.getfArmorStand(), e.getPlayer());return;}
if(e.getPlayer().isSneaking()){setPassanger(e.getfArmorStand(), e.getPlayer());return;} if(e.getPlayer().isSneaking()){setPassanger(e.getfArmorStand(), e.getPlayer());return;}
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
ItemStack stack = e.getPlayer().getItemInHand(); ItemStack stack = e.getPlayer().getInventory().getItemInMainHand();
stack.setAmount(1); stack.setAmount(1);
for(fArmorStand stand : getfAsList()){ for(fArmorStand stand : getfAsList()){
if(stand.getName().startsWith("#TO")){ if(stand.getName().startsWith("#TO")){
@ -64,7 +64,7 @@ public class Trunk extends Furniture implements Listener {
if(e.getPlayer().getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) return; if(e.getPlayer().getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) return;
Integer i = e.getPlayer().getInventory().getHeldItemSlot(); Integer i = e.getPlayer().getInventory().getHeldItemSlot();
ItemStack item = e.getPlayer().getItemInHand(); ItemStack item = e.getPlayer().getInventory().getItemInMainHand();
item.setAmount(item.getAmount()-1); item.setAmount(item.getAmount()-1);
e.getPlayer().getInventory().setItem(i, item); e.getPlayer().getInventory().setItem(i, item);
e.getPlayer().updateInventory(); e.getPlayer().updateInventory();

12
src/de/Ste3et_C0st/Furniture/Objects/garden/WaterBottle.java
View File

@ -61,10 +61,10 @@ public class WaterBottle extends Furniture implements Listener {
if(e.isCancelled()){return;} if(e.isCancelled()){return;}
if(!e.getID().equals(getObjID())){return;} if(!e.getID().equals(getObjID())){return;}
if(!canInteract(e.getPlayer())){return;} if(!canInteract(e.getPlayer())){return;}
Material data = e.getPlayer().getItemInHand().getType(); Material data = e.getPlayer().getInventory().getItemInMainHand().getType();
fArmorStand stand = removeItem(); fArmorStand stand = removeItem();
if(matList.contains(data)){ if(matList.contains(data)){
ItemStack is = e.getPlayer().getItemInHand(); ItemStack is = e.getPlayer().getInventory().getItemInMainHand();
is.setAmount(1); is.setAmount(1);
stand.setHelmet(is); stand.setHelmet(is);
update(); update();
@ -76,8 +76,8 @@ public class WaterBottle extends Furniture implements Listener {
for(fArmorStand stand : getfAsList()){ for(fArmorStand stand : getfAsList()){
if(stand.getName().equalsIgnoreCase("#ITEM#")){ if(stand.getName().equalsIgnoreCase("#ITEM#")){
fstand = stand; fstand = stand;
if(stand.getItemInHand()!=null&&!stand.getItemInHand().equals(Material.AIR)){ if(stand.getItemInMainHand()!=null&&!stand.getItemInMainHand().equals(Material.AIR)){
ItemStack is = stand.getItemInHand(); ItemStack is = stand.getItemInMainHand();
is.setAmount(1); is.setAmount(1);
getWorld().dropItem(getLocation(), is); getWorld().dropItem(getLocation(), is);
} }
@ -137,14 +137,14 @@ public class WaterBottle extends Furniture implements Listener {
as = spawnArmorStand(loc4); as = spawnArmorStand(loc4);
as.setSmall(true); as.setSmall(true);
as.setItemInHand(new ItemStack(Material.POTION)); as.setItemInMainHand(new ItemStack(Material.POTION));
as.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-110,0,0))); as.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-110,0,0)));
as.setMarker(false); as.setMarker(false);
stand.add(as); stand.add(as);
as = spawnArmorStand(loc5); as = spawnArmorStand(loc5);
as.setSmall(true); as.setSmall(true);
as.setItemInHand(new ItemStack(Material.POTION)); as.setItemInMainHand(new ItemStack(Material.POTION));
as.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-110,0,0))); as.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-110,0,0)));
as.setMarker(false); as.setMarker(false);
stand.add(as); stand.add(as);

4
src/de/Ste3et_C0st/Furniture/Objects/garden/campchair.java
View File

@ -65,13 +65,13 @@ public class campchair extends Furniture implements Listener {
Location l1 = getLutil().getRelativ(middle, getBlockFace(), .25, .4); Location l1 = getLutil().getRelativ(middle, getBlockFace(), .25, .4);
fArmorStand packet = getManager().createArmorStand(getObjID(), l1); fArmorStand packet = getManager().createArmorStand(getObjID(), l1);
packet.getInventory().setItemInHand(new ItemStack(Material.LADDER)); packet.getInventory().setItemInMainHand(new ItemStack(Material.LADDER));
packet.setPose(getLutil().degresstoRad(new EulerAngle(50, 0, 0)), BodyPart.RIGHT_ARM); packet.setPose(getLutil().degresstoRad(new EulerAngle(50, 0, 0)), BodyPart.RIGHT_ARM);
aspList.add(packet); aspList.add(packet);
l1 = getLutil().getRelativ(middle, getBlockFace().getOppositeFace(), .25, .4); l1 = getLutil().getRelativ(middle, getBlockFace().getOppositeFace(), .25, .4);
packet = getManager().createArmorStand(getObjID(), l1); packet = getManager().createArmorStand(getObjID(), l1);
packet.getInventory().setItemInHand(new ItemStack(Material.LADDER)); packet.getInventory().setItemInMainHand(new ItemStack(Material.LADDER));
packet.setPose(getLutil().degresstoRad(new EulerAngle(50, 0, 0)), BodyPart.RIGHT_ARM); packet.setPose(getLutil().degresstoRad(new EulerAngle(50, 0, 0)), BodyPart.RIGHT_ARM);
aspList.add(packet); aspList.add(packet);

6
src/de/Ste3et_C0st/Furniture/Objects/garden/graveStone.java
View File

@ -106,11 +106,11 @@ public class graveStone extends Furniture implements Listener{
} }
fArmorStand as = getManager().createArmorStand(getObjID(), kreutz1); fArmorStand as = getManager().createArmorStand(getObjID(), kreutz1);
as.getInventory().setItemInHand(new ItemStack(Material.STICK)); as.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
as.setPose(new EulerAngle(1.38,.0,.0), BodyPart.RIGHT_ARM); as.setPose(new EulerAngle(1.38,.0,.0), BodyPart.RIGHT_ARM);
aspList.add(as); aspList.add(as);
as = getManager().createArmorStand(getObjID(), kreutz2); as = getManager().createArmorStand(getObjID(), kreutz2);
as.getInventory().setItemInHand(new ItemStack(Material.STICK)); as.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
as.setPose(new EulerAngle(1.38,1.57,1.57), BodyPart.RIGHT_ARM); as.setPose(new EulerAngle(1.38,1.57,1.57), BodyPart.RIGHT_ARM);
aspList.add(as); aspList.add(as);
@ -157,7 +157,7 @@ public class graveStone extends Furniture implements Listener{
Player p = e.getPlayer(); Player p = e.getPlayer();
if(!e.getID().equals(getObjID())) return; if(!e.getID().equals(getObjID())) return;
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
ItemStack is = p.getItemInHand(); ItemStack is = p.getInventory().getItemInMainHand();
if (is == null) return; if (is == null) return;
if (!is.getType().equals(Material.WRITTEN_BOOK)) return; if (!is.getType().equals(Material.WRITTEN_BOOK)) return;
readFromBook(is); readFromBook(is);

42
src/de/Ste3et_C0st/Furniture/Objects/garden/log.java
View File

@ -34,7 +34,7 @@ public class log extends Furniture {
Block b; Block b;
int mode = 0; int mode = 0;
Inventory inv = Bukkit.createInventory(null, 9, "§2Settings"); Inventory inv = Bukkit.createInventory(null, 9, "<EFBFBD>2Settings");
ItemStack pane = new ItemStack(Material.STAINED_GLASS_PANE); ItemStack pane = new ItemStack(Material.STAINED_GLASS_PANE);
ItemStack permissions = new ItemStack(Material.ARROW); ItemStack permissions = new ItemStack(Material.ARROW);
List<ItemStack> isList = new ArrayList<ItemStack>(); List<ItemStack> isList = new ArrayList<ItemStack>();
@ -45,7 +45,7 @@ public class log extends Furniture {
b = getLocation().getBlock(); b = getLocation().getBlock();
getObjID().addBlock(Arrays.asList(b)); getObjID().addBlock(Arrays.asList(b));
ItemMeta meta = pane.getItemMeta(); ItemMeta meta = pane.getItemMeta();
meta.setDisplayName("§c"); meta.setDisplayName("<EFBFBD>c");
pane.setItemMeta(meta); pane.setItemMeta(meta);
pane.setDurability((short) 15); pane.setDurability((short) 15);
pane.setItemMeta(meta); pane.setItemMeta(meta);
@ -61,24 +61,24 @@ public class log extends Furniture {
ItemStack stack = new ItemStack(Material.BANNER); ItemStack stack = new ItemStack(Material.BANNER);
stack.setDurability((short) 1); stack.setDurability((short) 1);
ItemMeta meta = stack.getItemMeta(); ItemMeta meta = stack.getItemMeta();
meta.setDisplayName("§6Mode: §cTop"); meta.setDisplayName("<EFBFBD>6Mode: <20>cTop");
stack.setItemMeta(meta); stack.setItemMeta(meta);
isList.add(stack); isList.add(stack);
stack = new ItemStack(Material.BANNER); stack = new ItemStack(Material.BANNER);
stack.setDurability((short) 2); stack.setDurability((short) 2);
meta = stack.getItemMeta(); meta = stack.getItemMeta();
meta.setDisplayName("§6Mode: §cFront I"); meta.setDisplayName("<EFBFBD>6Mode: <20>cFront I");
stack.setItemMeta(meta); stack.setItemMeta(meta);
isList.add(stack); isList.add(stack);
stack = new ItemStack(Material.BANNER); stack = new ItemStack(Material.BANNER);
stack.setDurability((short) 11); stack.setDurability((short) 11);
meta = stack.getItemMeta(); meta = stack.getItemMeta();
meta.setDisplayName("§6Mode: §cFront II"); meta.setDisplayName("<EFBFBD>6Mode: <20>cFront II");
stack.setItemMeta(meta); stack.setItemMeta(meta);
isList.add(stack); isList.add(stack);
meta = permissions.getItemMeta(); meta = permissions.getItemMeta();
meta.setDisplayName("§cChange Permissions (Owner Only)"); meta.setDisplayName("<EFBFBD>cChange Permissions (Owner Only)");
permissions.setItemMeta(meta); permissions.setItemMeta(meta);
} }
@ -198,8 +198,8 @@ public class log extends Furniture {
} }
if(standOld!=null&&standCurrent!=null){ if(standOld!=null&&standCurrent!=null){
standCurrent.setItemInHand(standOld.getItemInHand()); standCurrent.setItemInMainHand(standOld.getItemInMainHand());
standOld.setItemInHand(new ItemStack(Material.AIR)); standOld.setItemInMainHand(new ItemStack(Material.AIR));
update(); update();
} }
} }
@ -224,18 +224,18 @@ public class log extends Furniture {
e.setCancelled(true); e.setCancelled(true);
Player p = e.getPlayer(); Player p = e.getPlayer();
if(p.isSneaking()){ if(p.isSneaking()){
if(p.getItemInHand().getType().isBlock()&&!p.getItemInHand().getType().equals(Material.AIR)){ if(p.getInventory().getItemInMainHand().getType().isBlock()&&!p.getInventory().getItemInMainHand().getType().equals(Material.AIR)){
e.setCancelled(false); e.setCancelled(false);
return; return;
} }
openInventory(p); openInventory(p);
}else{ }else{
if(p.getItemInHand().getType().isBlock() && !p.getItemInHand().getType().equals(Material.AIR)){ if(p.getInventory().getItemInMainHand().getType().isBlock() && !p.getInventory().getItemInMainHand().getType().equals(Material.AIR)){
this.b.setType(p.getItemInHand().getType()); this.b.setType(p.getInventory().getItemInMainHand().getType());
this.b.setData((byte) p.getItemInHand().getDurability()); this.b.setData((byte) p.getInventory().getItemInMainHand().getDurability());
removeItem(p); removeItem(p);
return; return;
}else if(!p.getItemInHand().getType().isBlock() && !p.getItemInHand().getType().equals(Material.AIR)){ }else if(!p.getInventory().getItemInMainHand().getType().isBlock() && !p.getInventory().getItemInMainHand().getType().equals(Material.AIR)){
fArmorStand stand = null; fArmorStand stand = null;
for(fArmorStand s : getObjID().getPacketList()){ for(fArmorStand s : getObjID().getPacketList()){
if(s.getName().equalsIgnoreCase(mode+"")){ if(s.getName().equalsIgnoreCase(mode+"")){
@ -245,13 +245,13 @@ public class log extends Furniture {
} }
if(stand==null){return;} if(stand==null){return;}
if(stand.getItemInHand()!=null&&!stand.getItemInHand().getType().equals(Material.AIR)){ if(stand.getInventory().getItemInMainHand()!=null&&!stand.getInventory().getItemInMainHand().getType().equals(Material.AIR)){
ItemStack is = stand.getItemInHand(); ItemStack is = stand.getInventory().getItemInMainHand();
is.setAmount(1); is.setAmount(1);
getWorld().dropItem(getLocation(), is); getWorld().dropItem(getLocation(), is);
} }
ItemStack is = p.getItemInHand().clone(); ItemStack is = p.getInventory().getItemInMainHand().clone();
is.setAmount(1); is.setAmount(1);
stand.setItemInHand(is); stand.setItemInHand(is);
update(); update();
@ -268,8 +268,8 @@ public class log extends Furniture {
if(stand==null){return;} if(stand==null){return;}
if(stand.getItemInHand()!=null&&!stand.getItemInHand().getType().equals(Material.AIR)){ if(stand.getInventory().getItemInMainHand()!=null&&!stand.getInventory().getItemInMainHand().getType().equals(Material.AIR)){
ItemStack is = stand.getItemInHand(); ItemStack is = stand.getInventory().getItemInMainHand();
is.setAmount(1); is.setAmount(1);
getWorld().dropItem(getLocation(), is); getWorld().dropItem(getLocation(), is);
} }
@ -285,7 +285,7 @@ public class log extends Furniture {
Boolean useGameMode = FurnitureLib.getInstance().useGamemode(); Boolean useGameMode = FurnitureLib.getInstance().useGamemode();
if(useGameMode&&p.getGameMode().equals(GameMode.CREATIVE)){return;} if(useGameMode&&p.getGameMode().equals(GameMode.CREATIVE)){return;}
Integer slot = p.getInventory().getHeldItemSlot(); Integer slot = p.getInventory().getHeldItemSlot();
ItemStack itemStack = p.getItemInHand().clone(); ItemStack itemStack = p.getInventory().getItemInMainHand().clone();
itemStack.setAmount(itemStack.getAmount()-1); itemStack.setAmount(itemStack.getAmount()-1);
p.getInventory().setItem(slot, itemStack); p.getInventory().setItem(slot, itemStack);
p.updateInventory(); p.updateInventory();
@ -317,8 +317,8 @@ public class log extends Furniture {
if(stand==null){p.sendMessage("test1");return;} if(stand==null){p.sendMessage("test1");return;}
if(stand.getItemInHand()!=null&&!stand.getItemInHand().getType().equals(Material.AIR)){ if(stand.getItemInMainHand()!=null&&!stand.getItemInMainHand().getType().equals(Material.AIR)){
ItemStack is = stand.getItemInHand(); ItemStack is = stand.getItemInMainHand();
is.setAmount(1); is.setAmount(1);
getWorld().dropItem(getLocation(), is); getWorld().dropItem(getLocation(), is);
} }

14
src/de/Ste3et_C0st/Furniture/Objects/garden/mailBox.java
View File

@ -59,7 +59,7 @@ public class mailBox extends Furniture implements Listener {
for(int i = 0; i<=1;i++){ for(int i = 0; i<=1;i++){
Location loc = getLutil().getRelativ(middle.clone(), getBlockFace(), .47, .38).add(0, .88*i, 0); Location loc = getLutil().getRelativ(middle.clone(), getBlockFace(), .47, .38).add(0, .88*i, 0);
fArmorStand packet = getManager().createArmorStand(getObjID(), loc); fArmorStand packet = getManager().createArmorStand(getObjID(), loc);
packet.getInventory().setItemInHand(new ItemStack(Material.STICK)); packet.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
packet.setPose(new EulerAngle(1.39, 0, 0), BodyPart.RIGHT_ARM); packet.setPose(new EulerAngle(1.39, 0, 0), BodyPart.RIGHT_ARM);
aspList.add(packet); aspList.add(packet);
} }
@ -81,7 +81,7 @@ public class mailBox extends Furniture implements Listener {
//x z y //x z y
//-.7 .73 -.3 //-.7 .73 -.3
packet.setPose(new EulerAngle(-.716D, .71D, -.32D), BodyPart.RIGHT_ARM); packet.setPose(new EulerAngle(-.716D, .71D, -.32D), BodyPart.RIGHT_ARM);
packet.getInventory().setItemInHand(new ItemStack(Material.SMOOTH_STAIRS)); packet.getInventory().setItemInMainHand(new ItemStack(Material.SMOOTH_STAIRS));
aspList.add(packet); aspList.add(packet);
loc = getLutil().getRelativ(middle.clone().add(0, 1.898, 0), getBlockFace().getOppositeFace(), -.44+.165*i, .462D); loc = getLutil().getRelativ(middle.clone().add(0, 1.898, 0), getBlockFace().getOppositeFace(), -.44+.165*i, .462D);
@ -90,7 +90,7 @@ public class mailBox extends Furniture implements Listener {
//x z y //x z y
//-.7 .73 -.3 //-.7 .73 -.3
packet.setPose(new EulerAngle(-.716D, .71D, -.32D), BodyPart.RIGHT_ARM); packet.setPose(new EulerAngle(-.716D, .71D, -.32D), BodyPart.RIGHT_ARM);
packet.getInventory().setItemInHand(new ItemStack(Material.SMOOTH_STAIRS)); packet.getInventory().setItemInMainHand(new ItemStack(Material.SMOOTH_STAIRS));
aspList.add(packet); aspList.add(packet);
@ -100,7 +100,7 @@ public class mailBox extends Furniture implements Listener {
//x z y //x z y
//-.7 .73 -.3 //-.7 .73 -.3
packet.setPose(new EulerAngle(-.716D, .71D, -.32D), BodyPart.RIGHT_ARM); packet.setPose(new EulerAngle(-.716D, .71D, -.32D), BodyPart.RIGHT_ARM);
packet.getInventory().setItemInHand(new ItemStack(Material.SMOOTH_BRICK, 1 ,(short) 0)); packet.getInventory().setItemInMainHand(new ItemStack(Material.SMOOTH_BRICK, 1 ,(short) 0));
aspList.add(packet); aspList.add(packet);
} }
@ -114,19 +114,19 @@ public class mailBox extends Furniture implements Listener {
aspList.add(as); aspList.add(as);
as = getManager().createArmorStand(getObjID(), getLutil().getRelativ(middle.clone().add(0, 1.10, 0), face.getOppositeFace(), -.0, .31D)); as = getManager().createArmorStand(getObjID(), getLutil().getRelativ(middle.clone().add(0, 1.10, 0), face.getOppositeFace(), -.0, .31D));
as.getInventory().setItemInHand(new ItemStack(Material.PAPER, 1, (short) 0)); as.getInventory().setItemInMainHand(new ItemStack(Material.PAPER, 1, (short) 0));
as.setPose(getLutil().degresstoRad(new EulerAngle(0, -120, -90)), BodyPart.RIGHT_ARM); as.setPose(getLutil().degresstoRad(new EulerAngle(0, -120, -90)), BodyPart.RIGHT_ARM);
as.setSmall(true); as.setSmall(true);
aspList.add(as); aspList.add(as);
as = getManager().createArmorStand(getObjID(), getLutil().getRelativ(middle.clone().add(0, 1.40, 0), face.getOppositeFace(), -.1, .34D)); as = getManager().createArmorStand(getObjID(), getLutil().getRelativ(middle.clone().add(0, 1.40, 0), face.getOppositeFace(), -.1, .34D));
as.getInventory().setItemInHand(new ItemStack(Material.WOOD_BUTTON, 1, (short) 0)); as.getInventory().setItemInMainHand(new ItemStack(Material.WOOD_BUTTON, 1, (short) 0));
as.setPose(getLutil().degresstoRad(new EulerAngle(-15,-67, -90)), BodyPart.RIGHT_ARM); as.setPose(getLutil().degresstoRad(new EulerAngle(-15,-67, -90)), BodyPart.RIGHT_ARM);
as.setSmall(true); as.setSmall(true);
aspList.add(as); aspList.add(as);
as = getManager().createArmorStand(getObjID(), getLutil().getRelativ(middle.clone().add(0, 1.2, 0), getBlockFace(), .2, .07D)); as = getManager().createArmorStand(getObjID(), getLutil().getRelativ(middle.clone().add(0, 1.2, 0), getBlockFace(), .2, .07D));
as.getInventory().setItemInHand(new ItemStack(Material.EMPTY_MAP, 1, (short) 0)); as.getInventory().setItemInMainHand(new ItemStack(Material.EMPTY_MAP, 1, (short) 0));
as.setPose(getLutil().degresstoRad(new EulerAngle(0, -120, -90)), BodyPart.RIGHT_ARM); as.setPose(getLutil().degresstoRad(new EulerAngle(0, -120, -90)), BodyPart.RIGHT_ARM);
as.setSmall(true); as.setSmall(true);
aspList.add(as); aspList.add(as);

16
src/de/Ste3et_C0st/Furniture/Objects/garden/sunshade.java
View File

@ -72,7 +72,7 @@ public class sunshade extends Furniture implements Listener{
for(int i = 0; i<=2;i++){ for(int i = 0; i<=2;i++){
Location loc = getLutil().getRelativ(center.clone(), getBlockFace(), .47, .38).add(0, .88*i, 0); Location loc = getLutil().getRelativ(center.clone(), getBlockFace(), .47, .38).add(0, .88*i, 0);
fArmorStand packet = getManager().createArmorStand(getObjID(), loc); fArmorStand packet = getManager().createArmorStand(getObjID(), loc);
packet.getInventory().setItemInHand(new ItemStack(Material.STICK)); packet.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
packet.setPose(new EulerAngle(1.39, 0, 0), BodyPart.RIGHT_ARM); packet.setPose(new EulerAngle(1.39, 0, 0), BodyPart.RIGHT_ARM);
asList.add(packet); asList.add(packet);
} }
@ -119,7 +119,7 @@ public class sunshade extends Furniture implements Listener{
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
e.setCancelled(true); e.setCancelled(true);
Player p = e.getPlayer(); Player p = e.getPlayer();
ItemStack is = p.getItemInHand(); ItemStack is = p.getInventory().getItemInMainHand();
if(!getLib().canBuild(e.getPlayer(), getObjID(), EventType.INTERACT)){return;} if(!getLib().canBuild(e.getPlayer(), getObjID(), EventType.INTERACT)){return;}
if(is.getType().equals(Material.BANNER)){ if(is.getType().equals(Material.BANNER)){
e.setCancelled(true); e.setCancelled(true);
@ -161,8 +161,8 @@ public class sunshade extends Furniture implements Listener{
stopTimer(); stopTimer();
for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){
if(packet.getName().equalsIgnoreCase("#ITEM#")){ if(packet.getName().equalsIgnoreCase("#ITEM#")){
if(packet.getInventory().getItemInHand()!=null&&!packet.getInventory().getItemInHand().getType().equals(Material.AIR)){ if(packet.getInventory().getItemInMainHand()!=null&&!packet.getInventory().getItemInMainHand().getType().equals(Material.AIR)){
ItemStack is = packet.getInventory().getItemInHand(); ItemStack is = packet.getInventory().getItemInMainHand();
getWorld().dropItem(getLocation(), is); getWorld().dropItem(getLocation(), is);
} }
} }
@ -180,7 +180,7 @@ public class sunshade extends Furniture implements Listener{
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
e.setCancelled(true); e.setCancelled(true);
Player p = e.getPlayer(); Player p = e.getPlayer();
ItemStack is = p.getItemInHand(); ItemStack is = p.getInventory().getItemInMainHand();
if(is.getType().equals(Material.BANNER)){ if(is.getType().equals(Material.BANNER)){
e.setCancelled(true); e.setCancelled(true);
if(isRunning()){return;} if(isRunning()){return;}
@ -209,7 +209,7 @@ public class sunshade extends Furniture implements Listener{
Boolean useGameMode = FurnitureLib.getInstance().useGamemode(); Boolean useGameMode = FurnitureLib.getInstance().useGamemode();
if(useGameMode&&p.getGameMode().equals(GameMode.CREATIVE)){return;} if(useGameMode&&p.getGameMode().equals(GameMode.CREATIVE)){return;}
Integer slot = p.getInventory().getHeldItemSlot(); Integer slot = p.getInventory().getHeldItemSlot();
ItemStack itemStack = p.getItemInHand().clone(); ItemStack itemStack = p.getInventory().getItemInMainHand().clone();
itemStack.setAmount(itemStack.getAmount()-1); itemStack.setAmount(itemStack.getAmount()-1);
p.getInventory().setItem(slot, itemStack); p.getInventory().setItem(slot, itemStack);
p.updateInventory(); p.updateInventory();
@ -226,8 +226,8 @@ public class sunshade extends Furniture implements Listener{
stopTimer(); stopTimer();
for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){
if(packet.getName().equalsIgnoreCase("#ITEM#")){ if(packet.getName().equalsIgnoreCase("#ITEM#")){
if(packet.getInventory().getItemInHand()!=null&&!packet.getInventory().getItemInHand().getType().equals(Material.AIR)){ if(packet.getInventory().getItemInMainHand()!=null&&!packet.getInventory().getItemInMainHand().getType().equals(Material.AIR)){
ItemStack is = packet.getInventory().getItemInHand(); ItemStack is = packet.getInventory().getItemInMainHand();
getWorld().dropItem(getLocation(), is); getWorld().dropItem(getLocation(), is);
} }
} }

2
src/de/Ste3et_C0st/Furniture/Objects/indoor/lantern.java
View File

@ -122,7 +122,7 @@ public class lantern extends Furniture implements Listener{
if(!e.getID().equals(getObjID())) return; if(!e.getID().equals(getObjID())) return;
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
Player p = e.getPlayer(); Player p = e.getPlayer();
ItemStack is = p.getItemInHand(); ItemStack is = p.getInventory().getItemInMainHand();
if(is.getType().equals(Material.FLINT_AND_STEEL)){ if(is.getType().equals(Material.FLINT_AND_STEEL)){
setLight(true); setLight(true);
}else if(is.getType().equals(Material.WATER_BUCKET)){ }else if(is.getType().equals(Material.WATER_BUCKET)){

29
src/de/Ste3et_C0st/Furniture/Objects/indoor/largeTable.java
View File

@ -116,22 +116,22 @@ public class largeTable extends Furniture implements Listener{
fArmorStand as = getManager().createArmorStand(getObjID(), feet1); fArmorStand as = getManager().createArmorStand(getObjID(), feet1);
as.setPose(new EulerAngle(-1.75, 0, 0), BodyPart.RIGHT_ARM); as.setPose(new EulerAngle(-1.75, 0, 0), BodyPart.RIGHT_ARM);
as.getInventory().setItemInHand(new ItemStack(Material.BONE)); as.getInventory().setItemInMainHand(new ItemStack(Material.BONE));
armorlist.add(as); armorlist.add(as);
as = getManager().createArmorStand(getObjID(), feet2); as = getManager().createArmorStand(getObjID(), feet2);
as.setPose(new EulerAngle(-1.75, 0, 0), BodyPart.RIGHT_ARM); as.setPose(new EulerAngle(-1.75, 0, 0), BodyPart.RIGHT_ARM);
as.getInventory().setItemInHand(new ItemStack(Material.BONE)); as.getInventory().setItemInMainHand(new ItemStack(Material.BONE));
armorlist.add(as); armorlist.add(as);
as = getManager().createArmorStand(getObjID(), feet3); as = getManager().createArmorStand(getObjID(), feet3);
as.setPose(new EulerAngle(-1.75, 0, 0), BodyPart.RIGHT_ARM); as.setPose(new EulerAngle(-1.75, 0, 0), BodyPart.RIGHT_ARM);
as.getInventory().setItemInHand(new ItemStack(Material.BONE)); as.getInventory().setItemInMainHand(new ItemStack(Material.BONE));
armorlist.add(as); armorlist.add(as);
as = getManager().createArmorStand(getObjID(), feet4); as = getManager().createArmorStand(getObjID(), feet4);
as.setPose(new EulerAngle(-1.75, 0, 0), BodyPart.RIGHT_ARM); as.setPose(new EulerAngle(-1.75, 0, 0), BodyPart.RIGHT_ARM);
as.getInventory().setItemInHand(new ItemStack(Material.BONE)); as.getInventory().setItemInMainHand(new ItemStack(Material.BONE));
armorlist.add(as); armorlist.add(as);
@ -168,7 +168,7 @@ public class largeTable extends Furniture implements Listener{
int i = 0; int i = 0;
for(Integer id : tellerIDs){ for(Integer id : tellerIDs){
fArmorStand as = getManager().getfArmorStandByID(id); fArmorStand as = getManager().getfArmorStandByID(id);
as.getInventory().setItemInHand(itemList.get(i)); as.getInventory().setItemInMainHand(itemList.get(i));
i++; i++;
} }
} }
@ -178,14 +178,15 @@ public class largeTable extends Furniture implements Listener{
if(getObjID()==null){return;} if(getObjID()==null){return;}
if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;}
if(e.isCancelled()){return;} if(e.isCancelled()){return;}
if(e.getID()==null){return;}
if(!e.getID().equals(getObjID())){return;} if(!e.getID().equals(getObjID())){return;}
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
for(Integer id : tellerIDs){ for(Integer id : tellerIDs){
fArmorStand asp = getManager().getfArmorStandByID(id); fArmorStand asp = getManager().getfArmorStandByID(id);
if(asp!=null&&asp.getInventory().getItemInHand()!=null){ if(asp!=null&&asp.getInventory().getItemInMainHand()!=null){
if(asp.getName().startsWith("#TELLER")){ if(asp.getName().startsWith("#TELLER")){
fArmorStand packet = asp; fArmorStand packet = asp;
e.getLocation().getWorld().dropItem(e.getLocation(), packet.getInventory().getItemInHand()); e.getLocation().getWorld().dropItem(e.getLocation(), packet.getInventory().getItemInMainHand());
} }
} }
} }
@ -202,12 +203,12 @@ public class largeTable extends Furniture implements Listener{
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
e.setCancelled(true); e.setCancelled(true);
Player p = e.getPlayer(); Player p = e.getPlayer();
if(p.getItemInHand().getType().equals(Material.INK_SACK)){ if(p.getInventory().getItemInMainHand().getType().equals(Material.INK_SACK)){
getLib().getColorManager().color(p, e.canBuild(), Material.STAINED_GLASS_PANE, getObjID(), ColorType.BLOCK, 3); getLib().getColorManager().color(p, e.canBuild(), Material.STAINED_GLASS_PANE, getObjID(), ColorType.BLOCK, 3);
update(); update();
return; return;
}else{ }else{
setTeller(p, p.getInventory().getItemInHand()); setTeller(p, p.getInventory().getItemInMainHand());
} }
} }
@ -228,17 +229,17 @@ public class largeTable extends Furniture implements Listener{
} }
} }
if(as!=null&&as.getInventory().getItemInHand()!= null && as.getInventory().getItemInHand().equals(is)){return;} if(as!=null&&as.getInventory().getItemInMainHand()!= null && as.getInventory().getItemInMainHand().equals(is)){return;}
if(as.getInventory().getItemInHand()!=null&&!as.getInventory().getItemInHand().getType().equals(Material.AIR)){ if(as.getInventory().getItemInMainHand()!=null&&!as.getInventory().getItemInMainHand().getType().equals(Material.AIR)){
fArmorStand asp = as; fArmorStand asp = as;
ItemStack item = asp.getInventory().getItemInHand(); ItemStack item = asp.getInventory().getItemInMainHand();
item.setAmount(1); item.setAmount(1);
asp.getLocation().getWorld().dropItem(asp.getLocation(), item); asp.getLocation().getWorld().dropItem(asp.getLocation(), item);
} }
ItemStack IS = is.clone(); ItemStack IS = is.clone();
IS.setAmount(1); IS.setAmount(1);
as.getInventory().setItemInHand(IS); as.getInventory().setItemInMainHand(IS);
update(); update();
@ -255,7 +256,7 @@ public class largeTable extends Furniture implements Listener{
for(Integer id : tellerIDs){ for(Integer id : tellerIDs){
try{ try{
fArmorStand as = getManager().getfArmorStandByID(id); fArmorStand as = getManager().getfArmorStandByID(id);
teller.put(teller.size(), as.getInventory().getItemInHand()); teller.put(teller.size(), as.getInventory().getItemInMainHand());
}catch(Exception e){ }catch(Exception e){
teller.put(teller.size(), new ItemStack(Material.AIR)); teller.put(teller.size(), new ItemStack(Material.AIR));
} }

2
src/de/Ste3et_C0st/Furniture/Objects/indoor/sofa.java
View File

@ -158,7 +158,7 @@ public class sofa extends Furniture implements Listener {
if(!e.getID().equals(getObjID())){return;} if(!e.getID().equals(getObjID())){return;}
e.setCancelled(true); e.setCancelled(true);
final Player p = e.getPlayer(); final Player p = e.getPlayer();
if(p.getItemInHand().getType().equals(Material.INK_SACK)){ if(p.getInventory().getItemInMainHand().getType().equals(Material.INK_SACK)){
getLib().getColorManager().color(p, e.canBuild(), Material.CARPET, getObjID(), ColorType.BLOCK, 12); getLib().getColorManager().color(p, e.canBuild(), Material.CARPET, getObjID(), ColorType.BLOCK, 12);
}else{ }else{
fArmorStand packet = e.getfArmorStand(); fArmorStand packet = e.getfArmorStand();

18
src/de/Ste3et_C0st/Furniture/Objects/indoor/table.java
View File

@ -52,7 +52,7 @@ public class table extends Furniture implements Listener {
packetL.add(asp); packetL.add(asp);
locatio = locatio.clone().add(0,-0.65,0.68); locatio = locatio.clone().add(0,-0.65,0.68);
asp = getManager().createArmorStand(getObjID(), locatio); asp = getManager().createArmorStand(getObjID(), locatio);
asp.getInventory().setItemInHand(new ItemStack(Material.STICK)); asp.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
asp.setPose(new EulerAngle(1.38,.0,.0), BodyPart.RIGHT_ARM); asp.setPose(new EulerAngle(1.38,.0,.0), BodyPart.RIGHT_ARM);
packetL.add(asp); packetL.add(asp);
@ -74,8 +74,8 @@ public class table extends Furniture implements Listener {
e.setCancelled(true); e.setCancelled(true);
for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){
if(packet.getName().equalsIgnoreCase("#ITEM#")){ if(packet.getName().equalsIgnoreCase("#ITEM#")){
if(packet.getInventory().getItemInHand()!=null&&!packet.getInventory().getItemInHand().getType().equals(Material.AIR)){ if(packet.getInventory().getItemInMainHand()!=null&&!packet.getInventory().getItemInMainHand().getType().equals(Material.AIR)){
ItemStack is = packet.getInventory().getItemInHand(); ItemStack is = packet.getInventory().getItemInMainHand();
getWorld().dropItem(getLocation(), is); getWorld().dropItem(getLocation(), is);
} }
} }
@ -93,20 +93,20 @@ public class table extends Furniture implements Listener {
Player p = e.getPlayer(); Player p = e.getPlayer();
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
e.setCancelled(true); e.setCancelled(true);
if(p.getItemInHand().getType().isBlock()&&!p.getItemInHand().getType().equals(Material.AIR)){return;} if(p.getInventory().getItemInMainHand().getType().isBlock()&&!p.getInventory().getItemInMainHand().getType().equals(Material.AIR)){return;}
for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){
if(packet.getName().equalsIgnoreCase("#ITEM#")){ if(packet.getName().equalsIgnoreCase("#ITEM#")){
ItemStack Itemstack = p.getItemInHand().clone(); ItemStack Itemstack = p.getInventory().getItemInMainHand().clone();
Itemstack.setAmount(1); Itemstack.setAmount(1);
if(packet.getInventory().getItemInHand()!=null&&!packet.getInventory().getItemInHand().getType().equals(Material.AIR)){ if(packet.getInventory().getItemInMainHand()!=null&&!packet.getInventory().getItemInMainHand().getType().equals(Material.AIR)){
ItemStack is = packet.getInventory().getItemInHand(); ItemStack is = packet.getInventory().getItemInMainHand();
is.setAmount(1); is.setAmount(1);
getWorld().dropItem(getLocation(), is); getWorld().dropItem(getLocation(), is);
} }
packet.getInventory().setItemInHand(Itemstack); packet.getInventory().setItemInMainHand(Itemstack);
if(p.getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) break; if(p.getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) break;
Integer i = p.getInventory().getHeldItemSlot(); Integer i = p.getInventory().getHeldItemSlot();
ItemStack is = p.getItemInHand(); ItemStack is = p.getInventory().getItemInMainHand();
is.setAmount(is.getAmount()-1); is.setAmount(is.getAmount()-1);
p.getInventory().setItem(i, is); p.getInventory().setItem(i, is);
p.updateInventory(); p.updateInventory();

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

@ -55,7 +55,7 @@ public class barrels extends Furniture implements Listener {
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
e.setCancelled(true); e.setCancelled(true);
Player p = e.getPlayer(); Player p = e.getPlayer();
if(!p.getItemInHand().getType().isBlock()&&!p.getItemInHand().getType().equals(Material.AIR)){return;} if(!p.getInventory().getItemInMainHand().getType().isBlock()&&!p.getInventory().getItemInMainHand().getType().equals(Material.AIR)){return;}
fArmorStand packet = getManager().getfArmorStandByObjectID(getObjID()).get(0); fArmorStand packet = getManager().getfArmorStandByObjectID(getObjID()).get(0);
if(packet.getInventory().getHelmet()!=null&&!packet.getInventory().getHelmet().getType().equals(Material.AIR)){ if(packet.getInventory().getHelmet()!=null&&!packet.getInventory().getHelmet().getType().equals(Material.AIR)){
ItemStack is = packet.getInventory().getHelmet(); ItemStack is = packet.getInventory().getHelmet();
@ -63,13 +63,13 @@ public class barrels extends Furniture implements Listener {
getWorld().dropItem(getLocation(), is); getWorld().dropItem(getLocation(), is);
} }
packet.getInventory().setHelmet(p.getItemInHand()); packet.getInventory().setHelmet(p.getInventory().getItemInMainHand());
getManager().updateFurniture(getObjID()); getManager().updateFurniture(getObjID());
if(p.getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) return; if(p.getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) return;
Integer i = e.getPlayer().getInventory().getHeldItemSlot(); Integer i = e.getPlayer().getInventory().getHeldItemSlot();
ItemStack item = e.getPlayer().getItemInHand(); ItemStack item = e.getPlayer().getInventory().getItemInMainHand();
item.setAmount(item.getAmount()-1); item.setAmount(item.getAmount()-1);
e.getPlayer().getInventory().setItem(i, item); e.getPlayer().getInventory().setItem(i, item);
e.getPlayer().updateInventory(); e.getPlayer().updateInventory();
@ -98,9 +98,9 @@ public class barrels extends Furniture implements Listener {
if(e.isCancelled()){return;} if(e.isCancelled()){return;}
if(!e.getID().equals(getObjID())){return;} if(!e.getID().equals(getObjID())){return;}
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
if(!e.getPlayer().getItemInHand().getType().isBlock()&&!e.getPlayer().getItemInHand().getType().equals(Material.AIR)){return;} if(!e.getPlayer().getInventory().getItemInMainHand().getType().isBlock()&&!e.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.AIR)){return;}
e.setCancelled(true); e.setCancelled(true);
ItemStack Itemstack = e.getPlayer().getItemInHand().clone(); ItemStack Itemstack = e.getPlayer().getInventory().getItemInMainHand().clone();
Itemstack.setAmount(1); Itemstack.setAmount(1);
fArmorStand packet = getManager().getfArmorStandByObjectID(getObjID()).get(0); fArmorStand packet = getManager().getfArmorStandByObjectID(getObjID()).get(0);
@ -116,7 +116,7 @@ public class barrels extends Furniture implements Listener {
if(e.getPlayer().getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) return; if(e.getPlayer().getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) return;
Integer i = e.getPlayer().getInventory().getHeldItemSlot(); Integer i = e.getPlayer().getInventory().getHeldItemSlot();
ItemStack item = e.getPlayer().getItemInHand(); ItemStack item = e.getPlayer().getInventory().getItemInMainHand();
item.setAmount(item.getAmount()-1); item.setAmount(item.getAmount()-1);
e.getPlayer().getInventory().setItem(i, item); e.getPlayer().getInventory().setItem(i, item);
e.getPlayer().updateInventory(); e.getPlayer().updateInventory();

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

@ -55,7 +55,7 @@ public class campfire_1 extends Furniture implements Listener{
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
e.setCancelled(true); e.setCancelled(true);
List<fArmorStand> aspList = getManager().getfArmorStandByObjectID(getObjID()); List<fArmorStand> aspList = getManager().getfArmorStandByObjectID(getObjID());
ItemStack is = e.getPlayer().getItemInHand(); ItemStack is = e.getPlayer().getInventory().getItemInMainHand();
if(is.getType().equals(Material.WATER_BUCKET)){ if(is.getType().equals(Material.WATER_BUCKET)){
for(fArmorStand packet : aspList){ for(fArmorStand packet : aspList){
packet.setFire(false); packet.setFire(false);

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

@ -115,7 +115,7 @@ public class campfire_2 extends Furniture implements Listener{
fArmorStand asp = getManager().createArmorStand(getObjID(), location); fArmorStand asp = getManager().createArmorStand(getObjID(), location);
asp.setPose( new EulerAngle(2, 0, 0), BodyPart.RIGHT_ARM); asp.setPose( new EulerAngle(2, 0, 0), BodyPart.RIGHT_ARM);
asp.getInventory().setItemInHand(new ItemStack(Material.STICK)); asp.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
packetList.add(asp); packetList.add(asp);
yaw+=90; yaw+=90;
@ -124,16 +124,16 @@ public class campfire_2 extends Furniture implements Listener{
fArmorStand asp = getManager().createArmorStand(getObjID(), stick1); fArmorStand asp = getManager().createArmorStand(getObjID(), stick1);
asp.setPose(new EulerAngle(1.38,.0,.0), BodyPart.RIGHT_ARM); asp.setPose(new EulerAngle(1.38,.0,.0), BodyPart.RIGHT_ARM);
asp.getInventory().setItemInHand(new ItemStack(Material.STICK)); asp.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
packetList.add(asp); packetList.add(asp);
asp = getManager().createArmorStand(getObjID(), stick2); asp = getManager().createArmorStand(getObjID(), stick2);
asp.setPose(new EulerAngle(1.38,.0,.0), BodyPart.RIGHT_ARM); asp.setPose(new EulerAngle(1.38,.0,.0), BodyPart.RIGHT_ARM);
asp.getInventory().setItemInHand(new ItemStack(Material.STICK)); asp.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
packetList.add(asp); packetList.add(asp);
asp = getManager().createArmorStand(getObjID(), bone); asp = getManager().createArmorStand(getObjID(), bone);
asp.setPose(new EulerAngle(1.38,.0,1.57), BodyPart.RIGHT_ARM); asp.setPose(new EulerAngle(1.38,.0,1.57), BodyPart.RIGHT_ARM);
asp.getInventory().setItemInHand(new ItemStack(Material.BONE)); asp.getInventory().setItemInMainHand(new ItemStack(Material.BONE));
packetList.add(asp); packetList.add(asp);
asp = getManager().createArmorStand(getObjID(), middle.add(0,-1.3,0)); asp = getManager().createArmorStand(getObjID(), middle.add(0,-1.3,0));
@ -157,7 +157,7 @@ public class campfire_2 extends Furniture implements Listener{
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
e.setCancelled(true); e.setCancelled(true);
List<fArmorStand> aspList = getManager().getfArmorStandByObjectID(getObjID()); List<fArmorStand> aspList = getManager().getfArmorStandByObjectID(getObjID());
final ItemStack itemStack = e.getPlayer().getItemInHand(); final ItemStack itemStack = e.getPlayer().getInventory().getItemInMainHand();
fArmorStand packet = null; fArmorStand packet = null;
for(fArmorStand pack : aspList){ for(fArmorStand pack : aspList){
if(pack.isSmall() && pack.isVisible()){ if(pack.isSmall() && pack.isVisible()){
@ -176,7 +176,7 @@ public class campfire_2 extends Furniture implements Listener{
if(e.getPlayer().getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) return; if(e.getPlayer().getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) return;
Integer i = e.getPlayer().getInventory().getHeldItemSlot(); Integer i = e.getPlayer().getInventory().getHeldItemSlot();
ItemStack item = e.getPlayer().getItemInHand(); ItemStack item = e.getPlayer().getInventory().getItemInMainHand();
item.setAmount(item.getAmount()-1); item.setAmount(item.getAmount()-1);
e.getPlayer().getInventory().setItem(i, item); e.getPlayer().getInventory().setItem(i, item);
e.getPlayer().updateInventory(); e.getPlayer().updateInventory();
@ -188,7 +188,7 @@ public class campfire_2 extends Furniture implements Listener{
for(fArmorStand pack : getManager().getfArmorStandByObjectID(getObjID())){ for(fArmorStand pack : getManager().getfArmorStandByObjectID(getObjID())){
if(pack.isSmall() && pack.isVisible()){ if(pack.isSmall() && pack.isVisible()){
if((pack.getInventory().getHelmet() == null || pack.getInventory().getHelmet().getType().equals(Material.AIR)) && if((pack.getInventory().getHelmet() == null || pack.getInventory().getHelmet().getType().equals(Material.AIR)) &&
(pack.getInventory().getItemInHand() == null || pack.getInventory().getItemInHand().getType().equals(Material.AIR))){ (pack.getInventory().getItemInMainHand() == null || pack.getInventory().getItemInMainHand().getType().equals(Material.AIR))){
pack.setFire(b); pack.setFire(b);
Location loc = middle.clone(); Location loc = middle.clone();
loc.add(0, 1.3, 0); loc.add(0, 1.3, 0);
@ -224,7 +224,7 @@ public class campfire_2 extends Furniture implements Listener{
if(isRunning()){ if(isRunning()){
Bukkit.getScheduler().cancelTask(timer); Bukkit.getScheduler().cancelTask(timer);
timer=null; timer=null;
if(armorS!=null&&armorS.getInventory().getItemInHand()!=null&&getItem(armorS.getInventory().getItemInHand())!=null){ if(armorS!=null&&armorS.getInventory().getItemInMainHand()!=null&&getItem(armorS.getInventory().getItemInMainHand())!=null){
getWorld().dropItem(middle.clone().add(0, .5, 0), getCooked(is)); getWorld().dropItem(middle.clone().add(0, .5, 0), getCooked(is));
armorS.kill(); armorS.kill();
armorS.delete(); armorS.delete();
@ -232,7 +232,7 @@ public class campfire_2 extends Furniture implements Listener{
} }
} }
if(armorS!=null){ if(armorS!=null){
if(armorS.getInventory().getItemInHand()!=null){getWorld().dropItem(middle.clone().add(0, .5, 0), getCooked(is));} if(armorS.getInventory().getItemInMainHand()!=null){getWorld().dropItem(middle.clone().add(0, .5, 0), getCooked(is));}
armorS.kill(); armorS.kill();
armorS.delete(); armorS.delete();
armorS=null; armorS=null;
@ -265,7 +265,7 @@ public class campfire_2 extends Furniture implements Listener{
public void setGrill(){ public void setGrill(){
this.armorS = getManager().createArmorStand(getObjID(), grill); this.armorS = getManager().createArmorStand(getObjID(), grill);
this.armorS.setInvisible(true); this.armorS.setInvisible(true);
this.armorS.getInventory().setItemInHand(is); this.armorS.getInventory().setItemInMainHand(is);
getManager().send(getObjID()); getManager().send(getObjID());
this.timer = main.getInstance().getServer().getScheduler().scheduleSyncRepeatingTask(main.getInstance(), new Runnable() { this.timer = main.getInstance().getServer().getScheduler().scheduleSyncRepeatingTask(main.getInstance(), new Runnable() {
Integer rounds = getLutil().randInt(15, 30); Integer rounds = getLutil().randInt(15, 30);

14
src/de/Ste3et_C0st/Furniture/Objects/outdoor/hammock.java
View File

@ -105,7 +105,7 @@ public class hammock extends Furniture implements Listener{
if(!e.getID().equals(getObjID())){return;} if(!e.getID().equals(getObjID())){return;}
List<fArmorStand> aspList = getManager().getfArmorStandByObjectID(getObjID()); List<fArmorStand> aspList = getManager().getfArmorStandByObjectID(getObjID());
Player p = e.getPlayer(); Player p = e.getPlayer();
ItemStack stack = p.getItemInHand(); ItemStack stack = p.getInventory().getItemInMainHand();
if(stack!=null){ if(stack!=null){
if(isMaterial(stack.getType())){ if(isMaterial(stack.getType())){
@ -127,7 +127,7 @@ public class hammock extends Furniture implements Listener{
Boolean useGameMode = FurnitureLib.getInstance().useGamemode(); Boolean useGameMode = FurnitureLib.getInstance().useGamemode();
if(useGameMode&&p.getGameMode().equals(GameMode.CREATIVE)){return;} if(useGameMode&&p.getGameMode().equals(GameMode.CREATIVE)){return;}
Integer slot = p.getInventory().getHeldItemSlot(); Integer slot = p.getInventory().getHeldItemSlot();
ItemStack itemStack = p.getItemInHand().clone(); ItemStack itemStack = p.getInventory().getItemInMainHand().clone();
itemStack.setAmount(itemStack.getAmount()-1); itemStack.setAmount(itemStack.getAmount()-1);
p.getInventory().setItem(slot, itemStack); p.getInventory().setItem(slot, itemStack);
p.updateInventory(); p.updateInventory();
@ -141,7 +141,7 @@ public class hammock extends Furniture implements Listener{
if(!e.getID().equals(getObjID())){return;} if(!e.getID().equals(getObjID())){return;}
List<fArmorStand> aspList = getManager().getfArmorStandByObjectID(getObjID()); List<fArmorStand> aspList = getManager().getfArmorStandByObjectID(getObjID());
Player p = e.getPlayer(); Player p = e.getPlayer();
ItemStack stack = p.getItemInHand(); ItemStack stack = p.getInventory().getItemInMainHand();
if(stack!=null){ if(stack!=null){
if(isMaterial(stack.getType())){ if(isMaterial(stack.getType())){
if(setColor(p,stack, e.canBuild(), aspList)){return;} if(setColor(p,stack, e.canBuild(), aspList)){return;}
@ -264,7 +264,7 @@ public class hammock extends Furniture implements Listener{
stick = stick.add(0, 1.7, 0); stick = stick.add(0, 1.7, 0);
stick.setYaw(getLutil().FaceToYaw(getBlockFace())); stick.setYaw(getLutil().FaceToYaw(getBlockFace()));
packet = getManager().createArmorStand(getObjID(), stick); packet = getManager().createArmorStand(getObjID(), stick);
packet.getInventory().setItemInHand(new ItemStack(Material.STICK)); packet.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
packet.setPose(getLutil().degresstoRad(new EulerAngle(-40f,110f,0f)), BodyPart.RIGHT_ARM); packet.setPose(getLutil().degresstoRad(new EulerAngle(-40f,110f,0f)), BodyPart.RIGHT_ARM);
aspList.add(packet); aspList.add(packet);
@ -272,7 +272,7 @@ public class hammock extends Furniture implements Listener{
stick = stick.add(0, 1.7, 0); stick = stick.add(0, 1.7, 0);
stick.setYaw(getLutil().FaceToYaw(getBlockFace())); stick.setYaw(getLutil().FaceToYaw(getBlockFace()));
packet = getManager().createArmorStand(getObjID(), stick); packet = getManager().createArmorStand(getObjID(), stick);
packet.getInventory().setItemInHand(new ItemStack(Material.STICK)); packet.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
packet.setPose(getLutil().degresstoRad(new EulerAngle(-40f,73f,0f)), BodyPart.RIGHT_ARM); packet.setPose(getLutil().degresstoRad(new EulerAngle(-40f,73f,0f)), BodyPart.RIGHT_ARM);
packet.setArms(true); packet.setArms(true);
aspList.add(packet); aspList.add(packet);
@ -281,7 +281,7 @@ public class hammock extends Furniture implements Listener{
stick = stick.add(0, 1.7, 0); stick = stick.add(0, 1.7, 0);
stick.setYaw(getLutil().FaceToYaw(getBlockFace().getOppositeFace())); stick.setYaw(getLutil().FaceToYaw(getBlockFace().getOppositeFace()));
packet = getManager().createArmorStand(getObjID(), stick); packet = getManager().createArmorStand(getObjID(), stick);
packet.getInventory().setItemInHand(new ItemStack(Material.STICK)); packet.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
packet.setPose(getLutil().degresstoRad(new EulerAngle(-40f,73f,0f)), BodyPart.RIGHT_ARM); packet.setPose(getLutil().degresstoRad(new EulerAngle(-40f,73f,0f)), BodyPart.RIGHT_ARM);
packet.setArms(true); packet.setArms(true);
aspList.add(packet); aspList.add(packet);
@ -290,7 +290,7 @@ public class hammock extends Furniture implements Listener{
stick = stick.add(0, 1.7, 0); stick = stick.add(0, 1.7, 0);
stick.setYaw(getLutil().FaceToYaw(getBlockFace().getOppositeFace())); stick.setYaw(getLutil().FaceToYaw(getBlockFace().getOppositeFace()));
packet = getManager().createArmorStand(getObjID(), stick); packet = getManager().createArmorStand(getObjID(), stick);
packet.getInventory().setItemInHand(new ItemStack(Material.STICK)); packet.getInventory().setItemInMainHand(new ItemStack(Material.STICK));
packet.setPose(getLutil().degresstoRad(new EulerAngle(-40f,110f,0f)), BodyPart.RIGHT_ARM); packet.setPose(getLutil().degresstoRad(new EulerAngle(-40f,110f,0f)), BodyPart.RIGHT_ARM);
packet.setArms(true); packet.setArms(true);
aspList.add(packet); aspList.add(packet);

4
src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_1.java
View File

@ -237,7 +237,7 @@ public class tent_1 extends Furniture implements Listener{
@EventHandler @EventHandler
public void onFurnitureBreak(FurnitureBreakEvent e){ public void onFurnitureBreak(FurnitureBreakEvent e){
if(getObjID()==null){return;} if(getObjID()==null||e.getID()==null) return;
if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;}
if(e.isCancelled()){return;} if(e.isCancelled()){return;}
if(!e.getID().equals(getObjID())){return;} if(!e.getID().equals(getObjID())){return;}
@ -257,7 +257,7 @@ public class tent_1 extends Furniture implements Listener{
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
e.setCancelled(true); e.setCancelled(true);
final Player p = e.getPlayer(); final Player p = e.getPlayer();
if(!p.getItemInHand().getType().equals(Material.INK_SACK)){ if(!p.getInventory().getItemInMainHand().getType().equals(Material.INK_SACK)){
p.openWorkbench(this.block.getLocation(), true); p.openWorkbench(this.block.getLocation(), true);
}else{ }else{
getLib().getColorManager().color(p, e.canBuild(), Material.CARPET, getObjID(), ColorType.BLOCK, 1); getLib().getColorManager().color(p, e.canBuild(), Material.CARPET, getObjID(), ColorType.BLOCK, 1);

2
src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_2.java
View File

@ -200,7 +200,7 @@ public class tent_2 extends Furniture implements Listener{
e.setCancelled(true); e.setCancelled(true);
Player p = e.getPlayer(); Player p = e.getPlayer();
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
if(!p.getItemInHand().getType().equals(Material.INK_SACK)){ if(!p.getInventory().getItemInMainHand().getType().equals(Material.INK_SACK)){
for(Block b : block){ for(Block b : block){
if(b.getType().equals(Material.CHEST)){ if(b.getType().equals(Material.CHEST)){

2
src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_3.java
View File

@ -175,7 +175,7 @@ public class tent_3 extends Furniture implements Listener{
e.setCancelled(true); e.setCancelled(true);
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
Player p = e.getPlayer(); Player p = e.getPlayer();
if(p.getItemInHand().getType().equals(Material.INK_SACK)){ if(p.getInventory().getItemInMainHand().getType().equals(Material.INK_SACK)){
getLib().getColorManager().color(p, e.canBuild(), Material.BANNER, getObjID(), ColorType.BANNER, 1); getLib().getColorManager().color(p, e.canBuild(), Material.BANNER, getObjID(), ColorType.BANNER, 1);
}else{ }else{
for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){

4
src/de/Ste3et_C0st/Furniture/Objects/trap/BearTrap.java
View File

@ -98,7 +98,7 @@ public class BearTrap extends Furniture implements Listener{
if(!e.canBuild()){return;} if(!e.canBuild()){return;}
if(b){ if(b){
setStatus(false); setStatus(false);
getWorld().playSound(getLocation(), Sound.ANVIL_LAND, 10, 1); getWorld().playSound(getLocation(), Sound.BLOCK_ANVIL_LAND, 10, 1);
} }
} }
@ -106,7 +106,7 @@ public class BearTrap extends Furniture implements Listener{
if(b){ if(b){
stand1.setHeadPose(getLutil().degresstoRad(new EulerAngle(0, 0, 0))); stand1.setHeadPose(getLutil().degresstoRad(new EulerAngle(0, 0, 0)));
stand2.setHeadPose(getLutil().degresstoRad(new EulerAngle(0, 0, 0))); stand2.setHeadPose(getLutil().degresstoRad(new EulerAngle(0, 0, 0)));
getWorld().playSound(getLocation(), Sound.ITEM_BREAK, 5, 1); getWorld().playSound(getLocation(), Sound.ENTITY_ITEM_BREAK, 5, 1);
}else{ }else{
stand1.setHeadPose(getLutil().degresstoRad(new EulerAngle(90, 0, 0))); stand1.setHeadPose(getLutil().degresstoRad(new EulerAngle(90, 0, 0)));
stand2.setHeadPose(getLutil().degresstoRad(new EulerAngle(-90, 0, 0))); stand2.setHeadPose(getLutil().degresstoRad(new EulerAngle(-90, 0, 0)));

2
src/plugin.yml
View File

@ -1,5 +1,5 @@
name: DiceFurniture name: DiceFurniture
version: 2.6 version: 2.6.6
description: Add some new Objects to the Server description: Add some new Objects to the Server
author: Ste3et_C0st author: Ste3et_C0st
website: http://dicecraft.de website: http://dicecraft.de