mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-10-25 15:43:44 +02:00 
			
		
		
		
	Compare commits
	
		
			101 Commits
		
	
	
		
			7.4.2
			...
			fix/v7/faw
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 22974d6478 | ||
|   | 4924ffe03b | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | cd6a32cf44 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 273c0ad989 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 774da7183b | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | e083015ab2 | ||
|   | 3f577d039b | ||
|   | 4d2e4a3d1a | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | e5d36579b1 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | f0cde251bd | ||
|   | 58016bb1c8 | ||
|   | e5943ba627 | ||
|   | 07dfdeef2c | ||
|   | 025b08e716 | ||
|   | 921435689e | ||
|   | aae154b23a | ||
|   | 0f33465d76 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 438f1d9656 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | cb38aeef93 | ||
|   | 7be0655b86 | ||
|   | 774298bef5 | ||
|   | 6fc25bc034 | ||
|   | 1054018e1e | ||
|   | 0508a7f6b6 | ||
|   | da0a57a48c | ||
|   | 87859b002b | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 4f4ba07bd2 | ||
|   | 53771a3ece | ||
|   | f020a6c6da | ||
|   | d7e158747e | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 4d64ea83ec | ||
|   | 7ab334562c | ||
|   | fe1ef36f7e | ||
|   | 70bc02985f | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 3ec7e992a3 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 9acaa9c554 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | e132c01331 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 24e4e51884 | ||
|   | 84ec090df1 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 6c6ea1c1b4 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 97989face1 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | f471c02330 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 94322d5982 | ||
|   | 6cbb894249 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 6f0fa19601 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 0b692459e6 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 0d410ed869 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 711fba0b2a | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 671a27fa6f | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 03de685dc4 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | f616885206 | ||
|   | 7da4eb1ab5 | ||
|   | 629646ab06 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 74a1a1f954 | ||
|   | aa44078018 | ||
|   | bfbf406418 | ||
|   | 2accedf264 | ||
|   | 6ef0d58480 | ||
|   | fbf4a638b4 | ||
|   | 9abfa21078 | ||
|   | b84599b4b3 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 058983cdd5 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 6ba3694121 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 8e8e31b80e | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | da2e66c1f8 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | d5d6fcb859 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 96f73331f9 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 020947d90c | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 7dbd0bcff8 | ||
|   | 9626302f04 | ||
|   | 1b4a347e8b | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 19e6ed4b9b | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 6b1b0f2d6a | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | e499bc02ec | ||
|   | 62084fffdd | ||
|   | d012f79349 | ||
|   | 139d6efc70 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 6f5cb917f2 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 9bf66f1b7c | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 92875ebe7f | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 25a4545f14 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 3fdeed019b | ||
|   | f3400df811 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | beb7cb40f4 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 2c0bb03e5c | ||
|   | e8c170686c | ||
|   | ff8676cde3 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 817effb735 | ||
|   | a0a3d8828a | ||
|   | 8741bfcf88 | ||
|   | 6a6c113e5b | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 3f573b4d46 | ||
|   | 2f6db9c3db | ||
|   | 2f050b7b47 | ||
|   | eb0d854870 | ||
|   | d4f10422e3 | ||
|   | 4e2ea67992 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | f533e194f4 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 98bc2e7407 | ||
|   | 1b9d0d5317 | ||
|   | 8bb15d5c65 | 
							
								
								
									
										1
									
								
								.github/ISSUE_TEMPLATE/bug_report.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/ISSUE_TEMPLATE/bug_report.yml
									
									
									
									
										vendored
									
									
								
							| @@ -27,6 +27,7 @@ body: | ||||
|       description: Which server version are you using? If your server version is not listed, it is not supported. Update to a supported version first. | ||||
|       multiple: false | ||||
|       options: | ||||
|         - '1.21.4' | ||||
|         - '1.21.3' | ||||
|         - '1.21.1' | ||||
|         - '1.20.6' | ||||
|   | ||||
							
								
								
									
										3
									
								
								.github/renovate.json
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.github/renovate.json
									
									
									
									
										vendored
									
									
								
							| @@ -2,7 +2,8 @@ | ||||
