mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-31 19:45:26 +02:00
Compare commits
5 Commits
chore/runS
...
feature/v7
Author | SHA1 | Date | |
---|---|---|---|
![]() |
894b1a2002 | ||
![]() |
80f435bb05 | ||
![]() |
f4def082c1 | ||
![]() |
69c9f1df83 | ||
![]() |
e138dc0267 |
5
.gitignore
vendored
5
.gitignore
vendored
@@ -138,6 +138,5 @@ build/
|
|||||||
|
|
||||||
.DS_Store
|
.DS_Store
|
||||||
# Ignore run folders
|
# Ignore run folders
|
||||||
run-[0-0].[0-9]/
|
run-[0-9].[0-9][0-9]/
|
||||||
run-[0-0].[0-9].[0-9]/
|
run-[0-9].[0-9][0-9].[0-9]/
|
||||||
|
|
||||||
|
@@ -33,6 +33,7 @@ import com.plotsquared.core.plot.PlotArea;
|
|||||||
import com.plotsquared.core.plot.flag.implementations.BlockBurnFlag;
|
import com.plotsquared.core.plot.flag.implementations.BlockBurnFlag;
|
||||||
import com.plotsquared.core.plot.flag.implementations.BlockIgnitionFlag;
|
import com.plotsquared.core.plot.flag.implementations.BlockIgnitionFlag;
|
||||||
import com.plotsquared.core.plot.flag.implementations.BreakFlag;
|
import com.plotsquared.core.plot.flag.implementations.BreakFlag;
|
||||||
|
import com.plotsquared.core.plot.flag.implementations.ConcreteHardenFlag;
|
||||||
import com.plotsquared.core.plot.flag.implementations.CoralDryFlag;
|
import com.plotsquared.core.plot.flag.implementations.CoralDryFlag;
|
||||||
import com.plotsquared.core.plot.flag.implementations.CropGrowFlag;
|
import com.plotsquared.core.plot.flag.implementations.CropGrowFlag;
|
||||||
import com.plotsquared.core.plot.flag.implementations.DisablePhysicsFlag;
|
import com.plotsquared.core.plot.flag.implementations.DisablePhysicsFlag;
|
||||||
@@ -586,6 +587,12 @@ public class BlockEventListener implements Listener {
|
|||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (event.getNewState().getType().toString().endsWith("CONCRETE")) {
|
||||||
|
if (!plot.getFlag(ConcreteHardenFlag.class)) {
|
||||||
|
plot.debug("Concrete powder could not harden because concrete-harden = false");
|
||||||
|
event.setCancelled(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||||
|
@@ -29,6 +29,7 @@ import com.plotsquared.core.plot.flag.implementations.BlockIgnitionFlag;
|
|||||||
import com.plotsquared.core.plot.flag.implementations.BlockedCmdsFlag;
|
import com.plotsquared.core.plot.flag.implementations.BlockedCmdsFlag;
|
||||||
import com.plotsquared.core.plot.flag.implementations.BreakFlag;
|
import com.plotsquared.core.plot.flag.implementations.BreakFlag;
|
||||||
import com.plotsquared.core.plot.flag.implementations.ChatFlag;
|
import com.plotsquared.core.plot.flag.implementations.ChatFlag;
|
||||||
|
import com.plotsquared.core.plot.flag.implementations.ConcreteHardenFlag;
|
||||||
import com.plotsquared.core.plot.flag.implementations.CopperOxideFlag;
|
import com.plotsquared.core.plot.flag.implementations.CopperOxideFlag;
|
||||||
import com.plotsquared.core.plot.flag.implementations.CoralDryFlag;
|
import com.plotsquared.core.plot.flag.implementations.CoralDryFlag;
|
||||||
import com.plotsquared.core.plot.flag.implementations.CropGrowFlag;
|
import com.plotsquared.core.plot.flag.implementations.CropGrowFlag;
|
||||||
@@ -142,6 +143,7 @@ public final class GlobalFlagContainer extends FlagContainer {
|
|||||||
this.addFlag(BeaconEffectsFlag.BEACON_EFFECT_TRUE);
|
this.addFlag(BeaconEffectsFlag.BEACON_EFFECT_TRUE);
|
||||||
this.addFlag(BlockIgnitionFlag.BLOCK_IGNITION_TRUE);
|
this.addFlag(BlockIgnitionFlag.BLOCK_IGNITION_TRUE);
|
||||||
this.addFlag(ChatFlag.CHAT_FLAG_TRUE);
|
this.addFlag(ChatFlag.CHAT_FLAG_TRUE);
|
||||||
|
this.addFlag(ConcreteHardenFlag.CONCRETE_HARDEN_TRUE);
|
||||||
this.addFlag(CopperOxideFlag.COPPER_OXIDE_FALSE);
|
this.addFlag(CopperOxideFlag.COPPER_OXIDE_FALSE);
|
||||||
this.addFlag(CoralDryFlag.CORAL_DRY_FALSE);
|
this.addFlag(CoralDryFlag.CORAL_DRY_FALSE);
|
||||||
this.addFlag(CropGrowFlag.CROP_GROW_TRUE);
|
this.addFlag(CropGrowFlag.CROP_GROW_TRUE);
|
||||||
|
@@ -0,0 +1,39 @@
|
|||||||
|
/*
|
||||||
|
* PlotSquared, a land and world management plugin for Minecraft.
|
||||||
|
* Copyright (C) IntellectualSites <https://intellectualsites.com>
|
||||||
|
* Copyright (C) IntellectualSites team and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package com.plotsquared.core.plot.flag.implementations;
|
||||||
|
|
||||||
|
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||||
|
import com.plotsquared.core.plot.flag.types.BooleanFlag;
|
||||||
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
|
public class ConcreteHardenFlag extends BooleanFlag<ConcreteHardenFlag> {
|
||||||
|
|
||||||
|
public static final ConcreteHardenFlag CONCRETE_HARDEN_TRUE = new ConcreteHardenFlag(true);
|
||||||
|
public static final ConcreteHardenFlag CONCRETE_HARDEN_FALSE = new ConcreteHardenFlag(false);
|
||||||
|
|
||||||
|
private ConcreteHardenFlag(boolean value) {
|
||||||
|
super(value, TranslatableCaption.of("flags.flag_description_concrete_harden"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected ConcreteHardenFlag flagOf(@NonNull Boolean value) {
|
||||||
|
return value ? CONCRETE_HARDEN_TRUE : CONCRETE_HARDEN_FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@@ -551,6 +551,7 @@
|
|||||||
"flags.flag_description_block_burn": "<gray>Set to `true` to allow blocks to burn within the plot.</gray>",
|
"flags.flag_description_block_burn": "<gray>Set to `true` to allow blocks to burn within the plot.</gray>",
|
||||||
"flags.flag_description_block_ignition": "<gray>Set to `false` to prevent blocks from igniting within the plot.</gray>",
|
"flags.flag_description_block_ignition": "<gray>Set to `false` to prevent blocks from igniting within the plot.</gray>",
|
||||||
"flags.flag_description_break": "<gray>Define a list of materials players should be able to break even when they aren't added to the plot.</gray>",
|
"flags.flag_description_break": "<gray>Define a list of materials players should be able to break even when they aren't added to the plot.</gray>",
|
||||||
|
"flags.flag_description_concrete_harden": "<gray>Set to `false` to disable concrete powder forming to concrete with water.</gray>",
|
||||||
"flags.flag_description_device_interact": "<gray>Set to `true` to allow devices to be interacted with in the plot.</gray>",
|
"flags.flag_description_device_interact": "<gray>Set to `true` to allow devices to be interacted with in the plot.</gray>",
|
||||||
"flags.flag_description_disable_physics": "<gray>Set to `true` to disable block physics in the plot.</gray>",
|
"flags.flag_description_disable_physics": "<gray>Set to `true` to disable block physics in the plot.</gray>",
|
||||||
"flags.flag_description_drop_protection": "<gray>Set to `true` to prevent dropped items from being picked up by non-members of the plot.</gray>",
|
"flags.flag_description_drop_protection": "<gray>Set to `true` to prevent dropped items from being picked up by non-members of the plot.</gray>",
|
||||||
|
@@ -1,5 +1,6 @@
|
|||||||
import com.diffplug.gradle.spotless.SpotlessPlugin
|
import com.diffplug.gradle.spotless.SpotlessPlugin
|
||||||
import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
|
import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
|
||||||
|
import groovy.json.JsonSlurper
|
||||||
import java.net.URI
|
import java.net.URI
|
||||||
import xyz.jpenilla.runpaper.task.RunServer
|
import xyz.jpenilla.runpaper.task.RunServer
|
||||||
|
|
||||||
@@ -218,14 +219,23 @@ tasks.getByName<Jar>("jar") {
|
|||||||
enabled = false
|
enabled = false
|
||||||
}
|
}
|
||||||
|
|
||||||
val supportedVersions = listOf("1.16.5", "1.17", "1.17.1", "1.18.2", "1.19", "1.19.1", "1.19.2", "1.19.3", "1.19.4", "1.20")
|
val supportedVersions = listOf("1.16.5", "1.17.1", "1.18.2", "1.19.4", "1.20.1")
|
||||||
tasks {
|
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") }
|
||||||
|
|
||||||
supportedVersions.forEach {
|
supportedVersions.forEach {
|
||||||
register<RunServer>("runServer-$it") {
|
register<RunServer>("runServer-$it") {
|
||||||
minecraftVersion(it)
|
minecraftVersion(it)
|
||||||
pluginJars(*project(":plotsquared-bukkit").getTasksByName("shadowJar", false).map { (it as Jar).archiveFile }
|
pluginJars(*project(":plotsquared-bukkit").getTasksByName("shadowJar", false).map { (it as Jar).archiveFile }
|
||||||
.toTypedArray())
|
.toTypedArray())
|
||||||
jvmArgs("-DPaper.IgnoreJavaVersion=true", "-Dcom.mojang.eula.agree=true")
|
jvmArgs("-DPaper.IgnoreJavaVersion=true", "-Dcom.mojang.eula.agree=true")
|
||||||
|
downloadPlugins {
|
||||||
|
url("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/artifact/artifacts/$artifact")
|
||||||
|
}
|
||||||
group = "run paper"
|
group = "run paper"
|
||||||
runDirectory.set(file("run-$it"))
|
runDirectory.set(file("run-$it"))
|
||||||
}
|
}
|
||||||
|
@@ -14,7 +14,7 @@ log4j = "2.19.0"
|
|||||||
# Plugins
|
# Plugins
|
||||||
worldedit = "7.2.15"
|
worldedit = "7.2.15"
|
||||||
fawe = "2.7.1"
|
fawe = "2.7.1"
|
||||||
placeholderapi = "2.11.3"
|
placeholderapi = "2.11.4"
|
||||||
luckperms = "5.4"
|
luckperms = "5.4"
|
||||||
essentialsx = "2.20.1"
|
essentialsx = "2.20.1"
|
||||||
mvdwapi = "3.1.1"
|
mvdwapi = "3.1.1"
|
||||||
@@ -22,7 +22,7 @@ mvdwapi = "3.1.1"
|
|||||||
# Third party
|
# Third party
|
||||||
prtree = "2.0.1"
|
prtree = "2.0.1"
|
||||||
aopalliance = "1.0"
|
aopalliance = "1.0"
|
||||||
cloud-services = "1.8.3"
|
cloud-services = "1.8.4"
|
||||||
arkitektonika = "2.1.2"
|
arkitektonika = "2.1.2"
|
||||||
squirrelid = "0.3.2"
|
squirrelid = "0.3.2"
|
||||||
paster = "1.1.5"
|
paster = "1.1.5"
|
||||||
@@ -37,7 +37,7 @@ shadow = "8.1.1"
|
|||||||
grgit = "4.1.1"
|
grgit = "4.1.1"
|
||||||
spotless = "6.21.0"
|
spotless = "6.21.0"
|
||||||
nexus = "1.3.0"
|
nexus = "1.3.0"
|
||||||
runPaper = "2.1.0"
|
runPaper = "2.2.0"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
# Platform expectations
|
# Platform expectations
|
||||||
|
Reference in New Issue
Block a user