Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Forge] Officially move to Java 8

Browse Source
This commit is contained in:
Kenzie Togami 2017-08-16 16:07:18 -07:00
parent f2c5b272ad
commit 6c6e1b4ce2
No known key found for this signature in database
GPG Key ID: 5D200B325E157A81
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
worldedit-core/build.gradle
View File

@ -5,7 +5,7 @@ dependencies {
compile 'de.schlichtherle:truezip:6.8.3' compile 'de.schlichtherle:truezip:6.8.3'
compile 'rhino:js:1.7R2' compile 'rhino:js:1.7R2'
compile 'org.yaml:snakeyaml:1.9' compile 'org.yaml:snakeyaml:1.9'
compile 'com.google.guava:guava:17.0' compile 'com.google.guava:guava:21.0'
compile 'com.sk89q:jchronic:0.2.4a' compile 'com.sk89q:jchronic:0.2.4a'
compile 'com.google.code.findbugs:jsr305:1.3.9' compile 'com.google.code.findbugs:jsr305:1.3.9'
compile 'com.thoughtworks.paranamer:paranamer:2.6' compile 'com.thoughtworks.paranamer:paranamer:2.6'

17
worldedit-forge/build.gradle
View File

@ -13,12 +13,21 @@ buildscript {
apply plugin: 'net.minecraftforge.gradle.forge' apply plugin: 'net.minecraftforge.gradle.forge'
configurations.all {
resolutionStrategy {
force 'org.ow2.asm:asm:5.2'
}
}
dependencies { dependencies {
compile project(':worldedit-core') compile project(':worldedit-core')
compile 'org.spongepowered:spongeapi:3.1.0-SNAPSHOT' compile 'org.spongepowered:spongeapi:6.0.0-SNAPSHOT'
testCompile group: 'org.mockito', name: 'mockito-core', version: '1.9.0-rc1' testCompile group: 'org.mockito', name: 'mockito-core', version: '1.9.0-rc1'
} }
sourceCompatibility = 1.8
targetCompatibility = 1.8
repositories { repositories {
maven { maven {
name = "Sponge" name = "Sponge"
@ -26,11 +35,11 @@ repositories {
} }
} }
ext.forgeVersion = "14.21.1.2443" ext.forgeVersion = "14.22.0.2456"
minecraft { minecraft {
version = "1.12-${project.forgeVersion}" version = "1.12.1-${project.forgeVersion}"
mappings = "snapshot_20170801" mappings = "snapshot_20170815"
runDir = 'run' runDir = 'run'
replaceIn "com/sk89q/worldedit/forge/ForgeWorldEdit.java" replaceIn "com/sk89q/worldedit/forge/ForgeWorldEdit.java"

4
worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorldEdit.java
View File

@ -64,10 +64,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
@Mod(modid = ForgeWorldEdit.MOD_ID, name = "WorldEdit", version = "%VERSION%", acceptableRemoteVersions = "*") @Mod(modid = ForgeWorldEdit.MOD_ID, name = "WorldEdit", version = "%VERSION%", acceptableRemoteVersions = "*")
public class ForgeWorldEdit { public class ForgeWorldEdit {
static {
Java8Detector.notifyIfNot8();
}
public static Logger logger; public static Logger logger;
public static final String MOD_ID = "worldedit"; public static final String MOD_ID = "worldedit";
public static final String CUI_PLUGIN_CHANNEL = "WECUI"; public static final String CUI_PLUGIN_CHANNEL = "WECUI";