mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-10-31 01:23:44 +01:00 
			
		
		
		
	Compare commits
	
		
			4 Commits
		
	
	
		
			7.1.0
			...
			fix/runSer
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 944e90334a | ||
|   | c013b92e62 | ||
|   | b00a46b286 | ||
|   | 44b1127181 | 
| @@ -72,8 +72,6 @@ tasks { | ||||
|         opt.links("https://jd.advntr.dev/text-minimessage/4.14.0/") | ||||
|         opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/") | ||||
|         opt.links("https://checkerframework.org/api/") | ||||
|         opt.links("https://javadocs.dev/com.intellectualsites.informative-annotations/informative-annotations/" | ||||
|                 + libs.informativeAnnotations.get().versionConstraint.toString()) | ||||
|         opt.isLinkSource = true | ||||
|         opt.bottom(File("$rootDir/javadocfooter.html").readText()) | ||||
|         opt.isUse = true | ||||
|   | ||||
| @@ -29,7 +29,6 @@ import com.plotsquared.core.util.WorldUtil; | ||||
| import com.plotsquared.core.util.entity.EntityCategories; | ||||
| import com.plotsquared.core.util.entity.EntityCategory; | ||||
| import com.plotsquared.core.util.query.PlotQuery; | ||||
| import com.plotsquared.core.util.task.TaskManager; | ||||
| import com.plotsquared.core.uuid.UUIDMapping; | ||||
| import com.sk89q.worldedit.world.entity.EntityType; | ||||
| import net.kyori.adventure.text.Component; | ||||
| @@ -71,7 +70,7 @@ public class Debug extends SubCommand { | ||||
|                     TranslatableCaption.of("commandconfig.command_syntax"), | ||||
|                     TagResolver.resolver( | ||||
|                             "value", | ||||
|                             Tag.inserting(Component.text("/plot debug <loadedchunks | player | debug-players | entitytypes | msg>")) | ||||
|                             Tag.inserting(Component.text("/plot debug <player | debug-players | entitytypes | msg>")) | ||||
|                     ) | ||||
|             ); | ||||
|         } | ||||
| @@ -85,16 +84,6 @@ public class Debug extends SubCommand { | ||||
|                 return true; | ||||
|             } | ||||
|         } | ||||
|         if (args.length > 0 && "loadedchunks".equalsIgnoreCase(args[0])) { | ||||
|             final long start = System.currentTimeMillis(); | ||||
|             player.sendMessage(TranslatableCaption.of("debug.fetching_loaded_chunks")); | ||||
|             TaskManager.runTaskAsync(() -> player.sendMessage(StaticCaption | ||||
|                     .of("Loaded chunks: " + this.worldUtil | ||||
|                             .getChunkChunks(player.getLocation().getWorldName()) | ||||
|                             .size() + " (" + (System.currentTimeMillis() | ||||
|                             - start) + "ms) using thread: " + Thread.currentThread().getName()))); | ||||
|             return true; | ||||
|         } | ||||
|         if (args.length > 0 && "uuids".equalsIgnoreCase(args[0])) { | ||||
|             final Collection<UUIDMapping> mappings = PlotSquared.get().getImpromptuUUIDPipeline().getAllImmediately(); | ||||
|             player.sendMessage( | ||||
| @@ -196,7 +185,7 @@ public class Debug extends SubCommand { | ||||
|  | ||||
|     @Override | ||||
|     public Collection<Command> tab(final PlotPlayer<?> player, String[] args, boolean space) { | ||||
|         return Stream.of("loadedchunks", "debug-players", "entitytypes") | ||||
|         return Stream.of("debug-players", "entitytypes") | ||||
|                 .filter(value -> value.startsWith(args[0].toLowerCase(Locale.ENGLISH))) | ||||
|                 .map(value -> new Command(null, false, value, "plots.admin", RequiredType.NONE, null) { | ||||
|                 }).collect(Collectors.toList()); | ||||
|   | ||||
| @@ -882,7 +882,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer, | ||||
|         final Component titleComponent = MiniMessage.miniMessage().deserialize(title.getComponent(this), replacements); | ||||
|         final Component subtitleComponent = | ||||
|                 MiniMessage.miniMessage().deserialize(subtitle.getComponent(this), replacements); | ||||
|         final Title.Times times = Title.Times.of( | ||||
|         final Title.Times times = Title.Times.times( | ||||
|                 Duration.of(Settings.Titles.TITLES_FADE_IN * 50L, ChronoUnit.MILLIS), | ||||
|                 Duration.of(Settings.Titles.TITLES_STAY * 50L, ChronoUnit.MILLIS), | ||||
|                 Duration.of(Settings.Titles.TITLES_FADE_OUT * 50L, ChronoUnit.MILLIS) | ||||
|   | ||||
| @@ -22,7 +22,7 @@ plugins { | ||||
| } | ||||
|  | ||||
| group = "com.intellectualsites.plotsquared" | ||||
| version = "7.1.0" | ||||
| version = "7.1.1-SNAPSHOT" | ||||
|  | ||||
| if (!File("$rootDir/.git").exists()) { | ||||
|     logger.lifecycle(""" | ||||
| @@ -226,20 +226,25 @@ tasks.getByName<Jar>("jar") { | ||||
|  | ||||
| val supportedVersions = listOf("1.16.5", "1.17.1", "1.18.2", "1.19.4", "1.20.1", "1.20.2") | ||||
| tasks { | ||||
|     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.contains("Bukkit") } | ||||
|     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") } | ||||
|         project.ext["faweArtifact"] = artifact | ||||
|     } | ||||
|  | ||||
|     supportedVersions.forEach { | ||||
|         register<RunServer>("runServer-$it") { | ||||
|             dependsOn(getByName("cacheLatestFaweArtifact")) | ||||
|             minecraftVersion(it) | ||||
|             pluginJars(*project(":plotsquared-bukkit").getTasksByName("shadowJar", false).map { (it as Jar).archiveFile } | ||||
|             pluginJars(*project(":plotsquared-bukkit").getTasksByName("shadowJar", false) | ||||
|                     .map { task -> (task as Jar).archiveFile } | ||||
|                     .toTypedArray()) | ||||
|             jvmArgs("-DPaper.IgnoreJavaVersion=true", "-Dcom.mojang.eula.agree=true") | ||||
|             downloadPlugins { | ||||
|                 url("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/artifact/artifacts/$artifact") | ||||
|                 url("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/artifact/artifacts/${project.ext["faweArtifact"]}") | ||||
|             } | ||||
|             group = "run paper" | ||||
|             runDirectory.set(file("run-$it")) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user