mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 11:59:25 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a1eb26aee2 | ||
|
|
638bea3b9c | ||
|
|
05cb868bb2 | ||
|
|
54d0bafa12 |
No files matched your search
Vendored
+13
-20
@@ -6,8 +6,8 @@ pipeline {
|
|||||||
}
|
}
|
||||||
agent {
|
agent {
|
||||||
docker {
|
docker {
|
||||||
image 'gradlewrapper:latest'
|
image 'gradle:jdk8'
|
||||||
args '-v gradlecache:/gradlecache'
|
args '-v forgegc:/home/gradle/.gradle/'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
environment {
|
environment {
|
||||||
@@ -18,11 +18,6 @@ pipeline {
|
|||||||
}
|
}
|
||||||
|
|
||||||
stages {
|
stages {
|
||||||
stage('fetch') {
|
|
||||||
steps {
|
|
||||||
checkout scm
|
|
||||||
}
|
|
||||||
}
|
|
||||||
stage('notify_start') {
|
stage('notify_start') {
|
||||||
when {
|
when {
|
||||||
not {
|
not {
|
||||||
@@ -64,20 +59,22 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
environment {
|
environment {
|
||||||
FORGE_MAVEN = credentials('forge-maven-forge-user')
|
|
||||||
CROWDIN = credentials('forge-crowdin')
|
CROWDIN = credentials('forge-crowdin')
|
||||||
KEYSTORE = credentials('forge-jenkins-keystore-old')
|
KEYSTORE = credentials('forge-jenkins-keystore-old')
|
||||||
KEYSTORE_KEYPASS = credentials('forge-jenkins-keystore-old-keypass')
|
KEYSTORE_KEYPASS = credentials('forge-jenkins-keystore-old-keypass')
|
||||||
KEYSTORE_STOREPASS = credentials('forge-jenkins-keystore-old-keypass')
|
KEYSTORE_STOREPASS = credentials('forge-jenkins-keystore-old-keypass')
|
||||||
}
|
}
|
||||||
steps {
|
steps {
|
||||||
cache(maxCacheSize: 250/*MB*/, caches: [
|
withCredentials([usernamePassword(credentialsId: 'maven-forge-user', usernameVariable: 'MAVEN_USER', passwordVariable: 'MAVEN_PASSWORD')]) {
|
||||||
[$class: 'ArbitraryFileCache', excludes: '', includes: 'output.txt', path: '${WORKSPACE}/projects/forge/build/extractRangeMap/'] //Cache the rangemap to help speed up builds
|
withGradle {
|
||||||
]){
|
sh './gradlew ${GRADLE_ARGS} :forge:publish -PkeystoreKeyPass=${KEYSTORE_KEYPASS} -PkeystoreStorePass=${KEYSTORE_STOREPASS} -Pkeystore=${KEYSTORE} -PcrowdinKey=${CROWDIN}'
|
||||||
sh './gradlew ${GRADLE_ARGS} :forge:publish -PforgeMavenUser=${FORGE_MAVEN_USR} -PforgeMavenPassword=${FORGE_MAVEN_PSW} -PkeystoreKeyPass=${KEYSTORE_KEYPASS} -PkeystoreStorePass=${KEYSTORE_STOREPASS} -Pkeystore=${KEYSTORE} -PcrowdinKey=${CROWDIN}'
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
post {
|
||||||
|
success {
|
||||||
|
build job: 'filegenerator', parameters: [string(name: 'COMMAND', value: "promote net.minecraftforge:forge ${env.MYVERSION} latest")], propagate: false, wait: false
|
||||||
}
|
}
|
||||||
//We're not testing anymore so don't use the test group
|
|
||||||
sh 'curl --user ${FORGE_MAVEN} http://files.minecraftforge.net/maven/manage/promote/latest/net.minecraftforge.forge/${MYVERSION}'
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
stage('test_publish_pr') { //Publish to local repo to test full process, but don't include credentials so it can't sign/publish to maven
|
stage('test_publish_pr') { //Publish to local repo to test full process, but don't include credentials so it can't sign/publish to maven
|
||||||
@@ -88,9 +85,7 @@ pipeline {
|
|||||||
CROWDIN = credentials('forge-crowdin')
|
CROWDIN = credentials('forge-crowdin')
|
||||||
}
|
}
|
||||||
steps {
|
steps {
|
||||||
cache(maxCacheSize: 250/*MB*/, caches: [
|
withGradle {
|
||||||
[$class: 'ArbitraryFileCache', excludes: '', includes: 'output.txt', path: '${WORKSPACE}/projects/forge/build/extractRangeMap/'] //Cache the rangemap to help speed up builds
|
|
||||||
]){
|
|
||||||
sh './gradlew ${GRADLE_ARGS} :forge:publish -PcrowdinKey=${CROWDIN}'
|
sh './gradlew ${GRADLE_ARGS} :forge:publish -PcrowdinKey=${CROWDIN}'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -100,9 +95,7 @@ pipeline {
|
|||||||
always {
|
always {
|
||||||
script {
|
script {
|
||||||
archiveArtifacts artifacts: 'projects/forge/build/libs/**/*.*', fingerprint: true, onlyIfSuccessful: true, allowEmptyArchive: true
|
archiveArtifacts artifacts: 'projects/forge/build/libs/**/*.*', fingerprint: true, onlyIfSuccessful: true, allowEmptyArchive: true
|
||||||
//junit 'build/test-results/*/*.xml'
|
|
||||||
//jacoco sourcePattern: '**/src/*/java'
|
|
||||||
|
|
||||||
if (env.CHANGE_ID == null) { // This is unset for non-PRs
|
if (env.CHANGE_ID == null) { // This is unset for non-PRs
|
||||||
discordSend(
|
discordSend(
|
||||||
title: "${DISCORD_PREFIX} Finished ${currentBuild.currentResult}",
|
title: "${DISCORD_PREFIX} Finished ${currentBuild.currentResult}",
|
||||||
|
|||||||
+14
-11
@@ -1,8 +1,7 @@
|
|||||||
buildscript {
|
buildscript {
|
||||||
repositories {
|
repositories {
|
||||||
mavenLocal()
|
mavenLocal()
|
||||||
maven { url = 'https://files.minecraftforge.net/maven' }
|
maven { url = 'https://maven.minecraftforge.net/' }
|
||||||
jcenter()
|
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
@@ -339,8 +338,9 @@ project(':forge') {
|
|||||||
installer 'org.apache.maven:maven-artifact:3.6.0'
|
installer 'org.apache.maven:maven-artifact:3.6.0'
|
||||||
installer 'net.jodah:typetools:0.6.0'
|
installer 'net.jodah:typetools:0.6.0'
|
||||||
installer 'java3d:vecmath:1.5.2'
|
installer 'java3d:vecmath:1.5.2'
|
||||||
installer 'org.apache.logging.log4j:log4j-api:2.11.2'
|
installer 'org.apache.logging.log4j:log4j-api:2.15.0' //TODO: Unpin in 1.18.1 or when Mojang bumps the Log4J version
|
||||||
installer 'org.apache.logging.log4j:log4j-core:2.11.2'
|
installer 'org.apache.logging.log4j:log4j-core:2.15.0' //TODO: Unpin in 1.18.1 or when Mojang bumps the Log4J version
|
||||||
|
installer 'org.apache.logging.log4j:log4j-slf4j18-impl:2.15.0' //TODO: Unpin in 1.18.1 or when Mojang bumps the Log4J version
|
||||||
installer 'net.minecrell:terminalconsoleappender:1.1.+'
|
installer 'net.minecrell:terminalconsoleappender:1.1.+'
|
||||||
installer 'net.sf.jopt-simple:jopt-simple:5.0.4'
|
installer 'net.sf.jopt-simple:jopt-simple:5.0.4'
|
||||||
fmllauncherImplementation 'com.google.guava:guava:21.0'
|
fmllauncherImplementation 'com.google.guava:guava:21.0'
|
||||||
@@ -732,7 +732,7 @@ project(':forge') {
|
|||||||
}
|
}
|
||||||
|
|
||||||
task downloadInstaller(type: DownloadMavenArtifact) {
|
task downloadInstaller(type: DownloadMavenArtifact) {
|
||||||
artifact = 'net.minecraftforge:installer:2.0.+:shrunk'
|
artifact = 'net.minecraftforge:installer:2.1.+:shrunk'
|
||||||
changing = true
|
changing = true
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -949,12 +949,15 @@ project(':forge') {
|
|||||||
}
|
}
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
maven {
|
||||||
if (project.hasProperty('forgeMavenPassword')) {
|
if (System.env.MAVEN_USER) {
|
||||||
credentials {
|
url "https://maven.minecraftforge.net/releases/"
|
||||||
username project.properties.forgeMavenUser
|
authentication {
|
||||||
password project.properties.forgeMavenPassword
|
basic(BasicAuthentication)
|
||||||
|
}
|
||||||
|
credentials {
|
||||||
|
username = System.env.MAVEN_USER ?: 'not'
|
||||||
|
password = System.env.MAVEN_PASSWORD ?: 'set'
|
||||||
}
|
}
|
||||||
url 'https://files.minecraftforge.net/maven/manage/upload'
|
|
||||||
} else {
|
} else {
|
||||||
url 'file://' + rootProject.file('repo').getAbsolutePath()
|
url 'file://' + rootProject.file('repo').getAbsolutePath()
|
||||||
}
|
}
|
||||||
@@ -1007,7 +1010,7 @@ def getArtifacts(project, config, classifiers) {
|
|||||||
def path = "${folder}${filename}"
|
def path = "${folder}${filename}"
|
||||||
def url = "https://libraries.minecraft.net/${path}"
|
def url = "https://libraries.minecraft.net/${path}"
|
||||||
if (!checkExists(url)) {
|
if (!checkExists(url)) {
|
||||||
url = "https://files.minecraftforge.net/maven/${path}"
|
url = "https://maven.minecraftforge.net/${path}"
|
||||||
}
|
}
|
||||||
//TODO remove when Mojang launcher is updated
|
//TODO remove when Mojang launcher is updated
|
||||||
if (!classifiers && art.classifier != null) { //Mojang launcher doesn't currently support classifiers, so... move it to part of the version, and force the extension to 'jar'
|
if (!classifiers && art.classifier != null) { //Mojang launcher doesn't currently support classifiers, so... move it to part of the version, and force the extension to 'jar'
|
||||||
|
|||||||
+1
-2
@@ -1,7 +1,6 @@
|
|||||||
buildscript {
|
buildscript {
|
||||||
repositories {
|
repositories {
|
||||||
maven { url = 'https://files.minecraftforge.net/maven' }
|
maven { url = 'https://maven.minecraftforge.net/' }
|
||||||
jcenter()
|
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|||||||
@@ -138,7 +138,7 @@
|
|||||||
protected void func_78474_d(float p_78474_1_) {
|
protected void func_78474_d(float p_78474_1_) {
|
||||||
+ net.minecraftforge.client.IRenderHandler renderer = this.field_78531_r.field_71441_e.func_201675_m().getWeatherRenderer();
|
+ net.minecraftforge.client.IRenderHandler renderer = this.field_78531_r.field_71441_e.func_201675_m().getWeatherRenderer();
|
||||||
+ if (renderer != null) {
|
+ if (renderer != null) {
|
||||||
+ renderer.render(p_78474_1_, this.field_78531_r.field_71441_e, field_78531_r);
|
+ renderer.render(this.field_78529_t, p_78474_1_, this.field_78531_r.field_71441_e, this.field_78531_r);
|
||||||
+ return;
|
+ return;
|
||||||
+ }
|
+ }
|
||||||
float f = this.field_78531_r.field_71441_e.func_72867_j(p_78474_1_);
|
float f = this.field_78531_r.field_71441_e.func_72867_j(p_78474_1_);
|
||||||
|
|||||||
@@ -110,7 +110,7 @@
|
|||||||
public void func_195465_a(float p_195465_1_) {
|
public void func_195465_a(float p_195465_1_) {
|
||||||
+ net.minecraftforge.client.IRenderHandler renderer = this.field_72769_h.func_201675_m().getSkyRenderer();
|
+ net.minecraftforge.client.IRenderHandler renderer = this.field_72769_h.func_201675_m().getSkyRenderer();
|
||||||
+ if (renderer != null) {
|
+ if (renderer != null) {
|
||||||
+ renderer.render(p_195465_1_, field_72769_h, field_72777_q);
|
+ renderer.render(this.field_72773_u, p_195465_1_, this.field_72769_h, this.field_72777_q);
|
||||||
+ return;
|
+ return;
|
||||||
+ }
|
+ }
|
||||||
if (this.field_72777_q.field_71441_e.field_73011_w.func_186058_p() == DimensionType.THE_END) {
|
if (this.field_72777_q.field_71441_e.field_73011_w.func_186058_p() == DimensionType.THE_END) {
|
||||||
|
|||||||
@@ -20,31 +20,31 @@
|
|||||||
<Appenders>
|
<Appenders>
|
||||||
<TerminalConsole name="Console">
|
<TerminalConsole name="Console">
|
||||||
<PatternLayout>
|
<PatternLayout>
|
||||||
<LoggerNamePatternSelector defaultPattern="%highlight{[%d{HH:mm:ss.SSS}] [%t/%level] [%c{2.}/%markerSimpleName]: %minecraftFormatting{%msg}%n%tEx}" disableAnsi="${sys:forge.logging.noansi:-true}">
|
<LoggerNamePatternSelector defaultPattern="%highlight{[%d{HH:mm:ss.SSS}] [%t/%level] [%c{2.}/%markerSimpleName]: %minecraftFormatting{%msg{nolookups}}%n%tEx}" disableAnsi="${sys:forge.logging.noansi:-true}">
|
||||||
<!-- don't include the full logger name for Mojang's logs since they use full class names and it's very verbose -->
|
<!-- don't include the full logger name for Mojang's logs since they use full class names and it's very verbose -->
|
||||||
<PatternMatch key="net.minecraft." pattern="%highlight{[%d{HH:mm:ss.SSS}] [%t/%level] [minecraft/%logger{1}]: %minecraftFormatting{%msg}%n%tEx}"/>
|
<PatternMatch key="net.minecraft." pattern="%highlight{[%d{HH:mm:ss.SSS}] [%t/%level] [minecraft/%logger{1}]: %minecraftFormatting{%msg{nolookups}}%n%tEx}"/>
|
||||||
<PatternMatch key="com.mojang." pattern="%highlight{[%d{HH:mm:ss.SSS}] [%t/%level] [mojang/%logger{1}]: %minecraftFormatting{%msg}%n%tEx}"/>
|
<PatternMatch key="com.mojang." pattern="%highlight{[%d{HH:mm:ss.SSS}] [%t/%level] [mojang/%logger{1}]: %minecraftFormatting{%msg{nolookups}}%n%tEx}"/>
|
||||||
</LoggerNamePatternSelector>
|
</LoggerNamePatternSelector>
|
||||||
</PatternLayout>
|
</PatternLayout>
|
||||||
</TerminalConsole>
|
</TerminalConsole>
|
||||||
<Queue name="ServerGuiConsole" ignoreExceptions="true">
|
<Queue name="ServerGuiConsole" ignoreExceptions="true">
|
||||||
<PatternLayout>
|
<PatternLayout>
|
||||||
<LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss.SSS}] [%t/%level] [%c{2.}/%markerSimpleName]: %minecraftFormatting{%msg}{strip}%n">
|
<LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss.SSS}] [%t/%level] [%c{2.}/%markerSimpleName]: %minecraftFormatting{%msg{nolookups}}{strip}%n">
|
||||||
<!-- don't include the full logger name for Mojang's logs since they use full class names and it's very verbose -->
|
<!-- don't include the full logger name for Mojang's logs since they use full class names and it's very verbose -->
|
||||||
<PatternMatch key="net.minecraft." pattern="[%d{HH:mm:ss.SSS}] [%t/%level] [minecraft/%logger{1}]: %minecraftFormatting{%msg}{strip}%n"/>
|
<PatternMatch key="net.minecraft." pattern="[%d{HH:mm:ss.SSS}] [%t/%level] [minecraft/%logger{1}]: %minecraftFormatting{%msg{nolookups}}{strip}%n"/>
|
||||||
<PatternMatch key="com.mojang." pattern="[%d{HH:mm:ss.SSS}] [%t/%level] [mojang/%logger{1}]: %minecraftFormatting{%msg}{strip}%n"/>
|
<PatternMatch key="com.mojang." pattern="[%d{HH:mm:ss.SSS}] [%t/%level] [mojang/%logger{1}]: %minecraftFormatting{%msg{nolookups}}{strip}%n"/>
|
||||||
</LoggerNamePatternSelector>
|
</LoggerNamePatternSelector>
|
||||||
</PatternLayout>
|
</PatternLayout>
|
||||||
</Queue>
|
</Queue>
|
||||||
<RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
|
<RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
|
||||||
<PatternLayout pattern="[%d{ddMMMyyyy HH:mm:ss.SSS}] [%t/%level] [%logger/%markerSimpleName]: %minecraftFormatting{%msg}{strip}%n%xEx"/>
|
<PatternLayout pattern="[%d{ddMMMyyyy HH:mm:ss.SSS}] [%t/%level] [%logger/%markerSimpleName]: %minecraftFormatting{%msg{nolookups}}{strip}%n%xEx"/>
|
||||||
<Policies>
|
<Policies>
|
||||||
<TimeBasedTriggeringPolicy/>
|
<TimeBasedTriggeringPolicy/>
|
||||||
<OnStartupTriggeringPolicy/>
|
<OnStartupTriggeringPolicy/>
|
||||||
</Policies>
|
</Policies>
|
||||||
</RollingRandomAccessFile>
|
</RollingRandomAccessFile>
|
||||||
<RollingRandomAccessFile name="DebugFile" fileName="logs/debug.log" filePattern="logs/debug-%i.log.gz">
|
<RollingRandomAccessFile name="DebugFile" fileName="logs/debug.log" filePattern="logs/debug-%i.log.gz">
|
||||||
<PatternLayout pattern="[%d{ddMMMyyyy HH:mm:ss.SSS}] [%t/%level] [%logger/%markerSimpleName]: %minecraftFormatting{%msg}{strip}%n%xEx"/>
|
<PatternLayout pattern="[%d{ddMMMyyyy HH:mm:ss.SSS}] [%t/%level] [%logger/%markerSimpleName]: %minecraftFormatting{%msg{nolookups}}{strip}%n%xEx"/>
|
||||||
<Policies>
|
<Policies>
|
||||||
<OnStartupTriggeringPolicy/>
|
<OnStartupTriggeringPolicy/>
|
||||||
<SizeBasedTriggeringPolicy size="200MB"/>
|
<SizeBasedTriggeringPolicy size="200MB"/>
|
||||||
|
|||||||
@@ -483,7 +483,7 @@ public class CloudRenderer implements ISelectiveResourceReloadListener
|
|||||||
IRenderHandler renderer = world.dimension.getCloudRenderer();
|
IRenderHandler renderer = world.dimension.getCloudRenderer();
|
||||||
if (renderer != null)
|
if (renderer != null)
|
||||||
{
|
{
|
||||||
renderer.render(partialTicks, world, client);
|
renderer.render(cloudTicks, partialTicks, world, client);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return getCloudRenderer().render(cloudTicks, partialTicks);
|
return getCloudRenderer().render(cloudTicks, partialTicks);
|
||||||
|
|||||||
@@ -28,5 +28,5 @@ import net.minecraftforge.api.distmarker.OnlyIn;
|
|||||||
public interface IRenderHandler
|
public interface IRenderHandler
|
||||||
{
|
{
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
public abstract void render(float partialTicks, WorldClient world, Minecraft mc);
|
void render(int ticks, float partialTicks, WorldClient world, Minecraft mc);
|
||||||
}
|
}
|
||||||
@@ -7,7 +7,7 @@ logoFile="forge_logo.png"
|
|||||||
modId="forge"
|
modId="forge"
|
||||||
# We use the global forge version
|
# We use the global forge version
|
||||||
version="${global.forgeVersion}"
|
version="${global.forgeVersion}"
|
||||||
updateJSONURL="https://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json"
|
updateJSONURL="https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json"
|
||||||
displayName="Forge"
|
displayName="Forge"
|
||||||
credits="LexManos,cpw,Mezz,fry,tterrag,gigaherz,illy"
|
credits="LexManos,cpw,Mezz,fry,tterrag,gigaherz,illy"
|
||||||
authors="LexManos,cpw,Mezz,fry,Spacetoad,Eloraam"
|
authors="LexManos,cpw,Mezz,fry,Spacetoad,Eloraam"
|
||||||
|
|||||||
Reference in new issue
Block a user