Skip to content

Commit 1ffe09c

Browse files
committed
fixes and improvements
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
1 parent 1e1783c commit 1ffe09c

File tree

128 files changed

+234
-143
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+234
-143
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ run
2424
/README.txt
2525
/forge-*-changelog.txt
2626
# /gradlew
27-
# /gradlew.bat
27+
# /gradlew.bat
28+
gradle.properties

CHANGELOG.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
1) Add CurseGradle (makes my life easier)
2+
2) Make ores more common (atleast until I decide on balance)
3+
2) Added textures for Small Powders
4+
3) Added textures for Small Blends
5+
4) Added textures for Shears
6+
5) Pre-Added textures for molten fluids

build.gradle

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,27 @@ buildscript {
77
name = "forge"
88
url = "http://files.minecraftforge.net/maven"
99
}
10+
}
11+
repositories {
12+
jcenter()
13+
maven {
14+
name = "sonatype"
15+
url = 'https://oss.sonatype.org/content/groups/public'
16+
}
1017
}
1118
dependencies {
1219
classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
13-
}
20+
classpath 'com.matthewprenger:CurseGradle:1.0-SNAPSHOT'
21+
}
1422
}
1523
apply plugin: 'net.minecraftforge.gradle.forge'
24+
apply plugin: 'com.matthewprenger.cursegradle'
1625

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

@@ -27,19 +37,13 @@ allprojects {
2737
targetCompatibility = 1.8
2838
}
2939

30-
version = "0.9"
40+
version = "0.9.1"
3141
group= "modernmetals" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
3242
archivesBaseName = "ModernMetals"
3343

3444
minecraft {
3545
version = "1.9-12.16.0.1865-1.9"
3646
runDir = "run"
37-
38-
// the mappings can be changed at any time, and must be in the following format.
39-
// snapshot_YYYYMMDD snapshot are built nightly.
40-
// stable_# stables are built at the discretion of the MCP team.
41-
// Use non-default mappings at your own risk. they may not allways work.
42-
// simply re-run your setup task after changing the mappings to update your workspace.
4347
mappings = "snapshot_20160424"
4448
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
4549
}
@@ -70,3 +74,20 @@ processResources
7074
exclude 'mcmod.info'
7175
}
7276
}
77+
78+
curseforge {
79+
project {
80+
apiKey = project.curseforge_apiKey
81+
id = '244357'
82+
changelog = file('CHANGELOG.txt')
83+
releaseType = 'alpha'
84+
mainArtifact(jar) {
85+
displayName = "Modern Metals version: $project.version"
86+
relations {
87+
requiredLibrary 'base-metals'
88+
optionalLibrary 'additional-loot-tables'
89+
}
90+
91+
}
92+
}
93+
}

src/main/java/modernmetals/ModernMetals.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class ModernMetals
3434
public static ModernMetals INSTANCE = null;
3535
public static final String MODID = "modernmetals";
3636
public static final String NAME = "Modern Metals";
37-
public static final String VERSION = "0.9";
37+
public static final String VERSION = "0.9.1";
3838

3939
/** All ore-spawn files discovered in the ore-spawn folder */
4040
public static final List<Path> oreSpawnConfigFiles = new LinkedList<>();

src/main/java/modernmetals/data/DataConstants.java

