EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 13:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/breaking' into breaking

Browse Source
This commit is contained in:
sauilitired 2018-12-21 17:49:15 +01:00
commit 3c48488c61
7 changed files with 53 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Bukkit/build.gradle
View File

@ -7,12 +7,13 @@ repositories {
dependencies { dependencies {
compile project(':Core') compile project(':Core')
testCompile project(':Core')
compile 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT' compile 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT'
compile(group: 'com.sk89q.worldedit', name: 'worldedit-bukkit', version: '7.0.0-SNAPSHOT') compile(group: 'com.sk89q.worldedit', name: 'worldedit-bukkit', version: '7.0.0-SNAPSHOT')
compile("net.milkbowl.vault:VaultAPI:1.6") { compile("net.milkbowl.vault:VaultAPI:1.7") {
exclude module: 'bukkit' exclude module: 'bukkit'
} }
compileOnly 'org.projectlombok:lombok:1.16.18' compileOnly 'org.projectlombok:lombok:1.18.4'
} }
sourceCompatibility = 1.8 sourceCompatibility = 1.8
@ -44,4 +45,4 @@ shadowJar.doLast {
ant.checksum file: task.archivePath ant.checksum file: task.archivePath
} }
build.dependsOn(shadowJar); build.dependsOn(shadowJar)

39
Core/build.gradle
View File

