ExampleMod for 1.12, clean up build script

Mumfrey
1 parent 48a4b5c6
Showing 4 changed files with 22 additions and 13 deletions
build.gradle
gradle.properties
src/main/java/com/examplemod/Clock.java
src/main/java/com/examplemod/mixin/MixinGuiMainMenu.java
@@ -16,7 +16,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:' + project.forgeGradleVersion
         classpath 'org.spongepowered:mixingradle:0.4-SNAPSHOT'
     }
 }
@@ -24,35 +24,38 @@ buildscript {
 apply plugin: 'net.minecraftforge.gradle.liteloader'
 apply plugin: 'org.spongepowered.mixin'
-version = "0.1"
 group = "com.mumfrey.examplemod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "examplemod"
 minecraft {
-    version = "1.11.2"
-    mappings = "snapshot_20161224"
+    // these values are defined in the gradle.properties file, so that this file does not need to be altered
+    version = project.mcVersion
+    mappings = project.mcMappings
     runDir = "run"
 }
 sourceSets {
     main {
         // Refmap declaration must match the refmap name specified in the json config
-        refMap = "mixins.example.refmap.json"
+        ext.refMap = "mixins.example.refmap.json"
     }
 }
 mixin {
+    // liteloader does not do runtime deobfuscation, so in production we use "notch names", mixin needs to know this
     defaultObfuscationEnv notch
 }
 litemod {
     json {
         name = "test"
-        mcversion = "1.11.r2"
+        mcversion = project.targetVersion
+        description = "An example litemod project which draws a clock in-game" 
         mixinConfigs += "mixins.example.json"
     }
 }
 jar {
+    // The litemod task above generates the litemod.json dynamically, you can replace it with a resource if you want more control
     from litemod.outputs
 }
+forgeGradleVersion=2.3-SNAPSHOT
+name=ExampleMod
+version=0.1
+mcVersion=1.12
+mcMappings=snapshot_20170627
+targetVersion=1.12.r1
 \ No newline at end of file
@@ -5,7 +5,7 @@ import static net.minecraft.client.renderer.vertex.DefaultVertexFormats.*;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.VertexBuffer;
+import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.util.ResourceLocation;
 import org.lwjgl.util.ReadableColor;
@@ -231,7 +231,7 @@ public class Clock
         // We use the tessellator rather than drawing individual quads because it uses vertex arrays to
         // draw the quads more efficiently.
 		Tessellator tessellator = Tessellator.getInstance();
-		VertexBuffer worldRenderer = tessellator.getBuffer();
+		BufferBuilder worldRenderer = tessellator.getBuffer();
         worldRenderer.begin(GL_QUADS, POSITION_TEX);
         worldRenderer.pos(x + 0,     y + height, 0).tex(u  * texMapScale, v2 * texMapScale).endVertex();
         worldRenderer.pos(x + width, y + height, 0).tex(u2 * texMapScale, v2 * texMapScale).endVertex();
@@ -254,7 +254,7 @@ public class Clock
         // Draw the quad
 		Tessellator tessellator = Tessellator.getInstance();
-		VertexBuffer worldRenderer = tessellator.getBuffer();
+		BufferBuilder worldRenderer = tessellator.getBuffer();
         worldRenderer.begin(GL_QUADS, POSITION);
         worldRenderer.pos(x1, y2, 0).endVertex();
         worldRenderer.pos(x2, y2, 0).endVertex();
@@ -35,11 +35,11 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 @Mixin(GuiMainMenu.class)
 public abstract class MixinGuiMainMenu extends GuiScreen
 {
-    @Shadow private int panoramaTimer;
+    @Shadow private float panoramaTimer;
-    @Inject(method = "updateScreen()V", at = @At("HEAD"))
-    private void onUpdateScreen(CallbackInfo ci)
+    @Inject(method = "drawScreen(IIF)V", at = @At("HEAD"))
+    private void onUpdateScreen(int mouseX, int mouseY, float partialTicks, CallbackInfo ci)
     {
-        this.panoramaTimer += 4;
+        this.panoramaTimer += partialTicks * 3;
     }
 }