Merge pull request #70 from dshadowwolf/master-1.12

bump version number
MinecraftModDevelopmentMods · May 18, 2019 · 34dad8a · 34dad8a
2 parents be36fde + 02e0359
commit 34dad8a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/src/main/java/com/mcmoddev/nethermetals/NetherMetals.java b/src/main/java/com/mcmoddev/nethermetals/NetherMetals.java
@@ -27,7 +27,7 @@
 		modid = NetherMetals.MODID,
 		name = NetherMetals.NAME,
 		version = NetherMetals.VERSION,
-		dependencies = "required-after:forge@[14.21.0.2327,);after:mmdlib;after:baseminerals;after:modernmetals",
+		dependencies = "required-after:forge@[14.21.0.2327,);required-after:mmdlib;after:baseminerals;after:modernmetals",
 		certificateFingerprint = "@FINGERPRINT@",
 		acceptedMinecraftVersions = "[1.12,)",
 		updateJSON = SharedStrings.UPDATE_JSON_URL + "NetherMetals/master/update.json")
@@ -47,7 +47,7 @@ public final class NetherMetals {
 	 * is made that has the potential to break compatibility with other mods that depend on this
 	 * one.
 	 */
-	public static final String VERSION = "1.2.0-rc1";
+	public static final String VERSION = "1.2.0-rc2";
 
 	public static final Logger LOGGER = LogManager.getFormatterLogger(NetherMetals.MODID);
 

diff --git a/src/main/java/com/mcmoddev/nethermetals/init/Recipes.java b/src/main/java/com/mcmoddev/nethermetals/init/Recipes.java
@@ -1,6 +1,6 @@
 package com.mcmoddev.nethermetals.init;
 
-import com.mcmoddev.lib.data.VanillaMaterialNames;
+import com.mcmoddev.lib.data.MaterialNames;
 import com.mcmoddev.lib.data.Names;
 import com.mcmoddev.lib.data.SharedStrings;
 import com.mcmoddev.lib.init.Materials;
@@ -21,13 +21,13 @@ public final class Recipes {
 	public static void init() {
 
 		// Vanilla
-		recipeWrapper(VanillaMaterialNames.COAL);
-		recipeWrapper(VanillaMaterialNames.DIAMOND);
-		recipeWrapper(VanillaMaterialNames.EMERALD);
-		recipeWrapper(VanillaMaterialNames.GOLD);
-		recipeWrapper(VanillaMaterialNames.IRON);
-		recipeWrapper(VanillaMaterialNames.LAPIS);
-		recipeWrapper(VanillaMaterialNames.REDSTONE);
+		recipeWrapper(MaterialNames.COAL);
+		recipeWrapper(MaterialNames.DIAMOND);
+		recipeWrapper(MaterialNames.EMERALD);
+		recipeWrapper(MaterialNames.GOLD);
+		recipeWrapper(MaterialNames.IRON);
+		recipeWrapper(MaterialNames.LAPIS);
+		recipeWrapper(MaterialNames.REDSTONE);
 
 		// Base Metals
 		if (Loader.isModLoaded("basemetals")) {

diff --git a/src/main/java/com/mcmoddev/nethermetals/integration/plugins/NMeMekanism.java b/src/main/java/com/mcmoddev/nethermetals/integration/plugins/NMeMekanism.java
@@ -5,7 +5,7 @@
 
 import javax.annotation.Nonnull;
 
-import com.mcmoddev.lib.data.VanillaMaterialNames;
+import com.mcmoddev.lib.data.MaterialNames;
 import com.mcmoddev.lib.data.Names;
 import com.mcmoddev.lib.init.Materials;
 import com.mcmoddev.lib.integration.IIntegration;
@@ -47,7 +47,7 @@ public void init() {
 	 */
 	@SubscribeEvent
 	public void regCallback(final RegistryEvent.Register<IRecipe> event) {
-		final List<String> mekProvides = Arrays.asList(VanillaMaterialNames.IRON, VanillaMaterialNames.GOLD,
+		final List<String> mekProvides = Arrays.asList(MaterialNames.IRON, MaterialNames.GOLD,
 				"osmium", "copper", "tin", "silver", "lead");
 
 		mekProvides.stream().map(Materials::getMaterialByName).filter(mat -> !mat.isEmpty())
@@ -77,32 +77,32 @@ public void regCallback(final RegistryEvent.Register<IRecipe> event) {
 				.filter(material -> !mekProvides.contains(material.getName()))
 				.forEach(this::addMultRecipe);
 
-		if (Materials.hasMaterial(VanillaMaterialNames.LAPIS)) {
-			final MMDMaterial material = Materials.getMaterialByName(VanillaMaterialNames.LAPIS);
+		if (Materials.hasMaterial(MaterialNames.LAPIS)) {
+			final MMDMaterial material = Materials.getMaterialByName(MaterialNames.LAPIS);
 			addEnrichmentChamberRecipe(material.getBlockItemStack(Names.NETHERORE),
 					new ItemStack(net.minecraft.init.Items.DYE, 24, 4));
 		}
 
-		if (Materials.hasMaterial(VanillaMaterialNames.REDSTONE)) {
-			final MMDMaterial material = Materials.getMaterialByName(VanillaMaterialNames.REDSTONE);
+		if (Materials.hasMaterial(MaterialNames.REDSTONE)) {
+			final MMDMaterial material = Materials.getMaterialByName(MaterialNames.REDSTONE);
 			addEnrichmentChamberRecipe(material.getBlockItemStack(Names.NETHERORE),
 					new ItemStack(net.minecraft.init.Items.REDSTONE, 24));
 		}
 
-		if (Materials.hasMaterial(VanillaMaterialNames.COAL)) {
-			final MMDMaterial material = Materials.getMaterialByName(VanillaMaterialNames.COAL);
+		if (Materials.hasMaterial(MaterialNames.COAL)) {
+			final MMDMaterial material = Materials.getMaterialByName(MaterialNames.COAL);
 			addEnrichmentChamberRecipe(material.getBlockItemStack(Names.NETHERORE),
 					new ItemStack(net.minecraft.init.Items.COAL, 4, 0));
 		}
 
-		if (Materials.hasMaterial(VanillaMaterialNames.DIAMOND)) {
-			final MMDMaterial material = Materials.getMaterialByName(VanillaMaterialNames.DIAMOND);
+		if (Materials.hasMaterial(MaterialNames.DIAMOND)) {
+			final MMDMaterial material = Materials.getMaterialByName(MaterialNames.DIAMOND);
 			addEnrichmentChamberRecipe(material.getBlockItemStack(Names.NETHERORE),
 					new ItemStack(net.minecraft.init.Items.DIAMOND, 4));
 		}
 
-		if (Materials.hasMaterial(VanillaMaterialNames.EMERALD)) {
-			final MMDMaterial material = Materials.getMaterialByName(VanillaMaterialNames.EMERALD);
+		if (Materials.hasMaterial(MaterialNames.EMERALD)) {
+			final MMDMaterial material = Materials.getMaterialByName(MaterialNames.EMERALD);
 			addEnrichmentChamberRecipe(material.getBlockItemStack(Names.NETHERORE),
 					new ItemStack(net.minecraft.init.Items.EMERALD, 4));
 		}

diff --git a/src/main/java/com/mcmoddev/nethermetals/proxy/CommonProxy.java b/src/main/java/com/mcmoddev/nethermetals/proxy/CommonProxy.java
@@ -2,7 +2,7 @@
 
 import java.util.HashSet;
 
-import com.mcmoddev.lib.data.VanillaMaterialNames;
+import com.mcmoddev.lib.data.MaterialNames;
 import com.mcmoddev.lib.data.SharedStrings;
 import com.mcmoddev.lib.oregen.FallbackGenerator;
 import com.mcmoddev.lib.registry.CrusherRecipeRegistry;
@@ -48,7 +48,7 @@ public void preInit(final FMLPreInitializationEvent event) {
 	public void init(final FMLInitializationEvent event) {
 		Recipes.init();
 
-		ItemGroups.setupIcons(VanillaMaterialNames.LAPIS);
+		ItemGroups.setupIcons(MaterialNames.LAPIS);
 	}
 
 	/**