chore: it builds
This commit is contained in:
parent
5ad5b986af
commit
de2c2d419c
3 changed files with 60 additions and 53 deletions
107
build.gradle
107
build.gradle
|
|
@ -7,12 +7,17 @@ buildscript {
|
|||
}
|
||||
}
|
||||
dependencies {
|
||||
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
|
||||
classpath ('com.anatawa12.forge:ForgeGradle:1.2-1.0.+') {
|
||||
changing = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
apply plugin: 'forge'
|
||||
apply plugin: 'idea'
|
||||
apply plugin: 'maven-publish'
|
||||
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
|
||||
ext.configFile = file "build.properties"
|
||||
configFile.withReader {
|
||||
|
|
@ -35,66 +40,70 @@ minecraft {
|
|||
|
||||
repositories {
|
||||
maven {
|
||||
name "ChickenBones"
|
||||
url "http://chickenbones.net/maven/"
|
||||
url = "https://s3.tilera.xyz/cdn/minecraft/libs/"
|
||||
metadataSources { artifact() }
|
||||
}
|
||||
maven { url = "https://maven.tilera.xyz" }
|
||||
maven {
|
||||
name "central"
|
||||
url "https://nexus.covers1624.net/repository/maven-hosted/"
|
||||
}
|
||||
maven { url = "https://maven.cil.li/" }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
repositories {
|
||||
ivy {
|
||||
name "BuildCraft"
|
||||
artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision](-[classifier]).[ext]"
|
||||
}
|
||||
maven { url = "http://maven.cil.li/" }
|
||||
}
|
||||
|
||||
compile "li.cil.oc:OpenComputers:MC1.7.10-1.5.+:api"
|
||||
|
||||
// you may put jars on which you depend on in ./libs
|
||||
// or you may define them like so..
|
||||
//compile "some.group:artifact:version:classifier"
|
||||
//compile "some.group:artifact:version"
|
||||
implementation "li.cil.oc:OpenComputers:MC1.7.10-1.5.+:api"
|
||||
|
||||
compile name: "buildcraft", version: "7.1.16", classifier: "dev"
|
||||
compile "codechicken:CodeChickenLib:1.7.10-1.1.3.138:dev"
|
||||
compile "codechicken:CodeChickenCore:1.7.10-1.0.7.46:dev"
|
||||
compile "codechicken:NotEnoughItems:1.7.10-1.0.5.110:dev"
|
||||
|
||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
||||
// real examples
|
||||
//compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env
|
||||
//compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
|
||||
|
||||
// for more info...
|
||||
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
|
||||
// http://www.gradle.org/docs/current/userguide/dependency_management.html
|
||||
implementation "buildcraft:buildcraft:7.1.25:dev"
|
||||
implementation "codechicken:NotEnoughItems:1.7.10-1.0.5.120:dev"
|
||||
implementation "codechicken:CodeChickenCore:1.7.10-1.0.7.48:dev"
|
||||
implementation "codechicken:CodeChickenLib:1.7.10-1.1.3.141:dev"
|
||||
}
|
||||
|
||||
processResources
|
||||
{
|
||||
// this will ensure that this task is redone when the versions change.
|
||||
processResources {
|
||||
inputs.property "version", project.version
|
||||
inputs.property "mcversion", project.minecraft.version
|
||||
|
||||
// replace stuff in mcmod.info, nothing else
|
||||
from(sourceSets.main.resources.srcDirs) {
|
||||
include 'mcmod.info'
|
||||
|
||||
// replace version and mcversion
|
||||
filesMatching('mcmod.info') {
|
||||
expand 'version':project.version, 'mcversion':project.minecraft.version
|
||||
}
|
||||
|
||||
// copy everything else, thats not the mcmod.info
|
||||
from(sourceSets.main.resources.srcDirs) {
|
||||
exclude 'mcmod.info'
|
||||
}
|
||||
}
|
||||
|
||||
idea
|
||||
{
|
||||
module
|
||||
{
|
||||
inheritOutputDirs = true
|
||||
}
|
||||
task deobfJar(type: Jar) {
|
||||
from sourceSets.main.output
|
||||
classifier = 'deobf'
|
||||
}
|
||||
|
||||
task sourcesJar(type: Jar) {
|
||||
from sourceSets.main.allSource
|
||||
classifier = 'sources'
|
||||
}
|
||||
|
||||
publishing {
|
||||
tasks.publish.dependsOn 'build'
|
||||
publications {
|
||||
mavenJava(MavenPublication) {
|
||||
artifactId = project.archivesBaseName
|
||||
|
||||
artifact deobfJar
|
||||
artifact sourcesJar
|
||||
artifact jar
|
||||
}
|
||||
}
|
||||
|
||||
repositories {
|
||||
if (project.hasProperty('mvnURL')) {
|
||||
maven {
|
||||
credentials {
|
||||
username findProperty("mvnUsername")
|
||||
password findProperty("mvnPassword")
|
||||
}
|
||||
url = findProperty("mvnURL")
|
||||
}
|
||||
}
|
||||
else {
|
||||
mavenLocal()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
|
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
|
|||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
|
||||
|
|
@ -95,12 +95,10 @@ public class TileInfoTransmitterMTC extends TileEntity implements IPeripheral, S
|
|||
daTrain.currentSignalBlock = this.signalBlock;
|
||||
daTrain.mtcType = this.mtcType;
|
||||
daTrain.enforceSpeedLimits = enforceSpeedLimits;
|
||||
if (this.mtcType == 2 && !daTrain.isConnecting) {
|
||||
if (this.mtcType == 2) {
|
||||
daTrain.stationStop = false;
|
||||
daTrain.speedGoingDown = false;
|
||||
if ( !this.serverUUID.equals("") && !(daTrain.serverUUID.equals(this.serverUUID))) {
|
||||
daTrain.isConnecting = true;
|
||||
daTrain.connectingUUID = this.serverUUID;
|
||||
daTrain.attemptConnection(serverUUID);
|
||||
}
|
||||
} else if (serverUUID.equals("end")) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue