From ed2ae90c679dcefc26f34156213329bd6684b7d8 Mon Sep 17 00:00:00 2001 From: "Joseph C. Sible" Date: Sun, 24 Sep 2017 13:37:05 -0400 Subject: [PATCH] Nuggets! - Add a nugget corresponding to each ingot that we add - Add the usual crafting recipes between ingots and nuggets - Make MekanismTools items smelt into nuggets like vanilla items do --- .../java/mekanism/client/ClientProxy.java | 1 + src/main/java/mekanism/common/Mekanism.java | 8 +++ .../java/mekanism/common/MekanismItems.java | 3 + .../java/mekanism/common/item/ItemIngot.java | 2 +- .../java/mekanism/common/item/ItemNugget.java | 43 +++++++++++ .../recipe/generation/MekanismRecipes.java | 14 ++++ .../mekanism/tools/common/MekanismTools.java | 67 ++++++++++++++++++ .../resources/assets/mekanism/lang/en_us.lang | 9 +++ .../mekanism/models/item/bronzenugget.json | 7 ++ .../mekanism/models/item/coppernugget.json | 7 ++ .../mekanism/models/item/glowstonenugget.json | 7 ++ .../mekanism/models/item/obsidiannugget.json | 7 ++ .../mekanism/models/item/osmiumnugget.json | 7 ++ .../mekanism/models/item/steelnugget.json | 7 ++ .../mekanism/models/item/tinnugget.json | 7 ++ .../assets/mekanism/recipes/ingot_0_alt.json | 18 +++++ .../assets/mekanism/recipes/ingot_1_alt.json | 18 +++++ .../assets/mekanism/recipes/ingot_2_alt.json | 18 +++++ .../assets/mekanism/recipes/ingot_3_alt.json | 18 +++++ .../assets/mekanism/recipes/ingot_4_alt.json | 18 +++++ .../assets/mekanism/recipes/ingot_5_alt.json | 18 +++++ .../assets/mekanism/recipes/ingot_6_alt.json | 18 +++++ .../assets/mekanism/recipes/nugget_0.json | 17 +++++ .../assets/mekanism/recipes/nugget_1.json | 17 +++++ .../assets/mekanism/recipes/nugget_2.json | 17 +++++ .../assets/mekanism/recipes/nugget_3.json | 17 +++++ .../assets/mekanism/recipes/nugget_4.json | 17 +++++ .../assets/mekanism/recipes/nugget_5.json | 17 +++++ .../assets/mekanism/recipes/nugget_6.json | 17 +++++ .../mekanism/textures/items/bronzenugget.png | Bin 0 -> 177 bytes .../mekanism/textures/items/coppernugget.png | Bin 0 -> 167 bytes .../textures/items/glowstonenugget.png | Bin 0 -> 218 bytes .../textures/items/obsidiannugget.png | Bin 0 -> 205 bytes .../mekanism/textures/items/osmiumnugget.png | Bin 0 -> 219 bytes .../mekanism/textures/items/steelnugget.png | Bin 0 -> 140 bytes .../mekanism/textures/items/tinnugget.png | Bin 0 -> 136 bytes 36 files changed, 440 insertions(+), 1 deletion(-) create mode 100644 src/main/java/mekanism/common/item/ItemNugget.java create mode 100644 src/main/resources/assets/mekanism/models/item/bronzenugget.json create mode 100644 src/main/resources/assets/mekanism/models/item/coppernugget.json create mode 100644 src/main/resources/assets/mekanism/models/item/glowstonenugget.json create mode 100644 src/main/resources/assets/mekanism/models/item/obsidiannugget.json create mode 100644 src/main/resources/assets/mekanism/models/item/osmiumnugget.json create mode 100644 src/main/resources/assets/mekanism/models/item/steelnugget.json create mode 100644 src/main/resources/assets/mekanism/models/item/tinnugget.json create mode 100644 src/main/resources/assets/mekanism/recipes/ingot_0_alt.json create mode 100644 src/main/resources/assets/mekanism/recipes/ingot_1_alt.json create mode 100644 src/main/resources/assets/mekanism/recipes/ingot_2_alt.json create mode 100644 src/main/resources/assets/mekanism/recipes/ingot_3_alt.json create mode 100644 src/main/resources/assets/mekanism/recipes/ingot_4_alt.json create mode 100644 src/main/resources/assets/mekanism/recipes/ingot_5_alt.json create mode 100644 src/main/resources/assets/mekanism/recipes/ingot_6_alt.json create mode 100644 src/main/resources/assets/mekanism/recipes/nugget_0.json create mode 100644 src/main/resources/assets/mekanism/recipes/nugget_1.json create mode 100644 src/main/resources/assets/mekanism/recipes/nugget_2.json create mode 100644 src/main/resources/assets/mekanism/recipes/nugget_3.json create mode 100644 src/main/resources/assets/mekanism/recipes/nugget_4.json create mode 100644 src/main/resources/assets/mekanism/recipes/nugget_5.json create mode 100644 src/main/resources/assets/mekanism/recipes/nugget_6.json create mode 100644 src/main/resources/assets/mekanism/textures/items/bronzenugget.png create mode 100644 src/main/resources/assets/mekanism/textures/items/coppernugget.png create mode 100644 src/main/resources/assets/mekanism/textures/items/glowstonenugget.png create mode 100644 src/main/resources/assets/mekanism/textures/items/obsidiannugget.png create mode 100644 src/main/resources/assets/mekanism/textures/items/osmiumnugget.png create mode 100644 src/main/resources/assets/mekanism/textures/items/steelnugget.png create mode 100644 src/main/resources/assets/mekanism/textures/items/tinnugget.png diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index e3997c43b..903d68f27 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -359,6 +359,7 @@ public class ClientProxy extends CommonProxy registerItemRender(MekanismItems.ElectricBow); registerItemRender(MekanismItems.Dust); registerItemRender(MekanismItems.Ingot); + registerItemRender(MekanismItems.Nugget); registerItemRender(MekanismItems.EnergyTablet); registerItemRender(MekanismItems.SpeedUpgrade); registerItemRender(MekanismItems.EnergyUpgrade); diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index c00d74d24..51cfbc10c 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -545,6 +545,14 @@ public class Mekanism OreDictionary.registerOre("ingotCopper", new ItemStack(MekanismItems.Ingot, 1, 5)); OreDictionary.registerOre("ingotTin", new ItemStack(MekanismItems.Ingot, 1, 6)); + OreDictionary.registerOre("nuggetRefinedObsidian", new ItemStack(MekanismItems.Nugget, 1, 0)); + OreDictionary.registerOre("nuggetOsmium", new ItemStack(MekanismItems.Nugget, 1, 1)); + OreDictionary.registerOre("nuggetBronze", new ItemStack(MekanismItems.Nugget, 1, 2)); + OreDictionary.registerOre("nuggetRefinedGlowstone", new ItemStack(MekanismItems.Nugget, 1, 3)); + OreDictionary.registerOre("nuggetSteel", new ItemStack(MekanismItems.Nugget, 1, 4)); + OreDictionary.registerOre("nuggetCopper", new ItemStack(MekanismItems.Nugget, 1, 5)); + OreDictionary.registerOre("nuggetTin", new ItemStack(MekanismItems.Nugget, 1, 6)); + OreDictionary.registerOre("blockOsmium", new ItemStack(MekanismBlocks.BasicBlock, 1, 0)); OreDictionary.registerOre("blockBronze", new ItemStack(MekanismBlocks.BasicBlock, 1, 1)); OreDictionary.registerOre("blockRefinedObsidian", new ItemStack(MekanismBlocks.BasicBlock, 1, 2)); diff --git a/src/main/java/mekanism/common/MekanismItems.java b/src/main/java/mekanism/common/MekanismItems.java index 0aa8f185f..14f2ccc65 100644 --- a/src/main/java/mekanism/common/MekanismItems.java +++ b/src/main/java/mekanism/common/MekanismItems.java @@ -23,6 +23,7 @@ import mekanism.common.item.ItemIngot; import mekanism.common.item.ItemJetpack; import mekanism.common.item.ItemMekanism; import mekanism.common.item.ItemNetworkReader; +import mekanism.common.item.ItemNugget; import mekanism.common.item.ItemOtherDust; import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.item.ItemProxy; @@ -88,6 +89,7 @@ public class MekanismItems public static final Item Sawdust = new ItemMekanism(); public static final Item Salt = new ItemMekanism(); public static final Item Ingot = new ItemIngot(); + public static final Item Nugget = new ItemNugget(); public static final Item Clump = new ItemClump(); public static final Item DirtyDust = new ItemDirtyDust(); public static final Item Shard = new ItemShard(); @@ -103,6 +105,7 @@ public class MekanismItems registry.register(init(ElectricBow, "ElectricBow")); registry.register(init(Dust, "Dust")); registry.register(init(Ingot, "Ingot")); + registry.register(init(Nugget, "Nugget")); registry.register(init(EnergyTablet, "EnergyTablet")); registry.register(init(SpeedUpgrade, "SpeedUpgrade")); registry.register(init(EnergyUpgrade, "EnergyUpgrade")); diff --git a/src/main/java/mekanism/common/item/ItemIngot.java b/src/main/java/mekanism/common/item/ItemIngot.java index 30a250422..965c7c2e7 100644 --- a/src/main/java/mekanism/common/item/ItemIngot.java +++ b/src/main/java/mekanism/common/item/ItemIngot.java @@ -33,7 +33,7 @@ public class ItemIngot extends ItemMekanism implements IMetaItem public void getSubItems(CreativeTabs tabs, NonNullList itemList) { if(!isInCreativeTab(tabs)) return; - for(int counter = 0; counter <= 6; counter++) + for(int counter = 0; counter < en_USNames.length; counter++) { itemList.add(new ItemStack(this, 1, counter)); } diff --git a/src/main/java/mekanism/common/item/ItemNugget.java b/src/main/java/mekanism/common/item/ItemNugget.java new file mode 100644 index 000000000..9e936fd3c --- /dev/null +++ b/src/main/java/mekanism/common/item/ItemNugget.java @@ -0,0 +1,43 @@ +package mekanism.common.item; + +import mekanism.common.base.IMetaItem; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; + +public class ItemNugget extends ItemMekanism implements IMetaItem +{ + public ItemNugget() + { + super(); + setHasSubtypes(true); + } + + @Override + public String getTexture(int meta) + { + return ItemIngot.en_USNames[meta] + "Nugget"; + } + + @Override + public int getVariants() + { + return ItemIngot.en_USNames.length; + } + + @Override + public void getSubItems(CreativeTabs tabs, NonNullList itemList) + { + if(!isInCreativeTab(tabs)) return; + for(int counter = 0; counter < ItemIngot.en_USNames.length; counter++) + { + itemList.add(new ItemStack(this, 1, counter)); + } + } + + @Override + public String getUnlocalizedName(ItemStack item) + { + return "item." + ItemIngot.en_USNames[item.getItemDamage()].toLowerCase() + "Nugget"; + } +} diff --git a/src/main/java/mekanism/common/recipe/generation/MekanismRecipes.java b/src/main/java/mekanism/common/recipe/generation/MekanismRecipes.java index 06c24eee3..7594d9862 100644 --- a/src/main/java/mekanism/common/recipe/generation/MekanismRecipes.java +++ b/src/main/java/mekanism/common/recipe/generation/MekanismRecipes.java @@ -42,6 +42,20 @@ public class MekanismRecipes { recipeGenerator.addShapedRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 13), "***", "***", "***", '*', "ingotTin"); recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Ingot, 9, 6), "*", '*', new ItemStack(MekanismBlocks.BasicBlock, 1, 13)); recipeGenerator.addShapedRecipe(new ItemStack(MekanismBlocks.SaltBlock), "**", "**", '*', MekanismItems.Salt); + recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Ingot, 1, 0), "***", "***", "***", '*', "nuggetObsidian"); + recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Nugget, 9, 0), "*", '*', "ingotObsidian"); + recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Ingot, 1, 1), "***", "***", "***", '*', "nuggetOsmium"); + recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Nugget, 9, 1), "*", '*', "ingotOsmium"); + recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Ingot, 1, 2), "***", "***", "***", '*', "nuggetBronze"); + recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Nugget, 9, 2), "*", '*', "ingotBronze"); + recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Ingot, 1, 3), "***", "***", "***", '*', "nuggetGlowstone"); + recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Nugget, 9, 3), "*", '*', "ingotGlowstone"); + recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Ingot, 1, 4), "***", "***", "***", '*', "nuggetSteel"); + recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Nugget, 9, 4), "*", '*', "ingotSteel"); + recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Ingot, 1, 5), "***", "***", "***", '*', "nuggetCopper"); + recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Nugget, 9, 5), "*", '*', "ingotCopper"); + recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Ingot, 1, 6), "***", "***", "***", '*', "nuggetTin"); + recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Nugget, 9, 6), "*", '*', "ingotTin"); //Base Recipes recipeGenerator.addShapedRecipe(new ItemStack(MekanismBlocks.ObsidianTNT, 1), "***", "XXX", "***", '*', Blocks.OBSIDIAN, 'X', Blocks.TNT); diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index 25f877444..119f849ac 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -6,11 +6,13 @@ import java.util.HashMap; import java.util.Map; import mekanism.common.Mekanism; +import mekanism.common.MekanismItems; import mekanism.common.Version; import mekanism.common.base.IModule; import mekanism.common.config.MekanismConfig.tools; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntityZombie; +import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; @@ -30,6 +32,7 @@ import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; @Mod(modid = "mekanismtools", name = "MekanismTools", version = "9.4.1", dependencies = "required-after:mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory", acceptedMinecraftVersions = "[1.12,1.13)") @Mod.EventBusSubscriber() @@ -100,6 +103,9 @@ public class MekanismTools implements IModule //Load the proxy proxy.loadConfiguration(); + + //Load this module + addRecipes(); //Finalization Mekanism.logger.info("Loaded MekanismTools module."); @@ -300,6 +306,67 @@ public class MekanismTools implements IModule ToolsItems.setHarvestLevels(); } + public void addRecipes() { + //Furnace Recipes + GameRegistry.addSmelting(ToolsItems.IronPaxel, new ItemStack(Items.IRON_NUGGET), 0.1F); + GameRegistry.addSmelting(ToolsItems.GoldPaxel, new ItemStack(Items.GOLD_NUGGET), 0.1F); + + GameRegistry.addSmelting(ToolsItems.GlowstonePaxel, new ItemStack(MekanismItems.Nugget, 1, 3), 0.1F); + GameRegistry.addSmelting(ToolsItems.GlowstonePickaxe, new ItemStack(MekanismItems.Nugget, 1, 3), 0.1F); + GameRegistry.addSmelting(ToolsItems.GlowstoneAxe, new ItemStack(MekanismItems.Nugget, 1, 3), 0.1F); + GameRegistry.addSmelting(ToolsItems.GlowstoneShovel, new ItemStack(MekanismItems.Nugget, 1, 3), 0.1F); + GameRegistry.addSmelting(ToolsItems.GlowstoneHoe, new ItemStack(MekanismItems.Nugget, 1, 3), 0.1F); + GameRegistry.addSmelting(ToolsItems.GlowstoneSword, new ItemStack(MekanismItems.Nugget, 1, 3), 0.1F); + GameRegistry.addSmelting(ToolsItems.GlowstoneHelmet, new ItemStack(MekanismItems.Nugget, 1, 3), 0.1F); + GameRegistry.addSmelting(ToolsItems.GlowstoneChestplate, new ItemStack(MekanismItems.Nugget, 1, 3), 0.1F); + GameRegistry.addSmelting(ToolsItems.GlowstoneLeggings, new ItemStack(MekanismItems.Nugget, 1, 3), 0.1F); + GameRegistry.addSmelting(ToolsItems.GlowstoneBoots, new ItemStack(MekanismItems.Nugget, 1, 3), 0.1F); + + GameRegistry.addSmelting(ToolsItems.BronzePaxel, new ItemStack(MekanismItems.Nugget, 1, 2), 0.1F); + GameRegistry.addSmelting(ToolsItems.BronzePickaxe, new ItemStack(MekanismItems.Nugget, 1, 2), 0.1F); + GameRegistry.addSmelting(ToolsItems.BronzeAxe, new ItemStack(MekanismItems.Nugget, 1, 2), 0.1F); + GameRegistry.addSmelting(ToolsItems.BronzeShovel, new ItemStack(MekanismItems.Nugget, 1, 2), 0.1F); + GameRegistry.addSmelting(ToolsItems.BronzeHoe, new ItemStack(MekanismItems.Nugget, 1, 2), 0.1F); + GameRegistry.addSmelting(ToolsItems.BronzeSword, new ItemStack(MekanismItems.Nugget, 1, 2), 0.1F); + GameRegistry.addSmelting(ToolsItems.BronzeHelmet, new ItemStack(MekanismItems.Nugget, 1, 2), 0.1F); + GameRegistry.addSmelting(ToolsItems.BronzeChestplate, new ItemStack(MekanismItems.Nugget, 1, 2), 0.1F); + GameRegistry.addSmelting(ToolsItems.BronzeLeggings, new ItemStack(MekanismItems.Nugget, 1, 2), 0.1F); + GameRegistry.addSmelting(ToolsItems.BronzeBoots, new ItemStack(MekanismItems.Nugget, 1, 2), 0.1F); + + GameRegistry.addSmelting(ToolsItems.OsmiumPaxel, new ItemStack(MekanismItems.Nugget, 1, 1), 0.1F); + GameRegistry.addSmelting(ToolsItems.OsmiumPickaxe, new ItemStack(MekanismItems.Nugget, 1, 1), 0.1F); + GameRegistry.addSmelting(ToolsItems.OsmiumAxe, new ItemStack(MekanismItems.Nugget, 1, 1), 0.1F); + GameRegistry.addSmelting(ToolsItems.OsmiumShovel, new ItemStack(MekanismItems.Nugget, 1, 1), 0.1F); + GameRegistry.addSmelting(ToolsItems.OsmiumHoe, new ItemStack(MekanismItems.Nugget, 1, 1), 0.1F); + GameRegistry.addSmelting(ToolsItems.OsmiumSword, new ItemStack(MekanismItems.Nugget, 1, 1), 0.1F); + GameRegistry.addSmelting(ToolsItems.OsmiumHelmet, new ItemStack(MekanismItems.Nugget, 1, 1), 0.1F); + GameRegistry.addSmelting(ToolsItems.OsmiumChestplate, new ItemStack(MekanismItems.Nugget, 1, 1), 0.1F); + GameRegistry.addSmelting(ToolsItems.OsmiumLeggings, new ItemStack(MekanismItems.Nugget, 1, 1), 0.1F); + GameRegistry.addSmelting(ToolsItems.OsmiumBoots, new ItemStack(MekanismItems.Nugget, 1, 1), 0.1F); + + GameRegistry.addSmelting(ToolsItems.ObsidianPaxel, new ItemStack(MekanismItems.Nugget, 1, 0), 0.1F); + GameRegistry.addSmelting(ToolsItems.ObsidianPickaxe, new ItemStack(MekanismItems.Nugget, 1, 0), 0.1F); + GameRegistry.addSmelting(ToolsItems.ObsidianAxe, new ItemStack(MekanismItems.Nugget, 1, 0), 0.1F); + GameRegistry.addSmelting(ToolsItems.ObsidianShovel, new ItemStack(MekanismItems.Nugget, 1, 0), 0.1F); + GameRegistry.addSmelting(ToolsItems.ObsidianHoe, new ItemStack(MekanismItems.Nugget, 1, 0), 0.1F); + GameRegistry.addSmelting(ToolsItems.ObsidianSword, new ItemStack(MekanismItems.Nugget, 1, 0), 0.1F); + GameRegistry.addSmelting(ToolsItems.ObsidianHelmet, new ItemStack(MekanismItems.Nugget, 1, 0), 0.1F); + GameRegistry.addSmelting(ToolsItems.ObsidianChestplate, new ItemStack(MekanismItems.Nugget, 1, 0), 0.1F); + GameRegistry.addSmelting(ToolsItems.ObsidianLeggings, new ItemStack(MekanismItems.Nugget, 1, 0), 0.1F); + GameRegistry.addSmelting(ToolsItems.ObsidianBoots, new ItemStack(MekanismItems.Nugget, 1, 0), 0.1F); + + GameRegistry.addSmelting(ToolsItems.SteelPaxel, new ItemStack(MekanismItems.Nugget, 1, 4), 0.1F); + GameRegistry.addSmelting(ToolsItems.SteelPickaxe, new ItemStack(MekanismItems.Nugget, 1, 4), 0.1F); + GameRegistry.addSmelting(ToolsItems.SteelAxe, new ItemStack(MekanismItems.Nugget, 1, 4), 0.1F); + GameRegistry.addSmelting(ToolsItems.SteelShovel, new ItemStack(MekanismItems.Nugget, 1, 4), 0.1F); + GameRegistry.addSmelting(ToolsItems.SteelHoe, new ItemStack(MekanismItems.Nugget, 1, 4), 0.1F); + GameRegistry.addSmelting(ToolsItems.SteelSword, new ItemStack(MekanismItems.Nugget, 1, 4), 0.1F); + GameRegistry.addSmelting(ToolsItems.SteelHelmet, new ItemStack(MekanismItems.Nugget, 1, 4), 0.1F); + GameRegistry.addSmelting(ToolsItems.SteelChestplate, new ItemStack(MekanismItems.Nugget, 1, 4), 0.1F); + GameRegistry.addSmelting(ToolsItems.SteelLeggings, new ItemStack(MekanismItems.Nugget, 1, 4), 0.1F); + GameRegistry.addSmelting(ToolsItems.SteelBoots, new ItemStack(MekanismItems.Nugget, 1, 4), 0.1F); + } + @SubscribeEvent public void onLivingSpecialSpawn(LivingSpawnEvent event) { diff --git a/src/main/resources/assets/mekanism/lang/en_us.lang b/src/main/resources/assets/mekanism/lang/en_us.lang index cc727ec0c..8de28c263 100644 --- a/src/main/resources/assets/mekanism/lang/en_us.lang +++ b/src/main/resources/assets/mekanism/lang/en_us.lang @@ -286,6 +286,15 @@ item.steelIngot.name=Steel Ingot item.copperIngot.name=Copper Ingot item.tinIngot.name=Tin Ingot +//Nuggets +item.obsidianNugget.name=Refined Obsidian Nugget +item.osmiumNugget.name=Osmium Nugget +item.bronzeNugget.name=Bronze Nugget +item.glowstoneNugget.name=Glowstone Nugget +item.steelNugget.name=Steel Nugget +item.copperNugget.name=Copper Nugget +item.tinNugget.name=Tin Nugget + //Gasses gas.hydrogen=Hydrogen gas.oxygen=Oxygen diff --git a/src/main/resources/assets/mekanism/models/item/bronzenugget.json b/src/main/resources/assets/mekanism/models/item/bronzenugget.json new file mode 100644 index 000000000..426ba9525 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/bronzenugget.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/bronzenugget" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/coppernugget.json b/src/main/resources/assets/mekanism/models/item/coppernugget.json new file mode 100644 index 000000000..edd86022e --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/coppernugget.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/coppernugget" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/glowstonenugget.json b/src/main/resources/assets/mekanism/models/item/glowstonenugget.json new file mode 100644 index 000000000..ab84fe7f3 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/glowstonenugget.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/glowstonenugget" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/obsidiannugget.json b/src/main/resources/assets/mekanism/models/item/obsidiannugget.json new file mode 100644 index 000000000..eb94d0164 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/obsidiannugget.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/obsidiannugget" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/osmiumnugget.json b/src/main/resources/assets/mekanism/models/item/osmiumnugget.json new file mode 100644 index 000000000..1ef21eac6 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/osmiumnugget.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/osmiumnugget" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/steelnugget.json b/src/main/resources/assets/mekanism/models/item/steelnugget.json new file mode 100644 index 000000000..a01ad37b2 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/steelnugget.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/steelnugget" + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/tinnugget.json b/src/main/resources/assets/mekanism/models/item/tinnugget.json new file mode 100644 index 000000000..b3ea7ffd5 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/tinnugget.json @@ -0,0 +1,7 @@ +{ + "parent": "mekanism:item/standard_item", + "textures": { + "layer0": "mekanism:items/tinnugget" + } +} + diff --git a/src/main/resources/assets/mekanism/recipes/ingot_0_alt.json b/src/main/resources/assets/mekanism/recipes/ingot_0_alt.json new file mode 100644 index 000000000..ca399769c --- /dev/null +++ b/src/main/resources/assets/mekanism/recipes/ingot_0_alt.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "mekanism:ingot", + "data": 0 + }, + "pattern": [ + "***", + "***", + "***" + ], + "type": "mekanism:ore_shaped", + "key": { + "*": { + "ore": "nuggetRefinedObsidian", + "type": "forge:ore_dict" + } + } +} diff --git a/src/main/resources/assets/mekanism/recipes/ingot_1_alt.json b/src/main/resources/assets/mekanism/recipes/ingot_1_alt.json new file mode 100644 index 000000000..582f7a9f2 --- /dev/null +++ b/src/main/resources/assets/mekanism/recipes/ingot_1_alt.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "mekanism:ingot", + "data": 1 + }, + "pattern": [ + "***", + "***", + "***" + ], + "type": "mekanism:ore_shaped", + "key": { + "*": { + "ore": "nuggetOsmium", + "type": "forge:ore_dict" + } + } +} diff --git a/src/main/resources/assets/mekanism/recipes/ingot_2_alt.json b/src/main/resources/assets/mekanism/recipes/ingot_2_alt.json new file mode 100644 index 000000000..382e7cf76 --- /dev/null +++ b/src/main/resources/assets/mekanism/recipes/ingot_2_alt.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "mekanism:ingot", + "data": 2 + }, + "pattern": [ + "***", + "***", + "***" + ], + "type": "mekanism:ore_shaped", + "key": { + "*": { + "ore": "nuggetBronze", + "type": "forge:ore_dict" + } + } +} diff --git a/src/main/resources/assets/mekanism/recipes/ingot_3_alt.json b/src/main/resources/assets/mekanism/recipes/ingot_3_alt.json new file mode 100644 index 000000000..b26ecf09a --- /dev/null +++ b/src/main/resources/assets/mekanism/recipes/ingot_3_alt.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "mekanism:ingot", + "data": 3 + }, + "pattern": [ + "***", + "***", + "***" + ], + "type": "mekanism:ore_shaped", + "key": { + "*": { + "ore": "nuggetRefinedGlowstone", + "type": "forge:ore_dict" + } + } +} diff --git a/src/main/resources/assets/mekanism/recipes/ingot_4_alt.json b/src/main/resources/assets/mekanism/recipes/ingot_4_alt.json new file mode 100644 index 000000000..4698becb8 --- /dev/null +++ b/src/main/resources/assets/mekanism/recipes/ingot_4_alt.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "mekanism:ingot", + "data": 4 + }, + "pattern": [ + "***", + "***", + "***" + ], + "type": "mekanism:ore_shaped", + "key": { + "*": { + "ore": "nuggetSteel", + "type": "forge:ore_dict" + } + } +} diff --git a/src/main/resources/assets/mekanism/recipes/ingot_5_alt.json b/src/main/resources/assets/mekanism/recipes/ingot_5_alt.json new file mode 100644 index 000000000..7580c24ab --- /dev/null +++ b/src/main/resources/assets/mekanism/recipes/ingot_5_alt.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "mekanism:ingot", + "data": 5 + }, + "pattern": [ + "***", + "***", + "***" + ], + "type": "mekanism:ore_shaped", + "key": { + "*": { + "ore": "nuggetCopper", + "type": "forge:ore_dict" + } + } +} diff --git a/src/main/resources/assets/mekanism/recipes/ingot_6_alt.json b/src/main/resources/assets/mekanism/recipes/ingot_6_alt.json new file mode 100644 index 000000000..c19a140e4 --- /dev/null +++ b/src/main/resources/assets/mekanism/recipes/ingot_6_alt.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "mekanism:ingot", + "data": 6 + }, + "pattern": [ + "***", + "***", + "***" + ], + "type": "mekanism:ore_shaped", + "key": { + "*": { + "ore": "nuggetTin", + "type": "forge:ore_dict" + } + } +} diff --git a/src/main/resources/assets/mekanism/recipes/nugget_0.json b/src/main/resources/assets/mekanism/recipes/nugget_0.json new file mode 100644 index 000000000..d6a662497 --- /dev/null +++ b/src/main/resources/assets/mekanism/recipes/nugget_0.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "mekanism:nugget", + "data": 0, + "count": 9 + }, + "pattern": [ + "*" + ], + "type": "mekanism:ore_shaped", + "key": { + "*": { + "ore": "ingotRefinedObsidian", + "type": "forge:ore_dict" + } + } +} diff --git a/src/main/resources/assets/mekanism/recipes/nugget_1.json b/src/main/resources/assets/mekanism/recipes/nugget_1.json new file mode 100644 index 000000000..7c181abe6 --- /dev/null +++ b/src/main/resources/assets/mekanism/recipes/nugget_1.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "mekanism:nugget", + "data": 1, + "count": 9 + }, + "pattern": [ + "*" + ], + "type": "mekanism:ore_shaped", + "key": { + "*": { + "ore": "ingotOsmium", + "type": "forge:ore_dict" + } + } +} diff --git a/src/main/resources/assets/mekanism/recipes/nugget_2.json b/src/main/resources/assets/mekanism/recipes/nugget_2.json new file mode 100644 index 000000000..ac7f477bc --- /dev/null +++ b/src/main/resources/assets/mekanism/recipes/nugget_2.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "mekanism:nugget", + "data": 2, + "count": 9 + }, + "pattern": [ + "*" + ], + "type": "mekanism:ore_shaped", + "key": { + "*": { + "ore": "ingotBronze", + "type": "forge:ore_dict" + } + } +} diff --git a/src/main/resources/assets/mekanism/recipes/nugget_3.json b/src/main/resources/assets/mekanism/recipes/nugget_3.json new file mode 100644 index 000000000..2c9b102f4 --- /dev/null +++ b/src/main/resources/assets/mekanism/recipes/nugget_3.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "mekanism:nugget", + "data": 3, + "count": 9 + }, + "pattern": [ + "*" + ], + "type": "mekanism:ore_shaped", + "key": { + "*": { + "ore": "ingotRefinedGlowstone", + "type": "forge:ore_dict" + } + } +} diff --git a/src/main/resources/assets/mekanism/recipes/nugget_4.json b/src/main/resources/assets/mekanism/recipes/nugget_4.json new file mode 100644 index 000000000..21e107c93 --- /dev/null +++ b/src/main/resources/assets/mekanism/recipes/nugget_4.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "mekanism:nugget", + "data": 4, + "count": 9 + }, + "pattern": [ + "*" + ], + "type": "mekanism:ore_shaped", + "key": { + "*": { + "ore": "ingotSteel", + "type": "forge:ore_dict" + } + } +} diff --git a/src/main/resources/assets/mekanism/recipes/nugget_5.json b/src/main/resources/assets/mekanism/recipes/nugget_5.json new file mode 100644 index 000000000..ad65213b0 --- /dev/null +++ b/src/main/resources/assets/mekanism/recipes/nugget_5.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "mekanism:nugget", + "data": 5, + "count": 9 + }, + "pattern": [ + "*" + ], + "type": "mekanism:ore_shaped", + "key": { + "*": { + "ore": "ingotCopper", + "type": "forge:ore_dict" + } + } +} diff --git a/src/main/resources/assets/mekanism/recipes/nugget_6.json b/src/main/resources/assets/mekanism/recipes/nugget_6.json new file mode 100644 index 000000000..d166a11c5 --- /dev/null +++ b/src/main/resources/assets/mekanism/recipes/nugget_6.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "mekanism:nugget", + "data": 6, + "count": 9 + }, + "pattern": [ + "*" + ], + "type": "mekanism:ore_shaped", + "key": { + "*": { + "ore": "ingotTin", + "type": "forge:ore_dict" + } + } +} diff --git a/src/main/resources/assets/mekanism/textures/items/bronzenugget.png b/src/main/resources/assets/mekanism/textures/items/bronzenugget.png new file mode 100644 index 0000000000000000000000000000000000000000..ebe034217435c02a34a7f1623e264e5bca59b635 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`6`n4RAr_~T6C_wI9D8Oys+Umn z{yg_B=YRY8Yk&R!Pnt-++mBJ$t=hwrBR51*#;=l+z}zwBp;I6JWIu@3w7|7YWx z|MU6H{>0Bt@tehH;OsEVUSChuUgn7hX2!VUH&&e$4BL^z=XEXx+nklUp?~Yew4_sdZ!h#nQaXs^E3T^)i2U}_y6Ox zFaOUv_C49jw4^dPRO;u$4a=-v|8KF7|HPZYU;H=zU7FWC#uI^-vsQd$W-tqNTYGoc REh(VQ44$rjF6*2UngHEUM=<~Z literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/items/glowstonenugget.png b/src/main/resources/assets/mekanism/textures/items/glowstonenugget.png new file mode 100644 index 0000000000000000000000000000000000000000..bdcb14d2196e59111f9618ff030fed77808fea03 GIT binary patch literal 218 zcmV<0044v4P)%MT*S-id2>Vb=k`QN!AR~^zEX>|NnP0{{OiZ{J%b1i8Mn%Hvhku@&DHi`~PoF zyZ!%h!Q_8s8VN1|IsgCD*8l%*+Wr6aa>@UvM=bxBCTWo7iZY-fAkD{C8T>CvQX)MZ z%2H+iKR%WDf8#V|paHU^8&H`c^Z)KnrT>Q(%Kk4+mibRsRFhc!%T6**U%-l*vNo{hJI~(y&njpj zBOLOZ|8LoM<^Q5}C;q2olM#?bWj+5(8(06|viIWuf^ri4j|{SkoBkJ7lj!#m2mlyf VUp}qX;I;q&002ovPDHLkV1hfTYgYgO literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/items/steelnugget.png b/src/main/resources/assets/mekanism/textures/items/steelnugget.png new file mode 100644 index 0000000000000000000000000000000000000000..edc5780652ca7eb10a96706b1faa22ac86534f3a GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6f<0XvLp07OCrG3mc(?y*{pSA` zOV9p$|HJ