diff --git a/build.gradle b/build.gradle index 0d1f644..92ff901 100644 --- a/build.gradle +++ b/build.gradle @@ -11,11 +11,11 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' } } -apply plugin: 'forge' +apply plugin: 'net.minecraftforge.gradle.forge' apply plugin: 'maven' apply plugin: 'checkstyle' @@ -43,10 +43,10 @@ targetCompatibility = jreVersion minecraft { // forge version - version = "1.8-11.14.3.1502" + version = "1.8.8-11.15.0.1639-1.8.8" runDir = "run" - mappings = "snapshot_20141130" + mappings = "snapshot_20151220" // this configurations is copied this replacement configuration to source copy tasks replace '@VERSION@', project.version @@ -99,10 +99,6 @@ task deobfJar(type: Jar, dependsOn: classes) { from sourceSets.main.output } -task sourceJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceMainJava.output -} task signJar(dependsOn:assemble) << { description = "signing jar files" @@ -179,9 +175,9 @@ gradle.taskGraph.whenReady { taskGraph -> } // update configuration of source copy tasks - project.tasks.withType(net.minecraftforge.gradle.tasks.user.SourceCopyTask.class).each { - t -> t.replace '@VERSION@', project.version - } + //project.tasks.withType(net.minecraftforge.gradle.tasks.user.SourceCopyTask.class).each { + // t -> t.replace '@VERSION@', project.version + //} // update configuration of processResources task project.tasks.findAll { t -> t.name.equals("processResources") }.each { t -> diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b761216..30d399d 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 678d9d8..9397848 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jul 02 15:54:47 CDT 2014 +#Mon Sep 14 12:28:28 PDT 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip diff --git a/src/main/java/net/awairo/mcmod/spawnchecker/client/marker/RenderingSupport.java b/src/main/java/net/awairo/mcmod/spawnchecker/client/marker/RenderingSupport.java index 5044f77..f1ab55e 100644 --- a/src/main/java/net/awairo/mcmod/spawnchecker/client/marker/RenderingSupport.java +++ b/src/main/java/net/awairo/mcmod/spawnchecker/client/marker/RenderingSupport.java @@ -22,6 +22,7 @@ import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.awairo.mcmod.common.v1.util.Colors; @@ -87,7 +88,7 @@ public final class RenderingSupport */ public static void startDrawingQuads() { - getWorldRenderer().startDrawingQuads(); + getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION); } /** @@ -95,7 +96,7 @@ public final class RenderingSupport */ public static void startDrawingLines() { - getWorldRenderer().startDrawing(GL11.GL_LINES); + getWorldRenderer().begin(GL11.GL_LINES, DefaultVertexFormats.POSITION); } /** @@ -119,7 +120,7 @@ public final class RenderingSupport */ public static void addVertex(double x, double y, double z) { - getWorldRenderer().addVertex(x, y, z); + getWorldRenderer().pos(x, y, z).endVertex(); } /** @@ -131,19 +132,20 @@ public final class RenderingSupport * @param u u * @param v v */ - public static void addVertexWithUV(double x, double y, double z, double u, double v) - { - getWorldRenderer().addVertexWithUV(x, y, z, u, v); - } + // disabled, as the new rendering code is too different and this is not used anyway + //public static void addVertexWithUV(double x, double y, double z, double u, double v) + //{ + // getWorldRenderer().addVertexWithUV(x, y, z, u, v); + //} /** * 描画します. * * @return バッファインデックス？ */ - public static int draw() + public static void draw() { - return tessellator().draw(); + tessellator().draw(); } /** diff --git a/src/main/java/net/awairo/mcmod/spawnchecker/client/mode/core/ModeConfig.java b/src/main/java/net/awairo/mcmod/spawnchecker/client/mode/core/ModeConfig.java index f6d7326..b8aeb94 100644 --- a/src/main/java/net/awairo/mcmod/spawnchecker/client/mode/core/ModeConfig.java +++ b/src/main/java/net/awairo/mcmod/spawnchecker/client/mode/core/ModeConfig.java @@ -150,7 +150,7 @@ public class ModeConfig extends ConfigCategory final String[] ids = enablingItemsProp.getStringList(); for (String id : ids) { - final Item item = (Item) Item.itemRegistry.getObject(id); + final Item item = (Item) Item.itemRegistry.getObject(new net.minecraft.util.ResourceLocation(id)); if (item == null) { diff --git a/src/main/java/net/awairo/mcmod/spawnchecker/client/mode/information/InformationManager.java b/src/main/java/net/awairo/mcmod/spawnchecker/client/mode/information/InformationManager.java index dc518a5..7c9d933 100644 --- a/src/main/java/net/awairo/mcmod/spawnchecker/client/mode/information/InformationManager.java +++ b/src/main/java/net/awairo/mcmod/spawnchecker/client/mode/information/InformationManager.java @@ -168,7 +168,7 @@ public final class InformationManager extends ClientManager private ScaledResolution newScaledResolution() { - return new ScaledResolution(GAME, GAME.displayWidth, GAME.displayHeight); + return new ScaledResolution(GAME); } // ------------------------- diff --git a/src/main/java/net/awairo/mcmod/spawnchecker/client/mode/information/Renderer.java b/src/main/java/net/awairo/mcmod/spawnchecker/client/mode/information/Renderer.java index ab6597b..bf6d1fc 100644 --- a/src/main/java/net/awairo/mcmod/spawnchecker/client/mode/information/Renderer.java +++ b/src/main/java/net/awairo/mcmod/spawnchecker/client/mode/information/Renderer.java @@ -18,6 +18,7 @@ import org.lwjgl.opengl.GL11; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.awairo.mcmod.spawnchecker.client.common.ConstantsConfig; import net.awairo.mcmod.spawnchecker.client.mode.Mode; @@ -116,13 +117,13 @@ class Renderer GL11.glEnable(GL11.GL_TEXTURE_2D); + int r = rgb >> 16, g = (rgb >> 8) & 0xff, b = rgb & 0xff; game.renderEngine.bindTexture(info.getIconResource()); - t.getWorldRenderer().startDrawingQuads(); - t.getWorldRenderer().setColorRGBA_I(rgb, a); - t.getWorldRenderer().addVertexWithUV(lbx, lby, consts().guiPosZ, consts().iconTextureUMin, consts().iconTextureVMax); - t.getWorldRenderer().addVertexWithUV(rbx, rby, consts().guiPosZ, consts().iconTextureUMax, consts().iconTextureVMax); - t.getWorldRenderer().addVertexWithUV(rtx, rty, consts().guiPosZ, consts().iconTextureUMax, consts().iconTextureVMin); - t.getWorldRenderer().addVertexWithUV(ltx, lty, consts().guiPosZ, consts().iconTextureUMin, consts().iconTextureVMin); + t.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); + t.getWorldRenderer().pos(lbx, lby, consts().guiPosZ).tex(consts().iconTextureUMin, consts().iconTextureVMax).color(r, g, b, a).endVertex(); + t.getWorldRenderer().pos(rbx, rby, consts().guiPosZ).tex(consts().iconTextureUMax, consts().iconTextureVMax).color(r, g, b, a).endVertex(); + t.getWorldRenderer().pos(rtx, rty, consts().guiPosZ).tex(consts().iconTextureUMax, consts().iconTextureVMin).color(r, g, b, a).endVertex(); + t.getWorldRenderer().pos(ltx, lty, consts().guiPosZ).tex(consts().iconTextureUMin, consts().iconTextureVMin).color(r, g, b, a).endVertex(); t.draw(); }