Skip to content

fix an issue caused by the former tight coupling of MMDLib and BaseMe… #71

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
May 22, 2019
Merged

fix an issue caused by the former tight coupling of MMDLib and BaseMe… #71

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
16 changes: 12 additions & 4 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 @@ -9,6 +9,7 @@
import com.mcmoddev.lib.init.Materials;
import com.mcmoddev.lib.material.MMDMaterial;
import com.mcmoddev.lib.util.Oredicts;
import com.mcmoddev.nethermetals.NetherMetals;

import net.minecraft.block.Block;

Expand All @@ -29,15 +30,21 @@ public static void init() {
"nickel", "platinum", "silver", "tin", "zinc", "aluminum", "cadmium", "chromium",
"iridium", "magnesium", "manganese", "osmium", "plutonium", "rutile", "tantalum",
"titanium", "tungsten", "uranium", "zirconium");
Materials.getAllMaterials().stream().map(material -> material.getName())
.filter(knownMaterials::contains).filter(Materials::hasMaterial)
.forEach(NetherBlocks::createOreWrapper);

Materials.getAllMaterials().stream().filter(MMDMaterial::isVanilla)
.map(material -> material.getName())
.filter(knownMaterials::contains)
.forEach(NetherBlocks::createVanillaOreWrapper);
Materials.getAllMaterials().stream().filter(mat -> !mat.isVanilla())
.map(material -> material.getName())
.filter(knownMaterials::contains).filter(Materials::hasMaterial)
.forEach(NetherBlocks::createOreWrapper);
}

private static void createOreWrapper(final String materialName) {
final List<String> vanillaMats = Arrays.asList("coal", "diamond", "emerald", "gold", "iron",
"lapis", "redstone");

NetherMetals.LOGGER.fatal("createOreWrapper(%s)", materialName);
if (vanillaMats.contains(materialName)) {
createVanillaOreWrapper(materialName);
} else {
Expand All @@ -46,6 +53,7 @@ private static void createOreWrapper(final String materialName) {
}

private static void createVanillaOreWrapper(final String materialName) {
NetherMetals.LOGGER.fatal("createVanillaOreWrapper(%s)", materialName);
final MMDMaterial material = Materials.getMaterialByName(materialName);
material.addNewBlock(Names.NETHERORE, addBlock(new BlockMMDNetherOre(material),
Names.NETHERORE.toString(), material, ItemGroups.getTab(SharedStrings.TAB_BLOCKS)));
Expand Down