Skip to content

Commit

Permalink
Release
Browse files Browse the repository at this point in the history
  • Loading branch information
TehStoneMan committed Nov 26, 2017
1 parent b6bf393 commit 4422e62
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 28 deletions.
53 changes: 29 additions & 24 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ configFile.withReader
project.ext.config = new ConfigSlurper().parse prop
}

version = "${config.minecraft_version}-${config.mod_version}"
version = "${config.minecraft_version}-${config.mod_major_version}.${config.api_major_version}.${config.minor_version}.${config.patch_version}"
group = "io.github.thestoneman.betterstorage"
archivesBaseName = "BetterStorage"
archivesBaseName = "BetterStorageToo"

// java version
sourceCompatibility = 1.8
Expand Down Expand Up @@ -127,7 +127,8 @@ sourceSets
}
}

processResources {
processResources
{
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version

Expand All @@ -147,24 +148,28 @@ processResources {
}
}

task apiJar(type: Jar, dependsOn: classes) {
from sourceSets.main.output
include 'net/mcft/copy/betterstorage/api/**'
classifier = 'api'
}

task sourcesJar(type: Jar, dependsOn: classes) {
from sourceSets.main.allSource
classifier = 'sources'
}

task deobfJar(type: Jar) {
from sourceSets.main.output
classifier = 'deobf'
}

artifacts {
archives sourcesJar
archives apiJar
archives deobfJar
}
//task apiJar(type: Jar, dependsOn: classes)
//{
// from sourceSets.main.output
// include 'io/gethub/tehstoneman/betterstorage/api/**'
// classifier = 'api'
//}

//task sourcesJar(type: Jar, dependsOn: classes)
//{
// from sourceSets.main.allSource
// classifier = 'sources'
//}

//task deobfJar(type: Jar)
//{
// from sourceSets.main.output
// classifier = 'deobf'
//}

//artifacts
//{
// archives sourcesJar
// archives apiJar
// archives deobfJar
//}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
mod_major_version=2
api_major_version=0
minor_version=0
patch_version=0_beta0
patch_version=0

minecraft_version = 1.11.2
forge_version = 13.20.0.2228
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package io.github.tehstoneman.betterstorage.config;

import java.io.File;
import java.util.Arrays;

import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import scala.actors.threadpool.Arrays;

public class BetterStorageConfig
{
Expand Down Expand Up @@ -217,7 +217,7 @@ public void syncConfig( boolean loadConfigFromFile, boolean readFieldsFromConfig
.setLanguageKey( "config.betterstorage.general.enableWarningMessages" );

// Define property order
config.setCategoryPropertyOrder( Configuration.CATEGORY_GENERAL,
/*config.setCategoryPropertyOrder( Configuration.CATEGORY_GENERAL,
Arrays.asList( new String[] { "reinforcedColumns",
"enableCrateInventoryInterface",
"cardboardBoxRows",
Expand Down Expand Up @@ -257,7 +257,7 @@ public void syncConfig( boolean loadConfigFromFile, boolean readFieldsFromConfig
"enchPersistanceEnabled",
"enchSecurityEnabled",
"enchShockEnabled",
"enchTriggerEnabled" } ) );
"enchTriggerEnabled" } ) );*/
//@formatter:on

// Read properties
Expand Down

0 comments on commit 4422e62

Please sign in to comment.