From 49c446d40f5502ad1714cd3622686a598373f765 Mon Sep 17 00:00:00 2001 From: Ste3et_C0st Date: Sun, 8 Jan 2017 23:21:15 +0100 Subject: [PATCH] Remove some hardcodet models --- src/Crafting/CactusPlant.yml | 12 - src/Crafting/CandyCane.yml | 11 - src/Crafting/Catapult.yml | 13 - src/Crafting/Chair.yml | 13 - src/Crafting/HumanSkeleton.yml | 13 - src/Crafting/SleepingBag.yml | 13 - src/Crafting/SnowGolem.yml | 13 - src/Crafting/TV.yml | 14 - src/Models/CactusPlant.yml | 24 ++ src/Models/CampChair.yml | 22 ++ src/Models/CandyCane.yml | 26 ++ src/Models/Catapult.yml | 44 ++++ src/Models/Chair.yml | 25 ++ src/Models/ChristmasTree.yml | 40 +++ src/Models/HumanSkeleton.yml | 25 ++ src/Models/SleepingBag.yml | 22 ++ src/Models/SnowGolem.yml | 31 +++ src/Models/TV.yml | 27 ++ src/de/Ste3et_C0st/Furniture/Main/config.java | 8 - src/de/Ste3et_C0st/Furniture/Main/main.java | 82 ++++-- .../Furniture/Objects/RPG/Catapult.java | 157 ++++++++++++ .../Furniture/Objects/RPG/Crossbow.java | 13 +- .../Furniture/Objects/RPG/HumanSkeleton.java | 94 ------- .../Furniture/Objects/RPG/catapult.java | 241 ------------------ .../Furniture/Objects/RPG/flag.java | 12 +- .../Furniture/Objects/RPG/guillotine.java | 9 +- .../Furniture/Objects/RPG/weaponStand.java | 12 +- .../Furniture/Objects/School/BlackBoard.java | 8 +- .../Furniture/Objects/School/SchoolChair.java | 10 +- .../Furniture/Objects/School/SchoolTable.java | 8 +- .../Furniture/Objects/School/TrashCan.java | 6 +- .../Objects/christmas/AdventCalender.java | 8 +- .../Objects/christmas/AdventWreath.java | 10 +- .../Objects/christmas/CandyCane.java | 123 --------- .../Objects/christmas/ChristmasTree.java | 121 --------- .../Objects/christmas/FireworkLauncher.java | 8 +- .../Objects/christmas/SnowGolem.java | 145 ----------- .../Furniture/Objects/electric/billboard.java | 4 +- .../Furniture/Objects/electric/camera.java | 4 +- .../Objects/electric/streetlamp.java | 5 - .../Furniture/Objects/electric/tv.java | 98 ------- .../Furniture/Objects/garden/SleepingBag.java | 88 ------- .../Furniture/Objects/garden/TFlowerPot.java | 3 +- .../Furniture/Objects/garden/Trunk.java | 6 +- .../Furniture/Objects/garden/WaterBottle.java | 8 +- .../Furniture/Objects/garden/campchair.java | 99 ------- .../Furniture/Objects/garden/fance.java | 9 +- .../Furniture/Objects/garden/graveStone.java | 2 - .../Furniture/Objects/garden/log.java | 48 +++- .../Furniture/Objects/garden/mailBox.java | 1 - .../Furniture/Objects/garden/sunshade.java | 10 - .../Furniture/Objects/indoor/chair.java | 128 ---------- .../Furniture/Objects/indoor/lantern.java | 6 +- .../Furniture/Objects/indoor/largeTable.java | 11 +- .../Furniture/Objects/indoor/sofa.java | 8 +- .../Furniture/Objects/indoor/table.java | 12 +- .../Furniture/Objects/light/WaxCandle.java | 12 +- .../Objects/outdoor/CactusPlant.java | 109 -------- .../Furniture/Objects/outdoor/barrels.java | 16 +- .../Furniture/Objects/outdoor/campfire_1.java | 5 +- .../Furniture/Objects/outdoor/campfire_2.java | 8 +- .../Furniture/Objects/outdoor/hammock.java | 12 +- .../Furniture/Objects/outdoor/tent_1.java | 6 +- .../Furniture/Objects/outdoor/tent_2.java | 10 +- .../Furniture/Objects/outdoor/tent_3.java | 8 +- .../Furniture/Objects/trap/BearTrap.java | 6 +- src/plugin.yml | 2 +- src/range.yml | 16 ++ 68 files changed, 637 insertions(+), 1586 deletions(-) delete mode 100644 src/Crafting/CactusPlant.yml delete mode 100644 src/Crafting/CandyCane.yml delete mode 100644 src/Crafting/Catapult.yml delete mode 100644 src/Crafting/Chair.yml delete mode 100644 src/Crafting/HumanSkeleton.yml delete mode 100644 src/Crafting/SleepingBag.yml delete mode 100644 src/Crafting/SnowGolem.yml delete mode 100644 src/Crafting/TV.yml create mode 100644 src/Models/CactusPlant.yml create mode 100644 src/Models/CampChair.yml create mode 100644 src/Models/CandyCane.yml create mode 100644 src/Models/Catapult.yml create mode 100644 src/Models/Chair.yml create mode 100644 src/Models/ChristmasTree.yml create mode 100644 src/Models/HumanSkeleton.yml create mode 100644 src/Models/SleepingBag.yml create mode 100644 src/Models/SnowGolem.yml create mode 100644 src/Models/TV.yml create mode 100644 src/de/Ste3et_C0st/Furniture/Objects/RPG/Catapult.java delete mode 100644 src/de/Ste3et_C0st/Furniture/Objects/RPG/HumanSkeleton.java delete mode 100644 src/de/Ste3et_C0st/Furniture/Objects/RPG/catapult.java delete mode 100644 src/de/Ste3et_C0st/Furniture/Objects/christmas/CandyCane.java delete mode 100644 src/de/Ste3et_C0st/Furniture/Objects/christmas/ChristmasTree.java delete mode 100644 src/de/Ste3et_C0st/Furniture/Objects/christmas/SnowGolem.java delete mode 100644 src/de/Ste3et_C0st/Furniture/Objects/electric/tv.java delete mode 100644 src/de/Ste3et_C0st/Furniture/Objects/garden/SleepingBag.java delete mode 100644 src/de/Ste3et_C0st/Furniture/Objects/garden/campchair.java delete mode 100644 src/de/Ste3et_C0st/Furniture/Objects/indoor/chair.java delete mode 100644 src/de/Ste3et_C0st/Furniture/Objects/outdoor/CactusPlant.java create mode 100644 src/range.yml diff --git a/src/Crafting/CactusPlant.yml b/src/Crafting/CactusPlant.yml deleted file mode 100644 index 5adab36..0000000 --- a/src/Crafting/CactusPlant.yml +++ /dev/null @@ -1,12 +0,0 @@ -CactusPlant: - system-ID: 'CactusPlant' - name: '&cCactusPlant' - material: 383 - glow: true - lore: '' - crafting: - disable: true - recipe: X0X,X0X,XXX - index: - '0': 0 - X: 280 \ No newline at end of file diff --git a/src/Crafting/CandyCane.yml b/src/Crafting/CandyCane.yml deleted file mode 100644 index 785fac6..0000000 --- a/src/Crafting/CandyCane.yml +++ /dev/null @@ -1,11 +0,0 @@ -CandyCane: - system-ID: 'CandyCane' - name: '&cCandyCane' - material: 383 - glow: false - lore: '' - crafting: - disable: true - recipe: XXX,XXX,XXX - index: - X: 0 \ No newline at end of file diff --git a/src/Crafting/Catapult.yml b/src/Crafting/Catapult.yml deleted file mode 100644 index 90da710..0000000 --- a/src/Crafting/Catapult.yml +++ /dev/null @@ -1,13 +0,0 @@ -Catapult: - system-ID: 'Catapult' - name: '&cCatapult' - material: 383 - glow: false - lore: '' - crafting: - disable: false - recipe: AXA,ABA,AAA - index: - X: 0 - A: 17 - B: 261 \ No newline at end of file diff --git a/src/Crafting/Chair.yml b/src/Crafting/Chair.yml deleted file mode 100644 index 778b500..0000000 --- a/src/Crafting/Chair.yml +++ /dev/null @@ -1,13 +0,0 @@ -Chair: - system-ID: 'Chair' - name: '&cChair' - material: 383 - glow: false - lore: '' - crafting: - disable: false - recipe: 0+0,0+0,E0E - index: - '0': 0 - +: 96 - E: 280 \ No newline at end of file diff --git a/src/Crafting/HumanSkeleton.yml b/src/Crafting/HumanSkeleton.yml deleted file mode 100644 index a008e68..0000000 --- a/src/Crafting/HumanSkeleton.yml +++ /dev/null @@ -1,13 +0,0 @@ -HumanSkeleton: - system-ID: 'HumanSkeleton' - name: '&cHumanSkeleton' - material: 383 - glow: false - lore: '' - crafting: - disable: false - recipe: XAX,XOX,XOX - index: - X: 0 - A: 397 - O: 352 \ No newline at end of file diff --git a/src/Crafting/SleepingBag.yml b/src/Crafting/SleepingBag.yml deleted file mode 100644 index 8f8dbd6..0000000 --- a/src/Crafting/SleepingBag.yml +++ /dev/null @@ -1,13 +0,0 @@ -SleepingBag: - system-ID: 'SleepingBag' - name: '&cSleepingBag' - material: 383 - glow: false - lore: '' - crafting: - disable: true - recipe: XXX,AOA,AAA - index: - X: 0 - A: 35 - O: 355 \ No newline at end of file diff --git a/src/Crafting/SnowGolem.yml b/src/Crafting/SnowGolem.yml deleted file mode 100644 index fa3028c..0000000 --- a/src/Crafting/SnowGolem.yml +++ /dev/null @@ -1,13 +0,0 @@ -SnowGolem: - system-ID: 'SnowGolem' - name: '&cSnowGolem' - material: 383 - glow: false - lore: '' - crafting: - disable: true - recipe: XTX,ATA,TAT - index: - T: 0 - X: 280 - A: 336 \ No newline at end of file diff --git a/src/Crafting/TV.yml b/src/Crafting/TV.yml deleted file mode 100644 index 841cec0..0000000 --- a/src/Crafting/TV.yml +++ /dev/null @@ -1,14 +0,0 @@ -TV: - system-ID: 'TV' - name: '&cTV' - material: 383 - glow: false - lore: '' - crafting: - disable: false - recipe: XXX,XEX,0A0 - index: - X: 171 - E: 69 - A: 148 - 0: 0 \ No newline at end of file diff --git a/src/Models/CactusPlant.yml b/src/Models/CactusPlant.yml new file mode 100644 index 0000000..be4386b --- /dev/null +++ b/src/Models/CactusPlant.yml @@ -0,0 +1,24 @@ +CactusPlant: + system-ID: CactusPlant + name: '&cCactusPlant' + creator: ff5f37d0-c1ea-4736-b6c3-ebbfdd67a810 + material: 383 + glow: false + lore: '' + PlaceAbleSide: TOP + crafting: + disable: true + recipe: X0X,X0X,XXX + index: + '0': 0 + X: 280 + ProjectModels: + ArmorStands: + '0': H4sIAAAAAAAAAI2Sv0/CQBTHX6GUoy6Ozu5uTi5Y6LUlgZYAUcpCznolF/sjaQvEjdXRyT+HuBhHB3f/AHdne/QKKDHxpve+976fd/fuVIAqHNkkpFcsZTcBBeBKo0VS2g9IJvLaMCRBUMSywRIhy1oSpsLRiRZbglQFpUeSO5oUSd0M4iWLZrxUBRXPA5po0SygKqAuNkbTLjYVkMbrxw/z9P1ymscuiJXHk1LPzbKFNZ3X7u3/qC1jKNnaoLdhv1yffD70FwdsoXN2y9Hdf7Ibg45p7eBvz/2nV9T6bWju4MIgbtr846alvmmRj5RGWZzcI6i1LTwcgWw7NhZDQFBht3Acsoh6CfGzC4942TyV8tp4HmVSBRSdhGTGHwRB3TEMS7P1AoEA9bSOvS/I+cmG28TAWHTLvTL/H8VAY49kLI4UQOMzx/dTmu1OjyaHkiuk9ZfP16oGVZcs2+d8+xsCNcsXfAIAAA== + '1': H4sIAAAAAAAAAI2Sv0/CQBTHX6GUoy6Ozu5uTiYGC722JNASIEpZyFkPcrE/4rVA/BMcnfwD/EOIi3F0MHF0NfGfsKVXQImJN733vff9vLt3pwKUYc8mAT1nMbv0KUCm1Bokpl2fJCKv9APi+3ksG4wLWdZ4EAtHK5yvCVIZlA7h15TnSdX0owULp1mpCiqe+ZRr4dSnKqA2NgbjNjYVkIbL+w/z8O1snMYuiJXGo0JPzbKFNT2r3dr/UVvEULC1XmfFfr44+LrrznfYQs/YDUd3/8mu9VqmtYG/PnUfXlDjt6G+gQuDuGn9j5sW+qpFOlIaJhG/RVBpWrg/ANl2bCyGgKDErmA/YCH1OJkkJx7xklkspbXRLEykEig6Ccg0exAEVccwLM3WcwQC1NFa9rYgpyfrrxMDY9Et9crZ/8gHGnkkYVGoABoeOZNJTJPN6dFoV3KFtPx8fFdPb6ACZZcsmsfZ9jeM6ysJfAIAAA== + '2': H4sIAAAAAAAAAHWSP0/CQBjG30qBoy6OzE4ubk4uWOi1xUBLgAglJuSsB2nsn6QtED+BcTJOfhyig3FwcDCujg7O7vboFQiETu/73PP87u69SgA52DeIRy+cyLlyKQBTSlUS0ZZLYt7nOx5x3bQWVSfksiiHXsQTdX+6JAg5KDRJeEPDtClqbjBz/DGzSiDhiUtD2R+7VALUwGp32MBaAYT+/PFbO/w8Gya1BfxL6kGmJ2FRx7LCvJWvXvn8R7nb9GY1ZGy53VywX3vl3/vWdIvNdcaumorFvGvru9ildl3TV/CP59bTG6puBiorOA/wm1Z23DTTF1skI6V+HIS3CPI1HXe6IBqmgfkQEOw513DgOT61QzKKT21ix5NISLzBxI+FPSgoxCNj9iAIiqaq6rKhpAgEqCnXjXVBTE7WWTYqxny3JCuy/yMdaGCT2An8AqD+sTkaRTRenR4NtiWLS/P3o7+Xh0vIQ84is9oJW/4HoSsh23wCAAA= + '3': H4sIAAAAAAAAAHWSvU/CQBjG30IpR10cHJjdHNycXGqhXxgoBIhQYkLOepDGfiRtgejkZpyMk/+FoyvRGOPI4G6cHJzdbekVCIZO7/vc8/zu7r3yAFnY0rFDTqzAOrMJQKwUSjggDRuHtM+1HGzbSc0qlk9lVvSdgCYq7nhBYLLA1bB/Qfykyau2N7HcYWzlgZdHNvFFd2gTHlBVVtr9qqxywHSn95/q7sdRP6oNoF9U91I9CrOaLEqxV3jqFI+/pZt1b1pDyhabtTn7rVP8uW2M/7GpHrNLdcmIvSvrm9iFZkXVlvDZc+PhHZXWA8ISTgP0psKGm6b6fItopMQNPf8SQa6sya02sHpdl+kQEGSsc9h2LJeYPh6EhyY2w1HARF5v5IZMBjgJO3gYPwiCfF1RNFGXEgQCVBMr+qrARidrLRpFluluUZaN/49koJ6JQ8tzOUDd/fpgEJBweXrUo9L09epLfdy5jiSDSsLs9+XudA9ykDXwpHwQJ/4AEaZqZ3wCAAA= + '4': H4sIAAAAAAAAAHWSP0/CQBjG30qBoy6OjsadzcG41EL/kUCLQJSykLMepLF/krZA/AAOjk7GxfgxdCIsxtHB3Q/A4kfwDq5AMNz0vr97nufu3lYCyMG+hQNy6SXetU8AGClVcEKaPk55n28H2PdpKeRA1L2YY1GJg4Q7auF4lUBVhQaOb0m8bIqGH028cMikEkjayCexEg59IgGqa3qnX9eMAgjd6eOPcfx93qe1A3zRupdxahZNTVGZVv6dtU7LCdnWZjVk2Uqrscj+uDqcPzTH/7I5Z9kVW3WYdmN/V3apVTPMdfjXrPn0iSrbBnkdzg38pfKOl2Z8cQQdKQnTKL5DkK+aWrsDomVbGh8Cgj3vBg4CLyRujAfpmYvddJQIVBuNwlTYg4KKAzxkHwRB0dZ1U7HUZQQC1FBq1iYQ6c3aq0bXNH4a9Yrs/1gONHJx6kVhAVC3bA8GCUnXt0c9jqbvz2y9UuRwJL+8XczvjyAPOQdPqifM8QfBq5zwfAIAAA== + '5': H4sIAAAAAAAAAHWSvU/CQBjG30KBoy6OTCa6szm5YKFfJNAiEKUs5KwHaexH0haIm4uDo5N/h5ubcTEODg7uuhr8D1y8gysQDDe97++e57m7t5UAsrBjYp+curF77hEARopVHJOWhxPe5zo+9jxaClkQNTfiWJQjP+aOejBZJlBVvomjSxItmoLuhVM3GDGpBJI69kgkByOPSIAaqtYdNFQ9D0Lv6e5TP/g4HtDaBr5o3U85NYuGKitz7ff+b1cplza1aQ1pttxuzvUvZ6XZbWvyL5tzll21FJtp1/a3ZRfbdd1Yhb8/t+5fUXXTUFmFcwN/aWXLS1M+P4KOlARJGF0hyNUMtdMF0bRMlQ8BQca9gF3fDYgT4WFy5GAnGccC1YbjIBEykFewj0fsgyAoWJpmyKayiECAmnLdXAcivVln2Wiqyk+jXpH9H4uBhg5O3DDIA+qVreEwJsnq9qjPUeVhdrP3ePJFkZ2inze2rnOQtfG0dsgcf+jserJ8AgAA + '6': H4sIAAAAAAAAAH2SPU/CQBjHn0oppS6OTCa6M+nkgoW+kUDLW5SykLMepLEvSVsgfgAHRye/hYkbG3Exjg7umjgZPoKLd3AFDNGbnud3/+d/9zx3EkAGdk3k4zM3di88DEBJvoxi3PBQwvJs20eeR0IuA7zmRgzzcuTHrKIajFcORCXUUXSFo2WS071w4gZDKpVAUkcejuRg6GEJxJqqdfo1VReA687u3vXDt9M+iW1gi8S9lJNi3lBlhWo39n9pS18H3x2lWIDUW27VF97P54X5bWO85c049S5biv2fdxoTbb5V1Y21+etT4/5FLG9dZm3OClinpT86TfniCDJSHCRhdC1CtmKo7Q7wpmWqbAgi7LiXsOe7AXYiNEhOHOQko5gj2nAUJNwOCAry0ZA+iAg5S9MM2VSWFiKIdblqbgKe3Ky9SjRVZaeRWp7+D1gMNHRQ4oaBAGK3aA0GMU5mD9Pm/GZ/SlAvRY8UND8IshkqfR7RBVnI2GhSOab9/gCX8z5XfAIAAA== + Block: '' diff --git a/src/Models/CampChair.yml b/src/Models/CampChair.yml new file mode 100644 index 0000000..83c23ba --- /dev/null +++ b/src/Models/CampChair.yml @@ -0,0 +1,22 @@ +CampChair: + system-ID: CampChair + name: '&cCampChair' + creator: ff5f37d0-c1ea-4736-b6c3-ebbfdd67a810 + material: 383 + glow: false + lore: '' + PlaceAbleSide: TOP + crafting: + disable: false + recipe: XXX,XEX,AXA + index: + E: 126 + X: 0 + A: 65 + ProjectModels: + ArmorStands: + '0': H4sIAAAAAAAAAI2SMU/CQBTHX6GUUhcXE2d3NycXLHBtSaQlQJSSGHLCQRqvbdIWiJuro5uOjn4KNmcHFxeNM34I7+gd0RijN733f+/93r13ZwAUYcvFITkJ0uCcEgCuVGo4JW2KM+GXuiGmNLdVK0iErJpJmIqKZjTfEJQiaC2cXJAkd8o2jRdBNOWpBhhoRkliRlNKDNCPkdUbHiNbA6W/vHmz956Phsz2QRxmD6TOilUHmQ2e+yX+LVfaINlmp7VmP57urq7b8x9soXN2zWv4/2RXOk3b2cCrq4/Xs/udh78LxKTVXyaV+rqCrZREWZxc6lCqO6jbA9X1XKTnS5BO2bMsx3SFz6ZumU2XCzoUgjFsh0FERgmeZIcUj8ckURgsnkWZUgCtgUM85S/GmOxm3U0DCyHRjYf4/8gXGo9wFsSRBnp/35tMUpItX+74uWXSQEpPciDdl9L7OuuqBEUfL+oHPPwJ611+fHwCAAA= + '1': H4sIAAAAAAAAAI2SMU/CQBTHX6GUUhcXE2d3v4ALFrm2JNASIEpJDDnhII3XNrkWCJuro5uOjn4KNmcHFxeNM34I7+iVaIzRm977v/d+7967MwCKsOPikJwGSXBBCYBQKjWckDbFqfRL3RBTmtmqFTApqyYLE1nRiOZbglIErYXZJWGZU7ZpvAiiqUg1wEAzSpgZTSkxQG8iqzdsIlsDpb+6ebMPno+H3PZBHm4Pcp0Xqw4y6yL3S/xbbm5DzjY7rQ378Wx/fd2e/2BLXbBrXt3/J7vSadjOFl5df7ye3+89/F0gJ63+Mmmubyr4SkmUxmypQ+nEQd0eqK7nIj1bQu6UPctyTFf6fOqW2XCFoEMhGMNuGERkxPAkPaJ4PCZM4bB4FqVKAbQ6DvFUvBhn8pt1tw0shGQ3ERL/I1toPMJpEEca6P1DbzJJSFp9uRPnlkuDXHrKB9J9Ka3eN1lXJSj6eJGFPwGsLILrfAIAAA== + '2': H4sIAAAAAAAAAI2SMU/CQBTHX6HAUVcHNxN3NycXLPTakkhLgChlaU44SGN7JdcC0W/g6OS38CsQF+Po4G6cTfwMtvQKKDHxpvf+9/6/u/fuFIAi7FkkoBde5F35FCBVqnUS0bZPYpGXugHx/SyWdY8LWVZ5EAlHk83XBKkI5Rbh15RnScXww4XHJmmpAgqe+ZSrbOJTBdA51nvuOTbKIPWX9+/G0duZm8QOiJXEg1xPzLKJVS2t3dr/UZvHkLPVTmvFfr48+Lxrz3fYQk/ZdVtz/smudpqGuYG/PrUfXlD9t6G2gQuD6LT2R6e5vjoiGSllcchvEJQaJu72QLZsC4shICh4IzgMPEaHnIzj00UYjihzp5xG0YxTd5q+n5RYwxmLpQKUNRKQSfo+CCq2rpuqpWVEBKilNq1tQU4u2l0nOsbi8MQrp98lm284JLEXsjKg/rE9Hkc03jSDBruSI6Tl1/7th/EIJSg6ZNE4Sbe/AW/be0OLAgAA + '3': H4sIAAAAAAAAAI2RMU/CUBDHj1Cg1C/gLKtNGiGCLljktSWhLQGilIW8witpLG3SFgibq6OTH4e4GEcHdz+Aqx/Alr4CSkx80/1/d/e/3D0OIAtHGp6RGzuwTYcAxKTYwAHpODikOtebYcdJYkayfYoZ0Z8FtKPlLrYOmSzkVezfET8RBdnxlrY7jUs54NDcIb7oTh3CAdtGUn/URnIeMoP144d88n41imID6IviYcqjZkZBYjOu3cv/qE1jSL3Frrrxfrk9/nzoLA68KY+9G3rT+Kd3sduSlZ3523Pn6ZVt/G6o78xpA920/semKd+MiE5K3NDzVyzkrhXU6wOj6RpikyOkoqBLkiJqW82qYkvbB0w0s7cVEkLUByIV/zycllRv7oaXY+GcVLFQ5SdWmfCVWu2MxwIxedOqjE08KV8Ik3IpPqs3xqHtuXlgB7xuWQEJdzuww0NkULT+ut+gHGQNvEzS30HCOf6CAgAA + Block: '' diff --git a/src/Models/CandyCane.yml b/src/Models/CandyCane.yml new file mode 100644 index 0000000..3ac3f8d --- /dev/null +++ b/src/Models/CandyCane.yml @@ -0,0 +1,26 @@ +CandyCane: + system-ID: CandyCane + name: '&cCandyCane' + creator: ff5f37d0-c1ea-4736-b6c3-ebbfdd67a810 + material: 383 + glow: false + lore: '' + PlaceAbleSide: TOP + crafting: + disable: true + recipe: xxx,xxx,xxx + index: + x: '7' + ProjectModels: + ArmorStands: + '0': H4sIAAAAAAAAAI1STW/aQBAdAiGOe+i156qHXpAwBhJ6SQy28UbYJuAARpWiDV6IYW2Qbb7yD3qqeur/6B+I2kPVYw+99wf0XKnHrhMDaaNKXWmlmTfvPXtnhgdIwxMDe6Tjhu4VJQAxcljFIWlSHCX5ftvDlN7HGdUNEjgjBV6YKJC/2Dqk0pDVcTAhwX1yUKfTpeuPYioPvDKnJJD8ESU8cA1FtS4bSj0Lqd7tu+/1599OL1lsQ3JY3N/gTJzRFEmOuQ/qf3A3MWy8pZZ+5/25++zHm+bikXeCx95VU7b/0/uwherazvzrx+b7L1z1b8HJzjwRJC89+cdLN/jdJ1hLiR9NgzUH+zVNaVuQMUxDSZrAwZ7rwFPP9ckgwMPoVTiZU5pi1Oncj1I8pCM8Yt1ux7C59EnAFMiBF0K5UhFL5WKujI/FXNEhYq5SKh3nRBGXjgpO3hGEY6ZrBtMZCSKXhIfARWQVzQMS8vFA2e90MJ0T+EDWZ/l+7zrv9M7oYI3KLLfaeWqi8ewI+Z31VQ2VkcfqmlRurCsPuKUId0vUFs+u+/75/Mrr5BtiixKtJQy8i4VRN8Z6wRZNWR2bFrqxLVQ0ZcfTrdZY73aobSkrXb5Y6pZdMNntj1FBl5Fg3Izyuqwy3rmgdy8YNhHt8UQ0uy0P+UJleA7AsS6yfQe+J886y5WhFV2APcjK2MMjwlaZgwNTVTXJkO/7zQGnS8h4CGTYGNvbRFWUZDRb87vtmw5w5E79LHC9nDkchiTajZrrP4bsBLr99fLnp7evT/chbeNlrRiXfwOQ56TzqQMAAA== + '1': H4sIAAAAAAAAAI1SzW7aQBAeAiHGPfTac9UrEsZAQqUqNbGNN8I2Pw5gLtEGL8SwNsg2IeTUa4899QH6Bn2BqJeqxx4q9dgHqPoOXYMhtFGlrrTSzDff99k7MzxAGp4Y2CNdN3SvKAGIkVwNh6RJcZTkhx0PU7qJM6obJHBGCrwwUSD/ZueQSkNWx8GUBJvkqE5nS9cfx1QeeGVBSSD5Y0p44BqKal02lHoWUv37dz/qz7+9vmSxDclh8WCLM3FGUyQ55u7V/+BuY9h6S2197f259+zn2+bNI+8Ej71rpmz/p3eujerag/nXT833X7ja34LTB/NEkLz09B8v3eLrT7CWEj+aBSsODs80pWNBxjANJWkCBweuA0891yfDAI+il+F0QWmKUWcLP0rxkI7wmHW7E8Pm0icBUyAHXgiValUsV0r5Cj4R8yWHiPlquXySF0VcPi46BUcQTpiuGczmJIhcEuaAi8httAhIyMcDZb/TxXRB4CNZnRcG/euC0z+nwxWqsNzqFKiJJvNj5HdXV2eogjxW16RKY1Xd45Yj3CtTWzy/HvitxZXXLTTENiVaWxh6FzdG3ZjoRVs0ZXViWujOtlDJlB1Pt9oTvdeltqXc6vLFUrfsosnuYIKKuowE425c0GWV8VqC3rtg2FS0J1PR7LU95AvVUQuAY11k+w58X553l7eGVnIBDiArYw+PCVtlDo5MVdUkQ970mwNOl5CxD2TYGDu7RFWUZDQ78/X2zYY4cmd+Frh+3hyNQhI9jJobPIbsBLr/Nf/wnX/15hDSNl6eleLyb47ve12pAwAA + '2': H4sIAAAAAAAAAI1SPXPaQBBdDMayUqRNlSKTlhmEAEMaRyAJnQdJfMiAaDxndGDBSTCS+HKfImWq/I9U6TxpMilTJHV+gP9ETrawSTyZyc3czO7b9550u8sDpOGZgT3Sc0P3khKAGDmu4ZC0KI6S/LDrYUrv44zqBgmckQIvTBTIXz04pNKQ1XEwI8F9ctSg87XrT2IqD7yypCSQ/AklPHBNRbUumkojC6nBzYdfjVc/3l6w2IbksHi4w5k4oymSHHP36n9wdzHsvKWOfuf9tf/i9n1r9cQ7wWPvminb/+l93EEN7dH8+5fWx29c7W/B6aN5IkheevqPl+7wu0+wlhI/mgdbDg7rmtK1IGOYhpI0gYMD14HnnuuTUYDH0ZtwtqQ0xajzpR+leEhHeMK63Y1hc+2TgCmQA6+FcrUqlsrFXBlXxFzRIWKuWipVcqKISycFJ+8IQoXpWsF8QYLIJeExcBHZRMuAhHw8UPY7PUyXBD6R7Vl+OLjKO4MzOtqiMsutbp6aaLo4QX5ve1lHZeSxuiaVm9vqHrcU4X6J2uLZ1dBvLy+9Xr4pdijROsLIO18ZDWOqF2zRlNWpaaFr20JFU3Y83epM9X6P2pay0eXztW7ZBZPd4RQVdBkJxvUkr8sq47UFvX/OsJloT2ei2e94yBeq4zYAx7rI9h34gbzorTeGVnQBDiArYw9PCFtlDo5MVdUkQ77vNwecLiFjH8iwMXYfElVRktE8mN9t33yEI3fuZ4Eb5MzxOCTR46i54VPITqCbny8/t2/fwSGkbbyuF+Pyb3ySmTypAwAA + '3': H4sIAAAAAAAAAI1SzW7aQBAewk8c99Brz1WuSBgDCZWq1GAbb4RtAg5gLtEGL8SwNtQ2EPIGPfbUB+gb9AWqXqoec6jUYx+gL9E1mJA2qtSVVpr55vs+e2eGB0jDMwN7pOuG7jUlADFyVMMhaVEcJXm242FKt3FGdYMEzkiBFyYK5C8fHFJpyOk4mJJgmxw26Gzl+uOYygOvLCgJJH9MCQ9cU1Gtq6bSyEGq//n9z8bL72+uWGxDclg82OFMnNEUSY65j+p/cHcx7Lyltr7x/tp78etda/nEO8Fj75op2//pfdRGDW1vfv+l9eEbV/tbcLY3TwTJS8/+8dIdvvkEaynxo1mw5iBb15SOBRnDNJSkCRwcuA4891yfDAM8il6F0wWlKUadLfwoxUM6wmPW7U4MmyufBEyBHDgWKtWqWK6U8hV8KuZLDhHz1XL5NC+KuHxSdAqOIJwyXSuYzUkQuSQ8Ai4it9EiICEfD5T9ThfTBYFPZH1eGPRvCk7/nA7XqMJyq1OgJprMT5DfXV/XUQV5rK5Jlea6+ohbjnCvTG3x/GbgXyyuvW6hKbYp0drC0LtcGg1johdt0ZTViWmhO9tCJVN2PN1qT/Rel9qWcqvLlyvdsosmu4MJKuoyEoy7cUGXVca7EPTeJcOmoj2Zimav7SFfqI4uADjWRbbvwPfleXd1a2glF+AAcjL28JiwVebg0FRVTTLkbb854HQJGY+BDBtj5yFRFSUZzYP5ZvtmQxy5Mz8HXD9vjkYhifaj5gZPITuBzu4//uBfv4UspG28qpfi8m9tBnbyqQMAAA== + '4': H4sIAAAAAAAAAI1Sy27aQBS9BEKMu+i26ypbJIyBhG5SJ7bxRNjmYR5mE03wQAxjg2wDIX/QZVf9j/5A1U3VZRfd9wPyEx2DebRRpY5k6d5zzznjuffyAGl4ZWCPdN3QvacEIEZy1zgkDYqjJD9te5jSbZxR3SCBM1LghYkC+cu9QyoNWR0HUxJsk7Mana1cfxxTeeCVBSWB5I8p4YGrK6p1V1dqWUj1v3z8VXv78/0di21IDosHO5yJM5oiyTH3qP4HdxfDzltq6Rvvb703zx8ayxfeCR57X5uy/Z/euRaqaQfzH18bn75z138Lrg7miSB56dU/XrrDN1ewlhI/mgVrDk5vNKVtQcYwDSVpAgcnrgOvPdcnwwCPonfhdEFpilFnCz9K8ZCO8Jh1ux3D5sonAVMgB86FSrUqliulfAVfivmSQ8R8tVy+zIsiLl8UnYIjCJdM1whmcxJELglzwEXkMVoEJOTjgbLf6WK6IPCZrG8Lg/5Dwenf0uEaVVhutQvURJP5BfK76/sbVEEeq2tSpb6uHnHLEe6VqS3ePgz85uLe6xbqYosSrSUMvc7SqBkTvWiLpqxOTAs92RYqmbLj6VZrove61LaUR13urHTLLprsG0xQUZeRYDyNC7qsMl5T0Hsdhk1FezIVzV7LQ75QHTUBONZFtu/A9+V5d/VoaCUX4ASyMvbwmLBV5uDMVFVNMuRtvzngdAkZx0CGjbG9T1RFSUazN99s32yII3fmZ4Hr583RKCTRYdTc4CVkJ9DVsxgfOIW0jVc3pbj8G/uxKTapAwAA + '5': H4sIAAAAAAAAAI1SzW7aQBAeAiGOe+i156pXJIyBhEpVarCNN8I2AfNjLtGCF2JYG2SbEPIGPfbUB+gb9AWqXqoee6jUYx+gD9Br18H8tFGlrrTSzDff99k7MzxAGp4Y2CNdN3SHlADEyGkVh6RJcZTkx20PU7qJM6obJHBGCrwwUSD/dueQSkNWx8GMBJvkpE7nK9efxFQeeGVJSSD5E0p44BqKal03lHoWUv2Pb3/Un397fc1iG5LD4sEWZ+KMpkhyzD2o/8HdxrD1llr6g/fn3rOfb5q3j7wTPPaumrL9n96nLVTX9uZfPzXffeGqfwsu9uaJIHnpxT9eusUfPsFaSvxoHqw5OK5pStuCjGEaStIEDo5cB556rk9GAR5HL8PZktIUo86XfpTiIR3hCet2O4bNlU8CpkAOvBDKlYpYKhdzZXwu5ooOEXOVUuk8J4q4dFZw8o4gnDNdM5gvSBC5JDwFLiJ30TIgIR8PlP1OF9MlgQ9kfZkf9G/yTv+SjtaozHKrnacmmi7OkN9dD2uojDxW16RyY1054JYi3CtRW7y8GfhXy6HXzTfEFiVaSxh5nVujbkz1gi2asjo1LXRvW6hoyo6nW62p3utS21LudLmz0i27YLI7mKKCLiPBuJ/kdVllvCtB73UYNhPt6Uw0ey0P+UJlfAXAsS6yfQe+Ly+6qztDK7oAR5CVsYcnhK0yByemqmqSIW/6zQGnS8g4BDJsjO1doipKMpqd+cP2zUc4cud+Frh+zhyPQxLtR80NHkN2Al384l8t3n+HY0jbeFUrxuXf6VwxFKkDAAA= + '6': H4sIAAAAAAAAAI1SPW/aUBS9BEIcd+jSoVOHqisSxkBCl2CwjR/CNh8OYJb0BT+I4dlEtgkhe4eOnfovOnTqFnWpOrZS96pz/kSfiUnSVpVqydK9551z7Hfu5QHS8MjAHum7oXtKCUCM7NdwSNoUR0m/2/Mwpbd1RnWDBM5IgRcmCuRf3Dmk0pDVcTAnwW2z16CLletPYyoPvLKkJJD8KSU8cC1FtU5aSiMLqeH12x+N59+rJ6y2IXlYPdriTJzRFEmOuQ/Of+Nua9h6S1194/158PTmTfviL+8Ej71rpmz/p/d+FzW0e/Ovn9rvvnC1PwVH9+aJILnp0T9uusU3n2CREj9aBGsOduua0rMgY5iGkoTAwY7rwGPP9ck4wJPoZThfUppi1MXSj1I8pCM8ZWn3Ythc+SRgCuTAC6FcqYilcjFXxodirugQMVcplQ5zoohLBwUn7wjCIdO1g8U5CSKXhPvAReQyWgYk5OOBst/pY7ok8IGsm/nR8CzvDJt0vEZl1lu9PDXR7PwA+f31aR2VkcfONancWlcecEsRHpSoLTbPRn5neer18y2xS4nWFcbe8YXRMGZ6wRZNWZ2ZFrqyLVQ0ZcfTre5MH/SpbSmXuny80i27YLJ3NEMFXUaCcTXN67LKeB1BHxwzbC7as7loDroe8oXKpAPAsRTZvgM/lM/7q0tDK7oAO5CVsYenhK0yB3umqmqSId/mzQGnS8h4CGTYGHt3jaooyWjuzDfbtxjjyF34WeCGOXMyCUl0P2pulEDX3xrvn1z9rDLITqAqdG5eP/v4ahfSNl7Vi7HiF+J4nd6pAwAA + '7': H4sIAAAAAAAAAI2SPW/aUBSGD+Ejjjt07dQh6oqEMRDokjixjW+EbT4cwCzpDb4Qw7VBtoGQvVI7dur/6NQt6lJ17NC9PyB/oteJCbRVpVqydM5zz/va95zDA6ThmYE90nVD94oSgJgcnOKQNCmOkjzb8TClj3FGdYMEZ6TACxMF8pdPDqk05HQcTEnwmOzX6Wzl+uO4lAdeWVASSP6YEh64hqJalw2lnoNU/+7Dz/rhj5NLFtuQPCwebDgTZzRFkuPanfPfajcxbLyltv7g/bX34v59c/mXd8Jj71NTtv/T+6CN6trW/PuX5sdv3OmfguOteSJIbnr8j5tu+MMnWEuJH82CNQfZM03pWJAxTENJmsDBnuvAc8/1yTDAo+h1OF1QmmKls4UfpXhIR3jMut2JsbnyScAUyIFXQqVWE8uVUr6Cq2K+5BAxXyuXq3lRxOWjolNwBKHKdM1gNidB5JLwALiI3ESLgIR8PFD2O11MFwQ+kfV5YdC/Ljj9czpcowrLrU6BmmgyP0J+d311hirIY+eaVGmsazu15Qj3ytQWz68Hfmtx5XULDbFNidYWht7F0qgbE71oi6asTkwL3doWKpmy4+lWe6L3utS2lBtdvljpll002TuYoKIuI8G4HRd0WWV1LUHvXTA2Fe3JVDR7bQ/5Qm3UAuBYF9m+A9+X593VjaGVXIA9yMnYw2PCVpmDfVNVNcmQH/vNAadLyNgFGTbGzlOiKkoymifzh+2bDXHkzvwccP28ORqFJNqOmhsk6O7+7cvPrft3DNkJOoFWDN9kIW3j1VkpVvwCJjcPdqkDAAA= + '8': H4sIAAAAAAAAAI1SPXPaQBBdDMZCKdKmSuFJywxCgCGNLVsSOg+S+JAB0ThndGDBSTCSAOM+RcpU+R+p0nnSZFKmSJ8f4B+QNidbYJJMZnIzN7P77r13d7vLA6ThmYE90nVD94oSgBjJneKQNCmOkny/42FKH+OM6gYJnJECL0wUyF9uHVJpyOo4mJLgMTmo09nK9ccxlQdeWVASSP6YEh64hqJalw2lnoVU/+79j/rh95NLFtuQLBYPNjgTZzRFkmPuzvlv3E0MG2+prT94f+m9uH/XXP7lneCx96kp2//pnWujuvZk/u1z88NX7vRPwfGTeSJIfnr8j59u8IcrWEmJH82CNQf7Z5rSsSBjmIaSFIGDPdeB557rk2GAR9HrcLqgNMWos4UfpXhIR3jMqt2JYXPlk4ApkAOvhEqtJpYrpXwFV8V8ySFivlYuV/OiiMtHRafgCEKV6ZrBbE6CyCVhDriI3ESLgIR83FD2nC6mCwIfyfq8MOhfF5z+OR2uUYXlVqdATTSZHyG/u746QxXksXNNqjTWtR1uOcK9MrXF8+uB31pced1CQ2xTorWFoXexNOrGRC/aoimrE9NCt7aFSqbseLrVnui9LrUt5UaXL1a6ZRdNtgcTVNRlJBi344Iuq4zXEvTeBcOmoj2Zimav7SFfqI1aAByrIpt34PvyvLu6MbSSC7AHWRl7eEzYKHNwYKqqJhnyY7054HQJGbtAhrWxs01URUlaszV/mL7ZEEfuzM8C18+bo1FIoqdWc4MEuvspxqvEIDuBTqB1//blpzf7kLbx6qwUK34B9mZN2qkDAAA= + '9': H4sIAAAAAAAAAI1SwW7aQBAdAiGOe+i15ypXJIyBQKWKOrGNF2GbgAOYS7TghRjWBtkmhPxBjz31A/oH/YGol6rHHir12A/oB/TSQ9fEQNqqUldaaebNe8/emeEB0vDEwB7puqE7pAQgRo7PcEhaFEdJftjxMKUPcUZ1gwTOSIEXJgrk3+wcUmnI6jiYkeAhOarT+cr1JzGVB15ZUhJI/oQSHrimolpXTaWehVT//s23+vMvr65YbENyWDzY4kyc0RRJjrmP6r9xtzFsvaW2vvH+2Hv2/XXr5i/vBI+9z0zZ/k/v4zaqa3vzzx9abz9xZ38KanvzRJC8tPaPl27xzSdYS4kfzYM1B4fnmtKxIGOYhpI0gYMD14GnnuuTUYDH0YtwtqQ0xajzpR+leEhHeMK63Ylhc+WTgCmQAydCuVoVS+VirowrYq7oEDFXLZUqOVHEpdOCk3cEocJ0rWC+IEHkkvAYuIjcRsuAhHw8UPY7XUyXBN6TdSM/6F/nnX6DjtaozHKrk6cmmi5Okd9dD89RGXmsrknl5rr6iFuKcK9EbbFxPfAvlkOvm2+KbUq0tjDyLm+MujHVC7ZoyurUtNCdbaGiKTuebrWneq9LbUu51eXLlW7ZBZPdwRQVdBkJxt0kr8sq410Ieu+SYTPRns5Es9f2kC9UxxcAHOsi23fg+/Kiu7o1tKILcABZGXt4Qtgqc3BkqqomGfJDvzngdAkZj4EMG2Nnl6iKkoxmZ77ZvvkIR+7czwLXz5njcUii/ai5QQLd/9xBdgLVfvAvF+++wiGkbbw6L8blX0Tr1NKpAwAA + Block: '' diff --git a/src/Models/Catapult.yml b/src/Models/Catapult.yml new file mode 100644 index 0000000..ff81d72 --- /dev/null +++ b/src/Models/Catapult.yml @@ -0,0 +1,44 @@ +catapultTest: + name: '&cCatapult' + system-ID: Catapult + creator: ff5f37d0-c1ea-4736-b6c3-ebbfdd67a810 + material: 383 + glow: false + lore: '' + PlaceAbleSide: TOP + crafting: + disable: false + recipe: AXA,ABA,AAA + index: + X: 0 + A: 17 + B: 261 + ProjectModels: + ArmorStands: + '0': H4sIAAAAAAAAAHVSv0/CQBR+hQJHjTur7mxOJqYWegUSKASIUhZy4tE09odpK8Q/wdHJP8A/BF2Mg4OJJrrp7upiXLyDKxAMN733ve/73r13pwCkYcskHj1yIufEpQAcyZdIRFsuiXkupSHT8Yjrzmuy4YSCJmuhFwlFzR8vHJgi2yDhGQ3nSa7iBhPHtzlVAQVfuDTUfNulCqA6NrqDOq5kQepNrz8qu6+HAxZbIA6L+wnOxHIVazrnqj87v129WFjnJjEk3lq7MfN+OC58XbXG/7wFzr1LTd3i3JX6Ju98u1apLs2f71s3j6i0LlCX5kIgJlU3TJrgsxZspdSPg/ASQaZcxZ0uyGbTxGIJCFLOKWx7jk+HIRnF+25gS4wYXPixlIKsTjxi89dAkGsaRlUz9bkeAWpoNXMVkNm1OovEwFi0YlqZf475NoMhiZ3AzwLqFZujUURj9eVNOTi/fWdQP4E+k2mQJaDp9xM/dxlIW2RS3uPlP77HnR15AgAA + '1': H4sIAAAAAAAAAONiYGBm4PZLzE0NyyzOTMpJZWAAiXA6JRanBuQkloD4jMwMrMG5iTk5EDkWt8wiqDIWx6LcYqgOz7wyuAlAHWy+iUXZqUUQDrt7Tn55Zl46SCkXA5draU5qkWNeek4qFwOHj6tbSLyPqzsbA2PE/on33ZWuOMQD2ZEMUABkR8HEgZpZPFwdXUBq7X8q/g5x0ZVAVwtjM8DMdgzyBZt9LFzidWdAGYbZUHGQ2U7+LpEgtUjyuMzmDPJ090AYfuFgwPQTHE7oGuwRhkM1QH1qj8OnMHGwFcAgTc0ryS+q5GBgdfZwDQ5hYPHz93OFBgIHA1NmCgNvbmZeanJRYlqJVU5+OiNQYX5pXgkjEwObS2JuYjooNjgY2P3d3Dwc/Vwg+jkYOHwdPf2QBViAzgqGc9xcXaFWAfWygBIHJDTzkxNLMvPz2Bg4InT909KKU0vsL1/nsi1YfAMoFAUV2r9H4+uh/higbzgiYUJfzoDAAVYG5sjEcmcTkGcB3RqVW3kCAAA= + '2': H4sIAAAAAAAAAHWSP0/CQBjG30KBUmPi6Ko7m5OJqYX+I4GWAFHKQk48SGP/mLZA/AiOTn4APwi6GAcHE01wc3RwdTEu3tErEAw3vfe753nu3rcVAbKwZSIPnziRc+ZiAEqKZRThhotiuueykGt5yHWTM15zQibj5dCLmKPqjxcJxJGvo/ACh8mmoLvBxPGHVCqCqI5cHMr+0MUiCDVVa/dqqp4HrjO9+dD33457pLaBLVJ3U07MvKHKCtVKP3u/baW0u65Na0iz5WZ9nv14uvt13Rj/y2acZpctxabalfNN2cVmVTeW4S8PjdsnobxukJbhzMA6lTZ0mvL5FWSk2I+D8EqAXMVQW23gTctU2RAEyDjnsO05Pu6HaBAfusGQI8Jg5MdcBvIK8tCQfg0BCpamGbKpJH4BhLpcNVcBT57VWmw0VWVXES9Pf45kmkEfxU7g50HolKzBIMKx9DoTjy7v3gnqMjT9pGS2Q5Cdou9nuu5zkLXRpHJAm/0DAxPVZ3kCAAA= + '3': H4sIAAAAAAAAAHVSPU8CQRAd4IDljJ2FrfZ0VibmPLgvErgjQBRoyIoLuXgf5jgg+g8srfwB9v4FtDEWFiaaaGesbbUwNu5ye0AwbDXz5r03O7MrAqRgzcQuObAH9pFDABiSK+ABqTo4ZHkiBem6ix0nqgmaHXCaIAfugCtK3mjmQBWZCg5OSBAlWd3xx7bXZ1QRRHXokED2+g4RAZVVrdEpq3oGEs3J5bu+/bLfoXEL+KFxO8apWDBUWWFc6Wfrt6HkN5e5cQyxt1yrTL3vDzc/L6qjf94cZ94FS2kx7kJ9lXeuVtKNufnTXfXqARWWBdLcnAv4pNKKSWN82oKulHihH5whSBcNtd4AwbRMlS8BQdI+hnXX9kg3wL1w1/H7CUr0h16YSEJGwS7us9dAkLU0zZBNJdIjQBW5ZC4CAr1WfZZoqspbUa3APke0Tb+LQ9v3MoCaeavXG5BQen4V906v3yjU5tDkW7/ZOP8wKNSKoa9Hdm7TkGrhcXGHDfsHirB/cHkCAAA= + '4': H4sIAAAAAAAAAHWSP0/CQBjG30IpR407q+5sTiamFtpSEigEiFIWcuJBGvvHlALxIzg6+QH8IOhiHBxMNMHND+DqYhz0jl6BYLjpvd89z3P3vq0MkIYdC3vkxBk5Zy4BYCRXxCPScHHE9kIaMi0Pu258JhpOyGWiGnoj7qj4k2UCdUg1HF6QMN5ky24wdfwhk8og62OXhKo/dIkMqKob7V5VL0sgdGY3H+X9t+MerW3gi9bdhFOzaOqqxrTK995PWyvkN7VJDUm22qwtsh9P85/Xjcm/bM5ZdrGu2Uy7dr4tO9eslM1V+MtD4/YJFTcNyiqcG3inypZOE764go6U+FEQXiHIlEy91QbRqls6HwKClHMOu57jk36IB9GhGwwFKgzGfiSkQNKwh4fsayDI1g3DVC0t9iNANbVirQORPqu13Bi6zq+iXpH9HPE0gz6OnMCXAHUK9cFgRCLldS4fXd69U9TlaPbLyBxRZCfo65mt+wykbTwtHbBm/wBFQEubeQIAAA== + '5': H4sIAAAAAAAAAHVSPU8CQRAd4DiWM/ZUJtrTWdmcB/dFAncIRIGGrLiQi/eR3B0Qf4CFpZV/hQ5tjIWFhb32tDZq4y7sAcGw1cyb997szK4EkIE9C3vk3ImcS5cAMCRfwhGpuzhmeSoD2aaHXXdZE3Qn5DRBCb2IKyr+eOVAFWINh9ckXCY5ww0mjj9kVAkkbeSSUPGHLpEAVTW91atqhgip9uz+wzh6P+3RuAP80Lib4FQsmJqiMq78ffjbUouFbW4SQ+KtNGoL7+eLwvyuPv7nzXHmXbLVDuNu1Hd55xsVw1ybvz3VH15QaVsgr825gE8q75g0wRct6EqJHwfhDYJs2dSaLRAs29L4EhCknSvY9xyf9EM8iE/cYJiixGDkx6k0iCr28JC9BoKcreumYqlLPQJUUyrWJiDQazVXia5pvBXVCuxzLLcZ9HHsBL4IqF20B4OIxPLP9Gx+ezClUDeBPpNpUIdDs69Xdh6zkOngSfmYlf8A+lXzrXkCAAA= + '6': H4sIAAAAAAAAAHVSv0/CQBR+lQJHjTuTiU4ubE4utdAWSKAgEKXEhJx4kMb+SEqB+Ac4OBkn/xUGE9TBODg4uPsHsOqgLt7RKxAMN733ve/73r13JwHEYNPADjm2+taZTQAYksriPqnaOGC5EIN43cG2HdZE3fI5TVR8p88VRXc4d6CKRBn7F8QPk2Te9kaW22NUCSRtYBNfcXs2kQCVNL3RLmn5BAjNye1Hfvf9sE1jE/ihcSvCqVgsaIrKuPL3zm9DzaRXuVEMkbdSK8+8n0/S0+vq8J83x5l3tqKajLtUX+edqhXzhYX522P17gVlVwXywpwL+KTymkkjfNaCrpS4gedfIojnClq9AaJRMTS+BAQb1jlsOZZLOj7uBge21xMo0Ru4gbABCRU7uMdeA0GyousFxVBDPQJUVorGMiDSa9Xnia5pvBXViuxzhNv0OjiwPDcBqJmpdLt9Esg/46Pp1faYQi0OTe73vp5uTuk0yIygz1d2HuIQM/Eot8+G/QOZiPvreQIAAA== + '7': H4sIAAAAAAAAAHVSv0/CQBR+hQKlxsTRyUR3NicTg4W2lARaBKKUhZx4kMb+MG2B+Ac4ODr5B/hPsKGLcXBwMHF0dGB1URfv6BUIhpve+973fe/euxMBkrChIwefWIF1ZmMAimQLKMA1G4U055KQajjItqMar1o+o/GS7wRMUXaHcweiSFeRf4H9KMmUbG9kuX1KFUFUBjb2JbdvYxGEiqI2OxWllAauNbn9KO29HXVIbAI7JG7HOBHzmiLJlJv/3v1tyrntVW4cQ+wt1asz76fT7elNbfjPm+HUu2DIJuUu1dd5Z+vlkrYwf32s3T0LhVVBfmHOBGzS/JpJY3zWgqwUu6HnXwmQKmpKowm8bugKW4IACescNh3LxV0f9cID2+tzhOgN3JBLQFpGDurT1xAgY6iqJulypBdAqEplfRngybUa80RVFNaKaHn6OaJtel0UWp6bBqGVM3q9AIf5n/Hx9HpnTKA2gyaf4uHl/fsWgcwY+nqh5yEFSRONivt02D9HgbvXeQIAAA== + '8': H4sIAAAAAAAAAHVSv0/CQBR+hQIF4+bAZKI7m5NLLfQXCbQIRCkLOfEgjf2RlALR3cHRyf/CmQ1djIODg7txZtVBXbyjVyAYbnrve9/3vXvvLgeQhC0DufjEHthnDgagSLaIBrjmoJDmXBJSDRc5TlTjVTtgNF4K3AFTlL3RwoEo0lUUXOAgSjKa449tr0+pOcgpQwcHktd3cA6EiqI2OxVFSwPXmt6+a/tvRx0SW8AOidsxTsS8rkgy5Yrfe79NuZBf58YxxN5SvTr3fjrNz25qo3/eDKfeRVO2KHelvsk7Wy9r+tL89bF29ywU1wXi0pwJ2KTihkljfN6CrBR7oR9cCpAq6UqjCbxhGgpbggAJ+xy2XdvD3QD1wkPH73OE6A+9kEtAWkYu6tPXECBjqqouGXKkF0CoSmVjFeDJtRqLRFUU1opoefo5om36XRTavpcGoVUwe70BDsWfyfHsendCoDaDpl/a/c7Vh04gK4Y+X+h5SEHSQuPSAR32D84iEcB5AgAA + '9': H4sIAAAAAAAAAHVSPU8CQRAd4DiWM/ZUJtrTWZkYPLg9IIEDgSjQkBUXcvE+zN0B8QdYWFr5A/wTdGhjLCwsTCz9AbQ2aqG7sAcEw1Yzb957szO7CkAMtgxi0xPTN88sCsCRZJb4tGqRgOeRGMTrNrGseU3STU/QJNWzfaEoOsOFA1PIZeJdUG+eJPKWOzKdPqcqoOCBRT3V6VtUAVTCeqNTwnkZIs3J7Ud+7+2ow+IWiMPidogzsVTAqsa5ma/dn4aWTq1zwxhCb7VWnnk/naamN9XhP2+Bc+9sRWtx7kp9k3eyVswXluavj9W7Z5RdF2SW5kIgJs1smDTEZy3YSqkTuN4VgniugOsNkIyKgcUSEETNc9i2TYd2PdILDiy3H2FEd+AEkSjIGrFJn78GgkRF1wuqoc31CFBZLRqrgMSuVV8kOsaiFdNK/HPMt+l2SWC6jgyoma70ej4NMt/j4+n1zphBbQFNfpXDy/t3xKBWCH2+8PMQh1iLjHL7fNg/AdIlK3kCAAA= + '10': H4sIAAAAAAAAAI1STU/CQBCdQilLjXfP3r15MjFY6BcJtASIAhey4tI09sO0BeJP8OjJ6NUfQrwYDx5INFFP/gD9Ee7SLaDGxDnNvH3vzc7sygB52LCwTw7d2D32CABDShUck6aHE1YLeSi0fex5aS7qbsRpohL5MVfUgsnSgbKkBo5OSZQWRcMLp27gMKoMsjb2SKQEjkdkQHVN7wzqmiGB0J1dvhvbzwcDmveAB837GU7FoqkpKuOunX/jZjlk3kqrsfC+P9r6uGhOfnlznHlXbLX3T+9Sq2aYK/P5XfPqAVV+Csorcy7gk5b/mDTDFy3oSkmQhNE5gkLV1NodEC3b0vgSEOTcE9j03YAMIzxK9rzQESgxHAeJkANJxT522GsgKNq6biqWmuoRoIZSs9YBkV6rvSx0TeOtqFZknyPdZjjEiRsGEqDujj0axSQpP73I+2e3rxTqc2j2+chiTqFeBr1d07iBAuR7eFrdZcN+AYftxyV5AgAA + '11': H4sIAAAAAAAAAI1SPU/CUBS9lVJKjbujcXdzMjFY6BcJtAhEKQt54qNp7IdpC8Qf4ODo5Obin3AjLsbBgUQT3fwB+CN8j74Caky8073nnXPuu/c9CSAH6yby8ZEbuyceBqBIsYxi3PBQQmsuB/mWjzwvzXnNjRiNlyM/ZopqMFo4EJZQR9EZjtKioHvh2A0cSpVAUocejuTA8bAEYk3V2r2aqgvAdSbXH/r260GP5DawIHk3w4mYN1RZodyV82/cLIfMW27W596Px5uzq8bolzfDqXfZUux/ehebVd1Ymk8fGjdPYvmnoLQ0ZwI2aemPSTN83oKsFAdJGF2IkK8YaqsNvGmZKluCCGvuKWz4boD7ERoke17ocIQYDoOEWwNBQT5y6GuIULA0zZBNJdWLINblqrkK8ORarUWhqSprRbQ8/RzpNsM+StwwEEDs7FiDQYyT0subtH9+906gLoMmn880pgSyM9bt/eHscgvykLPRuLJLh/0Ch/QNWXkCAAA= + '12': H4sIAAAAAAAAAI1SzU7CQBCeQoGlxrtn7948mRgs9I8EWgJEKRey4tI09oe0BeIjePTkA/AgxIvx4IFEE70YH0Afwl26BdSYOKeZb7/vm53ZlQDysGNin5y6sXvuEQCGlKs4Ji0PJ6wW8lDo+Njz0lzU3IjTRDnyY66oB9O1A2UVmzi6JFFalHQvnLmBw6gSSOrEI5EcOB6RADVUrTtoqHoRhN7i5l3ffz4Z0NwGHjTvZzgVi4YqK4y7df6Nm+WQecvt5sr7/mzv47o1/eXNceZdtRT7n97ldl03NubLu9btA6r+FFQ25lzAJ638MWmGr1rQlZIgCaMrBIWaoXa6IJqWqfIlIMi5F7DruwEZRniUHHmhI1BiOAkSIQdFBfvYYa+BoGRpmiGbSqpHgJpy3dwGRHqtzrrQVJW3olqRfY50m+EQJ24YFAH1DqzRKCZJ5elFOh7PXynU59Di85HFkkJ2xnobzykPCpC38ax2yIb9Ao3anSN5AgAA + '13': H4sIAAAAAAAAAI1SPU/CUBS9hVJKjZuDs7ubk4nBQr9IoCVAlLKQJz6axn6YtkJ0cnV08ge4+xeIi3FwINFEN+MsP8L36CugxsQ73XveOee+e9+TAPKwZiIfH7ixe+RhAIqUKijGTQ8ltObyUGj7yPPSnNfciNF4OfJjpqgFo4UDYQkNFJ3gKC2KuheO3cChVAkk9czDkRw4HpZArKtap19XdQG47uT6Xd962e+T3AYWJO9lOBHzhiorlLty/o2b5ZB5y63G3PvhcPPzqjn65c1w6l2xFPuf3qVWTTeW5tP75s2jWPkpKC/NmYBNWv5j0gyftyArxUESRuciFKqG2u4Ab1qmypYgQs49hnXfDfAgQsNk1wsdjhDDsyDhciAoyEcOfQ0RipamGbKppHoRxIZcM1cBnlyrvSg0VWWtiJannyPdZjhAiRsGAojdbWs4jHFSfn6V9k5v3wjUY9Bk9kRjSiA7Y80uPvS7jcsC5G00ru7QYb8A1P36b3kCAAA= + '14': H4sIAAAAAAAAAI1SPVPCQBBdIIQQx97Kwt7OygYDuSTMSILAKKFhTjwyGfMxkwQYf4CFpZWjv4SOsXEsLChsrPwB+AusvCMXQB1n3Gr33Xtvb/dOBijAlol9curG7rlHABhSruKYND2csDpXgGLbx56X5oLmRpwmKJEfc0U9GK8cKEts4OiSRGlR0r1w4gYOo8ogo5FHIiVwPCKDdIy0Tv8Y6SLkurPbd33v9ahPcxt40LyX4VQsGEhRGXfj/Bs3yyHzVlqNpffT2c7ipjn+5c1x5l21VPuf3uVWXTfW5vPH5t2zVP0pqKzNuYBPWvlj0gxftqArJUESRlcSFGsGandAMC0T8SVIkHcvYNt3AzKI8DA59EInR4nhKEhyeRBV7GOHvYYEJUvTDMVUU70EUkOpm5uAQK/VXhUaQrwV1Qrsc6TbDAc4ccNABKm7bw2HMUkqn9OTxfXulEI9Ds0+XljMKWRn0Ns9jQcoQsHGk9oBG/YLw3+plXkCAAA= + '15': H4sIAAAAAAAAAI1Sv0/CQBR+hQKlxt3JGHc3Jxcs9NqSQItAlLKQE4+msT+StkD8Axwcndz8O9iIi3FwYHD3D8C/wMk7egXUmPim9777vu/de3cyQB52TOyTczd2Lz0CwJByFcek5eGE1UIeCh0fe16ai5obcZqoRH7MFfVgsnagrGITR9ckSouS7oVTN3AYVQYZjT0SKYHjERmkBtK6gwbSiyD05vfv+uHb6YDmNvCgeT/DqVg0kKIy7tb5N26WQ+attJsr7+eLveVda/LLm+PMu2qp9j+9y+26bmzMF0+thxep+lNQ2ZhzAZ+08sekGb5qQVdKgiSMbiQo1AzU6YJoWibiS5Ag517Bru8GZBjhUXLihY5AieE4SIQcFFXsY4e9hgQlS9MMxVRTvQRSU6mb24BIr9VZFxpCvBXViuxzpNsMhzhxw6AIUu/IGo1iklQ+Z2fL2/0Zhfocmn+8slhQyM5Yj4x1AAXI23haO2bDfgHDZmPpeQIAAA== + '16': H4sIAAAAAAAAAI1SvU7CUBQ+hVJKjbuTg7ubk4nBYv9IoEUgSlnIFS9NY39MWyA+gIOjkw/gS7ARF+PgwGDiZHwAfAIn76W3gBoTz3TOd7/vO/eceyWAPGyYyMcnbuyeeRiAIqUKinHDQwmtuTwUWj7yvDTnNTdiNF6O/JgpqsFo6UBYQh1FFzhKi6LuhWM3cChVAkkdejiSA8fDEog1VWv3aqouANeZ3r7rOy+HPZLbwILk3QwnYt5QZYVy186/cbMcMm+5WV94P55uzW8ao1/eDKfeFUux/+ldalZ1Y2U+e2jcPYmVn4LyypwJ2KTlPybN8EULslIcJGF0JULhyFBbbeBNy1TZEkTIueew6bsB7kdokOx7ocMRYjgMEi4HgoJ85NDXEKFoaZohm0qqF0Gsy1VzHeDJtVrLQlNV1opoefo50m2GfZS4YSCA2Nm1BoMYJ+XPyfH8entCoC6Dph/PNGYEsjPW2+X9q3QABcjbaHy0R4f9AslI85N5AgAA + '17': H4sIAAAAAAAAAI1Sv0/CQBR+hQKlxs3BycHdzckFC/1FAi0CUcpCTjyaxv5I2gLRycXB0cn/wpmNuBgHBwZ34wx/gZN39AqoMfFN7333fd+79+5EgCxsGcjDp07knLsYgCLFMopww0Uxrbks5Foect0k51UnZDReCr2IKar+aOVAWPk6Ci9xmBQFzQ3Gjm9TqgiiMnRxKPm2i0UQaora7tUULQ9cZ3r/ru2/HfdIbgELkndTnIh5XZFkyt04/8ZNc0i9pWZ96f18tju/a4x+eTOcepdN2fqnd7FZ1fS1+eyp8fAilH8KSmtzJmCTlv6YNMWXLchKsR8H4ZUAuYqutNrAG6ahsCUIkHEuYNtzfNwP0SA+cgObI8Rg6MdcBvIy8pBNX0OAgqmqumTIiV4AoS5VjU2AJ9dqrQpVUVgrouXp50i2GfRR7AR+HoTOgTkYRDgufU5O5rd7EwJ1GTRdvNKYEchKWYvrD+1x5yYHWQuNK4d02C+Qb5TfeQIAAA== + '18': H4sIAAAAAAAAAI2Sv0/CQBTHX6VAqYMrq+5MOrmUQq8tBloCRCgLOfEgF/ojaQvEzc04uulfw2Bi4u7u6ODkYmJcvKMt/oqJb3rv+9773L13JwPkYNvCHjmmET1xCQBXSjUckbaLYx4LOch3Pey6SU7UaZiWiWroRWlHw19sCKyj0MLhjIRJsmi4wZL6Ux7JIKO5S0LVn7pEBqmJ9N6oiYwCCIPV1aOx91AdMd+B1Jg/zHTWLJpI1Xjtl/y32syHjK12Wmv2Xb/8fNle/GKnOmfXbM35J7vUaRjmBq689stHT9rFzwblbfe9p1XKnw3ppMofk2b6+gi2UuLHQXgmQb5uom4PRMu2kJQsIQuKtq6bqpXGbOqW2rC4IMEWPYUdj/pkHOJJfBjFdDwTGCuY+7GwBQUNe3jKH4wh2cW6G76OUHoYT/HvkewzGOOYBn4BpEHFnkwiEiv3N9yumTRMpdXtPrcqk5xMellXnech5+Bl/YCP+wFMw3RAewIAAA== + '19': H4sIAAAAAAAAAI2Sv0/CQBTHX4GWUgdXVt3ZnEwMFvoLAy0BIj8WcuJBLvQHaQvEzc04uunsH4KTibuJo6ODk4uJcfEOrvgrJt703ve97+fuvVYBSMOGjTx8SCJy5GIApuRKKMJ1F8UsF9IgNj3kuqtaxiAhb8uooRdxR8WfrQnUIdVQOMbhqpg13WBO/BHLFFD0qYtD1R+5WAG5qhutflU3JRA6i4tHc/t+v0/jLvBD416iU3PG0lWN9X6pf+tNYkjYaqO2ZN+288/n9dkvNtcZu+Ro3X+yc42Kaa3hxdd2/uBJO/tpKL5tvbe0Qv7TwCct/jFpoi+voCvFfhyEJzKIZUtvtiBjO7Yur5aQJFnHMCzV5jmduqZWbCbIkCLHsOkRHw9CNIx3o5gMxgJlBVM/FlIgachDI/bBKJI+rLnmG7rOL2Ml9nus9hkMUEwCXwK5U3CGwwjHxbsrdi6p1OPSjTi5flD2JlTqcmnxsuw6FSHdRfPyDhv3A+jA6lp7AgAA + '20': H4sIAAAAAAAAAONiYGBm4PZLzE0NyyzOTMpJZWAAiXA6JRanBuQkloD4jMwMrMG5iTk5EDkWt8wiqDIWx6LcYqgOz7wyuAlAHWy+iUXZqUUQSXb3nPzyzLx0EI+Lgcu1NCe1yDEvPSeVi4HDx9UtJN7H1Z2NgTFi/8T77kpXHOKB7EgGKACyo2DiQM0sHq6OLiC1SPIoamFsBpjZjkG+YLOPhUu87gwowzAbKg4y28nfJZJIszmDPN094IbbfwuX8Hru0o6uwf6n4u8QF10JhAaoT+1x+BQmDrYCGKSpeSX5RZUcDKzOHq7BIQwsfv5+rhyQQIBx2P3d3Dwc/aB8oK99HT39QAIcDEyZKQz8uZl5qclFiWklVsUlmcnZjECz8kvzShiZGNhcEnMT00ERBjQS6LBguPlurq5Qy0BSoOQBCc/85MSSzPw8NgaOCF3/tLTi1BL7kzNBYAZQKAoqtP+bSNVD93UCQKFImNBHsKoGVgbmyMRyZxOQdwHuPDVqewIAAA== + '21': H4sIAAAAAAAAAI2SPU/CUBSGT6WUUgcdHFh1Z3NyqYV+YaAlQISykCteSEM/krZA9A8YRzf9E/4FNhN3d3VycCcxLt5Lb/ErJt7pnPec97n3nFYCyMGmhXx87MbuiYcBqFKsoBg3PZTQnMtBvu0jz0trvO5GrI1XIj9mjlowWxOIQ2igaIKjtFgwvHDuBmOaSSBpUw9HSjD2sARiXdM7g7pmCMD1FlePxt7D4YDEDrBD4n6mEzNvaopKe7/Uv/VmMWRspdVYse+6pdfL5uwXm+mUXbFV55/sYqtmmGu4vOyWjl7Ui58G+W33vaOWS58GNqn8x6SZvrqCrBQHSRidiZCvmlq7A7xlW5qYLiFLCraum4rFcjJ1Q6lZVBBhwz2FLd8N8DBCo+QgTtzhhCOscBok3AYIKvLRmH4wgiQPa6/5uqaxy2iJ/h7pPsMhStwwEEDsle3RKMaJfH9DzzWR+kxaLHfOn43bbSI5WddTOmIecg6aV/dp/AFaHw+BewIAAA== + '22': H4sIAAAAAAAAAI2SMU+DUBDHD0spxcFREzf3JiZuLi1tH9CkhaZttHRpnvhosPBIgLbxIzj6XVxNNz+Bu4Ojo4mz78Gj0RijN9397v5/uAMNoAL7No7IRZAGVyEB4KTexikZhjjjtVSB6jjCYVj0ZCNIxJisJ1EqFD263jkwhTLAyZIkRbNmhvEmoAteaaChVUgSnS5CooHaR8Zk3kemAtJ0e/9injy35ix3QQTLZyVnYtlCepfPful/my1zKL310SD3fro8ersbrn94C869207X/ad3fdQzrZ1569Br0Jvjx78FYtPmL5uWPFewkxKaxcmtCtWOhcYTkG3HRmpxhLKoOYZh6bao2dYDvWdzoMJecA0HUUCJl2A/O0+zwFtKzCte0UzaA6WLI7zgH4xZshcb7/wNhMTDeIv/HsU9Yw9nQUwVUKcNx/dTkjU//DwYmgm0fT/jccqQW6LXHEEVKi7edB74up+2+ABVewIAAA== + '23': H4sIAAAAAAAAAI2SsU7CUBSGT6GUUgdHTdzceQEXKHDbkkBLgChlIdd6SyrtbdIWiI/g6KiTD+Fq2HwCFycfwN3Ze+ktkRijZzrnP+f/2nNaDaAMBzaOyHmQBpchAeBKrYVTMghxxmupDJVRhMMw78lGkIgxWU+iVDi6dLUjMIfSx8mCJHmzaobxOqBzXmmgoWVIEp3OQ6KB2kPGeNZDpgLSZHP3bp6+Nmcsd0EEy6eFzsyyhfQOn/3W35stcijY+rC/Zb9cHH/cDlY/2ELn7JbTcf/Jrg27prWDN4+8Or0+ef7bIDZt/LJpoW8d7KSEZnFyo0KlbaHRGGTbsZGaH6Eoqo5hWLotarZ1X+/aXFChFFzBYRRQ4iXYz87SLPAWEmPFS5pJJVA6OMJz/sEYkr3YaMc3EBIP4y3+e+T3jD2cBTFVQJ3UHd9PSdb49LfBpKmQNm/3PB6Z5O5JD1CBsovX7Se+7hexRrwXewIAAA== + '24': H4sIAAAAAAAAAHVSMU/CQBR+QIGCK4OzO5uDccEC10ICLQGilIUceJDG6zVpC0RdXB2djJu/wL9AWIwjg7txMTEu/gTv4AoEw5ve++77vnfv3WUBEnBgYpecO4HTpwRAIJkiDkiD4lDUsQQkWy6mdHWm6I4vaYrmu4FUVNlk7cAVqTr2r4i/KtIG9aYOGwlqFrJoTImvsRElWVBrSG/3ashIQawze/gwjt7Pejy3QQbPuxHOxUoFaWXBLSzmzZN8QHa5UQ6Rt9asL71fLw5/7huTf94SF95Fq2wL7tb5Pu9Ms2pUNuaLeePxTS3uCgobcymQkxb2TBrhyxZ8pYSFnn+tQrJUQa02KKZlIrkEFeLOJeRch5GBj4fhaRB6jPQCivsxzvfGLIzFIVXGLh6JR1Ehbel6RTPLKxsV1LpWNbcBhd+utS50hGRHrlXEH1kt1Rvg0PFYCtRO3hoOAxIWfm8+jZfcLYe6EfT9JOKZQ7aEZl9DEXdJSNh4WjoWM/8BGcfOZYACAAA= + '25': H4sIAAAAAAAAAI1SMU/CQBj9CqWUOrg66+JijIuDCxbbUhRaUohSFnLg0VTaq2mLBEcTYxz9Fa6Obmz+Ap1108TFH6CJV9oCJpp40/vevfe+++5OAMjCkoZcfGgHdtfBAMBkoVBCAa47KEzqXMNFjkMxVbOK7eMEir4bxLBQIWeLCVwN+QPsx0W+7Hgjm1iRVABBHjrYF4nlYAH4qqw0O1W5zAHTmtw8l1cfdzsUm5AsitspT82sKotSpF3Y/6FNMaTZolGbZn+Mn7buT05/yT647X5eRtklXTL/mV0wKmV1Hv5l6Ofbm+uRYfJwtLL/Kl1FhiLF79f1i7khmbT4x6QpP21BrxST0PPHPOT2VLnRBFbTNZmPLyEuBMjriqKKmsRDxj6GZdcmuOejfrgThHZvwFCrNyQhkwFOQi6yovfhga+JFS1yzSLpwRqzQpHlpBnVstH3AG7NQMSavpjXQ6HtEQ741obe7wc4nNylI/DtlHqZUWZKvcVUDrImGsX4G3s/PFSBAgAA + Block: '' diff --git a/src/Models/Chair.yml b/src/Models/Chair.yml new file mode 100644 index 0000000..47eed15 --- /dev/null +++ b/src/Models/Chair.yml @@ -0,0 +1,25 @@ +Chair: + system-ID: Chair + name: '&cChair' + creator: ff5f37d0-c1ea-4736-b6c3-ebbfdd67a810 + material: 383 + glow: false + lore: '' + PlaceAbleSide: TOP + crafting: + disable: false + recipe: 0+0,0+0,E0E + index: + '0': 0 + +: 96 + E: 280 + ProjectModels: + ArmorStands: + '0': H4sIAAAAAAAAAI2SsU7CQBjHv9JSjro5Obv7Ai5Y7LUlgZYAUcpCTjjIxbZnrgXiIzg6+TjExTg6uPsALj6CLb0CSkzs9P/+9/1/d/ddDQAVjjwS0SuWsJuQAuROvUkS2g1JKutqPyJhWGjNZkLamimiRCZa8XJLUFTQO0TcUlEUNSfkKxbP81YDDLwIqTDjeUgNQG1sD8Zt7OigDNePH87p+8U40wHIL9Oj0s/CmotNK+/dW//RW2oo2Wavs2G/XJ98PnSXB2zp5+ymbwX/ZNd7Lcfdwd+eu0+vqPk70NjBZUDetPHHTUt/s0U2UhqnXNwjqF66uD8AzfM9LIeAoMKmcByxmE4EmaXnqSB3U86FknXzRZwqFdAtEpF5/iQIar5tu6ZnFRAEqGO2vH1Dy87W3xY2xnK/LKvlf0gxUj4hKeOxDmh45s9mCU1350ejQyuQ1vqrsKqgBmRV6G/Hf1C6fgIAAA== + '1': H4sIAAAAAAAAAHWSP0/CQBjG30KBo25OTpq4+wVcsNhrSwItAlHKQk44SGP/mGuBuLk4ODr5VdyIi3FwYHB3ceMTuNmjVyAYb3rf3z3Pc3dvqwDkYc8iPr10I/faowCclKskok2PxKIvtH3ieWkt6y4TWFaZHwlHLZiuE6Q8FBuE3VCWNiXDC2duMOZSBRQ88ShTg7FHFUB1rHf6dWwUQerOn76M48+zflI7IFZS9zKemGUTqxrXVn4OXy6WD0e72qyGLFttNVbZb1cHy8fm9E+24Dy7amsO127t/5ddbtUMcxO+eG0+v6PqrqGyCRcG8dLKPy/N+OqIZKQ0iEN2h6BwbuJ2B2TLtrAYAoKcO4R93w3ogJFRfBozcjsMQyYl6nASxFIOihrxyZh/EgQlW9dN1dLSEASoodasbSAnd2uvGx1jcV7ilfkfko40HJDYDYMioO6JPRpFNN7cH/UEmi/WyMnQ9wdf9wXIO2SWbv8CSZBWG34CAAA= + '2': H4sIAAAAAAAAAI2Sv0/CQBTHX6HAUQcXBycHdzcnFyz0Fwm0CEQpCznxII39kbQVopODDo5Oxn/CmY24GCfj4G6c+RtMvKNXQI2JN733uff93r13JwFkYc3EHjl0IufYJQCMFMs4Ig0XxzzPtTzsukksak7IsSiHXsQVVX+0cBCykK/j8JSESVLQ3WDs+ENWKoGknrkklP2hSyRANVVr92qqngehM71917ff9ns0toEvGndTTsWiocoKq13Z/1abxpB6y8363PvpaHN20xj98uaceZctxf6nd7FZ1Y2l+etj4+4ZlX8KSktzLuCdlv7oNOXzI+hIiR8H4TmCXMVQW20QTctU+RAQZJwTWPccn/RDPIj3XDIioUBLgzM/FjKQV7CHh+w9EBQsTTNkU0kcEKC6XDVXgUgv1lokmqryw6hWZN8jmWfQx7ET+HlAnR1rMIhIXHqZHMyutyYUdTmaXl186A8btB9kp+jznq3LHGRtPK7ssna/AFMnBmt7AgAA + '3': H4sIAAAAAAAAAI2Sv0/CQBTHX6GUUgdXJwcnFzcnFyz0Fwm0CEQpMcFTD9J4bZO2QNxcHJyMk/E/YSM6GCfj4M4fwOxo4pVeATUm3vTe5973e/fenQSQhTUTufjQCZ1TggFiUiihENcJiliea7qIkCTmNSdgmJcDN2SKijdcOHBZEGoouMBBkuR14o8crx+XSiCpA4ID2esTLIFYVbVWt6rqAnDtyd1U33rf79LYBrZo3Ek5FfOGKitx7cr+t9o0htRbbtTm3s9HG7Ob+vCXN+Oxd8lS7H96FxoV3Viavz3W71/E0k9BcWnOBKzT4h+dpnx+BB0p9iI/uBQhVzbUZgt40zJVNgQRMs45rLuOh88C1Iv2CB7igKOl/sCLuAwICnJRP34PEfKWphmyqSQOIog1uWKuAp5erLlINFVlh1EtH3+PZJ7+GYoc3xNAbO9YvV6Io+Lr+GB2vTmmqMPQZHq8/fF0e0KRnaLPh3hd5SBro1F5N273CwbB+LF7AgAA + '4': H4sIAAAAAAAAAI2Sv0/CQBTHX6GUUgdXJwcnFzcnFyz0Fwm0CEQpMcFTD9LYH8m1QNxcHJyMk/E/YSM6GCfj4M4fwOxo4pVeATUm3vTe5973e/fenQSQhTUTefjQCZ1TFwPEpFBCIa67KGJ5rukh101iXnMIw7xMvJApKv5w4cBlQaghcoFJkuR1Nxg5fj8ulUBSBy4mst93sQRiVdVa3aqqC8C1J3dTfet9v0tjG9iicSflVMwbqqzEtSv732rTGFJvuVGbez8fbcxu6sNf3ozH3iVLsf/pXWhUdGNp/vZYv38RSz8FxaU5E7BOi390mvL5EXSk2I8CcilCrmyozRbwpmWqbAgiZJxzWPccH58R1Iv2XDzEhKOlwcCPuAwICvJQP34PEfKWphmyqSQOIog1uWKuAp5erLlINFVlh1EtH3+PZJ7BGYqcwBdAbO9YvV6Io8nr+GB2vTmmqJOi6fH2x9PtCUV2ij4f4nWVg6yNRuXduN0vNKitvXsCAAA= + '5': H4sIAAAAAAAAAONiYGBm4PZLzE0NyyzOTMpJZWAAiXA6JRanBuQklkD5rMG5iTk5EDaLW2YRVJjFsSi3GKrDM68MbgIjMwObb2JRdmoRhMPunpNfnpmXDlLKxcDlWpqTWuSYl56TysXA4ePqFhLv4+rOxsAYsX/ifXelKw7xQHYkAxQA2VEwcaBmFg9XRxeQWiR5FLUwNgPMbMcgX7DZx8IlXncGlGGYDRUHme3k7xJJpNmcQZ7uHgjDLxwMmH6Cwwldgz3CcKgGqE/tcfgUJg62AhikqXkl+UWVHAyszh6uwSEMLH7+fq7QQOBgYMpMYeDPzcxLTS5KTCuxykktSy1iBCrNL80rYWRiYHNJzE1MB8UHBwO7v5ubh6OfC8QEDgYOX0dPP2QBFqDDguEcN1dXqGVAvSyg5MHAfGh5MihI85MTSzLz89gYOCJ0/dPSilNL9p/bEfi6VW4HUCgKJtRS9dB9nQjQSxyRMKG/M0GggZWBOTKx3NkE5GMACL8x034CAAA= + '6': H4sIAAAAAAAAAI2RwU7CQBCGh1Cg1BfwLFebWGgJeMEi25aEtgSIUi5kIQtpLG3SFoiP4NGTj0O8GI8evPsAXn0AW7oFlJi4p///dubfzCwHkIUTAy/IjR3YE4cAxKTYxAHpOjikPtdfYMdJNKPYPsWM7C8C2tF2V7uETBbyOvbviJ+Ygup4a9udx6UccGjpEF925w7hgO0gZTDuIDUPmeHm8UM9e78aR9oCeiI9SnnUzGhIbsW1B/c/alMNabbc07fZL7ennw/d1VE25XF202xZ/8wu9tqqtg9/e+4+vbLN3w2NfThtoJM2/pg05dsnopUSN/T8exZy1xrqD4AxTAOxyRJSUzAVRZONnWd1uW0cAiZ6s78zCkI0ByIX/zycl3Rv6YaXE0maVaQLgRfqUpkXBaHO17BIeKEi1KplsVqekGkpXqs3xaHtuXlgh7w5mwUk3M/Ajo6RRdHmK0E5yFp4nehvGNexr4ICAAA= + Block: '' diff --git a/src/Models/ChristmasTree.yml b/src/Models/ChristmasTree.yml new file mode 100644 index 0000000..2e3e8c7 --- /dev/null +++ b/src/Models/ChristmasTree.yml @@ -0,0 +1,40 @@ +ChristmasTree: + system-ID: ChristmasTree + name: '&cChristmasTree' + creator: ff5f37d0-c1ea-4736-b6c3-ebbfdd67a810 + material: 383 + glow: false + lore: '' + PlaceAbleSide: TOP + crafting: + disable: true + recipe: XXX,XXX,XXX + index: + X: 0 + ProjectModels: + ArmorStands: + '0': H4sIAAAAAAAAAI2Sv07DMBDGL22aumFhZGZHQoKJpaTESSq1SdVW0HSpTHGrCCeRkrQVj8DIxONULIgRCXYGRl4Cu3H6B4SEp7uf7/vsO1sHKMOeS0J6GaTBNaMAgtQaJKUdRjKZV3ohYSyPVStIJFaNJEylohnN1w5KGbQ2SW5pkidVm8WLIJqKUh10PGM0MaIpozqgFrb6oxa2NVAGy4cP+/D9fMRjH+Ti8bDgXKw62DBF7db+Tm0RQ+FtdNsr7+erg6/7zvyXt+TCu+GZ/j+9a92m7WzMX586jy+o8VNQ35hLgey0/kenBV8dwUdKoyxO7hBULhzc64Pqei6WQ0BQCm5gPwwiOk7IJDtjlMxpqvDaeBZlSgk0k4RkKh4EQdWzLMdwzdwCAWobTXcbqPxmvXViYSxP41pV/I98oPGYZEEcaYAGR95kktKs/nYi1ilHw110zJEv0fJzhaACZZ8s8n6/AeoaQeJ8AgAA + '1': H4sIAAAAAAAAAI2SMU+DQBTHHy2lV1wcnd1NTNxcKsgBTVpo2kZLl+as14Z4QAK0TT+Co5NfxL1xMY4mujs4+iU84GirxsSb3vvx//+P90AFqMKeQwJ64Sf+FaMAGWnoJKFdRlLR1/oBYayoZdOPBZa1OEiEoxUuNglSFZQOiW9oXDR1i0VLP5xlUhVUPGc01sIZoyqgNjYH4za2FJCG67t36/DtbMxrD8Th9ajk3CzbWDMy7c7zb9qyhjJb63Xy7KfLg8/b7uJXtuBZtu4a3j+zG72WZW/DXx67989I/2lobsOFQUza/GPSkudX8JXSMI3iFYLauY37A5Ad18FiCQgq/jXsB35IJzGZpqeMkgVNJK6N5mEqVUAxSEBm2QdBUHdN09Yco4hAgDpay9kFMn+z/qYxMRa3ca+c/R/FQqMJSf0oVAANj9zpNKHp+vUkPxyNBGoW6Jgjr1R95AhqUPXIUn/I5v0CUaboUnwCAAA= + '2': H4sIAAAAAAAAAI2Sv0/CQBTHX6GUoy6Ozu4mJjq5YKHXlgRaAkQpCznxII3XNmkLhD/B0ck/h7gYRxPdHRz9J7y2V35oTLzpvc+97/fuvTsVoAwHNvHplRd7N4wCpKTWIDHtMpKIvNL3CWN5LBteJLCsRX4sFK1gsXGQyqB0SHRHozypmixcesEsLVVBxXNGIy2YMaoCamNjMG5jUwFpuH74MI/fL8c8dkEsHo8KzsWyhTU9rd3Z36stYii8tV4n836+Pvq67y5+eQueejcc3f2nd63XMq2t+etT9/EFNX4K6ltzIRCd1v/otODZEXykNEjCaIWg0rRwfwCy7dhYDAFBybuFQ98L6CQi0+SCUbKgscRrw3mQSCVQdOKTWfogCKqOYViarecWCFBHa9m7QOY3628SA2NxGtfK6f/IBxpOSOKFgQJoeOJMpzFN1m9n2eJotI9OOXIL9JkhqEDZJcvmedrvN5e7lm58AgAA + '3': H4sIAAAAAAAAAI2SMU/CQBTHX6GUoy6Ozu4mJjq5YKHXlgRaAkQpCznxII3XNmkrxE9gHJ38OMTFOJro7uDol/COXgE1Jt703u/e/3/33p0OUIYdl4T0LEiDC0YBBKk1SEq7jGQyr/RDwlgeq1aQSKwaSZhKRSuarx2UMmgdklzRJE+qNosXQTQTpTro+JrRxIhmjOqA2tgajNvY1kAZLu/f7f230zGPfZCLx6OCc7HqYMMUtVv732qLGApvo9dZeT+d733edee/vCUX3g3P9P/pXeu1bGdj/vLYfXhGjZ+C+sZcCmSn9T86LfjqCD5SGmVxcoOg0nRwfwCq67lYDgFBKbiE3TCI6CQh0+yEUTKnqcJr4+soU0qgmSQkM/EgCKqeZTmGa+YWCFDHaLnbQOU3668TC2N5Gteq4n/kA40nJAviSAM0PPCm05Rm9dcjsY45Gkm0zNEhR36BPlYIKlD2yaJ5K/r9Altwjy58AgAA + '4': H4sIAAAAAAAAAI2Sv07DMBDGL22aumFhZETsvABLSYmTVGqT0lbQdKlMcasIJ5GStBUPwMDIBCyIx2BDLAg2BnYeoC+B0zj9A0LC093P9332na0CFGHLJj498WLvjFGAlFRqJKYtRhKRlzo+YSyLZcOLBJa1yI+Foh5Mlw5SEZQmiS5olCVlk4UzLxinpSqoeMJopAVjRlVADWx0Bw1sKiD1nm++zL3PwwGPXRCLx/2cc7FsYU1Pa9f2N2rzGHJvrd1ceL+e7syvW9Nf3oKn3jVHd//pXWnXTWtl/vHSun1DtZ+C6spcCESn1T86zfniCD5SGiRhdImgdGThThdk27GxGAKCgncO274X0GFERskBo2RKY4nXhpMgkQqg6MQn4/RBEJQdw7A0W88sEKCmVrfXgcxv1lkmBsbiNK6V0/+RDTQcksQLAwVQb98ZjWKaVN/v03XHUX8TPXLk5ujh6Xh+tQslKLpklvX7Dec0Gfd8AgAA + '5': H4sIAAAAAAAAAI2Sv07DMBDGL23aumFhZETsvABLSci/Sm1S2gqaLpUpbhXhJFKSFvEADIxMCAbEQzCwVSwINgZ2HqAvgd04bQEh4enu5/s++85WAIqw4eCAHPmJf0IJACdVDSekRXEq8lInwJRmsWz6scCyGgeJUNTD6dJBKkK5ieMzEmdJxaLRuR+OeakCijGhJFbDMSUKoIZhdgcNwyqD1Jtdf1o7H/sDFnsgFov7OWdi2TZUndeu7X+rzWPIvdV2c+H9crw1v2pNf3kLzr01V/f+6V1t1y17Zf7+3Lp5RdpPQW1lLgSi09ofneZ8cQQbKQnTKL5AUDqwjU4XZMd1DDEEBAX/FDYDPyTDGI/SPUrwlCQSq40mYSoVoKzjAI/5gyCouKZpq46eWSBATbXurAOZ3ayzTEzDEKcxrcz/RzbQaIhTPwrLgHq77miUkHT2dsvXHUN9gWoZemDIy9H90+H8chtKUPTwufbI+/0CAbmXE3wCAAA= + '6': H4sIAAAAAAAAAI2SvU7DMBDHL23aumFhZETsbEwsJW2cpBJNSltB06Uyxa0i8iElaSsegIGRCcGAeAy2igXBxsDOA/QlsBunHyAkPN39fP+/fWcrAHnYsohPT93YPfcoACflKolp0yOJyAttn3heGsu6Gwksq5EfC0U9mCwdpDwUGyS6pFGalAwvnLrBiJcqoOCxRyM1GHlUAXSM9U7/GBtFkLqz2y9j7/Ooz2IHxGJxL+NMLJtY1Xjt2v5GbRZD5q22Ggvv17Od+U1z8stbcO5dtTXnn97lVt0wV+YfL827N1T9KaiszIVAdFr5o9OML45gI6VBEkZXCAo1E7c7IFu2hcUQEOTcC9j23YAOIjJMDj1KJjSWWG04DhIpB0WN+GTEHwRBydZ1U7W01AIBaqh1ax3I7GbtZaJjLE5jWpn/j3Sg4YAkbhgUAXX37eEwpsns/Z6vB4Z6m+iJIUegyuPzyfx6FwqQd8i0dsD7/QbHpOkvfAIAAA== + '7': H4sIAAAAAAAAAI2SsU7CUBSGT6HApS6OjsbdF3DBQm9bEmgRiFIWcsULabxtk7ZAfABjHJ3UxfgYbsTF6Obg7gPwEt7SW0CNiXc65+v//7fntApAHrYs4tFjN3JPGQVISLlKItpiJBZ9oeMRxtJa1t1QYFkNvUg46v50lSDlodgk4TkN06ZksGDm+uNEqoCCJ4yGqj9mVAHUwHp30MBGEaTe/ObT2Ps4HPDaAXF43c84N8smVrVEu/H8mzarIctW281l9svJzuK6Nf2VLXiSXbU155/Z5XbdMNfh78+t21dU/WmorMOFQUxa+WPSjC+v4CulfhyEFwgKNRN3uiBbtoXFEhDk3DPY9lyfDkMyig8YJVMaSVwbTPxYykFRIx4ZJx8EQcnWdVO1tDQCAWqqdWsTyPzNOqtGx1jcxr1y8n+kCw2GJHYDvwiot2+PRhGNK2/3ybnjqC/QPEWPHDmZ6uHpaHG5CwXIO2RWu0rm/QJWXtc7fAIAAA== + '8': H4sIAAAAAAAAAI2Sv07DMBDGL22aumFhZGJg5wVYSkqcpFKblLaCpktliltFOImUpK3YWBgYmYA3gQmxIEYGdiamvgRO4/QPCAlPdz/f99l3tgpQhC2b+PTEi70zRgFSUqmRmLYYSURe6viEsSyWDS8SWNYiPxaKejBdOkhFUJokuqBRlpRNFs68YJyWqqDiCaORFowZVQE1sNEdNLCpgNR7vv009z4OBzx2QSwe93POxbKFNT2tXdvfqM1jyL21dnPh/Xq6M79pTX95C5561xzd/ad3pV03rZX5+0vr7g3VfgqqK3MhEJ1W/+g054sj+EhpkITRJYLSkYU7XZBtx8ZiCAgK3jls+15AhxEZJQeMkimNJV4bToJEKoCiE5+M0wdBUHYMw9JsPbNAgJpa3V4HMr9ZZ5kYGIvTuFZO/0c20HBIEi8MFEC9fWc0imlSfXpI1z1H/U10xZGbo6/dx+P5NZSg6JJZ1u83Ha0opnwCAAA= + '9': H4sIAAAAAAAAAI2Sv0/CQBTHX6HAURdHJwd3/wEXbO0vEmgRiFIWcuJBGq9t0haMm4uDo5P6fzjoRFyMo4O7kxP/hHf0Cqgx8ab3Pve+37v37hSAImw4OCBHfuKfUALASVXDCWlRnIq81AkwpVksm34ssKzGQSIU9XC6dJCKUG7i+IzEWVKxaHTuh2NeqoBiTCiJ1XBMiQKoYZjdQcOwyiD1Zjcf1s77/oDFHojF4n7OmVi2DVXntWv732rzGHJvtd1ceL8cb82vW9Nf3oJzb83VvX96V9t1y16Zvz23bl+R9lNQW5kLgei09kenOV8cwUZKwjSKLxCUDmyj0wXZcR1DDAFBwT+FzcAPyTDGo3SPEjwlicRqo0mYSgUo6zjAY/4gCCquadqqo2cWCFBTrTvrQGY36ywT0zDEaUwr8/+RDTQa4tSPwjKg3q47GiUknT3d83XHUF+gWoYuGfJy9Ln9eDi/ghIUPXyuPfB+vwCcwaoNfAIAAA== + '10': H4sIAAAAAAAAAI2Sv0/CQBTHX6HAURdHJwd3NycXLPTakkiLQJSykBMP0tgfSVsgbi4Ojk7qf6ITcTGODu5OTvwT3tErPzQm3vTe5973e/fenQKQhy2L+PTUjd1zjwJwUq6SmDY9koi80PaJ56WxrLuRwLIa+bFQ1IPJ0kHKQ7FBoksapUnJ8MKpG4x4qQIKHns0UoORRxVAx1jv9I+xUQSpO7v7NPY+jvosdkAsFvcyzsSyiVWN167tb9RmMWTeaqux8H4925nfNie/vAXn3lVbc/7pXW7VDXNl/v7SvH9D1Z+CyspcCESnlT86zfjiCDZSGiRhdIWgUDNxuwOyZVtYDAFBzr2Abd8N6CAiw+TQo2RCY4nVhuMgkXJQ1IhPRvxBEJRsXTdVS0stEKCGWrfWgcxu1l4mOsbiNKaV+f9IBxoOSOKGQRFQd98eDmOazJ4f+XpgqLeJrhlyBKp87T6dzG+gAHmHTGsHvN9vWtzUMXwCAAA= + '11': H4sIAAAAAAAAAI2SMU/CQBTHX6HAURdHJwd3v4ALFnptSaBFIEpZyIkHaby2SVsgbi7GODqp30Qn4mIcHdydnPgSXukVUGPiTe/9+v//r++1CkAetizi0WM3ck8ZBUhIuUoi2mIkFn2h4xHG0lrW3VBgWQ29SDjq/nSVIOWh2CThOQ3TpmSwYOb640SqgIInjIaqP2ZUAdTAenfQwEYRpN789sPYez8c8NoBcXjdzzg3yyZWtUS78fybNqshy1bbzWX2y8nO4qY1/ZUteJJdtTXnn9nldt0w1+Fvz627V1T9aaisw4VBTFr5Y9KML6/gK6V+HIQXCAo1E3e6IFu2hcUSEOTcM9j2XJ8OQzKKDxglUxpJXBtM/FjKQVEjHhknHwRBydZ1U7W0NAIBaqp1axPI/M06q0bHWNzGvXLyf6QLDYYkdgO/CKi3b49GEY0rTw/JueeoL9A8RZccOZnqc/fxaHEFBcg7ZFa7Tub9AqzH5mp8AgAA + '12': H4sIAAAAAAAAAI2SMU/CQBTHX6GUoy6Ozu5uTiamFnptSaAlQJSykBMP0ni9mrZA/AiOTn4AP4i6GEcHE0c/gKsfwJZeASUm3vTe/97/9+7enQpQhh2HBPTUj/1zRgEypVYnMe0wkoi80gsIY3ksm34kZFmPglg4mny+IkhlUNokuqRRnlQtFi58Ps1KVVDxjNFI51NGVUAtbPZHLWwpIA0ebj+s/beTURp7IFYaDws9Ncs21o2sdmP/R20RQ8HWu+0l+/ls7/OmM99iCz1j113D+ye71m1a9hr++tS5e0H13wZtDRcGcVPtj5sW+rJFOlLKkzC6RlBp2LjXB9lxHSyGgKDkX8Bu4HM6jsgkOWKUzGkspbXhjCdSCRSDBGSaPQiCqmuatu4YOQIBautNZ1OQ05P1VomJseiWeuXsf+QDDcck8UOuABocuJNJTJP16dFwW/KEpH3dv6vHV48VKHtk0TjMtr8BxO8dOHwCAAA= + '13': H4sIAAAAAAAAAI2SMU/CQBiGv0IpR10cnd3dnEwMFHptSaAlQJSykBMP0nhtTVsg/gRHJ1cTf4hxMY4OJo7+AP+Ed3AFlJjY6fvee9/n7r6rDlCEPZeE9CxIgwtGAYRSqZOUdhjJZF/qhYQxXipFUK0gkbJqJGEqE81oviZwl9YmyRVNVk3ZZvEiiKbCqoOOZ4wmRjRlVAfUwlZ/1MK2Bsrg6e7TPnyvjXjtg/x4Pcx1HlYdbJjCu7X+w5vXkLONbnvJfjk/+LrtzHfYUhfsumf6/2RXuk3b2cDfnjv3r6j+O1DdwGVA3rT6x01zfbkFHymNsji5QVBqOLjXB9X1XCyHgKAQXMJ+GER0nJBJdsIomdNU4d54FmVKATSThGQqHgRB2bMsx3DNFQIBahtNd1tQ+cl668bCWO7Gs6r4P1YDjcckC+JIAzQ48iaTlGab06PhruRLqaY+fuin1w8lKPpk0TgWy9+EJW09fAIAAA== + '14': H4sIAAAAAAAAAI2SvVLCQBDHNySEEAtbans7KxsM5JLgQMIAI4SGOfFgbsjHTBJgfALH0lJehs4nsLHSzsLe2jtyYWQcR7fa/e/u7273TgeQ4cjFIbmiKb0OCABXqg2ckm6AMxGX+yEOgtxXLJoIWTGSMBUdrWi1J0gyqB2cLEiSBxU7iNc0mvNSHXS0DEhiRPOA6KC1kTWYtJGtgjTaPrzaJ88XE+b7IIz540JnzYqDDJPXfssf1BY+FGyj19mxn4a1j/vu6gdb6Jzd8Ez/n+xqr2U7e3j9c1i7fDfv/m4Qk9Z/mbTQdx1spSTK4uRWg3LTQf0BKK7nIi1fQhFUPMtyDFfEbOqO0XK5oEGJ3sBxSCMyTfAsO08zOl1IjBUvo0wqgWriEM/5gzEku1h/z7cQEofxFP8e+T7jKc5oHKmgjU692Swl2fblkduGSeNCeivm0fyDqg2UQfbxunnG01844E95ewIAAA== + '15': H4sIAAAAAAAAAI2SvVLCQBDHN5CEEAtbans7KxsI5JLgQMIAI4SGOfFgbsjHTBJgfALH0lIr34TOJ7Cx0s7C3to7cmF0HEe32v3v7u9u904HKMOBi0NyTlN6ERAArlSbOCW9AGciVgYhDoLcly2aCFk2kjAVHe1ovSdIZVC7OFmSJA8qdhBvaLTgpTroaBWQxIgWAdFB6yBrOO0gWwVpvL19sY+eGlPm+yCM+ZNCZ82ygwyT137Jf6stfCjYRr+7Yz+Oau83vfUPttA5u+mZ/j/Z1X7bdvbw+seodvZmXv/dICat/zJpoe862EpJlMXJlQZKy0GDIciu5yItX0IRVDzLcgxXxGzqrtF2uaBBiV7CYUgjMkvwPDtNMzpbSowVr6JMKoFq4hAv+IMxJLvYYM+3EBKH8RT/Hvk+4xnOaBypoI2Pvfk8Jdn2+Y7bPZMmhfRazKP5Qmoou6oHBco+3rROePoTId8E6nsCAAA= + '16': H4sIAAAAAAAAAHWSMU/CQBTHX6WUo6wOrLoz6eRCC22BBFoCRCkLOeBoGq5t0haIH8HRyY9DjIlxdHD3A/gJjIt3cAXUeNN7v/7//+t7rQqQg5KNA3LtJ/6EEgBOijWckC7Fqejz/QBTykopB7LlxwLLehwkwtEKV/sEplI6OF6QeNcUGjRa+6HHpSqo5pKSWA89SlRAbdMajNtmQwFpuLl/b5y/aWNWuyAOq0cZZ2a5aeoG11Y/z74GRqXMtVpxX48yDlm23utss59vyh933dWfbMF5ds0xXK49ev5Dm9VMW+y1Gs1D+Otj9+EF1X4bqodwYRCTVv+ZNOPbK9hKSZhG8S2CfL1p9gcg245tiiUgOPFncBr4IZnGeJ5eeRGdjSc0mi4kpo+WYSqdgGLgAHv8oyAoOJbV1G1jF4MAdfSWfQxk9nb9fWOZpriReWX+j8B2qdEUp34UKoCGFWc+T0h6mACNBNo8XfCjMeQKpJV2KA85F6/rl9zxDe+03baAAgAA + '17': H4sIAAAAAAAAAHVSPU/CQBh+C6UcsDqw6s6kkwsU+kUCLQGilIUccDQN1zZpC8Sf4OjkzyHGxDg6uDsbf4Fx8Q6ODzXe9LzPPc9z9753RYAslGwckCs/8ceUAHCmUMcJ6VCcijrXCzClDEpZkA0/FrSsxkEiHM1wuU9gKqWN4zmJt0XepNHKDz0uLUJRX1ASq6FHSRFQSzf6o5ZuKiAN1ndv5tlrbcSwC2IxPNzxzCxbuqpxbfXz9KuvVcpcWyvs8bD6vsWwy1a77U3203X547az/JMteJ5ddzSXa4/2f2h3mGkL3aZpHcJfHjr3z6j+21A9hAuD6LT6T6c7fnMEGykJ0yi+QZBrWHqvD7Lt2LoYAoKMP4WTwA/JJMaz9NKL6HQ0ptFkLjF9tAhTKQOKhgPs8UdBkHcMw1JtbRuDALXVpn1MyOx2vX1h6Lo4kXll/kdgM9RoglM/ChVAg4ozmyUkPXSAhoJaP57zVWOUK6haaUvlIOviVeOCO74BzQywtYACAAA= + Block: + '0': + X-Offset: 0.0 + Y-Offset: 0.0 + Z-Offset: 0.0 + Type: FLOWER_POT + Data: 0 diff --git a/src/Models/HumanSkeleton.yml b/src/Models/HumanSkeleton.yml new file mode 100644 index 0000000..77399ca --- /dev/null +++ b/src/Models/HumanSkeleton.yml @@ -0,0 +1,25 @@ +HumanSkeleton: + system-ID: HumanSkeleton + name: '&cHumanSkeleton' + material: 383 + glow: false + lore: '' + crafting: + disable: false + recipe: XAX,XOX,XOX + index: + X: 0 + A: 397 + O: 352 + creator: ff5f37d0-c1ea-4736-b6c3-ebbfdd67a810 + PlaceAbleSide: TOP + ProjectModels: + ArmorStands: + '0': H4sIAAAAAAAAAI2Sv0/CQBTHX6GUUhNnVt3ZnFyw0F8YaAkQoSzkwCtpbK9JWyBubsbRv4jN2cFdJx3cTYyLd/QK/oiJN733fe993r13pwAUYc9GIT7zE38aYACmVBoowd0Apdwv9UMUBJktGn7MZVGNw4RXtMhySxCKIHVQfIHjzCmbQbTyyZylKqDoiwDHKpkHWAG5rRuDSVs3JRBG69tH8/DhZEJtF/ih9jjXabFo6arGcr/Ev+XmNuRstdfZsO+G1deb7vIXm+uM3XA095/sSq9lWjv487B6+qJd/yyovx98DLRadVfAJ63/MWmub1rQlWKSRvGlDKWmpfcHINqOrcvZEnKn7BiGpdrcp1N31JbNBBkK/jnshz7Bsxh56fE0IligqGhBUqEAkoZCNGfvRYn0Xv0t3tB13ouF2O/I1hnNUOpHRAJ5VHM8L8Fp/Sm/uzzOpfut5HJp/eaxc1WCootWzSMW/gT/RLPVegIAAA== + '1': H4sIAAAAAAAAAI2Sv0/CQBTHX6FAqYkzq+5sTi5Y6bXFQEuACGUhB15JY38kbYG4uRlHRzf/EzYTd3c3HNxNjIt37RV/xcQ3vfe99z7v3ruTAYqwY2KfnLqxO/UIAFOqxzgmXQ8nPC71fex5mS9qbsRlUYn8mFe0guWWIBSh3MHROYmyoKJ74coN5ixVBhktPBIpwdwjMkhtpA0mbaSXQRitb570/cejCfVt4Eb9ca7TYtFAispyv5x/y819yNlKr5Oy74e1l+vu8heb64x9bKn2P9nVXks3tvDGZlg7eVavfhY03vbeB2q99lnAJ238MWmupy3oSkmQhNGFBKWmgfoDEE3LRFK2hDyoWJpmKCaP6dQdpWUyQYKCewa7vhuQWYSd5HAaBkSgqHARJEIByir28Zy9FyXSe/W3eA0h3osdsd+RrTOc4cQNgzJIo7rlODFJ1hsnNSqNc+nhltkdlexcek2TLktQtPGqecCm/QBvdvREegIAAA== + '2': H4sIAAAAAAAAAI2Sv0/CQBTHX6GUUhNnVt1JTHRywUKvLQm0BIhSFnLglTT2R9IWiJuro38Rm7OJ7v4B7ibGxTt6hxpD4pve+977fu7eazWAMhw4OCKXQRbMQgLAlFoLZ6Qf4pzXlWGEw7DIZTNIuSzraZRxRyde7QhSGZQeTm9IWhRVK0zWQbxgrRpoaBmSVI8XIdFA7SJzNO0iSwFpvHl4tY5fLqY094AHzSdCp2bZRrrBen+c/+oVOQi2Puht2Y9X9bf7/uoPm+uM3XIN75/s2qBj2Tv4PkPz4+hzZDTq3wY+aXPPpELfXkFXSuI8SW9VqLRtNByB7LgOUosliKLqmqatO7ymU/f0jsMEFUrBNRxGQUzmKfbz81kSE4mikmWcSyVQDBzhBftelEjfNdzhTYT4XeyI/R3FOpM5zoMkVkAdN1zfz0i+eRJvVydCej5lcUIlT0jvPou7CpQ9vG6fMccXLT5/13oCAAA= + '3': H4sIAAAAAAAAAI2Sv0/CUBDHr1BKqYmTA6vubA7GBQv9RQItAaKUhTzwlTT2R9IWiE6sjv4jTu7ExcnRXZ11NjEuvkdfwR8x8aa777v73Lt7TwLIw5aJfHzsxu7IwwBUKdVQjNseSlhc6PrI81Kf19yIybwc+TGraASzNYHLg9BC0RmO0qCoe+HcDSY0VQJJnXo4koOJhyUQm6rWGzZVXQCuv7x61PcejobEt4EZ8QeZTop5Q5UVmvvl/Ftu5kPGljutFfvupPxy2Z79YjOdsmuWYv+TXeo0dGMDf7rtHFRi/LOg+r770VMq5U0Bm7T6x6SZvmpBVoqDJIzORSjUDbXbA960TFVMl5AFRUvTDNlkMZm6JTdMKoiQc09h23cDPI6QkxyOwgBzBBVOg4TLgaAgH03oexEiuVd3jddUlfWiR/R3pOsMxyhxw0AAsV+xHCfGSfXm4lm/3lkQacCk5ev9yohkZ9KbQ21RgLyN5vV9Ou0ncaB5FnoCAAA= + '4': H4sIAAAAAAAAAI2Sv0/CQBTHX6FAqYkzq+5sTi5Y6C8MtASIUBZy4JU0ttekLRA3N+Popv4zbP4F7o4OTi4kxsU7egV/xMQ3vfe5977v3ruTAfKwZ6EAn3mxN/ExACPlOopxx0cJjwu9APl+6ou6F3EsKlEQ84omWWwVhDwU2yi6wFEalAw/XHpkxlJlkLW5jyOFzHwsg9TS9P64pRlFEIar22fj8OlkTH0HuFF/lHFaLJqaorLcL+ffcjMfMm2l295oPw4qrzedxS9tzpl23Vadf2qXu03D3ImvB5XTF/X6Z0Ht/eCjr1YruwI+ae2PSTO+aUFXikkSRpcSFBqm1uuDaNmWJqVLyIKSreumYvGYTt1WmhYDEuS8c9gPPIKnEXKT40lIsEClwjlJhBwUVRSgGXsvqkjv1dvK65rGe7Ej9jvSdYZTlHghKYI0rNquG+Ok9nbP7IGiEUerFN1R5GRo7TK7KkDeQcvGEZv2E+IurhJ6AgAA + '5': H4sIAAAAAAAAAI2Sv0/CQBTHX6GUUhNnVt3ZHIwLFnptSaAlQJSykAOvpLG9Jm2BuLk6uqn/DHHxL3DX1bibEBfvaIu/YuKb3vvce993790pAEXYsXBATrzYm/gEgJNKA8ek6+Mki0v9APt+6ou6F2VYVKMgzipadLFVEIogdXB0TqI0KBt+uPTojKcqoKC5TyKVznyigNxG+mDcRoYEwnB1/WTsPx6Pme9AZswf5ZwViyZSNZ775fxbbu5Drq32Ohvth9Pq61V38Us741y7YWvOP7UrvZZhbsXrz/e9w1pMfhbU13vvA61W/SzIJq3/MWnONy3YSglNwuhChlLTRP0BiJZtITldQh6UbV03VSuL2dQdtWVxIEPBO4PdwKNkGmE3OZqElAhMKpzTRCiApOEAz/h7MUV2r/5WXkco68WP+O9I1xlOceKFVAJ5WLNdNybJ6uWW2x1DoxytN+iGISdHby63yxIUHbxsHvBpPwBBUJlMegIAAA== + '6': H4sIAAAAAAAAAHVSv0/CQBR+SIGjDq6sujPp5FILbQEDhQCRHws58SAN1zZpC8TBxM04OvmPGFd0QRcTY9wdHBzcTYyLd+X4ocY3vffd933v3ruTAaKwbmKbHFi+dUgJAEeSGeyTCsWBqGM1G1M6yyXD8gQsqZ7tC0XBGS0cIlGIl7A3IN6sSOSoO7acPqfKIOtDSjzV6VMiAyrqRr1T1HNxiDQnFy+5ree9DstbIILl7TnOxFJeV7WQ+7n5VdfSKc5VHuSnu6lyEnKvG6n9N+0M5t5qtRTyp43U+3ll9Mdb4Nw7U9ZanLty/oM7zxk3WS3k8kvzx9vK5T3K/BYoS3MhEJMq/0w6x8MWbKXECVzvGEEsm9drdZDMsqmLJSBYs45gw7Yc0vVwL9j1B0NKI4zqDp0gsgZxDdu4z98DQaJsGHnV1GYOCFBJLZirgMQuVlsUhq6LZkwr8e8B4T7dLg4s14kDaqbLvZ5PAuV1m8cOg9oCulnMg1oCmnz0eJzGINrC4+wVP/4G8uiS6HsCAAA= + Block: '' diff --git a/src/Models/SleepingBag.yml b/src/Models/SleepingBag.yml new file mode 100644 index 0000000..700081a --- /dev/null +++ b/src/Models/SleepingBag.yml @@ -0,0 +1,22 @@ +SleepingBag: + system-ID: SleepingBag + name: '&cSleepingBag' + creator: ff5f37d0-c1ea-4736-b6c3-ebbfdd67a810 + material: 383 + glow: false + lore: '' + PlaceAbleSide: TOP + crafting: + disable: true + recipe: XXX,AOA,AAA + index: + X: 0 + A: 35 + O: 355 + ProjectModels: + ArmorStands: + '0': H4sIAAAAAAAAAHVSPU8CQRCdg+NY8AdIqz2JiVY2eHBfJHBHgCjQkBX2yMX7MHsHxM7W0sqfQ2yMpYn2/gB/gdq4C3tAMEw18/a9NzuzWwTIwoGNA3Lpxd61TwA4UqjimLR8nPBaykKuE2DfX53JhkcFTVZpEAtFPZytHZhCaWJ6Q+iqyJt+NPfCCacWoahPfULVcOKTIqCGbnSHDd1UQOotHj/N44+LIcv7IILlgxRnYtnSVY1zK99Hv12tXNrlpjmk3mq7ufR+uSp9PbRm/7wFzr2rjtbn3K3zfd6Fdt20NuZvz62nV1TdFVQ25kIgJq3smTTFly3YSkmYRPQOQa5m6Z0uyLZj62IJCDLeGA4DLyQjit3k3KNROEwovh1HEZWYJJqGiZQBRcMBnvB3QZB3DMNSbW3lhAA11bq9Dcjsgp11Yei6aMq0Mv8mq71GI5x4UagA6pUd141JshkCDQRUeT/lccKgvoAWPy6P+xxk+3heO+OKP0G9ZpWDAgAA + '1': H4sIAAAAAAAAAHWSP0/CQBjG30opR10cWXVnkskFCv1HAi0BopSFHHiQxvaatAXiR3B08uMQF+Po4O4HcHQyLF7bKxAMN73v757nubu3lQEKcG5hn9y6kTv1CEBCyk0ckZ6H46QXClAc+Njzsj1Rd0MuE5XQj7ijTVe7BOaQujh8IGHWlAwvWLt0kUhlkLWlR0KFLjwiA+po+nDS0QwJhNHm+cu4+mxMWO0AX6we55yZRVNT1FT7e7kdqtXKsTavIc9W+t1U/3ZX+X7qrf5lc55kN23VSbQH+6eyy/22Ye7DP157L++oeWyo78O5gb+0fuKlOU+PYCMlNA7CRwTFlqkNhiBatqXxISA4c+/hwncpmYV4Ht9MMaUkFJg2WNJYOANJxT5eEPZ1EJRsXTcVS80iEKCu0rYOgchuNtg1uqbx05hXTP6PbKDBDMduQCVAo6o9n0ck3t8ejTnabK+TVWPIydFPihpFKDh43aoljj++OOdrfAIAAA== + '2': H4sIAAAAAAAAAHVSu04CQRS9wLIMa2NhQas9nZUNLOwDElgIEAUaMuBANu7OJrMLxPgFllbqT/gLxMZYWtgbS2NnZ2ycYYeHGqe698w55z5mNIAU7DjYJ8du6A49AiCQbAmHpOnhSOSJFKTbPva8+E6xXCZpis78UCqqdLZ24Aq1jtkZYXGSsb1g7tKJoGqgmVOPMJ1OPKIBqplWZ1AzbRUS3cXVi33wXBzwuAfy8Li/wrlYqZi6seR+7n91jHxOcIvZddxf6WDlrbfqS/7DSe79sjn74y1x4V1qGD3B3br/wd3yzraqdmVj/nTfvH5Epd+CwsZcCuSkhX8mXeHLEnylhEYBO0eQLlfMdgcUp+GYcgkIku4p7PouJSOGx9HREFNKWIJzgymNEklQDezjCeGvgyDTsKyK7hixBQJU16vONqDwztrrxDJNWY1rFfE/4oUGIxy5AVUBdfON8Tgk0aZ71JdQ4e1WnBsO9SS0+Hi17/YuIA2pHp6XD4XiG1rfG5t8AgAA + '3': H4sIAAAAAAAAAI2RwU7CQBCGx1Cg1BfwLFebgLCFeMEi25aEFgJEKReymC1pLG3SFoiP4NGTj0O8GI8evPsAvoEnW7oFlJi4p///dubfzKwAkIFjg8zptR3YU4cCxKTQJAHtOSRkPjuYE8dJNKfYPsOc7M8D1tF2l9uEowzkdOLfUT8xedXxVrY7i0sFEPDCob7szhwqAN/BynDSwWoOjkbrxw/19P1yEmkT2In0OOVRM6dhuRXX7t3/qE01pNlyX99kv9ycfD70lgfZjMfZzW7L/Gd2od9WtV3423Pv6ZVv/m5o7MJZA5u08cekKd88Ea2UuqHn3/OQvdLwYAic0TUwnywhNfmuomiysfW8LreNfcBFbw62RsGY5UDk4p+Hs6LuLdzwolKqSOVqCYkISUisolpNnNbPLRGRSpnUpbolIVSM1+rdktD23BzwI7FrWQENdzPw40NkMrT+SlAWMiZZJfobjtWVooICAAA= + Block: '' diff --git a/src/Models/SnowGolem.yml b/src/Models/SnowGolem.yml new file mode 100644 index 0000000..5b819ef --- /dev/null +++ b/src/Models/SnowGolem.yml @@ -0,0 +1,31 @@ +SnowGolem: + system-ID: SnowGolem + name: '&cSnowGolem' + creator: ff5f37d0-c1ea-4736-b6c3-ebbfdd67a810 + material: 383 + glow: false + lore: '' + PlaceAbleSide: TOP + crafting: + disable: true + recipe: xxx,xxx,xxx + index: + x: '7' + ProjectModels: + ArmorStands: + '0': H4sIAAAAAAAAAI2SMU/CQBTHX6GUoyZODs7ubk4uWOi1JYG2AaKUhZx4kMb2mlwLRL+Bo5Pfwq9AXIyjg4mjcfZL2NIroMTEm9773/v/3t27UwHKsGeTkJ77sX8ZUIBMqTVITN2AJCKv9EISBHksGz4XsqzxMBaOFpuvCVIZlA7h15TnSdUMooXPplmpCiqeBZRrbBpQFVAbG/1RG5sKSIPl/Yd59HY2SmMPxErjYaGnZtnCmp7Vbu3/qC1iKNhat7NiP18cft258x220DN2w9G9f7Jr3ZZpbeCvT+7DC2r8NtQ3cGEQN63/cdNCX7VIR0pZEvEbBJWmhXt9kG3HxmIICEr+FeyHPqNjTibJacyihZRWRjOWSCVQdBKSafYcCKqOYViarecABKijtextQU7P1VsnBsaiV+qVs9+RjzMak8SPmAJocOxMJjFNNmdHw13JE9Ly/fHg9tOCCpQ9smieZNvfFtccXXoCAAA= + '1': H4sIAAAAAAAAAI2SMU/CQBTHX6GUo64Ozk4ubk4uWOi1JYGWAFFKTMhRD9JwbZO2QPwITsbJj2N0MI4O7n4AXd29whVQYmKn9/73//+u77UqQBH2bBLQcz/xR4wCZEqlRhLaZiQVfakbEMZ4KRVBNvxYyLIWB4lINML5msBdSovEUxqvmrLJooUfTjKrCiqeMRpr4YRRFVATG71hE5sKSP2Hu3fz8O1syGsXxMPrQa7zsGxhTc+8W+c/vHkNOVvrtJbs54uDj5v2fIct9Ixdc3T3n+xKp2FaG/jrY/v+BdV+B6obuAiISat/TJrryyv4SmmYRvE1glLdwt0eyLZjY7EEBAX/CvYDP6ReTMbpqRcRNhyxyJtK3B/NwlQqgKKTgEyyj4Kg7BiGpdn6CoMAtbSGvS3I/O2668bAWNzIs3L2j6yWGnkk9aNQAdQ/dsbjhKabCdBgV3KFVP08+nq6vYQSFF2yqJ9kx9+x6Ko+gAIAAA== + '2': H4sIAAAAAAAAAI1SPU8CQRAd4IDjbCwsaLWnNybmPGDvjgTuCBAFGrLiQi7eh1kOiP4BY+lvMLH0L2CFrTEmlkZbK0tj4y63h18xcas3b2be7JtdBSAFKxb2yK4zcvZdAsCZXBGPSN3FoYjTTQ+7boQl3aGCljTqjURHxZ8sFRIpyNQwPSQ0SmYNN5g6/pBHCiho7BKq+UOXKCBXkd7qVZGRgUR7dv5obNzv9BjugDgMd2OeNUsm0sq89kv+W22MIdbWGrWF9nwv/3JWn/zSFjzXLtrlzj+1c42KYS7F1bf191a5kP/ZcC29Xs43b9XPBuFU/cNpzC9GsJUSPwzosQzpkomaLZAs20JytIQ4yNq6bmqWiJnrmlaxOCFD0jmAVc/xSZ/iQbjVx5QGYYKJBWM/TCQhU8YeHvIXY5rsZs3lAB0hMY2n+P+IFhr0cegEfgbkdsEeDEYkVJ+Nq7WTJ5NR3Zi6UbaPLh6YIbkjqNld5DENqQ6elk45/gAzS3PIfAIAAA== + '3': H4sIAAAAAAAAAI1Sv0/CQBR+hQIFVwdW3RldXGqhv0igECBKcSBHvWLDtU3aAnFjMxoXR/8E/wFXNv8Cd2dj4mLi4uIdXPFXTHzT97773vfuvbsSQBa2LOTjQy/2RgQDMKZYRTFuE5TwPNf1ESEUClkQdS/itKhEfswr6sFs40BV+SaKJjhaJwWDhHMvGDNpCUralOBICcYEl0BqaHpv2NCMPAj95fWjsftwMKTYBh4UD1KeFoumpqhM++X8mzbFkHornebK+/6o/HzRnv3y5jzzrrZU+5/exU7dMDfm8uvVnnJ5/PazQH7aee+plfJnAZ9U/mPSlF+1oCvFQRJGZxLkaqbW7YFotSxNWi8hTQotXTcVi+d06qZStxghQcY7gW3fC7ATITfZd0JEhiMSOhOBGobTIBEykFeRj8bs1agvvV1300TXNN6RHbE/sl5q6KDEC4M8SP1Ky3VjnMh3LotTSg04tby9YbGglJ2qXlaqRQ6yNprXztnMH1CoJRqAAgAA + '4': H4sIAAAAAAAAAI1Sv0/CQBR+hQIFVwdW3RldXGqhv0igJUAUcCBHvZKGa5u0BeLGZjQujv4J/hVsTo4Obs7GxMXExcU7uOKvmPim7333ve/de3clgCxsWcjHh17sjQgGYEyximLcIijhea7jI0IoFLIg6l7EaVGJ/JhX1IPZxoGq8k0UTXC0TgoGCedeMGbSEpS0KcGREowJLoHU0PTusKEZeRB6y6tHY/f+YEhxH3hQPEh5WiyamqIy7Zfzb9oUQ+qttJsr79uj8vN5a/bLm/PMu2qr/X96F9t1w9yYy6+Xe8rF8dvPAvlp572rVsqfBXxS+Y9JU37Vgq4UB0kYnUqQq5lapwuiZVuatF5CmhRsXTcVi+d06qZStxghQcY7gW3fC7ATITfZd0JEhiMSOhOBGobTIBEykFeRj8bs1agvvV1n00TXNN6RHbE/sl5q6KDEC4M8SL2K7boxTuSHu1VQasCp5c01iwWl+qnqxWWxyEG2j+a1MzbzB6ceId+AAgAA + '5': H4sIAAAAAAAAAONiYGBm4PZLzE0NyyzOTMpJZWAAiXA6JRanBuQklkD5rMG5iTk5QCYjMwOLW2YRVJjFsSi3GKrDM68MbgJQFZtvYlF2ahGEw+6ek1+emZcOUsrFwOVampNa5JiXnpPKxcDh4+oWEu/j6s7GwBixf+J9d6UrDvFAdiQDFADZUTBxoGYWD1dHF5BaJHkUtTA2A8xsxyBfsNnHwiVedwaUYZgNFQeZ7eTvEkmk2ZxBnu4ecMPtP/eYOnZFf0PXYP9S8XeIi64EQgPUp/Y4fAoTB1sBDNLUvJL8okoOBlZnD9fgEAYWP38/Vw5IIMA47P5ubh6OflA+0Ne+jp5+IAEOBqbMFAaR3My81OSixLQSq+T8xJz4pJz85GxGoIH5pXkljEwMbC6JuYnpoFgDmgt0XTDcEjdXV6iNIClQGoEEan5yYklmfh4bA0eErn9aWnFqif3p61y2BYtvAIWiYEKHjUHAASgUCRM6ORMIZjGwMjBHJpY7t4P8DACCnqRBgAIAAA== + '6': H4sIAAAAAAAAAI2Sv0/CQBTHX6VAqasDq+5MxsXElEJ/QAItAaIUB3LgQRqurSkF4l9gNC6OuvqHMJiYGFcT3ZyNo4mLi3dwxV8x8U3vfe6977v37mSABKxayMO77sjtEgzASKaARrhGUMTjZMNDhFBXSIBouCHHohp6I15R9idLBZqVqqJwiMNFkDZJMHX9AUuVQdbHBIeqPyBYBqmiG81ORTdTILRm50/mxn2+Q30HuFG/HXNaLJZ0VWO5X86/5cY+xNpqvTrXvtnLvpzUJr+0OWfaBVtz/qmdqZfN0lJceT3bUk/3334WKM/r700tl/0s4JMqf0wa83kLulLsR0F4JEGyWNIbTRAt29KlxRLiIG0bRkm1eEynrqpliwEJVtwDWPNcH/dC1I+2ewEinS4JekOBCgZjPxJWIKUhDw3Yq1FdervGsomh67wjO2J/ZLHUoIciN/BTILVydr8/wpFy9yDvHF49UtSO0fUmszxFDkez2wtql5CEhIOmxWM28weu3lUqgAIAAA== + '7': H4sIAAAAAAAAAONiYGBm4PZLzE0NyyzOTMpJZWAAiXA6JRanBuQklkD5rMG5iTk5EDaLW2YRVJjFsSi3GKrDM68MbgIjMwObb2JRdmoRhMPunpNfnpmXDlLKxcDlWpqTWuSYl56TysXA4ePqFhLv4+rOxsAYsX/ifXelKw7xQHYkAxQA2VEwcaBmFg9XRxeQWiR5FLUwNgPMbMcgX7DZx8IlXncGlGGYDRUHme3k7xJJpNmcQZ7uHnDD7X8q/g5x0ZUAaUBiR9l/7jF17Ir+htAA9ak9Dp/CxMFWAIM0Na8kv6iSg4HV2cM1OISBxc/fz5UDEggwDru/m5uHox+UD/S1r6OnH0iAg4EpM4WBPzczLzW5KDGtxKq4JDM5mxFoVn5pXgkjEwObS2JuYjoowoBGAh0WDDffzdUVahlICpQ8IOGZn5xYkpmfx8bAEaHrn5ZWnFqy/3Or3I7A161AoSioEMI/HJFQIfuVM4FgBgMrA3NkYrmzCUgaABaa9CV7AgAA + '8': H4sIAAAAAAAAAONiYGBm4PZLzE0NyyzOTMpJZWAAiXA6JRanBuQklkD5rMG5iTk5EDaLW2YRVJjFsSi3GKrDM68MbgIjMwObb2JRdmoRhMPunpNfnpmXDlLKxcDlWpqTWuSYl56TysXA4ePqFhLv4+rOxsAYsX/ifXelKw7xQHYkAxQA2VEwcaBmFg9XRxeQWiR5FLUwNgPMbMcgX7DZx8IlXncGlGGYDRUHme3k7xJJpNmcQZ7uHnDD7X8q/g5x0ZUAaUBiR9l/7jF17Ir+htAA9ak9Dp/CxMFWAIM0Na8kv6iSg4HV2cM1OISBxc/fz5UDEggwDru/m5uHox+UD/S1r6OnH0iAg4EpM4WBPzczLzW5KDGtxKq4JDM5mxFoVn5pXgkjEwObS2JuYjoowoBGAh0WDDffzdUVahlICpQ8IOGZn5xYkpmfx8bAEaHrn5ZWnFpi/7lVbkfg61agUBRMaOdMEGgACkXChFaCRGYwsDIwRyaWO28BeRcApP8+znsCAAA= + Block: + '0': + X-Offset: 0.0 + Y-Offset: 0.0 + Z-Offset: 0.0 + Type: SNOW_BLOCK + Data: 0 diff --git a/src/Models/TV.yml b/src/Models/TV.yml new file mode 100644 index 0000000..00570ff --- /dev/null +++ b/src/Models/TV.yml @@ -0,0 +1,27 @@ +TV: + system-ID: TV + name: '&cTV' + creator: ff5f37d0-c1ea-4736-b6c3-ebbfdd67a810 + material: 383 + glow: false + lore: '' + PlaceAbleSide: TOP + crafting: + disable: false + recipe: XXX,XEX,0A0 + index: + X: 171 + E: 69 + A: 148 + '0': 0 + ProjectModels: + ArmorStands: + '0': H4sIAAAAAAAAAI2SzU7CQBDHp1BgqS/g2YtefAEvWOwXCbQEiFJi0qywlMZ+kG2B8AiejCcfh+jBePTg3ZMn757d0i2gxsQ9zfx3/r/dmV0JoAh7Jg7IuRd7Vz4BSJVqHcek7eOE56VugH2fhUIRRM2jXBZlGsTc0QjnGwKrKrcwvSY0Syq6Hy280E1LJZDUmU+oHLo+kQA1Va3nNFW9DEJ/dfemH7yeOiy2gS8WD3KdmUVDlZW0dmf/W20eQ86WO601++li/+OmPf/F5nrKrluK/U92tdPQjS385aF9/4zqPw21LZwbeKe1PzrN9fURbKQkTCK6RFA6M9RuD0TTMlU+BAQFbwSHgReSIcXj5GRC8HzpLIjnThIycqaUxPGMEmeavqPAENEsTIQClBUcYDd9JwQVS9MM2VQyMgLUkhvmriCyC3c3iaaq/BLMK6bfJptzNMSJF4VlQP1jazyOSbJtCg1+SzaXVu+Pt5dHn1CCoo0X2fYX1/Pt1ZMCAAA= + '1': H4sIAAAAAAAAAI2Sv0/CQBTHX6GUow4uDs7uJiY6uUCh15YEWgJEKQs58SCN/ZFcK0T/A0cn/wv/BeJiHE10N87+D8YrvQJqTLzpve+97+fdvTsVoAhbNgnoiRd7Zz4FSJVKncS045NE5KVeQHw/i2XDY0KWNRbEwtEMZyuCVASlTdgFZVlSNv1o7oXTtFQFFV/6lGnh1KcqoBY2+qMWNhWQBovbN3PvtTbisQti8XiY69wsW1jT09qN/W+1eQw5W+u2l+zH092Pm87sF1voKbvu6O4/2ZVu07TW8OeHzt0Tqv80VNdwYRA3rf5x01xftuAjpWESsSsEpYaFe32QbcfGYggICt45bAdeSMeMTJJjn84ok3hpdBkmUgEUnQRkmr4HgrJjGJZm6xkBAWprTXtTkPnBeqvEwFg04145/R7ZPKMxSbwoVAAN9p3JJKbJ+vBoKKTFy2G6Drjk5tLnzvW7eV8rQdEl88ZR6vgCQQ3D9nsCAAA= + '2': H4sIAAAAAAAAAHWSPU/CUBSGD1DKpQ46Oml0Z3MyMbXQLxIoCESBhVzxQhr7QUqB+AMYHJ3cXPwTbMTFODoYHR2cDL/AuHhLb4FguNM5b9/3uT0nVwBIwJaBbXJu9s1LiwAESjqL+6RsYZ/1yaqNLSusOdX0mMxJnt1nibwzXBBiCeCL2LsmXtikNMsdmU43sAogKAOLeJLTtYgAqKCotVZB0XiI1ad3n9rh22mL1g1gh9bNSKdhTlckOfCKPwe/NTmzu+6NaojYUqU4Zz9f7M5uy8N/bKYH7GxJbgTele+b2OlKXtOX8Nen8v0Lyq4HxCWcBdik4oZJI31+BV0pcXzXu0GQzOlKtQacUTIUtgQEcfMKdmzTIW0Pd/zjNvZ6xI9Rrztw/FgceBnbuEtgGxCkSqqqS4YcIhCgopQ3VgWO/ll10aiKwm6jWS54H+FC3Tb2TdfhAdUzpU6nT3zx60M46T2+U6nJpOnD5Gw23qcDoUYkfc/Ge5MKJCHRwKPcUTDvH4lSaY18AgAA + '3': H4sIAAAAAAAAAHWSP0/CQBjG30IpRx10ZNLozubkgoVeWxJoEYhSFnLiQRr7x7QF4gdgcHRy83OwERfj6ODubPgExsWWXoFgvOl9n3ue3929OREgC3s6ceilFVjXNgWIlUKFBLRpk5D1ubZDbDupecXymcxLvhOwRM2drAlcFoQG8W+pnzR51famljuKrSKIeGxTX3JHNhUB1bHS6dexKgDXXTx+qicf5/2oNoGtqO6lehTmNSzJsbf8ffzTkUvFXW9aQ8qWWo0V+/WquHxoTv6wmR6zK4Zsxt6t/f/YhVZN1Tbw95fm0xuq7AbKGzgLsJeW/3lpqq+OiEZK3dDz7xHkqhpud4DXDR2zISDIWDdw4FguHfhkGJ4NiH9HQy7yemM35DIgyMQhIwr7gCBvKIom6XKCQIAaUk3fFvjoZu11o2DMTouyfPw/koF6AxJanisA6paM4TCg4eb2qMekxfP8Yjk7iiUzlb6Ws8N5C3KQNcm0ehonfgEL1WB4fAIAAA== + '4': H4sIAAAAAAAAAHWSP0/CQBjGX6DAUQcdnTS6szmZGCz0WkigIBAFFnLiQRr7h7QF4gdgcHRyc/FLsBEX4+hgwujgZPgExsUrvQLBcNP7Pn2e3/V9cyJADHY0YtJL3dWvDQrgK6kscWnFIB7v4zWTGEZQC4rucFmQHNPliYI1XBIiMUiUiHNLnaBJqoY90q2ebxVBxAODOpLVM6gIqIiVeruI1QREGtOHT/X447zN6ibww+pWqLOwkMeS7HszP0e/dTm9v+kNawjZUrW0YL9e7c/vK8N/bK777GxZbvrete/b2KlqQc2v4O8vlcc3lN0MZFZwHuCTZrZMGuqLK9hKqeXZzh2CeC6Pa3UQtLKG+RIQRPUb2DN1i3Yc0vVOO8TpUy/CvPbA8iJRSMjEJD0Ku4AgWVaUvKTJAQIBKkkFbV0Q2J/Vlo2CMb+NZQX/fQQLtTvE020rAaiRLne7LvWmXzPxrP88Y1IrlJ4mF/PxIRsINUPpez4+mFQhDrEmGeVO/Hn/ACjIAkt8AgAA + '5': H4sIAAAAAAAAAHWSPU/CUBSGT6HApQ46Mml0Z3MyMVjoByTQIhAFFnLFC2nsB2kLxB/g4Ojk5uKfYCMuhtHB6OjgyC8wLt7SWyAY7nTO0/d9b8/JFQDisKNhi1wYnnFlEoCApPPYI1UT+6xP1C1smmHNK4bLMC+6lsccJXu0TODikKxg94a4YZNSTWds2P1AKoAgD03iinbfJAKgsqw0OmVZTQLXnD58qUfvZx1at4AdWrcjTs18URalQJv7OfxtSNnMpjaqIcoWa5VF9utlZn5fHf3LZjzIzutSK9Cufd+Wna6V1OIq/O2l+jhD+U1DbhXODGzS3JZJI764gq6U2L7j3iJIFIpyvQG8pmsyWwKCmHENe5Zhk66Le/5JF7sD4nNU6wxtn4tBUsIW7hPYBQQpXVGKoiaFEQhQRSxp64Cnf1ZfNooss9uolw/eR7hQp4t9w7GTgJpZvdfziJ/7/hROB88fFLUZmj5Nzud3B3Qg1IrQjJL9CSQg3sLjwnEw7x8rlOVYfAIAAA== + '6': H4sIAAAAAAAAAHWSP0/CQBjG30IpRx10ZNLozubkgoVeWxJoEYhSFnLiQRr7x7QF4gdwcHRy83OwERfD6ODuB+ATGBdbegWC4ab3/d3zPHf35kSALBzoxKHXVmDd2hQgJoUKCWjTJiHrc22H2HZS84rlM8xLvhMwR82drBO4LAgN4t9TP2nyqu1NLXcUS0UQ8dimvuSObCoCqmOl069jVQCuO3/5Vs++LvtRbQJbUd1LeWTmNSzJsbb8c/rbkUvFXW1aQ5ottRqr7I+b4vK5OfmXzXicXTFkM9Zu7e/LLrRqqrYJ/3xvvi5QZddQ3oQzA3tpec9LU746IhopdUPPf0SQq2q43QFeN3TMhoAgY93BkWO5dOCTYXgxIP4DDblI643dkMuAIBOHjCgcAoK8oSiapMtJBALUkGr6NuCjm7XXjYIxOy3y8vH/SAbqDUhoea4AqFsyhsOAhpvbox5D87fZ1fLpJEZmihYROZ5BDrImmVbPY8cfqRPsrXwCAAA= + '7': H4sIAAAAAAAAAHWSvU4CQRSF78ICw1poSaXRns7KxODC/kACCwJRloaMOJCN+0OGBeIDWFha2dn4EnTExlBamFBaWPIExsZZmAWCYap7vz3nzN6bkQCisGdgh1xZfevGJgABSWZxn1Rs7PM+VnOwbS9rUbMox6JMnT53FNzhKkGIQryE6R2hyyah297IcruBVAJJHdiEym7XJhKgoqrVW0VVj4PQmDx96SefFy1Wm8APq5shZ2Yxr8pKoM38HP/WlXRqWxvWEGbL1dIi+/06NX+sDP9lcx5kZ8uKGWg3vu/KTlYLen4d/vFWeZ6i7LYhsw7nBj5pZsekIV9cwVZKXN+j9whiubxaq4NolA2VLwFBxLqFA8dySZvijn/WxrRHfIFpvYHrCxGIK9jBXQL7gCBR1rS8bCjLCASoJBeMTSCyP6utGk1V+W3MKwbvY7lQr419y3PjgBrpcqfTJ/7keyad915nDDVD9DK+nD8csYGQGaIpI4djiEHUxKPcaTDvH4oOjp58AgAA + Block: '' diff --git a/src/de/Ste3et_C0st/Furniture/Main/config.java b/src/de/Ste3et_C0st/Furniture/Main/config.java index 6400c8e..7215754 100644 --- a/src/de/Ste3et_C0st/Furniture/Main/config.java +++ b/src/de/Ste3et_C0st/Furniture/Main/config.java @@ -81,14 +81,6 @@ public class config return false; } - - public boolean isMaps(String folder){ - if(new File(path + folder).list().length > 0){ - return true; - } - return false; - } - public void deleteFolder(File folder) { diff --git a/src/de/Ste3et_C0st/Furniture/Main/main.java b/src/de/Ste3et_C0st/Furniture/Main/main.java index fdab1b7..87a41c1 100644 --- a/src/de/Ste3et_C0st/Furniture/Main/main.java +++ b/src/de/Ste3et_C0st/Furniture/Main/main.java @@ -1,18 +1,21 @@ package de.Ste3et_C0st.Furniture.Main; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.java.JavaPlugin; +import org.bukkit.util.Vector; import de.Ste3et_C0st.Furniture.Objects.RPG.Crossbow; -import de.Ste3et_C0st.Furniture.Objects.RPG.HumanSkeleton; -import de.Ste3et_C0st.Furniture.Objects.RPG.catapult; +import de.Ste3et_C0st.Furniture.Objects.RPG.Catapult; import de.Ste3et_C0st.Furniture.Objects.RPG.flag; import de.Ste3et_C0st.Furniture.Objects.RPG.guillotine; import de.Ste3et_C0st.Furniture.Objects.RPG.weaponStand; @@ -21,30 +24,22 @@ 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.CandyCane; -import de.Ste3et_C0st.Furniture.Objects.christmas.ChristmasTree; import de.Ste3et_C0st.Furniture.Objects.christmas.FireworkLauncher; -import de.Ste3et_C0st.Furniture.Objects.christmas.SnowGolem; import de.Ste3et_C0st.Furniture.Objects.electric.billboard; import de.Ste3et_C0st.Furniture.Objects.electric.camera; import de.Ste3et_C0st.Furniture.Objects.electric.streetlamp; -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.campchair; import de.Ste3et_C0st.Furniture.Objects.garden.fance; import de.Ste3et_C0st.Furniture.Objects.garden.graveStone; import de.Ste3et_C0st.Furniture.Objects.garden.log; import de.Ste3et_C0st.Furniture.Objects.garden.mailBox; import de.Ste3et_C0st.Furniture.Objects.garden.sunshade; -import de.Ste3et_C0st.Furniture.Objects.indoor.chair; 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; import de.Ste3et_C0st.Furniture.Objects.outdoor.campfire_2; @@ -54,30 +49,34 @@ import de.Ste3et_C0st.Furniture.Objects.outdoor.tent_2; import de.Ste3et_C0st.Furniture.Objects.outdoor.tent_3; import de.Ste3et_C0st.Furniture.Objects.trap.BearTrap; import de.Ste3et_C0st.FurnitureLib.Crafting.Project; +import de.Ste3et_C0st.FurnitureLib.Events.FurnitureLateSpawnEvent; +import de.Ste3et_C0st.FurnitureLib.ShematicLoader.ProjectLoader; import de.Ste3et_C0st.FurnitureLib.Utilitis.LocationUtil; import de.Ste3et_C0st.FurnitureLib.main.FurnitureLib; +import de.Ste3et_C0st.FurnitureLib.main.ObjectID; import de.Ste3et_C0st.FurnitureLib.main.Type.CenterType; import de.Ste3et_C0st.FurnitureLib.main.Type.PlaceableSide; -public class main extends JavaPlugin{ +public class main extends JavaPlugin implements Listener{ FurnitureLib lib; config c; FileConfiguration file; public static double damage = 0; + public static main instance; static LocationUtil util; public static List materialWhiteList = new ArrayList(); + public static HashMap catapultRange = new HashMap(); + public void onEnable(){ if(!Bukkit.getPluginManager().isPluginEnabled("FurnitureLib")){Bukkit.getPluginManager().disablePlugin(this);} instance = this; lib = (FurnitureLib) Bukkit.getPluginManager().getPlugin("FurnitureLib"); util = lib.getLocationUtil(); - if(lib.getDescription().getVersion().startsWith("1.7") || lib.getDescription().getVersion().startsWith("1.6")){ + if(lib.getDescription().getVersion().startsWith("1.8")){ 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); @@ -95,35 +94,46 @@ public class main extends JavaPlugin{ 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); + + + new Project("Catapult", this, getResource("Models/Catapult.yml"), PlaceableSide.TOP, ProjectLoader.class).setSize(3, 2, 3, CenterType.RIGHT).setEditorProject(false); + new Project("HumanSkeleton", this, getResource("Models/HumanSkeleton.yml"), PlaceableSide.TOP, ProjectLoader.class).setSize(3, 1, 2, CenterType.RIGHT).setEditorProject(false); + new Project("CandyCane", this, getResource("Models/CandyCane.yml"), PlaceableSide.TOP, ProjectLoader.class).setSize(3, 4, 1, CenterType.RIGHT).setEditorProject(false); + new Project("SnowGolem", this, getResource("Models/SnowGolem.yml"), PlaceableSide.TOP, ProjectLoader.class).setSize(1, 2, 1, CenterType.RIGHT).setEditorProject(false); + new Project("TV", this, getResource("Models/TV.yml"), PlaceableSide.TOP, ProjectLoader.class).setSize(1, 2, 3, CenterType.CENTER).setEditorProject(false); + new Project("Chair", this, getResource("Models/Chair.yml"), PlaceableSide.TOP, ProjectLoader.class).setSize(1, 1, 1, CenterType.RIGHT).setEditorProject(false); + new Project("CampChair", this, getResource("Models/CampChair.yml"), PlaceableSide.TOP, ProjectLoader.class).setSize(1, 1, 1, CenterType.RIGHT).setEditorProject(false); + new Project("CactusPlant", this, getResource("Models/CactusPlant.yml"), PlaceableSide.TOP, ProjectLoader.class).setSize(1, 1, 1, CenterType.RIGHT).setEditorProject(false); + new Project("SleepingBag", this, getResource("Models/SleepingBag.yml"), PlaceableSide.TOP, ProjectLoader.class).setSize(1, 1, 2, CenterType.RIGHT).setEditorProject(false); + new Project("ChristmasTree", this, getResource("Models/ChristmasTree.yml"), PlaceableSide.TOP, ProjectLoader.class).setSize(1, 1, 2, CenterType.RIGHT).setEditorProject(false); + + addDefault("fence", "whiteList", "config.yml"); addDefault("bearTrap", "damage", "damage.yml"); + addDefault("catapult", "range", "range.yml"); + setDefaults(); setDefaults_2(); lib.registerPluginFurnitures(this); + loadModels(); + + Bukkit.getPluginManager().registerEvents(this, this); }else{ - lib.send("FurnitureLib Version 1.6.x or 1.7.x not found"); + lib.send("FurnitureLib Version > 1.6.x not found"); lib.send("DiceFurniture deos not load"); } } @@ -141,6 +151,16 @@ public class main extends JavaPlugin{ c = new config(); this.file = c.getConfig("damage", "plugin/bearTrap/"); damage = this.file.getDouble("damage"); + + c = new config(); + this.file = c.getConfig("range", "plugin/catapult/"); + for(String str : this.file.getConfigurationSection("rangeOptions").getKeys(false)){ + Vector v = new Vector( + 0, + this.file.getDouble("rangeOptions." + str + ".height"), + this.file.getDouble("rangeOptions." + str + ".width")); + catapultRange.put(str, v); + } } private void setDefaults(){ @@ -160,4 +180,20 @@ public class main extends JavaPlugin{ public static Plugin getInstance() { return instance; } + + public void loadModels(){ + for(ObjectID id : FurnitureLib.getInstance().getFurnitureManager().getObjectList()){ + switch (id.getProjectOBJ().getName()) { + case "Catapult":new Catapult(id);break; + default:break; + } + } + } + + @EventHandler + public void onFurnitureLateSpawn(FurnitureLateSpawnEvent event){ + if(event.getProject().getName().equalsIgnoreCase("Catapult")){ + new Catapult(event.getID()); + } + } } \ No newline at end of file diff --git a/src/de/Ste3et_C0st/Furniture/Objects/RPG/Catapult.java b/src/de/Ste3et_C0st/Furniture/Objects/RPG/Catapult.java new file mode 100644 index 0000000..68ff24f --- /dev/null +++ b/src/de/Ste3et_C0st/Furniture/Objects/RPG/Catapult.java @@ -0,0 +1,157 @@ +package de.Ste3et_C0st.Furniture.Objects.RPG; + +import java.util.HashMap; + +import org.bukkit.Bukkit; +import org.bukkit.EntityEffect; +import org.bukkit.GameMode; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.block.Block; +import org.bukkit.block.BlockFace; +import org.bukkit.entity.Entity; +import org.bukkit.entity.EntityType; +import org.bukkit.entity.FallingBlock; +import org.bukkit.entity.Player; +import org.bukkit.entity.TNTPrimed; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.entity.EntityExplodeEvent; +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.FurnitureClickEvent; +import de.Ste3et_C0st.FurnitureLib.main.FurnitureHelper; +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 Catapult extends FurnitureHelper implements Listener{ + + private fArmorStand stand1; + private HashMap fallingSandList = new HashMap(); + + public Catapult(ObjectID id) { + super(id); + Bukkit.getPluginManager().registerEvents(this, main.instance); + + for(fEntity stand : id.getPacketList()){ + if(stand.getCustomName().toLowerCase().startsWith("#range")){ + stand1 = (fArmorStand) stand; + stand1.setNameVasibility(false); + if(stand1.getCustomName().equalsIgnoreCase("#range")){ + stand1.setName("#range:1"); + } + } + } + } + + @EventHandler + public void onPrimedTnt(EntityExplodeEvent e){ + if(e.getEntity()==null) return; + if(e.getEntity() instanceof TNTPrimed){ + if(fallingSandList.containsKey(e.getEntity())){ + Entity entity = e.getEntity(); + Player p = fallingSandList.get(e.getEntity()); + fallingSandList.remove(e.getEntity()); + Block b = entity.getLocation().getBlock().getRelative(BlockFace.DOWN); + if(!FurnitureLib.getInstance().getPermManager().canBuild(p, b.getLocation())){ + e.setCancelled(true); + e.blockList().clear(); + e.getEntity().remove(); + } + } + } + } + + @EventHandler + public void FurnitureClickEvent(FurnitureClickEvent e){ + if(getObjID()==null) return; + if(e.getID()==null) return; + if(!e.getID().equals(getObjID())) return; + if(e.getID().getSQLAction().equals(SQLAction.REMOVE)) return; + Location loc = getRelative(getCenter(), getBlockFace(), -.8, -1.03).add(0, -.2, 0); + loc.setYaw(getYaw()); + ItemStack stack = e.getPlayer().getInventory().getItemInMainHand(); + if(stack.getType().equals(Material.TNT)){ + TNTPrimed tnt = (TNTPrimed) e.getID().getWorld().spawnEntity(loc, EntityType.PRIMED_TNT); + if(tnt == null) return; + Vector v= getLaunchVector(getBlockFace()); + if(v == null) return; + tnt.playEffect(EntityEffect.WITCH_MAGIC); + tnt.setVelocity(v.multiply(1)); + fallingSandList.put(tnt, e.getPlayer()); + }else if(stack.getType().equals(Material.AIR)){ + if(stand1!=null){ + int x = -59; + String name = "#range:1"; + switch (stand1.getName().substring(stand1.getName().length()-1, stand1.getName().length())) { + case "1": + name = "#range:2"; + x -= 4; + break; + case "2": + name = "#range:3"; + x -= 8; + break; + case "3": + name = "#range:4"; + x -= 12; + break; + case "4": + name = "#range:5"; + x -= 16; + break; + default: break; + } + stand1.setName(name); + EulerAngle angle = stand1.getLeftArmPose(); + angle = getLutil().Radtodegress(angle); + angle = angle.setX(x); + stand1.setLeftArmPose(getLutil().degresstoRad(angle)); + update(); + } + }else{ + @SuppressWarnings("deprecation") + FallingBlock block = getWorld().spawnFallingBlock(loc, stack.getType().getId(), (byte) stack.getDurability()); + if(block == null) return; + Vector v= getLaunchVector(getBlockFace()); + if(v == null) return; + block.playEffect(EntityEffect.WITCH_MAGIC); + block.setDropItem(false); + block.setVelocity(v.multiply(1)); + fallingSandList.put(block, e.getPlayer()); + + } + + if(e.getPlayer().getGameMode().equals(GameMode.CREATIVE) && FurnitureLib.getInstance().useGamemode()) return; + Integer i = e.getPlayer().getInventory().getHeldItemSlot(); + ItemStack is = e.getPlayer().getInventory().getItemInMainHand(); + is.setAmount(is.getAmount()-1); + e.getPlayer().getInventory().setItem(i, is); + e.getPlayer().updateInventory(); + } + + public Vector getLaunchVector(BlockFace face){ + String str = "#range:1"; + if(this.stand1!=null){str = stand1.getName().toLowerCase();} + str = str.replace("#range:", ""); + String level = "Range" + str; + Vector v = new Vector(0, .5, 1.2); + if(main.catapultRange.containsKey(level)) v = main.catapultRange.get(level); + switch (face) { + case NORTH:v= new Vector(0, v.getY(), v.getZ());break; + case SOUTH:v= new Vector(0, v.getY(), -v.getZ());break; + case EAST: v= new Vector(-v.getZ(), v.getY(), 0);break; + case WEST: v= new Vector(v.getZ(), v.getY(), 0);break; + default:break; + } + return v; + } + + +} diff --git a/src/de/Ste3et_C0st/Furniture/Objects/RPG/Crossbow.java b/src/de/Ste3et_C0st/Furniture/Objects/RPG/Crossbow.java index 8270131..d46bde9 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/RPG/Crossbow.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/RPG/Crossbow.java @@ -105,9 +105,8 @@ public class Crossbow extends Furniture implements Listener { @EventHandler public void onFurnitureBreak(FurnitureBreakEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()) return; if(!e.getID().equals(getObjID())) return; if(!e.canBuild()){return;} e.remove(); @@ -116,9 +115,8 @@ public class Crossbow extends Furniture implements Listener { @EventHandler public void onFurnitureBreak(FurnitureBlockBreakEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()) return; if(!e.getID().equals(getObjID())) return; if(!e.canBuild()){return;} e.remove(); @@ -127,9 +125,8 @@ public class Crossbow extends Furniture implements Listener { @EventHandler public void onFurnitureClick(FurnitureClickEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()) return; if(!e.getID().equals(getObjID())) return; if(!e.canBuild()){return;} fEntity stand = getArmorStand(); @@ -148,9 +145,8 @@ public class Crossbow extends Furniture implements Listener { @EventHandler public void onFurnitureClick(FurnitureBlockClickEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()) return; if(!e.getID().equals(getObjID())) return; if(!e.canBuild()){return;} fEntity stand = getArmorStand(); @@ -178,6 +174,7 @@ public class Crossbow extends Furniture implements Listener { case WEST: v= new Vector(1.2, 0.5, 0);break; default:break; } + if(v == null) return; getWorld().playSound(getLocation(), Sound.ENTITY_ARROW_SHOOT, 1, 1); Location start = getRelative(getCenter(), getBlockFace(), 0,0); start.setYaw(getYaw()); diff --git a/src/de/Ste3et_C0st/Furniture/Objects/RPG/HumanSkeleton.java b/src/de/Ste3et_C0st/Furniture/Objects/RPG/HumanSkeleton.java deleted file mode 100644 index 90925e9..0000000 --- a/src/de/Ste3et_C0st/Furniture/Objects/RPG/HumanSkeleton.java +++ /dev/null @@ -1,94 +0,0 @@ -package de.Ste3et_C0st.Furniture.Objects.RPG; - -import java.util.ArrayList; -import java.util.List; - -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.inventory.ItemStack; -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.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; - -public class HumanSkeleton extends Furniture implements Listener { - - public HumanSkeleton(ObjectID id) { - super(id); - if(isFinish()){ - Bukkit.getPluginManager().registerEvents(this, main.getInstance()); - return; - } - spawn(id.getStartLocation()); - } - - - @Override - public void spawn(Location paramLocation) { - List asList = new ArrayList(); - fArmorStand stand = spawnArmorStand(getRelative(getLocation().add(0, -1.4, 0), -.25, 0)); - stand.setItemInMainHand(new ItemStack(Material.BONE)); - stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-40,0,90))); - asList.add(stand); - - stand = spawnArmorStand(getRelative(getLocation().add(0, -1.4, 0), .2, 1.2)); - stand.setItemInMainHand(new ItemStack(Material.BONE)); - stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(40,0,90))); - asList.add(stand); - - stand = spawnArmorStand(getRelative(getLocation().add(0, -1.4, 0), .3, .75)); - stand.setItemInMainHand(new ItemStack(Material.BONE)); - stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(0,0,90))); - asList.add(stand); - - stand = spawnArmorStand(getRelative(getLocation().add(0, -1.4, 0), .9, .42)); - stand.setItemInMainHand(new ItemStack(Material.BONE)); - stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-30,0,90))); - asList.add(stand); - - stand = spawnArmorStand(getRelative(getLocation().add(0, -1.4, 0), 1.1, -.6)); - stand.setItemInMainHand(new ItemStack(Material.BONE)); - stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-80,0,90))); - asList.add(stand); - - stand = spawnArmorStand(getRelative(getLocation().add(0, -1.4, 0), 1.6, 1.3)); - stand.setItemInMainHand(new ItemStack(Material.BONE)); - stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(30,0,90))); - asList.add(stand); - - Location loc = getRelative(getLocation().add(0, -1.4, 0), getBlockFace(), 2.0, -.1); - loc.setYaw(getYaw()+180); - stand = spawnArmorStand(loc); - stand.setHelmet(new ItemStack(Material.SKULL_ITEM)); - stand.setHeadPose(getLutil().degresstoRad(new EulerAngle(-90,13,-5))); - asList.add(stand); - for(fArmorStand asp : asList){ - asp.setInvisible(true); - asp.setBasePlate(false); - } - send(); - Bukkit.getPluginManager().registerEvents(this, getPlugin()); - } - - @EventHandler - public void onFurnitureBreak(FurnitureBreakEvent e) { - if(getObjID()==null){return;} - if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} - if(!e.getID().equals(getObjID())){return;} - if(!e.canBuild()){return;} - delete(); - e.remove(); - } - - @Override - public void onFurnitureClick(FurnitureClickEvent paramFurnitureClickEvent) {} -} diff --git a/src/de/Ste3et_C0st/Furniture/Objects/RPG/catapult.java b/src/de/Ste3et_C0st/Furniture/Objects/RPG/catapult.java deleted file mode 100644 index 140e600..0000000 --- a/src/de/Ste3et_C0st/Furniture/Objects/RPG/catapult.java +++ /dev/null @@ -1,241 +0,0 @@ -package de.Ste3et_C0st.Furniture.Objects.RPG; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import org.bukkit.Bukkit; -import org.bukkit.EntityEffect; -import org.bukkit.GameMode; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.block.Block; -import org.bukkit.block.BlockFace; -import org.bukkit.entity.Entity; -import org.bukkit.entity.EntityType; -import org.bukkit.entity.FallingBlock; -import org.bukkit.entity.Player; -import org.bukkit.entity.TNTPrimed; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.entity.EntityChangeBlockEvent; -import org.bukkit.event.entity.EntityExplodeEvent; -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; -import de.Ste3et_C0st.FurnitureLib.Events.FurnitureClickEvent; -import de.Ste3et_C0st.FurnitureLib.main.Furniture; -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; - -public class catapult extends Furniture implements Listener { - public catapult(ObjectID id) { - super(id); - if(isFinish()){ - Bukkit.getPluginManager().registerEvents(this, main.getInstance()); - return; - } - spawn(id.getStartLocation()); - } - - HashMap fallingSandList = new HashMap(); - - - @Override - public void spawn(Location paramLocation) { - List asList = new ArrayList(); - double d = .05; - for(int i =0;i<5;i++){ - Location loc = getRelative(getCenter(), -.5+i*.61, -.26-d).add(0, -1.8, 0); - fArmorStand stand = spawnArmorStand(loc); - stand.setHelmet(new ItemStack(Material.LOG)); - stand.setHeadPose(getLutil().degresstoRad(new EulerAngle(90, 0, 0))); - asList.add(stand); - } - - for(int i =0;i<5;i++){ - Location loc = getRelative(getCenter(), -.5+i*.61, -2+.28+d).add(0, -1.8, 0); - fArmorStand stand = spawnArmorStand(loc); - stand.setHelmet(new ItemStack(Material.LOG)); - stand.setHeadPose(getLutil().degresstoRad(new EulerAngle(90, 0, 0))); - asList.add(stand); - } - - for(int i =0;i<4;i++){ - Location loc = getRelative(getCenter(), .9 , -.26-d).add(0, -.9+i*.43, 0); - fArmorStand stand = spawnArmorStand(loc); - stand.setHelmet(new ItemStack(Material.LOG)); - stand.setSmall(true); - asList.add(stand); - } - - for(int i =0;i<4;i++){ - Location loc = getRelative(getCenter(), .9 , -2+.28+d).add(0, -.9+i*.43, 0); - fArmorStand stand = spawnArmorStand(loc); - stand.setHelmet(new ItemStack(Material.LOG)); - stand.setSmall(true); - asList.add(stand); - } - - Location loc = getRelative(getCenter(), getBlockFace(), .15, -.2).add(0, -1.6, 0); - fArmorStand stand = spawnArmorStand(loc); - stand.setItemInMainHand(new ItemStack(Material.STICK)); - stand.setMarker(false); - stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(80,0,90))); - asList.add(stand); - - loc = getRelative(getCenter(), getBlockFace(), 2.8-.12, -.2).add(0, -1.6, 0); - stand = spawnArmorStand(loc); - stand.setItemInMainHand(new ItemStack(Material.STICK)); - stand.setMarker(false); - stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(80,0,90))); - asList.add(stand); - - loc = getRelative(getCenter(), getBlockFace(), 1.5-.12, -.2).add(0, -1.6, 0); - stand = spawnArmorStand(loc); - stand.setItemInMainHand(new ItemStack(Material.STICK)); - stand.setMarker(false); - stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(80,0,90))); - asList.add(stand); - - loc = getRelative(getCenter(), getBlockFace(), 1.5-.12, -.2).add(0, 0, 0); - stand = spawnArmorStand(loc); - stand.setItemInMainHand(new ItemStack(Material.STICK)); - stand.setMarker(false); - stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(80,0,90))); - asList.add(stand); - - loc = getRelative(getCenter(), getBlockFace(), 1.5-.3, -1.4).add(0, -1.1, 0); - loc.setYaw(getYaw()+180); - stand = spawnArmorStand(loc); - stand.setItemInMainHand(new ItemStack(Material.STICK)); - stand.setMarker(false); - stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(335,0,0))); - asList.add(stand); - - loc = getRelative(getCenter(), getBlockFace(), .4, -1.4).add(0, -.9, 0); - loc.setYaw(getYaw()+180); - stand = spawnArmorStand(loc); - stand.setItemInMainHand(new ItemStack(Material.STICK)); - stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(335,0,0))); - stand.setMarker(false); - asList.add(stand); - - loc = getRelative(getCenter(), getBlockFace(), -.8, -1.03).add(0, -1.2, 0); - loc.setYaw(getYaw()); - stand = spawnArmorStand(loc); - stand.setHelmet(new ItemStack(Material.STEP)); - stand.setHeadPose(getLutil().degresstoRad(new EulerAngle(15,0,0))); - asList.add(stand); - - for(fArmorStand asp : asList){ - asp.setInvisible(true); - } - - send(); - Bukkit.getPluginManager().registerEvents(this, getPlugin()); - } - - @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(!e.canBuild()){return;} - e.remove(); - delete(); - } - - @EventHandler - public void onFallingSand(EntityChangeBlockEvent e){ - if(e.getEntity()==null) return; - if(e.getEntity() instanceof FallingBlock){ - if(fallingSandList.containsKey(e.getEntity())){ - Entity entity = e.getEntity(); - Player p = fallingSandList.get(e.getEntity()); - fallingSandList.remove(e.getEntity()); - Block b = entity.getLocation().getBlock().getRelative(BlockFace.DOWN); - if(!FurnitureLib.getInstance().getPermManager().canBuild(p, b.getLocation())){ - e.setCancelled(true); - e.getEntity().remove(); - } - } - } - } - - @EventHandler - public void onPrimedTnt(EntityExplodeEvent e){ - if(e.getEntity()==null) return; - if(e.getEntity() instanceof TNTPrimed){ - if(fallingSandList.containsKey(e.getEntity())){ - Entity entity = e.getEntity(); - Player p = fallingSandList.get(e.getEntity()); - fallingSandList.remove(e.getEntity()); - Block b = entity.getLocation().getBlock().getRelative(BlockFace.DOWN); - if(!FurnitureLib.getInstance().getPermManager().canBuild(p, b.getLocation())){ - e.setCancelled(true); - e.blockList().clear(); - e.getEntity().remove(); - } - } - } - } - - @SuppressWarnings("deprecation") - @EventHandler - public void onFurnitureClick(FurnitureClickEvent e) { - if(getObjID()==null){return;} - if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()) return; - if(!e.getID().equals(getObjID())) return; - if(!e.canBuild()){return;} - if(e.getPlayer().getItemInHand()==null){return;} - if(e.getPlayer().getItemInHand().getType()==null){return;} - if(!e.getPlayer().getItemInHand().getType().isBlock()){return;} - Location loc = getRelative(getCenter(), getBlockFace(), -.8, -1.03).add(0, -.2, 0); - loc.setYaw(getYaw()); - ItemStack stack = e.getPlayer().getItemInHand(); - if(stack.getType().equals(Material.TNT)){ - TNTPrimed tnt = (TNTPrimed) getWorld().spawnEntity(loc, EntityType.PRIMED_TNT); - Vector v=null; - switch (getBlockFace()) { - case NORTH:v= new Vector(0, 0.5, 1.2);break; - case SOUTH:v= new Vector(0, 0.5, -1.2);break; - case EAST: v= new Vector(-1.2, 0.5, 0);break; - case WEST: v= new Vector(1.2, 0.5, 0);break; - default:break; - } - tnt.playEffect(EntityEffect.WITCH_MAGIC); - tnt.setVelocity(v.multiply(1)); - fallingSandList.put(tnt, e.getPlayer()); - }else{ - FallingBlock block = getWorld().spawnFallingBlock(loc, stack.getType().getId(), (byte) stack.getDurability()); - Vector v=null; - switch (getBlockFace()) { - case NORTH:v= new Vector(0, 0.5, 1.2);break; - case SOUTH:v= new Vector(0, 0.5, -1.2);break; - case EAST: v= new Vector(-1.2, 0.5, 0);break; - case WEST: v= new Vector(1.2, 0.5, 0);break; - default:break; - } - block.playEffect(EntityEffect.WITCH_MAGIC); - block.setDropItem(false); - block.setVelocity(v.multiply(1)); - fallingSandList.put(block, e.getPlayer()); - } - - if(e.getPlayer().getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) return; - Integer i = e.getPlayer().getInventory().getHeldItemSlot(); - ItemStack is = e.getPlayer().getItemInHand(); - is.setAmount(is.getAmount()-1); - e.getPlayer().getInventory().setItem(i, is); - e.getPlayer().updateInventory(); - } -} diff --git a/src/de/Ste3et_C0st/Furniture/Objects/RPG/flag.java b/src/de/Ste3et_C0st/Furniture/Objects/RPG/flag.java index 261602c..4c99537 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/RPG/flag.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/RPG/flag.java @@ -129,9 +129,8 @@ public class flag extends Furniture implements Listener { @EventHandler public void onFurnitureBreak(FurnitureBreakEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || 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(!e.canBuild()){return;} @@ -141,9 +140,8 @@ public class flag extends Furniture implements Listener { @EventHandler public void onFurnitureClick(FurnitureClickEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} if(e.getPlayer().getInventory().getItemInMainHand()!=null&&e.getPlayer().getInventory().getItemInMainHand().getType()!=null){ @@ -170,9 +168,8 @@ public class flag extends Furniture implements Listener { @EventHandler public void onFurnitureBreak(FurnitureBlockBreakEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} delete(); @@ -181,9 +178,8 @@ public class flag extends Furniture implements Listener { @EventHandler public void onFurnitureClick(FurnitureBlockClickEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} if(e.getPlayer().getInventory().getItemInMainHand()!=null&&e.getPlayer().getInventory().getItemInMainHand().getType()!=null){ diff --git a/src/de/Ste3et_C0st/Furniture/Objects/RPG/guillotine.java b/src/de/Ste3et_C0st/Furniture/Objects/RPG/guillotine.java index 8c33633..47708f9 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/RPG/guillotine.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/RPG/guillotine.java @@ -310,9 +310,8 @@ public class guillotine extends Furniture implements Listener{ @EventHandler public void onFurnitureBreak(FurnitureBreakEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} if(!isRunning()){ @@ -341,12 +340,10 @@ public class guillotine extends Furniture implements Listener{ @EventHandler public void onFurnitureClick(FurnitureClickEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} - e.setCancelled(true); Player p = e.getPlayer(); if(!getLib().canBuild(e.getPlayer(), getObjID(), EventType.INTERACT)){return;} if(p.isSneaking()){ @@ -453,7 +450,7 @@ public class guillotine extends Furniture implements Listener{ boolean a = false,b = false,c = false; a = !packet1.isInvisible(); b = !packet2.isInvisible(); - if(packet1.getItemInMainHand()!=null&&!packet1.getItemInMainHand().equals(Material.AIR)){ + if(packet1.getItemInMainHand()!=null&&!packet1.getItemInMainHand().getType().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 59b000f..b010c08 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/RPG/weaponStand.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/RPG/weaponStand.java @@ -53,9 +53,8 @@ public class weaponStand extends Furniture { @EventHandler public void onFurnitureBreak(FurnitureBreakEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(!e.getID().equals(getObjID())){return;} - if(e.isCancelled()){return;} if(!e.canBuild()){return;} if(p!=null){ p.closeInventory(); @@ -77,10 +76,9 @@ public class weaponStand extends Furniture { @EventHandler public void onFurnitureClick(FurnitureClickEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} if(p!=null){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} this.p = e.getPlayer(); @@ -105,12 +103,12 @@ public class weaponStand extends Furniture { ItemMeta im1 = is1.getItemMeta(); ItemMeta im3 = is3.getItemMeta(); - im1.setDisplayName("�c"); - im3.setDisplayName("�c"); + im1.setDisplayName("§c"); + im3.setDisplayName("§c"); is1.setItemMeta(im1); is3.setItemMeta(im3); - inv = Bukkit.createInventory(null, 45, "�cWeaponBox"); + inv = Bukkit.createInventory(null, 45, "§cWeaponBox"); List asList = getManager().getfArmorStandByObjectID(getObjID()); int j = 1; diff --git a/src/de/Ste3et_C0st/Furniture/Objects/School/BlackBoard.java b/src/de/Ste3et_C0st/Furniture/Objects/School/BlackBoard.java index 84a4192..f0c0747 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/School/BlackBoard.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/School/BlackBoard.java @@ -61,7 +61,6 @@ public class BlackBoard extends Furniture implements Listener { Location loc = getRelative(getCenter(), getBlockFace(),.25d, 1.2d).add(0, -1.63, 0); loc.setYaw(getYaw()+180); fArmorStand stand = spawnArmorStand(loc); - //stand.setItemInHand(new ItemStack(Material.BONE)); stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(-110, 0, 270))); stand.setMarker(false); stand.setName("#ITEM#"); @@ -76,9 +75,8 @@ public class BlackBoard extends Furniture implements Listener { @EventHandler public void onFurnitureBreak(FurnitureBreakEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} delete(); @@ -87,13 +85,11 @@ public class BlackBoard extends Furniture implements Listener { @EventHandler public void onFurnitureClick(FurnitureClickEvent e){ - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} Player p = e.getPlayer(); if(!e.canBuild()){return;} - e.setCancelled(true); if(p.getInventory().getItemInMainHand().getType().isBlock()&&!p.getInventory().getItemInMainHand().getType().equals(Material.AIR)){return;} for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getName().equalsIgnoreCase("#ITEM#")){ diff --git a/src/de/Ste3et_C0st/Furniture/Objects/School/SchoolChair.java b/src/de/Ste3et_C0st/Furniture/Objects/School/SchoolChair.java index 5bb59f8..c021a51 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/School/SchoolChair.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/School/SchoolChair.java @@ -72,7 +72,9 @@ public class SchoolChair extends Furniture implements Listener { stand.setHelmet(new ItemStack(Material.IRON_PLATE)); asList.add(stand); - stand = spawnArmorStand(getCenter().subtract(0, 1.3, 0)); + Location loc = getCenter().subtract(0, 1.7, 0); + loc.setYaw(getYaw()+180); + stand = spawnArmorStand(loc); stand.setName("#SITZ#"); asList.add(stand); @@ -90,9 +92,8 @@ public class SchoolChair extends Furniture implements Listener { @EventHandler public void onFurnitureBreak(FurnitureBreakEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || 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;} @@ -102,9 +103,8 @@ public class SchoolChair extends Furniture implements Listener { @EventHandler public void onFurnitureClick(FurnitureClickEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getName().equalsIgnoreCase("#SITZ#")){ diff --git a/src/de/Ste3et_C0st/Furniture/Objects/School/SchoolTable.java b/src/de/Ste3et_C0st/Furniture/Objects/School/SchoolTable.java index aa900d3..78f8cc0 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/School/SchoolTable.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/School/SchoolTable.java @@ -36,12 +36,10 @@ public class SchoolTable extends Furniture implements Listener { @EventHandler public void onFurnitureBreak(FurnitureBreakEvent e){ - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} - e.setCancelled(true); for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getName().equalsIgnoreCase("#ITEM#")){ if(packet.getInventory().getItemInMainHand()!=null&&!packet.getInventory().getItemInMainHand().getType().equals(Material.AIR)){ @@ -56,13 +54,11 @@ public class SchoolTable extends Furniture implements Listener { @EventHandler public void onFurnitureClick(FurnitureClickEvent e){ - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} Player p = e.getPlayer(); if(!e.canBuild()){return;} - e.setCancelled(true); if(p.getInventory().getItemInMainHand().getType().isBlock()&&!p.getInventory().getItemInMainHand().getType().equals(Material.AIR)){return;} for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getName().equalsIgnoreCase("#ITEM#")){ diff --git a/src/de/Ste3et_C0st/Furniture/Objects/School/TrashCan.java b/src/de/Ste3et_C0st/Furniture/Objects/School/TrashCan.java index ec40480..797518a 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/School/TrashCan.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/School/TrashCan.java @@ -33,9 +33,8 @@ public class TrashCan extends Furniture implements Listener { @EventHandler public void onFurnitureBreak(FurnitureBreakEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()) return; if(!e.getID().equals(getObjID())) return; if(!e.canBuild()){return;} e.remove(); @@ -44,9 +43,8 @@ public class TrashCan extends Furniture implements Listener { @EventHandler public void onFurnitureClick(FurnitureClickEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()) return; if(!e.getID().equals(getObjID())) return; if(!e.canBuild()){return;} ItemStack is = e.getPlayer().getInventory().getItemInMainHand(); diff --git a/src/de/Ste3et_C0st/Furniture/Objects/christmas/AdventCalender.java b/src/de/Ste3et_C0st/Furniture/Objects/christmas/AdventCalender.java index 68a4992..742c98f 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/christmas/AdventCalender.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/christmas/AdventCalender.java @@ -87,10 +87,8 @@ public class AdventCalender extends Furniture implements Listener { @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(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} if(!e.getID().equals(getObjID())){return;} if(!canBuild(e.getPlayer())){return;} e.remove(true,false); @@ -99,10 +97,8 @@ public class AdventCalender extends Furniture implements Listener { @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(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} if(!e.getID().equals(getObjID())){return;} ItemStack is = e.getPlayer().getInventory().getItemInMainHand(); if(is==null){open(e.getPlayer()); return;} diff --git a/src/de/Ste3et_C0st/Furniture/Objects/christmas/AdventWreath.java b/src/de/Ste3et_C0st/Furniture/Objects/christmas/AdventWreath.java index a810f5e..84fbf08 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/christmas/AdventWreath.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/christmas/AdventWreath.java @@ -42,10 +42,8 @@ public class AdventWreath extends Furniture implements Listener { @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(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} if(!e.getID().equals(getObjID())){return;} if(!canBuild(e.getPlayer())){return;} e.remove(true,false); @@ -54,13 +52,9 @@ public class AdventWreath extends Furniture implements Listener { @EventHandler public void onFurnitureClick(FurnitureClickEvent e) { - if(getObjID()==null){return;} - if(e.isCancelled()){return;} - if(e.getID()==null) return; - if(!e.getID().equals(getObjID())){return;} if(e.getID() == null || getObjID() == null) return; + if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} - e.setCancelled(true); fArmorStand stand = e.getfArmorStand(); String str = stand.getName(); if(str.startsWith("Fire") || str.startsWith("Torch")){ diff --git a/src/de/Ste3et_C0st/Furniture/Objects/christmas/CandyCane.java b/src/de/Ste3et_C0st/Furniture/Objects/christmas/CandyCane.java deleted file mode 100644 index c23a9be..0000000 --- a/src/de/Ste3et_C0st/Furniture/Objects/christmas/CandyCane.java +++ /dev/null @@ -1,123 +0,0 @@ -package de.Ste3et_C0st.Furniture.Objects.christmas; - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; -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.event.EventHandler; -import org.bukkit.event.Listener; -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.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.fArmorStand; - -public class CandyCane extends Furniture implements Listener { - - public CandyCane(ObjectID id){ - super(id); - if(isFinish()){ - Bukkit.getPluginManager().registerEvents(this, getPlugin()); - return; - } - spawn(id.getStartLocation()); - } - - private String generateSessionKey(int length){ - String alphabet = new String("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"); //9 - int n = alphabet.length(); - String result = new String(); - Random r = new Random(); - for (int i=0; i asList = new ArrayList(); - - ItemStack is = getSkull(); - - double d = .0; - double c = .0; - for(int i = 1; i<7;i++){ - d = -2.6+ .59*i; - Location loc = getCenter().clone().add(0,d, 0); - fArmorStand stand = spawnArmorStand(loc); - stand.setHelmet(is); - asList.add(stand); - } - d = d + 3.5; - for(int i = 1; i<4;i++){ - c = -.32+.59*i; - Location loc = getRelative(getCenter(), c, 0).add(0,-2.9+d, 0); - fArmorStand stand = spawnArmorStand(loc); - stand.setHelmet(is); - asList.add(stand); - } - - Location loc = getRelative(getCenter(), c+.3, 0).add(0,-3.5+d, 0); - fArmorStand stand = spawnArmorStand(loc); - stand.setHelmet(is); - asList.add(stand); - - for(fArmorStand pack : asList){ - pack.setInvisible(true); - pack.setBasePlate(false); - } - - send(); - Bukkit.getPluginManager().registerEvents(this, getPlugin()); - } -} diff --git a/src/de/Ste3et_C0st/Furniture/Objects/christmas/ChristmasTree.java b/src/de/Ste3et_C0st/Furniture/Objects/christmas/ChristmasTree.java deleted file mode 100644 index b940822..0000000 --- a/src/de/Ste3et_C0st/Furniture/Objects/christmas/ChristmasTree.java +++ /dev/null @@ -1,121 +0,0 @@ -package de.Ste3et_C0st.Furniture.Objects.christmas; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.block.Block; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.inventory.ItemStack; -import org.bukkit.util.EulerAngle; - -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.fArmorStand; - -public class ChristmasTree extends Furniture implements Listener{ - - public ChristmasTree(ObjectID id){ - super(id); - setBlock(); - if(isFinish()){ - Bukkit.getPluginManager().registerEvents(this, getPlugin()); - return; - } - spawn(id.getStartLocation()); - } - - private void setBlock(){ - Block b = getCenter().getBlock(); - b.setType(Material.FLOWER_POT); - getObjID().addBlock(Arrays.asList(b)); - } - - @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,true); - delete(); - } - - @Override - public void onFurnitureClick(FurnitureClickEvent arg0) { - - } - - @Override - public void spawn(Location arg0) { - List asList = new ArrayList(); - - double d = -1.1; - - setEbene(.3, d, .3, asList); - setEbene(.2, d+.63, .2, asList); - setEbene(.1, d+1.26, .1, asList); - fArmorStand stand = spawnArmorStand(getCenter().add(0, d+1.89, 0)); - stand.setHelmet(new ItemStack(Material.LEAVES)); - asList.add(stand); - - stand = spawnArmorStand(getCenter().add(0, d+3.18, 0)); - stand.setHelmet(new ItemStack(Material.LEAVES)); - stand.setSmall(true); - asList.add(stand); - - stand = spawnArmorStand(getRelative(getCenter(), getBlockFace(), .5, .4).add(0, d+.2, 0)); - stand.setItemInMainHand(new ItemStack(Material.STICK)); - stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(80, 0, 0))); - asList.add(stand); - - stand = spawnArmorStand(getRelative(getCenter(), getBlockFace(), .5, .4).add(0, d+3.3, 0)); - stand.setItemInMainHand(new ItemStack(Material.STICK)); - stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(80, 0, 0))); - asList.add(stand); - - Location location = getRelative(getCenter(), getBlockFace(), .15, 0); - location.add(0, 2.9, 0); - stand = spawnArmorStand(location); - stand.setHeadPose(getLutil().degresstoRad(new EulerAngle(90f,180f,90f))); - stand.setHelmet(new ItemStack(Material.GOLD_BLOCK)); - stand.setSmall(true); - asList.add(stand); - - stand = spawnArmorStand(location); - stand.setHeadPose(getLutil().degresstoRad(new EulerAngle(90f,180f,45f))); - stand.setHelmet(new ItemStack(Material.GOLD_BLOCK)); - stand.setSmall(true); - asList.add(stand); - - for(fArmorStand pack : asList){ - pack.setInvisible(true); - pack.setBasePlate(false); - } - - send(); - Bukkit.getPluginManager().registerEvents(this, getPlugin()); - } - - private void setEbene(double x, double y, double z, List standL){ - float yaw = 0; - for(int i = 1; i<=4;i++){ - Location loc = getLutil().getRelativ(getCenter(), getLutil().yawToFace(yaw), x, z); - loc.add(0, y, 0); - loc.setYaw(yaw); - fArmorStand stand = spawnArmorStand(loc); - stand.setHelmet(new ItemStack(Material.LEAVES)); - yaw+=90; - standL.add(stand); - } - } -} diff --git a/src/de/Ste3et_C0st/Furniture/Objects/christmas/FireworkLauncher.java b/src/de/Ste3et_C0st/Furniture/Objects/christmas/FireworkLauncher.java index 0918e4a..545bf37 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/christmas/FireworkLauncher.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/christmas/FireworkLauncher.java @@ -38,10 +38,8 @@ public class FireworkLauncher extends Furniture implements Listener { @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(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} if(!e.getID().equals(getObjID())){return;} if(!canBuild(e.getPlayer())){return;} for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ @@ -58,10 +56,8 @@ public class FireworkLauncher extends Furniture implements Listener { @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(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} if(!e.getID().equals(getObjID())){return;} if(!canBuild(e.getPlayer())){return;} Player p = e.getPlayer(); diff --git a/src/de/Ste3et_C0st/Furniture/Objects/christmas/SnowGolem.java b/src/de/Ste3et_C0st/Furniture/Objects/christmas/SnowGolem.java deleted file mode 100644 index e3586e3..0000000 --- a/src/de/Ste3et_C0st/Furniture/Objects/christmas/SnowGolem.java +++ /dev/null @@ -1,145 +0,0 @@ -package de.Ste3et_C0st.Furniture.Objects.christmas; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.block.Block; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.inventory.ItemStack; -import org.bukkit.util.EulerAngle; - -import de.Ste3et_C0st.FurnitureLib.Events.FurnitureBlockBreakEvent; -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.fArmorStand; - -public class SnowGolem extends Furniture implements Listener{ - - public SnowGolem(ObjectID id){ - super(id); - setBlock(); - if(isFinish()){ - Bukkit.getPluginManager().registerEvents(this, getPlugin()); - return; - } - spawn(id.getStartLocation()); - } - - private void setBlock(){ - Block b = getCenter().getBlock(); - b.setType(Material.SNOW_BLOCK); - getObjID().addBlock(Arrays.asList(b)); - } - - @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(); - delete(); - } - - @EventHandler - public void onFurnitureBreak(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(); - delete(); - } - - @Override - public void onFurnitureClick(FurnitureClickEvent arg0) { - - } - - @Override - public void spawn(Location arg0) { - List asList = new ArrayList(); - fArmorStand stand = spawnArmorStand(getCenter().add(0, -.87, 0)); - stand.setHelmet(new ItemStack(Material.SNOW_BLOCK)); - asList.add(stand); - - stand = spawnArmorStand(getCenter().add(0, .38, 0)); - stand.setHelmet(new ItemStack(Material.COAL_BLOCK)); - stand.setSmall(true); - asList.add(stand); - - Location loc = getRelative(getCenter().add(0, -.75, 0), -.18, -.54); - loc.setYaw(getYaw()+90); - stand = spawnArmorStand(loc); - stand.setItemInMainHand(new ItemStack(Material.CARROT_ITEM)); - stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(90, 0, -150))); - stand.setMarker(false); - asList.add(stand); - - loc = getRelative(getCenter().add(0, .2, 0), .05, -.15); - loc.setYaw(getYaw()+90); - stand = spawnArmorStand(loc); - stand.setItemInMainHand(new ItemStack(Material.COAL_BLOCK)); - stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(70f, 0f, 45f))); - stand.setSmall(true); - asList.add(stand); - - loc = getRelative(getCenter().add(0, .2, 0), .05, -.45); - loc.setYaw(getYaw()+90); - stand = spawnArmorStand(loc); - stand.setItemInMainHand(new ItemStack(Material.COAL_BLOCK)); - stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(70f, 0f, 45f))); - stand.setSmall(true); - asList.add(stand); - - loc = getRelative(getCenter().add(0, -.55, 0), -.15, -.28); - loc.setYaw(getYaw()+90); - stand = spawnArmorStand(loc); - stand.setItemInMainHand(new ItemStack(Material.COAL_BLOCK)); - stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(70f, 0f, 45f))); - stand.setSmall(true); - asList.add(stand); - - loc = getRelative(getCenter().add(0, -.95, 0), -.15, -.28); - loc.setYaw(getYaw()+90); - stand = spawnArmorStand(loc); - stand.setItemInMainHand(new ItemStack(Material.COAL_BLOCK)); - stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(70f, 0f, 45f))); - stand.setSmall(true); - asList.add(stand); - - loc = getRelative(getCenter().add(0, -.45, 0), .0, 1.22); - loc.setYaw(getYaw()); - stand = spawnArmorStand(loc); - stand.setItemInMainHand(new ItemStack(Material.STICK)); - stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(90f,90f,70f))); - asList.add(stand); - - loc = getRelative(getCenter().add(0, -.45, 0), -.1, -1.22); - loc.setYaw(getYaw()+180); - stand = spawnArmorStand(loc); - stand.setItemInMainHand(new ItemStack(Material.STICK)); - stand.setRightArmPose(getLutil().degresstoRad(new EulerAngle(90f,90f,70f))); - asList.add(stand); - - for(fArmorStand pack : asList){ - pack.setInvisible(true); - pack.setBasePlate(false); - } - - send(); - Bukkit.getPluginManager().registerEvents(this, getPlugin()); - } -} diff --git a/src/de/Ste3et_C0st/Furniture/Objects/electric/billboard.java b/src/de/Ste3et_C0st/Furniture/Objects/electric/billboard.java index 18ed0f7..ac83ae0 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/electric/billboard.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/electric/billboard.java @@ -93,10 +93,8 @@ public class billboard extends Furniture implements Listener{ @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(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} if(!e.getID().equals(getObjID())){return;} if(!canBuild(e.getPlayer())){return;} e.remove(); diff --git a/src/de/Ste3et_C0st/Furniture/Objects/electric/camera.java b/src/de/Ste3et_C0st/Furniture/Objects/electric/camera.java index 54dd36f..cc878cc 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/electric/camera.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/electric/camera.java @@ -105,10 +105,8 @@ public class camera extends Furniture implements Listener{ @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(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} e.remove(); diff --git a/src/de/Ste3et_C0st/Furniture/Objects/electric/streetlamp.java b/src/de/Ste3et_C0st/Furniture/Objects/electric/streetlamp.java index 8bb1731..e8c0bbc 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/electric/streetlamp.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/electric/streetlamp.java @@ -127,7 +127,6 @@ public class streetlamp extends Furniture implements Listener{ @EventHandler private void onBlockBreak(FurnitureBlockBreakEvent e){ - if(e.isCancelled()){return;} if(e.getID() == null || getObjID() == null) return; if(!e.getID().equals(getObjID())){return;} if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} @@ -139,7 +138,6 @@ public class streetlamp extends Furniture implements Listener{ @EventHandler private void onBlockClick(FurnitureBlockClickEvent e){ - if(e.isCancelled()){return;} if(e.getID() == null || getObjID() == null) return; if(!e.getID().equals(getObjID())){return;} if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} @@ -221,7 +219,6 @@ public class streetlamp extends Furniture implements Listener{ @EventHandler public void onFurnitureBreak(FurnitureBreakEvent e) { - if(e.isCancelled()){return;} if(e.getID() == null || getObjID() == null) return; if(!e.getID().equals(getObjID())){return;} if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} @@ -235,10 +232,8 @@ public class streetlamp extends Furniture implements Listener{ public void onFurnitureClick(FurnitureClickEvent e) { if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} - e.setCancelled(true); Boolean isOn = isOn(); fEntity packet = getPacket(); if(packet==null) return; diff --git a/src/de/Ste3et_C0st/Furniture/Objects/electric/tv.java b/src/de/Ste3et_C0st/Furniture/Objects/electric/tv.java deleted file mode 100644 index 90bb719..0000000 --- a/src/de/Ste3et_C0st/Furniture/Objects/electric/tv.java +++ /dev/null @@ -1,98 +0,0 @@ -package de.Ste3et_C0st.Furniture.Objects.electric; - -import java.util.ArrayList; -import java.util.List; - -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.block.BlockFace; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.inventory.ItemStack; -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.main.Furniture; -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; - -public class tv extends Furniture implements Listener{ - public tv(ObjectID id){ - super(id); - if(isFinish()){ - Bukkit.getPluginManager().registerEvents(this, main.getInstance()); - return; - } - spawn(id.getStartLocation()); - } - - public void spawn(Location location){ - List aspList = new ArrayList(); - BlockFace b = getLutil().yawToFace(location.getYaw()).getOppositeFace(); - Location center = getLutil().getCenter(location); - double d = .2; - center.add(0, -1.38+d, 0); - center.setYaw(getLutil().FaceToYaw(b)); - Location iron = center.clone(); - fArmorStand as = getManager().createArmorStand(getObjID(), iron); - as.getInventory().setHelmet(new ItemStack(Material.IRON_PLATE)); - as.setSmall(true); - aspList.add(as); - center.add(0, -1.0, 0); - center.setYaw(getLutil().FaceToYaw(b)); - - as = getManager().createArmorStand(getObjID(), getRelative(center, getBlockFace(), .3, 0).subtract(0, d, 0)); - as.getInventory().setHelmet(new ItemStack(Material.LEVER)); - aspList.add(as); - - Location tv = getLutil().getRelativ(center.clone().add(0, .55, 0), b, -.38, -.2); - tv.add(0, -.1, 0); - tv.setYaw(getLutil().FaceToYaw(b)); - Double l = .62-d; - for(int i = 0;i<=1;i++){ - setRow(tv, .62, l, -.35,2,getLutil().degresstoRad(new EulerAngle(90, 0, 0)), aspList); - l+=.62; - } - - for(fArmorStand asp : aspList){ - asp.setBasePlate(false); - asp.setInvisible(true); - } - send(); - Bukkit.getPluginManager().registerEvents(this, getPlugin()); - } - - public void setRow(Location loc, double x,double y, double z, int replay, EulerAngle angle, List list){ - Double d = .0; - for(int i = 0; i<=replay;i++){ - Location loc1= getLutil().getRelativ(loc, getBlockFace(), z, d-.825); - loc1.setYaw(getLutil().FaceToYaw(getBlockFace())); - loc1.add(0, y,0); - fArmorStand packet = getManager().createArmorStand(getObjID(), loc1); - packet.getInventory().setHelmet(new ItemStack(Material.CARPET, 1 , (short) 15)); - packet.setPose(angle, BodyPart.HEAD); - list.add(packet); - d+=x; - } - } - - - @EventHandler - public void onFurnitureBreak(FurnitureBreakEvent e){ - if(e.getID() == null || getObjID() == null) return; - if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} - if(!e.getID().equals(getObjID())){return;} - if(!e.canBuild()){return;} - e.remove(); - delete(); - } - - @EventHandler - public void onFurnitureClick(FurnitureClickEvent e){} -} diff --git a/src/de/Ste3et_C0st/Furniture/Objects/garden/SleepingBag.java b/src/de/Ste3et_C0st/Furniture/Objects/garden/SleepingBag.java deleted file mode 100644 index 507b54d..0000000 --- a/src/de/Ste3et_C0st/Furniture/Objects/garden/SleepingBag.java +++ /dev/null @@ -1,88 +0,0 @@ -package de.Ste3et_C0st.Furniture.Objects.garden; - -import java.util.ArrayList; -import java.util.List; - -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.inventory.ItemStack; -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.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 SleepingBag extends Furniture implements Listener { - - public SleepingBag(ObjectID id){ - super(id); - if(isFinish()){ - Bukkit.getPluginManager().registerEvents(this, main.getInstance()); - return; - } - spawn(id.getStartLocation()); - } - - - @EventHandler - public void onFurnitureBreak(FurnitureBreakEvent e) { - if(e.getID() == null || getObjID() == null) return; - if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} - if(!e.getID().equals(getObjID())){return;} - if(!e.canBuild()){return;} - delete(); - e.remove(); - } - - @EventHandler - public void onFurnitureClick(FurnitureClickEvent e) { - if(e.getID() == null || getObjID() == null) return; - if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} - if(!e.getID().equals(getObjID())){return;} - for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ - if(packet.getName().equalsIgnoreCase("#SITZ#")){ - if(packet.getPassanger()==null){ - packet.setPassanger(e.getPlayer()); - } - } - } - } - - public void spawn(Location loc) { - List asList = new ArrayList(); - double offset = .3; - fArmorStand stand = spawnArmorStand(getRelative(getCenter(), 0 - offset, 0).add(0, -2.15, 0)); - asList.add(stand); - stand.setHelmet(new ItemStack(Material.IRON_TRAPDOOR)); - stand.setHeadPose(getLutil().degresstoRad(new EulerAngle(90, 0, 0))); - - stand = spawnArmorStand(getRelative(getCenter(), 2 - offset, 0).add(0, -1.7, 0)); - asList.add(stand); - stand.setHelmet(new ItemStack(Material.BANNER, 1, (short) 3)); - stand.setHeadPose(getLutil().degresstoRad(new EulerAngle(-90, 0, 0))); - - stand = spawnArmorStand(getRelative(getCenter(), -.5 - offset, 0).add(0, -1.68, 0)); - asList.add(stand); - stand.setHelmet(new ItemStack(Material.BANNER, 1, (short) 3)); - stand.setHeadPose(getLutil().degresstoRad(new EulerAngle(-90, 180, 0))); - - stand = spawnArmorStand(getRelative(getCenter(), .3 - offset, 0).add(0, -2.1, 0)); - stand.setName("#SITZ#"); - asList.add(stand); - for(fArmorStand as : asList){ - as.setInvisible(true); - } - send(); - Bukkit.getPluginManager().registerEvents(this, getPlugin()); - } -} diff --git a/src/de/Ste3et_C0st/Furniture/Objects/garden/TFlowerPot.java b/src/de/Ste3et_C0st/Furniture/Objects/garden/TFlowerPot.java index cb1e706..ca1a59f 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/garden/TFlowerPot.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/garden/TFlowerPot.java @@ -76,13 +76,12 @@ public class TFlowerPot extends Furniture implements Listener { @EventHandler private void BlockBreak(FurnitureBlockBreakEvent e){ - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} if (pot==null) return; if (e.getBlock() == null) return; if (e.getBlock().getLocation() == null) return; if(!e.getBlock().equals(pot)){return;} - e.setCancelled(true); if(!canBuild(e.getPlayer())){return;} destroy(e.getPlayer()); pot.setType(Material.AIR); diff --git a/src/de/Ste3et_C0st/Furniture/Objects/garden/Trunk.java b/src/de/Ste3et_C0st/Furniture/Objects/garden/Trunk.java index 3ee6cc7..790982b 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/garden/Trunk.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/garden/Trunk.java @@ -35,9 +35,8 @@ public class Trunk extends Furniture implements Listener { @EventHandler public void onFurnitureBreak(FurnitureBreakEvent e){ - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} e.remove(); @@ -46,9 +45,8 @@ public class Trunk extends Furniture implements Listener { @EventHandler public void onFurnitureClick(FurnitureClickEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.getPlayer().getInventory().getItemInMainHand().getType().isBlock()|| e.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.AIR)){setPassanger(e.getfArmorStand(), e.getPlayer());return;} diff --git a/src/de/Ste3et_C0st/Furniture/Objects/garden/WaterBottle.java b/src/de/Ste3et_C0st/Furniture/Objects/garden/WaterBottle.java index 4f081c5..2ab04e8 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/garden/WaterBottle.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/garden/WaterBottle.java @@ -45,9 +45,8 @@ public class WaterBottle extends Furniture implements Listener { @EventHandler public void onFurnitureBreak(FurnitureBreakEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || 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(!e.canBuild()){return;} @@ -57,9 +56,8 @@ public class WaterBottle extends Furniture implements Listener { @EventHandler public void onFurnitureClick(FurnitureClickEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!canInteract(e.getPlayer())){return;} Material data = e.getPlayer().getInventory().getItemInMainHand().getType(); @@ -77,7 +75,7 @@ public class WaterBottle extends Furniture implements Listener { for(fEntity stand : getfAsList()){ if(stand.getName().equalsIgnoreCase("#ITEM#")){ fstand = stand; - if(stand.getItemInMainHand()!=null&&!stand.getItemInMainHand().equals(Material.AIR)){ + if(stand.getItemInMainHand()!=null&&!stand.getItemInMainHand().getType().equals(Material.AIR)){ ItemStack is = stand.getItemInMainHand(); is.setAmount(1); getWorld().dropItem(getLocation(), is); diff --git a/src/de/Ste3et_C0st/Furniture/Objects/garden/campchair.java b/src/de/Ste3et_C0st/Furniture/Objects/garden/campchair.java deleted file mode 100644 index 842d7a7..0000000 --- a/src/de/Ste3et_C0st/Furniture/Objects/garden/campchair.java +++ /dev/null @@ -1,99 +0,0 @@ -package de.Ste3et_C0st.Furniture.Objects.garden; - -import java.util.ArrayList; -import java.util.List; - -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.inventory.ItemStack; -import org.bukkit.util.EulerAngle; - -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.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 campchair extends Furniture implements Listener { - public campchair(ObjectID id){ - super(id); - if(isFinish()){ - Bukkit.getPluginManager().registerEvents(this, getPlugin()); - return; - } - spawn(id.getStartLocation()); - } - - @EventHandler - public void onFurnitureBreak(FurnitureBreakEvent e) { - if(e.getID() == null || getObjID() == null) return; - if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} - if(!e.getID().equals(getObjID())){return;} - if(!e.canBuild()){return;} - delete(); - e.remove(); - } - - @EventHandler - public void onFurnitureClick(FurnitureClickEvent e) { - if(e.getID() == null || getObjID() == null) return; - if(getObjID()==null){return;} - if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} - if(!e.getID().equals(getObjID())){return;} - for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ - if(packet.getName().equalsIgnoreCase("#SITZ#")){ - if(packet.getPassanger()==null){ - packet.setPassanger(e.getPlayer()); - } - } - } - } - - @Override - public void spawn(Location location) { - List aspList = new ArrayList(); - Location middle = getLutil().getCenter(location); - middle.add(0, -1.05, 0); - middle.setYaw(getLutil().FaceToYaw(getBlockFace())); - - Location l1 = getLutil().getRelativ(middle, getBlockFace(), .25, .4); - fArmorStand packet = getManager().createArmorStand(getObjID(), l1); - packet.getInventory().setItemInMainHand(new ItemStack(Material.LADDER)); - packet.setPose(getLutil().degresstoRad(new EulerAngle(50, 0, 0)), BodyPart.RIGHT_ARM); - aspList.add(packet); - - l1 = getLutil().getRelativ(middle, getBlockFace().getOppositeFace(), .25, .4); - packet = getManager().createArmorStand(getObjID(), l1); - packet.getInventory().setItemInMainHand(new ItemStack(Material.LADDER)); - packet.setPose(getLutil().degresstoRad(new EulerAngle(50, 0, 0)), BodyPart.RIGHT_ARM); - aspList.add(packet); - - l1 = middle.clone(); - l1.add(0, -.39, 0); - packet = getManager().createArmorStand(getObjID(), l1); - packet.getInventory().setHelmet(new ItemStack(Material.WOOD_PLATE)); - aspList.add(packet); - - middle.add(0,-0.6-.26,0); - middle.setYaw(getLutil().FaceToYaw(getBlockFace().getOppositeFace())); - packet = getManager().createArmorStand(getObjID(), middle); - packet.setName("#SITZ#"); - aspList.add(packet); - - for(fArmorStand as : aspList){ - as.setInvisible(true); - as.setBasePlate(false); - } - - send(); - Bukkit.getPluginManager().registerEvents(this, getPlugin()); - } -} diff --git a/src/de/Ste3et_C0st/Furniture/Objects/garden/fance.java b/src/de/Ste3et_C0st/Furniture/Objects/garden/fance.java index 0636569..601fc68 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/garden/fance.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/garden/fance.java @@ -73,7 +73,6 @@ public class fance extends Furniture implements Listener{ private void onBlockBreak(FurnitureBlockBreakEvent e){ if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} e.remove(); @@ -85,7 +84,6 @@ public class fance extends Furniture implements Listener{ private void onBlockBreak(FurnitureBlockClickEvent e){ if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} Player p = e.getPlayer(); @@ -109,13 +107,10 @@ public class fance extends Furniture implements Listener{ @EventHandler public void onFurnitureBreak(FurnitureBreakEvent e){ - if(getObjID()==null){return;} - if(e.getID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} - e.setCancelled(true); e.remove(); delete(); } @@ -132,7 +127,7 @@ public class fance extends Furniture implements Listener{ @SuppressWarnings("deprecation") @EventHandler public void onFurnitureClick(FurnitureClickEvent e){ - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} if(e.isCancelled()){return;} if(this.block==null) return; diff --git a/src/de/Ste3et_C0st/Furniture/Objects/garden/graveStone.java b/src/de/Ste3et_C0st/Furniture/Objects/garden/graveStone.java index 51ebe13..2c8dc8a 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/garden/graveStone.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/garden/graveStone.java @@ -130,7 +130,6 @@ public class graveStone extends Furniture implements Listener{ public void onFurnitureBreak(FurnitureBreakEvent e){ if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().getPlugin().equalsIgnoreCase(main.getInstance().getName())){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} @@ -156,7 +155,6 @@ public class graveStone extends Furniture implements Listener{ if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} if(!e.getID().getPlugin().equalsIgnoreCase(getPlugin().getName())){return;} - if(e.isCancelled()){return;} Player p = e.getPlayer(); if(!e.getID().equals(getObjID())) return; if(!e.canBuild()){return;} diff --git a/src/de/Ste3et_C0st/Furniture/Objects/garden/log.java b/src/de/Ste3et_C0st/Furniture/Objects/garden/log.java index 02e7147..22c3fc5 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/garden/log.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/garden/log.java @@ -19,10 +19,12 @@ import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.util.EulerAngle; import de.Ste3et_C0st.Furniture.Main.main; +import de.Ste3et_C0st.FurnitureLib.Crafting.Project; 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.Utilitis.HiddenStringUtils; import de.Ste3et_C0st.FurnitureLib.Utilitis.ManageInv; import de.Ste3et_C0st.FurnitureLib.main.Furniture; import de.Ste3et_C0st.FurnitureLib.main.FurnitureLib; @@ -35,7 +37,7 @@ 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(); @@ -46,7 +48,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); @@ -62,24 +64,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); } @@ -237,6 +239,7 @@ public class log extends Furniture { return; }else if(!p.getInventory().getItemInMainHand().getType().isBlock() && !p.getInventory().getItemInMainHand().getType().equals(Material.AIR)){ fEntity stand = null; + if(getProjectByItem(p.getInventory().getItemInMainHand()) != null){return;} for(fEntity s : getObjID().getPacketList()){ if(s.getName().equalsIgnoreCase(mode+"")){ stand = s; @@ -313,10 +316,8 @@ public class log extends Furniture { public void onBlockBreak(FurnitureBlockBreakEvent e){ if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} - e.setCancelled(true); Player p = e.getPlayer(); fEntity stand = null; @@ -327,8 +328,6 @@ public class log extends Furniture { } } - if(stand==null){p.sendMessage("test1");return;} - if(stand.getItemInMainHand()!=null&&!stand.getItemInMainHand().getType().equals(Material.AIR)){ ItemStack is = stand.getItemInMainHand(); is.setAmount(1); @@ -339,4 +338,33 @@ public class log extends Furniture { b.setType(Material.AIR); b=null; } + + private Project getProjectByItem(ItemStack is){ + ItemStack stack = getItemStackCopy(is); + if(stack==null) return null; + String systemID = ""; + if(stack.hasItemMeta()){ + if(stack.getItemMeta().hasLore()){ + List s = stack.getItemMeta().getLore(); + if(HiddenStringUtils.hasHiddenString(s.get(0))) systemID = HiddenStringUtils.extractHiddenString(s.get(0)); + } + } + + for(Project pro : FurnitureLib.getInstance().getFurnitureManager().getProjects()){ + if(pro==null) continue; + if(pro.getSystemID()==null) continue; + if(pro.getSystemID().equalsIgnoreCase(systemID)){ + return pro; + } + } + return null; + } + + private ItemStack getItemStackCopy(ItemStack is){ + ItemStack copy = new ItemStack(is.getType()); + copy.setAmount(1); + copy.setDurability(is.getDurability()); + copy.setItemMeta(is.getItemMeta()); + return copy; + } } diff --git a/src/de/Ste3et_C0st/Furniture/Objects/garden/mailBox.java b/src/de/Ste3et_C0st/Furniture/Objects/garden/mailBox.java index 73f7256..5ba1615 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/garden/mailBox.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/garden/mailBox.java @@ -188,7 +188,6 @@ public class mailBox extends Furniture implements Listener { public void onFurnitureBreak(FurnitureBreakEvent e){ if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()) return; if(!e.getID().equals(getObjID())) return; if(!e.canBuild()){return;} diff --git a/src/de/Ste3et_C0st/Furniture/Objects/garden/sunshade.java b/src/de/Ste3et_C0st/Furniture/Objects/garden/sunshade.java index e4e1d3f..ec93d8f 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/garden/sunshade.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/garden/sunshade.java @@ -114,15 +114,12 @@ public class sunshade extends Furniture implements Listener{ public void onFurnitureClick(FurnitureClickEvent e){ if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} - e.setCancelled(true); Player p = e.getPlayer(); ItemStack is = p.getInventory().getItemInMainHand(); if(!getLib().canBuild(e.getPlayer(), getObjID(), EventType.INTERACT)){return;} if(is.getType().equals(Material.BANNER)){ - e.setCancelled(true); if(isRunning()){return;} for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getInventory().getHelmet()!=null&&packet.getInventory().getHelmet().getType().equals(Material.BANNER)){ @@ -154,10 +151,8 @@ public class sunshade extends Furniture implements Listener{ public void onBlockBreak(FurnitureBlockBreakEvent e){ if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} - e.setCancelled(true); stopTimer(); for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getName().equalsIgnoreCase("#ITEM#")){ @@ -175,14 +170,11 @@ public class sunshade extends Furniture implements Listener{ public void onBlockBreak(FurnitureBlockClickEvent e){ if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} - e.setCancelled(true); Player p = e.getPlayer(); ItemStack is = p.getInventory().getItemInMainHand(); if(is.getType().equals(Material.BANNER)){ - e.setCancelled(true); if(isRunning()){return;} for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getInventory().getHelmet()!=null&&packet.getInventory().getHelmet().getType().equals(Material.BANNER)){ @@ -219,10 +211,8 @@ public class sunshade extends Furniture implements Listener{ public void onFurnitureBreak(FurnitureBreakEvent e){ if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} - e.setCancelled(true); stopTimer(); for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getName().equalsIgnoreCase("#ITEM#")){ diff --git a/src/de/Ste3et_C0st/Furniture/Objects/indoor/chair.java b/src/de/Ste3et_C0st/Furniture/Objects/indoor/chair.java deleted file mode 100644 index c439e07..0000000 --- a/src/de/Ste3et_C0st/Furniture/Objects/indoor/chair.java +++ /dev/null @@ -1,128 +0,0 @@ -package de.Ste3et_C0st.Furniture.Objects.indoor; - -import java.util.ArrayList; -import java.util.List; - -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.block.BlockFace; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.inventory.ItemStack; -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.main.Furniture; -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{ - - public chair(ObjectID id){ - super(id); - if(isFinish()){ - Bukkit.getPluginManager().registerEvents(this, main.getInstance()); - return; - } - spawn(id.getStartLocation()); - } - - public void spawn(Location loc){ - List aspList = new ArrayList(); - BlockFace b = getLutil().yawToFace(loc.getYaw()).getOppositeFace(); - Location center = getLutil().getCenter(loc).add(0, -.05, 0); - Location sitz = new Location(center.getWorld(), center.getX(), center.getY(), center.getZ()); - Location lehne = getLutil().getRelativ(center.add(0,-1.1,0), b, -.25, .0); - double offsetX = -.25; - Location feet1 = getRelative(center.clone(), getBlockFace(), -.24-offsetX, -.24).subtract(0, 1.2, 0); - Location feet2 = getRelative(center.clone(), getBlockFace(), .24-offsetX, -.24).subtract(0, 1.2, 0); - Location feet3 = getRelative(center.clone(), getBlockFace(), .24-offsetX, .24).subtract(0, 1.2, 0); - Location feet4 = getRelative(center.clone(), getBlockFace(), -.24-offsetX, .24).subtract(0, 1.2, 0); - - feet1.setYaw(getYaw()); - feet2.setYaw(getYaw()); - feet3.setYaw(getYaw()); - feet4.setYaw(getYaw()); - - sitz.add(0,-1.45,0); - sitz.setYaw(getLutil().FaceToYaw(b)); - lehne.setYaw(getLutil().FaceToYaw(b)); - - fArmorStand as = getManager().createArmorStand(getObjID(), sitz.clone()); - as.getInventory().setHelmet(new ItemStack(Material.TRAP_DOOR)); - aspList.add(as); - - as = getManager().createArmorStand(getObjID(), lehne.clone()); - as.getInventory().setHelmet(new ItemStack(Material.TRAP_DOOR)); - as.setPose(new EulerAngle(1.57, .0, .0), BodyPart.HEAD); - aspList.add(as); - - as = getManager().createArmorStand(getObjID(), feet1.clone()); - as.getInventory().setHelmet(new ItemStack(Material.LEVER)); - aspList.add(as); - - as = getManager().createArmorStand(getObjID(), feet2.clone()); - as.getInventory().setHelmet(new ItemStack(Material.LEVER)); - aspList.add(as); - - as = getManager().createArmorStand(getObjID(), feet3.clone()); - as.getInventory().setHelmet(new ItemStack(Material.LEVER)); - aspList.add(as); - - as = getManager().createArmorStand(getObjID(), feet4.clone()); - as.getInventory().setHelmet(new ItemStack(Material.LEVER)); - aspList.add(as); - - Location sit = sitz.clone().add(0,-.2,0); - as = getManager().createArmorStand(getObjID(), sit.clone()); - as.setName("#SITZ#"); - aspList.add(as); - - for(fArmorStand asp : aspList){ - asp.setInvisible(true); - asp.setBasePlate(false); - } - send(); - Bukkit.getPluginManager().registerEvents(this, getPlugin()); - } - - @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(!e.canBuild()){return;} - e.remove(); - delete(); - } - - @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;} - fEntity packet = null; - for(fEntity as : getManager().getfArmorStandByObjectID(getObjID())){ - if(as.getName().equalsIgnoreCase("#SITZ#")){ - packet=as; - break; - } - } - if(packet!=null){ - if(packet.getPassanger()==null){ - packet.setPassanger(e.getPlayer()); - packet.update(); - } - } - } -} diff --git a/src/de/Ste3et_C0st/Furniture/Objects/indoor/lantern.java b/src/de/Ste3et_C0st/Furniture/Objects/indoor/lantern.java index 60f952a..c1bbb2b 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/indoor/lantern.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/indoor/lantern.java @@ -108,9 +108,8 @@ public class lantern extends Furniture implements Listener{ @EventHandler public void onFurnitureBreak(FurnitureBreakEvent e){ - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()) return; if(block==null) return; if(!e.getID().equals(getObjID())) return; if(!e.canBuild()){return;} @@ -120,9 +119,8 @@ public class lantern extends Furniture implements Listener{ @EventHandler public void onFurnitureClick(FurnitureClickEvent e){ - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()) return; if(block==null) return; if(!e.getID().equals(getObjID())) return; if(!e.canBuild()){return;} diff --git a/src/de/Ste3et_C0st/Furniture/Objects/indoor/largeTable.java b/src/de/Ste3et_C0st/Furniture/Objects/indoor/largeTable.java index 9cc86c9..e3d133f 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/indoor/largeTable.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/indoor/largeTable.java @@ -177,9 +177,8 @@ public class largeTable extends Furniture implements Listener{ @EventHandler public void onFurnitureBreak(FurnitureBreakEvent e){ - if(getObjID()==null){return;} + if(e.getID() == null || 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;} @@ -198,13 +197,11 @@ public class largeTable extends Furniture implements Listener{ @EventHandler public void onFurnitureClick(FurnitureClickEvent e){ - if(getObjID()==null){return;} + if(e.getID() == null || 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); Player p = e.getPlayer(); if(p.getInventory().getItemInMainHand().getType().equals(Material.INK_SACK)){ getLib().getColorManager().color(p, e.canBuild(), Material.STAINED_GLASS_PANE, getObjID(), ColorType.BLOCK, 3); @@ -231,8 +228,8 @@ public class largeTable extends Furniture implements Listener{ } } } - - if(as!=null&&as.getInventory().getItemInMainHand()!= null && as.getInventory().getItemInMainHand().equals(is)){return;} + if(as==null) return; + if(as.getInventory().getItemInMainHand()!= null && as.getInventory().getItemInMainHand().equals(is)){return;} if(as.getInventory().getItemInMainHand()!=null&&!as.getInventory().getItemInMainHand().getType().equals(Material.AIR)){ fEntity asp = as; ItemStack item = asp.getInventory().getItemInMainHand(); diff --git a/src/de/Ste3et_C0st/Furniture/Objects/indoor/sofa.java b/src/de/Ste3et_C0st/Furniture/Objects/indoor/sofa.java index b4fcec6..b4068dc 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/indoor/sofa.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/indoor/sofa.java @@ -152,11 +152,9 @@ public class sofa extends Furniture implements Listener { @EventHandler public void onFurnitureClick(FurnitureClickEvent e){ - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} - e.setCancelled(true); final Player p = e.getPlayer(); if(p.getInventory().getItemInMainHand().getType().equals(Material.INK_SACK)){ getLib().getColorManager().color(p, e.canBuild(), Material.CARPET, getObjID(), ColorType.BLOCK, 12); @@ -187,12 +185,10 @@ public class sofa extends Furniture implements Listener { @EventHandler public void onFurnitureBreak(FurnitureBreakEvent e){ - if(getObjID()==null){return;} - if(e.isCancelled()){return;} + if(e.getID() == null || getObjID() == null) return; if(e.getID()==null){return;} if(!e.getID().equals(getObjID())){return;} if(!getLib().canBuild(e.getPlayer(), getObjID(), EventType.BREAK)){return;} - e.setCancelled(true); for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getPassanger()!=null){ packet.eject(); diff --git a/src/de/Ste3et_C0st/Furniture/Objects/indoor/table.java b/src/de/Ste3et_C0st/Furniture/Objects/indoor/table.java index c3f659a..51d82d4 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/indoor/table.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/indoor/table.java @@ -66,12 +66,10 @@ public class table extends Furniture implements Listener { @EventHandler public void onFurnitureBreak(FurnitureBreakEvent e){ - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} - e.setCancelled(true); for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getName().equalsIgnoreCase("#ITEM#")){ if(packet.getInventory().getItemInMainHand()!=null&&!packet.getInventory().getItemInMainHand().getType().equals(Material.AIR)){ @@ -86,13 +84,11 @@ public class table extends Furniture implements Listener { @EventHandler public void onFurnitureClick(FurnitureClickEvent e){ - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} Player p = e.getPlayer(); if(!e.canBuild()){return;} - e.setCancelled(true); if(p.getInventory().getItemInMainHand().getType().isBlock()&&!p.getInventory().getItemInMainHand().getType().equals(Material.AIR)){return;} for(fEntity packet : getManager().getfArmorStandByObjectID(getObjID())){ if(packet.getName().equalsIgnoreCase("#ITEM#")){ @@ -107,7 +103,9 @@ public class table extends Furniture implements Listener { if(p.getGameMode().equals(GameMode.CREATIVE) && getLib().useGamemode()) break; Integer i = p.getInventory().getHeldItemSlot(); ItemStack is = p.getInventory().getItemInMainHand(); - is.setAmount(is.getAmount()-1); + int amount = is.getAmount(); + amount = amount - 1; + is.setAmount(amount); p.getInventory().setItem(i, is); p.updateInventory(); break; diff --git a/src/de/Ste3et_C0st/Furniture/Objects/light/WaxCandle.java b/src/de/Ste3et_C0st/Furniture/Objects/light/WaxCandle.java index e513c22..673413b 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/light/WaxCandle.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/light/WaxCandle.java @@ -55,9 +55,8 @@ public class WaxCandle extends Furniture{ @EventHandler public void onFurnitureBreak(FurnitureBreakEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || 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;} @@ -67,9 +66,8 @@ public class WaxCandle extends Furniture{ @EventHandler public void onFurnitureBlockBreak(FurnitureBlockBreakEvent e){ - if(getObjID()==null){return;} + if(e.getID() == null || 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;} @@ -79,9 +77,8 @@ public class WaxCandle extends Furniture{ @EventHandler public void onFurnitureClick(FurnitureBlockClickEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || 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;} @@ -98,9 +95,8 @@ public class WaxCandle extends Furniture{ @EventHandler public void onFurnitureClick(FurnitureClickEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || 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;} diff --git a/src/de/Ste3et_C0st/Furniture/Objects/outdoor/CactusPlant.java b/src/de/Ste3et_C0st/Furniture/Objects/outdoor/CactusPlant.java deleted file mode 100644 index b00027c..0000000 --- a/src/de/Ste3et_C0st/Furniture/Objects/outdoor/CactusPlant.java +++ /dev/null @@ -1,109 +0,0 @@ -package de.Ste3et_C0st.Furniture.Objects.outdoor; - -import java.util.ArrayList; -import java.util.List; - -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.inventory.ItemStack; -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.main.Furniture; -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; - -public class CactusPlant extends Furniture implements Listener { - - public CactusPlant(ObjectID id){ - super(id); - if(isFinish()){ - Bukkit.getPluginManager().registerEvents(this, main.getInstance()); - return; - } - spawn(id.getStartLocation()); - } - - @EventHandler - public void onFurnitureBreak(FurnitureBreakEvent e) { - if(getObjID()==null){return;} - if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} - if(!e.getID().equals(getObjID())){return;} - if(!e.canBuild()){return;} - delete(); - e.remove(); - } - - @Override - public void onFurnitureClick(FurnitureClickEvent e) {} - - - public void spawn(Location location) { - List aspList = new ArrayList(); - Location middle = getLutil().getCenter(location); - middle.add(0, -1.9, 0); - middle.setYaw(getLutil().FaceToYaw(getBlockFace())); - - fArmorStand packet = getManager().createArmorStand(getObjID(), middle); - packet.getInventory().setHelmet(new ItemStack(Material.CACTUS)); - aspList.add(packet); - - packet = getManager().createArmorStand(getObjID(), middle.clone().add(0, .63, 0)); - packet.getInventory().setHelmet(new ItemStack(Material.CACTUS)); - aspList.add(packet); - - packet = getManager().createArmorStand(getObjID(), middle.clone().add(0, 1.18, 0)); - packet.getInventory().setHelmet(new ItemStack(Material.CACTUS)); - packet.setPose(getLutil().degresstoRad(new EulerAngle(20, 0, 0)), BodyPart.HEAD); - aspList.add(packet); - - Location l1 = getLutil().getRelativ(middle.clone().add(0, 1.665, 0), getBlockFace(), .16d, 0d); - l1.setYaw(getLutil().FaceToYaw(getBlockFace())); - packet = getManager().createArmorStand(getObjID(), l1); - packet.getInventory().setHelmet(new ItemStack(Material.CACTUS)); - packet.setPose(getLutil().degresstoRad(new EulerAngle(5, 0, 0)), BodyPart.HEAD); - aspList.add(packet); - - l1 = getLutil().getRelativ(middle.clone().add(0, 1.43, 0), getBlockFace(), .1d, 0d); - l1.setYaw(getLutil().FaceToYaw(getBlockFace())); - packet = getManager().createArmorStand(getObjID(), l1); - packet.getInventory().setHelmet(new ItemStack(Material.CACTUS)); - packet.setSmall(true); - packet.setPose(getLutil().degresstoRad(new EulerAngle(60, 0, 0)), BodyPart.HEAD); - aspList.add(packet); - - l1 = getLutil().getRelativ(middle.clone().add(0, 2.3, 0), getBlockFace(), -.07d, 0d); - l1.setYaw(getLutil().FaceToYaw(getBlockFace())); - packet = getManager().createArmorStand(getObjID(), l1); - packet.getInventory().setHelmet(new ItemStack(Material.CACTUS)); - packet.setSmall(true); - packet.setPose(getLutil().degresstoRad(new EulerAngle(-45, 0, 0)), BodyPart.HEAD); - aspList.add(packet); - - l1 = getLutil().getRelativ(middle.clone().add(0, 2.0, 0), getBlockFace(), .07d, .06d); - l1.setYaw(getLutil().FaceToYaw(getBlockFace())); - packet = getManager().createArmorStand(getObjID(), l1); - packet.getInventory().setHelmet(new ItemStack(Material.CACTUS)); - packet.setSmall(true); - packet.setPose(getLutil().degresstoRad(new EulerAngle(0, 0, 45)), BodyPart.HEAD); - aspList.add(packet); - - - - for(fArmorStand as : aspList){ - as.setInvisible(true); - as.setBasePlate(false); - } - - send(); - Bukkit.getPluginManager().registerEvents(this, getPlugin()); - } -} diff --git a/src/de/Ste3et_C0st/Furniture/Objects/outdoor/barrels.java b/src/de/Ste3et_C0st/Furniture/Objects/outdoor/barrels.java index 76368f0..05169ea 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/outdoor/barrels.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/outdoor/barrels.java @@ -50,11 +50,9 @@ public class barrels extends Furniture implements Listener { @EventHandler public void onFurnitureClick(FurnitureClickEvent e){ - if(getObjID()==null){return;} - if(e.isCancelled()){return;} + if(e.getID() == null || getObjID() == null) return; if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} - e.setCancelled(true); Player p = e.getPlayer(); if(!p.getInventory().getItemInMainHand().getType().isBlock()&&!p.getInventory().getItemInMainHand().getType().equals(Material.AIR)){return;} fEntity packet = getManager().getfArmorStandByObjectID(getObjID()).get(0); @@ -78,11 +76,9 @@ public class barrels extends Furniture implements Listener { @EventHandler private void onBlockBreak(FurnitureBlockBreakEvent e){ - if(getObjID()==null){return;} - if(e.isCancelled()){return;} + if(e.getID() == null || getObjID() == null) return; if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} - e.setCancelled(true); fEntity packet = getManager().getfArmorStandByObjectID(getObjID()).get(0); if(packet.getInventory().getHelmet()!=null&&!packet.getInventory().getHelmet().getType().equals(Material.AIR)){ ItemStack is = packet.getInventory().getHelmet(); @@ -95,12 +91,10 @@ public class barrels extends Furniture implements Listener { @EventHandler private void onBlockClick(FurnitureBlockClickEvent e){ - if(getObjID()==null){return;} - if(e.isCancelled()){return;} + if(e.getID() == null || getObjID() == null) return; if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} if(!e.getPlayer().getInventory().getItemInMainHand().getType().isBlock()&&!e.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.AIR)){return;} - e.setCancelled(true); ItemStack Itemstack = e.getPlayer().getInventory().getItemInMainHand().clone(); Itemstack.setAmount(1); fEntity packet = getManager().getfArmorStandByObjectID(getObjID()).get(0); @@ -125,11 +119,9 @@ public class barrels extends Furniture implements Listener { @EventHandler public void onFurnitureBreak(FurnitureBreakEvent e){ - if(getObjID()==null){return;} - if(e.isCancelled()){return;} + if(e.getID() == null || getObjID() == null) return; if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} - e.setCancelled(true); fEntity packet = getManager().getfArmorStandByObjectID(getObjID()).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/campfire_1.java b/src/de/Ste3et_C0st/Furniture/Objects/outdoor/campfire_1.java index e625d2b..8e99b55 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/outdoor/campfire_1.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/outdoor/campfire_1.java @@ -32,7 +32,6 @@ public class campfire_1 extends Furniture implements Listener{ public void onFurnitureBreak(FurnitureBreakEvent e){ if(getObjID()==null||e.getID()==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;} @@ -49,12 +48,10 @@ public class campfire_1 extends Furniture implements Listener{ @EventHandler public void onFurnitureClick(FurnitureClickEvent e){ - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} - e.setCancelled(true); List aspList = getManager().getfArmorStandByObjectID(getObjID()); ItemStack is = e.getPlayer().getInventory().getItemInMainHand(); if(is.getType().equals(Material.WATER_BUCKET)){ 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 e4a401f..adfa70e 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/outdoor/campfire_2.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/outdoor/campfire_2.java @@ -151,12 +151,10 @@ public class campfire_2 extends Furniture implements Listener{ @EventHandler public void onFurnitureClick(FurnitureClickEvent e){ - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} - e.setCancelled(true); List aspList = getManager().getfArmorStandByObjectID(getObjID()); final ItemStack itemStack = e.getPlayer().getInventory().getItemInMainHand(); fArmorStand packet = null; @@ -211,12 +209,10 @@ public class campfire_2 extends Furniture implements Listener{ @EventHandler public void onFurnitureBreak(FurnitureBreakEvent e){ - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} - e.setCancelled(true); if(isRunning()){ Bukkit.getScheduler().cancelTask(timer); timer=null; diff --git a/src/de/Ste3et_C0st/Furniture/Objects/outdoor/hammock.java b/src/de/Ste3et_C0st/Furniture/Objects/outdoor/hammock.java index 50b1a1a..0cb93ed 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/outdoor/hammock.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/outdoor/hammock.java @@ -77,9 +77,8 @@ public class hammock extends Furniture implements Listener{ @EventHandler public void onFurnitureBreak(FurnitureBreakEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || 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(!e.canBuild()){return;} @@ -89,9 +88,8 @@ public class hammock extends Furniture implements Listener{ @EventHandler public void onFurnitureBreak(FurnitureBlockBreakEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} e.remove(); @@ -100,9 +98,8 @@ public class hammock extends Furniture implements Listener{ @EventHandler public void onFurnitureClick(FurnitureClickEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} List aspList = getManager().getfArmorStandByObjectID(getObjID()); Player p = e.getPlayer(); @@ -136,9 +133,8 @@ public class hammock extends Furniture implements Listener{ @EventHandler public void onFurnitureClick(FurnitureBlockClickEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} List aspList = getManager().getfArmorStandByObjectID(getObjID()); Player p = e.getPlayer(); 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 498ec8d..5bd4b82 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_1.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_1.java @@ -227,10 +227,8 @@ public class tent_1 extends Furniture implements Listener{ public void onFurnitureBreak(FurnitureBreakEvent e){ if(getObjID()==null||e.getID()==null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} - e.setCancelled(true); block.setType(Material.AIR); e.remove(); delete(); @@ -238,12 +236,10 @@ public class tent_1 extends Furniture implements Listener{ @EventHandler public void onFurnitureClick(FurnitureClickEvent e){ - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} - e.setCancelled(true); final Player p = e.getPlayer(); if(!p.getInventory().getItemInMainHand().getType().equals(Material.INK_SACK)){ p.openWorkbench(this.block.getLocation(), true); 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 f316188..0e4e859 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_2.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_2.java @@ -156,7 +156,7 @@ public class tent_2 extends Furniture implements Listener{ bedLoc = getLutil().setBed(this.getBlockFace(), b1); - getObjID().addBlock(Arrays.asList(b1.getWorld().getBlockAt(b1))); + getObjID().addBlock(Arrays.asList(b1.getBlock(), b2.getBlock(), b1.getBlock().getRelative(getLutil().yawToFace(getLutil().FaceToYaw(getBlockFace()) + 180)))); block.add(b1.getWorld().getBlockAt(b1)); block.add(b2.getWorld().getBlockAt(b2)); } @@ -177,12 +177,10 @@ public class tent_2 extends Furniture implements Listener{ @EventHandler public void onFurnitureBreak(FurnitureBreakEvent e){ - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} - e.setCancelled(true); for(Block bl : block){ bl.setType(Material.AIR); } @@ -192,11 +190,9 @@ public class tent_2 extends Furniture implements Listener{ @EventHandler public void onFurnitureClick(final FurnitureClickEvent e){ - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} - e.setCancelled(true); Player p = e.getPlayer(); if(!e.canBuild()){return;} if(!p.getInventory().getItemInMainHand().getType().equals(Material.INK_SACK)){ 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 7be2407..9f83e8d 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_3.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/outdoor/tent_3.java @@ -155,12 +155,10 @@ public class tent_3 extends Furniture implements Listener{ @EventHandler public void onFurnitureBreak(FurnitureBreakEvent e){ - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} - e.setCancelled(true); bed.setType(Material.AIR); e.remove(); delete(); @@ -168,11 +166,9 @@ public class tent_3 extends Furniture implements Listener{ @EventHandler public void onFurnitureClick(FurnitureClickEvent e){ - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} - e.setCancelled(true); if(!e.canBuild()){return;} Player p = e.getPlayer(); if(p.getInventory().getItemInMainHand().getType().equals(Material.INK_SACK)){ diff --git a/src/de/Ste3et_C0st/Furniture/Objects/trap/BearTrap.java b/src/de/Ste3et_C0st/Furniture/Objects/trap/BearTrap.java index f64b2f2..ec7b080 100644 --- a/src/de/Ste3et_C0st/Furniture/Objects/trap/BearTrap.java +++ b/src/de/Ste3et_C0st/Furniture/Objects/trap/BearTrap.java @@ -104,9 +104,8 @@ public class BearTrap extends Furniture implements Listener{ @EventHandler public void onFurnitureBreak(FurnitureBreakEvent e){ - if(getObjID()==null){return;} + if(e.getID() == null || 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(!e.canBuild()){return;} @@ -116,9 +115,8 @@ public class BearTrap extends Furniture implements Listener{ @EventHandler public void onFurnitureClick(FurnitureClickEvent e) { - if(getObjID()==null){return;} + if(e.getID() == null || getObjID() == null) return; if(getObjID().getSQLAction().equals(SQLAction.REMOVE)){return;} - if(e.isCancelled()){return;} if(!e.getID().equals(getObjID())){return;} if(!e.canBuild()){return;} if(b){ diff --git a/src/plugin.yml b/src/plugin.yml index 07bab79..16a6624 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,5 +1,5 @@ name: DiceFurniture -version: 2.9.2 +version: 3.1 description: Add some new Objects to the Server author: Ste3et_C0st website: http://dicecraft.de diff --git a/src/range.yml b/src/range.yml new file mode 100644 index 0000000..15a6a91 --- /dev/null +++ b/src/range.yml @@ -0,0 +1,16 @@ +rangeOptions: + Range1: + height: 0.25 + width: 1.2 + Range2: + height: 0.5 + width: 1.2 + Range3: + height: 0.75 + width: 1.2 + Range4: + height: 1.0 + width: 1.2 + Range5: + height: 1.3 + width: 1.2 \ No newline at end of file