Skip to content

Commit 211ce32

Browse files
authored
Merge pull request #32 from dshadowwolf/master-1.11.2-dev
Final cleanup in prep for release
2 parents f98b84c + fba57d6 commit 211ce32

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

src/main/java/com/mcmoddev/nethermetals/init/Recipes.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ private static void recipeWrapper(boolean enabled, MMDMaterial material) {
8686
if (enabled) {
8787
if (material != null) {
8888
if (material.getBlock(Names.NETHERORE) != null) {
89-
boolean makeDusts = false;
90-
boolean smeltToIngots = false;
89+
boolean makeDusts = Options.makeDusts;
90+
boolean smeltToIngots = Options.smeltToIngots;
9191
if (Options.enableFurnaceSmelting) {
92-
if (smeltToIngots == true) {
92+
if (smeltToIngots) {
9393
if (material.getItem(Names.INGOT) != null) {
9494
GameRegistry.addSmelting(material.getBlock(Names.NETHERORE), new ItemStack(material.getItem(Names.INGOT), 2), 1.0f);
9595
} else {
@@ -103,7 +103,7 @@ private static void recipeWrapper(boolean enabled, MMDMaterial material) {
103103
}
104104
}
105105
}
106-
if (makeDusts == true) {
106+
if (makeDusts) {
107107
if (material.getItem(Names.POWDER) != null) {
108108
CrusherRecipeRegistry.addNewCrusherRecipe(material.getBlock(Names.NETHERORE), new ItemStack(material.getItem(Names.POWDER), 4));
109109
} else {

src/main/java/com/mcmoddev/nethermetals/util/Config.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ public static void init() {
4747
Options.enableFurnaceSmelting = configuration.getBoolean("enableFurnaceSmelting", GENERAL, true, "EnableFurnaceSmelting");
4848
Options.explosionChance = configuration.get("mean", "OreExplosionChance", 2, "Explosion Percentage Chance\nSet to 0 to not explode").getInt();
4949
Options.angerPigmenRange = configuration.get("mean", "PigmenAngerRange", 20, "Anger Pigmen Range\nRequires PigmenAnger").getInt();
50-
50+
Options.smeltToIngots = configuration.getBoolean("smeltToIngots", GENERAL, false, "By default nether ores smelt to 2 standard ores - with this option you get 2 ingots");
51+
Options.makeDusts = configuration.getBoolean("makeDusts", GENERAL, false, "Normally hitting a Nether Ore with a Crackhammer gives you 2 normal ores. With this option you get 4 dusts");
52+
5153
//Nether Ores
5254
Options.enableCoalNetherOre = configuration.getBoolean("enableCoalNetherOre", NETHERORE, true, "Enable Coal Nether Ore");
5355
Options.enableDiamondNetherOre = configuration.getBoolean("enableDiamondNetherOre", NETHERORE, true, "Enable Diamond Nether Ore");
@@ -113,6 +115,8 @@ public static void init() {
113115

114116
public static class Options {
115117

118+
public static boolean makeDusts;
119+
public static boolean smeltToIngots;
116120
public static boolean requireMMDLib = false;
117121
public static boolean requireMMDOreSpawn = true;
118122
public static boolean enableTinkersConstruct = false;

0 commit comments

Comments
 (0)