diff options
| -rwxr-xr-x | build.gradle | 127 | ||||
| -rw-r--r-- | gradle.properties | 1 | ||||
| -rwxr-xr-x | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rw-r--r-- | src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonMap.java | 4 | ||||
| -rwxr-xr-x | src/main/java/kr/syeyoung/dungeonsguide/utils/MapUtils.java | 2 |
5 files changed, 56 insertions, 80 deletions
diff --git a/build.gradle b/build.gradle index b571e637..677c0a9a 100755 --- a/build.gradle +++ b/build.gradle @@ -1,109 +1,65 @@ - // For those who want the bleeding edge buildscript { repositories { - jcenter() + gradlePluginPortal() mavenCentral() maven { name = "forge" - url = "https://files.minecraftforge.net/maven" + url = "https://maven.minecraftforge.net/" } + maven { url "https://jitpack.io" } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' - classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.4' + classpath "com.github.Skytils:ForgeGradle:FG_2.1-SNAPSHOT" + classpath "com.github.jengelman.gradle.plugins:shadow:6.1.0" } } -apply plugin: 'net.minecraftforge.gradle.forge' -apply plugin: 'com.github.johnrengelman.shadow' +apply plugin: "net.minecraftforge.gradle.forge" +apply plugin: "com.github.johnrengelman.shadow" -/* -// for people who want stable - not yet functional for MC 1.8.8 - we require the forgegradle 2.1 snapshot -plugins { - id "net.minecraftforge.gradle.forge" version "2.0.2" -} -*/ version = "2.0" -group= "kr.syeyoung.dungeonsguide" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +group = "kr.syeyoung.dungeonsguide" archivesBaseName = "dungeonsguide" -sourceCompatibility=1.8 -targetCompatibility=1.8 +sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8 +tasks.withType(JavaCompile) { + options.encoding = "UTF-8" +} minecraft { - version = "1.8.9-11.15.1.1722" + version = "1.8.9-11.15.1.2318-1.8.9" runDir = "run" - - // the mappings can be changed at any time, and must be in the following format. - // snapshot_YYYYMMDD snapshot are built nightly. - // stable_# stables are built at the discretion of the MCP team. - // Use non-default mappings at your own risk. they may not allways work. - // simply re-run your setup task after changing the mappings to update your workspace. - mappings = "stable_20" - // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. + + mappings = "stable_22" + makeObfSourceJar = false } repositories { - jcenter() mavenCentral() - maven { url 'https://jitpack.io' } + maven { url "https://jitpack.io" } } dependencies { - implementation 'org.jetbrains:annotations-java5:19.0.0' - compile "org.java-websocket:Java-WebSocket:1.5.1" - compile "org.json:json:20171018" - - // you may put jars on which you depend on in ./libs - // or you may define them like so.. - //compile "some.group:artifact:version:classifier" - //compile "some.group:artifact:version" - - // real examples - //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env - //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env - - // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. - //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' - - // the deobf configurations: 'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided, - // except that these dependencies get remapped to your current MCP mappings - //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev' - //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev' - - // for more info... - // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html - // http://www.gradle.org/docs/current/userguide/dependency_management.html - compileOnly 'org.projectlombok:lombok:1.18.16' - compileOnly files('mods/Hychat-1.12.1-BETA.jar') - annotationProcessor 'org.projectlombok:lombok:1.18.16' - - testCompileOnly 'org.projectlombok:lombok:1.18.16' - testAnnotationProcessor 'org.projectlombok:lombok:1.18.16' -} + implementation "org.jetbrains:annotations-java5:19.0.0" + implementation "org.java-websocket:Java-WebSocket:1.5.1" + implementation "org.json:json:20171018" + compileOnly "org.projectlombok:lombok:1.18.16" + compileOnly files("mods/Hychat-1.12.1-BETA.jar") + annotationProcessor "org.projectlombok:lombok:1.18.16" -processResources -{ - // this will ensure that this task is redone when the versions change. - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version + testCompileOnly "org.projectlombok:lombok:1.18.16" + testAnnotationProcessor "org.projectlombok:lombok:1.18.16" +} - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' - - // replace version and mcversion - expand 'version':project.version, 'mcversion':project.minecraft.version - } - - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'mcmod.info' - } +jar { + enabled = false } shadowJar { + + archiveFileName = jar.archiveFileName + relocate "org.java_websocket", "kr.syeyoung.org.java_websocket" dependencies { @@ -115,6 +71,25 @@ shadowJar { reobf { shadowJar { - mappingType = 'SEARGE' + mappingType = "SEARGE" + } +} + +processResources { + // this will ensure that this task is redone when the versions change. + inputs.property "version", project.version + inputs.property "mcversion", project.minecraft.version + + // replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include "mcmod.info" + + // replace version and mcversion + expand "version": project.version, "mcversion": project.minecraft.version + } + + // copy everything else, thats not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude "mcmod.info" } }
\ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..bf86fb71 --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +org.gradle.jvmargs=-Xmx2G
\ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2d80b69a..8cf6eb5a 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonMap.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonMap.java index e7e899d3..1cfb204b 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonMap.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonMap.java @@ -220,7 +220,7 @@ public class FeatureDungeonMap extends GuiFeature implements DungeonEndListener, if (j / 4 == 0) { this.mapTextureData[i] = 0x00000000; } else { - this.mapTextureData[i] = MapColor.mapColorArray[j / 4].func_151643_b(j & 3); + this.mapTextureData[i] = MapColor.mapColorArray[j / 4].getMapColor(j & 3); } } @@ -237,7 +237,7 @@ public class FeatureDungeonMap extends GuiFeature implements DungeonEndListener, if (j / 4 == 0) { this.mapTextureData[i] = 0x00000000; } else { - this.mapTextureData[i] = MapColor.mapColorArray[j / 4].func_151643_b(j & 3); + this.mapTextureData[i] = MapColor.mapColorArray[j / 4].getMapColor(j & 3); } } } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/utils/MapUtils.java b/src/main/java/kr/syeyoung/dungeonsguide/utils/MapUtils.java index 6666043f..06c3818f 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/utils/MapUtils.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/utils/MapUtils.java @@ -55,7 +55,7 @@ public class MapUtils { } else { - theColor = MapColor.mapColorArray[j / 4].func_151643_b(j & 3); + theColor = MapColor.mapColorArray[j / 4].getMapColor(j & 3); } return theColor; |