diff --git a/.classpath b/.classpath index 288d3d9..e642996 100644 --- a/.classpath +++ b/.classpath @@ -4,6 +4,6 @@ - - + + diff --git a/.externalToolBuilders/DiceFurniture.launch b/.externalToolBuilders/DiceFurniture.launch new file mode 100644 index 0000000..f7790cc --- /dev/null +++ b/.externalToolBuilders/DiceFurniture.launch @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/.project b/.project index eed33ee..c787c7e 100644 --- a/.project +++ b/.project @@ -10,6 +10,16 @@ + + org.eclipse.ui.externaltools.ExternalToolBuilder + auto,full,incremental, + + + LaunchConfigHandle + <project>/.externalToolBuilders/DiceFurniture.launch + + + org.eclipse.jdt.core.javanature diff --git a/builder.xml b/builder.xml new file mode 100644 index 0000000..0ae685e --- /dev/null +++ b/builder.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/Crafting/AdventCalender.yml b/src/Crafting/AdventCalender.yml index 82015b0..d1a5094 100644 --- a/src/Crafting/AdventCalender.yml +++ b/src/Crafting/AdventCalender.yml @@ -1,4 +1,5 @@ AdventCalender: + system-ID: 'AdventCalender' name: '&cAdventCalender' material: 383 glow: true diff --git a/src/Crafting/AdventWreath.yml b/src/Crafting/AdventWreath.yml index 658f995..14d78ad 100644 --- a/src/Crafting/AdventWreath.yml +++ b/src/Crafting/AdventWreath.yml @@ -1,4 +1,5 @@ AdventWreath: + system-ID: 'AdventWreath' name: '&cAdventWreath' material: 383 glow: true diff --git a/src/Crafting/Barrels.yml b/src/Crafting/Barrels.yml index 834719a..d3d087a 100644 --- a/src/Crafting/Barrels.yml +++ b/src/Crafting/Barrels.yml @@ -1,4 +1,5 @@ Barrels: + systemID: 'Barrels' name: '&cBarrels' material: 383 glow: true diff --git a/src/Crafting/BearTrap.yml b/src/Crafting/BearTrap.yml index 77202bc..0c9565f 100644 --- a/src/Crafting/BearTrap.yml +++ b/src/Crafting/BearTrap.yml @@ -1,4 +1,5 @@ BearTrap: + system-ID: 'BearTrap' name: '&cBearTrap' material: 383 glow: false diff --git a/src/Crafting/Billboard.yml b/src/Crafting/Billboard.yml index 3c249b1..483aba3 100644 --- a/src/Crafting/Billboard.yml +++ b/src/Crafting/Billboard.yml @@ -1,4 +1,5 @@ Billboard: + system-ID: 'Billboard' name: '&cBillboard' material: 383 glow: false diff --git a/src/Crafting/BlackBoard.yml b/src/Crafting/BlackBoard.yml index 7ca7517..c32a0e3 100644 --- a/src/Crafting/BlackBoard.yml +++ b/src/Crafting/BlackBoard.yml @@ -1,4 +1,5 @@ BlackBoard: + system-Name: 'BlackBoard' name: '&cBlackBoard' material: 383 glow: false diff --git a/src/Crafting/CactusPlant.yml b/src/Crafting/CactusPlant.yml index eac20c5..5adab36 100644 --- a/src/Crafting/CactusPlant.yml +++ b/src/Crafting/CactusPlant.yml @@ -1,4 +1,5 @@ CactusPlant: + system-ID: 'CactusPlant' name: '&cCactusPlant' material: 383 glow: true diff --git a/src/Crafting/Camera.yml b/src/Crafting/Camera.yml index 49bba5e..9d08ef3 100644 --- a/src/Crafting/Camera.yml +++ b/src/Crafting/Camera.yml @@ -1,4 +1,5 @@ Camera: + system-ID: 'Camera' name: '&cCamera' material: 383 glow: false diff --git a/src/Crafting/CampChair.yml b/src/Crafting/CampChair.yml index cb920c0..1d3fa69 100644 --- a/src/Crafting/CampChair.yml +++ b/src/Crafting/CampChair.yml @@ -1,4 +1,5 @@ CampChair: + system-ID: 'CampChair' name: '&cCampChair' material: 383 glow: false diff --git a/src/Crafting/Campfire1.yml b/src/Crafting/Campfire1.yml index aaddca7..78a58a0 100644 --- a/src/Crafting/Campfire1.yml +++ b/src/Crafting/Campfire1.yml @@ -1,4 +1,5 @@ Campfire1: + system-ID: 'Campfire1' name: '&cCampfire #1' material: 383 glow: false diff --git a/src/Crafting/Campfire2.yml b/src/Crafting/Campfire2.yml index 7c0183a..e971708 100644 --- a/src/Crafting/Campfire2.yml +++ b/src/Crafting/Campfire2.yml @@ -1,4 +1,5 @@ Campfire2: + system-ID: 'Campfire2' name: '&cCampfire #2' material: 383 glow: false diff --git a/src/Crafting/CandyCane.yml b/src/Crafting/CandyCane.yml index 66cca0c..785fac6 100644 --- a/src/Crafting/CandyCane.yml +++ b/src/Crafting/CandyCane.yml @@ -1,4 +1,5 @@ CandyCane: + system-ID: 'CandyCane' name: '&cCandyCane' material: 383 glow: false diff --git a/src/Crafting/Catapult.yml b/src/Crafting/Catapult.yml index e48c6d1..90da710 100644 --- a/src/Crafting/Catapult.yml +++ b/src/Crafting/Catapult.yml @@ -1,4 +1,5 @@ Catapult: + system-ID: 'Catapult' name: '&cCatapult' material: 383 glow: false diff --git a/src/Crafting/Chair.yml b/src/Crafting/Chair.yml index 110e92a..778b500 100644 --- a/src/Crafting/Chair.yml +++ b/src/Crafting/Chair.yml @@ -1,4 +1,5 @@ Chair: + system-ID: 'Chair' name: '&cChair' material: 383 glow: false diff --git a/src/Crafting/ChristmasTree.yml b/src/Crafting/ChristmasTree.yml index 227fcfc..522d2e1 100644 --- a/src/Crafting/ChristmasTree.yml +++ b/src/Crafting/ChristmasTree.yml @@ -1,4 +1,5 @@ ChristmasTree: + system-ID: 'ChristmasTree' name: '&cChristmasTree' material: 383 glow: false diff --git a/src/Crafting/Crossbow.yml b/src/Crafting/Crossbow.yml index d8a92f5..1109cac 100644 --- a/src/Crafting/Crossbow.yml +++ b/src/Crafting/Crossbow.yml @@ -1,4 +1,5 @@ Crossbow: + system-ID: 'Crossbow' name: '&cCrossbow' material: 383 glow: false diff --git a/src/Crafting/FireworkLauncher.yml b/src/Crafting/FireworkLauncher.yml index b8d7d17..c27be60 100644 --- a/src/Crafting/FireworkLauncher.yml +++ b/src/Crafting/FireworkLauncher.yml @@ -1,4 +1,5 @@ FireworkLauncher: + system-ID: 'FireworkLauncher' name: '&cFireworkLauncher' material: 383 glow: false diff --git a/src/Crafting/FlowerPot.yml b/src/Crafting/FlowerPot.yml index 3427fe5..21c3c99 100644 --- a/src/Crafting/FlowerPot.yml +++ b/src/Crafting/FlowerPot.yml @@ -1,4 +1,5 @@ FlowerPot: + system-ID: 'FlowerPot' name: '&cFlowerPot' material: 383 glow: false diff --git a/src/Crafting/GraveStone.yml b/src/Crafting/GraveStone.yml index 824a2cd..f09b419 100644 --- a/src/Crafting/GraveStone.yml +++ b/src/Crafting/GraveStone.yml @@ -1,4 +1,5 @@ GraveStone: + system-ID: 'GraveStone' name: '&cGrave Stone' material: 383 glow: false diff --git a/src/Crafting/Hammock.yml b/src/Crafting/Hammock.yml index e521122..8cca148 100644 --- a/src/Crafting/Hammock.yml +++ b/src/Crafting/Hammock.yml @@ -1,4 +1,5 @@ Hammock: + system-ID: 'Hammock' name: '&cHammock' material: 383 glow: false diff --git a/src/Crafting/HumanSkeleton.yml b/src/Crafting/HumanSkeleton.yml index b4afa50..a008e68 100644 --- a/src/Crafting/HumanSkeleton.yml +++ b/src/Crafting/HumanSkeleton.yml @@ -1,4 +1,5 @@ HumanSkeleton: + system-ID: 'HumanSkeleton' name: '&cHumanSkeleton' material: 383 glow: false diff --git a/src/Crafting/Lantern.yml b/src/Crafting/Lantern.yml index 3740981..f96c9a3 100644 --- a/src/Crafting/Lantern.yml +++ b/src/Crafting/Lantern.yml @@ -1,4 +1,5 @@ Lantern: + system-ID: 'Lantern' name: '&cLantern' material: 383 glow: false diff --git a/src/Crafting/LargeTable.yml b/src/Crafting/LargeTable.yml index 79a3ebe..408bfd1 100644 --- a/src/Crafting/LargeTable.yml +++ b/src/Crafting/LargeTable.yml @@ -1,4 +1,5 @@ LargeTable: + system-ID: 'LargeTable' name: '&cLarge Table' material: 383 glow: false diff --git a/src/Crafting/Mailbox.yml b/src/Crafting/Mailbox.yml index 823bbdb..2029cab 100644 --- a/src/Crafting/Mailbox.yml +++ b/src/Crafting/Mailbox.yml @@ -1,4 +1,5 @@ -Mailbox: +MailBox: + system-ID: 'MailBox' name: '&cMailBox' material: 383 glow: false diff --git a/src/Crafting/SchoolChair.yml b/src/Crafting/SchoolChair.yml index e2494a9..e7ee4c0 100644 --- a/src/Crafting/SchoolChair.yml +++ b/src/Crafting/SchoolChair.yml @@ -1,4 +1,5 @@ SchoolChair: + system-ID: 'SchoolChair' name: '&cSchoolChair' material: 383 glow: false diff --git a/src/Crafting/SchoolTable.yml b/src/Crafting/SchoolTable.yml index c0f3cb2..3effbdb 100644 --- a/src/Crafting/SchoolTable.yml +++ b/src/Crafting/SchoolTable.yml @@ -1,4 +1,5 @@ SchoolTable: + system-ID: 'SchoolTable' name: '&cSchoolTable' material: 383 glow: false diff --git a/src/Crafting/SleepingBag.yml b/src/Crafting/SleepingBag.yml index 9e91d5f..8f8dbd6 100644 --- a/src/Crafting/SleepingBag.yml +++ b/src/Crafting/SleepingBag.yml @@ -1,4 +1,5 @@ SleepingBag: + system-ID: 'SleepingBag' name: '&cSleepingBag' material: 383 glow: false diff --git a/src/Crafting/SnowGolem.yml b/src/Crafting/SnowGolem.yml index 0a62514..fa3028c 100644 --- a/src/Crafting/SnowGolem.yml +++ b/src/Crafting/SnowGolem.yml @@ -1,4 +1,5 @@ SnowGolem: + system-ID: 'SnowGolem' name: '&cSnowGolem' material: 383 glow: false diff --git a/src/Crafting/Sofa.yml b/src/Crafting/Sofa.yml index c93896e..5befcc9 100644 --- a/src/Crafting/Sofa.yml +++ b/src/Crafting/Sofa.yml @@ -1,4 +1,5 @@ Sofa: + system-ID: 'Sofa' name: '&cSofa' material: 383 glow: false diff --git a/src/Crafting/Streetlamp.yml b/src/Crafting/Streetlamp.yml index fca2d7d..fc45d77 100644 --- a/src/Crafting/Streetlamp.yml +++ b/src/Crafting/Streetlamp.yml @@ -1,4 +1,5 @@ Streetlamp: + system-ID: 'Streetlamp' name: '&cStreetlamp' material: 383 glow: false diff --git a/src/Crafting/Sunshade.yml b/src/Crafting/Sunshade.yml index c078e6d..22cc46b 100644 --- a/src/Crafting/Sunshade.yml +++ b/src/Crafting/Sunshade.yml @@ -1,4 +1,5 @@ Sunshade: + system-ID: 'Sunshade' name: '&cSunshade' material: 383 glow: false diff --git a/src/Crafting/TV.yml b/src/Crafting/TV.yml index 80fbd73..841cec0 100644 --- a/src/Crafting/TV.yml +++ b/src/Crafting/TV.yml @@ -1,4 +1,5 @@ TV: + system-ID: 'TV' name: '&cTV' material: 383 glow: false diff --git a/src/Crafting/Table.yml b/src/Crafting/Table.yml index 6d5034f..6b53782 100644 --- a/src/Crafting/Table.yml +++ b/src/Crafting/Table.yml @@ -1,4 +1,5 @@ Table: + system-ID: 'Table' name: '&cTable' material: 383 glow: false diff --git a/src/Crafting/Tent1.yml b/src/Crafting/Tent1.yml index 0a1a213..318bad6 100644 --- a/src/Crafting/Tent1.yml +++ b/src/Crafting/Tent1.yml @@ -1,4 +1,5 @@ Tent1: + system-ID: 'Tent1' name: '&cTent #1' material: 383 glow: false diff --git a/src/Crafting/Tent2.yml b/src/Crafting/Tent2.yml index 1fcaa5b..fbd7d8f 100644 --- a/src/Crafting/Tent2.yml +++ b/src/Crafting/Tent2.yml @@ -1,4 +1,5 @@ Tent2: + system-ID: 'Tent2' name: '&cTent #2' material: 383 glow: false diff --git a/src/Crafting/Tent3.yml b/src/Crafting/Tent3.yml index 4d44125..4039e12 100644 --- a/src/Crafting/Tent3.yml +++ b/src/Crafting/Tent3.yml @@ -1,4 +1,5 @@ Tent3: + system-ID: 'Tent3' name: '&cTent #3' material: 383 glow: false diff --git a/src/Crafting/TrashCan.yml b/src/Crafting/TrashCan.yml index eb2171b..e387cb1 100644 --- a/src/Crafting/TrashCan.yml +++ b/src/Crafting/TrashCan.yml @@ -1,4 +1,5 @@ TrashCan: + system-ID: 'TrashCan' name: '&cTrashCan' material: 383 glow: false diff --git a/src/Crafting/Trunk.yml b/src/Crafting/Trunk.yml index 716aa59..c98c2ff 100644 --- a/src/Crafting/Trunk.yml +++ b/src/Crafting/Trunk.yml @@ -1,4 +1,5 @@ Trunk: + system-ID: 'Trunk' name: '&cTrunk' material: 383 glow: false diff --git a/src/Crafting/WaterBottle.yml b/src/Crafting/WaterBottle.yml index 2c4372d..8c8b32d 100644 --- a/src/Crafting/WaterBottle.yml +++ b/src/Crafting/WaterBottle.yml @@ -1,4 +1,5 @@ WaterBottle: + system-ID: 'WaterBottle' name: '&cWaterBottle' material: 383 glow: false diff --git a/src/Crafting/WaxCandle.yml b/src/Crafting/WaxCandle.yml new file mode 100644 index 0000000..a7986a7 --- /dev/null +++ b/src/Crafting/WaxCandle.yml @@ -0,0 +1,13 @@ +WaxCandle: + system-ID: 'WaxCandle' + name: '&cWaxCandle' + material: 383 + glow: false + lore: '' + crafting: + disable: false + recipe: XXX,AAA,XOX + index: + X: 0 + A: 101 + O: 167 \ No newline at end of file diff --git a/src/Crafting/WeaponStand.yml b/src/Crafting/WeaponStand.yml index 10366ef..ceec661 100644 --- a/src/Crafting/WeaponStand.yml +++ b/src/Crafting/WeaponStand.yml @@ -1,4 +1,5 @@ WeaponStand: + system-ID: 'WeaponStand' name: '&cWeaponStand' material: 383 glow: false diff --git a/src/Crafting/fence.yml b/src/Crafting/fence.yml index 62322ac..dd2d29f 100644 --- a/src/Crafting/fence.yml +++ b/src/Crafting/fence.yml @@ -1,4 +1,5 @@ Fence: + system-ID: 'Fence' name: '&cFence' material: 383 glow: false diff --git a/src/Crafting/flag.yml b/src/Crafting/flag.yml index 2956728..a5c0099 100644 --- a/src/Crafting/flag.yml +++ b/src/Crafting/flag.yml @@ -1,4 +1,5 @@ Flag: + system-ID: 'Flag' name: '&cFlag' material: 383 glow: false diff --git a/src/Crafting/guillotine.yml b/src/Crafting/guillotine.yml index a291699..961e1e8 100644 --- a/src/Crafting/guillotine.yml +++ b/src/Crafting/guillotine.yml @@ -1,4 +1,5 @@ Guillotine: + system-ID: 'Guillotine' name: '&cGuillotine' material: 383 glow: false diff --git a/src/Crafting/log.yml b/src/Crafting/log.yml index 23ea2a2..b9b88c0 100644 --- a/src/Crafting/log.yml +++ b/src/Crafting/log.yml @@ -1,4 +1,5 @@ Log: + system-ID: 'Log' name: '&cLog' material: 383 glow: false diff --git a/src/de/Ste3et_C0st/Furniture/Main/main.java b/src/de/Ste3et_C0st/Furniture/Main/main.java index 7ca05e2..fdab1b7 100644 --- a/src/de/Ste3et_C0st/Furniture/Main/main.java +++ b/src/de/Ste3et_C0st/Furniture/Main/main.java @@ -21,7 +21,6 @@ import de.Ste3et_C0st.Furniture.Objects.School.SchoolChair; import de.Ste3et_C0st.Furniture.Objects.School.SchoolTable; import de.Ste3et_C0st.Furniture.Objects.School.TrashCan; import de.Ste3et_C0st.Furniture.Objects.christmas.AdventCalender; -import de.Ste3et_C0st.Furniture.Objects.christmas.AdventWreath; import de.Ste3et_C0st.Furniture.Objects.christmas.CandyCane; import de.Ste3et_C0st.Furniture.Objects.christmas.ChristmasTree; import de.Ste3et_C0st.Furniture.Objects.christmas.FireworkLauncher; @@ -33,7 +32,6 @@ import de.Ste3et_C0st.Furniture.Objects.electric.tv; import de.Ste3et_C0st.Furniture.Objects.garden.SleepingBag; import de.Ste3et_C0st.Furniture.Objects.garden.TFlowerPot; import de.Ste3et_C0st.Furniture.Objects.garden.Trunk; -import de.Ste3et_C0st.Furniture.Objects.garden.WaterBottle; import de.Ste3et_C0st.Furniture.Objects.garden.campchair; import de.Ste3et_C0st.Furniture.Objects.garden.fance; import de.Ste3et_C0st.Furniture.Objects.garden.graveStone; @@ -45,6 +43,7 @@ import de.Ste3et_C0st.Furniture.Objects.indoor.lantern; import de.Ste3et_C0st.Furniture.Objects.indoor.largeTable; import de.Ste3et_C0st.Furniture.Objects.indoor.sofa; import de.Ste3et_C0st.Furniture.Objects.indoor.table; +import de.Ste3et_C0st.Furniture.Objects.light.WaxCandle; import de.Ste3et_C0st.Furniture.Objects.outdoor.CactusPlant; import de.Ste3et_C0st.Furniture.Objects.outdoor.barrels; import de.Ste3et_C0st.Furniture.Objects.outdoor.campfire_1; @@ -74,55 +73,59 @@ public class main extends JavaPlugin{ instance = this; lib = (FurnitureLib) Bukkit.getPluginManager().getPlugin("FurnitureLib"); util = lib.getLocationUtil(); - new Project("Camera", this,getResource("Crafting/Camera.yml"),PlaceableSide.TOP, camera.class).setSize(1, 1, 1, CenterType.RIGHT); - new Project("TV", this,getResource("Crafting/TV.yml"),PlaceableSide.TOP, tv.class).setSize(1, 2, 3, CenterType.CENTER); - new Project("GraveStone", this,getResource("Crafting/GraveStone.yml"),PlaceableSide.TOP, graveStone.class).setSize(1, 2, 3, CenterType.CENTER); - new Project("Chair", this,getResource("Crafting/Chair.yml"),PlaceableSide.TOP, chair.class).setSize(1, 1, 1, CenterType.RIGHT); - new Project("LargeTable", this,getResource("Crafting/LargeTable.yml"),PlaceableSide.TOP, largeTable.class).setSize(2, 1, 2, CenterType.RIGHT); - new Project("Lantern", this,getResource("Crafting/Lantern.yml"),PlaceableSide.TOP, lantern.class).setSize(1, 1, 1, CenterType.RIGHT); - new Project("Sofa", this,getResource("Crafting/Sofa.yml"),PlaceableSide.TOP, sofa.class).setSize(1, 1, 3, CenterType.RIGHT); - new Project("Table", this,getResource("Crafting/Table.yml"),PlaceableSide.TOP, table.class).setSize(1, 1, 1, CenterType.RIGHT); - new Project("Barrels", this,getResource("Crafting/Barrels.yml"),PlaceableSide.TOP, barrels.class).setSize(1, 1, 1, CenterType.RIGHT); - new Project("Campfire1", this,getResource("Crafting/Campfire1.yml"),PlaceableSide.TOP, campfire_1.class).setSize(1, 1, 1, CenterType.RIGHT); - new Project("Campfire2", this,getResource("Crafting/Campfire2.yml"),PlaceableSide.TOP, campfire_2.class).setSize(1, 1, 1, CenterType.RIGHT); - new Project("Tent1", this,getResource("Crafting/Tent1.yml"),PlaceableSide.TOP, tent_1.class).setSize(4, 3, 5, CenterType.RIGHT); - new Project("Tent2", this,getResource("Crafting/Tent2.yml"),PlaceableSide.TOP, tent_2.class).setSize(4, 3, 5, CenterType.RIGHT); - new Project("Tent3", this,getResource("Crafting/Tent3.yml"),PlaceableSide.TOP, tent_3.class).setSize(3, 2, 3, CenterType.CENTER); - new Project("Fence", this, getResource("Crafting/fence.yml"),PlaceableSide.TOP, fance.class).setSize(1, 1, 1, CenterType.RIGHT); - new Project("Sunshade", this, getResource("Crafting/Sunshade.yml"),PlaceableSide.TOP, sunshade.class).setSize(1, 3, 1, CenterType.RIGHT); - new Project("Streetlamp", this, getResource("Crafting/Streetlamp.yml"),PlaceableSide.TOP, streetlamp.class).setSize(2, 4, 1, CenterType.FRONT); - new Project("Billboard", this, getResource("Crafting/Billboard.yml"),PlaceableSide.TOP, billboard.class).setSize(1, 3, 3, CenterType.RIGHT); - new Project("Mailbox", this, getResource("Crafting/Mailbox.yml"),PlaceableSide.TOP, mailBox.class).setSize(1, 2, 1, CenterType.RIGHT); - new Project("WeaponStand", this, getResource("Crafting/WeaponStand.yml"),PlaceableSide.TOP, weaponStand.class).setSize(1, 1, 1, CenterType.RIGHT); - new Project("Hammock", this, getResource("Crafting/Hammock.yml"),PlaceableSide.TOP, hammock.class).setSize(1, 2, 7, CenterType.RIGHT); - new Project("CampChair", this, getResource("Crafting/CampChair.yml"),PlaceableSide.TOP, campchair.class).setSize(1, 1, 1, CenterType.RIGHT); - new Project("CactusPlant", this, getResource("Crafting/CactusPlant.yml"),PlaceableSide.TOP, CactusPlant.class).setSize(1, 1, 1, CenterType.RIGHT); - new Project("Guillotine", this, getResource("Crafting/guillotine.yml"),PlaceableSide.TOP, guillotine.class).setSize(1, 5, 2, CenterType.RIGHT); - new Project("Log", this, getResource("Crafting/log.yml"), PlaceableSide.TOP, log.class).setSize(1, 1, 1, CenterType.RIGHT); - new Project("FlowerPot", this, getResource("Crafting/FlowerPot.yml"),PlaceableSide.BOTTOM, TFlowerPot.class).setSize(1, 1, 1, CenterType.RIGHT); - new Project("WaterBottle", this, getResource("Crafting/WaterBottle.yml"), PlaceableSide.WATER, WaterBottle.class).setSize(1, 1, 1, CenterType.RIGHT); - new Project("SleepingBag", this, getResource("Crafting/SleepingBag.yml"), PlaceableSide.TOP, SleepingBag.class).setSize(1, 1, 2, CenterType.RIGHT); - new Project("BearTrap", this, getResource("Crafting/BearTrap.yml"), PlaceableSide.TOP, BearTrap.class).setSize(1, 1, 1, CenterType.RIGHT); - new Project("Trunk", this, getResource("Crafting/Trunk.yml"), PlaceableSide.TOP, Trunk.class).setSize(1, 1, 4, CenterType.RIGHT); - new Project("SchoolTable", this, getResource("Crafting/SchoolTable.yml"), PlaceableSide.TOP, SchoolTable.class).setSize(1, 1, 1, CenterType.RIGHT); - new Project("SchoolChair", this, getResource("Crafting/SchoolChair.yml"), PlaceableSide.TOP, SchoolChair.class).setSize(1, 1, 1, CenterType.RIGHT); - new Project("BlackBoard", this, getResource("Crafting/BlackBoard.yml"), PlaceableSide.SIDE, BlackBoard.class).setSize(1, 2, 3, CenterType.RIGHT); - new Project("TrashCan", this, getResource("Crafting/TrashCan.yml"), PlaceableSide.TOP, TrashCan.class).setSize(1, 1, 1, CenterType.RIGHT); - new Project("HumanSkeleton", this, getResource("Crafting/HumanSkeleton.yml"), PlaceableSide.TOP, HumanSkeleton.class).setSize(3, 1, 2, CenterType.RIGHT); - new Project("Crossbow", this, getResource("Crafting/Crossbow.yml"), PlaceableSide.TOP, Crossbow.class).setSize(1, 1, 1, CenterType.RIGHT); - new Project("Catapult", this, getResource("Crafting/Catapult.yml"), PlaceableSide.TOP, catapult.class).setSize(3, 2, 3, CenterType.RIGHT); - new Project("Flag", this, getResource("Crafting/flag.yml"), PlaceableSide.TOP, flag.class).setSize(1, 3, 1, CenterType.RIGHT); - new Project("SnowGolem", this, getResource("Crafting/SnowGolem.yml"), PlaceableSide.TOP, SnowGolem.class).setSize(1, 2, 1, CenterType.RIGHT); - new Project("CandyCane", this, getResource("Crafting/CandyCane.yml"), PlaceableSide.TOP, CandyCane.class).setSize(3, 4, 1, CenterType.RIGHT); - new Project("AdventWreath", this, getResource("Crafting/AdventWreath.yml"), PlaceableSide.TOP, AdventWreath.class).setSize(1, 1, 1, CenterType.RIGHT); - new Project("AdventCalender", this, getResource("Crafting/AdventCalender.yml"), PlaceableSide.TOP, AdventCalender.class).setSize(1, 1, 1, CenterType.RIGHT); - new Project("ChristmasTree", this, getResource("Crafting/ChristmasTree.yml"), PlaceableSide.TOP, ChristmasTree.class).setSize(1, 1, 1, CenterType.CENTER); - new Project("FireworkLauncher", this, getResource("Crafting/FireworkLauncher.yml"), PlaceableSide.TOP, FireworkLauncher.class).setSize(1, 1, 1, CenterType.CENTER); - addDefault("fence", "whiteList", "config.yml"); - addDefault("bearTrap", "damage", "damage.yml"); - setDefaults(); - setDefaults_2(); - lib.registerPluginFurnitures(this); + if(lib.getDescription().getVersion().startsWith("1.7") || lib.getDescription().getVersion().startsWith("1.6")){ + new Project("Camera", this,getResource("Crafting/Camera.yml"),PlaceableSide.TOP, camera.class).setSize(1, 1, 1, CenterType.RIGHT); + new Project("TV", this,getResource("Crafting/TV.yml"),PlaceableSide.TOP, tv.class).setSize(1, 2, 3, CenterType.CENTER); + new Project("GraveStone", this,getResource("Crafting/GraveStone.yml"),PlaceableSide.TOP, graveStone.class).setSize(1, 2, 3, CenterType.CENTER); + new Project("Chair", this,getResource("Crafting/Chair.yml"),PlaceableSide.TOP, chair.class).setSize(1, 1, 1, CenterType.RIGHT); + new Project("LargeTable", this,getResource("Crafting/LargeTable.yml"),PlaceableSide.TOP, largeTable.class).setSize(2, 1, 2, CenterType.RIGHT); + new Project("Lantern", this,getResource("Crafting/Lantern.yml"),PlaceableSide.TOP, lantern.class).setSize(1, 1, 1, CenterType.RIGHT); + new Project("Sofa", this,getResource("Crafting/Sofa.yml"),PlaceableSide.TOP, sofa.class).setSize(1, 1, 3, CenterType.RIGHT); + new Project("Table", this,getResource("Crafting/Table.yml"),PlaceableSide.TOP, table.class).setSize(1, 1, 1, CenterType.RIGHT); + new Project("Barrels", this,getResource("Crafting/Barrels.yml"),PlaceableSide.TOP, barrels.class).setSize(1, 1, 1, CenterType.RIGHT); + new Project("Campfire1", this,getResource("Crafting/Campfire1.yml"),PlaceableSide.TOP, campfire_1.class).setSize(1, 1, 1, CenterType.RIGHT); + new Project("Campfire2", this,getResource("Crafting/Campfire2.yml"),PlaceableSide.TOP, campfire_2.class).setSize(1, 1, 1, CenterType.RIGHT); + new Project("Tent1", this,getResource("Crafting/Tent1.yml"),PlaceableSide.TOP, tent_1.class).setSize(4, 3, 5, CenterType.RIGHT); + new Project("Tent2", this,getResource("Crafting/Tent2.yml"),PlaceableSide.TOP, tent_2.class).setSize(4, 3, 5, CenterType.RIGHT); + new Project("Tent3", this,getResource("Crafting/Tent3.yml"),PlaceableSide.TOP, tent_3.class).setSize(3, 2, 3, CenterType.CENTER); + new Project("Fence", this, getResource("Crafting/fence.yml"),PlaceableSide.TOP, fance.class).setSize(1, 1, 1, CenterType.RIGHT); + new Project("Sunshade", this, getResource("Crafting/Sunshade.yml"),PlaceableSide.TOP, sunshade.class).setSize(1, 3, 1, CenterType.RIGHT); + new Project("Streetlamp", this, getResource("Crafting/Streetlamp.yml"),PlaceableSide.TOP, streetlamp.class).setSize(2, 4, 1, CenterType.FRONT); + new Project("Billboard", this, getResource("Crafting/Billboard.yml"),PlaceableSide.TOP, billboard.class).setSize(1, 3, 3, CenterType.RIGHT); + new Project("Mailbox", this, getResource("Crafting/Mailbox.yml"),PlaceableSide.TOP, mailBox.class).setSize(1, 2, 1, CenterType.RIGHT); + new Project("WeaponStand", this, getResource("Crafting/WeaponStand.yml"),PlaceableSide.TOP, weaponStand.class).setSize(1, 1, 1, CenterType.RIGHT); + new Project("Hammock", this, getResource("Crafting/Hammock.yml"),PlaceableSide.TOP, hammock.class).setSize(1, 2, 7, CenterType.RIGHT); + new Project("CampChair", this, getResource("Crafting/CampChair.yml"),PlaceableSide.TOP, campchair.class).setSize(1, 1, 1, CenterType.RIGHT); + new Project("CactusPlant", this, getResource("Crafting/CactusPlant.yml"),PlaceableSide.TOP, CactusPlant.class).setSize(1, 1, 1, CenterType.RIGHT); + new Project("Guillotine", this, getResource("Crafting/guillotine.yml"),PlaceableSide.TOP, guillotine.class).setSize(1, 5, 2, CenterType.RIGHT); + new Project("Log", this, getResource("Crafting/log.yml"), PlaceableSide.TOP, log.class).setSize(1, 1, 1, CenterType.RIGHT); + new Project("FlowerPot", this, getResource("Crafting/FlowerPot.yml"),PlaceableSide.BOTTOM, TFlowerPot.class).setSize(1, 1, 1, CenterType.RIGHT); + new Project("SleepingBag", this, getResource("Crafting/SleepingBag.yml"), PlaceableSide.TOP, SleepingBag.class).setSize(1, 1, 2, CenterType.RIGHT); + new Project("BearTrap", this, getResource("Crafting/BearTrap.yml"), PlaceableSide.TOP, BearTrap.class).setSize(1, 1, 1, CenterType.RIGHT); + new Project("Trunk", this, getResource("Crafting/Trunk.yml"), PlaceableSide.TOP, Trunk.class).setSize(1, 1, 4, CenterType.RIGHT); + new Project("SchoolTable", this, getResource("Crafting/SchoolTable.yml"), PlaceableSide.TOP, SchoolTable.class).setSize(1, 1, 1, CenterType.RIGHT); + new Project("SchoolChair", this, getResource("Crafting/SchoolChair.yml"), PlaceableSide.TOP, SchoolChair.class).setSize(1, 1, 1, CenterType.RIGHT); + new Project("BlackBoard", this, getResource("Crafting/BlackBoard.yml"), PlaceableSide.SIDE, BlackBoard.class).setSize(1, 2, 3, CenterType.RIGHT); + new Project("TrashCan", this, getResource("Crafting/TrashCan.yml"), PlaceableSide.TOP, TrashCan.class).setSize(1, 1, 1, CenterType.RIGHT); + new Project("HumanSkeleton", this, getResource("Crafting/HumanSkeleton.yml"), PlaceableSide.TOP, HumanSkeleton.class).setSize(3, 1, 2, CenterType.RIGHT); + new Project("Crossbow", this, getResource("Crafting/Crossbow.yml"), PlaceableSide.TOP, Crossbow.class).setSize(1, 1, 1, CenterType.RIGHT); + new Project("Catapult", this, getResource("Crafting/Catapult.yml"), PlaceableSide.TOP, catapult.class).setSize(3, 2, 3, CenterType.RIGHT); + new Project("Flag", this, getResource("Crafting/flag.yml"), PlaceableSide.TOP, flag.class).setSize(1, 3, 1, CenterType.RIGHT); + new Project("SnowGolem", this, getResource("Crafting/SnowGolem.yml"), PlaceableSide.TOP, SnowGolem.class).setSize(1, 2, 1, CenterType.RIGHT); + new Project("CandyCane", this, getResource("Crafting/CandyCane.yml"), PlaceableSide.TOP, CandyCane.class).setSize(3, 4, 1, CenterType.RIGHT); + new Project("AdventCalender", this, getResource("Crafting/AdventCalender.yml"), PlaceableSide.TOP, AdventCalender.class).setSize(1, 1, 1, CenterType.RIGHT); + new Project("ChristmasTree", this, getResource("Crafting/ChristmasTree.yml"), PlaceableSide.TOP, ChristmasTree.class).setSize(1, 1, 1, CenterType.CENTER); + new Project("FireworkLauncher", this, getResource("Crafting/FireworkLauncher.yml"), PlaceableSide.TOP, FireworkLauncher.class).setSize(1, 1, 1, CenterType.CENTER); + new Project("WaxCandle", this, getResource("Crafting/WaxCandle.yml"), PlaceableSide.TOP, WaxCandle.class); + addDefault("fence", "whiteList", "config.yml"); + addDefault("bearTrap", "damage", "damage.yml"); + setDefaults(); + setDefaults_2(); + lib.registerPluginFurnitures(this); + }else{ + lib.send("FurnitureLib Version 1.6.x or 1.7.x not found"); + lib.send("DiceFurniture deos not load"); + } } @SuppressWarnings("deprecation") diff --git a/src/de/Ste3et_C0st/Furniture/Objects/RPG/Crossbow.java b/src/de/Ste3et_C0st/Furniture/Objects/RPG/Crossbow.java index 2f5600b..8270131 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/RPG/Crossbow.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/RPG/Crossbow.java @@ -28,6 +28,7 @@ import de.Ste3et_C0st.FurnitureLib.main.Furniture; import de.Ste3et_C0st.FurnitureLib.main.ObjectID; import de.Ste3et_C0st.FurnitureLib.main.Type.SQLAction; import de.Ste3et_C0st.FurnitureLib.main.entity.fArmorStand; +import de.Ste3et_C0st.FurnitureLib.main.entity.fEntity; public class Crossbow extends Furniture implements Listener { @@ -131,7 +132,7 @@ public class Crossbow extends Furniture implements Listener { if(e.isCancelled()) return; if(!e.getID().equals(getObjID())) return; if(!e.canBuild()){return;} - fArmorStand stand = getArmorStand(); + fEntity stand = getArmorStand(); if(stand==null){return;} ItemStack is = e.getPlayer().getInventory().getItemInMainHand(); if(!hasArrow()||(is!=null&&is.getType()!=null&&is.getType().equals(Material.ARROW))){ @@ -152,7 +153,7 @@ public class Crossbow extends Furniture implements Listener { if(e.isCancelled()) return; if(!e.getID().equals(getObjID())) return; if(!e.canBuild()){return;} - fArmorStand stand = getArmorStand(); + fEntity stand = getArmorStand(); if(stand==null){return;} ItemStack is = e.getPlayer().getInventory().getItemInMainHand(); if(!hasArrow()||(is!=null&&is.getType()!=null&&is.getType().equals(Material.ARROW))){ @@ -198,7 +199,7 @@ public class Crossbow extends Furniture implements Listener { return entities; } - private void removeArrow(fArmorStand stand){ + private void removeArrow(fEntity stand){ ItemStack is = stand.getItemInMainHand(); if(is.getAmount()-1<=0){ stand.setItemInMainHand(new ItemStack(Material.AIR)); @@ -210,7 +211,7 @@ public class Crossbow extends Furniture implements Listener { update(); } - private void addArmor(ItemStack is, fArmorStand stand){ + private void addArmor(ItemStack is, fEntity stand){ if(getArrow()!=null){is.setAmount(getArrow().getAmount());} stand.setItemInMainHand(is); update(); @@ -218,8 +219,8 @@ public class Crossbow extends Furniture implements Listener { - private fArmorStand getArmorStand(){ - for(fArmorStand stand : getfAsList()){ + private fEntity getArmorStand(){ + for(fEntity stand : getfAsList()){ if(stand.getName().equalsIgnoreCase("#ARROW#")){ return stand; } @@ -228,7 +229,7 @@ public class Crossbow extends Furniture implements Listener { } private ItemStack getArrow(){ - for(fArmorStand stand : getfAsList()){ + for(fEntity stand : getfAsList()){ if(stand.getName().equalsIgnoreCase("#ARROW#")){ if(!(stand.getItemInMainHand()==null||stand.getItemInMainHand().getType()==null||stand.getItemInMainHand().getType().equals(Material.AIR))){ return stand.getItemInMainHand(); @@ -239,7 +240,7 @@ public class Crossbow extends Furniture implements Listener { } private boolean hasArrow(){ - for(fArmorStand stand : getfAsList()){ + for(fEntity stand : getfAsList()){ if(stand.getName().equalsIgnoreCase("#ARROW#")){ if(stand.getItemInMainHand()==null||stand.getItemInMainHand().getType()==null||stand.getItemInMainHand().getType().equals(Material.AIR)){ return false; diff --git a/src/de/Ste3et_C0st/Furniture/Objects/RPG/flag.java b/src/de/Ste3et_C0st/Furniture/Objects/RPG/flag.java index 0b40ddc..261602c 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/RPG/flag.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/RPG/flag.java @@ -24,6 +24,7 @@ import de.Ste3et_C0st.FurnitureLib.main.ObjectID; import de.Ste3et_C0st.FurnitureLib.main.Type.BodyPart; import de.Ste3et_C0st.FurnitureLib.main.Type.SQLAction; import de.Ste3et_C0st.FurnitureLib.main.entity.fArmorStand; +import de.Ste3et_C0st.FurnitureLib.main.entity.fEntity; public class flag extends Furniture implements Listener { @@ -83,7 +84,7 @@ public class flag extends Furniture implements Listener { } public int getState(){ - for(fArmorStand stand : getfAsList()){ + for(fEntity stand : getfAsList()){ if(stand.getName().startsWith("#FLAG")){ return Integer.parseInt(stand.getName().split(":")[1]); } @@ -91,8 +92,8 @@ public class flag extends Furniture implements Listener { return 1; } - public fArmorStand getStand(){ - for(fArmorStand stand : getfAsList()){ + public fEntity getStand(){ + for(fEntity stand : getfAsList()){ if(stand.getName().startsWith("#FLAG")){ return stand; } @@ -100,7 +101,7 @@ public class flag extends Furniture implements Listener { return null; } - public void setState(int i, fArmorStand stand){ + public void setState(int i, fEntity stand){ if(i<1||i>3){return;} if(stand==null){return;} switch (i) { diff --git a/src/de/Ste3et_C0st/Furniture/Objects/RPG/guillotine.java b/src/de/Ste3et_C0st/Furniture/Objects/RPG/guillotine.java index cc39833..8c33633 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/RPG/guillotine.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/RPG/guillotine.java @@ -30,6 +30,7 @@ import de.Ste3et_C0st.FurnitureLib.main.Type.BodyPart; import de.Ste3et_C0st.FurnitureLib.main.Type.EventType; import de.Ste3et_C0st.FurnitureLib.main.Type.SQLAction; import de.Ste3et_C0st.FurnitureLib.main.entity.fArmorStand; +import de.Ste3et_C0st.FurnitureLib.main.entity.fEntity; public class guillotine extends Furniture implements Listener{ @@ -83,10 +84,10 @@ public class guillotine extends Furniture implements Listener{ } private fArmorStand getByName(String s){ - for(fArmorStand packets : getManager().getfArmorStandByObjectID(getObjID())){ + for(fEntity packets : getManager().getfArmorStandByObjectID(getObjID())){ if(!packets.getName().equalsIgnoreCase("")){ if(packets.getName().startsWith("#Oblation#")){ - return packets; + return (fArmorStand) packets; } } } @@ -97,15 +98,18 @@ public class guillotine extends Furniture implements Listener{ armorStandList.clear(); if(packet2==null){packet2 = getByName("#Oblation#");} if(packet3==null){packet3 = getByName("#Head#");} - for(fArmorStand packets : getManager().getfArmorStandByObjectID(getObjID())){ - if(!packets.getName().equalsIgnoreCase("")){ - if(!(packets.getName().startsWith("#Oblation#") && packets.getName().startsWith("#Head#"))){ - if(packets.getName().startsWith("iron")){ - armorStandList.add(packets); - Location loc = getStartLocation(packets.getName()); - packets.teleport(loc); - }else{ - packet1 = packets; + for(fEntity packets : getManager().getfArmorStandByObjectID(getObjID())){ + if(packets instanceof fArmorStand){ + fArmorStand stand = (fArmorStand) packets; + if(!packets.getName().equalsIgnoreCase("")){ + if(!(packets.getName().startsWith("#Oblation#") && packets.getName().startsWith("#Head#"))){ + if(packets.getName().startsWith("iron")){ + armorStandList.add(stand); + Location loc = getStartLocation(packets.getName()); + packets.teleport(loc); + }else{ + packet1 = stand; + } } } } @@ -447,8 +451,8 @@ public class guillotine extends Furniture implements Listener{ private boolean canStart(){ if(isRunning()) return false; boolean a = false,b = false,c = false; - a = !packet1.isVisible(); - b = !packet2.isVisible(); + a = !packet1.isInvisible(); + b = !packet2.isInvisible(); if(packet1.getItemInMainHand()!=null&&!packet1.getItemInMainHand().equals(Material.AIR)){ c = true; } diff --git a/src/de/Ste3et_C0st/Furniture/Objects/RPG/weaponStand.java b/src/de/Ste3et_C0st/Furniture/Objects/RPG/weaponStand.java index 1cad29f..59b000f 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/RPG/weaponStand.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/RPG/weaponStand.java @@ -25,6 +25,7 @@ import de.Ste3et_C0st.FurnitureLib.main.ObjectID; import de.Ste3et_C0st.FurnitureLib.main.Type.BodyPart; import de.Ste3et_C0st.FurnitureLib.main.Type.SQLAction; import de.Ste3et_C0st.FurnitureLib.main.entity.fArmorStand; +import de.Ste3et_C0st.FurnitureLib.main.entity.fEntity; public class weaponStand extends Furniture { @@ -59,8 +60,8 @@ public class weaponStand extends Furniture { if(p!=null){ p.closeInventory(); } - List asList = getManager().getfArmorStandByObjectID(getObjID()); - for(fArmorStand packet : asList){ + List asList = getManager().getfArmorStandByObjectID(getObjID()); + for(fEntity packet : asList){ if(packet.getName()!=null&&!packet.getName().equalsIgnoreCase("")){ if(packet.getInventory().getItemInMainHand()!=null){ if(!packet.getInventory().getItemInMainHand().getType().equals(Material.AIR)){ @@ -86,7 +87,7 @@ public class weaponStand extends Furniture { ItemStack itemstack = p.getInventory().getItemInMainHand(); if(itemstack!=null&&matList.contains(itemstack.getType())){ - for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ + for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getInventory().getHelmet()!=null){ if(packet.getInventory().getHelmet().getType().name().toLowerCase().endsWith("gate")){ ItemStack itemStack = new ItemStack(itemstack.getType(), 1, (short) 0); @@ -110,7 +111,7 @@ public class weaponStand extends Furniture { is3.setItemMeta(im3); inv = Bukkit.createInventory(null, 45, "�cWeaponBox"); - List asList = getManager().getfArmorStandByObjectID(getObjID()); + List asList = getManager().getfArmorStandByObjectID(getObjID()); int j = 1; for(int i = 0; i asList = getManager().getfArmorStandByObjectID(getObjID()); + List asList = getManager().getfArmorStandByObjectID(getObjID()); int j = 1; for(int i = 0; i matList = Arrays.asList( Material.SPRUCE_FENCE, Material.BIRCH_FENCE, diff --git a/src/de/Ste3et_C0st/Furniture/Objects/garden/graveStone.java b/src/de/Ste3et_C0st/Furniture/Objects/garden/graveStone.java index 1a7f24f..51ebe13 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/garden/graveStone.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/garden/graveStone.java @@ -10,6 +10,7 @@ import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; +import org.bukkit.block.BlockState; import org.bukkit.block.Sign; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -23,6 +24,7 @@ import org.bukkit.util.EulerAngle; import de.Ste3et_C0st.Furniture.Main.main; import de.Ste3et_C0st.FurnitureLib.Events.FurnitureBreakEvent; import de.Ste3et_C0st.FurnitureLib.Events.FurnitureClickEvent; +import de.Ste3et_C0st.FurnitureLib.Utilitis.LocationUtil; import de.Ste3et_C0st.FurnitureLib.main.Furniture; import de.Ste3et_C0st.FurnitureLib.main.ObjectID; import de.Ste3et_C0st.FurnitureLib.main.Type.BodyPart; @@ -33,11 +35,12 @@ public class graveStone extends Furniture implements Listener{ public graveStone(ObjectID id){ super(id); if(isFinish()){ - setBlock(); Bukkit.getPluginManager().registerEvents(this, main.getInstance()); + setBlock(); return; } spawn(id.getStartLocation()); + Bukkit.getPluginManager().registerEvents(this, main.getInstance()); setBlock(); } @@ -45,6 +48,7 @@ public class graveStone extends Furniture implements Listener{ Block sign; String[] lines = new String[4]; + @SuppressWarnings("deprecation") private void setBlock(){ Location location = getLocation().clone(); if(getBlockFace().equals(BlockFace.WEST)){location = getLutil().getRelativ(location, getBlockFace(), .0, -1.02);} @@ -57,7 +61,12 @@ public class graveStone extends Furniture implements Listener{ this.signLoc = sign; if(!sign.getBlock().getType().equals(Material.WALL_SIGN)){ - this.sign = getLutil().setSign(getBlockFace(), sign); + sign.getBlock().setType(Material.WALL_SIGN); + this.sign = sign.getBlock(); + BlockState state = this.sign.getState(); + LocationUtil util = getLutil(); + state.setRawData(util.getFacebyte(util.yawToFace(getYaw() + 90))); + state.update(); }else{ this.sign = sign.getBlock(); } @@ -115,7 +124,6 @@ public class graveStone extends Furniture implements Listener{ asp.setBasePlate(false); } send(); - Bukkit.getPluginManager().registerEvents(this, getPlugin()); } @EventHandler(priority=EventPriority.LOW) diff --git a/src/de/Ste3et_C0st/Furniture/Objects/garden/log.java b/src/de/Ste3et_C0st/Furniture/Objects/garden/log.java index 09a3046..02e7147 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/garden/log.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/garden/log.java @@ -29,12 +29,13 @@ import de.Ste3et_C0st.FurnitureLib.main.FurnitureLib; import de.Ste3et_C0st.FurnitureLib.main.ObjectID; import de.Ste3et_C0st.FurnitureLib.main.Type.SQLAction; import de.Ste3et_C0st.FurnitureLib.main.entity.fArmorStand; +import de.Ste3et_C0st.FurnitureLib.main.entity.fEntity; public class log extends Furniture { Block b; int mode = 0; - Inventory inv = Bukkit.createInventory(null, 9, "�2Settings"); + Inventory inv = Bukkit.createInventory(null, 9, "$2Settings"); ItemStack pane = new ItemStack(Material.STAINED_GLASS_PANE); ItemStack permissions = new ItemStack(Material.ARROW); List isList = new ArrayList(); @@ -45,7 +46,7 @@ public class log extends Furniture { b = getLocation().getBlock(); getObjID().addBlock(Arrays.asList(b)); ItemMeta meta = pane.getItemMeta(); - meta.setDisplayName("�c"); + meta.setDisplayName("$c"); pane.setItemMeta(meta); pane.setDurability((short) 15); pane.setItemMeta(meta); @@ -61,24 +62,24 @@ public class log extends Furniture { ItemStack stack = new ItemStack(Material.BANNER); stack.setDurability((short) 1); ItemMeta meta = stack.getItemMeta(); - meta.setDisplayName("�6Mode: �cTop"); + meta.setDisplayName("$6Mode: $cTop"); stack.setItemMeta(meta); isList.add(stack); stack = new ItemStack(Material.BANNER); stack.setDurability((short) 2); meta = stack.getItemMeta(); - meta.setDisplayName("�6Mode: �cFront I"); + meta.setDisplayName("$6Mode: $cFront I"); stack.setItemMeta(meta); isList.add(stack); stack = new ItemStack(Material.BANNER); stack.setDurability((short) 11); meta = stack.getItemMeta(); - meta.setDisplayName("�6Mode: �cFront II"); + meta.setDisplayName("$6Mode: $cFront II"); stack.setItemMeta(meta); isList.add(stack); meta = permissions.getItemMeta(); - meta.setDisplayName("�cChange Permissions (Owner Only)"); + meta.setDisplayName("$cChange Permissions (Owner Only)"); permissions.setItemMeta(meta); } @@ -186,9 +187,9 @@ public class log extends Furniture { break; } - fArmorStand standOld = null; - fArmorStand standCurrent = null; - for(fArmorStand s : getObjID().getPacketList()){ + fEntity standOld = null; + fEntity standCurrent = null; + for(fEntity s : getObjID().getPacketList()){ if(s.getName().equalsIgnoreCase(oldArmorStand+"")){ standOld=s; }else if(s.getName().equalsIgnoreCase(currentArmorStand+"")){ @@ -235,8 +236,8 @@ public class log extends Furniture { removeItem(p); return; }else if(!p.getInventory().getItemInMainHand().getType().isBlock() && !p.getInventory().getItemInMainHand().getType().equals(Material.AIR)){ - fArmorStand stand = null; - for(fArmorStand s : getObjID().getPacketList()){ + fEntity stand = null; + for(fEntity s : getObjID().getPacketList()){ if(s.getName().equalsIgnoreCase(mode+"")){ stand = s; break; @@ -245,6 +246,11 @@ public class log extends Furniture { if(stand==null){return;} if(stand.getInventory().getItemInMainHand()!=null&&!stand.getInventory().getItemInMainHand().getType().equals(Material.AIR)){ + if(p.getInventory().getItemInMainHand()!=null){ + if(p.getInventory().getItemInMainHand().equals(stand.getItemInMainHand())){ + return; + } + } ItemStack is = stand.getInventory().getItemInMainHand(); is.setAmount(1); getWorld().dropItem(getLocation(), is); @@ -257,8 +263,8 @@ public class log extends Furniture { removeItem(p); return; }else{ - fArmorStand stand = null; - for(fArmorStand s : getObjID().getPacketList()){ + fEntity stand = null; + for(fEntity s : getObjID().getPacketList()){ if(s.getName().equalsIgnoreCase(mode+"")){ stand = s; break; @@ -268,6 +274,13 @@ public class log extends Furniture { if(stand==null){return;} if(stand.getInventory().getItemInMainHand()!=null&&!stand.getInventory().getItemInMainHand().getType().equals(Material.AIR)){ + for(fEntity s : getObjID().getPacketList()){ + if(s.getName().equalsIgnoreCase(mode+"")){ + stand = s; + break; + } + } + ItemStack is = stand.getInventory().getItemInMainHand(); is.setAmount(1); getWorld().dropItem(getLocation(), is); @@ -306,8 +319,8 @@ public class log extends Furniture { e.setCancelled(true); Player p = e.getPlayer(); - fArmorStand stand = null; - for(fArmorStand s : getObjID().getPacketList()){ + fEntity stand = null; + for(fEntity s : getObjID().getPacketList()){ if(s.getName().equalsIgnoreCase(mode+"")){ stand = s; break; diff --git a/src/de/Ste3et_C0st/Furniture/Objects/garden/mailBox.java b/src/de/Ste3et_C0st/Furniture/Objects/garden/mailBox.java index 3044864..73f7256 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/garden/mailBox.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/garden/mailBox.java @@ -64,18 +64,18 @@ public class mailBox extends Furniture implements Listener { aspList.add(packet); } - as = getManager().createArmorStand(getObjID(), getLutil().getRelativ(middle.clone().add(0, 1.2, 0), getBlockFace(), -.21, 0D)); + as = getManager().createArmorStand(getObjID(), getLutil().getRelativ(middle.clone().add(0, 1.25, 0), getBlockFace(), -.21, -.0D)); as.getInventory().setHelmet(new ItemStack(Material.SMOOTH_BRICK, 1, (short) 0)); as.setSmall(true); aspList.add(as); - as = getManager().createArmorStand(getObjID(), getLutil().getRelativ(middle.clone().add(0, 1.2, 0), getBlockFace(), .21, 0D)); + as = getManager().createArmorStand(getObjID(), getLutil().getRelativ(middle.clone().add(0, 1.25, 0), getBlockFace(), .21, 0D)); as.getInventory().setHelmet(new ItemStack(Material.SMOOTH_BRICK, 1, (short) 0)); as.setSmall(true); aspList.add(as); for(int i = 0; i<=4;i++){ - Location loc = getLutil().getRelativ(middle.clone().add(0, 1.898, 0), getBlockFace(), -.44+.165*i, .43D); + Location loc = getLutil().getRelativ(middle.clone().add(0, 1.898, 0), getBlockFace(), -.44+.165*i, .462D); fArmorStand packet = getManager().createArmorStand(getObjID(), loc); packet.setSmall(true); //x z y @@ -106,7 +106,7 @@ public class mailBox extends Furniture implements Listener { BlockFace face = getBlockFace(); face = getLutil().yawToFace(getLutil().FaceToYaw(getBlockFace()) + 90); - as = getManager().createArmorStand(getObjID(), getLutil().getRelativ(middle.clone().add(0, 1.5, 0), face, -.21, -.32D)); + as = getManager().createArmorStand(getObjID(), getLutil().getRelativ(middle.clone().add(0, 1.5, 0), face, -.04, -.55D)); as.getInventory().setHelmet(new ItemStack(Material.REDSTONE_TORCH_ON, 1, (short) 0)); as.setPose(getLutil().degresstoRad(new EulerAngle(0, 0, 90)), BodyPart.HEAD); as.setName("#ELEMENT#"); @@ -119,7 +119,7 @@ public class mailBox extends Furniture implements Listener { as.setSmall(true); 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(), -.15, .33D)); as.getInventory().setItemInMainHand(new ItemStack(Material.WOOD_BUTTON, 1, (short) 0)); as.setPose(getLutil().degresstoRad(new EulerAngle(-15,-67, -90)), BodyPart.RIGHT_ARM); as.setSmall(true); diff --git a/src/de/Ste3et_C0st/Furniture/Objects/garden/sunshade.java b/src/de/Ste3et_C0st/Furniture/Objects/garden/sunshade.java index 537f646..e4e1d3f 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/garden/sunshade.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/garden/sunshade.java @@ -31,6 +31,7 @@ import de.Ste3et_C0st.FurnitureLib.main.Type.BodyPart; import de.Ste3et_C0st.FurnitureLib.main.Type.EventType; import de.Ste3et_C0st.FurnitureLib.main.Type.SQLAction; import de.Ste3et_C0st.FurnitureLib.main.entity.fArmorStand; +import de.Ste3et_C0st.FurnitureLib.main.entity.fEntity; public class sunshade extends Furniture implements Listener{ List matList = Arrays.asList( @@ -123,7 +124,7 @@ public class sunshade extends Furniture implements Listener{ if(is.getType().equals(Material.BANNER)){ e.setCancelled(true); if(isRunning()){return;} - for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ + for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getInventory().getHelmet()!=null&&packet.getInventory().getHelmet().getType().equals(Material.BANNER)){ packet.getInventory().setHelmet(is); }else if(packet.getInventory().getHelmet()!=null&&packet.getInventory().getHelmet().getType().equals(Material.CARPET)){ @@ -158,7 +159,7 @@ public class sunshade extends Furniture implements Listener{ if(!e.canBuild()){return;} e.setCancelled(true); stopTimer(); - for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ + for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getName().equalsIgnoreCase("#ITEM#")){ if(packet.getInventory().getItemInMainHand()!=null&&!packet.getInventory().getItemInMainHand().getType().equals(Material.AIR)){ ItemStack is = packet.getInventory().getItemInMainHand(); @@ -183,7 +184,7 @@ public class sunshade extends Furniture implements Listener{ if(is.getType().equals(Material.BANNER)){ e.setCancelled(true); if(isRunning()){return;} - for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ + for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getInventory().getHelmet()!=null&&packet.getInventory().getHelmet().getType().equals(Material.BANNER)){ packet.getInventory().setHelmet(is); }else if(packet.getInventory().getHelmet()!=null&&packet.getInventory().getHelmet().getType().equals(Material.CARPET)){ @@ -223,7 +224,7 @@ public class sunshade extends Furniture implements Listener{ if(!e.canBuild()){return;} e.setCancelled(true); stopTimer(); - for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ + for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getName().equalsIgnoreCase("#ITEM#")){ if(packet.getInventory().getItemInMainHand()!=null&&!packet.getInventory().getItemInMainHand().getType().equals(Material.AIR)){ ItemStack is = packet.getInventory().getItemInMainHand(); @@ -243,11 +244,11 @@ public class sunshade extends Furniture implements Listener{ @Override public void run() { try{ - for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ + for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getName().startsWith("#ELEMENT#")){ - if(!isClose(packet)){ - Double x = packet.getPose(BodyPart.HEAD).getX(); - packet.setPose(new EulerAngle(x-.32, 0, 0), BodyPart.HEAD); + if(!isClose((fArmorStand) packet)){ + Double x = ((fArmorStand) packet).getPose(BodyPart.HEAD).getX(); + ((fArmorStand) packet).setPose(new EulerAngle(x-.32, 0, 0), BodyPart.HEAD); }else{ stopTimer(); return; @@ -269,11 +270,11 @@ public class sunshade extends Furniture implements Listener{ @Override public void run() { try{ - for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ + for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getName().startsWith("#ELEMENT#")){ - if(!isOpen(packet)){ - Double x = packet.getPose(BodyPart.HEAD).getX(); - packet.setPose(new EulerAngle(x+.32, 0, 0), BodyPart.HEAD); + if(!isOpen((fArmorStand) packet)){ + Double x = ((fArmorStand) packet).getPose(BodyPart.HEAD).getX(); + ((fArmorStand) packet).setPose(new EulerAngle(x+.32, 0, 0), BodyPart.HEAD); }else{ stopTimer(); return; @@ -291,9 +292,9 @@ public class sunshade extends Furniture implements Listener{ } private void reset(){ - for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ - if(!isOpen(packet)){ - packet.setPose(new EulerAngle(-3.054, 0, 0), BodyPart.HEAD); + for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ + if(!isOpen((fArmorStand) packet)){ + ((fArmorStand) packet).setPose(new EulerAngle(-3.054, 0, 0), BodyPart.HEAD); } } update(); @@ -312,9 +313,9 @@ public class sunshade extends Furniture implements Listener{ } private boolean isOpen(){ - for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ + for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getName().startsWith("#ELEMENT#")){ - if(packet.getPose(BodyPart.HEAD).getX()< -1.85){ + if(((fArmorStand) packet).getPose(BodyPart.HEAD).getX()< -1.85){ return false; } } diff --git a/src/de/Ste3et_C0st/Furniture/Objects/indoor/chair.java b/src/de/Ste3et_C0st/Furniture/Objects/indoor/chair.java index 87cf5b6..c439e07 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/indoor/chair.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/indoor/chair.java @@ -20,6 +20,7 @@ import de.Ste3et_C0st.FurnitureLib.main.ObjectID; import de.Ste3et_C0st.FurnitureLib.main.Type.BodyPart; import de.Ste3et_C0st.FurnitureLib.main.Type.SQLAction; import de.Ste3et_C0st.FurnitureLib.main.entity.fArmorStand; +import de.Ste3et_C0st.FurnitureLib.main.entity.fEntity; public class chair extends Furniture implements Listener{ @@ -110,8 +111,8 @@ public class chair extends Furniture implements Listener{ if(e.isCancelled()){return;} if(e.getID() == null || getObjID() == null) return; if(!e.getID().equals(getObjID())){return;} - fArmorStand packet = null; - for(fArmorStand as : getManager().getfArmorStandByObjectID(getObjID())){ + fEntity packet = null; + for(fEntity as : getManager().getfArmorStandByObjectID(getObjID())){ if(as.getName().equalsIgnoreCase("#SITZ#")){ packet=as; break; diff --git a/src/de/Ste3et_C0st/Furniture/Objects/indoor/largeTable.java b/src/de/Ste3et_C0st/Furniture/Objects/indoor/largeTable.java index facec4d..9cc86c9 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/indoor/largeTable.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/indoor/largeTable.java @@ -24,13 +24,14 @@ import de.Ste3et_C0st.FurnitureLib.main.Type.BodyPart; import de.Ste3et_C0st.FurnitureLib.main.Type.ColorType; import de.Ste3et_C0st.FurnitureLib.main.Type.SQLAction; import de.Ste3et_C0st.FurnitureLib.main.entity.fArmorStand; +import de.Ste3et_C0st.FurnitureLib.main.entity.fEntity; public class largeTable extends Furniture implements Listener{ public largeTable(ObjectID id){ super(id); if(isFinish()){ - for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ + for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getName().startsWith("#TELLER")){ tellerIDs.add(packet.getEntityID()); } @@ -168,7 +169,7 @@ public class largeTable extends Furniture implements Listener{ public void setTeller(HashMap itemList){ int i = 0; for(Integer id : tellerIDs){ - fArmorStand as = getManager().getfArmorStandByID(id); + fEntity as = getManager().getfArmorStandByID(id); as.getInventory().setItemInMainHand(itemList.get(i)); i++; } @@ -183,10 +184,10 @@ public class largeTable extends Furniture implements Listener{ if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} for(Integer id : tellerIDs){ - fArmorStand asp = getManager().getfArmorStandByID(id); + fEntity asp = getManager().getfArmorStandByID(id); if(asp!=null&&asp.getInventory().getItemInMainHand()!=null){ if(asp.getName().startsWith("#TELLER")){ - fArmorStand packet = asp; + fEntity packet = asp; e.getLocation().getWorld().dropItem(e.getLocation(), packet.getInventory().getItemInMainHand()); } } @@ -200,6 +201,7 @@ public class largeTable extends Furniture implements Listener{ if(getObjID()==null){return;} if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} if(e.isCancelled()){return;} + if(e.getID()==null) return; if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} e.setCancelled(true); @@ -215,11 +217,11 @@ public class largeTable extends Furniture implements Listener{ public void setTeller(Player player, ItemStack is){ BlockFace b = getLutil().yawToFace(player.getLocation().getYaw()); - fArmorStand as = null; + fEntity as = null; if(tellerIDs == null || tellerIDs.isEmpty()){return;} for(Integer id : this.tellerIDs){ if(id!=null){ - fArmorStand armorStand = getManager().getfArmorStandByID(id); + fEntity armorStand = getManager().getfArmorStandByID(id); if(armorStand!=null){ BlockFace b2 = getLutil().yawToFace(armorStand.getLocation().getYaw()); if(b2.equals(b)){ @@ -232,7 +234,7 @@ public class largeTable extends Furniture implements Listener{ if(as!=null&&as.getInventory().getItemInMainHand()!= null && as.getInventory().getItemInMainHand().equals(is)){return;} if(as.getInventory().getItemInMainHand()!=null&&!as.getInventory().getItemInMainHand().getType().equals(Material.AIR)){ - fArmorStand asp = as; + fEntity asp = as; ItemStack item = asp.getInventory().getItemInMainHand(); item.setAmount(1); asp.getLocation().getWorld().dropItem(asp.getLocation(), item); @@ -256,7 +258,7 @@ public class largeTable extends Furniture implements Listener{ HashMap teller = new HashMap(); for(Integer id : tellerIDs){ try{ - fArmorStand as = getManager().getfArmorStandByID(id); + fEntity as = getManager().getfArmorStandByID(id); teller.put(teller.size(), as.getInventory().getItemInMainHand()); }catch(Exception e){ teller.put(teller.size(), new ItemStack(Material.AIR)); diff --git a/src/de/Ste3et_C0st/Furniture/Objects/indoor/sofa.java b/src/de/Ste3et_C0st/Furniture/Objects/indoor/sofa.java index bcbbd6d..b4fcec6 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/indoor/sofa.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/indoor/sofa.java @@ -23,6 +23,7 @@ import de.Ste3et_C0st.FurnitureLib.main.Type.ColorType; import de.Ste3et_C0st.FurnitureLib.main.Type.EventType; import de.Ste3et_C0st.FurnitureLib.main.Type.SQLAction; import de.Ste3et_C0st.FurnitureLib.main.entity.fArmorStand; +import de.Ste3et_C0st.FurnitureLib.main.entity.fEntity; public class sofa extends Furniture implements Listener { @@ -175,7 +176,7 @@ public class sofa extends Furniture implements Listener { } private void sit(String s, Player p){ - for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ + for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getName().equalsIgnoreCase(s) && packet.getPassanger() == null){ packet.setPassanger(p); packet.update(); @@ -192,7 +193,7 @@ public class sofa extends Furniture implements Listener { if(!e.getID().equals(getObjID())){return;} if(!getLib().canBuild(e.getPlayer(), getObjID(), EventType.BREAK)){return;} e.setCancelled(true); - for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ + for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getPassanger()!=null){ packet.eject(); packet.update(); diff --git a/src/de/Ste3et_C0st/Furniture/Objects/indoor/table.java b/src/de/Ste3et_C0st/Furniture/Objects/indoor/table.java index a244558..c3f659a 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/indoor/table.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/indoor/table.java @@ -21,6 +21,7 @@ import de.Ste3et_C0st.FurnitureLib.main.ObjectID; import de.Ste3et_C0st.FurnitureLib.main.Type.BodyPart; import de.Ste3et_C0st.FurnitureLib.main.Type.SQLAction; import de.Ste3et_C0st.FurnitureLib.main.entity.fArmorStand; +import de.Ste3et_C0st.FurnitureLib.main.entity.fEntity; public class table extends Furniture implements Listener { @@ -71,7 +72,7 @@ public class table extends Furniture implements Listener { if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} e.setCancelled(true); - for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ + for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getName().equalsIgnoreCase("#ITEM#")){ if(packet.getInventory().getItemInMainHand()!=null&&!packet.getInventory().getItemInMainHand().getType().equals(Material.AIR)){ ItemStack is = packet.getInventory().getItemInMainHand(); @@ -93,7 +94,7 @@ public class table extends Furniture implements Listener { if(!e.canBuild()){return;} e.setCancelled(true); if(p.getInventory().getItemInMainHand().getType().isBlock()&&!p.getInventory().getItemInMainHand().getType().equals(Material.AIR)){return;} - for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ + for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getName().equalsIgnoreCase("#ITEM#")){ ItemStack Itemstack = p.getInventory().getItemInMainHand().clone(); Itemstack.setAmount(1); diff --git a/src/de/Ste3et_C0st/Furniture/Objects/light/WaxCandle.java b/src/de/Ste3et_C0st/Furniture/Objects/light/WaxCandle.java new file mode 100644 index 0000000..e513c22 --- /dev/null +++ b/src/de/Ste3et_C0st/Furniture/Objects/light/WaxCandle.java @@ -0,0 +1,172 @@ +package de.Ste3et_C0st.Furniture.Objects.light; + +import java.lang.reflect.Field; +import java.util.Arrays; +import java.util.Random; +import java.util.UUID; + +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.SkullType; +import org.bukkit.block.Block; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.block.BlockFromToEvent; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.ItemMeta; + +import com.mojang.authlib.GameProfile; +import com.mojang.authlib.properties.Property; + +import de.Ste3et_C0st.FurnitureLib.Events.FurnitureBlockBreakEvent; +import de.Ste3et_C0st.FurnitureLib.Events.FurnitureBlockClickEvent; +import de.Ste3et_C0st.FurnitureLib.Events.FurnitureBreakEvent; +import de.Ste3et_C0st.FurnitureLib.Events.FurnitureClickEvent; +import de.Ste3et_C0st.FurnitureLib.main.Furniture; +import de.Ste3et_C0st.FurnitureLib.main.ObjectID; +import de.Ste3et_C0st.FurnitureLib.main.Type.SQLAction; +import de.Ste3et_C0st.FurnitureLib.main.entity.fEntity; + +public class WaxCandle extends Furniture{ + + Block block; + fEntity stand; + + public WaxCandle(ObjectID id){ + super(id); + if(isFinish()){ + setBlock(); + Bukkit.getPluginManager().registerEvents(this, getPlugin()); + stand = getObjID().getPacketList().get(0); + return; + } + spawn(id.getStartLocation()); + Bukkit.getPluginManager().registerEvents(this, getPlugin()); + } + + private void setBlock(){ + Location center = getLutil().getCenter(getLocation()); + block = center.getWorld().getBlockAt(center); + if(!block.getType().equals(Material.AIR)){getObjID().addBlock(Arrays.asList(block));return;} + block.setType(Material.TORCH); + getObjID().addBlock(Arrays.asList(block)); + } + + @EventHandler + public void onFurnitureBreak(FurnitureBreakEvent e) { + if(getObjID()==null){return;} + if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} + if(e.isCancelled()){return;} + if(e.getID() == null || getObjID() == null) return; + if(!e.getID().equals(getObjID())){return;} + if(!canBuild(e.getPlayer())){return;} + e.remove(true,false); + delete(); + } + + @EventHandler + public void onFurnitureBlockBreak(FurnitureBlockBreakEvent e){ + if(getObjID()==null){return;} + if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} + if(e.isCancelled()){return;} + if(e.getID() == null || getObjID() == null) return; + if(!e.getID().equals(getObjID())){return;} + if(!canBuild(e.getPlayer())){return;} + e.remove(true,false); + delete(); + } + + @EventHandler + public void onFurnitureClick(FurnitureBlockClickEvent e) { + if(getObjID()==null){return;} + if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} + if(e.isCancelled()){return;} + if(e.getID() == null || getObjID() == null) return; + if(!e.getID().equals(getObjID())){return;} + if(!canBuild(e.getPlayer())){return;} + if(e.getPlayer().getInventory().getItemInMainHand()==null) return; + if(e.getPlayer().getInventory().getItemInMainHand().getType()==null) return; + Player p = e.getPlayer(); + ItemStack is = p.getInventory().getItemInMainHand(); + if(is.getType().equals(Material.FLINT_AND_STEEL)){ + setLight(true); + }else if(is.getType().equals(Material.WATER_BUCKET)){ + setLight(false); + } + } + + @EventHandler + public void onFurnitureClick(FurnitureClickEvent e) { + if(getObjID()==null){return;} + if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} + if(e.isCancelled()){return;} + if(e.getID() == null || getObjID() == null) return; + if(!e.getID().equals(getObjID())){return;} + if(!canBuild(e.getPlayer())){return;} + if(e.getPlayer().getInventory().getItemInMainHand()==null) return; + if(e.getPlayer().getInventory().getItemInMainHand().getType()==null) return; + Player p = e.getPlayer(); + ItemStack is = p.getInventory().getItemInMainHand(); + if(is.getType().equals(Material.FLINT_AND_STEEL)){ + setLight(true); + }else if(is.getType().equals(Material.WATER_BUCKET)){ + setLight(false); + } + } + + public void setLight(final boolean bool){ + if(bool){block.setType(Material.TORCH);} + else{block.setType(Material.REDSTONE_TORCH_OFF);} + } + + @EventHandler + public void onWaterFlow(BlockFromToEvent e){ + if(getObjID()==null){return;} + if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} + Location locTo = e.getToBlock().getLocation(); + if(getLocation()!=null && locTo.equals(getLocation().getBlock().getLocation())){ + e.setCancelled(true); + } + } + + public void spawn(Location loc) { + setBlock(); + stand = spawnArmorStand(getCenter().subtract(0, 2, 0)); + stand.setHelmet(getSkull()).setInvisible(true); + send(); + } + + private String generateSessionKey(int length){ + String alphabet = new String("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"); + int n = alphabet.length(); + String result = new String(); + Random r = new Random(); + for (int i=0; i aspList = getManager().getfArmorStandByObjectID(getObjID()); + List aspList = getManager().getfArmorStandByObjectID(getObjID()); ItemStack is = e.getPlayer().getInventory().getItemInMainHand(); if(is.getType().equals(Material.WATER_BUCKET)){ - for(fArmorStand packet : aspList){ + for(fEntity packet : aspList){ packet.setFire(false); Location location = getLocation().clone(); location.add(0, 1.2, 0); @@ -65,7 +66,7 @@ public class campfire_1 extends Furniture implements Listener{ } getManager().updateFurniture(getObjID()); }else if(is.getType().equals(Material.FLINT_AND_STEEL)){ - for(fArmorStand packet : aspList){ + for(fEntity packet : aspList){ packet.setFire(true); Location location = getLocation().clone(); location.add(0, 1.2, 0); diff --git a/src/de/Ste3et_C0st/Furniture/Objects/outdoor/campfire_2.java b/src/de/Ste3et_C0st/Furniture/Objects/outdoor/campfire_2.java index 16deb2a..e4a401f 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/outdoor/campfire_2.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/outdoor/campfire_2.java @@ -12,6 +12,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.inventory.ItemStack; import org.bukkit.util.EulerAngle; +import org.bukkit.util.Vector; import de.Ste3et_C0st.Furniture.Main.main; import de.Ste3et_C0st.FurnitureLib.Events.FurnitureBreakEvent; @@ -21,6 +22,7 @@ import de.Ste3et_C0st.FurnitureLib.main.ObjectID; import de.Ste3et_C0st.FurnitureLib.main.Type.BodyPart; import de.Ste3et_C0st.FurnitureLib.main.Type.SQLAction; import de.Ste3et_C0st.FurnitureLib.main.entity.fArmorStand; +import de.Ste3et_C0st.FurnitureLib.main.entity.fEntity; public class campfire_2 extends Furniture implements Listener{ List items = new ArrayList( @@ -155,12 +157,15 @@ public class campfire_2 extends Furniture implements Listener{ if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} e.setCancelled(true); - List aspList = getManager().getfArmorStandByObjectID(getObjID()); + List aspList = getManager().getfArmorStandByObjectID(getObjID()); final ItemStack itemStack = e.getPlayer().getInventory().getItemInMainHand(); fArmorStand packet = null; - for(fArmorStand pack : aspList){ - if(pack.isSmall() && pack.isVisible()){ - packet = pack; + for(fEntity pack : aspList){ + if(pack instanceof fArmorStand){ + fArmorStand stand = (fArmorStand) pack; + if(stand.isSmall() && pack.isInvisible()){ + packet = stand; + } } } if(itemStack.getType().equals(Material.WATER_BUCKET) && packet.isFire()){ @@ -184,19 +189,22 @@ public class campfire_2 extends Furniture implements Listener{ } private void setfire(boolean b){ - for(fArmorStand pack : getManager().getfArmorStandByObjectID(getObjID())){ - if(pack.isSmall() && pack.isVisible()){ - if((pack.getInventory().getHelmet() == null || pack.getInventory().getHelmet().getType().equals(Material.AIR)) && - (pack.getInventory().getItemInMainHand() == null || pack.getInventory().getItemInMainHand().getType().equals(Material.AIR))){ - pack.setFire(b); - Location loc = middle.clone(); - loc.add(0, 1.3, 0); - if(b) getLib().getLightManager().addLight(loc, 15); - if(!b) getLib().getLightManager().removeLight(loc); - getManager().updateFurniture(getObjID()); - return; - } + for(fEntity pack : getManager().getfArmorStandByObjectID(getObjID())){ + if(pack instanceof fArmorStand){ + fArmorStand stand = (fArmorStand) pack; + if(stand.isSmall() && pack.isInvisible()){ + if((pack.getInventory().getHelmet() == null || pack.getInventory().getHelmet().getType().equals(Material.AIR)) && + (pack.getInventory().getItemInMainHand() == null || pack.getInventory().getItemInMainHand().getType().equals(Material.AIR))){ + pack.setFire(b); + Location loc = middle.clone(); + loc.add(0, 1.3, 0); + if(b) getLib().getLightManager().addLight(loc, 15); + if(!b) getLib().getLightManager().removeLight(loc); + getManager().updateFurniture(getObjID()); + return; + } + } } } } @@ -212,7 +220,7 @@ public class campfire_2 extends Furniture implements Listener{ if(isRunning()){ Bukkit.getScheduler().cancelTask(timer); timer=null; - getWorld().dropItem(middle.clone().add(0, .5, 0), is); + getWorld().dropItemNaturally(middle.clone().add(0, 1, 0), is).setVelocity(new Vector().zero()); } setfire(false); e.remove(); @@ -224,18 +232,21 @@ public class campfire_2 extends Furniture implements Listener{ Bukkit.getScheduler().cancelTask(timer); timer=null; if(armorS!=null&&armorS.getInventory().getItemInMainHand()!=null&&getItem(armorS.getInventory().getItemInMainHand())!=null){ - getWorld().dropItem(middle.clone().add(0, .5, 0), getCooked(is)); + getWorld().dropItemNaturally(middle.clone().add(0, 1, 0), getCooked(is)).setVelocity(new Vector().zero()); + getObjID().getPacketList().remove(this.armorS); armorS.kill(); armorS.delete(); armorS=null; } } if(armorS!=null){ - if(armorS.getInventory().getItemInMainHand()!=null){getWorld().dropItem(middle.clone().add(0, .5, 0), getCooked(is));} + if(armorS.getInventory().getItemInMainHand()!=null){getWorld().dropItemNaturally(middle.clone().add(0, 1, 0), getCooked(is)).setVelocity(new Vector().zero());} + getObjID().getPacketList().remove(this.armorS); armorS.kill(); armorS.delete(); armorS=null; } + update(); } public ItemStack getItem(ItemStack is){ @@ -265,7 +276,8 @@ public class campfire_2 extends Furniture implements Listener{ this.armorS = getManager().createArmorStand(getObjID(), grill); this.armorS.setInvisible(true); this.armorS.getInventory().setItemInMainHand(is); - getManager().send(getObjID()); + getObjID().getPlayerList().clear(); + send(); this.timer = main.getInstance().getServer().getScheduler().scheduleSyncRepeatingTask(main.getInstance(), new Runnable() { Integer rounds = getLutil().randInt(15, 30); Integer labs = 0; @@ -276,7 +288,7 @@ public class campfire_2 extends Furniture implements Listener{ if(position>3){position=0;} if(armorS!=null){ armorS.setPose(angle[position], BodyPart.RIGHT_ARM); - armorS.update(); + update(); } position++; labs++; diff --git a/src/de/Ste3et_C0st/Furniture/Objects/outdoor/hammock.java b/src/de/Ste3et_C0st/Furniture/Objects/outdoor/hammock.java index 269bb4b..50b1a1a 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/outdoor/hammock.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/outdoor/hammock.java @@ -28,6 +28,7 @@ import de.Ste3et_C0st.FurnitureLib.main.Type.BodyPart; import de.Ste3et_C0st.FurnitureLib.main.Type.EventType; import de.Ste3et_C0st.FurnitureLib.main.Type.SQLAction; import de.Ste3et_C0st.FurnitureLib.main.entity.fArmorStand; +import de.Ste3et_C0st.FurnitureLib.main.entity.fEntity; public class hammock extends Furniture implements Listener{ @@ -103,7 +104,7 @@ public class hammock extends Furniture implements Listener{ if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} - List aspList = getManager().getfArmorStandByObjectID(getObjID()); + List aspList = getManager().getfArmorStandByObjectID(getObjID()); Player p = e.getPlayer(); ItemStack stack = p.getInventory().getItemInMainHand(); @@ -113,7 +114,7 @@ public class hammock extends Furniture implements Listener{ } } - for(fArmorStand packet : aspList){ + for(fEntity packet : aspList){ if(packet.getName().equalsIgnoreCase("#SITZ#")){ if(packet.getPassanger()==null){ packet.setPassanger(e.getPlayer()); @@ -139,7 +140,7 @@ public class hammock extends Furniture implements Listener{ if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} - List aspList = getManager().getfArmorStandByObjectID(getObjID()); + List aspList = getManager().getfArmorStandByObjectID(getObjID()); Player p = e.getPlayer(); ItemStack stack = p.getInventory().getItemInMainHand(); if(stack!=null){ @@ -148,7 +149,7 @@ public class hammock extends Furniture implements Listener{ } } - for(fArmorStand packet : aspList){ + for(fEntity packet : aspList){ if(packet.getName().equalsIgnoreCase("#SITZ#")){ if(packet.getPassanger()==null){ packet.setPassanger(e.getPlayer()); @@ -158,12 +159,12 @@ public class hammock extends Furniture implements Listener{ } } - private boolean setColor(Player p,ItemStack stack, Boolean canbuild, List aspList){ + private boolean setColor(Player p,ItemStack stack, Boolean canbuild, List aspList){ if(!canbuild){return true;} if(stack!=null){ switch (stack.getType()) { case BANNER: - for(fArmorStand packet : aspList){ + for(fEntity packet : aspList){ if(packet.getInventory().getHelmet()!=null&&packet.getInventory().getHelmet().getType().equals(Material.BANNER)){ packet.getInventory().setHelmet(stack); } @@ -172,7 +173,7 @@ public class hammock extends Furniture implements Listener{ getManager().updateFurniture(getObjID()); return true; case LOG: - for(fArmorStand packet : aspList){ + for(fEntity packet : aspList){ if(packet.getName().equalsIgnoreCase("#PILLAR#")){ packet.getInventory().setHelmet(stack); } @@ -182,7 +183,7 @@ public class hammock extends Furniture implements Listener{ getManager().updateFurniture(getObjID()); return true; case LOG_2: - for(fArmorStand packet : aspList){ + for(fEntity packet : aspList){ if(packet.getName().equalsIgnoreCase("#PILLAR#")){ packet.getInventory().setHelmet(stack); } 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 1dc3093..7be2407 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_3.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_3.java @@ -28,6 +28,7 @@ import de.Ste3et_C0st.FurnitureLib.main.Type.BodyPart; import de.Ste3et_C0st.FurnitureLib.main.Type.ColorType; import de.Ste3et_C0st.FurnitureLib.main.Type.SQLAction; import de.Ste3et_C0st.FurnitureLib.main.entity.fArmorStand; +import de.Ste3et_C0st.FurnitureLib.main.entity.fEntity; public class tent_3 extends Furniture implements Listener{ public tent_3(ObjectID id){ @@ -177,7 +178,7 @@ public class tent_3 extends Furniture implements Listener{ if(p.getInventory().getItemInMainHand().getType().equals(Material.INK_SACK)){ getLib().getColorManager().color(p, e.canBuild(), Material.BANNER, getObjID(), ColorType.BANNER, 1); }else{ - for(fArmorStand packet : getManager().getfArmorStandByObjectID(getObjID())){ + for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getName().equalsIgnoreCase("#SITZ#")){ packet.setPassanger(p); packet.update(); diff --git a/src/de/Ste3et_C0st/Furniture/Objects/trap/BearTrap.java b/src/de/Ste3et_C0st/Furniture/Objects/trap/BearTrap.java index 457bd31..f64b2f2 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/trap/BearTrap.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/trap/BearTrap.java @@ -20,8 +20,8 @@ import de.Ste3et_C0st.FurnitureLib.Events.FurnitureClickEvent; import de.Ste3et_C0st.FurnitureLib.main.Furniture; import de.Ste3et_C0st.FurnitureLib.main.ObjectID; import de.Ste3et_C0st.FurnitureLib.main.Type.SQLAction; -import de.Ste3et_C0st.FurnitureLib.main.entity.Relative; import de.Ste3et_C0st.FurnitureLib.main.entity.fArmorStand; +import de.Ste3et_C0st.FurnitureLib.main.entity.fEntity; public class BearTrap extends Furniture implements Listener{ @@ -31,19 +31,23 @@ public class BearTrap extends Furniture implements Listener{ public BearTrap(ObjectID id){ super(id); if(isFinish()){ - for(fArmorStand stand : getfAsList()){ + for(fEntity stand : getfAsList()){ if(stand.getName().equalsIgnoreCase("#IRON1#")){ - stand1 = stand; + stand1 = (fArmorStand) stand; }else if(stand.getName().equalsIgnoreCase("#IRON2#")){ - stand2 = stand; + stand2 = (fArmorStand) stand; }else if(stand.getName().equalsIgnoreCase("#IRON3#")){ - stand2 = stand; + stand3 = (fArmorStand) stand; }else if(stand.getName().equalsIgnoreCase("#IRON4#")){ - stand2 = stand; + stand4 = (fArmorStand) stand; } } - setStatus(false); Bukkit.getPluginManager().registerEvents(this, main.getInstance()); + if(stand1==null) return; + if(stand2==null) return; + if(stand3==null) return; + if(stand4==null) return; + setStatus(false); return; } spawn(id.getStartLocation()); @@ -59,7 +63,7 @@ public class BearTrap extends Furniture implements Listener{ double offset = .35; Location location = getRelative(getCenter(), 0, .04+offset).add(0, -2.1, 0); location.setYaw(getYaw()+90); - stand = spawnArmorStand(location); + stand = spawnArmorStand(location.clone()); stand.setHeadPose(getLutil().degresstoRad(new EulerAngle(90, 0, 0))); stand.setHelmet(new ItemStack(Material.IRON_FENCE)); stand.setName("#IRON1#"); @@ -68,7 +72,7 @@ public class BearTrap extends Furniture implements Listener{ location = getRelative(getCenter(), 0, -.04-offset).add(0, -2.1, 0); location.setYaw(getYaw()-90); - stand = spawnArmorStand(location); + stand = spawnArmorStand(location.clone()); stand.setHeadPose(getLutil().degresstoRad(new EulerAngle(90, 0, 0))); stand.setHelmet(new ItemStack(Material.IRON_FENCE)); stand.setName("#IRON2#"); @@ -78,7 +82,7 @@ public class BearTrap extends Furniture implements Listener{ location = getRelative(getCenter(), 0, .04+offset).add(0, -2.25, 0); location.setYaw(getYaw()+90); - stand = spawnArmorStand(location); + stand = spawnArmorStand(location.clone()); stand.setHeadPose(getLutil().degresstoRad(new EulerAngle(0, 0, 0))); stand.setName("#IRON3#"); stand3 = stand; @@ -86,16 +90,11 @@ public class BearTrap extends Furniture implements Listener{ location = getRelative(getCenter(), 0, -.04-offset).add(0, -2.25, 0); location.setYaw(getYaw()-90); - stand = spawnArmorStand(location); + stand = spawnArmorStand(location.clone()); stand.setHeadPose(getLutil().degresstoRad(new EulerAngle(0, 0, 0))); stand.setName("#IRON4#"); stand4 = stand; asList.add(stand); - - fArmorStand testStand = stand.clone(new Relative(getCenter(), 0, 2, 0, getBlockFace())); - testStand.setGlowing(true); - asList.add(testStand); - for(fArmorStand packet : asList){ packet.setInvisible(true); } diff --git a/src/plugin.yml b/src/plugin.yml index 10b63b4..07bab79 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,5 +1,5 @@ name: DiceFurniture -version: 2.6.6 +version: 2.9.2 description: Add some new Objects to the Server author: Ste3et_C0st website: http://dicecraft.de diff --git a/target/.gitignore b/target/.gitignore new file mode 100644 index 0000000..840e7d3 --- /dev/null +++ b/target/.gitignore @@ -0,0 +1 @@ +/classes/