Skip to content

update to OreSpawn 3.1 and latest BMe/MMDLib interfaces #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 8, 2017
Merged

update to OreSpawn 3.1 and latest BMe/MMDLib interfaces #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ if (secretFile.exists()) {
}

minecraft {
version = '1.11.2-13.20.0.2228'
version = '1.11.2-13.20.1.2386'
runDir = 'run'
mappings = 'stable_32'
// coreMod = corePlugin
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ tconstruct_version=2.7.0.+
mcmp_version=2.0.1
mcmp_experimental_version=2.0.1_31
top_version=1.4.7-57
orespawn_version=3.0.0.+
orespawn_version=3.1.0.+
tesla_version=1.3.0.+
bme_version=2.5.0-beta+
mme_version=2.5.0-beta+
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/mcmoddev/nethermetals/NetherMetals.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import com.mcmoddev.lib.block.BlockExplosiveOre;
import com.mcmoddev.nethermetals.proxy.CommonProxy;
import com.mcmoddev.nethermetals.util.Config.Options;
import com.mcmoddev.lib.util.ConfigBase.Options;

import net.minecraft.enchantment.Enchantment;
import net.minecraft.init.Blocks;
Expand Down Expand Up @@ -105,7 +105,7 @@ public void onBlockBreak(BlockEvent.BreakEvent event) {
&& ((BlockExplosiveOre) event.getState().getBlock()).doesExplode())
|| event.getState().getBlock() == Blocks.QUARTZ_ORE)) {
int randomNum = new Random().nextInt((100 - 1) + 1) + 1;
if (randomNum <= Options.getExplosionChance() || Options.getExplosionChance() > 100) {
if (randomNum <= Options.explosionChance() || Options.explosionChance() > 100) {
event.getWorld().createExplosion(event.getPlayer(), event.getPos().getX(), event.getPos().getY(), event.getPos().getZ(), 4.0F, true);
//if (ConfigHandler.isAngerPigmen())
//ModularityApi.angerPigmen(e.getPos(), e.getWorld(), e.getPlayer(), ConfigHandler.getAngerPigmenRange());
Expand Down
64 changes: 32 additions & 32 deletions src/main/java/com/mcmoddev/nethermetals/init/NetherBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.mcmoddev.lib.init.Materials;
import com.mcmoddev.lib.material.MMDMaterial;
import com.mcmoddev.nethermetals.NetherMetals;
import com.mcmoddev.nethermetals.util.Config.Options;
import com.mcmoddev.lib.util.ConfigBase.Options;

import net.minecraftforge.fml.common.Loader;

Expand All @@ -28,42 +28,42 @@ public static void init() {
Materials.init();
ItemGroups.init();

createNetherOreWrapper(Options.enableCoalNetherOre, Materials.getMaterialByName("coal"));
createNetherOreWrapper(Options.enableDiamondNetherOre, Materials.getMaterialByName("diamond"));
createNetherOreWrapper(Options.enableEmeraldNetherOre, Materials.getMaterialByName("emerald"));
createNetherOreWrapper(Options.enableGoldNetherOre, Materials.getMaterialByName("gold"));
createNetherOreWrapper(Options.enableIronNetherOre, Materials.getMaterialByName("iron"));
createNetherOreWrapper(Options.enableLapisNetherOre, Materials.getMaterialByName("lapis"));
createNetherOreWrapper(Options.enableRedstoneNetherOre, Materials.getMaterialByName("redstone"));
createNetherOreWrapper(Options.isMaterialEnabled("enableCoalNetherOre"), Materials.getMaterialByName("coal"));
createNetherOreWrapper(Options.isMaterialEnabled("enableDiamondNetherOre"), Materials.getMaterialByName("diamond"));
createNetherOreWrapper(Options.isMaterialEnabled("enableEmeraldNetherOre"), Materials.getMaterialByName("emerald"));
createNetherOreWrapper(Options.isMaterialEnabled("enableGoldNetherOre"), Materials.getMaterialByName("gold"));
createNetherOreWrapper(Options.isMaterialEnabled("enableIronNetherOre"), Materials.getMaterialByName("iron"));
createNetherOreWrapper(Options.isMaterialEnabled("enableLapisNetherOre"), Materials.getMaterialByName("lapis"));
createNetherOreWrapper(Options.isMaterialEnabled("enableRedstoneNetherOre"), Materials.getMaterialByName("redstone"));

if (Loader.isModLoaded("basemetals")) {
createNetherOreWrapper(Options.enableAntimonyNetherOre, Materials.getMaterialByName("antimony"));
createNetherOreWrapper(Options.enableBismuthNetherOre, Materials.getMaterialByName("bismuth"));
createNetherOreWrapper(Options.enableCopperNetherOre, Materials.getMaterialByName("copper"));
createNetherOreWrapper(Options.enableLeadNetherOre, Materials.getMaterialByName("lead"));
createNetherOreWrapper(Options.enableMercuryNetherOre, Materials.getMaterialByName("mercury"));
createNetherOreWrapper(Options.enableNickelNetherOre, Materials.getMaterialByName("nickel"));
createNetherOreWrapper(Options.enablePlatinumNetherOre, Materials.getMaterialByName("platinum"));
createNetherOreWrapper(Options.enableSilverNetherOre, Materials.getMaterialByName("silver"));
createNetherOreWrapper(Options.enableTinNetherOre, Materials.getMaterialByName("tin"));
createNetherOreWrapper(Options.enableZincNetherOre, Materials.getMaterialByName("zinc"));
createNetherOreWrapper(Options.isMaterialEnabled("enableAntimonyNetherOre"), Materials.getMaterialByName("antimony"));
createNetherOreWrapper(Options.isMaterialEnabled("enableBismuthNetherOre"), Materials.getMaterialByName("bismuth"));
createNetherOreWrapper(Options.isMaterialEnabled("enableCopperNetherOre"), Materials.getMaterialByName("copper"));
createNetherOreWrapper(Options.isMaterialEnabled("enableLeadNetherOre"), Materials.getMaterialByName("lead"));
createNetherOreWrapper(Options.isMaterialEnabled("enableMercuryNetherOre"), Materials.getMaterialByName("mercury"));
createNetherOreWrapper(Options.isMaterialEnabled("enableNickelNetherOre"), Materials.getMaterialByName("nickel"));
createNetherOreWrapper(Options.isMaterialEnabled("enablePlatinumNetherOre"), Materials.getMaterialByName("platinum"));
createNetherOreWrapper(Options.isMaterialEnabled("enableSilverNetherOre"), Materials.getMaterialByName("silver"));
createNetherOreWrapper(Options.isMaterialEnabled("enableTinNetherOre"), Materials.getMaterialByName("tin"));
createNetherOreWrapper(Options.isMaterialEnabled("enableZincNetherOre"), Materials.getMaterialByName("zinc"));
}

if (Loader.isModLoaded("modernmetals")) {
createNetherOreWrapper(Options.enableAluminumNetherOre, Materials.getMaterialByName("aluminum"));
createNetherOreWrapper(Options.enableCadmiumNetherOre, Materials.getMaterialByName("cadmium"));
createNetherOreWrapper(Options.enableChromiumNetherOre, Materials.getMaterialByName("chromium"));
createNetherOreWrapper(Options.enableIridiumNetherOre, Materials.getMaterialByName("iridium"));
createNetherOreWrapper(Options.enableMagnesiumNetherOre, Materials.getMaterialByName("magnesium"));
createNetherOreWrapper(Options.enableManganeseNetherOre, Materials.getMaterialByName("manganese"));
createNetherOreWrapper(Options.enableOsmiumNetherOre, Materials.getMaterialByName("osmium"));
createNetherOreWrapper(Options.enablePlutoniumNetherOre, Materials.getMaterialByName("plutonium"));
createNetherOreWrapper(Options.enableRutileNetherOre, Materials.getMaterialByName("rutile"));
createNetherOreWrapper(Options.enableTantalumNetherOre, Materials.getMaterialByName("tantalum"));
createNetherOreWrapper(Options.enableTitaniumNetherOre, Materials.getMaterialByName("titanium"));
createNetherOreWrapper(Options.enableTungstenNetherOre, Materials.getMaterialByName("tungsten"));
createNetherOreWrapper(Options.enableUraniumNetherOre, Materials.getMaterialByName("uranium"));
createNetherOreWrapper(Options.enableZirconiumNetherOre, Materials.getMaterialByName("zirconium"));
createNetherOreWrapper(Options.isMaterialEnabled("enableAluminumNetherOre"), Materials.getMaterialByName("aluminum"));
createNetherOreWrapper(Options.isMaterialEnabled("enableCadmiumNetherOre"), Materials.getMaterialByName("cadmium"));
createNetherOreWrapper(Options.isMaterialEnabled("enableChromiumNetherOre"), Materials.getMaterialByName("chromium"));
createNetherOreWrapper(Options.isMaterialEnabled("enableIridiumNetherOre"), Materials.getMaterialByName("iridium"));
createNetherOreWrapper(Options.isMaterialEnabled("enableMagnesiumNetherOre"), Materials.getMaterialByName("magnesium"));
createNetherOreWrapper(Options.isMaterialEnabled("enableManganeseNetherOre"), Materials.getMaterialByName("manganese"));
createNetherOreWrapper(Options.isMaterialEnabled("enableOsmiumNetherOre"), Materials.getMaterialByName("osmium"));
createNetherOreWrapper(Options.isMaterialEnabled("enablePlutoniumNetherOre"), Materials.getMaterialByName("plutonium"));
createNetherOreWrapper(Options.isMaterialEnabled("enableRutileNetherOre"), Materials.getMaterialByName("rutile"));
createNetherOreWrapper(Options.isMaterialEnabled("enableTantalumNetherOre"), Materials.getMaterialByName("tantalum"));
createNetherOreWrapper(Options.isMaterialEnabled("enableTitaniumNetherOre"), Materials.getMaterialByName("titanium"));
createNetherOreWrapper(Options.isMaterialEnabled("enableTungstenNetherOre"), Materials.getMaterialByName("tungsten"));
createNetherOreWrapper(Options.isMaterialEnabled("enableUraniumNetherOre"), Materials.getMaterialByName("uranium"));
createNetherOreWrapper(Options.isMaterialEnabled("enableZirconiumNetherOre"), Materials.getMaterialByName("zirconium"));
}
initDone = true;
}
Expand Down
29 changes: 4 additions & 25 deletions src/main/java/com/mcmoddev/nethermetals/init/Recipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.mcmoddev.lib.material.MMDMaterial;
import com.mcmoddev.lib.registry.CrusherRecipeRegistry;
import com.mcmoddev.nethermetals.NetherMetals;
import com.mcmoddev.nethermetals.util.Config.Options;
import com.mcmoddev.lib.util.ConfigBase.Options;

import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.Loader;
Expand All @@ -28,27 +28,6 @@ public static void init() {
recipeWrapper(true, Materials.getMaterialByName("lapis"));
recipeWrapper(true, Materials.getMaterialByName("redstone"));

/*
GameRegistry.addSmelting(Materials.getMaterialByName("coal").getBlock(Names.NETHERORE), new ItemStack(Blocks.COAL_ORE, 2), 1.0f);
GameRegistry.addSmelting(Materials.getMaterialByName("diamond").getBlock(Names.NETHERORE), new ItemStack(Blocks.DIAMOND_ORE, 2), 1.0f);
GameRegistry.addSmelting(Materials.getMaterialByName("emerald").getBlock(Names.NETHERORE), new ItemStack(Blocks.EMERALD_ORE, 2), 1.0f);
GameRegistry.addSmelting(Materials.getMaterialByName("gold").getBlock(Names.NETHERORE), new ItemStack(Blocks.GOLD_ORE, 2), 1.0f);
GameRegistry.addSmelting(Materials.getMaterialByName("iron").getBlock(Names.NETHERORE), new ItemStack(Blocks.IRON_ORE, 2), 1.0f);
GameRegistry.addSmelting(Materials.getMaterialByName("lapis").getBlock(Names.NETHERORE), new ItemStack(Blocks.LAPIS_ORE, 2), 1.0f);
GameRegistry.addSmelting(Materials.getMaterialByName("redstone").getBlock(Names.NETHERORE), new ItemStack(Blocks.REDSTONE_ORE, 2), 1.0f);

// Vanilla BM Hammer Compat
if (Loader.isModLoaded("basemetals")) {
CrusherRecipeRegistry.addNewCrusherRecipe(Materials.getMaterialByName("coal").getBlock(Names.NETHERORE), new ItemStack(Blocks.COAL_ORE, 2));
CrusherRecipeRegistry.addNewCrusherRecipe(Materials.getMaterialByName("diamond").getBlock(Names.NETHERORE), new ItemStack(Blocks.DIAMOND_ORE, 2));
CrusherRecipeRegistry.addNewCrusherRecipe(Materials.getMaterialByName("emerald").getBlock(Names.NETHERORE), new ItemStack(Blocks.EMERALD_ORE, 2));
CrusherRecipeRegistry.addNewCrusherRecipe(Materials.getMaterialByName("gold").getBlock(Names.NETHERORE), new ItemStack(Blocks.GOLD_ORE, 2));
CrusherRecipeRegistry.addNewCrusherRecipe(Materials.getMaterialByName("iron").getBlock(Names.NETHERORE), new ItemStack(Blocks.IRON_ORE, 2));
CrusherRecipeRegistry.addNewCrusherRecipe(Materials.getMaterialByName("lapis").getBlock(Names.NETHERORE), new ItemStack(Blocks.LAPIS_ORE, 2));
CrusherRecipeRegistry.addNewCrusherRecipe(Materials.getMaterialByName("redstone").getBlock(Names.NETHERORE), new ItemStack(Blocks.REDSTONE_ORE, 2));
}
*/

// Base Metals
if (Loader.isModLoaded("basemetals")) {
recipeWrapper(true, Materials.getMaterialByName("antimony"));
Expand Down Expand Up @@ -86,9 +65,9 @@ private static void recipeWrapper(boolean enabled, MMDMaterial material) {
if (enabled) {
if (material != null) {
if (material.getBlock(Names.NETHERORE) != null) {
boolean makeDusts = Options.makeDusts;
boolean smeltToIngots = Options.smeltToIngots;
if (Options.enableFurnaceSmelting) {
boolean makeDusts = Options.isThingEnabled("makeDusts");
boolean smeltToIngots = Options.isThingEnabled("smeltToIngots");
if (Options.isThingEnabled("enableFurnaceSmelting")) {
if (smeltToIngots) {
if (material.getItem(Names.INGOT) != null) {
GameRegistry.addSmelting(material.getBlock(Names.NETHERORE), new ItemStack(material.getItem(Names.INGOT), 2), 1.0f);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/mcmoddev/nethermetals/integration/plugins/TinkersConstruct.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class TinkersConstruct extends com.mcmoddev.lib.integration.plugins.Tinke

@Override
public void init() {
if (initDone || !com.mcmoddev.basemetals.util.Config.Options.modEnabled("tinkersconstruct")) {
if (initDone || !com.mcmoddev.lib.util.ConfigBase.Options.isModEnabled("tinkersconstruct")) {
return;
}

Expand Down
Loading