Brandon/FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix sponge buildscript

Browse Source
This commit is contained in:
Jesse Boyd 2017-11-10 20:19:05 +11:00
parent d5d97f82af
commit 97515d0f31
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
4 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

3
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,5 @@
#Mon Feb 22 17:40:44 PST 2016
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip

17
sponge/build.gradle
View File

@ -1,14 +1,7 @@
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
maven { maven { url = 'https://plugins.gradle.org/m2' }
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
maven {
name = 'minecrell'
url = 'http://repo.minecrell.net/releases'
}
maven {url = "https://oss.sonatype.org/content/repositories/snapshots/"} maven {url = "https://oss.sonatype.org/content/repositories/snapshots/"}
maven {url = "http://repo.minecrell.net/snapshots"} maven {url = "http://repo.minecrell.net/snapshots"}
maven { url = "http://files.minecraftforge.net/maven" } maven { url = "http://files.minecraftforge.net/maven" }
@ -16,7 +9,7 @@ buildscript {
maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" } maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" }
} }
dependencies { dependencies {
classpath 'net.minecrell:VanillaGradle:2.0.3_1' classpath 'gradle.plugin.net.minecrell:vanillagradle:2.2-6'
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
} }
} }
@ -25,7 +18,7 @@ plugins {
id 'org.spongepowered.plugin' version '0.8.1' id 'org.spongepowered.plugin' version '0.8.1'
} }
apply plugin: 'net.minecrell.vanilla.server.library' apply plugin: 'net.minecrell.vanillagradle.server'
apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.github.johnrengelman.shadow'
sourceCompatibility = 1.8 sourceCompatibility = 1.8
@ -55,8 +48,8 @@ dependencies {
} }
minecraft { minecraft {
version = "1.12" version = "1.12.2"
mappings = "snapshot_20171108" mappings = "snapshot_20171022"
runDir = 'run' runDir = 'run'
} }

1
sponge/src/main/java/com/boydti/fawe/sponge/v1_12/SpongeQueue_1_12.java
View File

@ -342,7 +342,6 @@ public class SpongeQueue_1_12 extends NMSMappedFaweQueue<World, net.minecraft.wo
net.minecraft.world.biome.Biome[] existingBiomes = new net.minecraft.world.biome.Biome[256]; net.minecraft.world.biome.Biome[] existingBiomes = new net.minecraft.world.biome.Biome[256];
Arrays.fill(existingBiomes, base); Arrays.fill(existingBiomes, base);
fieldBiomes.set(generator, existingBiomes); fieldBiomes.set(generator, existingBiomes);
boolean cold = base.getTemperature() <= 1;
IChunkGenerator existingGenerator = (IChunkGenerator) fieldChunkGenerator.get(nmsWorld.getChunkProvider()); IChunkGenerator existingGenerator = (IChunkGenerator) fieldChunkGenerator.get(nmsWorld.getChunkProvider());
long existingSeed = world.getSeed(); long existingSeed = world.getSeed();
{ {