Merge pull request #6 from FPSP-Modpack/master

Fix Buildscript
This commit is contained in:
Martin Robertz authored and GitHub committed 2021-04-26 20:44:53 +02:00
commit 83c8a6dcdc
14 files changed
+93 -97

No files matched your search

+12 -27
View File
@@ -1,27 +1,12 @@
*.class
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.war
*.ear
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
.gradle/
eclipse/
out/
lib/
Avaritia.iml
Avaritia.ipr
Avaritia.iws
CREDITS-fml.txt
LICENSE-fml.txt
MinecraftForge-Credits.txt
MinecraftForge-License.txt
README.txt
forge-1.7.10-10.13.4.1614-1.7.10-changelog.txt
*.bat
.idea/
.classpath
.gradle
.idea
.project
.settings
bin
build
eclipse
out
*.iml
*.ipr
*.iws
+66 -51
View File
@@ -1,21 +1,29 @@
import java.util.concurrent.TimeUnit
import java.util.Properties
import groovy.util.ConfigSlurper
buildscript {
repositories {
mavenCentral()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
name = "gregtech forge mirror"
url = "https://gregtech.overminddl1.com"
}
maven {
name = "sonatype"
url = "https://oss.sonatype.org/content/repositories/snapshots/"
name = "jitpack.io"
url = "https://jitpack.io"
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
classpath("com.github.GTNH2:ForgeGradle:FG_1.2-SNAPSHOT") {
changing = true
}
}
}
apply plugin: 'forge'
apply plugin: 'java'
apply plugin: 'idea'
apply plugin: 'signing'
file "build.properties" withReader {
@@ -25,22 +33,38 @@ file "build.properties" withReader {
}
version = "${config.avaritia.version}"
group= "fox.spiteful.avaritia" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
group = "fox.spiteful.avaritia"
archivesBaseName = "Avaritia"
idea {
module {
inheritOutputDirs = true
downloadJavadoc = true
downloadSources = true
}
}
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = 1.8
targetCompatibility = 1.8
minecraft {
version = "${config.minecraft.version}-${config.forge.version}-${config.minecraft.version}"
runDir = "eclipse"
}
idea { module { inheritOutputDirs = true } }
idea {
module {
inheritOutputDirs = true
downloadJavadoc = true
downloadSources = true
}
}
configurations {
all {
resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS)
setTransitive(false)
}
provided
embedded
compile.extendsFrom provided, embedded
@@ -48,36 +72,32 @@ configurations {
repositories {
maven {
name 'Forge maven'
url 'http://files.minecraftforge.net/maven/'
name = "Chickenbones Maven"
url = "https://chickenbones.net/maven/"
}
maven { //NEI, chicken core and lib
name = "Chickenbones maven"
url = "http://chickenbones.net/maven/"
maven {
name = "Jared Maven"
url = "https://maven.blamejared.com/"
}
maven { // Forestry
name = "Player IC2 maven"
url = "http://maven.ic2.player.to/"
maven {
name = "Player IC2 Maven"
url = "https://maven.ic2.player.to/"
}
maven { // TConstruct
name 'DVS1 Maven FS'
url = "http://downloads.gtnewhorizons.com/Mods_for_Jenkins/"
maven {
name = "DVS1 Maven"
url = "https://dvs1.progwml6.com/files/maven"
}
maven { // Baubles
name 'MC Mod Dev maven'
url 'https://maven.mcmoddev.com/'
maven {
name = "MC Mod Dev Maven"
url = "https://maven.mcmoddev.com/"
}
maven { // CraftTweaker (aka MineTweaker3)
name 'jared maven'
url "http://maven.blamejared.com/"
maven {
name = "CurseForge Maven"
url = "https://www.cursemaven.com/"
}
ivy { //Thaumcraft, CoFHCore, BloodMagic and Witchery
name 'gtnh_download_source_stupid_underscore_typo'
artifactPattern "http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]_[revision].[ext]"
}
ivy { // - instead of _
name 'gtnh_download_source'
artifactPattern "http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]-[revision].[ext]"
ivy {
name = "GTNH"
artifactPattern "http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]-[revision](-[classifier]).[ext]"
}
}
@@ -85,33 +105,28 @@ dependencies {
provided "codechicken:CodeChickenLib:${config.minecraft.version}-${config.codechickenlib.version}:dev"
provided "codechicken:CodeChickenCore:${config.minecraft.version}-${config.codechickencore.version}:dev"
provided "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev"
provided "MineTweaker3:MineTweaker3-MC1710-Main:${config.minecraft.version}-${config.minetweaker3.version}"
provided "net.sengir.forestry:forestry_${config.minecraft.version}:${config.forestry.version}:dev"
provided "tconstruct:TConstruct:${config.minecraft.version}-${config.tconstruct.version}:deobf"
provided "com.azanor:Baubles:${config.minecraft.version}-${config.baubles.version}"
//provided "com.azanor:Thaumcraft:${config.minecraft.version}-${config.thaumcraft.version}"
provided name: 'Thaumcraft', version: config.thaumcraft.version, ext: 'jar'
provided name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar'
provided name: 'BloodMagic', version: config.bloodmagic.version, ext: 'jar'
provided name: 'witchery', version: config.witchery.version, ext: 'jar'
compile fileTree(dir: 'lib', include: '*.jar')
provided "MineTweaker3:ZenScript:${config.minetweaker3.version}"
provided "MineTweaker3:MineTweaker3-API:${config.minetweaker3.version}"
provided "net.sengir.forestry:forestry_${config.minecraft.version}:${config.forestry.version}:dev"
provided "mantle:Mantle:${config.minecraft.version}-${config.mantle.version}:deobf"
provided "tconstruct:TConstruct:${config.minecraft.version}-${config.tconstruct.version}:deobf"
provided "com.azanor:Baubles:${config.minecraft.version}-${config.baubles.version}"
provided "com.azanor:Thaumcraft:${config.minecraft.version}-${config.thaumcraft.version}:deobf"
provided "curse.maven:cofh-core-69162:${config.cofhcore.fileid}"
provided ":BloodMagic:${config.minecraft.version}-${config.bloodmagic.version}:deobf"
provided ":witchery:${config.minecraft.version}-${config.witchery.version}:deobf"
compile fileTree(dir: 'libs', include: '*.jar')
}
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
expand 'version':project.version, 'mcversion':project.minecraft.version
}
// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
+8 -8
View File
@@ -6,12 +6,12 @@ avaritia.version=1.18
codechickenlib.version=1.1.3.140
codechickencore.version=1.0.7.47
nei.version=1.0.5.120
tconstruct.version=1.8.9.14-GTNH
minetweaker3.version=3.0.26.113
forestry.version=3.6.9.28
mantle.version=0.3.2.jenkins207
tconstruct.version=1.8.8.build1003
baubles.version=1.0.1.10
//thaumcraft.version=4.2.3.5-deobf
thaumcraft.version=1.7.10-4.2.3.5-deobf
cofhcore.version=[1.7.10]3.1.4-329-dev
bloodmagic.version=1.7.10-1.3.3-17-deobf
witchery.version=1.7.10-0.24.1
forestry.version=3.6.2.19
minetweaker3.version=3.0.13.43
thaumcraft.version=4.2.3.5
cofhcore.fileid=2388751
bloodmagic.version=1.3.3-17
witchery.version=0.24.1
+2
View File
@@ -0,0 +1,2 @@
systemProp.org.gradle.internal.http.connectionTimeout=120000
systemProp.org.gradle.internal.http.socketTimeout=120000
+1 -1
View File
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
Vendored
+4 -10
View File
@@ -8,14 +8,14 @@
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
@@ -46,10 +46,9 @@ echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windowz variants
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
goto execute
:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.