|   "$schema": "https://docs.renovatebot.com/renovate-schema.json", | ||||
|   "extends": [ | ||||
|     "config:recommended", | ||||
|     ":semanticCommitsDisabled" | ||||
|     ":semanticCommitsDisabled", | ||||
|     "schedule:earlyMondays" | ||||
|   ], | ||||
|   "automerge": true, | ||||
|   "labels": [ | ||||
|   | ||||
| @@ -11,7 +11,7 @@ jobs: | ||||
|           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} | ||||
|           DISCORD_USERNAME: PlotSquared Release | ||||
|           DISCORD_AVATAR: https://raw.githubusercontent.com/IntellectualSites/Assets/main/plugins/PlotSquared/PlotSquared.png | ||||
|         uses: Ilshidur/action-discord@0.3.2 | ||||
|         uses: Ilshidur/action-discord@0.4.0 | ||||
|         with: | ||||
|           args: | | ||||
|             "<@&525015541815967744> <@&679322738552471574> <@&699293353862496266>" | ||||
|   | ||||
							
								
								
									
										12
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							| @@ -29,18 +29,18 @@ jobs: | ||||
|           fi | ||||
|       - name: Publish Release | ||||
|         if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}} | ||||
|         run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository | ||||
|         run: ./gradlew publishAndReleaseToMavenCentral --no-configuration-cache | ||||
|         env: | ||||
|           ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }} | ||||
|           ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }} | ||||
|           ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.CENTRAL_USERNAME }} | ||||
|           ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.CENTRAL_PASSWORD }} | ||||
|           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }} | ||||
|           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }} | ||||
|       - name: Publish Snapshot | ||||
|         if: ${{ runner.os == 'Linux' && env.STATUS != 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main' }} | ||||
|         run: ./gradlew publishToSonatype | ||||
|         run: ./gradlew publishAllPublicationsToMavenCentralRepository | ||||
|         env: | ||||
|           ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }} | ||||
|           ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }} | ||||
|           ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.CENTRAL_USERNAME }} | ||||
|           ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.CENTRAL_PASSWORD }} | ||||
|       - name: Publish core javadoc | ||||
|         if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}} | ||||
|         uses: cpina/github-action-push-to-another-repository@main | ||||
|   | ||||
| @@ -3,7 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar | ||||
| repositories { | ||||
|     maven { | ||||
|         name = "PlaceholderAPI" | ||||
|         url = uri("https://repo.extendedclip.com/content/repositories/placeholderapi/") | ||||
|         url = uri("https://repo.extendedclip.com/releases/") | ||||
|     } | ||||
|  | ||||
|     maven { | ||||
| @@ -39,7 +39,9 @@ dependencies { | ||||
|     } | ||||
|     compileOnly(libs.placeholderapi) | ||||
|     compileOnly(libs.luckperms) | ||||
|     compileOnly(libs.essentialsx) | ||||
|     compileOnly(libs.essentialsx) { | ||||
|         exclude(group = "org.spigotmc") | ||||
|     } | ||||
|     compileOnly(libs.mvdwapi) { isTransitive = false } | ||||
|  | ||||
|     // Other libraries | ||||
| @@ -101,7 +103,7 @@ tasks { | ||||
|     withType<Javadoc> { | ||||
|         val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString() | ||||
|         val opt = options as StandardJavadocDocletOptions | ||||
|         opt.links("https://jd.papermc.io/paper/1.20/") | ||||
|         opt.links("https://jd.papermc.io/paper/1.20.4/") | ||||
|         opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString()) | ||||
|         opt.links("https://intellectualsites.github.io/plotsquared-javadocs/core/") | ||||
|         opt.links("https://jd.advntr.dev/api/" + libs.adventureApi.get().versionConstraint.toString()) | ||||
|   | ||||
| @@ -252,6 +252,11 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl | ||||
|         return Bukkit.getVersion(); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public @NonNull String serverBrand() { | ||||
|         return Bukkit.getName(); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     @SuppressWarnings("deprecation") // Paper deprecation | ||||
|     public void onEnable() { | ||||
| @@ -789,22 +794,23 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl | ||||
|                     if (entity.getMetadata("ps_custom_spawned").stream().anyMatch(MetadataValue::asBoolean)) { | ||||
|                         continue; | ||||
|                     } | ||||
|                     // TODO: use (type) pattern matching when targeting java 21 | ||||
|                     switch (entity.getType().toString()) { | ||||
|                         case "EGG": | ||||
|                         case "FISHING_HOOK": | ||||
|                         case "ENDER_SIGNAL": | ||||
|                         case "FISHING_HOOK", "FISHING_BOBBER": | ||||
|                         case "ENDER_SIGNAL", "EYE_OF_ENDER": | ||||
|                         case "AREA_EFFECT_CLOUD": | ||||
|                         case "EXPERIENCE_ORB": | ||||
|                         case "LEASH_HITCH": | ||||
|                         case "FIREWORK": | ||||
|                         case "LIGHTNING": | ||||
|                         case "LEASH_HITCH", "LEASH_KNOT": | ||||
|                         case "FIREWORK", "FIREWORK_ROCKET": | ||||
|                         case "LIGHTNING", "LIGHTNING_BOLT": | ||||
|                         case "WITHER_SKULL": | ||||
|                         case "UNKNOWN": | ||||
|                         case "PLAYER": | ||||
|                             // non moving / unmovable | ||||
|                             continue; | ||||
|                         case "THROWN_EXP_BOTTLE": | ||||
|                         case "SPLASH_POTION": | ||||
|                         case "THROWN_EXP_BOTTLE", "EXPERIENCE_BOTTLE": | ||||
|                         case "SPLASH_POTION", "POTION": | ||||
|                         case "SNOWBALL": | ||||
|                         case "SHULKER_BULLET": | ||||
|                         case "SPECTRAL_ARROW": | ||||
| @@ -831,11 +837,17 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl | ||||
|                         case "HOPPER_MINECART": | ||||
|                         case "MINECART_MOB_SPAWNER": | ||||
|                         case "SPAWNER_MINECART": | ||||
|                         case "ENDER_CRYSTAL": | ||||
|                         case "END_CRYSTAL": | ||||
|                         case "ENDER_CRYSTAL": // Backwards compatibility for 1.20.4 | ||||
|                         case "MINECART_TNT": | ||||
|                         case "TNT_MINECART": | ||||
|                         case "CHEST_BOAT": | ||||
|                         case "BOAT": | ||||
|                         case "ACACIA_BOAT", "BIRCH_BOAT", "CHERRY_BOAT", "DARK_OAK_BOAT", "JUNGLE_BOAT", "MANGROVE_BOAT", | ||||
|                              "OAK_BOAT", "PALE_OAK_BOAT", "SPRUCE_BOAT", "BAMBOO_RAFT": | ||||
|                         case "ACACIA_CHEST_BOAT", "BIRCH_CHEST_BOAT", "CHERRY_CHEST_BOAT", "DARK_OAK_CHEST_BOAT", | ||||
|                              "JUNGLE_CHEST_BOAT", "MANGROVE_CHEST_BOAT", "OAK_CHEST_BOAT", "PALE_OAK_CHEST_BOAT", | ||||
|                              "SPRUCE_CHEST_BOAT", "BAMBOO_CHEST_RAFT": | ||||
|                             if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) { | ||||
|                                 com.plotsquared.core.location.Location location = BukkitUtil.adapt(entity.getLocation()); | ||||
|                                 Plot plot = location.getPlot(); | ||||
| @@ -864,14 +876,14 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl | ||||
|                         case "SMALL_FIREBALL": | ||||
|                         case "FIREBALL": | ||||
|                         case "DRAGON_FIREBALL": | ||||
|                         case "DROPPED_ITEM": | ||||
|                         case "DROPPED_ITEM", "ITEM": | ||||
|                             if (Settings.Enabled_Components.KILL_ROAD_ITEMS | ||||
|                                     && plotArea.getOwnedPlotAbs(BukkitUtil.adapt(entity.getLocation())) == null) { | ||||
|                                 this.removeRoadEntity(entity, iterator); | ||||
|                             } | ||||
|                             // dropped item | ||||
|                             continue; | ||||
|                         case "PRIMED_TNT": | ||||
|                         case "PRIMED_TNT", "TNT": | ||||
|                         case "FALLING_BLOCK": | ||||
|                             // managed elsewhere | ||||
|                             continue; | ||||
| @@ -944,12 +956,14 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl | ||||
|                         case "ENDERMITE": | ||||
|                         case "ENDER_DRAGON": | ||||
|                         case "GHAST": | ||||
|                         case "HAPPY_GHAST": // 1.21.6+ | ||||
|                         case "GHASTLING": // 1.21.6+ | ||||
|                         case "GIANT": | ||||
|                         case "GUARDIAN": | ||||
|                         case "HORSE": | ||||
|                         case "IRON_GOLEM": | ||||
|                         case "MAGMA_CUBE": | ||||
|                         case "MUSHROOM_COW": | ||||
|                         case "MUSHROOM_COW", "MOOSHROOM": | ||||
|                         case "OCELOT": | ||||
|                         case "PIG": | ||||
|                         case "PIG_ZOMBIE": | ||||
| @@ -958,7 +972,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl | ||||
|                         case "SILVERFISH": | ||||
|                         case "SKELETON": | ||||
|                         case "SLIME": | ||||
|                         case "SNOWMAN": | ||||
|                         case "SNOWMAN", "SNOW_GOLEM": | ||||
|                         case "SPIDER": | ||||
|                         case "SQUID": | ||||
|                         case "VILLAGER": | ||||
|   | ||||
| @@ -25,7 +25,6 @@ import org.bukkit.Art; | ||||
| import org.bukkit.DyeColor; | ||||
| import org.bukkit.Location; | ||||
| import org.bukkit.Rotation; | ||||
| import org.bukkit.TreeSpecies; | ||||
| import org.bukkit.World; | ||||
| import org.bukkit.block.BlockFace; | ||||
| import org.bukkit.entity.AbstractHorse; | ||||
| @@ -34,6 +33,7 @@ import org.bukkit.entity.ArmorStand; | ||||
| import org.bukkit.entity.Bat; | ||||
| import org.bukkit.entity.Boat; | ||||
| import org.bukkit.entity.Breedable; | ||||
| import org.bukkit.entity.ChestBoat; | ||||
| import org.bukkit.entity.ChestedHorse; | ||||
| import org.bukkit.entity.EnderDragon; | ||||
| import org.bukkit.entity.Entity; | ||||
| @@ -44,7 +44,6 @@ import org.bukkit.entity.LivingEntity; | ||||
| import org.bukkit.entity.Painting; | ||||
| import org.bukkit.entity.Rabbit; | ||||
| import org.bukkit.entity.Sheep; | ||||
| import org.bukkit.entity.Slime; | ||||
| import org.bukkit.entity.Tameable; | ||||
| import org.bukkit.inventory.EntityEquipment; | ||||
| import org.bukkit.inventory.InventoryHolder; | ||||
| @@ -103,12 +102,20 @@ public final class ReplicatingEntityWrapper extends EntityWrapper { | ||||
|             this.noGravity = true; | ||||
|         } | ||||
|         switch (entity.getType().toString()) { | ||||
|             case "BOAT" -> { | ||||
|             case "BOAT", "ACACIA_BOAT", "BIRCH_BOAT", "CHERRY_BOAT", "DARK_OAK_BOAT", "JUNGLE_BOAT", "MANGROVE_BOAT", | ||||
|                  "OAK_BOAT", "PALE_OAK_BOAT", "SPRUCE_BOAT", "BAMBOO_RAFT" -> { | ||||
|                 Boat boat = (Boat) entity; | ||||
|                 this.dataByte = getOrdinal(TreeSpecies.values(), boat.getWoodType()); | ||||
|                 this.dataByte = getOrdinal(Boat.Type.values(), boat.getBoatType()); | ||||
|                 return; | ||||
|             } | ||||
|             case "ARROW", "EGG", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "EXPERIENCE_ORB", "FALLING_BLOCK", "FIREBALL", | ||||
|             case "ACACIA_CHEST_BOAT", "BIRCH_CHEST_BOAT", "CHERRY_CHEST_BOAT", "DARK_OAK_CHEST_BOAT", | ||||
|                  "JUNGLE_CHEST_BOAT", "MANGROVE_CHEST_BOAT", "OAK_CHEST_BOAT", "PALE_OAK_CHEST_BOAT", | ||||
|                  "SPRUCE_CHEST_BOAT", "BAMBOO_CHEST_RAFT" -> { | ||||
|                 ChestBoat boat = (ChestBoat) entity; | ||||
|                 this.dataByte = getOrdinal(Boat.Type.values(), boat.getBoatType()); | ||||
|                 storeInventory(boat); | ||||
|             } | ||||
|             case "ARROW", "EGG", "END_CRYSTAL", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "EXPERIENCE_ORB", "FALLING_BLOCK", "FIREBALL", | ||||
|                     "FIREWORK", "FISHING_HOOK", "LEASH_HITCH", "LIGHTNING", "MINECART", "MINECART_COMMAND", "MINECART_MOB_SPAWNER", | ||||
|                     "MINECART_TNT", "PLAYER", "PRIMED_TNT", "SLIME", "SMALL_FIREBALL", "SNOWBALL", "MINECART_FURNACE", "SPLASH_POTION", | ||||
|                     "THROWN_EXP_BOTTLE", "WITHER_SKULL", "UNKNOWN", "SPECTRAL_ARROW", "SHULKER_BULLET", "DRAGON_FIREBALL", "AREA_EFFECT_CLOUD", | ||||
| @@ -117,7 +124,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper { | ||||
|                 return; | ||||
|             } | ||||
|             // MISC // | ||||
|             case "DROPPED_ITEM" -> { | ||||
|             case "DROPPED_ITEM", "ITEM" -> { | ||||
|                 Item item = (Item) entity; | ||||
|                 this.stack = item.getItemStack(); | ||||
|                 return; | ||||
| @@ -147,14 +154,14 @@ public final class ReplicatingEntityWrapper extends EntityWrapper { | ||||
|             } | ||||
|             // END MISC // | ||||
|             // INVENTORY HOLDER // | ||||
|             case "MINECART_CHEST", "MINECART_HOPPER" -> { | ||||
|             case "MINECART_CHEST", "CHEST_MINECART", "MINECART_HOPPER", "HOPPER_MINECART" -> { | ||||
|                 storeInventory((InventoryHolder) entity); | ||||
|                 return; | ||||
|             } | ||||
|             // START LIVING ENTITY // | ||||
|             // START AGEABLE // | ||||
|             // START TAMEABLE // | ||||
|             case "HORSE", "DONKEY", "LLAMA", "MULE", "SKELETON_HORSE" -> { | ||||
|             case "CAMEL", "HORSE", "DONKEY", "LLAMA", "TRADER_LLAMA", "MULE", "SKELETON_HORSE", "ZOMBIE_HORSE" -> { | ||||
|                 AbstractHorse horse = (AbstractHorse) entity; | ||||
|                 this.horse = new HorseStats(); | ||||
|                 this.horse.jump = horse.getJumpStrength(); | ||||
| @@ -172,14 +179,13 @@ public final class ReplicatingEntityWrapper extends EntityWrapper { | ||||
|                 return; | ||||
|             } | ||||
|             // END INVENTORY HOLDER // | ||||
|             case "WOLF", "OCELOT" -> { | ||||
|             case "WOLF", "OCELOT", "CAT", "PARROT" -> { | ||||
|                 storeTameable((Tameable) entity); | ||||
|                 storeBreedable((Breedable) entity); | ||||
|                 storeLiving((LivingEntity) entity); | ||||
|                 return; | ||||
|             } | ||||
|             // END TAMEABLE // | ||||
|             //todo fix sheep | ||||
|             case "SHEEP" -> { | ||||
|                 Sheep sheep = (Sheep) entity; | ||||
|                 if (sheep.isSheared()) { | ||||
| @@ -187,7 +193,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper { | ||||
|                 } else { | ||||
|                     this.dataByte = (byte) 0; | ||||
|                 } | ||||
|                 this.dataByte2 = sheep.getColor().getDyeData(); | ||||
|                 this.dataByte2 = getOrdinal(DyeColor.values(), sheep.getColor()); | ||||
|                 storeBreedable(sheep); | ||||
|                 storeLiving(sheep); | ||||
|                 return; | ||||
| @@ -266,9 +272,9 @@ public final class ReplicatingEntityWrapper extends EntityWrapper { | ||||
|                 this.dataByte = (byte) entity1.getPhase().ordinal(); | ||||
|                 return; | ||||
|             } | ||||
|             case "SKELETON", "WITHER_SKELETON", "GUARDIAN", "ELDER_GUARDIAN", "GHAST", "MAGMA_CUBE", "SQUID", "PIG_ZOMBIE", "HOGLIN", | ||||
|             case "SKELETON", "WITHER_SKELETON", "GUARDIAN", "ELDER_GUARDIAN", "GHAST", "HAPPY_GHAST", "GHASTLING", "MAGMA_CUBE", "SQUID", "PIG_ZOMBIE", "HOGLIN", | ||||
|                     "ZOMBIFIED_PIGLIN", "PIGLIN", "PIGLIN_BRUTE", "ZOMBIE", "WITHER", "WITCH", "SPIDER", "CAVE_SPIDER", "SILVERFISH", | ||||
|                     "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SHULKER", "SNOWMAN" -> { | ||||
|                     "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SHULKER", "SNOWMAN", "SNOW_GOLEM" -> { | ||||
|                 storeLiving((LivingEntity) entity); | ||||
|                 return; | ||||
|             } | ||||
| @@ -450,7 +456,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper { | ||||
|         } | ||||
|         Entity entity; | ||||
|         switch (this.getType().toString()) { | ||||
|             case "DROPPED_ITEM" -> { | ||||
|             case "DROPPED_ITEM", "ITEM" -> { | ||||
|                 return world.dropItem(location, this.stack); | ||||
|             } | ||||
|             case "PLAYER", "LEASH_HITCH" -> { | ||||
| @@ -486,16 +492,26 @@ public final class ReplicatingEntityWrapper extends EntityWrapper { | ||||
|             entity.setGravity(false); | ||||
|         } | ||||
|         switch (entity.getType().toString()) { | ||||
|             case "BOAT" -> { | ||||
|             case "BOAT", "ACACIA_BOAT", "BIRCH_BOAT", "CHERRY_BOAT", "DARK_OAK_BOAT", "JUNGLE_BOAT", "MANGROVE_BOAT", | ||||
|                  "OAK_BOAT", "PALE_OAK_BOAT", "SPRUCE_BOAT", "BAMBOO_RAFT" -> { | ||||
|                 Boat boat = (Boat) entity; | ||||
|                 boat.setWoodType(TreeSpecies.values()[dataByte]); | ||||
|                 boat.setBoatType(Boat.Type.values()[dataByte]); | ||||
|                 return entity; | ||||
|             } | ||||
|             case "SLIME" -> { | ||||
|             case "ACACIA_CHEST_BOAT", "BIRCH_CHEST_BOAT", "CHERRY_CHEST_BOAT", "DARK_OAK_CHEST_BOAT", | ||||
|                  "JUNGLE_CHEST_BOAT", "MANGROVE_CHEST_BOAT", "OAK_CHEST_BOAT", "PALE_OAK_CHEST_BOAT", | ||||
|                  "SPRUCE_CHEST_BOAT", "BAMBOO_CHEST_RAFT" -> { | ||||
|                 ChestBoat boat = (ChestBoat) entity; | ||||
|                 boat.setBoatType(Boat.Type.values()[dataByte]); | ||||
|                 restoreInventory(boat); | ||||
|                 return entity; | ||||
|             } | ||||
|             // SLIME is not even stored | ||||
|             /* case "SLIME" -> { | ||||
|                 ((Slime) entity).setSize(this.dataByte); | ||||
|                 return entity; | ||||
|             } | ||||
|             case "ARROW", "EGG", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "DROPPED_ITEM", "EXPERIENCE_ORB", "FALLING_BLOCK", | ||||
|             } */ | ||||
|             case "ARROW", "EGG", "END_CRYSTAL", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "DROPPED_ITEM", "EXPERIENCE_ORB", "FALLING_BLOCK", | ||||
|                     "FIREBALL", "FIREWORK", "FISHING_HOOK", "LEASH_HITCH", "LIGHTNING", "MINECART", "MINECART_COMMAND", | ||||
|                     "MINECART_MOB_SPAWNER", "MINECART_TNT", "PLAYER", "PRIMED_TNT", "SMALL_FIREBALL", "SNOWBALL", | ||||
|                     "SPLASH_POTION", "THROWN_EXP_BOTTLE", "SPECTRAL_ARROW", "SHULKER_BULLET", "AREA_EFFECT_CLOUD", | ||||
| @@ -518,14 +534,14 @@ public final class ReplicatingEntityWrapper extends EntityWrapper { | ||||
|             } | ||||
|             // END MISC // | ||||
|             // INVENTORY HOLDER // | ||||
|             case "MINECART_CHEST", "MINECART_HOPPER" -> { | ||||
|             case "MINECART_CHEST", "CHEST_MINECART", "MINECART_HOPPER", "HOPPER_MINECART" -> { | ||||
|                 restoreInventory((InventoryHolder) entity); | ||||
|                 return entity; | ||||
|             } | ||||
|             // START LIVING ENTITY // | ||||
|             // START AGEABLE // | ||||
|             // START TAMEABLE // | ||||
|             case "HORSE", "LLAMA", "SKELETON_HORSE", "DONKEY", "MULE" -> { | ||||
|             case "CAMEL", "HORSE", "DONKEY", "LLAMA", "TRADER_LLAMA", "MULE", "SKELETON_HORSE", "ZOMBIE_HORSE" -> { | ||||
|                 AbstractHorse horse = (AbstractHorse) entity; | ||||
|                 horse.setJumpStrength(this.horse.jump); | ||||
|                 if (horse instanceof ChestedHorse) { | ||||
| @@ -542,7 +558,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper { | ||||
|                 return entity; | ||||
|             } | ||||
|             // END INVENTORY HOLDER // | ||||
|             case "WOLF", "OCELOT" -> { | ||||
|             case "WOLF", "OCELOT", "CAT", "PARROT" -> { | ||||
|                 restoreTameable((Tameable) entity); | ||||
|                 restoreBreedable((Breedable) entity); | ||||
|                 restoreLiving((LivingEntity) entity); | ||||
| @@ -555,7 +571,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper { | ||||
|                     sheep.setSheared(true); | ||||
|                 } | ||||
|                 if (this.dataByte2 != 0) { | ||||
|                     sheep.setColor(DyeColor.getByDyeData(this.dataByte2)); | ||||
|                     sheep.setColor(DyeColor.values()[this.dataByte2]); | ||||
|                 } | ||||
|                 restoreBreedable(sheep); | ||||
|                 restoreLiving(sheep); | ||||
| @@ -660,7 +676,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper { | ||||
|                 restoreLiving((LivingEntity) entity); | ||||
|                 return entity; | ||||
|             } | ||||
|             case "ENDERMITE", "GHAST", "MAGMA_CUBE", "SQUID", "PIG_ZOMBIE", "HOGLIN", "PIGLIN", "ZOMBIFIED_PIGLIN", "PIGLIN_BRUTE", "ZOMBIE", "WITHER", "WITCH", "SPIDER", "CAVE_SPIDER", "SILVERFISH", "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SNOWMAN", "SHULKER", "GUARDIAN", "ELDER_GUARDIAN", "SKELETON", "WITHER_SKELETON" -> { | ||||
|             case "ENDERMITE", "GHAST", "HAPPY_GHAST", "GHASTLING", "MAGMA_CUBE", "SQUID", "PIG_ZOMBIE", "HOGLIN", "PIGLIN", "ZOMBIFIED_PIGLIN", "PIGLIN_BRUTE", "ZOMBIE", "WITHER", "WITCH", "SPIDER", "CAVE_SPIDER", "SILVERFISH", "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SNOWMAN", "SHULKER", "GUARDIAN", "ELDER_GUARDIAN", "SKELETON", "WITHER_SKELETON" -> { | ||||
|                 restoreLiving((LivingEntity) entity); | ||||
|                 return entity; | ||||
|             } | ||||
|   | ||||
| @@ -28,7 +28,6 @@ import com.plotsquared.core.plot.flag.implementations.CopperOxideFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.MiscInteractFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.SculkSensorInteractFlag; | ||||
| import com.plotsquared.core.util.PlotFlagUtil; | ||||
| import org.bukkit.Material; | ||||
| import org.bukkit.block.Block; | ||||
| import org.bukkit.entity.Entity; | ||||
| import org.bukkit.entity.Item; | ||||
| @@ -42,31 +41,11 @@ import org.bukkit.event.block.BlockReceiveGameEvent; | ||||
|  | ||||
| import java.util.List; | ||||
| import java.util.Objects; | ||||
| import java.util.Set; | ||||
| import java.util.UUID; | ||||
|  | ||||
| @SuppressWarnings("unused") | ||||
| public class BlockEventListener117 implements Listener { | ||||
|  | ||||
|     private static final Set<Material> COPPER_OXIDIZING = Set.of( | ||||
|             Material.COPPER_BLOCK, | ||||
|             Material.EXPOSED_COPPER, | ||||
|             Material.WEATHERED_COPPER, | ||||
|             Material.OXIDIZED_COPPER, | ||||
|             Material.CUT_COPPER, | ||||
|             Material.EXPOSED_CUT_COPPER, | ||||
|             Material.WEATHERED_CUT_COPPER, | ||||
|             Material.OXIDIZED_CUT_COPPER, | ||||
|             Material.CUT_COPPER_STAIRS, | ||||
|             Material.EXPOSED_CUT_COPPER_STAIRS, | ||||
|             Material.WEATHERED_CUT_COPPER_STAIRS, | ||||
|             Material.OXIDIZED_CUT_COPPER_STAIRS, | ||||
|             Material.CUT_COPPER_SLAB, | ||||
|             Material.EXPOSED_CUT_COPPER_SLAB, | ||||
|             Material.WEATHERED_CUT_COPPER_SLAB, | ||||
|             Material.OXIDIZED_CUT_COPPER_SLAB | ||||
|     ); | ||||
|  | ||||
|     @Inject | ||||
|     public BlockEventListener117() { | ||||
|     } | ||||
| @@ -134,7 +113,7 @@ public class BlockEventListener117 implements Listener { | ||||
|     public void onBlockFertilize(BlockFertilizeEvent event) { | ||||
|         Block block = event.getBlock(); | ||||
|         List<org.bukkit.block.BlockState> blocks = event.getBlocks(); | ||||
|         Location location = BukkitUtil.adapt(blocks.get(0).getLocation()); | ||||
|         Location location = BukkitUtil.adapt(block.getLocation()); | ||||
|  | ||||
|         PlotArea area = location.getPlotArea(); | ||||
|         if (area == null) { | ||||
| @@ -184,7 +163,7 @@ public class BlockEventListener117 implements Listener { | ||||
|         if (plot == null) { | ||||
|             return; | ||||
|         } | ||||
|         if (COPPER_OXIDIZING.contains(event.getNewState().getType())) { | ||||
|         if (event.getNewState().getType().name().contains("COPPER")) { | ||||
|             if (!plot.getFlag(CopperOxideFlag.class)) { | ||||
|                 plot.debug("Copper could not oxide because copper-oxide = false"); | ||||
|                 event.setCancelled(true); | ||||
|   | ||||
| @@ -42,6 +42,7 @@ import com.plotsquared.core.plot.world.PlotAreaManager; | ||||
| import com.plotsquared.core.util.EventDispatcher; | ||||
| import com.plotsquared.core.util.PlotFlagUtil; | ||||
| import com.sk89q.worldedit.bukkit.BukkitAdapter; | ||||
| import com.sk89q.worldedit.util.Enums; | ||||
| import com.sk89q.worldedit.world.block.BlockType; | ||||
| import io.papermc.lib.PaperLib; | ||||
| import org.bukkit.Material; | ||||
| @@ -57,6 +58,7 @@ import org.bukkit.entity.Player; | ||||
| import org.bukkit.entity.Projectile; | ||||
| import org.bukkit.entity.TNTPrimed; | ||||
| import org.bukkit.entity.Vehicle; | ||||
| import org.bukkit.entity.minecart.ExplosiveMinecart; | ||||
| import org.bukkit.event.Cancellable; | ||||
| import org.bukkit.event.EventHandler; | ||||
| import org.bukkit.event.EventPriority; | ||||
| @@ -78,10 +80,17 @@ import org.checkerframework.checker.nullness.qual.NonNull; | ||||
|  | ||||
| import java.util.Iterator; | ||||
| import java.util.List; | ||||
| import java.util.Objects; | ||||
|  | ||||
| @SuppressWarnings("unused") | ||||
| public class EntityEventListener implements Listener { | ||||
|  | ||||
|     private static final Particle EXPLOSION_HUGE = Objects.requireNonNull(Enums.findByValue( | ||||
|             Particle.class, | ||||
|             "EXPLOSION_EMITTER", | ||||
|             "EXPLOSION_HUGE" | ||||
|     )); | ||||
|  | ||||
|     private final BukkitPlatform platform; | ||||
|     private final PlotAreaManager plotAreaManager; | ||||
|     private final EventDispatcher eventDispatcher; | ||||
| @@ -152,8 +161,8 @@ public class EntityEventListener implements Listener { | ||||
|                 } | ||||
|             } | ||||
|             case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL", | ||||
|                     "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN", "NETHER_PORTAL", | ||||
|                     "FROZEN", "SPELL", "DEFAULT" -> { | ||||
|                  "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN", "NETHER_PORTAL", | ||||
|                  "FROZEN", "SPELL", "DEFAULT" -> { | ||||
|                 if (!area.isMobSpawning()) { | ||||
|                     event.setCancelled(true); | ||||
|                     return; | ||||
| @@ -314,7 +323,7 @@ public class EntityEventListener implements Listener { | ||||
|                 if (this.lastRadius != 0) { | ||||
|                     List<Entity> nearby = event.getEntity().getNearbyEntities(this.lastRadius, this.lastRadius, this.lastRadius); | ||||
|                     for (Entity near : nearby) { | ||||
|                         if (near instanceof TNTPrimed || near.getType().equals(EntityType.MINECART_TNT)) { | ||||
|                         if (near instanceof TNTPrimed || near instanceof ExplosiveMinecart) { | ||||
|                             if (!near.hasMetadata("plot")) { | ||||
|                                 near.setMetadata("plot", new FixedMetadataValue((Plugin) PlotSquared.platform(), plot)); | ||||
|                             } | ||||
| @@ -338,7 +347,7 @@ public class EntityEventListener implements Listener { | ||||
|         event.setCancelled(true); | ||||
|         //Spawn Explosion Particles when enabled in settings | ||||
|         if (Settings.General.ALWAYS_SHOW_EXPLOSIONS) { | ||||
|             event.getLocation().getWorld().spawnParticle(Particle.EXPLOSION_HUGE, event.getLocation(), 0); | ||||
|             event.getLocation().getWorld().spawnParticle(EXPLOSION_HUGE, event.getLocation(), 0); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|   | ||||
| @@ -31,8 +31,10 @@ import org.bukkit.Chunk; | ||||
| import org.bukkit.World; | ||||
| import org.bukkit.block.Block; | ||||
| import org.bukkit.entity.ArmorStand; | ||||
| import org.bukkit.entity.EnderCrystal; | ||||
| import org.bukkit.entity.Entity; | ||||
| import org.bukkit.entity.EntityType; | ||||
| import org.bukkit.entity.Item; | ||||
| import org.bukkit.entity.Vehicle; | ||||
| import org.bukkit.event.EventHandler; | ||||
| import org.bukkit.event.EventPriority; | ||||
| @@ -132,7 +134,7 @@ public class EntitySpawnListener implements Listener { | ||||
|         Plot plot = location.getOwnedPlotAbs(); | ||||
|         EntityType type = entity.getType(); | ||||
|         if (plot == null) { | ||||
|             if (type == EntityType.DROPPED_ITEM) { | ||||
|             if (entity instanceof Item) { | ||||
|                 if (Settings.Enabled_Components.KILL_ROAD_ITEMS) { | ||||
|                     event.setCancelled(true); | ||||
|                 } | ||||
| @@ -154,7 +156,7 @@ public class EntitySpawnListener implements Listener { | ||||
|         if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) { | ||||
|             event.setCancelled(true); | ||||
|         } | ||||
|         if (type == EntityType.ENDER_CRYSTAL || type == EntityType.ARMOR_STAND) { | ||||
|         if (entity instanceof EnderCrystal || type == EntityType.ARMOR_STAND) { | ||||
|             if (BukkitEntityUtil.checkEntity(entity, plot)) { | ||||
|                 event.setCancelled(true); | ||||
|             } | ||||
|   | ||||
| @@ -29,6 +29,7 @@ import com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent; | ||||
| import com.destroystokyo.paper.event.server.AsyncTabCompleteEvent; | ||||
| import com.google.inject.Inject; | ||||
| import com.plotsquared.bukkit.util.BukkitUtil; | ||||
| import com.plotsquared.core.PlotSquared; | ||||
| import com.plotsquared.core.command.Command; | ||||
| import com.plotsquared.core.command.MainCommand; | ||||
| import com.plotsquared.core.configuration.Settings; | ||||
| @@ -38,6 +39,7 @@ import com.plotsquared.core.permissions.Permission; | ||||
| import com.plotsquared.core.player.PlotPlayer; | ||||
| import com.plotsquared.core.plot.Plot; | ||||
| import com.plotsquared.core.plot.PlotArea; | ||||
| import com.plotsquared.core.plot.PlotAreaType; | ||||
| import com.plotsquared.core.plot.flag.FlagContainer; | ||||
| import com.plotsquared.core.plot.flag.implementations.BeaconEffectsFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.DoneFlag; | ||||
| @@ -48,10 +50,12 @@ import com.plotsquared.core.plot.flag.types.BooleanFlag; | ||||
| import com.plotsquared.core.plot.world.PlotAreaManager; | ||||
| import com.plotsquared.core.util.PlotFlagUtil; | ||||
| import io.papermc.paper.event.entity.EntityMoveEvent; | ||||
| import io.papermc.paper.event.world.StructuresLocateEvent; | ||||
| import net.kyori.adventure.text.Component; | ||||
| import net.kyori.adventure.text.minimessage.tag.Tag; | ||||
| import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; | ||||
| import org.bukkit.Chunk; | ||||
| import org.bukkit.NamespacedKey; | ||||
| import org.bukkit.block.Block; | ||||
| import org.bukkit.block.TileState; | ||||
| import org.bukkit.entity.Entity; | ||||
| @@ -80,6 +84,9 @@ import java.util.regex.Pattern; | ||||
| @SuppressWarnings("unused") | ||||
| public class PaperListener implements Listener { | ||||
|  | ||||
|     private static final NamespacedKey ITEM = NamespacedKey.minecraft("item"); | ||||
|     private static final NamespacedKey FISHING_BOBBER = NamespacedKey.minecraft("fishing_bobber"); | ||||
|  | ||||
|     private final PlotAreaManager plotAreaManager; | ||||
|     private Chunk lastChunk; | ||||
|  | ||||
| @@ -228,7 +235,7 @@ public class PaperListener implements Listener { | ||||
|         if (plot == null) { | ||||
|             EntityType type = event.getType(); | ||||
|             // PreCreatureSpawnEvent **should** not be called for DROPPED_ITEM, just for the sake of consistency | ||||
|             if (type == EntityType.DROPPED_ITEM) { | ||||
|             if (type.getKey().equals(ITEM)) { | ||||
|                 if (Settings.Enabled_Components.KILL_ROAD_ITEMS) { | ||||
|                     event.setCancelled(true); | ||||
|                 } | ||||
| @@ -354,7 +361,7 @@ public class PaperListener implements Listener { | ||||
|                 event.setCancelled(true); | ||||
|             } | ||||
|         } else if (!plot.isAdded(pp.getUUID())) { | ||||
|             if (entity.getType().equals(EntityType.FISHING_HOOK)) { | ||||
|             if (entity.getType().getKey().equals(FISHING_BOBBER)) { | ||||
|                 if (plot.getFlag(FishingFlag.class)) { | ||||
|                     return; | ||||
|                 } | ||||
| @@ -454,6 +461,21 @@ public class PaperListener implements Listener { | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Don't let the server die when populating cartographers (villager offering maps) in classic plot worlds | ||||
|      * (as those don't generate POIs) | ||||
|      */ | ||||
|     @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST) | ||||
|     public void onStructuresLocate(StructuresLocateEvent event) { | ||||
|         if (!PlotSquared.get().getPlotAreaManager().hasPlotArea(event.getWorld().getName())) { | ||||
|             return; | ||||
|         } | ||||
|         final PlotArea area = PlotSquared.get().getPlotAreaManager().getPlotAreaByString(event.getWorld().getName()); | ||||
|         if (area != null && area.getType() == PlotAreaType.NORMAL) { | ||||
|             event.setCancelled(true); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     private boolean getBooleanFlagValue( | ||||
|             @NonNull FlagContainer container, | ||||
|             @NonNull Class<? extends BooleanFlag<?>> flagClass, | ||||
|   | ||||
| @@ -64,9 +64,11 @@ import com.plotsquared.core.plot.flag.implementations.PreventCreativeCopyFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.TamedInteractFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.TileDropFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.UntrustedVisitFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.UseFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.VehicleBreakFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.VehicleUseFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.VillagerInteractFlag; | ||||
| import com.plotsquared.core.plot.flag.types.BlockTypeWrapper; | ||||
| import com.plotsquared.core.plot.world.PlotAreaManager; | ||||
| import com.plotsquared.core.util.EventDispatcher; | ||||
| import com.plotsquared.core.util.MathMan; | ||||
| @@ -77,7 +79,9 @@ import com.plotsquared.core.util.task.TaskManager; | ||||
| import com.plotsquared.core.util.task.TaskTime; | ||||
| import com.sk89q.worldedit.WorldEdit; | ||||
| import com.sk89q.worldedit.bukkit.BukkitAdapter; | ||||
| import com.sk89q.worldedit.util.Enums; | ||||
| import com.sk89q.worldedit.world.block.BlockType; | ||||
| import com.sk89q.worldedit.world.block.BlockTypes; | ||||
| import io.papermc.lib.PaperLib; | ||||
| import net.kyori.adventure.text.Component; | ||||
| import net.kyori.adventure.text.minimessage.MiniMessage; | ||||
| @@ -88,10 +92,8 @@ import org.bukkit.Bukkit; | ||||
| import org.bukkit.FluidCollisionMode; | ||||
| import org.bukkit.Material; | ||||
| import org.bukkit.block.Block; | ||||
| import org.bukkit.block.BlockFace; | ||||
| import org.bukkit.block.BlockState; | ||||
| import org.bukkit.block.Sign; | ||||
| import org.bukkit.block.data.Waterlogged; | ||||
| import org.bukkit.command.PluginCommand; | ||||
| import org.bukkit.entity.ArmorStand; | ||||
| import org.bukkit.entity.Boat; | ||||
| @@ -154,9 +156,12 @@ import org.bukkit.util.Vector; | ||||
| import org.checkerframework.checker.nullness.qual.NonNull; | ||||
|  | ||||
| import java.lang.reflect.Field; | ||||
| import java.util.Collections; | ||||
| import java.util.HashSet; | ||||
| import java.util.List; | ||||
| import java.util.Locale; | ||||
| import java.util.Objects; | ||||
| import java.util.Optional; | ||||
| import java.util.Set; | ||||
| import java.util.UUID; | ||||
|  | ||||
| @@ -180,7 +185,17 @@ public class PlayerEventListener implements Listener { | ||||
|             Material.WRITABLE_BOOK, | ||||
|             Material.WRITTEN_BOOK | ||||
|     ); | ||||
|  | ||||
|     /** | ||||
|      * The correct EntityType for End Crystal, determined once at class loading time. | ||||
|      * Tries END_CRYSTAL first (1.21+), falls back to ENDER_CRYSTAL (1.20.4 and older). | ||||
|      */ | ||||
|     private static final EntityType END_CRYSTAL_ENTITY_TYPE = Objects.requireNonNull( | ||||
|             Enums.findByValue(EntityType.class, "END_CRYSTAL", "ENDER_CRYSTAL") | ||||
|     ); | ||||
|  | ||||
|     private static final Set<String> DYES; | ||||
|  | ||||
|     static { | ||||
|         Set<String> mutableDyes = new HashSet<>(Set.of( | ||||
|                 "WHITE_DYE", | ||||
| @@ -215,7 +230,7 @@ public class PlayerEventListener implements Listener { | ||||
|         // "temporary" fix for https://hub.spigotmc.org/jira/browse/SPIGOT-7813 | ||||
|         // can (and should) be removed when 1.21 support is dropped | ||||
|         // List of all interactable 1.21 materials | ||||
|         INTERACTABLE_MATERIALS = Material.CHEST.isInteractable() ? null :  Set.of( | ||||
|         INTERACTABLE_MATERIALS = Material.CHEST.isInteractable() ? null : Set.of( | ||||
|                 "REDSTONE_ORE", "DEEPSLATE_REDSTONE_ORE", "CHISELED_BOOKSHELF", "DECORATED_POT", "CHEST", "CRAFTING_TABLE", | ||||
|                 "FURNACE", "JUKEBOX", "OAK_FENCE", "SPRUCE_FENCE", "BIRCH_FENCE", "JUNGLE_FENCE", "ACACIA_FENCE", "CHERRY_FENCE", | ||||
|                 "DARK_OAK_FENCE", "MANGROVE_FENCE", "BAMBOO_FENCE", "CRIMSON_FENCE", "WARPED_FENCE", "PUMPKIN", | ||||
| @@ -376,7 +391,7 @@ public class PlayerEventListener implements Listener { | ||||
|  | ||||
|     @EventHandler | ||||
|     public void onVehicleEntityCollision(VehicleEntityCollisionEvent e) { | ||||
|         if (e.getVehicle().getType() == EntityType.BOAT) { | ||||
|         if (e.getVehicle() instanceof Boat) { | ||||
|             Location location = BukkitUtil.adapt(e.getEntity().getLocation()); | ||||
|             if (location.isPlotArea()) { | ||||
|                 if (e.getEntity() instanceof Player) { | ||||
| @@ -533,12 +548,14 @@ public class PlayerEventListener implements Listener { | ||||
|         // Delayed | ||||
|  | ||||
|         // Async | ||||
|         TaskManager.runTaskLaterAsync(() -> { | ||||
|             if (!player.hasPlayedBefore() && player.isOnline()) { | ||||
|                 player.saveData(); | ||||
|             } | ||||
|             this.eventDispatcher.doJoinTask(pp); | ||||
|         }, TaskTime.seconds(1L)); | ||||
|         TaskManager.runTaskLaterAsync( | ||||
|                 () -> { | ||||
|                     if (!player.hasPlayedBefore() && player.isOnline()) { | ||||
|                         player.saveData(); | ||||
|                     } | ||||
|                     this.eventDispatcher.doJoinTask(pp); | ||||
|                 }, TaskTime.seconds(1L) | ||||
|         ); | ||||
|  | ||||
|         if (pp.hasPermission(Permission.PERMISSION_ADMIN_UPDATE_NOTIFICATION.toString()) && Settings.Enabled_Components.UPDATE_NOTIFICATIONS | ||||
|                 && PremiumVerification.isPremium() && UpdateUtility.hasUpdate) { | ||||
| @@ -593,14 +610,20 @@ public class PlayerEventListener implements Listener { | ||||
|                     return; | ||||
|                 } | ||||
|                 Plot plot = area.getPlot(location); | ||||
|                 if (plot != null) { | ||||
|                 if (plot != null && !plot.equals(lastPlot)) { | ||||
|                     final boolean result = DenyTeleportFlag.allowsTeleport(pp, plot); | ||||
|                     // there is one possibility to still allow teleportation: | ||||
|                     // to is identical to the plot's home location, and untrusted-visit is true | ||||
|                     // i.e. untrusted-visit can override deny-teleport | ||||
|                     // this is acceptable, because otherwise it wouldn't make sense to have both flags set | ||||
|                     if (result || (plot.getFlag(UntrustedVisitFlag.class) && plot.getHomeSynchronous().equals(BukkitUtil.adaptComplete(to)))) { | ||||
|                         plotListener.plotEntry(pp, plot); | ||||
|                     if (result || (plot.getFlag(UntrustedVisitFlag.class) && plot | ||||
|                             .getHomeSynchronous() | ||||
|                             .equals(BukkitUtil.adaptComplete(to)))) { | ||||
|                         // returns false if the player is not allowed to enter the plot (if they are denied, for example) | ||||
|                         // don't let the move event cancel the entry after teleport, but rather catch and cancel early (#4647) | ||||
|                         if (!plotListener.plotEntry(pp, plot)) { | ||||
|                             event.setCancelled(true); | ||||
|                         } | ||||
|                     } else { | ||||
|                         pp.sendMessage( | ||||
|                                 TranslatableCaption.of("deny.no_enter"), | ||||
| @@ -939,12 +962,15 @@ public class PlayerEventListener implements Listener { | ||||
|         builder.tag("plot_id", Tag.inserting(Component.text(id.toString()))); | ||||
|         builder.tag("sender", Tag.inserting(Component.text(sender))); | ||||
|         if (plotPlayer.hasPermission("plots.chat.color")) { | ||||
|             builder.tag("msg", Tag.inserting(MiniMessage.miniMessage().deserialize( | ||||
|                     message, | ||||
|                     TagResolver.resolver(StandardTags.color(), StandardTags.gradient(), | ||||
|                             StandardTags.rainbow(), StandardTags.decorations() | ||||
|                     ) | ||||
|             ))); | ||||
|             builder.tag( | ||||
|                     "msg", Tag.inserting(MiniMessage.miniMessage().deserialize( | ||||
|                             message, | ||||
|                             TagResolver.resolver( | ||||
|                                     StandardTags.color(), StandardTags.gradient(), | ||||
|                                     StandardTags.rainbow(), StandardTags.decorations() | ||||
|                             ) | ||||
|                     )) | ||||
|             ); | ||||
|         } else { | ||||
|             builder.tag("msg", Tag.inserting(Component.text(message))); | ||||
|         } | ||||
| @@ -1253,7 +1279,9 @@ public class PlayerEventListener implements Listener { | ||||
|                 eventType = PlayerBlockEventType.INTERACT_BLOCK; | ||||
|                 blocktype1 = BukkitAdapter.asBlockType(block.getType()); | ||||
|  | ||||
|                 if (INTERACTABLE_MATERIALS != null ? INTERACTABLE_MATERIALS.contains(blockType.name()) : blockType.isInteractable()) { | ||||
|                 if (INTERACTABLE_MATERIALS != null | ||||
|                         ? INTERACTABLE_MATERIALS.contains(blockType.name()) | ||||
|                         : blockType.isInteractable()) { | ||||
|                     if (!player.isSneaking()) { | ||||
|                         break; | ||||
|                     } | ||||
| @@ -1271,7 +1299,7 @@ public class PlayerEventListener implements Listener { | ||||
|                 // in the following, lb needs to have the material of the item in hand i.e. type | ||||
|                 switch (type.toString()) { | ||||
|                     case "REDSTONE", "STRING", "PUMPKIN_SEEDS", "MELON_SEEDS", "COCOA_BEANS", "WHEAT_SEEDS", "BEETROOT_SEEDS", | ||||
|                             "SWEET_BERRIES", "GLOW_BERRIES" -> { | ||||
|                          "SWEET_BERRIES", "GLOW_BERRIES" -> { | ||||
|                         return; | ||||
|                     } | ||||
|                     default -> { | ||||
| @@ -1296,6 +1324,17 @@ public class PlayerEventListener implements Listener { | ||||
|                     //Allow all players to eat while also allowing the block place event to be fired | ||||
|                     return; | ||||
|                 } | ||||
|                 // Process creature spawning of armor stands & end crystals here if spawned by the player in order to be able to | ||||
|                 // reset the player's hand item if spawning needs to be cancelled. | ||||
|                 if (type == Material.ARMOR_STAND || type == Material.END_CRYSTAL) { | ||||
|                     Plot plot = location.getOwnedPlotAbs(); | ||||
|                     EntityType entityType = type == Material.ARMOR_STAND ? EntityType.ARMOR_STAND : END_CRYSTAL_ENTITY_TYPE; | ||||
|                     if (BukkitEntityUtil.checkEntity(entityType, plot)) { | ||||
|                         event.setCancelled(true); | ||||
|                         break; | ||||
|                     } | ||||
|                 } | ||||
|                 // Continue with normal place event checks | ||||
|                 if (type == Material.ARMOR_STAND) { | ||||
|                     location = BukkitUtil.adapt(block.getRelative(event.getBlockFace()).getLocation()); | ||||
|                     eventType = PlayerBlockEventType.PLACE_MISC; | ||||
| @@ -1370,22 +1409,7 @@ public class PlayerEventListener implements Listener { | ||||
|  | ||||
|     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) | ||||
|     public void onBucketEmpty(PlayerBucketEmptyEvent event) { | ||||
|         BlockFace bf = event.getBlockFace(); | ||||
|         // Note: a month after Bukkit 1.14.4 released, they added the API method | ||||
|         // PlayerBucketEmptyEvent#getBlock(), which returns the block the | ||||
|         // bucket contents is going to be placed at. Currently we determine this | ||||
|         // block ourselves to retain compatibility with 1.13. | ||||
|         final Block block; | ||||
|         // if the block can be waterlogged, the event might waterlog the block | ||||
|         // sometimes | ||||
|         if (event.getBlockClicked().getBlockData() instanceof Waterlogged waterlogged | ||||
|                 && !waterlogged.isWaterlogged() && event.getBucket() != Material.LAVA_BUCKET) { | ||||
|             block = event.getBlockClicked(); | ||||
|         } else { | ||||
|             block = event.getBlockClicked().getLocation() | ||||
|                     .add(bf.getModX(), bf.getModY(), bf.getModZ()) | ||||
|                     .getBlock(); | ||||
|         } | ||||
|         final Block block = event.getBlock(); | ||||
|         Location location = BukkitUtil.adapt(block.getLocation()); | ||||
|         PlotArea area = location.getPlotArea(); | ||||
|         if (area == null) { | ||||
| @@ -1393,6 +1417,16 @@ public class PlayerEventListener implements Listener { | ||||
|         } | ||||
|         BukkitPlayer pp = BukkitUtil.adapt(event.getPlayer()); | ||||
|         Plot plot = area.getPlot(location); | ||||
|         final List<BlockTypeWrapper> use = | ||||
|                 Optional.ofNullable(plot).map(p -> p.getFlag(UseFlag.class)).orElse(area.isRoadFlags() ? | ||||
|                         area.getFlag(UseFlag.class) : Collections.emptyList()); | ||||
|         BlockType type = BukkitAdapter.asBlockType(block.getType()); | ||||
|         for (final BlockTypeWrapper blockTypeWrapper : use) { | ||||
|             if (blockTypeWrapper.accepts(BlockTypes.AIR) || blockTypeWrapper | ||||
|                     .accepts(type)) { | ||||
|                 return; | ||||
|             } | ||||
|         } | ||||
|         if (plot == null) { | ||||
|             if (pp.hasPermission(Permission.PERMISSION_ADMIN_BUILD_ROAD)) { | ||||
|                 return; | ||||
| @@ -1464,6 +1498,16 @@ public class PlayerEventListener implements Listener { | ||||
|         Player player = event.getPlayer(); | ||||
|         BukkitPlayer plotPlayer = BukkitUtil.adapt(player); | ||||
|         Plot plot = area.getPlot(location); | ||||
|         final List<BlockTypeWrapper> use = | ||||
|                 Optional.ofNullable(plot).map(p -> p.getFlag(UseFlag.class)).orElse(area.isRoadFlags() ? | ||||
|                         area.getFlag(UseFlag.class) : Collections.emptyList()); | ||||
|         BlockType type = BukkitAdapter.asBlockType(blockClicked.getType()); | ||||
|         for (final BlockTypeWrapper blockTypeWrapper : use) { | ||||
|             if (blockTypeWrapper.accepts(BlockTypes.AIR) || blockTypeWrapper | ||||
|                     .accepts(type)) { | ||||
|                 return; | ||||
|             } | ||||
|         } | ||||
|         if (plot == null) { | ||||
|             if (plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_BUILD_ROAD)) { | ||||
|                 return; | ||||
|   | ||||
| @@ -35,7 +35,7 @@ import com.plotsquared.core.util.PlotFlagUtil; | ||||
| import net.kyori.adventure.text.minimessage.tag.Tag; | ||||
| import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; | ||||
| import org.bukkit.entity.Entity; | ||||
| import org.bukkit.entity.EntityType; | ||||
| import org.bukkit.entity.FishHook; | ||||
| import org.bukkit.entity.LivingEntity; | ||||
| import org.bukkit.entity.Player; | ||||
| import org.bukkit.entity.Projectile; | ||||
| @@ -134,7 +134,7 @@ public class ProjectileEventListener implements Listener { | ||||
|                 event.setCancelled(true); | ||||
|             } | ||||
|         } else if (!plot.isAdded(pp.getUUID())) { | ||||
|             if (entity.getType().equals(EntityType.FISHING_HOOK)) { | ||||
|             if (entity instanceof FishHook) { | ||||
|                 if (plot.getFlag(FishingFlag.class)) { | ||||
|                     return; | ||||
|                 } | ||||
| @@ -194,7 +194,7 @@ public class ProjectileEventListener implements Listener { | ||||
|                 return; | ||||
|             } | ||||
|             if (plot.isAdded(pp.getUUID()) || pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER) || plot.getFlag( | ||||
|                     ProjectilesFlag.class) || (entity.getType().equals(EntityType.FISHING_HOOK) && plot.getFlag( | ||||
|                     ProjectilesFlag.class) || (entity instanceof FishHook && plot.getFlag( | ||||
|                     FishingFlag.class))) { | ||||
|                 return; | ||||
|             } | ||||
|   | ||||
| @@ -30,6 +30,8 @@ import com.plotsquared.core.util.task.TaskTime; | ||||
| import com.sk89q.worldedit.math.BlockVector2; | ||||
| import com.sk89q.worldedit.world.World; | ||||
| import io.papermc.lib.PaperLib; | ||||
| import org.apache.logging.log4j.LogManager; | ||||
| import org.apache.logging.log4j.Logger; | ||||
| import org.bukkit.Bukkit; | ||||
| import org.bukkit.Chunk; | ||||
| import org.bukkit.plugin.Plugin; | ||||
| @@ -41,6 +43,8 @@ import java.util.LinkedList; | ||||
| import java.util.List; | ||||
| import java.util.Queue; | ||||
| import java.util.concurrent.LinkedBlockingQueue; | ||||
| import java.util.concurrent.TimeUnit; | ||||
| import java.util.concurrent.TimeoutException; | ||||
| import java.util.concurrent.atomic.AtomicInteger; | ||||
| import java.util.function.Consumer; | ||||
|  | ||||
| @@ -55,6 +59,8 @@ import java.util.function.Consumer; | ||||
|  **/ | ||||
| public final class BukkitChunkCoordinator extends ChunkCoordinator { | ||||
|  | ||||
|     private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + BukkitChunkCoordinator.class.getSimpleName()); | ||||
|  | ||||
|     private final List<ProgressSubscriber> progressSubscribers = new LinkedList<>(); | ||||
|  | ||||
|     private final Queue<BlockVector2> requestedChunks; | ||||
| @@ -70,6 +76,7 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator { | ||||
|     private final AtomicInteger expectedSize; | ||||
|     private final AtomicInteger loadingChunks = new AtomicInteger(); | ||||
|     private final boolean forceSync; | ||||
|     private final boolean shouldGen; | ||||
|  | ||||
|     private int batchSize; | ||||
|     private PlotSquaredTask task; | ||||
| @@ -87,7 +94,8 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator { | ||||
|             @Assisted final @NonNull Consumer<Throwable> throwableConsumer, | ||||
|             @Assisted("unloadAfter") final boolean unloadAfter, | ||||
|             @Assisted final @NonNull Collection<ProgressSubscriber> progressSubscribers, | ||||
|             @Assisted("forceSync") final boolean forceSync | ||||
|             @Assisted("forceSync") final boolean forceSync, | ||||
|             @Assisted("shouldGen") final boolean shouldGen | ||||
|     ) { | ||||
|         this.requestedChunks = new LinkedBlockingQueue<>(requestedChunks); | ||||
|         this.availableChunks = new LinkedBlockingQueue<>(); | ||||
| @@ -103,6 +111,7 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator { | ||||
|         this.bukkitWorld = Bukkit.getWorld(world.getName()); | ||||
|         this.progressSubscribers.addAll(progressSubscribers); | ||||
|         this.forceSync = forceSync; | ||||
|         this.shouldGen = shouldGen; | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
| @@ -212,18 +221,28 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator { | ||||
|      * Requests a batch of chunks to be loaded | ||||
|      */ | ||||
|     private void requestBatch() { | ||||
|         BlockVector2 chunk; | ||||
|         for (int i = 0; i < this.batchSize && (chunk = this.requestedChunks.poll()) != null; i++) { | ||||
|         for (int i = 0; i < this.batchSize && this.requestedChunks.peek() != null; i++) { | ||||
|             // This required PaperLib to be bumped to version 1.0.4 to mark the request as urgent | ||||
|             final BlockVector2 chunk = this.requestedChunks.poll(); | ||||
|             loadingChunks.incrementAndGet(); | ||||
|             PaperLib | ||||
|                     .getChunkAtAsync(this.bukkitWorld, chunk.getX(), chunk.getZ(), true, true) | ||||
|                     .getChunkAtAsync(this.bukkitWorld, chunk.getX(), chunk.getZ(), shouldGen, true) | ||||
|                     .orTimeout(10L, TimeUnit.SECONDS) | ||||
|                     .whenComplete((chunkObject, throwable) -> { | ||||
|                         loadingChunks.decrementAndGet(); | ||||
|                         if (throwable != null) { | ||||
|                             throwable.printStackTrace(); | ||||
|                             // We want one less because this couldn't be processed | ||||
|                             this.expectedSize.decrementAndGet(); | ||||
|                             if (throwable instanceof TimeoutException) { | ||||
|                                 LOGGER.warn("Timed out awaiting chunk load {}", chunk); | ||||
|                                 this.requestedChunks.offer(chunk); | ||||
|                             } else { | ||||
|                                 LOGGER.error("Failed to load chunk {}", chunk, throwable); | ||||
|                                 // We want one less because this couldn't be processed | ||||
|                                 this.expectedSize.decrementAndGet(); | ||||
|                             } | ||||
|                         } else if (chunkObject == null) { | ||||
|                             if (shouldGen) { | ||||
|                                 LOGGER.error("Null chunk returned for chunk at {}", chunk); | ||||
|                             } | ||||
|                         } else if (PlotSquared.get().isMainThread(Thread.currentThread())) { | ||||
|                             this.processChunk(chunkObject); | ||||
|                         } else { | ||||
|   | ||||
| @@ -238,6 +238,7 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator { | ||||
|                         .unloadAfter(isUnloadAfter()) | ||||
|                         .withProgressSubscribers(getProgressSubscribers()) | ||||
|                         .forceSync(isForceSync()) | ||||
|                         .shouldGen(isShouldGen()) | ||||
|                         .build(); | ||||
|         return super.enqueue(); | ||||
|     } | ||||
|   | ||||
| @@ -49,6 +49,7 @@ import org.bukkit.entity.Arrow; | ||||
| import org.bukkit.entity.Creature; | ||||
| import org.bukkit.entity.Entity; | ||||
| import org.bukkit.entity.EntityType; | ||||
| import org.bukkit.entity.Firework; | ||||
| import org.bukkit.entity.Player; | ||||
| import org.bukkit.entity.Projectile; | ||||
| import org.bukkit.event.entity.EntityDamageEvent; | ||||
| @@ -341,8 +342,7 @@ public class BukkitEntityUtil { | ||||
|         } | ||||
|         //disable the firework damage. too much of a headache to support at the moment. | ||||
|         if (vplot != null) { | ||||
|             if (EntityDamageEvent.DamageCause.ENTITY_EXPLOSION == cause | ||||
|                     && damager.getType() == EntityType.FIREWORK) { | ||||
|             if (EntityDamageEvent.DamageCause.ENTITY_EXPLOSION == cause && damager instanceof Firework) { | ||||
|                 return false; | ||||
|             } | ||||
|         } | ||||
| @@ -354,13 +354,17 @@ public class BukkitEntityUtil { | ||||
|     } | ||||
|  | ||||
|     public static boolean checkEntity(Entity entity, Plot plot) { | ||||
|         return checkEntity(entity.getType(), plot); | ||||
|     } | ||||
|  | ||||
|     public static boolean checkEntity(EntityType type, Plot plot) { | ||||
|         if (plot == null || !plot.hasOwner() || plot.getFlags().isEmpty() && plot.getArea() | ||||
|                 .getFlagContainer().getFlagMap().isEmpty()) { | ||||
|             return false; | ||||
|         } | ||||
|  | ||||
|         final com.sk89q.worldedit.world.entity.EntityType entityType = | ||||
|                 BukkitAdapter.adapt(entity.getType()); | ||||
|                 BukkitAdapter.adapt(type); | ||||
|  | ||||
|         if (EntityCategories.PLAYER.contains(entityType)) { | ||||
|             return false; | ||||
|   | ||||
| @@ -262,6 +262,11 @@ public class BukkitUtil extends WorldUtil { | ||||
|         }); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public boolean isSmallBlock(Location location) { | ||||
|         return adapt(location).getBlock().getBoundingBox().getHeight() < 0.25; | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     @NonNegative | ||||
|     public int getHighestBlockSynchronous(final @NonNull String world, final int x, final int z) { | ||||
|   | ||||
| @@ -120,6 +120,14 @@ public interface PlotPlatform<P> extends LocaleHolder { | ||||
|      */ | ||||
|     @NonNull String serverImplementation(); | ||||
|  | ||||
|     /** | ||||
|      * Gets the server brand name | ||||
|      * | ||||
|      * @return server brand | ||||
|      * @since 7.5.3 | ||||
|      */ | ||||
|     @NonNull String serverBrand(); | ||||
|  | ||||
|     /** | ||||
|      * Gets the native server code package prefix. | ||||
|      * | ||||
|   | ||||
| @@ -144,6 +144,7 @@ public class Buy extends Command { | ||||
|             plot.getPlotModificationManager().setSign(player.getName()); | ||||
|             player.sendMessage( | ||||
|                     TranslatableCaption.of("working.claimed"), | ||||
|                     TagResolver.resolver("world", Tag.inserting(Component.text(plot.getArea().getWorldName()))), | ||||
|                     TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString()))) | ||||
|             ); | ||||
|             this.eventDispatcher.callPostPlayerBuyPlot(player, previousOwner, plot, price); | ||||
|   | ||||
| @@ -131,6 +131,7 @@ public class Clear extends Command { | ||||
|                     player.sendMessage( | ||||
|                             TranslatableCaption.of("working.clearing_done"), | ||||
|                             TagResolver.builder() | ||||
|                                     .tag("world", Tag.inserting(Component.text(plot.getArea().getWorldName()))) | ||||
|                                     .tag("amount", Tag.inserting(Component.text(System.currentTimeMillis() - start))) | ||||
|                                     .tag("plot", Tag.inserting(Component.text(plot.getId().toString()))) | ||||
|                                     .build() | ||||
|   | ||||
| @@ -24,6 +24,7 @@ import com.plotsquared.core.configuration.caption.TranslatableCaption; | ||||
| import com.plotsquared.core.player.PlotPlayer; | ||||
| import net.kyori.adventure.text.Component; | ||||
| import net.kyori.adventure.text.minimessage.MiniMessage; | ||||
| import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; | ||||
| import org.checkerframework.checker.nullness.qual.NonNull; | ||||
| import org.jetbrains.annotations.NotNull; | ||||
|  | ||||
| @@ -98,6 +99,14 @@ public enum CommandCategory implements Caption { | ||||
|         return MiniMessage.miniMessage().deserialize(getComponent(localeHolder)); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public @NonNull Component toComponent( | ||||
|             @NonNull final LocaleHolder localeHolder, | ||||
|             final @NonNull TagResolver @NonNull ... tagResolvers | ||||
|     ) { | ||||
|         return MiniMessage.miniMessage().deserialize(getComponent(localeHolder)); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Checks if a player has access to this command category | ||||
|      * | ||||
|   | ||||
| @@ -86,7 +86,8 @@ public class DebugPaste extends SubCommand { | ||||
|                 b.append("# WorldEdit implementation:\n"); | ||||
|                 b.append(PlotSquared.platform().worldEditImplementations()).append("\n\n"); | ||||
|                 b.append("# Server Information\n"); | ||||
|                 b.append("Server Version: ").append(PlotSquared.platform().serverImplementation()) | ||||
|                 b.append("Server Version: ").append(PlotSquared.platform().serverBrand()).append(": ") | ||||
|                         .append(PlotSquared.platform().serverImplementation()).append("\n") | ||||
|                         .append("\n"); | ||||
|                 b.append("online_mode: ").append(!Settings.UUID.OFFLINE).append(';') | ||||
|                         .append(!Settings.UUID.OFFLINE).append('\n'); | ||||
|   | ||||
| @@ -124,6 +124,7 @@ public class Delete extends SubCommand { | ||||
|                                 "amount", | ||||
|                                 Tag.inserting(Component.text(String.valueOf(System.currentTimeMillis() - start))) | ||||
|                         ), | ||||
|                         TagResolver.resolver("world", Tag.inserting(Component.text(plotArea.getWorldName()))), | ||||
|                         TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString()))) | ||||
|                 ); | ||||
|                 eventDispatcher.callPostDelete(plot); | ||||
|   | ||||
| @@ -101,6 +101,10 @@ public class Grant extends Command { | ||||
|                                     ); | ||||
|                                 } else { | ||||
|                                     access.set(access.get().orElse(0) + 1); | ||||
|                                     player.sendMessage( | ||||
|                                             TranslatableCaption.of("grants.added"), | ||||
|                                             TagResolver.resolver("grants", Tag.inserting(Component.text(access.get().orElse(0)))) | ||||
|                                     ); | ||||
|                                 } | ||||
|                             } | ||||
|                         } else { | ||||
| @@ -173,8 +177,14 @@ public class Grant extends Command { | ||||
|                 commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList())); | ||||
|             } | ||||
|             return commands; | ||||
|         } else if (args.length == 2) { | ||||
|             final String subcommand = args[0].toLowerCase(); | ||||
|             if ((subcommand.equals("add") && player.hasPermission(Permission.PERMISSION_GRANT_ADD)) || | ||||
|                 (subcommand.equals("check") && player.hasPermission(Permission.PERMISSION_GRANT_CHECK))) { | ||||
|                 return TabCompletions.completePlayers(player, args[1], Collections.emptyList()); | ||||
|             } | ||||
|         } | ||||
|         return TabCompletions.completePlayers(player, String.join(",", args).trim(), Collections.emptyList()); | ||||
|         return Collections.emptyList(); | ||||
|     } | ||||
|  | ||||
| } | ||||
|   | ||||
| @@ -113,38 +113,34 @@ public class Help extends Command { | ||||
|             } | ||||
|             if (cat == null && page == 0) { | ||||
|                 TextComponent.Builder builder = Component.text(); | ||||
|                 builder.append(MINI_MESSAGE.deserialize(TranslatableCaption.of("help.help_header").getComponent(player))); | ||||
|                 builder.append(TranslatableCaption.of("help.help_header").toComponent(player)); | ||||
|                 for (CommandCategory c : CommandCategory.values()) { | ||||
|                     if (!c.canAccess(player)) { | ||||
|                         continue; | ||||
|                     } | ||||
|                     builder.append(Component.newline()).append(MINI_MESSAGE | ||||
|                             .deserialize( | ||||
|                                     TranslatableCaption.of("help.help_info_item").getComponent(player), | ||||
|                                     TagResolver.builder() | ||||
|                                             .tag("command", Tag.inserting(Component.text("/plot help"))) | ||||
|                                             .tag("category", Tag.inserting(Component.text(c.name().toLowerCase()))) | ||||
|                                             .tag("category_desc", Tag.inserting(c.toComponent(player))) | ||||
|                                             .build() | ||||
|                             )); | ||||
|                     builder.append(Component.newline()); | ||||
|                     builder.append(TranslatableCaption.of("help.help_info_item").toComponent( | ||||
|                             player, TagResolver.builder() | ||||
|                                     .tag("command", Tag.inserting(Component.text("/plot help"))) | ||||
|                                     .tag("category", Tag.inserting(Component.text(c.name().toLowerCase()))) | ||||
|                                     .tag("category_desc", Tag.inserting(c.toComponent(player))) | ||||
|                                     .build() | ||||
|                     )); | ||||
|                 } | ||||
|                 builder.append(Component.newline()).append(MINI_MESSAGE | ||||
|                         .deserialize( | ||||
|                                 TranslatableCaption.of("help.help_info_item").getComponent(player), | ||||
|                                 TagResolver.builder() | ||||
|                                         .tag("command", Tag.inserting(Component.text("/plot help"))) | ||||
|                                         .tag("category", Tag.inserting(Component.text("all"))) | ||||
|                                         .tag( | ||||
|                                                 "category_desc", | ||||
|                                                 Tag.inserting(TranslatableCaption | ||||
|                                                         .of("help.help_display_all_commands") | ||||
|                                                         .toComponent(player)) | ||||
|                                         ) | ||||
|                                         .build() | ||||
|                         )); | ||||
|                 builder.append(Component.newline()).append(MINI_MESSAGE.deserialize(TranslatableCaption | ||||
|                         .of("help.help_footer") | ||||
|                         .getComponent(player))); | ||||
|                 builder.append(Component.newline()); | ||||
|                 builder.append(TranslatableCaption.of("help.help_info_item").toComponent( | ||||
|                         player, TagResolver.builder() | ||||
|                                 .tag("command", Tag.inserting(Component.text("/plot help"))) | ||||
|                                 .tag("category", Tag.inserting(Component.text("all"))) | ||||
|                                 .tag( | ||||
|                                         "category_desc", Tag.inserting(TranslatableCaption | ||||
|                                                 .of("help.help_display_all_commands") | ||||
|                                                 .toComponent(player)) | ||||
|                                 ) | ||||
|                                 .build() | ||||
|                 )); | ||||
|                 builder.append(Component.newline()); | ||||
|                 builder.append(TranslatableCaption.of("help.help_footer").toComponent(player)); | ||||
|                 player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(builder.asComponent()))); | ||||
|                 return true; | ||||
|             } | ||||
|   | ||||
| @@ -20,7 +20,6 @@ package com.plotsquared.core.command; | ||||
|  | ||||
| import com.plotsquared.core.configuration.Settings; | ||||
| import com.plotsquared.core.configuration.caption.Caption; | ||||
| import com.plotsquared.core.configuration.caption.StaticCaption; | ||||
| import com.plotsquared.core.configuration.caption.TranslatableCaption; | ||||
| import com.plotsquared.core.database.DBFunc; | ||||
| import com.plotsquared.core.permissions.Permission; | ||||
| @@ -131,13 +130,9 @@ public class Info extends SubCommand { | ||||
|             info = getCaption(arg); | ||||
|             if (info == null) { | ||||
|                 if (Settings.Ratings.USE_LIKES) { | ||||
|                     player.sendMessage(StaticCaption.of( | ||||
|                             "&6Categories&7: &amembers&7, &aalias&7, &abiome&7, &aseen&7, &adenied&7, &aflags&7, &aid&7, &asize&7, &atrusted&7, " | ||||
|                                     + "&aowner&7, " + " &alikes")); | ||||
|                     player.sendMessage(TranslatableCaption.of("info.plot_info_categories.use_likes")); | ||||
|                 } else { | ||||
|                     player.sendMessage(StaticCaption.of( | ||||
|                             "&6Categories&7: &amembers&7, &aalias&7, &abiome&7, &aseen&7, &adenied&7, &aflags&7, &aid&7, &asize&7, &atrusted&7, " | ||||
|                                     + "&aowner&7, " + " &arating")); | ||||
|                     player.sendMessage(TranslatableCaption.of("info.plot_info_categories.use_rating")); | ||||
|                 } | ||||
|                 return false; | ||||
|             } | ||||
|   | ||||
| @@ -44,8 +44,13 @@ import org.apache.logging.log4j.Logger; | ||||
| import java.util.Arrays; | ||||
| import java.util.LinkedList; | ||||
| import java.util.List; | ||||
| import java.util.Objects; | ||||
| import java.util.Optional; | ||||
| import java.util.concurrent.CompletableFuture; | ||||
|  | ||||
| import javax.annotation.Nonnull; | ||||
| import javax.annotation.Nullable; | ||||
|  | ||||
| /** | ||||
|  * PlotSquared command class. | ||||
|  */ | ||||
| @@ -147,8 +152,7 @@ public class MainCommand extends Command { | ||||
|                 try { | ||||
|                     injector.getInstance(command); | ||||
|                 } catch (final Exception e) { | ||||
|                     LOGGER.error("Failed to register command {}", command.getCanonicalName()); | ||||
|                     e.printStackTrace(); | ||||
|                     LOGGER.error("Failed to register command {}", command.getCanonicalName(), e); | ||||
|                 } | ||||
|             } | ||||
|  | ||||
| @@ -236,111 +240,180 @@ public class MainCommand extends Command { | ||||
|             RunnableVal3<Command, Runnable, Runnable> confirm, | ||||
|             RunnableVal2<Command, CommandResult> whenDone | ||||
|     ) { | ||||
|         // Optional command scope // | ||||
|         Location location = null; | ||||
|         Plot plot = null; | ||||
|         boolean tp = false; | ||||
|         if (args.length >= 2) { | ||||
|             PlotArea area = player.getApplicablePlotArea(); | ||||
|             Plot newPlot = Plot.fromString(area, args[0]); | ||||
|             if (newPlot != null && (player instanceof ConsolePlayer || newPlot.getArea() | ||||
|                     .equals(area) || player.hasPermission(Permission.PERMISSION_ADMIN) | ||||
|                     || player.hasPermission(Permission.PERMISSION_ADMIN_AREA_SUDO)) | ||||
|                     && !newPlot.isDenied(player.getUUID())) { | ||||
|                 final Location newLoc; | ||||
|                 if (newPlot.getArea() instanceof SinglePlotArea) { | ||||
|                     newLoc = newPlot.isLoaded() ? newPlot.getCenterSynchronous() : Location.at("", 0, 0, 0); | ||||
|                 } else { | ||||
|                     newLoc = newPlot.getCenterSynchronous(); | ||||
|                 } | ||||
|                 if (player.canTeleport(newLoc)) { | ||||
|                     // Save meta | ||||
|                     try (final MetaDataAccess<Location> locationMetaDataAccess | ||||
|                                  = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LOCATION)) { | ||||
|                         location = locationMetaDataAccess.get().orElse(null); | ||||
|                         locationMetaDataAccess.set(newLoc); | ||||
|         prepareArguments(new CommandExecutionData(player, args, confirm, whenDone, null)) | ||||
|                 .thenCompose(executionData -> { | ||||
|                     if (executionData.isEmpty()) { | ||||
|                         return CompletableFuture.completedFuture(false); | ||||
|                     } | ||||
|                     try (final MetaDataAccess<Plot> plotMetaDataAccess | ||||
|                                  = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) { | ||||
|                         plot = plotMetaDataAccess.get().orElse(null); | ||||
|                         plotMetaDataAccess.set(newPlot); | ||||
|                     } | ||||
|                     tp = true; | ||||
|                 } else { | ||||
|                     player.sendMessage(TranslatableCaption.of("border.denied")); | ||||
|                     return CompletableFuture.completedFuture(false); | ||||
|                 } | ||||
|                 // Trim command | ||||
|                 args = Arrays.copyOfRange(args, 1, args.length); | ||||
|             } | ||||
|             if (args.length >= 2 && !args[0].isEmpty() && args[0].charAt(0) == '-') { | ||||
|                 if ("f".equals(args[0].substring(1))) { | ||||
|                     confirm = new RunnableVal3<>() { | ||||
|                         @Override | ||||
|                         public void run(Command cmd, Runnable success, Runnable failure) { | ||||
|                             if (area != null && PlotSquared.platform().econHandler().isEnabled(area)) { | ||||
|                                 PlotExpression priceEval = | ||||
|                                         area.getPrices().get(cmd.getFullId()); | ||||
|                                 double price = priceEval != null ? priceEval.evaluate(0d) : 0d; | ||||
|                                 if (price != 0d | ||||
|                                         && PlotSquared.platform().econHandler().getMoney(player) < price) { | ||||
|                                     if (failure != null) { | ||||
|                                         failure.run(); | ||||
|                                     } | ||||
|                                     return; | ||||
|                                 } | ||||
|                             } | ||||
|                             if (success != null) { | ||||
|                                 success.run(); | ||||
|                             } | ||||
|                     var data = executionData.get(); | ||||
|                     try { | ||||
|                         return super.execute(data.player(), data.args(), data.confirm(), data.whenDone()); | ||||
|                     } catch (CommandException e) { | ||||
|                         throw e; | ||||
|                     } catch (Throwable e) { | ||||
|                         LOGGER.error("A error occurred while executing plot command", e); | ||||
|                         String message = e.getMessage(); | ||||
|                         if (message != null) { | ||||
|                             data.player().sendMessage( | ||||
|                                     TranslatableCaption.of("errors.error"), | ||||
|                                     TagResolver.resolver("value", Tag.inserting(Component.text(message))) | ||||
|                             ); | ||||
|                         } else { | ||||
|                             data.player().sendMessage( | ||||
|                                     TranslatableCaption.of("errors.error_console")); | ||||
|                         } | ||||
|                     }; | ||||
|                     args = Arrays.copyOfRange(args, 1, args.length); | ||||
|                 } else { | ||||
|                     player.sendMessage(TranslatableCaption.of("errors.invalid_command_flag")); | ||||
|                     return CompletableFuture.completedFuture(false); | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|         try { | ||||
|             super.execute(player, args, confirm, whenDone); | ||||
|         } catch (CommandException e) { | ||||
|             throw e; | ||||
|         } catch (Throwable e) { | ||||
|             e.printStackTrace(); | ||||
|             String message = e.getMessage(); | ||||
|             if (message != null) { | ||||
|                 player.sendMessage( | ||||
|                         TranslatableCaption.of("errors.error"), | ||||
|                         TagResolver.resolver("value", Tag.inserting(Component.text(message))) | ||||
|                 ); | ||||
|             } else { | ||||
|                 player.sendMessage( | ||||
|                         TranslatableCaption.of("errors.error_console")); | ||||
|             } | ||||
|         } | ||||
|         // Reset command scope // | ||||
|         if (tp && !(player instanceof ConsolePlayer)) { | ||||
|             try (final MetaDataAccess<Location> locationMetaDataAccess | ||||
|                          = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LOCATION)) { | ||||
|                 if (location == null) { | ||||
|                     locationMetaDataAccess.remove(); | ||||
|                 } else { | ||||
|                     locationMetaDataAccess.set(location); | ||||
|                 } | ||||
|             } | ||||
|             try (final MetaDataAccess<Plot> plotMetaDataAccess | ||||
|                          = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) { | ||||
|                 if (plot == null) { | ||||
|                     plotMetaDataAccess.remove(); | ||||
|                 } else { | ||||
|                     plotMetaDataAccess.set(plot); | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|                     } finally { | ||||
|                         if (data.postCommandData() != null) { | ||||
|                             resetCommandScope(data.player(), data.postCommandData()); | ||||
|                         } | ||||
|                     } | ||||
|                     return CompletableFuture.completedFuture(true); | ||||
|                 }); | ||||
|         return CompletableFuture.completedFuture(true); | ||||
|     } | ||||
|  | ||||
|     private CompletableFuture<Optional<CommandExecutionData>> prepareArguments(CommandExecutionData data) { | ||||
|         if (data.args().length >= 2) { | ||||
|             PlotArea area = data.player().getApplicablePlotArea(); | ||||
|             Plot newPlot = Plot.fromString(area, data.args()[0], data.player()); | ||||
|             return preparePlotArgument(newPlot, data, area) | ||||
|                     .thenApply(d -> d.flatMap(x -> prepareFlagArgument(x, area))); | ||||
|         } else { | ||||
|             return CompletableFuture.completedFuture(Optional.of(data)); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     private CompletableFuture<Optional<CommandExecutionData>> preparePlotArgument( | ||||
|             @Nullable Plot newPlot, | ||||
|             @Nonnull CommandExecutionData data, | ||||
|             @Nullable PlotArea area | ||||
|     ) { | ||||
|         if (newPlot == null) { | ||||
|             return CompletableFuture.completedFuture(Optional.of(data)); | ||||
|         } | ||||
|         final PlotPlayer<?> player = data.player(); | ||||
|         final boolean isAdmin = player instanceof ConsolePlayer || player.hasPermission(Permission.PERMISSION_ADMIN); | ||||
|         final boolean isDenied = newPlot.isDenied(player.getUUID()); | ||||
|         if (!isAdmin) { | ||||
|             if (isDenied) { | ||||
|                 throw new CommandException(TranslatableCaption.of("deny.cannot_interact")); | ||||
|             } | ||||
|             if (area != null && area.equals(newPlot.getArea()) && !player.hasPermission(Permission.PERMISSION_ADMIN_AREA_SUDO)) { | ||||
|                 return CompletableFuture.completedFuture(Optional.of(data)); | ||||
|             } | ||||
|         } | ||||
|         return fetchPlotCenterLocation(newPlot) | ||||
|                 .thenApply(newLoc -> { | ||||
|                     if (!player.canTeleport(newLoc)) { | ||||
|                         player.sendMessage(TranslatableCaption.of("border.denied")); | ||||
|                         return Optional.empty(); | ||||
|                     } | ||||
|                     // Save meta | ||||
|                     var originalCommandMeta = setCommandScope(player, new TemporaryCommandMeta(newLoc, newPlot)); | ||||
|                     return Optional.of(new CommandExecutionData( | ||||
|                             player, | ||||
|                             Arrays.copyOfRange(data.args(), 1, data.args().length), // Trimmed command | ||||
|                             data.confirm(), | ||||
|                             data.whenDone(), | ||||
|                             originalCommandMeta | ||||
|                     )); | ||||
|                 }); | ||||
|     } | ||||
|  | ||||
|     private Optional<CommandExecutionData> prepareFlagArgument(@Nonnull CommandExecutionData data, @Nonnull PlotArea area) { | ||||
|         if (data.args().length >= 2 && !data.args()[0].isEmpty() && data.args()[0].charAt(0) == '-') { | ||||
|             if ("f".equals(data.args()[0].substring(1))) { | ||||
|                 return Optional.of(new CommandExecutionData( | ||||
|                         data.player(), | ||||
|                         Arrays.copyOfRange(data.args(), 1, data.args().length), // Trimmed command | ||||
|                         createForcedConfirmation(data.player(), area), | ||||
|                         data.whenDone(), | ||||
|                         data.postCommandData() | ||||
|                 )); | ||||
|             } else { | ||||
|                 data.player().sendMessage(TranslatableCaption.of("errors.invalid_command_flag")); | ||||
|                 return Optional.empty(); | ||||
|             } | ||||
|         } | ||||
|         return Optional.of(data); | ||||
|     } | ||||
|  | ||||
|     private CompletableFuture<Location> fetchPlotCenterLocation(Plot plot) { | ||||
|         if (plot.getArea() instanceof SinglePlotArea && !plot.isLoaded()) { | ||||
|             return CompletableFuture.completedFuture(Location.at("", 0, 0, 0)); | ||||
|         } | ||||
|         CompletableFuture<Location> future = new CompletableFuture<>(); | ||||
|         plot.getCenter(future::complete); | ||||
|         return future; | ||||
|     } | ||||
|  | ||||
|     private @Nonnull RunnableVal3<Command, Runnable, Runnable> createForcedConfirmation(@Nonnull PlotPlayer<?> player, | ||||
|                                                                                         @Nullable PlotArea area) { | ||||
|         return new RunnableVal3<>() { | ||||
|             @Override | ||||
|             public void run(Command cmd, Runnable success, Runnable failure) { | ||||
|                 if (area != null && PlotSquared.platform().econHandler().isEnabled(area) | ||||
|                         && Optional.of(area.getPrices().get(cmd.getFullId())) | ||||
|                         .map(priceEval -> priceEval.evaluate(0d)) | ||||
|                         .filter(price -> price != 0d) | ||||
|                         .filter(price -> PlotSquared.platform().econHandler().getMoney(player) < price) | ||||
|                         .isPresent()) { | ||||
|                     if (failure != null) { | ||||
|                         failure.run(); | ||||
|                     } | ||||
|                     return; | ||||
|                 } | ||||
|                 if (success != null) { | ||||
|                     success.run(); | ||||
|                 } | ||||
|             } | ||||
|         }; | ||||
|     } | ||||
|  | ||||
|     private @Nonnull TemporaryCommandMeta setCommandScope(@Nonnull PlotPlayer<?> player, @Nonnull TemporaryCommandMeta commandMeta) { | ||||
|         Objects.requireNonNull(commandMeta.location()); | ||||
|         Objects.requireNonNull(commandMeta.plot()); | ||||
|         Location location; | ||||
|         Plot plot; | ||||
|         try (final MetaDataAccess<Location> locationMetaDataAccess | ||||
|                      = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LOCATION)) { | ||||
|             location = locationMetaDataAccess.get().orElse(null); | ||||
|             locationMetaDataAccess.set(commandMeta.location()); | ||||
|         } | ||||
|         try (final MetaDataAccess<Plot> plotMetaDataAccess | ||||
|                      = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) { | ||||
|             plot = plotMetaDataAccess.get().orElse(null); | ||||
|             plotMetaDataAccess.set(commandMeta.plot()); | ||||
|         } | ||||
|         return new TemporaryCommandMeta(location, plot); | ||||
|     } | ||||
|  | ||||
|     private void resetCommandScope(@Nonnull PlotPlayer<?> player, @Nonnull TemporaryCommandMeta commandMeta) { | ||||
|         try (final MetaDataAccess<Location> locationMetaDataAccess | ||||
|                      = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LOCATION)) { | ||||
|             if (commandMeta.location() == null) { | ||||
|                 locationMetaDataAccess.remove(); | ||||
|             } else { | ||||
|                 locationMetaDataAccess.set(commandMeta.location()); | ||||
|             } | ||||
|         } | ||||
|         try (final MetaDataAccess<Plot> plotMetaDataAccess | ||||
|                      = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) { | ||||
|             if (commandMeta.plot() == null) { | ||||
|                 plotMetaDataAccess.remove(); | ||||
|             } else { | ||||
|                 plotMetaDataAccess.set(commandMeta.plot()); | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     private record CommandExecutionData(@Nonnull PlotPlayer<?> player, @Nonnull String[] args, | ||||
|                     @Nonnull RunnableVal3<Command, Runnable, Runnable> confirm, | ||||
|                     @Nonnull RunnableVal2<Command, CommandResult> whenDone, | ||||
|                     @Nullable TemporaryCommandMeta postCommandData) {} | ||||
|  | ||||
|     private record TemporaryCommandMeta(@Nullable Location location, @Nullable Plot plot) {} | ||||
|  | ||||
|     @Override | ||||
|     public boolean canExecute(PlotPlayer<?> player, boolean message) { | ||||
|         return true; | ||||
|   | ||||
| @@ -57,7 +57,7 @@ public class Music extends SubCommand { | ||||
|                     "music_disc_far", "music_disc_mall", "music_disc_mellohi", "music_disc_stal", | ||||
|                     "music_disc_strad", "music_disc_ward", "music_disc_11", "music_disc_wait", "music_disc_otherside", | ||||
|                     "music_disc_pigstep", "music_disc_5", "music_disc_relic", "music_disc_creator", | ||||
|                     "music_disc_creator_music_box", "music_disc_precipice" | ||||
|                     "music_disc_creator_music_box", "music_disc_precipice", "music_disc_tears", "music_disc_lava_chicken" | ||||
|             ); | ||||
|  | ||||
|     // make sure all discs and the bedrock ("cancel") fit into the inventory | ||||
|   | ||||
| @@ -117,8 +117,8 @@ public class Remove extends SubCommand { | ||||
|             } | ||||
|             if (count == 0) { | ||||
|                 player.sendMessage( | ||||
|                         TranslatableCaption.of("errors.invalid_player"), | ||||
|                         TagResolver.resolver("value", Tag.inserting(Component.text(args[0]))) | ||||
|                         TranslatableCaption.of("member.player_not_removed"), | ||||
|                         TagResolver.resolver("player", Tag.inserting(Component.text(args[0]))) | ||||
|                 ); | ||||
|             } else { | ||||
|                 player.sendMessage( | ||||
|   | ||||
| @@ -582,6 +582,8 @@ public class Settings extends Config { | ||||
|         public static boolean PER_WORLD_VISIT = false; | ||||
|         @Comment("Search merged plots for having multiple owners when using the visit command") | ||||
|         public static boolean VISIT_MERGED_OWNERS = true; | ||||
|         @Comment("Allows to teleport based on block size instead to spawn on the highest block at the home command") | ||||
|         public static boolean SIZED_BASED = true; | ||||
|  | ||||
|     } | ||||
|  | ||||
|   | ||||
| @@ -20,6 +20,7 @@ package com.plotsquared.core.configuration.caption; | ||||
|  | ||||
| import net.kyori.adventure.text.Component; | ||||
| import net.kyori.adventure.text.ComponentLike; | ||||
| import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; | ||||
| import org.checkerframework.checker.nullness.qual.NonNull; | ||||
|  | ||||
| /** | ||||
| @@ -44,6 +45,16 @@ public interface Caption { | ||||
|      */ | ||||
|     @NonNull Component toComponent(@NonNull LocaleHolder localeHolder); | ||||
|  | ||||
|     /** | ||||
|      * Get the Adventure {@link ComponentLike} for this caption while applying custom {@link TagResolver} | ||||
|      * (apart from the default {@code core.prefix}) | ||||
|      * @param localeHolder Local holder | ||||
|      * @param tagResolvers custom tag resolvers to replace placeholders / parameters | ||||
|      * @return {@link ComponentLike} | ||||
|      * @since 7.5.4 | ||||
|      */ | ||||
|     @NonNull Component toComponent(@NonNull LocaleHolder localeHolder, @NonNull TagResolver @NonNull... tagResolvers); | ||||
|  | ||||
|     @NonNull String toString(); | ||||
|  | ||||
| } | ||||
|   | ||||
| @@ -21,6 +21,7 @@ package com.plotsquared.core.configuration.caption; | ||||
| import com.google.common.base.Preconditions; | ||||
| import net.kyori.adventure.text.Component; | ||||
| import net.kyori.adventure.text.minimessage.MiniMessage; | ||||
| import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; | ||||
| import org.checkerframework.checker.nullness.qual.NonNull; | ||||
|  | ||||
| public final class StaticCaption implements Caption { | ||||
| @@ -51,6 +52,14 @@ public final class StaticCaption implements Caption { | ||||
|         return MiniMessage.miniMessage().deserialize(this.value); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public @NonNull Component toComponent( | ||||
|             @NonNull final LocaleHolder localeHolder, | ||||
|             final @NonNull TagResolver @NonNull ... tagResolvers | ||||
|     ) { | ||||
|         return MiniMessage.miniMessage().deserialize(this.value, tagResolvers); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public @NonNull String toString() { | ||||
|         return "StaticCaption(" + value + ")"; | ||||
|   | ||||
| @@ -27,6 +27,7 @@ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; | ||||
| import org.checkerframework.checker.nullness.qual.NonNull; | ||||
| import org.jetbrains.annotations.NotNull; | ||||
|  | ||||
| import java.util.Arrays; | ||||
| import java.util.Locale; | ||||
| import java.util.regex.Pattern; | ||||
|  | ||||
| @@ -96,13 +97,23 @@ public final class TranslatableCaption implements NamespacedCaption { | ||||
|  | ||||
|     @Override | ||||
|     public @NonNull Component toComponent(@NonNull final LocaleHolder localeHolder) { | ||||
|         return this.toComponent(localeHolder, new TagResolver[0]); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public @NonNull Component toComponent( | ||||
|             @NonNull final LocaleHolder localeHolder, | ||||
|             final @NonNull TagResolver @NonNull ... tagResolvers | ||||
|     ) { | ||||
|         if (getKey().equals("core.prefix")) { | ||||
|             return MiniMessage.miniMessage().deserialize(getComponent(localeHolder)); | ||||
|         } | ||||
|         return MiniMessage.miniMessage().deserialize(getComponent(localeHolder), TagResolver.resolver( | ||||
|         TagResolver[] finalResolvers = Arrays.copyOf(tagResolvers, tagResolvers.length + 1); | ||||
|         finalResolvers[finalResolvers.length - 1] = TagResolver.resolver( | ||||
|                 "prefix", | ||||
|                 Tag.inserting(TranslatableCaption.of("core.prefix").toComponent(localeHolder)) | ||||
|         )); | ||||
|         ); | ||||
|         return MiniMessage.miniMessage().deserialize(getComponent(localeHolder), finalResolvers); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|   | ||||
| @@ -164,6 +164,9 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld { | ||||
|                 : getMinBuildHeight(); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Get the lowest height of plot, road, and wall. Accounts for {@link Settings.Schematics#USE_WALL_IN_ROAD_SCHEM_HEIGHT} | ||||
|      */ | ||||
|     int schematicStartHeight() { | ||||
|         int plotRoadMin = Math.min(PLOT_HEIGHT, ROAD_HEIGHT); | ||||
|         if (!Settings.Schematics.USE_WALL_IN_ROAD_SCHEM_HEIGHT) { | ||||
|   | ||||
| @@ -274,7 +274,8 @@ public class HybridPlotWorld extends ClassicPlotWorld { | ||||
|                 SCHEM_Y = getMinGenHeight(); | ||||
|                 plotY = 0; | ||||
|             } else if (!Settings.Schematics.PASTE_ON_TOP) { | ||||
|                 SCHEM_Y = getMinGenHeight(); | ||||
|                 // Schematics should generate/be pasted from build height | ||||
|                 SCHEM_Y = getMinBuildHeight(); | ||||
|                 plotY = 0; | ||||
|             } | ||||
|         } | ||||
| @@ -291,18 +292,14 @@ public class HybridPlotWorld extends ClassicPlotWorld { | ||||
|                 roadY = 0; // Road is the lowest schematic | ||||
|                 if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() != worldGenHeight) { | ||||
|                     // Road is the lowest schematic. Normalize plotY to it. | ||||
|                     if (Settings.Schematics.PASTE_ON_TOP) { | ||||
|                         plotY = PLOT_HEIGHT - getMinGenHeight(); | ||||
|                     } | ||||
|                     plotY = (Settings.Schematics.PASTE_ON_TOP ? PLOT_HEIGHT : getMinBuildHeight()) - SCHEM_Y; | ||||
|                 } | ||||
|             } else if (!Settings.Schematics.PASTE_ROAD_ON_TOP) { | ||||
|                 roadY = 0; | ||||
|                 SCHEM_Y = getMinGenHeight(); | ||||
|                 if (schematic3 != null) { | ||||
|                     if (Settings.Schematics.PASTE_ON_TOP) { | ||||
|                         // Road is the lowest schematic. Normalize plotY to it. | ||||
|                         plotY = PLOT_HEIGHT - SCHEM_Y; | ||||
|                     } | ||||
|                 if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() != worldGenHeight) { | ||||
|                     // Road is the lowest schematic. Normalize plotY to it. | ||||
|                     plotY = (Settings.Schematics.PASTE_ON_TOP ? PLOT_HEIGHT : getMinBuildHeight()) - SCHEM_Y; | ||||
|                 } | ||||
|             } else { | ||||
|                 roadY = minRoadWall - SCHEM_Y; | ||||
|   | ||||
| @@ -68,6 +68,7 @@ import java.util.HashSet; | ||||
| import java.util.Iterator; | ||||
| import java.util.LinkedHashSet; | ||||
| import java.util.List; | ||||
| import java.util.Objects; | ||||
| import java.util.Set; | ||||
| import java.util.concurrent.atomic.AtomicBoolean; | ||||
| import java.util.concurrent.atomic.AtomicInteger; | ||||
| @@ -432,6 +433,7 @@ public class HybridUtils { | ||||
|                 if (!UPDATE) { | ||||
|                     Iterator<BlockVector2> iter = chunks.iterator(); | ||||
|                     QueueCoordinator queue = blockQueue.getNewQueue(worldUtil.getWeWorld(area.getWorldName())); | ||||
|                     queue.setShouldGen(false); | ||||
|                     while (iter.hasNext()) { | ||||
|                         BlockVector2 chunk = iter.next(); | ||||
|                         iter.remove(); | ||||
| @@ -474,6 +476,7 @@ public class HybridUtils { | ||||
|                                     Iterator<BlockVector2> iterator = chunks.iterator(); | ||||
|                                     if (chunks.size() >= 32) { | ||||
|                                         QueueCoordinator queue = blockQueue.getNewQueue(worldUtil.getWeWorld(area.getWorldName())); | ||||
|                                         queue.setShouldGen(false); | ||||
|                                         for (int i = 0; i < 32; i++) { | ||||
|                                             final BlockVector2 chunk = iterator.next(); | ||||
|                                             iterator.remove(); | ||||
| @@ -487,6 +490,7 @@ public class HybridUtils { | ||||
|                                         return null; | ||||
|                                     } | ||||
|                                     QueueCoordinator queue = blockQueue.getNewQueue(worldUtil.getWeWorld(area.getWorldName())); | ||||
|                                     queue.setShouldGen(false); | ||||
|                                     while (!chunks.isEmpty()) { | ||||
|                                         final BlockVector2 chunk = iterator.next(); | ||||
|                                         iterator.remove(); | ||||
| @@ -502,7 +506,6 @@ public class HybridUtils { | ||||
|                                 return; | ||||
|                             } | ||||
|                         } catch (Exception e) { | ||||
|                             e.printStackTrace(); | ||||
|                             Iterator<BlockVector2> iterator = HybridUtils.regions.iterator(); | ||||
|                             BlockVector2 loc = iterator.next(); | ||||
|                             iterator.remove(); | ||||
| @@ -510,7 +513,8 @@ public class HybridUtils { | ||||
|                                     "Error! Could not update '{}/region/r.{}.{}.mca' (Corrupt chunk?)", | ||||
|                                     area.getWorldHash(), | ||||
|                                     loc.getX(), | ||||
|                                     loc.getZ() | ||||
|                                     loc.getZ(), | ||||
|                                     e | ||||
|                             ); | ||||
|                         } | ||||
|                         TaskManager.runTaskLater(task, TaskTime.seconds(1L)); | ||||
| @@ -526,7 +530,7 @@ public class HybridUtils { | ||||
|         final QueueCoordinator queue = blockQueue.getNewQueue(worldUtil.getWeWorld(world)); | ||||
|         Location bot = plot.getBottomAbs().subtract(1, 0, 1); | ||||
|         Location top = plot.getTopAbs(); | ||||
|         final HybridPlotWorld plotworld = (HybridPlotWorld) plot.getArea(); | ||||
|         final HybridPlotWorld plotworld = Objects.requireNonNull((HybridPlotWorld) plot.getArea()); | ||||
|         // Do not use plotworld#schematicStartHeight() here as we want to restore the pre 6.1.4 way of doing it if | ||||
|         //  USE_WALL_IN_ROAD_SCHEM_HEIGHT is false | ||||
|         int schemY = Settings.Schematics.USE_WALL_IN_ROAD_SCHEM_HEIGHT ? | ||||
| @@ -558,7 +562,7 @@ public class HybridUtils { | ||||
|                                 try { | ||||
|                                     plotworld.setupSchematics(); | ||||
|                                 } catch (SchematicHandler.UnsupportedFormatException e) { | ||||
|                                     e.printStackTrace(); | ||||
|                                     LOGGER.error(e); | ||||
|                                 } | ||||
|                             }); | ||||
|                 }); | ||||
|   | ||||
| @@ -40,7 +40,8 @@ public interface ChunkCoordinatorFactory { | ||||
|             final @NonNull Consumer<Throwable> throwableConsumer, | ||||
|             @Assisted("unloadAfter") final boolean unloadAfter, | ||||
|             final @NonNull Collection<ProgressSubscriber> progressSubscribers, | ||||
|             @Assisted("forceSync") final boolean forceSync | ||||
|             @Assisted("forceSync") final boolean forceSync, | ||||
|             @Assisted("shouldGen") final boolean shouldGen | ||||
|     ); | ||||
|  | ||||
| } | ||||
|   | ||||
| @@ -444,7 +444,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer, | ||||
|  | ||||
|     /** | ||||
|      * Get this player's UUID. | ||||
|      * === !IMPORTANT ===<br> | ||||
|      * <p>=== !IMPORTANT ===</p> | ||||
|      * The UUID is dependent on the mode chosen in the settings.yml and may not be the same as Bukkit has | ||||
|      * (especially if using an old version of Bukkit that does not support UUIDs) | ||||
|      * | ||||
|   | ||||
| @@ -321,7 +321,8 @@ public class Plot { | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Get the plot from a string. | ||||
|      * Get the plot from a string. Performs a check to ensure Plot#getBottomAbs is not outside world bounds | ||||
|      * (x/z +/- 30,000,000) to prevent crashes | ||||
|      * | ||||
|      * @param player  Provides a context for what world to search in. Prefixing the term with 'world_name;' will override this context. | ||||
|      * @param arg     The search term | ||||
| @@ -332,6 +333,31 @@ public class Plot { | ||||
|             final @Nullable PlotPlayer<?> player, | ||||
|             final @Nullable String arg, | ||||
|             final boolean message | ||||
|     ) { | ||||
|         Plot plot = getPlotFromStringUnchecked(player, arg, message); | ||||
|         if (plot != null && !WorldUtil.isValidLocation(plot.getBottomAbs())) { | ||||
|             if (message) { | ||||
|                 (player == null ? ConsolePlayer.getConsole() : player).sendMessage(TranslatableCaption.of( | ||||
|                         "invalid.world_location_plot")); | ||||
|             } | ||||
|             return null; | ||||
|         } | ||||
|         return plot; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Get the plot from a string. Does not perform a check on world bounds. | ||||
|      * | ||||
|      * @param player  Provides a context for what world to search in. Prefixing the term with 'world_name;' will override this context. | ||||
|      * @param arg     The search term | ||||
|      * @param message If a message should be sent to the player if a plot cannot be found | ||||
|      * @return The plot if only 1 result is found, or null | ||||
|      * @since 7.5.5 | ||||
|      */ | ||||
|     public static @Nullable Plot getPlotFromStringUnchecked( | ||||
|             final @Nullable PlotPlayer<?> player, | ||||
|             final @Nullable String arg, | ||||
|             final boolean message | ||||
|     ) { | ||||
|         if (arg == null) { | ||||
|             if (player == null) { | ||||
| @@ -389,13 +415,51 @@ public class Plot { | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Gets a plot from a string e.g. [area];[id] | ||||
|      * Gets a plot from a string e.g. [area];[id]. Performs a check to ensure Plot#getBottomAbs is not outside world bounds | ||||
|      * (x/z +/- 30,000,000) to prevent crashes | ||||
|      * | ||||
|      * @param defaultArea if no area is specified | ||||
|      * @param string      plot id/area + id | ||||
|      * @return New or existing plot object | ||||
|      */ | ||||
|     public static @Nullable Plot fromString(final @Nullable PlotArea defaultArea, final @NonNull String string) { | ||||
|         return fromString(defaultArea, string, null); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Gets a plot from a string e.g. [area];[id]. Performs a check to ensure Plot#getBottomAbs is not outside world bounds | ||||
|      * (x/z +/- 30,000,000) to prevent crashes | ||||
|      * | ||||
|      * @param defaultArea if no area is specified | ||||
|      * @param string      plot id/area + id | ||||
|      * @param player      {@link PlotPlayer} player to notify if plot is invalid (outside bounds) | ||||
|      * @return New or existing plot object | ||||
|      * @since 7.5.5 | ||||
|      */ | ||||
|     public static @Nullable Plot fromString( | ||||
|             final @Nullable PlotArea defaultArea, | ||||
|             final @NonNull String string, | ||||
|             final @Nullable PlotPlayer<?> player | ||||
|     ) { | ||||
|         Plot plot = fromStringUnchecked(defaultArea, string); | ||||
|         if (plot != null && !WorldUtil.isValidLocation(plot.getBottomAbs())) { | ||||
|             if (player != null) { | ||||
|                 player.sendMessage(TranslatableCaption.of("invalid.world_location_plot")); | ||||
|             } | ||||
|             return null; | ||||
|         } | ||||
|         return plot; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Gets a plot from a string e.g. [area];[id]. Does not perform a check on world bounds. | ||||
|      * | ||||
|      * @param defaultArea if no area is specified | ||||
|      * @param string      plot id/area + id | ||||
|      * @return New or existing plot object | ||||
|      * @since 7.5.5 | ||||
|      */ | ||||
|     public static @Nullable Plot fromStringUnchecked(final @Nullable PlotArea defaultArea, final @NonNull String string) { | ||||
|         final String[] split = string.split("[;,]"); | ||||
|         if (split.length == 2) { | ||||
|             if (defaultArea != null) { | ||||
| @@ -419,7 +483,8 @@ public class Plot { | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Return a new/cached plot object at a given location. | ||||
|      * Return a new/cached plot object at a given location. Does not check world bounds for potential crashes, these should be | ||||
|      * performed before (or after) this method is used. | ||||
|      * | ||||
|      * <p> | ||||
|      * Use {@link PlotPlayer#getCurrentPlot()} if a player is expected here. | ||||
| @@ -1407,6 +1472,9 @@ public class Plot { | ||||
|                 ); | ||||
|             } | ||||
|             Location location = toHomeLocation(bottom, home); | ||||
|             if (Settings.Teleport.SIZED_BASED && this.worldUtil.isSmallBlock(location) && this.worldUtil.isSmallBlock(location.add(0,1,0))) { | ||||
|                 return location; | ||||
|             } | ||||
|             if (!this.worldUtil.getBlockSynchronous(location).getBlockType().getMaterial().isAir()) { | ||||
|                 location = location.withY( | ||||
|                         Math.max(1 + this.worldUtil.getHighestBlockSynchronous( | ||||
| @@ -1440,15 +1508,21 @@ public class Plot { | ||||
|             } | ||||
|             Location bottom = this.getBottomAbs(); | ||||
|             Location location = toHomeLocation(bottom, home); | ||||
|             this.worldUtil.getBlock(location, block -> { | ||||
|                 if (!block.getBlockType().getMaterial().isAir()) { | ||||
|                     this.worldUtil.getHighestBlock(this.getWorldName(), location.getX(), location.getZ(), | ||||
|                             y -> result.accept(location.withY(Math.max(1 + y, bottom.getY()))) | ||||
|                     ); | ||||
|                 } else { | ||||
|                     result.accept(location); | ||||
|                 } | ||||
|             }); | ||||
|             if (Settings.Teleport.SIZED_BASED && this.worldUtil.isSmallBlock(location) && this.worldUtil.isSmallBlock(location.add(0,1,0))) { | ||||
|                 result.accept(location); | ||||
|             } else { | ||||
|                 this.worldUtil.getBlock(location, block -> { | ||||
|  | ||||
|                     if (!block.getBlockType().getMaterial().isAir()) { | ||||
|                         this.worldUtil.getHighestBlock(this.getWorldName(), location.getX(), location.getZ(), | ||||
|                                 y -> result.accept(location.withY(Math.max(1 + y, bottom.getY()))) | ||||
|                         ); | ||||
|                     } else { | ||||
|                         result.accept(location); | ||||
|                     } | ||||
|                 }); | ||||
|             } | ||||
|  | ||||
|         } | ||||
|     } | ||||
|  | ||||
| @@ -1708,6 +1782,7 @@ public class Plot { | ||||
|         } | ||||
|         player.sendMessage( | ||||
|                 TranslatableCaption.of("working.claimed"), | ||||
|                 TagResolver.resolver("world", Tag.inserting(Component.text(this.getWorldName()))), | ||||
|                 TagResolver.resolver("plot", Tag.inserting(Component.text(this.getId().toString()))) | ||||
|         ); | ||||
|         if (teleport) { | ||||
|   | ||||
| @@ -371,8 +371,7 @@ public final class PlotModificationManager { | ||||
|                             manager.createRoadSouthEast(current, queue); | ||||
|                         } | ||||
|                     } | ||||
|                 } | ||||
|                 if (current.isMerged(Direction.SOUTH)) { | ||||
|                 } else if (current.isMerged(Direction.SOUTH)) { | ||||
|                     manager.createRoadSouth(current, queue); | ||||
|                 } | ||||
|             } | ||||
|   | ||||
| @@ -63,4 +63,18 @@ public class PlotTitle { | ||||
|         return subtitle; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Provides a string representation of this plot title value (used in placeholders). | ||||
|      * | ||||
|      * @return the plot title representation in the format {@code "<title>" "<subtitle>"} | ||||
|      * @since 7.5.5 | ||||
|      */ | ||||
|     @Override | ||||
|     public String toString() { | ||||
|         return "\"%s\" \"%s\"".formatted( | ||||
|                 this.title != null ? this.title : "", | ||||
|                 this.subtitle != null ? this.subtitle : "" | ||||
|         ); | ||||
|     } | ||||
|  | ||||
| } | ||||
|   | ||||
| @@ -52,6 +52,7 @@ public class ChunkCoordinatorBuilder { | ||||
|     private int initialBatchSize = Settings.QUEUE.INITIAL_BATCH_SIZE; | ||||
|     private boolean unloadAfter = true; | ||||
|     private boolean forceSync = false; | ||||
|     private boolean shouldGen = true; | ||||
|  | ||||
|     @Inject | ||||
|     public ChunkCoordinatorBuilder(@NonNull ChunkCoordinatorFactory chunkCoordinatorFactory) { | ||||
| @@ -203,6 +204,19 @@ public class ChunkCoordinatorBuilder { | ||||
|         return this; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Set whether chunks should be generated as part of this operation. Default is true. Disabling this may not be supported | ||||
|      * depending on server implementation. (i.e. setting to false may not actually disable generation as part of this operation | ||||
|      * - this is just a catch-all in case of future differing server implementations; the option will work on Spigot/Paper). | ||||
|      * | ||||
|      * @param shouldGen should generate new chunks or not | ||||
|      * @since 7.5.0 | ||||
|      */ | ||||
|     public @NonNull ChunkCoordinatorBuilder shouldGen(final boolean shouldGen) { | ||||
|         this.shouldGen = shouldGen; | ||||
|         return this; | ||||
|     } | ||||
|  | ||||
|     public @NonNull ChunkCoordinatorBuilder withProgressSubscriber(ProgressSubscriber progressSubscriber) { | ||||
|         this.progressSubscribers.add(progressSubscriber); | ||||
|         return this; | ||||
| @@ -234,7 +248,8 @@ public class ChunkCoordinatorBuilder { | ||||
|                         this.throwableConsumer, | ||||
|                         this.unloadAfter, | ||||
|                         this.progressSubscribers, | ||||
|                         this.forceSync | ||||
|                         this.forceSync, | ||||
|                         this.shouldGen | ||||
|                 ); | ||||
|     } | ||||
|  | ||||
|   | ||||
| @@ -51,6 +51,7 @@ public class DelegateQueueCoordinator extends QueueCoordinator { | ||||
|  | ||||
|         if (parent != null) { | ||||
|             this.setForceSync(parent.isForceSync()); | ||||
|             this.setShouldGen(parent.isShouldGen()); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|   | ||||
| @@ -45,6 +45,7 @@ public abstract class QueueCoordinator { | ||||
|  | ||||
|     private final AtomicBoolean enqueued = new AtomicBoolean(); | ||||
|     private boolean forceSync = false; | ||||
|     private boolean shouldGen = true; | ||||
|     @Nullable | ||||
|     private Object chunkObject; | ||||
|     @SuppressWarnings({"unused", "FieldCanBeLocal"}) | ||||
| @@ -110,6 +111,30 @@ public abstract class QueueCoordinator { | ||||
|         this.forceSync = forceSync; | ||||
|     } | ||||
|  | ||||
|  | ||||
|     /** | ||||
|      * Get whether chunks should be generated as part of this operation. Default is true. Disabling this may not be supported | ||||
|      * depending on server implementation. (i.e. setting to false may not actually disable generation as part of this operation | ||||
|      * - this is just a catch-all in case of future differing server implementations; the option will work on Spigot/Paper). | ||||
|      * | ||||
|      * @since 7.5.0 | ||||
|      */ | ||||
|     public boolean isShouldGen() { | ||||
|         return shouldGen; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Set whether chunks should be generated as part of this operation. Default is true. Disabling this may not be supported | ||||
|      * depending on server implementation. (i.e. setting to false may not actually disable generation as part of this operation | ||||
|      * - this is just a catch-all in case of future differing server implementations; the option will work on Spigot/Paper). | ||||
|      * | ||||
|      * @param shouldGen should generate new chunks or not | ||||
|      * @since 7.5.0 | ||||
|      */ | ||||
|     public void setShouldGen(boolean shouldGen) { | ||||
|         this.shouldGen = shouldGen; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Get the Chunk Object set to the queue | ||||
|      * | ||||
|   | ||||
| @@ -177,6 +177,13 @@ public abstract class WorldUtil { | ||||
|      */ | ||||
|     public abstract void getBlock(@NonNull Location location, @NonNull Consumer<BlockState> result); | ||||
|  | ||||
|     /** | ||||
|      * Checks if the block smaller as a slab | ||||
|      * @param location Block location | ||||
|      * @return true if it smaller as a slab | ||||
|      */ | ||||
|     public abstract boolean isSmallBlock(@NonNull Location location); | ||||
|  | ||||
|     /** | ||||
|      * Get the block at a given location (synchronously) | ||||
|      * | ||||
|   | ||||
| @@ -25,30 +25,24 @@ import com.plotsquared.core.player.PlotPlayer; | ||||
| import com.plotsquared.core.util.StringMan; | ||||
| import net.kyori.adventure.text.Component; | ||||
| import net.kyori.adventure.text.ComponentLike; | ||||
| import net.kyori.adventure.text.minimessage.MiniMessage; | ||||
| import net.kyori.adventure.text.minimessage.tag.Tag; | ||||
| import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; | ||||
| import org.jetbrains.annotations.NotNull; | ||||
|  | ||||
| public class HelpObject implements ComponentLike { | ||||
|  | ||||
|     static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage(); | ||||
|  | ||||
|     private final Component rendered; | ||||
|  | ||||
|     public HelpObject(final Command command, final String label, final PlotPlayer<?> audience) { | ||||
|         rendered = MINI_MESSAGE.deserialize( | ||||
|                 TranslatableCaption.of("help.help_item").getComponent(audience), | ||||
|                 TagResolver.builder() | ||||
|                         .tag("usage", Tag.inserting(Component.text(command.getUsage().replace("{label}", label)))) | ||||
|                         .tag("alias", Tag.inserting(Component.text( | ||||
|                                 command.getAliases().isEmpty() ? "" : StringMan.join(command.getAliases(), " | ") | ||||
|                         ))) | ||||
|                         .tag("desc", Tag.inserting(command.getDescription().toComponent(audience))) | ||||
|                         .tag("arguments", Tag.inserting(Component.text(buildArgumentList(command.getRequiredArguments())))) | ||||
|                         .tag("label", Tag.inserting(Component.text(label))) | ||||
|                         .build() | ||||
|         ); | ||||
|         this.rendered = TranslatableCaption.of("help.help_item").toComponent(audience, TagResolver.builder() | ||||
|                 .tag("usage", Tag.inserting(Component.text(command.getUsage().replace("{label}", label)))) | ||||
|                 .tag("alias", Tag.inserting(Component.text( | ||||
|                         command.getAliases().isEmpty() ? "" : StringMan.join(command.getAliases(), " | ") | ||||
|                 ))) | ||||
|                 .tag("desc", Tag.inserting(command.getDescription().toComponent(audience))) | ||||
|                 .tag("arguments", Tag.inserting(Component.text(buildArgumentList(command.getRequiredArguments())))) | ||||
|                 .tag("label", Tag.inserting(Component.text(label))) | ||||
|                 .build()); | ||||
|     } | ||||
|  | ||||
|     private String buildArgumentList(final Argument<?>[] arguments) { | ||||
|   | ||||
| @@ -49,10 +49,12 @@ import java.util.Collection; | ||||
| import java.util.Collections; | ||||
| import java.util.Locale; | ||||
| import java.util.Map; | ||||
| import java.util.Set; | ||||
| import java.util.TimeZone; | ||||
| import java.util.UUID; | ||||
| import java.util.concurrent.TimeUnit; | ||||
| import java.util.function.BiFunction; | ||||
| import java.util.stream.Collectors; | ||||
|  | ||||
| /** | ||||
|  * Registry that contains {@link Placeholder placeholders} | ||||
| @@ -127,6 +129,22 @@ public final class PlaceholderRegistry { | ||||
|             } | ||||
|             return legacyComponent(TranslatableCaption.of("info.unknown"), player); | ||||
|         }); | ||||
|         this.createPlaceholder("currentplot_owners", (player, plot) -> { | ||||
|             if (plot.getFlag(ServerPlotFlag.class)) { | ||||
|                 return legacyComponent(TranslatableCaption.of("info.server"), player); | ||||
|             } | ||||
|             final Set<UUID> plotOwners = plot.getOwners(); | ||||
|             if (plotOwners.isEmpty()) { | ||||
|                 return legacyComponent(TranslatableCaption.of("generic.generic_unowned"), player); | ||||
|             } | ||||
|             return plotOwners.stream().map(PlotSquared.platform().playerManager()::getUsernameCaption).map(f -> { | ||||
|                 try { | ||||
|                     return f.get(Settings.UUID.BLOCKING_TIMEOUT, TimeUnit.MILLISECONDS).getComponent(player); | ||||
|                 } catch (final Exception ignored) { | ||||
|                     return legacyComponent(TranslatableCaption.of("info.unknown"), player); | ||||
|                 } | ||||
|             }).collect(Collectors.joining(", ")); | ||||
|         }); | ||||
|         this.createPlaceholder("currentplot_members", (player, plot) -> { | ||||
|             if (plot.getMembers().isEmpty() && plot.getTrusted().isEmpty()) { | ||||
|                 return legacyComponent(TranslatableCaption.of("info.none"), player); | ||||
|   | ||||
| @@ -234,6 +234,7 @@ | ||||
|   "invalid.not_valid_number": "<prefix><red>That's not a valid number within the range: </red><gray><value></gray>", | ||||
|   "invalid.not_valid_plot_id": "<prefix><red>That's not a valid plot ID.</red>", | ||||
|   "invalid.origin_cant_be_target": "<prefix><red>The origin and target location cannot be the same.</red>", | ||||
|   "invalid.world_location_plot": "<prefix><red>The target plot is invalid.</red>", | ||||
|   "invalid.found_no_plots": "<prefix><red>Found no plots with your search query.</red>", | ||||
|   "invalid.number_not_in_range": "<prefix><red>That's not a valid number within the range: <gray>(<min>, <max>)</gray></red>", | ||||
|   "invalid.number_not_positive": "<red>That's not a positive number: <gray><value></gray></red>", | ||||
| @@ -353,6 +354,8 @@ | ||||
|   "info.infinite": "<gray>Infinite</gray>", | ||||
|   "info.plot_unowned": "<prefix><red>The current plot must have an owner to perform this action.</red>", | ||||
|   "info.plot_info_unclaimed": "<prefix><gray>Plot <gold><plot></gold> is not yet claimed.</gray>", | ||||
|   "info.plot_info_categories.use_rating": "<prefix><gold>Categories: </gold> <gray>members, alias, biome, seen, denied, flags, id, size, trusted, owner, rating</gray>", | ||||
|   "info.plot_info_categories.use_likes": "<prefix><gold>Categories: </gold> <gray>members, alias, biome, seen, denied, flags, id, size, trusted, owner, likes</gray>", | ||||
|   "info.plot_info_header": "<dark_gray><strikethrough>--------- <reset><gold>INFO </gold><dark_gray><strikethrough>---------</dark_gray><reset>", | ||||
|   "info.plot_info_hidden": "<prefix><red>You cannot view the information about this plot.</red>", | ||||
|   "info.plot_info_format": "<header>\n<gold>ID: <gray><id></gray>\nCreation: <gray><creationdate></gray>\nArea: <gray><area></gray>\nAlias: <gray><alias></gray>\nOwner: <gray><owner></gray>\nBiome: <gray><biome></gray>\nCan Build: <gray><build></gray>\nRating: <gray><rating></gray>\nSeen: <gray><seen></gray>\nTrusted: <gray><trusted></gray>\nMembers: <gray><members></gray>\nDenied: <gray><denied></gray>\nFlags: <gray><flags></gray>\nDescription: <gray><desc></gray></gold>\n<footer>", | ||||
| @@ -390,11 +393,11 @@ | ||||
|   "info.area_list_tooltip": "<gold>Claimed=</gold><gray><claimed></gray>\n<gold>Usage=</gold><gray><usage></gray>\n<gold>Clusters=</gold><gray><clusters></gray>\n<gold>Region=</gold><gray><region></gray>\n<gold>Generator=</gold><gray><generator></gray>", | ||||
|   "info.area_list_item": "<click:run_command:'<command_tp>'><hover:show_text:'<command_tp>'><dark_gray>[</dark_gray><gold><number></gold><dark_gray>]</dark_gray></hover></click> <click:run_command:'<command_info>'><hover:show_text:'<hover_info>'><gold><area_name></gold></hover></click><gray> - </gray><gray><area_type>:<area_terrain></gray>", | ||||
|   "working.generating_component": "<prefix><gold>Started generating component from your settings.</gold>", | ||||
|   "working.clearing_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><plot></gold><dark_aqua> has been cleared! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>", | ||||
|   "working.deleting_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><plot></gold><dark_aqua> has been deleted! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>", | ||||
|   "working.clearing_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><world>;<plot></gold><dark_aqua> has been cleared! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>", | ||||
|   "working.deleting_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><world>;<plot></gold><dark_aqua> has been deleted! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>", | ||||
|   "working.plot_not_claimed": "<prefix><gray>Plot not claimed.</gray>", | ||||
|   "working.plot_is_claimed": "<prefix><gray>This plot is already claimed.</gray>", | ||||
|   "working.claimed": "<prefix><dark_aqua>You successfully claimed the plot </dark_aqua><gold><plot></gold><dark_aqua>.</dark_aqua>", | ||||
|   "working.claimed": "<prefix><dark_aqua>You successfully claimed the plot </dark_aqua><gold><world>;<plot></gold><dark_aqua>.</dark_aqua>", | ||||
|   "working.progress": "<prefix><gray>Current progress: </gray><gold><progress></gold><gray>%</gray>", | ||||
|   "working.component_complete": "<prefix><gold>Component generation has finished for plot <plot>.</gold>", | ||||
|   "list.comment_list_header_paged": "<gray>(Page </gray><gold><cur></gold><gray>/</gray><gold><max></gold><gray>) </gray><gold>List of <amount> comment(s):</gold>", | ||||
| @@ -412,6 +415,7 @@ | ||||
|   "deny.denied_added": "<prefix><dark_aqua>You successfully denied the player from this plot.</dark_aqua>", | ||||
|   "deny.no_enter": "<prefix><red>You are denied from the plot <red><gold><plot></gold><red> and therefore not allowed to enter.</red>", | ||||
|   "deny.you_got_denied": "<prefix><red>You are denied from the plot you were previously on, and got teleported to spawn.</red>", | ||||
|   "deny.cannot_interact": "<prefix><red>You are denied from the plot <red><gold><plot></gold><red> and therefore cannot interact with it.</red>", | ||||
|   "deny.cant_remove_owner": "<prefix><red>You can't remove the plot owner.</red>", | ||||
|   "kick.player_not_in_plot": "<prefix><red>The player <gray><player></gray> is not on this plot.</red>", | ||||
|   "kick.cannot_kick_player": "<prefix><red>You cannot kick the player <gray><player></gray>.</red>", | ||||
| @@ -454,7 +458,7 @@ | ||||
|   "category.command_category_debug": "<gray>Debug</gray>", | ||||
|   "category.command_category_administration": "<gray>Admin</gray>", | ||||
|   "grants.granted_plots": "<prefix><gold>Result: <gray><amount> </gray>grants left.</gold>", | ||||
|   "grants.added": "<prefix><gold><grants></gold> <gray>grant(s) have been added.</gray>", | ||||
|   "grants.added": "<prefix><gold>1</gold> <gray>grant has been added. (<grants> total grants)</gray>", | ||||
|   "events.event_denied": "<prefix><gold><value> </gold><gray>Cancelled by external plugin.</gray>", | ||||
|   "backups.backup_impossible": "<prefix><red>Backups are not enabled for this plot: <plot>.</red>", | ||||
|   "backups.backup_save_success": "<prefix><gold>The backup was created successfully.</gold>", | ||||
|   | ||||
| @@ -37,12 +37,7 @@ class ClickStripTransformTest { | ||||
|     void removeClickEvent() { | ||||
|         var commonAction = ClickEvent.Action.OPEN_FILE; | ||||
|         var transform = new ClickStripTransform(EnumSet.of(commonAction)); | ||||
|         var component = Component.text("Hello") | ||||
|                 .clickEvent(ClickEvent.clickEvent( | ||||
|                                 commonAction, | ||||
|                                 "World" | ||||
|                         ) | ||||
|                 ); | ||||
|         var component = Component.text("Hello").clickEvent(ClickEvent.openFile("World")); | ||||
|         var transformedComponent = transform.transform(component); | ||||
|         Assertions.assertNull(transformedComponent.clickEvent()); | ||||
|     } | ||||
| @@ -52,10 +47,7 @@ class ClickStripTransformTest { | ||||
|     void ignoreClickEvent() { | ||||
|         var actionToRemove = ClickEvent.Action.SUGGEST_COMMAND; | ||||
|         var transform = new ClickStripTransform(EnumSet.of(actionToRemove)); | ||||
|         var originalClickEvent = ClickEvent.clickEvent( | ||||
|                 ClickEvent.Action.CHANGE_PAGE, | ||||
|                 "World" | ||||
|         ); | ||||
|         var originalClickEvent = ClickEvent.changePage(1337); | ||||
|         var component = Component.text("Hello") | ||||
|                 .clickEvent(originalClickEvent); | ||||
|         var transformedComponent = transform.transform(component); | ||||
| @@ -76,12 +68,12 @@ class ClickStripTransformTest { | ||||
|                 .insertion("DEF"); | ||||
|         var component = Component.text("Hello ") | ||||
|                 .append( | ||||
|                         inner.clickEvent(ClickEvent.clickEvent(ClickEvent.Action.OPEN_URL, "https://example.org")) | ||||
|                         inner.clickEvent(ClickEvent.openUrl("https://example.org")) | ||||
|                 ); | ||||
|         var transformedComponent = transform.transform(component); | ||||
|         Assertions.assertFalse(transformedComponent.children().isEmpty()); // child still exists | ||||
|         Assertions.assertEquals(inner, transformedComponent.children().get(0)); // only the click event has changed | ||||
|         Assertions.assertNull(transformedComponent.children().get(0).clickEvent()); | ||||
|         Assertions.assertEquals(inner, transformedComponent.children().getFirst()); // only the click event has changed | ||||
|         Assertions.assertNull(transformedComponent.children().getFirst().clickEvent()); | ||||
|     } | ||||
|  | ||||
| } | ||||
|   | ||||
							
								
								
									
										154
									
								
								build.gradle.kts
									
									
									
									
									
								
							
							
						
						
									
										154
									
								
								build.gradle.kts
									
									
									
									
									
								
							| @@ -2,18 +2,16 @@ import com.diffplug.gradle.spotless.SpotlessPlugin | ||||
| import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin | ||||
| import groovy.json.JsonSlurper | ||||
| import xyz.jpenilla.runpaper.task.RunServer | ||||
| import java.net.URI | ||||
|  | ||||
| plugins { | ||||
|     java | ||||
|     `java-library` | ||||
|     `maven-publish` | ||||
|     signing | ||||
|  | ||||
|     alias(libs.plugins.shadow) | ||||
|     alias(libs.plugins.spotless) | ||||
|     alias(libs.plugins.grgit) | ||||
|     alias(libs.plugins.nexus) | ||||
|     alias(libs.plugins.publish) | ||||
|  | ||||
|     eclipse | ||||
|     idea | ||||
| @@ -22,7 +20,7 @@ plugins { | ||||
| } | ||||
|  | ||||
| group = "com.intellectualsites.plotsquared" | ||||
| version = "7.4.2" | ||||
| version = "7.5.7-SNAPSHOT" | ||||
|  | ||||
| if (!File("$rootDir/.git").exists()) { | ||||
|     logger.lifecycle(""" | ||||
| @@ -41,16 +39,6 @@ subprojects { | ||||
|     repositories { | ||||
|         mavenCentral() | ||||
|  | ||||
|         maven { | ||||
|             name = "Sonatype OSS" | ||||
|             url = uri("https://oss.sonatype.org/content/repositories/snapshots/") | ||||
|         } | ||||
|  | ||||
|         maven { | ||||
|             name = "Sonatype OSS (S01)" | ||||
|             url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/") | ||||
|         } | ||||
|  | ||||
|         maven { | ||||
|             name = "Jitpack" | ||||
|             url = uri("https://jitpack.io") | ||||
| @@ -68,7 +56,7 @@ subprojects { | ||||
|     apply { | ||||
|         plugin<JavaPlugin>() | ||||
|         plugin<JavaLibraryPlugin>() | ||||
|         plugin<MavenPublishPlugin>() | ||||
|         plugin<com.vanniktech.maven.publish.MavenPublishPlugin>() | ||||
|         plugin<ShadowPlugin>() | ||||
|         plugin<SpotlessPlugin>() | ||||
|         plugin<SigningPlugin>() | ||||
| @@ -79,8 +67,8 @@ subprojects { | ||||
|  | ||||
|     dependencies { | ||||
|         // Tests | ||||
|         testImplementation("org.junit.jupiter:junit-jupiter:5.11.4") | ||||
|         testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.11.4") | ||||
|         testImplementation("org.junit.jupiter:junit-jupiter:5.13.4") | ||||
|         testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.4") | ||||
|     } | ||||
|  | ||||
|     plugins.withId("java") { | ||||
| @@ -107,11 +95,6 @@ subprojects { | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     java { | ||||
|         withSourcesJar() | ||||
|         withJavadocJar() | ||||
|     } | ||||
|  | ||||
|     val javaComponent = components["java"] as AdhocComponentWithVariants | ||||
|     javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) { | ||||
|         skip() | ||||
| @@ -127,66 +110,67 @@ subprojects { | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     publishing { | ||||
|         publications { | ||||
|             create<MavenPublication>("maven") { | ||||
|                 from(components["java"]) | ||||
|     mavenPublishing { | ||||
|         coordinates( | ||||
|             groupId = "$group", | ||||
|             artifactId = project.name, | ||||
|             version = "${project.version}", | ||||
|         ) | ||||
|  | ||||
|                 pom { | ||||
|         pom { | ||||
|             name.set(project.name) | ||||
|             description.set("PlotSquared, a land and world management plugin for Minecraft.") | ||||
|             url.set("https://github.com/IntellectualSites/PlotSquared") | ||||
|  | ||||
|                     name.set(project.name + " " + project.version) | ||||
|                     description.set("PlotSquared, a land and world management plugin for Minecraft.") | ||||
|                     url.set("https://github.com/IntellectualSites/PlotSquared") | ||||
|  | ||||
|                     licenses { | ||||
|                         license { | ||||
|                             name.set("GNU General Public License, Version 3.0") | ||||
|                             url.set("https://www.gnu.org/licenses/gpl-3.0.html") | ||||
|                             distribution.set("repo") | ||||
|                         } | ||||
|                     } | ||||
|  | ||||
|                     developers { | ||||
|                         developer { | ||||
|                             id.set("Sauilitired") | ||||
|                             name.set("Alexander Söderberg") | ||||
|                             organization.set("IntellectualSites") | ||||
|                             organizationUrl.set("https://github.com/IntellectualSites") | ||||
|                         } | ||||
|                         developer { | ||||
|                             id.set("NotMyFault") | ||||
|                             name.set("Alexander Brandes") | ||||
|                             organization.set("IntellectualSites") | ||||
|                             organizationUrl.set("https://github.com/IntellectualSites") | ||||
|                             email.set("contact(at)notmyfault.dev") | ||||
|                         } | ||||
|                         developer { | ||||
|                             id.set("SirYwell") | ||||
|                             name.set("Hannes Greule") | ||||
|                             organization.set("IntellectualSites") | ||||
|                             organizationUrl.set("https://github.com/IntellectualSites") | ||||
|                         } | ||||
|                         developer { | ||||
|                             id.set("dordsor21") | ||||
|                             name.set("dordsor21") | ||||
|                             organization.set("IntellectualSites") | ||||
|                             organizationUrl.set("https://github.com/IntellectualSites") | ||||
|                         } | ||||
|                     } | ||||
|  | ||||
|                     scm { | ||||
|                         url.set("https://github.com/IntellectualSites/PlotSquared") | ||||
|                         connection.set("scm:git:https://github.com/IntellectualSites/PlotSquared.git") | ||||
|                         developerConnection.set("scm:git:git@github.com:IntellectualSites/PlotSquared.git") | ||||
|                         tag.set("${project.version}") | ||||
|                     } | ||||
|  | ||||
|                     issueManagement { | ||||
|                         system.set("GitHub") | ||||
|                         url.set("https://github.com/IntellectualSites/PlotSquared/issues") | ||||
|                     } | ||||
|             licenses { | ||||
|                 license { | ||||
|                     name.set("GNU General Public License, Version 3.0") | ||||
|                     url.set("https://www.gnu.org/licenses/gpl-3.0.html") | ||||
|                     distribution.set("repo") | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|             developers { | ||||
|                 developer { | ||||
|                     id.set("Sauilitired") | ||||
|                     name.set("Alexander Söderberg") | ||||
|                     organization.set("IntellectualSites") | ||||
|                     organizationUrl.set("https://github.com/IntellectualSites") | ||||
|                 } | ||||
|                 developer { | ||||
|                     id.set("NotMyFault") | ||||
|                     name.set("Alexander Brandes") | ||||
|                     organization.set("IntellectualSites") | ||||
|                     organizationUrl.set("https://github.com/IntellectualSites") | ||||
|                     email.set("contact(at)notmyfault.dev") | ||||
|                 } | ||||
|                 developer { | ||||
|                     id.set("SirYwell") | ||||
|                     name.set("Hannes Greule") | ||||
|                     organization.set("IntellectualSites") | ||||
|                     organizationUrl.set("https://github.com/IntellectualSites") | ||||
|                 } | ||||
|                 developer { | ||||
|                     id.set("dordsor21") | ||||
|                     name.set("dordsor21") | ||||
|                     organization.set("IntellectualSites") | ||||
|                     organizationUrl.set("https://github.com/IntellectualSites") | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|             scm { | ||||
|                 url.set("https://github.com/IntellectualSites/PlotSquared") | ||||
|                 connection.set("scm:git:https://github.com/IntellectualSites/PlotSquared.git") | ||||
|                 developerConnection.set("scm:git:git@github.com:IntellectualSites/PlotSquared.git") | ||||
|                 tag.set("${project.version}") | ||||
|             } | ||||
|  | ||||
|             issueManagement { | ||||
|                 system.set("GitHub") | ||||
|                 url.set("https://github.com/IntellectualSites/PlotSquared/issues") | ||||
|             } | ||||
|  | ||||
|             publishToMavenCentral() | ||||
|         } | ||||
|     } | ||||
|  | ||||
| @@ -194,7 +178,6 @@ subprojects { | ||||
|  | ||||
|         compileJava { | ||||
|             options.compilerArgs.add("-parameters") | ||||
|             options.isDeprecation = true | ||||
|             options.encoding = "UTF-8" | ||||
|         } | ||||
|  | ||||
| @@ -217,27 +200,18 @@ subprojects { | ||||
|     } | ||||
| } | ||||
|  | ||||
| nexusPublishing { | ||||
|     this.repositories { | ||||
|         sonatype { | ||||
|             nexusUrl.set(URI.create("https://s01.oss.sonatype.org/service/local/")) | ||||
|             snapshotRepositoryUrl.set(URI.create("https://s01.oss.sonatype.org/content/repositories/snapshots/")) | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
| tasks.getByName<Jar>("jar") { | ||||
|     enabled = false | ||||
| } | ||||
|  | ||||
| val supportedVersions = listOf("1.18.2", "1.19.4", "1.20.6", "1.21.1", "1.21.3") | ||||
| val supportedVersions = listOf("1.19.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8") | ||||
| tasks { | ||||
|     register("cacheLatestFaweArtifact") { | ||||
|         val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL() | ||||
|         val artifact = ((JsonSlurper().parse(lastSuccessfulBuildUrl) as Map<*, *>)["artifacts"] as List<*>) | ||||
|                 .map { it as Map<*, *> } | ||||
|                 .map { it["fileName"] as String } | ||||
|                 .first { it -> it.contains("Bukkit") } | ||||
|                 .first { it -> it.contains("Paper") } | ||||
|         project.ext["faweArtifact"] = artifact | ||||
|     } | ||||
|  | ||||
|   | ||||
| @@ -2,41 +2,41 @@ | ||||
| # Platform expectations | ||||
| paper = "1.20.4-R0.1-SNAPSHOT" | ||||
| guice = "7.0.0" | ||||
| spotbugs = "4.9.1" | ||||
| checkerqual = "3.49.0" | ||||
| spotbugs = "4.9.4" | ||||
| checkerqual = "3.49.5" | ||||
| gson = "2.10" | ||||
| guava = "31.1-jre" | ||||
| snakeyaml = "2.0" | ||||
| adventure = "4.18.0" | ||||
| adventure-bukkit = "4.3.4" | ||||
| adventure = "4.24.0" | ||||
| adventure-bukkit = "4.4.1" | ||||
| log4j = "2.19.0" | ||||
|  | ||||
| # Plugins | ||||
| worldedit = "7.2.20" | ||||
| fawe = "2.12.3" | ||||
| fawe = "2.13.1" | ||||
| placeholderapi = "2.11.6" | ||||
| luckperms = "5.4" | ||||
| essentialsx = "2.20.1" | ||||
| luckperms = "5.5" | ||||
| essentialsx = "2.21.2" | ||||
| mvdwapi = "3.1.1" | ||||
|  | ||||
| # Third party | ||||
| prtree = "2.0.1" | ||||
| aopalliance = "1.0" | ||||
| cloud-services = "1.8.4" | ||||
| arkitektonika = "2.1.3" | ||||
| arkitektonika = "2.1.4" | ||||
| squirrelid = "0.3.2" | ||||
| paster = "1.1.6" | ||||
| paster = "1.1.7" | ||||
| bstats = "3.1.0" | ||||
| paperlib = "1.0.8" | ||||
| informative-annotations = "1.5" | ||||
| informative-annotations = "1.6" | ||||
| vault = "1.7.1" | ||||
| serverlib = "2.3.6" | ||||
| serverlib = "2.3.7" | ||||
|  | ||||
| # Gradle plugins | ||||
| shadow = "8.3.6" | ||||
| shadow = "8.3.9" | ||||
| grgit = "4.1.1" | ||||
| spotless = "7.0.2" | ||||
| nexus = "2.0.0" | ||||
| spotless = "7.2.1" | ||||
| publish = "0.34.0" | ||||
| runPaper = "2.3.1" | ||||
|  | ||||
| [libraries] | ||||
| @@ -81,5 +81,5 @@ serverlib = { group = "dev.notmyfault.serverlib", name = "ServerLib", version.re | ||||
| shadow = { id = "com.gradleup.shadow", version.ref = "shadow" } | ||||
| grgit = { id = "org.ajoberstar.grgit", version.ref = "grgit" } | ||||
| spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } | ||||
| nexus = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus" } | ||||
| publish = { id = "com.vanniktech.maven.publish", version.ref = "publish" } | ||||
| runPaper = { id = "xyz.jpenilla.run-paper", version.ref = "runPaper" } | ||||
|   | ||||
							
								
								
									
										
											BIN
										
									
								
								gradle/wrapper/gradle-wrapper.jar
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								gradle/wrapper/gradle-wrapper.jar
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										2
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							| @@ -1,6 +1,6 @@ | ||||
| distributionBase=GRADLE_USER_HOME | ||||
| distributionPath=wrapper/dists | ||||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip | ||||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip | ||||
| networkTimeout=10000 | ||||
| validateDistributionUrl=true | ||||
| zipStoreBase=GRADLE_USER_HOME | ||||
|   | ||||
							
								
								
									
										6
									
								
								gradlew
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								gradlew
									
									
									
									
										vendored
									
									
								
							| @@ -114,7 +114,7 @@ case "$( uname )" in                #( | ||||
|   NONSTOP* )        nonstop=true ;; | ||||
| esac | ||||
|  | ||||
| CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar | ||||
| CLASSPATH="\\\"\\\"" | ||||
|  | ||||
|  | ||||
| # Determine the Java command to use to start the JVM. | ||||
| @@ -205,7 +205,7 @@ fi | ||||
| DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' | ||||
|  | ||||
| # Collect all arguments for the java command: | ||||
| #   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, | ||||
| #   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, | ||||
| #     and any embedded shellness will be escaped. | ||||
| #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be | ||||
| #     treated as '${Hostname}' itself on the command line. | ||||
| @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' | ||||
| set -- \ | ||||
|         "-Dorg.gradle.appname=$APP_BASE_NAME" \ | ||||
|         -classpath "$CLASSPATH" \ | ||||
|         org.gradle.wrapper.GradleWrapperMain \ | ||||
|         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ | ||||
|         "$@" | ||||
|  | ||||
| # Stop when "xargs" is not available. | ||||
|   | ||||
							
								
								
									
										4
									
								
								gradlew.bat
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								gradlew.bat
									
									
									
									
										vendored
									
									
								
							| @@ -70,11 +70,11 @@ goto fail | ||||
| :execute | ||||
| @rem Setup the command line | ||||
|  | ||||
| set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar | ||||
| set CLASSPATH= | ||||
|  | ||||
|  | ||||
| @rem Execute Gradle | ||||
| "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* | ||||
| "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* | ||||
|  | ||||
| :end | ||||
| @rem End local scope for the variables with windows NT shell | ||||
|   | ||||
		Reference in New Issue
	
	Block a user