Lines changed: 76 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,56 +25,119 @@ public class DataConstants {
2525
+ "\n \"blockID\":\"modernmetals:aluminum_ore\","
2626
+ "\n \"size\":8,"
2727
+ "\n \"variation\":4,"
28-
+ "\n \"frequency\":10,"
28+
+ "\n \"frequency\":20,"
29+
+ "\n \"minHeight\":0,"
30+
+ "\n \"maxHeight\":96"
31+
+ "\n },"
32+
//+ "\n \"blockID\":\"modernmetals:aluminumbrass_ore\","
33+
//+ "\n \"size\":8,"
34+
//+ "\n \"variation\":4,"
35+
//+ "\n \"frequency\":20,"
36+
//+ "\n \"minHeight\":0,"
37+
//+ "\n \"maxHeight\":96"
38+
//+ "\n },"
39+
+ "\n {"
40+
+ "\n \"blockID\":\"modernmetals:cadmium_ore\","
41+
+ "\n \"size\":8,"
42+
+ "\n \"variation\":4,"
43+
+ "\n \"frequency\":20,"
44+
+ "\n \"minHeight\":0,"
45+
+ "\n \"maxHeight\":96"
46+
+ "\n },"
47+
+ "\n {"
48+
+ "\n \"blockID\":\"modernmetals:chromium_ore\","
49+
+ "\n \"size\":8,"
50+
+ "\n \"variation\":4,"
51+
+ "\n \"frequency\":20,"
52+
+ "\n \"minHeight\":0,"
53+
+ "\n \"maxHeight\":96"
54+
+ "\n },"
55+
+ "\n {"
56+
+ "\n \"blockID\":\"modernmetals:iridium_ore\","
57+
+ "\n \"size\":8,"
58+
+ "\n \"variation\":4,"
59+
+ "\n \"frequency\":20,"
2960
+ "\n \"minHeight\":0,"
3061
+ "\n \"maxHeight\":96"
3162
+ "\n },"
3263
+ "\n {"
3364
+ "\n \"blockID\":\"modernmetals:magnesium_ore\","
3465
+ "\n \"size\":8,"
3566
+ "\n \"variation\":4,"
36-
+ "\n \"frequency\":4,"
67+
+ "\n \"frequency\":20,"
3768
+ "\n \"minHeight\":0,"
38-
+ "\n \"maxHeight\":32"
69+
+ "\n \"maxHeight\":96"
70+
+ "\n },"
71+
+ "\n {"
72+
+ "\n \"blockID\":\"modernmetals:manganese_ore\","
73+
+ "\n \"size\":8,"
74+
+ "\n \"variation\":4,"
75+
+ "\n \"frequency\":20,"
76+
+ "\n \"minHeight\":0,"
77+
+ "\n \"maxHeight\":96"
3978
+ "\n },"
4079
+ "\n {"
4180
+ "\n \"blockID\":\"modernmetals:osmium_ore\","
4281
+ "\n \"size\":8,"
4382
+ "\n \"variation\":4,"
44-
+ "\n \"frequency\":10,"
83+
+ "\n \"frequency\":20,"
4584
+ "\n \"minHeight\":0,"
46-
+ "\n \"maxHeight\":128"
85+
+ "\n \"maxHeight\":96"
86+
+ "\n },"
87+
+ "\n {"
88+
+ "\n \"blockID\":\"modernmetals:plutonium_ore\","
89+
+ "\n \"size\":8,"
90+
+ "\n \"variation\":4,"
91+
+ "\n \"frequency\":20,"
92+
+ "\n \"minHeight\":0,"
93+
+ "\n \"maxHeight\":96"
4794
+ "\n },"
4895
+ "\n {"
4996
+ "\n \"blockID\":\"modernmetals:rutile_ore\","
5097
+ "\n \"size\":8,"
5198
+ "\n \"variation\":4,"
52-
+ "\n \"frequency\":5,"
99+
+ "\n \"frequency\":20,"
53100
+ "\n \"minHeight\":0,"
54101
+ "\n \"maxHeight\":96"
55102
+ "\n },"
56103
+ "\n {"
57-
+ "\n \"blockID\":\"modernmetals:titanium_ore\","
104+
+ "\n \"blockID\":\"modernmetals:tantalum_ore\","
58105
+ "\n \"size\":8,"
59106
+ "\n \"variation\":4,"
60-
+ "\n \"frequency\":3,"
107+
+ "\n \"frequency\":20,"
61108
+ "\n \"minHeight\":0,"
62-
+ "\n \"maxHeight\":32"
109+
+ "\n \"maxHeight\":96"
63110
+ "\n },"
111+
//+ "\n {"
112+
//+ "\n \"blockID\":\"modernmetals:titanium_ore\","
113+
//+ "\n \"size\":8,"
114+
+ "\n \"variation\":4,"
115+
+ "\n \"frequency\":20,"
116+
+ "\n \"minHeight\":0,"
117+
//+ "\n \"maxHeight\":96"
118+
//+ "\n },"
64119
+ "\n {"
65120
+ "\n \"blockID\":\"modernmetals:tungsten_ore\","
66121
+ "\n \"size\":8,"
67122
+ "\n \"variation\":4,"
68-
+ "\n \"frequency\":3,"
123+
+ "\n \"frequency\":20,"
69124
+ "\n \"minHeight\":0,"
70-
+ "\n \"maxHeight\":32"
125+
+ "\n \"maxHeight\":96"
71126
+ "\n },"
72127
+ "\n {"
73128
+ "\n \"blockID\":\"modernmetals:uranium_ore\","
74129
+ "\n \"size\":8,"
75130
+ "\n \"variation\":4,"
76-
+ "\n \"frequency\":2,"
77-
+ "\n \"minHeight\":32,"
131+
+ "\n \"frequency\":20,"
132+
+ "\n \"minHeight\":0,"
133+
+ "\n \"maxHeight\":96"
134+
+ "\n },"
135+
+ "\n {"
136+
+ "\n \"blockID\":\"modernmetals:zirconium_ore\","
137+
+ "\n \"size\":8,"
138+
+ "\n \"variation\":4,"
139+
+ "\n \"frequency\":20,"
140+
+ "\n \"minHeight\":0,"
78141
+ "\n \"maxHeight\":96"
79142
+ "\n }"
80143
+ "\n ]"

0 commit comments

Comments
 (0)