Commit 7ca84e15ae2df6bb437ab46dadc5009def917945
1 parent
47d63a12
Fix snapshot build metadata
Showing
2 changed files
with
11 additions
and
9 deletions
build.gradle
... | ... | @@ -33,15 +33,17 @@ apply plugin: 'org.spongepowered.mixin' |
33 | 33 | defaultTasks 'build' |
34 | 34 | |
35 | 35 | ext { |
36 | + def isJenkins = project.hasProperty("jenkins") | |
37 | + | |
36 | 38 | // Artefact details |
37 | - buildNumber = project.hasProperty("buildNumber") ? buildNumber : '0' | |
39 | + buildNumber = isJenkins ? System.env.BUILD_NUMBER : (project.hasProperty("buildNumber") ? buildNumber : '0') | |
38 | 40 | buildVersion = project.hasProperty("buildVersion") ? buildVersion : '0.0' |
39 | 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 | 43 | classifier = project.hasProperty("buildType") ? buildType : 'SNAPSHOT' |
42 | 44 | isReleaseBuild = "RELEASE".equals(project.classifier.toUpperCase()) |
43 | 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 | 48 | // Extended project information |
47 | 49 | projectName = 'LiteLoader' | ... | ... |
src/client/java/com/mumfrey/liteloader/client/gui/GuiLiteLoaderPanel.java
... | ... | @@ -794,12 +794,12 @@ public class GuiLiteLoaderPanel extends GuiScreen |
794 | 794 | glColor4f(1.0F, 1.0F, 1.0F, alpha); |
795 | 795 | |
796 | 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 | 803 | tessellator.draw(); |
804 | 804 | |
805 | 805 | glDisableBlend(); | ... | ... |