From 4d4e00de2c980388953d31c71e491573d1e16c2a Mon Sep 17 00:00:00 2001 From: BuildTools Date: Fri, 14 Aug 2015 18:08:21 +0200 Subject: [PATCH] DiceFurniture --- .../Furniture/Main/StringPage.java | 60 ------------------- src/de/Ste3et_C0st/Furniture/Main/main.java | 5 +- .../Objects/electric/streetlamp.java | 6 +- .../Furniture/Objects/garden/fance.java | 3 +- .../Furniture/Objects/garden/sunshade.java | 5 +- .../Furniture/Objects/indoor/sofa.java | 3 +- .../Furniture/Objects/outdoor/barrels.java | 5 +- .../Furniture/Objects/outdoor/tent_1.java | 5 +- .../Furniture/Objects/outdoor/tent_2.java | 3 +- .../Furniture/Objects/outdoor/tent_3.java | 3 +- src/plugin.yml | 2 +- 11 files changed, 24 insertions(+), 76 deletions(-) delete mode 100644 src/de/Ste3et_C0st/Furniture/Main/StringPage.java diff --git a/src/de/Ste3et_C0st/Furniture/Main/StringPage.java b/src/de/Ste3et_C0st/Furniture/Main/StringPage.java deleted file mode 100644 index 3d602ac..0000000 --- a/src/de/Ste3et_C0st/Furniture/Main/StringPage.java +++ /dev/null @@ -1,60 +0,0 @@ -package de.Ste3et_C0st.Furniture.Main; - -import static org.bukkit.util.NumberConversions.ceil; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; - -import org.bukkit.command.CommandSender; -import org.bukkit.inventory.ItemStack; - -public class StringPage { - - public void returnStringPage(CommandSender sender, HashMap map, Integer page, Integer perside){ - if(sender==null){return;} - if(map==null||map.isEmpty()){return;} - if(page==null||page==0){page=1;} - - List strings = getList(map); - List stringL = new ArrayList(); - Collections.sort(strings); - Integer max = page*perside; - Integer min = page*perside-perside; - - Integer l = 0; - for(String s : strings){ - if(l>=min&&l getList(HashMap map){ - if(map==null||map.isEmpty()){return null;} - List stringlist = new ArrayList(); - for(String s : map.keySet()){ - stringlist.add(s); - } - return stringlist; - } - - public boolean check(CommandSender sender, HashMap stringList, Integer page, Integer perside){ - if(sender==null){return false;} - if(stringList==null||stringList.isEmpty()){return false;} - if(page==null||page==0){page=1;} - int numPages = ceil((double)stringList.size()/(double)perside); - if(page > numPages){ - return false; - } - return true; - } -} diff --git a/src/de/Ste3et_C0st/Furniture/Main/main.java b/src/de/Ste3et_C0st/Furniture/Main/main.java index 7893f28..a6198cf 100644 --- a/src/de/Ste3et_C0st/Furniture/Main/main.java +++ b/src/de/Ste3et_C0st/Furniture/Main/main.java @@ -171,9 +171,8 @@ public class main extends JavaPlugin implements Listener{ loc.setYaw(e.getPlayer().getLocation().getYaw()); loc.add(0, 1, 0); Project pro = e.getProject(); - lib.getLimitationManager().add(e.getLocation(), pro); - ObjectID obj = new ObjectID(pro.getName(), pro.getPlugin().getName(), e.getLocation()); - + lib.getLimitationManager().add(loc, pro); + ObjectID obj = new ObjectID(pro.getName(), pro.getPlugin().getName(), loc); switch(e.getProject().getName()){ case "Camera" : new camera(loc, lib, instance, obj);break; case "TV" : new tv(loc, lib, instance, obj);break; diff --git a/src/de/Ste3et_C0st/Furniture/Objects/electric/streetlamp.java b/src/de/Ste3et_C0st/Furniture/Objects/electric/streetlamp.java index 381076e..3cc0784 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/electric/streetlamp.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/electric/streetlamp.java @@ -29,6 +29,7 @@ import de.Ste3et_C0st.FurnitureLib.main.FurnitureLib; import de.Ste3et_C0st.FurnitureLib.main.FurnitureManager; import de.Ste3et_C0st.FurnitureLib.main.ObjectID; import de.Ste3et_C0st.FurnitureLib.main.Type.BodyPart; +import de.Ste3et_C0st.FurnitureLib.main.Type.EventType; public class streetlamp extends Furniture implements Listener{ @@ -155,7 +156,7 @@ public class streetlamp extends Furniture implements Listener{ if(e.getClickedBlock()==null) return; if(blockLocation.contains(e.getClickedBlock().getLocation())){ e.setCancelled(true); - if(!lib.canBuild(e.getPlayer(), e.getClickedBlock().getLocation())){return;} + if(!lib.canBuild(e.getPlayer(), e.getClickedBlock().getLocation(), EventType.BREAK)){return;} FurnitureLib.getInstance().getLightManager().removeLight(light); obj.remove(e.getPlayer()); for(Location loc : blockLocation){ @@ -166,7 +167,7 @@ public class streetlamp extends Furniture implements Listener{ }else if(e.getAction().equals(Action.RIGHT_CLICK_BLOCK)){ if(e.getClickedBlock()==null) return; if(blockLocation.contains(e.getClickedBlock().getLocation())){ - if(!lib.canBuild(e.getPlayer(), e.getClickedBlock().getLocation())){return;} + if(!lib.canBuild(e.getPlayer(), e.getClickedBlock().getLocation(), EventType.INTERACT)){return;} if(isOn()){ setLight(false); }else{ @@ -251,6 +252,7 @@ public class streetlamp extends Furniture implements Listener{ if(obj==null){return;} if(e.isCancelled()){return;} if(!e.getID().equals(obj)){return;} + if(!e.canBuild()){return;} e.setCancelled(true); Boolean isOn = isOn(); ArmorStandPacket packet = getPacket(); diff --git a/src/de/Ste3et_C0st/Furniture/Objects/garden/fance.java b/src/de/Ste3et_C0st/Furniture/Objects/garden/fance.java index fb13a97..12c5758 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/garden/fance.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/garden/fance.java @@ -28,6 +28,7 @@ import de.Ste3et_C0st.FurnitureLib.main.Furniture; import de.Ste3et_C0st.FurnitureLib.main.FurnitureLib; import de.Ste3et_C0st.FurnitureLib.main.FurnitureManager; import de.Ste3et_C0st.FurnitureLib.main.ObjectID; +import de.Ste3et_C0st.FurnitureLib.main.Type.EventType; public class fance extends Furniture implements Listener{ @@ -101,7 +102,7 @@ public class fance extends Furniture implements Listener{ if(obj==null){return;} if(block==null){return;} if(!e.getBlock().getLocation().equals(block.getLocation())){return;} - if(!lib.canBuild(e.getPlayer(), e.getBlock().getLocation())){return;} + if(!lib.canBuild(e.getPlayer(), e.getBlock().getLocation(), EventType.BREAK)){return;} this.block.setType(Material.AIR); this.obj.remove(e.getPlayer()); block=null; diff --git a/src/de/Ste3et_C0st/Furniture/Objects/garden/sunshade.java b/src/de/Ste3et_C0st/Furniture/Objects/garden/sunshade.java index 0cecc61..c8d5a9d 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/garden/sunshade.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/garden/sunshade.java @@ -34,6 +34,7 @@ import de.Ste3et_C0st.FurnitureLib.main.FurnitureLib; import de.Ste3et_C0st.FurnitureLib.main.FurnitureManager; import de.Ste3et_C0st.FurnitureLib.main.ObjectID; import de.Ste3et_C0st.FurnitureLib.main.Type.BodyPart; +import de.Ste3et_C0st.FurnitureLib.main.Type.EventType; public class sunshade extends Furniture implements Listener{ @@ -191,7 +192,7 @@ public class sunshade extends Furniture implements Listener{ if(e.getAction().equals(Action.LEFT_CLICK_BLOCK)){ if(e.getClickedBlock().getLocation().equals(block.getLocation())){ e.setCancelled(true); - if(!lib.canBuild(e.getPlayer(), e.getClickedBlock().getLocation())){return;} + if(!lib.canBuild(e.getPlayer(), e.getClickedBlock().getLocation(), EventType.BREAK)){return;} stopTimer(); for(ArmorStandPacket packet : manager.getArmorStandPacketByObjectID(obj)){ if(packet.getName().equalsIgnoreCase("#ITEM#")){ @@ -208,7 +209,7 @@ public class sunshade extends Furniture implements Listener{ } }else if(e.getAction().equals(Action.RIGHT_CLICK_BLOCK)){ if(e.getClickedBlock().getLocation().equals(block.getLocation())){ - if(!lib.canBuild(e.getPlayer(), e.getClickedBlock().getLocation())){return;} + if(!lib.canBuild(e.getPlayer(), e.getClickedBlock().getLocation(), EventType.INTERACT)){return;} Player p = e.getPlayer(); ItemStack is = p.getItemInHand(); if(is==null||!is.getType().equals(Material.BANNER)){ diff --git a/src/de/Ste3et_C0st/Furniture/Objects/indoor/sofa.java b/src/de/Ste3et_C0st/Furniture/Objects/indoor/sofa.java index 5f6765f..71d9c0d 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/indoor/sofa.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/indoor/sofa.java @@ -26,6 +26,7 @@ import de.Ste3et_C0st.FurnitureLib.main.FurnitureLib; import de.Ste3et_C0st.FurnitureLib.main.FurnitureManager; import de.Ste3et_C0st.FurnitureLib.main.ObjectID; import de.Ste3et_C0st.FurnitureLib.main.Type.BodyPart; +import de.Ste3et_C0st.FurnitureLib.main.Type.EventType; public class sofa extends Furniture implements Listener { @@ -178,7 +179,7 @@ public class sofa extends Furniture implements Listener { e.setCancelled(true); final Player p = e.getPlayer(); if(p.getItemInHand().getType().equals(Material.INK_SACK)){ - Boolean canBuild = lib.canBuild(p, e.getLocation()); + Boolean canBuild = lib.canBuild(p, e.getLocation(), EventType.INTERACT); Material m = Material.CARPET; color(p, canBuild, m); }else{ diff --git a/src/de/Ste3et_C0st/Furniture/Objects/outdoor/barrels.java b/src/de/Ste3et_C0st/Furniture/Objects/outdoor/barrels.java index 25a33c5..8556299 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/outdoor/barrels.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/outdoor/barrels.java @@ -25,6 +25,7 @@ import de.Ste3et_C0st.FurnitureLib.main.Furniture; import de.Ste3et_C0st.FurnitureLib.main.FurnitureLib; import de.Ste3et_C0st.FurnitureLib.main.FurnitureManager; import de.Ste3et_C0st.FurnitureLib.main.ObjectID; +import de.Ste3et_C0st.FurnitureLib.main.Type.EventType; public class barrels extends Furniture implements Listener { @@ -108,7 +109,7 @@ public class barrels extends Furniture implements Listener { if(e.getClickedBlock()==null){return;} if(!e.getClickedBlock().getLocation().equals(block.getLocation())){return;} if(!e.getAction().equals(Action.RIGHT_CLICK_BLOCK)){return;} - if(!lib.canBuild(e.getPlayer(), e.getClickedBlock().getLocation())){return;} + if(!lib.canBuild(e.getPlayer(), e.getClickedBlock().getLocation(), EventType.INTERACT)){return;} Player p = e.getPlayer(); if(!p.getItemInHand().getType().isBlock()&&!p.getItemInHand().getType().equals(Material.AIR)){e.getPlayer().sendMessage("03");return;} e.setCancelled(true); @@ -139,7 +140,7 @@ public class barrels extends Furniture implements Listener { if(obj==null){return;} if(block==null){return;} if(!e.getBlock().getLocation().equals(block.getLocation())){return;} - if(!lib.canBuild(e.getPlayer(), e.getBlock().getLocation())){return;} + if(!lib.canBuild(e.getPlayer(), e.getBlock().getLocation(), EventType.BREAK)){return;} ArmorStandPacket packet = manager.getArmorStandPacketByObjectID(obj).get(0); if(packet.getInventory().getHelmet()!=null&&!packet.getInventory().getHelmet().getType().equals(Material.AIR)){ ItemStack is = packet.getInventory().getHelmet(); diff --git a/src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_1.java b/src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_1.java index 2b7066e..6cb9c37 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_1.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_1.java @@ -28,6 +28,7 @@ import de.Ste3et_C0st.FurnitureLib.main.FurnitureLib; import de.Ste3et_C0st.FurnitureLib.main.FurnitureManager; import de.Ste3et_C0st.FurnitureLib.main.ObjectID; import de.Ste3et_C0st.FurnitureLib.main.Type.BodyPart; +import de.Ste3et_C0st.FurnitureLib.main.Type.EventType; public class tent_1 extends Furniture implements Listener{ @@ -280,7 +281,7 @@ public class tent_1 extends Furniture implements Listener{ if(!p.getItemInHand().getType().equals(Material.INK_SACK)){ p.openWorkbench(this.block.getLocation(), true); }else{ - Boolean canBuild = lib.canBuild(p, e.getLocation()); + Boolean canBuild = lib.canBuild(p, e.getLocation(), EventType.INTERACT); Material m = Material.CARPET; color(p, canBuild, m); } @@ -290,7 +291,7 @@ public class tent_1 extends Furniture implements Listener{ private void onBlockBreak(BlockBreakEvent e){ if(obj==null){return;} if(e.isCancelled()){return;} - if(!lib.canBuild(e.getPlayer(), loc)){return;} + if(!lib.canBuild(e.getPlayer(), loc, EventType.BREAK)){return;} if(obj==null){return;} if(this.block!=null&&e.getBlock().equals(block)){this.block.setType(Material.AIR);this.block=null;} this.obj.remove(e.getPlayer()); diff --git a/src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_2.java b/src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_2.java index b82ad5e..debd65c 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_2.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_2.java @@ -29,6 +29,7 @@ import de.Ste3et_C0st.FurnitureLib.main.FurnitureLib; import de.Ste3et_C0st.FurnitureLib.main.FurnitureManager; import de.Ste3et_C0st.FurnitureLib.main.ObjectID; import de.Ste3et_C0st.FurnitureLib.main.Type.BodyPart; +import de.Ste3et_C0st.FurnitureLib.main.Type.EventType; public class tent_2 extends Furniture implements Listener{ @@ -229,7 +230,7 @@ public class tent_2 extends Furniture implements Listener{ } } }else{ - Boolean canBuild = lib.canBuild(p, e.getLocation()); + Boolean canBuild = lib.canBuild(p, e.getLocation(), EventType.INTERACT); Material m = Material.CARPET; color(p, canBuild, m); } diff --git a/src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_3.java b/src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_3.java index 37b5f20..18dc1f5 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_3.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_3.java @@ -31,6 +31,7 @@ import de.Ste3et_C0st.FurnitureLib.main.FurnitureLib; import de.Ste3et_C0st.FurnitureLib.main.FurnitureManager; import de.Ste3et_C0st.FurnitureLib.main.ObjectID; import de.Ste3et_C0st.FurnitureLib.main.Type.BodyPart; +import de.Ste3et_C0st.FurnitureLib.main.Type.EventType; public class tent_3 extends Furniture implements Listener{ @@ -194,7 +195,7 @@ public class tent_3 extends Furniture implements Listener{ e.setCancelled(true); Player p = e.getPlayer(); if(p.getItemInHand().getType().equals(Material.INK_SACK)){ - Boolean canBuild = lib.canBuild(p, e.getLocation()); + Boolean canBuild = lib.canBuild(p, e.getLocation(), EventType.INTERACT); Material m = Material.BANNER; color(p, canBuild, m); }else{ diff --git a/src/plugin.yml b/src/plugin.yml index 6b42a45..5146826 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,5 +1,5 @@ name: DiceFurniture -version: 2.0.8.2 +version: 2.0.9 description: Furniture author: Ste3et_C0st website: http://dicecraft.de