From bb55bf57c892e05bbaf1eab7930deb9eb7f4b3b4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 7 Aug 2017 21:07:09 -0500 Subject: [PATCH] Add mana diamond and pearl 1/9th units, terrasteel nuggets crafted using them --- .../common/block/tile/TileTerraPlate.java | 6 +++--- .../vazkii/botania/common/item/ModItems.java | 2 ++ .../common/item/material/ItemManaResource.java | 18 +++++++++++++----- .../common/lexicon/page/PageTerrasteel.java | 12 ++++++------ .../botania/common/lib/LibItemNames.java | 4 +++- .../vazkii/botania/common/lib/LibOreDict.java | 3 ++- .../resources/assets/botania/lang/en_us.lang | 2 ++ .../botania/models/item/manadiamondchunk.json | 7 +++++++ .../botania/models/item/manapearlshard.json | 7 +++++++ .../assets/botania/recipes/_constants.json | 14 ++++++++++++++ ...resource_0_alt.json => manaresource_0.json} | 0 .../assets/botania/recipes/manaresource_1.json | 17 +++++++++++++++++ .../botania/recipes/manaresource_24.json | 13 +++++++++++++ .../botania/recipes/manaresource_25.json | 13 +++++++++++++ .../botania/recipes/manaresource_2_alt.json | 17 +++++++++++++++++ 15 files changed, 119 insertions(+), 16 deletions(-) create mode 100644 src/main/resources/assets/botania/models/item/manadiamondchunk.json create mode 100644 src/main/resources/assets/botania/models/item/manapearlshard.json rename src/main/resources/assets/botania/recipes/{manaresource_0_alt.json => manaresource_0.json} (100%) create mode 100644 src/main/resources/assets/botania/recipes/manaresource_1.json create mode 100644 src/main/resources/assets/botania/recipes/manaresource_24.json create mode 100644 src/main/resources/assets/botania/recipes/manaresource_25.json create mode 100644 src/main/resources/assets/botania/recipes/manaresource_2_alt.json diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java index 93099cf60..2493c8db9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -132,11 +132,11 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { return false; int meta = stack.getItemDamage(); - if(meta == 0) + if(meta == 17) ingot = stack; - else if(meta == 1) + else if(meta == 24) pearl = stack; - else if(meta == 2) + else if(meta == 25) diamond = stack; else return false; } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index a60a64f0b..2a5663dc4 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -445,6 +445,8 @@ public final class ModItems { OreDictionary.registerOre(LibOreDict.PEBBLE, new ItemStack(manaResource, 1, 21)); OreDictionary.registerOre(LibOreDict.MANAWEAVE_CLOTH, new ItemStack(manaResource, 1, 22)); OreDictionary.registerOre(LibOreDict.MANA_POWDER, new ItemStack(manaResource, 1, 23)); + OreDictionary.registerOre(LibOreDict.MANA_PEARL_SHARD, new ItemStack(manaResource, 1, 24)); + OreDictionary.registerOre(LibOreDict.MANA_DIAMOND_CHUNK, new ItemStack(manaResource, 1, 25)); OreDictionary.registerOre(LibOreDict.VIAL, new ItemStack(vial, 1, 0)); OreDictionary.registerOre(LibOreDict.FLASK, new ItemStack(vial, 1, 1)); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index b2c46a84f..d9e457f89 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item.material; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -23,6 +24,7 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -38,13 +40,12 @@ import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.entity.EntityEnderAirBottle; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem { - final int types = 24; - public ItemManaResource() { super(LibItemNames.MANA_RESOURCE); setHasSubtypes(true); @@ -117,7 +118,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @Override public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList stacks) { if(isInCreativeTab(tab)) { - for(int i = 0; i < types; i++) { + for(int i = 0; i < LibItemNames.MANA_RESOURCE_NAMES.length; i++) { if("UNUSED".equals(LibItemNames.MANA_RESOURCE_NAMES[i])) continue; if(Botania.gardenOfGlassLoaded || i != 20 && i != 21) @@ -129,7 +130,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { - return "item." + LibItemNames.MANA_RESOURCE_NAMES[Math.min(types - 1, par1ItemStack.getItemDamage())]; + return "item." + LibItemNames.MANA_RESOURCE_NAMES[Math.min(LibItemNames.MANA_RESOURCE_NAMES.length - 1, par1ItemStack.getItemDamage())]; } @Override @@ -158,7 +159,14 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @SideOnly(Side.CLIENT) @Override public void registerModels() { - ModelHandler.registerItemMetas(this, LibItemNames.MANA_RESOURCE_NAMES.length, i -> LibItemNames.MANA_RESOURCE_NAMES[i]); + for(int i = 0; i < LibItemNames.MANA_RESOURCE_NAMES.length; i++) { + if("UNUSED".equals(LibItemNames.MANA_RESOURCE_NAMES[i])) + continue; + ModelLoader.setCustomModelResourceLocation( + this, i, + new ModelResourceLocation(LibMisc.MOD_ID + ":" + LibItemNames.MANA_RESOURCE_NAMES[i], "inventory") + ); + } } } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java b/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java index 0ed23b6ba..39163296a 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java @@ -68,10 +68,10 @@ public class PageTerrasteel extends PageRecipe { renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 102, new ItemStack(block3), false); GlStateManager.translate(0F, 0F, -10F); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 30, new ItemStack(ModItems.manaResource, 1, 4), false); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 80, new ItemStack(ModItems.manaResource, 1, 0), false); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 - 20, gui.getTop() + 86, new ItemStack(ModItems.manaResource, 1, 1), false); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 19, gui.getTop() + 86, new ItemStack(ModItems.manaResource, 1, 2), false); + renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 30, new ItemStack(ModItems.manaResource, 1, 18), false); + renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 80, new ItemStack(ModItems.manaResource, 1, 17), false); + renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 - 20, gui.getTop() + 86, new ItemStack(ModItems.manaResource, 1, 24), false); + renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 19, gui.getTop() + 86, new ItemStack(ModItems.manaResource, 1, 25), false); Minecraft.getMinecraft().renderEngine.bindTexture(terrasteelOverlay); @@ -84,13 +84,13 @@ public class PageTerrasteel extends PageRecipe { @Override public void onPageAdded(LexiconEntry entry, int index) { - LexiconRecipeMappings.map(new ItemStack(ModItems.manaResource, 1, 4), entry, index); + LexiconRecipeMappings.map(new ItemStack(ModItems.manaResource, 1, 18), entry, index); } @Override public List getDisplayedRecipes() { ArrayList list = new ArrayList<>(); - list.add(new ItemStack(ModItems.manaResource, 1, 4)); + list.add(new ItemStack(ModItems.manaResource, 1, 18)); return list; } diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 08217dc8d..d704d88fd 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -218,6 +218,8 @@ public final class LibItemNames { "livingRoot", "pebble", "manaweaveCloth", - "manaPowder" + "manaPowder", + "manaPearlShard", + "manaDiamondChunk" }; } diff --git a/src/main/java/vazkii/botania/common/lib/LibOreDict.java b/src/main/java/vazkii/botania/common/lib/LibOreDict.java index 0003909eb..c3f595df1 100644 --- a/src/main/java/vazkii/botania/common/lib/LibOreDict.java +++ b/src/main/java/vazkii/botania/common/lib/LibOreDict.java @@ -41,11 +41,12 @@ public final class LibOreDict { public static final String PEBBLE = "pebble"; public static final String MANAWEAVE_CLOTH = "clothManaweave"; public static final String MANA_POWDER = "powderMana"; + public static final String MANA_PEARL_SHARD = "shardManaPearl"; + public static final String MANA_DIAMOND_CHUNK = "nuggetManaDiamond"; public static final String VIAL = "bVial"; public static final String FLASK = "bFlask"; - public static final String PRISMARINE_BLOCK = "blockPrismarine"; public static final String BLAZE_BLOCK = "blockBlaze"; public static final String DYE_WILDCARD = "dye"; diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index 380e1ec27..0114fdd6e 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -1309,7 +1309,9 @@ item.botania:pestleAndMortar.name=Pestle and Mortar item.botania:twigWand.name=Wand of the Forest item.botania:manasteel.name=Manasteel Ingot item.botania:manaPearl.name=Mana Pearl +item.botania:manaPearlShard.name=Mana Pearl Shard item.botania:manaDiamond.name=Mana Diamond +item.botania:manaDiamondChunk.name=Mana Diamond Chunk item.botania:lensNormal.name=Mana Lens item.botania:lensSpeed.name=Mana Lens: Velocity item.botania:lensSpeed.short=Velocity diff --git a/src/main/resources/assets/botania/models/item/manadiamondchunk.json b/src/main/resources/assets/botania/models/item/manadiamondchunk.json new file mode 100644 index 000000000..f73dfe965 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manadiamondchunk.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": + { + "layer0": "botania:items/manadiamondchunk" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manapearlshard.json b/src/main/resources/assets/botania/models/item/manapearlshard.json new file mode 100644 index 000000000..31fd95546 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manapearlshard.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": + { + "layer0": "botania:items/manapearlshard" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/_constants.json b/src/main/resources/assets/botania/recipes/_constants.json index 61fa7b60e..6ff6c4c82 100644 --- a/src/main/resources/assets/botania/recipes/_constants.json +++ b/src/main/resources/assets/botania/recipes/_constants.json @@ -517,6 +517,13 @@ }, "name": "NUGGETGOLD" }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "nuggetManaDiamond" + }, + "name": "NUGGETMANADIAMOND" + }, { "ingredient": { "type": "forge:ore_dict", @@ -832,6 +839,13 @@ }, "name": "RUNEWRATHB" }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "shardManaPearl" + }, + "name": "SHARDMANAPEARL" + }, { "ingredient": { "type": "forge:ore_dict", diff --git a/src/main/resources/assets/botania/recipes/manaresource_0_alt.json b/src/main/resources/assets/botania/recipes/manaresource_0.json similarity index 100% rename from src/main/resources/assets/botania/recipes/manaresource_0_alt.json rename to src/main/resources/assets/botania/recipes/manaresource_0.json diff --git a/src/main/resources/assets/botania/recipes/manaresource_1.json b/src/main/resources/assets/botania/recipes/manaresource_1.json new file mode 100644 index 000000000..9e27594b4 --- /dev/null +++ b/src/main/resources/assets/botania/recipes/manaresource_1.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "botania:manaresource", + "data": 1 + }, + "pattern": [ + "III", + "III", + "III" + ], + "type": "forge:ore_shaped", + "key": { + "I": { + "item": "#SHARDMANAPEARL" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/manaresource_24.json b/src/main/resources/assets/botania/recipes/manaresource_24.json new file mode 100644 index 000000000..841bd5783 --- /dev/null +++ b/src/main/resources/assets/botania/recipes/manaresource_24.json @@ -0,0 +1,13 @@ +{ + "result": { + "item": "botania:manaresource", + "data": 24, + "count": 9 + }, + "ingredients": [ + { + "item": "#MANAPEARL" + } + ], + "type": "forge:ore_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/manaresource_25.json b/src/main/resources/assets/botania/recipes/manaresource_25.json new file mode 100644 index 000000000..3c5aa16c0 --- /dev/null +++ b/src/main/resources/assets/botania/recipes/manaresource_25.json @@ -0,0 +1,13 @@ +{ + "result": { + "item": "botania:manaresource", + "data": 25, + "count": 9 + }, + "ingredients": [ + { + "item": "#MANADIAMOND" + } + ], + "type": "forge:ore_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/manaresource_2_alt.json b/src/main/resources/assets/botania/recipes/manaresource_2_alt.json new file mode 100644 index 000000000..8202a128a --- /dev/null +++ b/src/main/resources/assets/botania/recipes/manaresource_2_alt.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "botania:manaresource", + "data": 2 + }, + "pattern": [ + "III", + "III", + "III" + ], + "type": "forge:ore_shaped", + "key": { + "I": { + "item": "#NUGGETMANADIAMOND" + } + } +} \ No newline at end of file