@ -1,10 +1,9 @@
dependencies { dependencies {
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
compile 'org.yaml:snakeyaml:1.16' compile 'org.yaml:snakeyaml:1.23'
compile 'com.google.code.gson:gson:2.2.4' compile 'com.google.code.gson:gson:2.8.5'
compileOnly 'org.projectlombok:lombok:1.16.18' compileOnly 'org.projectlombok:lombok:1.18.4'
} }
sourceCompatibility = 1.8 sourceCompatibility = 1.8
targetCompatibility = 1.8 targetCompatibility = 1.8
@ -21,21 +20,23 @@ processResources {
jar.archiveName = "plotsquared-api-${project.parent.version}.jar" jar.archiveName = "plotsquared-api-${project.parent.version}.jar"
jar.destinationDir = file '../mvn/com/plotsquared/plotsquared-api/' + project.parent.version jar.destinationDir = file '../mvn/com/plotsquared/plotsquared-api/' + project.parent.version
task createPom << { task createPom {
pom { doLast {
project { pom {
groupId 'com.plotsquared' project {
artifactId 'plotsquared-api' groupId 'com.plotsquared'
version project.parent.version artifactId 'plotsquared-api'
} version project.parent.version
}.writeTo("../mvn/com/plotsquared/plotsquared-api/${project.parent.version}/plotsquared-api-${project.parent.version}.pom") }
pom { }.writeTo("../mvn/com/plotsquared/plotsquared-api/${project.parent.version}/plotsquared-api-${project.parent.version}.pom")
project { pom {
groupId 'com.plotsquared' project {
artifactId 'plotsquared-api' groupId 'com.plotsquared'
version 'latest' artifactId 'plotsquared-api'
} version 'latest'
}.writeTo("../mvn/com/plotsquared/plotsquared-api/latest/plotsquared-api-latest.pom") }
}.writeTo("../mvn/com/plotsquared/plotsquared-api/latest/plotsquared-api-latest.pom")
}
} }
task copyFiles { task copyFiles {

2
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java
View File

@ -81,7 +81,7 @@ public class AugmentedUtils {
primaryMask = queue; primaryMask = queue;
} }
LocalBlockQueue secondaryMask; LocalBlockQueue secondaryMask;
PlotBlock air = PlotBlock.get((short) 0, (byte) 0); PlotBlock air = StringPlotBlock.EVERYTHING;
if (area.TERRAIN == 2) { if (area.TERRAIN == 2) {
PlotManager manager = area.getPlotManager(); PlotManager manager = area.getPlotManager();
final boolean[][] canPlace = new boolean[16][16]; final boolean[][] canPlace = new boolean[16][16];

20
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java
View File

@ -10,21 +10,21 @@ import com.github.intellectualsites.plotsquared.plot.util.StringMan;
public abstract class ClassicPlotWorld extends SquarePlotWorld { public abstract class ClassicPlotWorld extends SquarePlotWorld {
public int ROAD_HEIGHT = 64; public int ROAD_HEIGHT = 62;
public int PLOT_HEIGHT = 64; public int PLOT_HEIGHT = 62;
public int WALL_HEIGHT = 64; public int WALL_HEIGHT = 62;
public BlockBucket MAIN_BLOCK = BlockBucket.withSingle(PlotBlock.get("stone")); public BlockBucket MAIN_BLOCK = BlockBucket.withSingle(PlotBlock.get("stone"));
// new PlotBlock[] {PlotBlock.get("stone")}; // new PlotBlock[] {PlotBlock.get("stone")};
public BlockBucket TOP_BLOCK = BlockBucket.withSingle(PlotBlock.get("grass")); public BlockBucket TOP_BLOCK = BlockBucket.withSingle(PlotBlock.get("grass_block"));
//new PlotBlock[] {PlotBlock.get("grass")}; //new PlotBlock[] {PlotBlock.get("grass")};
public BlockBucket WALL_BLOCK = BlockBucket.withSingle(PlotBlock.get("stone_slab")); public BlockBucket WALL_BLOCK = BlockBucket.withSingle(PlotBlock.get("stone_slab"));
// PlotBlock.get((short) 44, (byte) 0); // PlotBlock.get((short) 44, (byte) 0);
public BlockBucket CLAIMED_WALL_BLOCK = BlockBucket.withSingle(PlotBlock.get("sandstone_slab")); public BlockBucket CLAIMED_WALL_BLOCK = BlockBucket.withSingle(PlotBlock.get("sandstone_slab"));
// PlotBlock.get((short) 44, (byte) 1); // PlotBlock.get((short) 44, (byte) 1);
public BlockBucket WALL_FILLING = BlockBucket.withSingle(PlotBlock.get("stone")); public BlockBucket WALL_FILLING = BlockBucket.withSingle(PlotBlock.get("stone"));
//PlotBlock.get((short) 1, (byte) 0); //PlotBlock.get((short) 1, (byte) 0);
public BlockBucket ROAD_BLOCK = BlockBucket.withSingle(PlotBlock.get("quartz_block")); public BlockBucket ROAD_BLOCK = BlockBucket.withSingle(PlotBlock.get("quartz_block"));
// PlotBlock.get((short) 155, (byte) 0); // PlotBlock.get((short) 155, (byte) 0);
public boolean PLOT_BEDROCK = true; public boolean PLOT_BEDROCK = true;
public ClassicPlotWorld(String worldName, String id, IndependentPlotGenerator generator, public ClassicPlotWorld(String worldName, String id, IndependentPlotGenerator generator,

6
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
View File

@ -1169,7 +1169,7 @@ public class Plot {
if (!isLoaded()) if (!isLoaded())
return loc; return loc;
int y = int y =
isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), loc.getX(), loc.getZ()) : 64; isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), loc.getX(), loc.getZ()) : 62;
if (area.ALLOW_SIGNS) { if (area.ALLOW_SIGNS) {
y = Math.max(y, getManager().getSignLoc(area, this).getY()); y = Math.max(y, getManager().getSignLoc(area, this).getY());
} }
@ -1182,7 +1182,7 @@ public class Plot {
int x = (largest.maxX >> 1) - (largest.minX >> 1) + largest.minX; int x = (largest.maxX >> 1) - (largest.minX >> 1) + largest.minX;
int z = largest.minZ - 1; int z = largest.minZ - 1;
PlotManager manager = getManager(); PlotManager manager = getManager();
int y = isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), x, z) : 64; int y = isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), x, z) : 62;
if (area.ALLOW_SIGNS && (y <= 0 || y >= 255)) { if (area.ALLOW_SIGNS && (y <= 0 || y >= 255)) {
y = Math.max(y, manager.getSignLoc(area, this).getY() - 1); y = Math.max(y, manager.getSignLoc(area, this).getY() - 1);
} }
@ -1258,7 +1258,7 @@ public class Plot {
x = bot.getX() + loc.x; x = bot.getX() + loc.x;
z = bot.getZ() + loc.z; z = bot.getZ() + loc.z;
} }
int y = isLoaded() ? WorldUtil.IMP.getHighestBlock(plot.getWorldName(), x, z) : 64; int y = isLoaded() ? WorldUtil.IMP.getHighestBlock(plot.getWorldName(), x, z) : 62;
return new Location(plot.getWorldName(), x, y + 1, z); return new Location(plot.getWorldName(), x, y + 1, z);
} }
// Side // Side

