diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index fa69faae2..d83a606b2 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "88", provides = "BotaniaAPI") +@API(owner = "botania", apiVersion = "89", provides = "BotaniaAPI") package vazkii.botania.api; import net.minecraftforge.fml.common.API; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index 9b00d6948..cb9b5f5d6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -42,7 +42,8 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.DrumVariant; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.item.ItemGrassHorn; +import vazkii.botania.common.item.ItemHorn; +import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -119,9 +120,9 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona } DrumVariant variant = world.getBlockState(pos).getValue(BotaniaStateProps.DRUM_VARIANT); if(variant == DrumVariant.WILD) - ItemGrassHorn.breakGrass(world, null, 0, pos); + ItemHorn.breakGrass(world, new ItemStack(ModItems.grassHorn), pos); else if(variant == DrumVariant.CANOPY) - ItemGrassHorn.breakGrass(world, null, 1, pos); + ItemHorn.breakGrass(world, new ItemStack(ModItems.leavesHorn), pos); else { int range = 10; List entities = world.getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range + 1, range + 1, range + 1))); diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index f3bea7791..e82e63330 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -97,6 +97,8 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.terraformRod); addItem(ModItems.laputaShard); addItem(ModItems.grassHorn); + addItem(ModItems.leavesHorn); + addItem(ModItems.snowHorn); addItem(ModItems.waterRod); addItem(ModItems.openBucket); addItem(ModItems.rainbowRod); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 24a299fad..2eb40d505 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -591,9 +591,9 @@ public final class ModCraftingRecipes { recipeTerrasteelChest = ModItems.terrasteelChest.getRegistryName(); recipeTerrasteelLegs = ModItems.terrasteelLegs.getRegistryName(); recipeTerrasteelBoots = ModItems.terrasteelBoots.getRegistryName(); - recipeGrassHorn = path("grasshorn_0"); - recipeLeafHorn = path("grasshorn_1"); - recipeSnowHorn = path("grasshorn_2"); + recipeGrassHorn = ModItems.grassHorn.getRegistryName(); + recipeLeafHorn = ModItems.leavesHorn.getRegistryName(); + recipeSnowHorn = ModItems.snowHorn.getRegistryName(); recipeTerraSword = ModItems.terraSword.getRegistryName(); recipeTerraPick = ModItems.terraPick.getRegistryName(); recipeWaterRod = ModItems.waterRod.getRegistryName(); diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index 15f199656..378bd5ede 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -16,7 +16,7 @@ public class FlattenItems implements IFixableData { static { LOOKUP.put("botania:manaresource", i -> { - if (i == 10) { + if(i == 10) { // support ancient prismarine from 1.7 return "minecraft:prismarine_shard"; } else { @@ -24,7 +24,7 @@ public class FlattenItems implements IFixableData { } }); LOOKUP.put("botania:vial", i -> { - if (i == 1) { + if(i == 1) { return LibMisc.MOD_ID + ":" + LibItemNames.FLASK; } else { return LibMisc.MOD_ID + ":" + LibItemNames.VIAL; @@ -38,6 +38,15 @@ public class FlattenItems implements IFixableData { return LibMisc.MOD_ID + ":" + LibItemNames.THORN_CHAKRAM; } }); + LOOKUP.put("botania:grasshorn", i -> { + switch (i) { + case 0: + default: + return LibMisc.MOD_ID + ":" + LibItemNames.GRASS_HORN; + case 1: return LibMisc.MOD_ID + ":" + LibItemNames.LEAVES_HORN; + case 2: return LibMisc.MOD_ID + ":" + LibItemNames.SNOW_HORN; + } + }); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemHorn.java similarity index 75% rename from src/main/java/vazkii/botania/common/item/ItemGrassHorn.java rename to src/main/java/vazkii/botania/common/item/ItemHorn.java index b1787cbd9..0f6e2a89f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemHorn.java @@ -46,38 +46,14 @@ import java.util.List; import java.util.Locale; import java.util.Random; -public class ItemGrassHorn extends ItemMod { - - private static final int SUBTYPES = 3; - - public ItemGrassHorn() { - super(LibItemNames.GRASS_HORN); +public class ItemHorn extends ItemMod { + public ItemHorn(String name) { + super(name); setMaxStackSize(1); - setHasSubtypes(true); addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "vuvuzela"), (stack, worldIn, entityIn) -> stack.getDisplayName().toLowerCase(Locale.ROOT).contains("vuvuzela") ? 1 : 0); } - @Override - public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList list) { - if(isInCreativeTab(tab)) { - for(int i = 0; i < SUBTYPES; i++) - list.add(new ItemStack(this, 1, i)); - } - } - - @Nonnull - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerItemAppendMeta(this, 3, LibItemNames.GRASS_HORN); - } - @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { @@ -100,31 +76,39 @@ public class ItemGrassHorn extends ItemMod { public void onUsingTick(ItemStack stack, EntityLivingBase player, int time) { if(!player.world.isRemote) { if(time != getMaxItemUseDuration(stack) && time % 5 == 0) - breakGrass(player.world, stack, stack.getItemDamage(), new BlockPos(player)); + breakGrass(player.world, stack, new BlockPos(player)); player.world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.BLOCK_NOTE_BASS, SoundCategory.BLOCKS, 1F, 0.001F); } } - public static void breakGrass(World world, ItemStack stack, int stackDmg, BlockPos srcPos) { - EnumHornType type = EnumHornType.getTypeForMeta(stackDmg); + public static void breakGrass(World world, ItemStack stack, BlockPos srcPos) { + EnumHornType type = null; + if (stack.getItem() == ModItems.grassHorn) { + type = EnumHornType.WILD; + } else if (stack.getItem() == ModItems.leavesHorn) { + type = EnumHornType.CANOPY; + } else if (stack.getItem() == ModItems.snowHorn) { + type = EnumHornType.COVERING; + } + Random rand = new Random(srcPos.hashCode()); - int range = 12 - stackDmg * 3; - int rangeY = 3 + stackDmg * 4; + int range = 12 - type.ordinal() * 3; + int rangeY = 3 + type.ordinal() * 4; List coords = new ArrayList<>(); for(BlockPos pos : BlockPos.getAllInBox(srcPos.add(-range, -rangeY, -range), srcPos.add(range, rangeY, range))) { Block block = world.getBlockState(pos).getBlock(); if(block instanceof IHornHarvestable ? ((IHornHarvestable) block).canHornHarvest(world, pos, stack, type) - : stackDmg == 0 && block instanceof BlockBush && !(block instanceof ISpecialFlower) - || stackDmg == 1 && block.isLeaves(world.getBlockState(pos), world, pos) - || stackDmg == 2 && block == Blocks.SNOW_LAYER) + : type == EnumHornType.WILD && block instanceof BlockBush && !(block instanceof ISpecialFlower) + || type == EnumHornType.CANOPY && block.isLeaves(world.getBlockState(pos), world, pos) + || type == EnumHornType.COVERING && block == Blocks.SNOW_LAYER) coords.add(pos); } Collections.shuffle(coords, rand); - int count = Math.min(coords.size(), 32 + stackDmg * 16); + int count = Math.min(coords.size(), 32 + type.ordinal() * 16); for(int i = 0; i < count; i++) { BlockPos currCoords = coords.get(i); IBlockState state = world.getBlockState(currCoords); diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index b0db882e8..7f0abd992 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -135,7 +135,9 @@ public final class ModItems { public static final Item grassSeeds = new ItemGrassSeeds(); public static final Item dirtRod = new ItemDirtRod(); public static final Item terraformRod = new ItemTerraformRod(); - public static final Item grassHorn = new ItemGrassHorn(); + public static final Item grassHorn = new ItemHorn(LibItemNames.GRASS_HORN); + public static final Item leavesHorn = new ItemHorn(LibItemNames.LEAVES_HORN); + public static final Item snowHorn = new ItemHorn(LibItemNames.SNOW_HORN); public static final Item manaMirror = new ItemManaMirror(); public static final Item manasteelHelm = new ItemManasteelHelm(); public static final Item manasteelHelmRevealing = new ItemManasteelHelmRevealing(); @@ -322,6 +324,8 @@ public final class ModItems { r.register(dirtRod); r.register(terraformRod); r.register(grassHorn); + r.register(leavesHorn); + r.register(snowHorn); r.register(manaMirror); r.register(manasteelHelm); r.register(manasteelHelmRevealing); diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index ec95af8b9..66959ea2b 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -38,7 +38,9 @@ public final class LibItemNames { public static final String MANASTEEL_AXE = "manasteelAxe"; public static final String MANASTEEL_SWORD = "manasteelSword"; public static final String MANASTEEL_SHEARS = "manasteelShears"; - public static final String GRASS_HORN = "grassHorn"; + public static final String GRASS_HORN = "horn_grass"; + public static final String LEAVES_HORN = "horn_leaves"; + public static final String SNOW_HORN = "horn_snow"; public static final String TERRASTEEL_HELM = "terrasteelHelm"; public static final String TERRASTEEL_CHEST = "terrasteelChest"; public static final String TERRASTEEL_LEGS = "terrasteelLegs"; diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index 0ac9fd2be..5a56d8439 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -1391,9 +1391,9 @@ item.botania:manasteelShovel.name=Manasteel Shovel item.botania:manasteelAxe.name=Manasteel Axe item.botania:manasteelSword.name=Manasteel Sword item.botania:manasteelShears.name=Manasteel Shears -item.botania:grassHorn0.name=Horn of the Wild -item.botania:grassHorn1.name=Horn of the Canopy -item.botania:grassHorn2.name=Horn of the Covering +item.botania:horn_grass.name=Horn of the Wild +item.botania:horn_leaves.name=Horn of the Canopy +item.botania:horn_snow.name=Horn of the Covering item.botania:terrasteel_ingot.name=Terrasteel Ingot item.botania:terrasteelHelm.name=Terrasteel Helmet item.botania:terrasteelChest.name=Terrasteel Chestplate diff --git a/src/main/resources/assets/botania/lang/es_es.lang b/src/main/resources/assets/botania/lang/es_es.lang index d46e9a798..d38d71524 100644 --- a/src/main/resources/assets/botania/lang/es_es.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -1151,9 +1151,9 @@ item.botania:manasteelShovel.name=Pala de manacero item.botania:manasteelAxe.name=Hacha de manacero item.botania:manasteelSword.name=Espada manacero item.botania:manasteelShears.name=Tijera de manacero -item.botania:grassHorn0.name=Cuerno de lo salvaje -item.botania:grassHorn1.name=Cuerno del follaje -item.botania:grassHorn2.name=Cuerno de capa +item.botania:horn_grass.name=Cuerno de lo salvaje +item.botania:horn_leaves.name=Cuerno del follaje +item.botania:horn_snow.name=Cuerno de capa item.botania:terrasteel_ingot.name=Lingote de terracero item.botania:terrasteelHelm.name=Casco de terracero item.botania:terrasteelChest.name=Peto de terracero diff --git a/src/main/resources/assets/botania/lang/fr_fr.lang b/src/main/resources/assets/botania/lang/fr_fr.lang index 5a45fa0e5..a2a0aa91a 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -1013,9 +1013,9 @@ item.botania:manasteelShovel.name=Pelle en manacier item.botania:manasteelAxe.name=hache en manacier item.botania:manasteelSword.name=Épée en manacier item.botania:manasteelShears.name=Cisailles en manacier -item.botania:grassHorn0.name=Corne du sauvage -item.botania:grassHorn1.name=Corne de la canopée -item.botania:grassHorn2.name=Corne de la couverture +item.botania:horn_grass.name=Corne du sauvage +item.botania:horn_leaves.name=Corne de la canopée +item.botania:horn_snow.name=Corne de la couverture item.botania:terrasteel_ingot.name=Lingot de terracier item.botania:terrasteelHelm.name=Casque de terracier item.botania:terrasteelChest.name=Plastron de terracier diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index d9c2117dc..a0ec5841e 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -1176,9 +1176,9 @@ item.botania:manasteelShovel.name=マナスチールのシャベル item.botania:manasteelAxe.name=マナスチールの斧 item.botania:manasteelSword.name=マナスチールの剣 item.botania:manasteelShears.name=マナスチールのハサミ -item.botania:grassHorn0.name=野生のホルン -item.botania:grassHorn1.name=天蓋のホルン -item.botania:grassHorn2.name=外被のホルン +item.botania:horn_grass.name=野生のホルン +item.botania:horn_leaves.name=天蓋のホルン +item.botania:horn_snow.name=外被のホルン item.botania:terrasteel_ingot.name=テラスチールインゴット item.botania:terrasteelHelm.name=テラスチールのヘルメット item.botania:terrasteelChest.name=テラスチールのチェスト diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index 5670e7419..682b8db8e 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -1112,9 +1112,9 @@ item.botania:manasteelShovel.name=마나합금 삽 item.botania:manasteelAxe.name=마나합금 도끼 item.botania:manasteelSword.name=마나합금 검 item.botania:manasteelShears.name=마나합금 가위 -item.botania:grassHorn0.name=야생의 혼 -item.botania:grassHorn1.name=캐노피의 혼 -item.botania:grassHorn2.name=외피의 혼 +item.botania:horn_grass.name=야생의 혼 +item.botania:horn_leaves.name=캐노피의 혼 +item.botania:horn_snow.name=외피의 혼 item.botania:terrasteel_ingot.name=테라스틸 주괴 item.botania:terrasteelHelm.name=테라스틸 투구 item.botania:terrasteelChest.name=테라스틸 갑옷 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index 63676754a..014596d1e 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -1244,9 +1244,9 @@ item.botania:manasteelShovel.name=Manastaal Schep item.botania:manasteelAxe.name=Manastaal Bijl item.botania:manasteelSword.name=Manastaal Zwaard item.botania:manasteelShears.name=Manastaal Schaar -item.botania:grassHorn0.name=Hoorn van het Wild -item.botania:grassHorn1.name=Hoorn van de Troonhemel -item.botania:grassHorn2.name=Hoorn der Afdekking +item.botania:horn_grass.name=Hoorn van het Wild +item.botania:horn_leaves.name=Hoorn van de Troonhemel +item.botania:horn_snow.name=Hoorn der Afdekking item.botania:terrasteel_ingot.name=Staaf Terrastaal item.botania:terrasteelHelm.name=Terrastaal Helm item.botania:terrasteelChest.name=Terrastaal Borstplaat diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index f0f4515bd..8cc40b9a4 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -1394,9 +1394,9 @@ item.botania:manasteelShovel.name=Pá de Manasteel item.botania:manasteelAxe.name=Machado de Manasteel item.botania:manasteelSword.name=Espada de Manasteel item.botania:manasteelShears.name=Tesouras de Manasteel -item.botania:grassHorn0.name=Berrante da Selva -item.botania:grassHorn1.name=Berrante do Toldo -item.botania:grassHorn2.name=Berrante das Neves +item.botania:horn_grass.name=Berrante da Selva +item.botania:horn_leaves.name=Berrante do Toldo +item.botania:horn_snow.name=Berrante das Neves item.botania:terrasteel_ingot.name=Barra de Terrasteel item.botania:terrasteelHelm.name=Elmo de Terrasteel item.botania:terrasteelChest.name=Peitoral de Terrasteel diff --git a/src/main/resources/assets/botania/lang/ru_ru.lang b/src/main/resources/assets/botania/lang/ru_ru.lang index 0a95fadf2..a6c4f4449 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.lang +++ b/src/main/resources/assets/botania/lang/ru_ru.lang @@ -640,8 +640,8 @@ item.botania:manasteelShovel.name=Лопата из манастали item.botania:manasteelAxe.name=Топор из манастали item.botania:manasteelSword.name=Меч из манастали item.botania:manasteelShears.name=Ножницы из манастали -item.botania:grassHorn0.name=Рог дикой природы -item.botania:grassHorn1.name=Рог укрытия +item.botania:horn_grass.name=Рог дикой природы +item.botania:horn_leaves.name=Рог укрытия item.botania:terrasteel_ingot.name=Слиток террастали item.botania:terrasteelHelm.name=Шлем из террастали item.botania:terrasteelChest.name=Кираса из террастали diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index 488c1a6fe..47e444f06 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -1391,9 +1391,9 @@ item.botania:manasteelShovel.name=魔钢铲 item.botania:manasteelAxe.name=魔钢斧 item.botania:manasteelSword.name=魔钢剑 item.botania:manasteelShears.name=魔钢剪刀 -item.botania:grassHorn0.name=狂野号角 -item.botania:grassHorn1.name=林冠号角 -item.botania:grassHorn2.name=雪原号角 +item.botania:horn_grass.name=狂野号角 +item.botania:horn_leaves.name=林冠号角 +item.botania:horn_snow.name=雪原号角 item.botania:terrasteel_ingot.name=泰拉钢锭 item.botania:terrasteelHelm.name=泰拉钢头盔 item.botania:terrasteelChest.name=泰拉钢胸甲 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index 5dbf67f77..510e72179 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -1357,9 +1357,9 @@ item.botania:manasteelShovel.name=魔鋼鏟 item.botania:manasteelAxe.name=魔鋼斧 item.botania:manasteelSword.name=魔鋼劍 item.botania:manasteelShears.name=魔鋼剪刀 -item.botania:grassHorn0.name=狂野號角 -item.botania:grassHorn1.name=林冠號角 -item.botania:grassHorn2.name=雪原號角 +item.botania:horn_grass.name=狂野號角 +item.botania:horn_leaves.name=林冠號角 +item.botania:horn_snow.name=雪原號角 item.botania:terrasteel_ingot.name=泰拉鋼錠 item.botania:terrasteelHelm.name=泰拉鋼頭盔 item.botania:terrasteelChest.name=泰拉鋼胸甲 diff --git a/src/main/resources/assets/botania/models/item/grasshorn0.json b/src/main/resources/assets/botania/models/item/horn_grass.json similarity index 100% rename from src/main/resources/assets/botania/models/item/grasshorn0.json rename to src/main/resources/assets/botania/models/item/horn_grass.json diff --git a/src/main/resources/assets/botania/models/item/grasshorn1.json b/src/main/resources/assets/botania/models/item/horn_leaves.json similarity index 100% rename from src/main/resources/assets/botania/models/item/grasshorn1.json rename to src/main/resources/assets/botania/models/item/horn_leaves.json diff --git a/src/main/resources/assets/botania/models/item/grasshorn2.json b/src/main/resources/assets/botania/models/item/horn_snow.json similarity index 100% rename from src/main/resources/assets/botania/models/item/grasshorn2.json rename to src/main/resources/assets/botania/models/item/horn_snow.json diff --git a/src/main/resources/assets/botania/recipes/forestdrum_0.json b/src/main/resources/assets/botania/recipes/forestdrum_0.json index d64f39dd7..baf1034c9 100644 --- a/src/main/resources/assets/botania/recipes/forestdrum_0.json +++ b/src/main/resources/assets/botania/recipes/forestdrum_0.json @@ -14,8 +14,7 @@ "item": "#LIVINGWOOD" }, "H": { - "item": "botania:grasshorn", - "data": 0 + "item": "botania:horn_grass" }, "L": { "item": "minecraft:leather" diff --git a/src/main/resources/assets/botania/recipes/forestdrum_2.json b/src/main/resources/assets/botania/recipes/forestdrum_2.json index 496706327..fd26f04cf 100644 --- a/src/main/resources/assets/botania/recipes/forestdrum_2.json +++ b/src/main/resources/assets/botania/recipes/forestdrum_2.json @@ -14,8 +14,7 @@ "item": "#LIVINGWOOD" }, "H": { - "item": "botania:grasshorn", - "data": 1 + "item": "botania:horn_leaves" }, "L": { "item": "minecraft:leather" diff --git a/src/main/resources/assets/botania/recipes/grasshorn_0.json b/src/main/resources/assets/botania/recipes/horn_grass.json similarity index 83% rename from src/main/resources/assets/botania/recipes/grasshorn_0.json rename to src/main/resources/assets/botania/recipes/horn_grass.json index 0e61c74cc..b08616423 100644 --- a/src/main/resources/assets/botania/recipes/grasshorn_0.json +++ b/src/main/resources/assets/botania/recipes/horn_grass.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:grasshorn", - "data": 0 + "item": "botania:horn_grass" }, "pattern": [ " W ", diff --git a/src/main/resources/assets/botania/recipes/grasshorn_1.json b/src/main/resources/assets/botania/recipes/horn_leaves.json similarity index 57% rename from src/main/resources/assets/botania/recipes/grasshorn_1.json rename to src/main/resources/assets/botania/recipes/horn_leaves.json index 3127e8fbd..08fdf16fb 100644 --- a/src/main/resources/assets/botania/recipes/grasshorn_1.json +++ b/src/main/resources/assets/botania/recipes/horn_leaves.json @@ -1,12 +1,10 @@ { "result": { - "item": "botania:grasshorn", - "data": 1 + "item": "botania:horn_leaves" }, "ingredients": [ { - "item": "botania:grasshorn", - "data": 0 + "item": "botania:horn_grass" }, { "item": "#TREELEAVES" diff --git a/src/main/resources/assets/botania/recipes/grasshorn_2.json b/src/main/resources/assets/botania/recipes/horn_snow.json similarity index 60% rename from src/main/resources/assets/botania/recipes/grasshorn_2.json rename to src/main/resources/assets/botania/recipes/horn_snow.json index a45281771..70f8e5e36 100644 --- a/src/main/resources/assets/botania/recipes/grasshorn_2.json +++ b/src/main/resources/assets/botania/recipes/horn_snow.json @@ -1,12 +1,10 @@ { "result": { - "item": "botania:grasshorn", - "data": 2 + "item": "botania:horn_snow" }, "ingredients": [ { - "item": "botania:grasshorn", - "data": 0 + "item": "botania:horn_grass" }, { "item": "minecraft:snowball"