Skip to content

Commit

Permalink
cleaned up buildfile
Browse files Browse the repository at this point in the history
  • Loading branch information
mickelus committed May 27, 2020
1 parent c034012 commit cdf9a16
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 29 deletions.
30 changes: 2 additions & 28 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildscript {
}
}
apply plugin: 'net.minecraftforge.gradle'
// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.

apply plugin: 'eclipse'
apply plugin: 'maven-publish'
apply plugin: "com.wynprice.cursemaven"
Expand All @@ -28,7 +28,7 @@ if (System.getenv('VERSION') != null) {
}

version = "${mc_version}-${tetra_version}"
group = 'se.mickelus.tetra' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
group = 'se.mickelus.tetra'
archivesBaseName = "tetra"

repositories {
Expand All @@ -43,26 +43,14 @@ repositories {
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.

minecraft {
// The mappings can be changed at any time, and must be in the following format.
// snapshot_YYYYMMDD Snapshot are built nightly.
// stable_# Stables are built at the discretion of the MCP team.
// Use non-default mappings at your own risk. they may not always work.
// Simply re-run your setup task after changing the mappings to update your workspace.
mappings channel: 'snapshot', version: "${mcp_mappings}"
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.

// accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')

// Default run configurations.
// These can be tweaked, removed, or duplicated as needed.
runs {
client {
workingDirectory project.file('run')

// Recommended logging data for a userdev environment
property 'forge.logging.markers', '' //'SCAN,REGISTRIES,REGISTRYDUMP'

// Recommended logging level for the console
property 'forge.logging.console.level', 'debug'

mods {
Expand All @@ -74,11 +62,7 @@ minecraft {

server {
workingDirectory project.file('run')

// Recommended logging data for a userdev environment
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'

// Recommended logging level for the console
property 'forge.logging.console.level', 'debug'

mods {
Expand All @@ -90,11 +74,7 @@ minecraft {

data {
workingDirectory project.file('run')

// Recommended logging data for a userdev environment
property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP'

// Recommended logging level for the console
property 'forge.logging.console.level', 'debug'

args '--mod', 'tetra', '--all', '--output', file('src/generated/resources/'), '--existing', sourceSets.main.resources.srcDirs[0]
Expand All @@ -114,14 +94,8 @@ sourceSets.main.resources {
}

dependencies {
// Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
// that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
// The userdev artifact is a special name and will get all sorts of transformations applied to it.
minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"

// 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"
if (findProject(':mgui') != null) {
compile project(':mgui')
} else {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ mc_version=1.15.2
mcp_mappings=20200504-1.15.1
forge_version=31.2.0

tetra_version=2.7.1
tetra_version=2.7.2
mgui_version=1.15.2-2.1.1
curios_version=FORGE-1.15.2-2.0

0 comments on commit cdf9a16

Please sign in to comment.