2
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
View File

@ -955,7 +955,7 @@ public abstract class PlotArea {
public void addCluster(PlotCluster plotCluster) { public void addCluster(PlotCluster plotCluster) {
if (this.clusters == null) { if (this.clusters == null) {
this.clusters = new QuadMap<PlotCluster>(Integer.MAX_VALUE, 0, 0, 64) { this.clusters = new QuadMap<PlotCluster>(Integer.MAX_VALUE, 0, 0, 62) {
@Override public RegionWrapper getRegion(PlotCluster value) { @Override public RegionWrapper getRegion(PlotCluster value) {
return new RegionWrapper(value.getP1().x, value.getP2().x, value.getP1().y, return new RegionWrapper(value.getP1().x, value.getP2().x, value.getP1().y,
value.getP2().y); value.getP2().y);

24
build.gradle
View File

@ -1,3 +1,5 @@
import org.ajoberstar.grgit.Grgit
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenCentral()
@ -5,30 +7,29 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3' classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.2'
classpath 'org.ajoberstar:grgit:1.7.0' classpath 'org.ajoberstar.grgit:grgit-gradle:3.0.0'
} }
configurations.all { configurations.all {
resolutionStrategy { resolutionStrategy {
force 'org.ow2.asm:asm:6.0_BETA' force 'org.ow2.asm:asm:7.0'
} }
} }
} }
plugins { plugins {
id 'maven-publish'
id 'io.franzbecker.gradle-lombok' version '1.14' id 'io.franzbecker.gradle-lombok' version '1.14'
} }
group = 'com.intellectualcrafters' group = 'com.github.intellectualsites,plotsquared'
def rootVersion = "4" def rootVersion = "4"
def revision = "" def revision = ""
def buildNumber = "" def buildNumber = ""
def date = "" def date = ""
ext { ext {
git = org.ajoberstar.grgit.Grgit.open(file(".git")) git = Grgit.open(dir: '.git')
date = git.head().date.format("yy.MM.dd") date = git.head().getDate().format("yy.MM.dd")
revision = "-${git.head().abbreviatedId}" revision = "-${git.head().abbreviatedId}"
parents = git.head().parentIds; parents = git.head().parentIds;
index = 0; // Offset to match CI index = 0; // Offset to match CI
@ -42,7 +43,7 @@ version = String.format("%s.%s%s%s", rootVersion, date, revision, buildNumber)
description = rootProject.name description = rootProject.name
if (project.hasProperty("lzNoVersion")) { // gradle build -PlzNoVersion if (project.hasProperty("lzNoVersion")) { // gradle build -PlzNoVersion
version = "unknown"; version = "unknown"
} }
subprojects { subprojects {
@ -52,8 +53,10 @@ subprojects {
apply plugin: 'idea' apply plugin: 'idea'
apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.github.johnrengelman.shadow'
group = 'com.github.intellectualsites,plotsquared'
lombok { lombok {
version = '1.18.2' version = '1.18.4'
sha256 = "" sha256 = ""
} }
@ -63,8 +66,9 @@ subprojects {
exclude(module: 'mockito-core') exclude(module: 'mockito-core')
exclude(module: 'dummypermscompat') exclude(module: 'dummypermscompat')
} }
compile 'com.google.guava:guava:10.0' compile 'com.google.guava:guava:27.0.1-jre'
compileOnly 'org.projectlombok:lombok:1.18.4' compileOnly 'org.projectlombok:lombok:1.18.4'
testImplementation "junit:junit:4.12"
} }
clean { clean {
delete file("../target") delete file("../target")