Skip to content

Commit 4dadc54

Browse files
authored
Merge pull request #24 from dshadowwolf/master-1.10.2-dev
fix to match rename/refactor of MMDLib embedded in BMe on 4/1
2 parents dab9c95 + 811e604 commit 4dadc54

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.mcmoddev.nethermetals.init;
22

33
import com.mcmoddev.lib.init.Materials;
4-
import com.mcmoddev.lib.material.MetalMaterial;
4+
import com.mcmoddev.lib.material.MMDMaterial;
55
import com.mcmoddev.nethermetals.NetherMetals;
66
import com.mcmoddev.nethermetals.util.Config.Options;
77

@@ -63,7 +63,7 @@ public static void init() {
6363
initDone = true;
6464
}
6565

66-
private static void createNetherOreWrapper(boolean enabled, MetalMaterial material) {
66+
private static void createNetherOreWrapper(boolean enabled, MMDMaterial material) {
6767
if (enabled) {
6868
if (material != null) {
6969
createNetherOre(material);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.mcmoddev.nethermetals.init;
22

33
import com.mcmoddev.lib.init.Materials;
4-
import com.mcmoddev.lib.material.MetalMaterial;
4+
import com.mcmoddev.lib.material.MMDMaterial;
55
import com.mcmoddev.lib.registry.CrusherRecipeRegistry;
66
import com.mcmoddev.nethermetals.NetherMetals;
77
import com.mcmoddev.nethermetals.util.Config.Options;
@@ -81,7 +81,7 @@ public static void init() {
8181
}
8282
}
8383

84-
private static void recipeWrapper(boolean enabled, MetalMaterial material) {
84+
private static void recipeWrapper(boolean enabled, MMDMaterial material) {
8585
if (enabled) {
8686
if (material != null) {
8787
if (material.oreNether != null) {

src/main/java/com/mcmoddev/nethermetals/integration/plugins/TinkersConstruct.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.mcmoddev.lib.init.Materials;
55
import com.mcmoddev.lib.integration.IIntegration;
66
import com.mcmoddev.lib.integration.MMDPlugin;
7-
import com.mcmoddev.lib.material.MetalMaterial;
7+
import com.mcmoddev.lib.material.MMDMaterial;
88

99
/**
1010
*
@@ -59,7 +59,7 @@ public void init() {
5959
initDone = true;
6060
}
6161

62-
private static void registerExtraMeltingWrapper(MetalMaterial material, int quantity) {
62+
private static void registerExtraMeltingWrapper(MMDMaterial material, int quantity) {
6363
registerExtraMelting(material, material.oreNether, quantity);
6464
}
6565
}

0 commit comments

Comments
 (0)