Skip to content

Commit

Permalink
fixes and improvements
Browse files Browse the repository at this point in the history
1) Add CurseGradle (makes my life easier)
2) Make ores more common (atleast until I decide on balance)
2) Added textures for Small Powders
3) Added textures for Small Blends
4) Added textures for Shears
5) Pre-Added textures for molten fluids
  • Loading branch information
jriwanek committed Apr 25, 2016
1 parent 1e1783c commit 1ffe09c
Show file tree
Hide file tree
Showing 128 changed files with 234 additions and 143 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,5 @@ run
/README.txt
/forge-*-changelog.txt
# /gradlew
# /gradlew.bat
# /gradlew.bat
gradle.properties
6 changes: 6 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
1) Add CurseGradle (makes my life easier)
2) Make ores more common (atleast until I decide on balance)
2) Added textures for Small Powders
3) Added textures for Small Blends
4) Added textures for Shears
5) Pre-Added textures for molten fluids
37 changes: 29 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,27 @@ buildscript {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
}
repositories {
jcenter()
maven {
name = "sonatype"
url = 'https://oss.sonatype.org/content/groups/public'
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
}
classpath 'com.matthewprenger:CurseGradle:1.0-SNAPSHOT'
}
}
apply plugin: 'net.minecraftforge.gradle.forge'
apply plugin: 'com.matthewprenger.cursegradle'

/*
// for people who want stable - not yet functional for MC 1.8.8 - we require the forgegradle 2.1 snapshot
plugins {
id "net.minecraftforge.gradle.forge" version "2.0.2"
id 'com.matthewprenger.cursegradle' version '1.0.7'
}
*/

Expand All @@ -27,19 +37,13 @@ allprojects {
targetCompatibility = 1.8
}

version = "0.9"
version = "0.9.1"
group= "modernmetals" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "ModernMetals"

minecraft {
version = "1.9-12.16.0.1865-1.9"
runDir = "run"

// 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 allways work.
// simply re-run your setup task after changing the mappings to update your workspace.
mappings = "snapshot_20160424"
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
}
Expand Down Expand Up @@ -70,3 +74,20 @@ processResources
exclude 'mcmod.info'
}
}

curseforge {
project {
apiKey = project.curseforge_apiKey
id = '244357'
changelog = file('CHANGELOG.txt')
releaseType = 'alpha'
mainArtifact(jar) {
displayName = "Modern Metals version: $project.version"
relations {
requiredLibrary 'base-metals'
optionalLibrary 'additional-loot-tables'
}

}
}
}
2 changes: 1 addition & 1 deletion src/main/java/modernmetals/ModernMetals.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class ModernMetals
public static ModernMetals INSTANCE = null;
public static final String MODID = "modernmetals";
public static final String NAME = "Modern Metals";
public static final String VERSION = "0.9";
public static final String VERSION = "0.9.1";

/** All ore-spawn files discovered in the ore-spawn folder */
public static final List<Path> oreSpawnConfigFiles = new LinkedList<>();
Expand Down
89 changes: 76 additions & 13 deletions src/main/java/modernmetals/data/DataConstants.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,56 +25,119 @@ public class DataConstants {
+ "\n \"blockID\":\"modernmetals:aluminum_ore\","
+ "\n \"size\":8,"
+ "\n \"variation\":4,"
+ "\n \"frequency\":10,"
+ "\n \"frequency\":20,"
+ "\n \"minHeight\":0,"
+ "\n \"maxHeight\":96"
+ "\n },"
//+ "\n \"blockID\":\"modernmetals:aluminumbrass_ore\","
//+ "\n \"size\":8,"
//+ "\n \"variation\":4,"
//+ "\n \"frequency\":20,"
//+ "\n \"minHeight\":0,"
//+ "\n \"maxHeight\":96"
//+ "\n },"
+ "\n {"
+ "\n \"blockID\":\"modernmetals:cadmium_ore\","
+ "\n \"size\":8,"
+ "\n \"variation\":4,"
+ "\n \"frequency\":20,"
+ "\n \"minHeight\":0,"
+ "\n \"maxHeight\":96"
+ "\n },"
+ "\n {"
+ "\n \"blockID\":\"modernmetals:chromium_ore\","
+ "\n \"size\":8,"
+ "\n \"variation\":4,"
+ "\n \"frequency\":20,"
+ "\n \"minHeight\":0,"
+ "\n \"maxHeight\":96"
+ "\n },"
+ "\n {"
+ "\n \"blockID\":\"modernmetals:iridium_ore\","
+ "\n \"size\":8,"
+ "\n \"variation\":4,"
+ "\n \"frequency\":20,"
+ "\n \"minHeight\":0,"
+ "\n \"maxHeight\":96"
+ "\n },"
+ "\n {"
+ "\n \"blockID\":\"modernmetals:magnesium_ore\","
+ "\n \"size\":8,"
+ "\n \"variation\":4,"
+ "\n \"frequency\":4,"
+ "\n \"frequency\":20,"
+ "\n \"minHeight\":0,"
+ "\n \"maxHeight\":32"
+ "\n \"maxHeight\":96"
+ "\n },"
+ "\n {"
+ "\n \"blockID\":\"modernmetals:manganese_ore\","
+ "\n \"size\":8,"
+ "\n \"variation\":4,"
+ "\n \"frequency\":20,"
+ "\n \"minHeight\":0,"
+ "\n \"maxHeight\":96"
+ "\n },"
+ "\n {"
+ "\n \"blockID\":\"modernmetals:osmium_ore\","
+ "\n \"size\":8,"
+ "\n \"variation\":4,"
+ "\n \"frequency\":10,"
+ "\n \"frequency\":20,"
+ "\n \"minHeight\":0,"
+ "\n \"maxHeight\":128"
+ "\n \"maxHeight\":96"
+ "\n },"
+ "\n {"
+ "\n \"blockID\":\"modernmetals:plutonium_ore\","
+ "\n \"size\":8,"
+ "\n \"variation\":4,"
+ "\n \"frequency\":20,"
+ "\n \"minHeight\":0,"
+ "\n \"maxHeight\":96"
+ "\n },"
+ "\n {"
+ "\n \"blockID\":\"modernmetals:rutile_ore\","
+ "\n \"size\":8,"
+ "\n \"variation\":4,"
+ "\n \"frequency\":5,"
+ "\n \"frequency\":20,"
+ "\n \"minHeight\":0,"
+ "\n \"maxHeight\":96"
+ "\n },"
+ "\n {"
+ "\n \"blockID\":\"modernmetals:titanium_ore\","
+ "\n \"blockID\":\"modernmetals:tantalum_ore\","
+ "\n \"size\":8,"
+ "\n \"variation\":4,"
+ "\n \"frequency\":3,"
+ "\n \"frequency\":20,"
+ "\n \"minHeight\":0,"
+ "\n \"maxHeight\":32"
+ "\n \"maxHeight\":96"
+ "\n },"
//+ "\n {"
//+ "\n \"blockID\":\"modernmetals:titanium_ore\","
//+ "\n \"size\":8,"
+ "\n \"variation\":4,"
+ "\n \"frequency\":20,"
+ "\n \"minHeight\":0,"
//+ "\n \"maxHeight\":96"
//+ "\n },"
+ "\n {"
+ "\n \"blockID\":\"modernmetals:tungsten_ore\","
+ "\n \"size\":8,"
+ "\n \"variation\":4,"
+ "\n \"frequency\":3,"
+ "\n \"frequency\":20,"
+ "\n \"minHeight\":0,"
+ "\n \"maxHeight\":32"
+ "\n \"maxHeight\":96"
+ "\n },"
+ "\n {"
+ "\n \"blockID\":\"modernmetals:uranium_ore\","
+ "\n \"size\":8,"
+ "\n \"variation\":4,"
+ "\n \"frequency\":2,"
+ "\n \"minHeight\":32,"
+ "\n \"frequency\":20,"
+ "\n \"minHeight\":0,"
+ "\n \"maxHeight\":96"
+ "\n },"
+ "\n {"
+ "\n \"blockID\":\"modernmetals:zirconium_ore\","
+ "\n \"size\":8,"
+ "\n \"variation\":4,"
+ "\n \"frequency\":20,"
+ "\n \"minHeight\":0,"
+ "\n \"maxHeight\":96"
+ "\n }"
+ "\n ]"
Expand Down
Loading

0 comments on commit 1ffe09c

Please sign in to comment.