LiteLoader / LiteLoader · Commits

Commit 7ca84e15ae2df6bb437ab46dadc5009def917945

Authored by Mumfrey
1 parent 47d63a12
build: skipped

Fix snapshot build metadata

Inline Side-by-side
Showing 2 changed files with 11 additions and 9 deletions
build.gradle
  View file @7ca84e1
@@ -33,15 +33,17 @@ apply plugin: 'org.spongepowered.mixin' @@ -33,15 +33,17 @@ apply plugin: 'org.spongepowered.mixin'
33 defaultTasks 'build' 33 defaultTasks 'build'
34 34
35 ext { 35 ext {
  36 + def isJenkins = project.hasProperty("jenkins")
  37 +
36 // Artefact details 38 // Artefact details
37 - buildNumber = project.hasProperty("buildNumber") ? buildNumber : '0' 39 + buildNumber = isJenkins ? System.env.BUILD_NUMBER : (project.hasProperty("buildNumber") ? buildNumber : '0')
38 buildVersion = project.hasProperty("buildVersion") ? buildVersion : '0.0' 40 buildVersion = project.hasProperty("buildVersion") ? buildVersion : '0.0'
39 ciSystem = project.hasProperty("ciSystem") ? ciSystem : 'unknown' 41 ciSystem = project.hasProperty("ciSystem") ? ciSystem : 'unknown'
40 - commit = project.hasProperty("commit") ? commit : 'unknown' 42 + commit = isJenkins ? System.env.GIT_COMMIT : (project.hasProperty("commit") ? commit : 'unknown')
41 classifier = project.hasProperty("buildType") ? buildType : 'SNAPSHOT' 43 classifier = project.hasProperty("buildType") ? buildType : 'SNAPSHOT'
42 isReleaseBuild = "RELEASE".equals(project.classifier.toUpperCase()) 44 isReleaseBuild = "RELEASE".equals(project.classifier.toUpperCase())
43 mavenRepo = project.isReleaseBuild ? "mavenUrl" : "mavenSnapshotUrl" 45 mavenRepo = project.isReleaseBuild ? "mavenUrl" : "mavenSnapshotUrl"
44 - brand = project.hasProperty("jenkins") ? "${project.mcVersion}-SNAPSHOT-r${System.env.GIT_COMMIT.take(7).toUpperCase()}-b${System.env.BUILD_NUMBER}-${System.env.BUILD_ID}" : "" 46 + brand = isJenkins ? "${project.mcVersion}-SNAPSHOT-r${System.env.GIT_COMMIT.take(7).toUpperCase()}-b${System.env.BUILD_NUMBER}-${System.env.BUILD_ID}" : ""
45 47
46 // Extended project information 48 // Extended project information
47 projectName = 'LiteLoader' 49 projectName = 'LiteLoader'
src/client/java/com/mumfrey/liteloader/client/gui/GuiLiteLoaderPanel.java
  View file @7ca84e1
@@ -794,12 +794,12 @@ public class GuiLiteLoaderPanel extends GuiScreen @@ -794,12 +794,12 @@ public class GuiLiteLoaderPanel extends GuiScreen
794 glColor4f(1.0F, 1.0F, 1.0F, alpha); 794 glColor4f(1.0F, 1.0F, 1.0F, alpha);
795 795
796 Tessellator tessellator = Tessellator.getInstance(); 796 Tessellator tessellator = Tessellator.getInstance();
797 - VertexBuffer worldRenderer = tessellator.getBuffer();  
798 - worldRenderer.begin(GL_QUADS, VF_POSITION_TEX);  
799 - worldRenderer.pos(x + 0, y + height, 0).tex(u , v2).endVertex();  
800 - worldRenderer.pos(x + width, y + height, 0).tex(u2, v2).endVertex();  
801 - worldRenderer.pos(x + width, y + 0, 0).tex(u2, v ).endVertex();  
802 - worldRenderer.pos(x + 0, y + 0, 0).tex(u , v ).endVertex(); 797 + VertexBuffer buf = tessellator.getBuffer();
  798 + buf.begin(GL_QUADS, VF_POSITION_TEX);
  799 + buf.pos(x + 0, y + height, 0).tex(u , v2).endVertex();
  800 + buf.pos(x + width, y + height, 0).tex(u2, v2).endVertex();
  801 + buf.pos(x + width, y + 0, 0).tex(u2, v ).endVertex();
  802 + buf.pos(x + 0, y + 0, 0).tex(u , v ).endVertex();
803 tessellator.draw(); 803 tessellator.draw();
804 804
805 glDisableBlend(); 805 glDisableBlend();