From b37764bd3077982649672a4472dd22fade194d4c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 19 Dec 2017 10:42:56 -0600 Subject: [PATCH] Flatten seeds --- .../common/core/BotaniaCreativeTab.java | 8 + .../common/crafting/ModCraftingRecipes.java | 2 +- .../crafting/ModManaInfusionRecipes.java | 6 +- .../botania/common/fixers/FlattenItems.java | 37 ++-- .../botania/common/item/ItemGrassSeeds.java | 167 ++++++------------ .../vazkii/botania/common/item/ModItems.java | 21 ++- .../botania/common/lib/LibItemNames.java | 2 +- .../resources/assets/botania/lang/de_de.lang | 6 +- .../resources/assets/botania/lang/en_us.lang | 18 +- .../resources/assets/botania/lang/es_es.lang | 6 +- .../resources/assets/botania/lang/fr_fr.lang | 6 +- .../resources/assets/botania/lang/ja_jp.lang | 18 +- .../resources/assets/botania/lang/ko_kr.lang | 6 +- .../resources/assets/botania/lang/nl_nl.lang | 6 +- .../resources/assets/botania/lang/pt_br.lang | 18 +- .../resources/assets/botania/lang/ru_ru.lang | 6 +- .../resources/assets/botania/lang/zh_cn.lang | 18 +- .../resources/assets/botania/lang/zh_tw.lang | 18 +- .../item/{grassseeds3.json => seeds_dry.json} | 0 .../{grassseeds4.json => seeds_golden.json} | 0 .../{grassseeds0.json => seeds_grass.json} | 0 .../{grassseeds7.json => seeds_infused.json} | 0 .../{grassseeds8.json => seeds_mutated.json} | 0 .../{grassseeds2.json => seeds_mycel.json} | 0 .../{grassseeds1.json => seeds_podzol.json} | 0 .../{grassseeds6.json => seeds_scorched.json} | 0 .../{grassseeds5.json => seeds_vivid.json} | 0 .../assets/botania/recipes/horn_grass.json | 3 +- .../assets/botania/recipes/miniisland_0.json | 3 +- .../assets/botania/recipes/miniisland_1.json | 3 +- .../assets/botania/recipes/miniisland_10.json | 3 +- .../assets/botania/recipes/miniisland_11.json | 3 +- .../assets/botania/recipes/miniisland_12.json | 3 +- .../assets/botania/recipes/miniisland_13.json | 3 +- .../assets/botania/recipes/miniisland_14.json | 3 +- .../assets/botania/recipes/miniisland_15.json | 3 +- .../assets/botania/recipes/miniisland_2.json | 3 +- .../assets/botania/recipes/miniisland_3.json | 3 +- .../assets/botania/recipes/miniisland_4.json | 3 +- .../assets/botania/recipes/miniisland_5.json | 3 +- .../assets/botania/recipes/miniisland_6.json | 3 +- .../assets/botania/recipes/miniisland_7.json | 3 +- .../assets/botania/recipes/miniisland_8.json | 3 +- .../assets/botania/recipes/miniisland_9.json | 3 +- .../{grassseeds_3.json => seeds_dry.json} | 8 +- .../{grassseeds_4.json => seeds_golden.json} | 8 +- .../{grassseeds_7.json => seeds_infused.json} | 8 +- .../{grassseeds_8.json => seeds_mutated.json} | 8 +- ...{grassseeds_6.json => seeds_scorched.json} | 8 +- .../{grassseeds_5.json => seeds_vivid.json} | 8 +- .../assets/botania/recipes/speedupbelt.json | 3 +- .../assets/botania/recipes/terraformrod.json | 3 +- 52 files changed, 217 insertions(+), 257 deletions(-) rename src/main/resources/assets/botania/models/item/{grassseeds3.json => seeds_dry.json} (100%) rename src/main/resources/assets/botania/models/item/{grassseeds4.json => seeds_golden.json} (100%) rename src/main/resources/assets/botania/models/item/{grassseeds0.json => seeds_grass.json} (100%) rename src/main/resources/assets/botania/models/item/{grassseeds7.json => seeds_infused.json} (100%) rename src/main/resources/assets/botania/models/item/{grassseeds8.json => seeds_mutated.json} (100%) rename src/main/resources/assets/botania/models/item/{grassseeds2.json => seeds_mycel.json} (100%) rename src/main/resources/assets/botania/models/item/{grassseeds1.json => seeds_podzol.json} (100%) rename src/main/resources/assets/botania/models/item/{grassseeds6.json => seeds_scorched.json} (100%) rename src/main/resources/assets/botania/models/item/{grassseeds5.json => seeds_vivid.json} (100%) rename src/main/resources/assets/botania/recipes/{grassseeds_3.json => seeds_dry.json} (52%) rename src/main/resources/assets/botania/recipes/{grassseeds_4.json => seeds_golden.json} (51%) rename src/main/resources/assets/botania/recipes/{grassseeds_7.json => seeds_infused.json} (53%) rename src/main/resources/assets/botania/recipes/{grassseeds_8.json => seeds_mutated.json} (52%) rename src/main/resources/assets/botania/recipes/{grassseeds_6.json => seeds_scorched.json} (53%) rename src/main/resources/assets/botania/recipes/{grassseeds_5.json => seeds_vivid.json} (54%) diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 6f93328bb..a62221f9b 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -122,6 +122,14 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.overgrowthSeed); addBlock(ModBlocks.enchantedSoil); addItem(ModItems.grassSeeds); + addItem(ModItems.podzolSeeds); + addItem(ModItems.mycelSeeds); + addItem(ModItems.drySeeds); + addItem(ModItems.goldenSeeds); + addItem(ModItems.vividSeeds); + addItem(ModItems.scorchedSeeds); + addItem(ModItems.infusedSeeds); + addItem(ModItems.mutatedSeeds); addBlock(ModBlocks.altGrass); if(Botania.thaumcraftLoaded) addItem(ModItems.manaInkwell); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index c8c0c25d5..d66974893 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -516,7 +516,7 @@ public final class ModCraftingRecipes { recipeFelPumpkin = ModBlocks.felPumpkin.getRegistryName(); recipeAnimatedTorch = ModBlocks.animatedTorch.getRegistryName(); recipeManaBlaster = ModItems.manaGun.getRegistryName(); - recipesAltGrassSeeds = allOfGroup(ModItems.grassSeeds.getRegistryName()); + recipesAltGrassSeeds = allOfGroup(new ResourceLocation(LibMisc.MOD_ID, LibItemNames.GRASS_SEEDS)); recipeDirtRod = ModItems.dirtRod.getRegistryName(); recipeTerraformRod = ModItems.terraformRod.getRegistryName(); recipeManasteelPick = ModItems.manasteelPick.getRegistryName(); diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index 7a8ca52c5..b427e034a 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -65,11 +65,11 @@ public final class ModManaInfusionRecipes { pistonRelayRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.pistonRelay), new ItemStack(Blocks.PISTON), 15000); manaCookieRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaCookie), new ItemStack(Items.COOKIE), 20000); grassSeedsRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.grassSeeds), new ItemStack(Blocks.TALLGRASS, 1, 1), 2500); - podzolSeedsRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.grassSeeds, 1, 1), new ItemStack(Blocks.DEADBUSH), 2500); + podzolSeedsRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.podzolSeeds), new ItemStack(Blocks.DEADBUSH), 2500); mycelSeedsRecipes = new ArrayList<>(); - mycelSeedsRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.grassSeeds, 1, 2), new ItemStack(Blocks.RED_MUSHROOM), 6500)); - mycelSeedsRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.grassSeeds, 1, 2), new ItemStack(Blocks.BROWN_MUSHROOM), 6500)); + mycelSeedsRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.mycelSeeds), new ItemStack(Blocks.RED_MUSHROOM), 6500)); + mycelSeedsRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.mycelSeeds), new ItemStack(Blocks.BROWN_MUSHROOM), 6500)); manaQuartzRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaQuartz), new ItemStack(Items.QUARTZ), 250); tinyPotatoRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.tinyPotato), new ItemStack(Items.POTATO), 1337); diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index ec73d6d15..8a29abf09 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -3,6 +3,7 @@ package vazkii.botania.common.fixers; import net.minecraft.item.EnumDyeColor; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.datafix.IFixableData; +import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; @@ -26,42 +27,56 @@ public class FlattenItems implements IFixableData { }); LOOKUP.put("botania:vial", i -> { if(i == 1) { - return LibMisc.MOD_ID + ":" + LibItemNames.FLASK; + return ModItems.flask.getRegistryName().toString(); } else { - return LibMisc.MOD_ID + ":" + LibItemNames.VIAL; + return ModItems.vial.getRegistryName().toString(); } }); LOOKUP.put("botania:quartz", i -> LibMisc.MOD_ID + ":" + LibItemNames.QUARTZ_NAMES[i % LibItemNames.QUARTZ_NAMES.length]); LOOKUP.put("botania:thornchakram", i -> { if(i == 1) { - return LibMisc.MOD_ID + ":" + LibItemNames.FLARE_CHAKRAM; + return ModItems.flareChakram.getRegistryName().toString(); } else { - return LibMisc.MOD_ID + ":" + LibItemNames.THORN_CHAKRAM; + return ModItems.thornChakram.getRegistryName().toString(); } }); 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; + return ModItems.grassHorn.getRegistryName().toString(); + case 1: return ModItems.leavesHorn.getRegistryName().toString(); + case 2: return ModItems.snowHorn.getRegistryName().toString(); } }); LOOKUP.put("botania:lens", i -> LibMisc.MOD_ID + ":" + LibItemNames.LENS_NAMES[i % LibItemNames.LENS_NAMES.length]); LOOKUP.put("botania:dye", i -> { EnumDyeColor color = EnumDyeColor.byMetadata(i); - return LibMisc.MOD_ID + ":" + LibItemNames.DYE + "_" + color.getName(); + return ModItems.dyes.get(color).getRegistryName().toString(); }); LOOKUP.put("botania:petal", i -> { EnumDyeColor color = EnumDyeColor.byMetadata(i); - return LibMisc.MOD_ID + ":" + LibItemNames.PETAL + "_" + color.getName(); + return ModItems.petals.get(color).getRegistryName().toString(); }); LOOKUP.put("botania:virus", i -> { if (i == 1) { - return LibMisc.MOD_ID + ":" + LibItemNames.NULL_VIRUS; + return ModItems.nullVirus.getRegistryName().toString(); } else { - return LibMisc.MOD_ID + ":" + LibItemNames.NECRO_VIRUS; + return ModItems.necroVirus.getRegistryName().toString(); + } + }); + LOOKUP.put("botania:grassseeds", i -> { + switch(i) { + default: + case 0: return ModItems.grassSeeds.getRegistryName().toString(); + case 1: return ModItems.podzolSeeds.getRegistryName().toString(); + case 2: return ModItems.mycelSeeds.getRegistryName().toString(); + case 3: return ModItems.drySeeds.getRegistryName().toString(); + case 4: return ModItems.goldenSeeds.getRegistryName().toString(); + case 5: return ModItems.vividSeeds.getRegistryName().toString(); + case 6: return ModItems.scorchedSeeds.getRegistryName().toString(); + case 7: return ModItems.infusedSeeds.getRegistryName().toString(); + case 8: return ModItems.mutatedSeeds.getRegistryName().toString(); } }); } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 7ee53046d..de64bf1d5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item; +import com.google.common.collect.ImmutableMap; import gnu.trove.map.hash.TIntObjectHashMap; import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; @@ -25,6 +26,7 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; @@ -37,49 +39,42 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.util.Locale; +import java.util.Map; import java.util.Random; import java.util.Set; +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { - /** * Represents a map of dimension IDs to a set of all block swappers * active in that dimension. */ private static final TIntObjectHashMap> blockSwappers = new TIntObjectHashMap<>(); + private static final Map COLORS = ImmutableMap.builder() + .put(IslandType.GRASS, new float[] {0F, 0.4F, 0F}) + .put(IslandType.PODZOL, new float[] {0.5F, 0.37F, 0F}) + .put(IslandType.MYCEL, new float[] {0.27F, 0F, 0.33F}) + .put(IslandType.DRY, new float[] {0.4F, 0.5F, 0.05F}) + .put(IslandType.GOLDEN, new float[] {0.75F, 0.7F, 0F}) + .put(IslandType.VIVID, new float[] {0F, 0.5F, 0.1F}) + .put(IslandType.SCORCHED, new float[] {0.75F, 0F, 0F}) + .put(IslandType.INFUSED, new float[] {0F, 0.55F, 0.55F}) + .put(IslandType.MUTATED, new float[] {0.4F, 0.1F, 0.4F}) + .build(); - private static final IslandType[] ISLAND_TYPES = { - IslandType.GRASS, IslandType.PODZOL, IslandType.MYCEL, - IslandType.DRY, IslandType.GOLDEN, IslandType.VIVID, - IslandType.SCORCHED, IslandType.INFUSED, IslandType.MUTATED - }; + private final IslandType type; - private static final int SUBTYPES = 9; - - public ItemGrassSeeds() { - super(LibItemNames.GRASS_SEEDS); - setHasSubtypes(true); - MinecraftForge.EVENT_BUS.register(this); - } - - @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 stack) { - return super.getUnlocalizedName() + stack.getItemDamage(); + public ItemGrassSeeds(IslandType type) { + super(LibItemNames.GRASS_SEEDS + "_" + type.toString().toLowerCase(Locale.ROOT)); + this.type = type; } @Nonnull @@ -88,73 +83,27 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { IBlockState state = world.getBlockState(pos); ItemStack stack = player.getHeldItem(hand); - if(state.getBlock() == Blocks.DIRT && state.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT || state.getBlock() == Blocks.GRASS && stack.getItemDamage() != 0) { - int meta = stack.getItemDamage(); - + if(state.getBlock() == Blocks.DIRT && state.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT || state.getBlock() == Blocks.GRASS && type != IslandType.GRASS) { if(!world.isRemote) { - BlockSwapper swapper = addBlockSwapper(world, pos, meta); - world.setBlockState(pos, swapper.stateToSet, 1 | 2); + BlockSwapper swapper = addBlockSwapper(world, pos, type); + world.setBlockState(pos, swapper.stateToSet); stack.shrink(1); } else { + float r = 0F; + float g = 0.4F; + float b = 0F; + + if(COLORS.containsKey(type)) { + float[] colors = COLORS.get(type); + r = colors[0]; + g = colors[1]; + b = colors[2]; + } + for(int i = 0; i < 50; i++) { double x = (Math.random() - 0.5) * 3; double y = Math.random() - 0.5 + 1; double z = (Math.random() - 0.5) * 3; - - float r = 0F; - float g = 0.4F; - float b = 0F; - switch(meta) { - case 1: { - r = 0.5F; - g = 0.37F; - b = 0F; - break; - } - case 2: { - r = 0.27F; - g = 0F; - b = 0.33F; - break; - } - case 3: { - r = 0.4F; - g = 0.5F; - b = 0.05F; - break; - } - case 4: { - r = 0.75F; - g = 0.7F; - b = 0F; - break; - } - case 5: { - r = 0F; - g = 0.5F; - b = 0.1F; - break; - } - case 6: { - r = 0.75F; - g = 0F; - b = 0F; - break; - } - case 7: { - r = 0F; - g = 0.55F; - b = 0.55F; - break; - } - case 8: { - r = 0.4F; - g = 0.1F; - b = 0.4F; - break; - } - } - float velMul = 0.025F; Botania.proxy.wispFX(pos.getX() + 0.5 + x, pos.getY() + 0.5 + y, pos.getZ() + 0.5 + z, r, g, b, (float) Math.random() * 0.15F + 0.15F, (float) -x * velMul, (float) -y * velMul, (float) -z * velMul); @@ -167,14 +116,8 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { return EnumActionResult.PASS; } - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerItemAppendMeta(this, 9, LibItemNames.GRASS_SEEDS); - } - @SubscribeEvent - public void onTickEnd(TickEvent.WorldTickEvent event) { + public static void onTickEnd(TickEvent.WorldTickEvent event) { // Block swapper updates should only occur on the server if(event.world.isRemote) return; @@ -205,11 +148,11 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { * the provided information but is not ticked. * @param world The world the swapper will be in. * @param pos The position of the swapper. - * @param meta The meta value representing the type of block being swapped. + * @param type The IslandType of the grass seed * @return The created block swapper. */ - private static BlockSwapper addBlockSwapper(World world, BlockPos pos, int meta) { - BlockSwapper swapper = swapperFromMeta(world, pos, meta); + private static BlockSwapper addBlockSwapper(World world, BlockPos pos, IslandType type) { + BlockSwapper swapper = new BlockSwapper(world, pos, stateForType(type)); // If a set for the dimension doesn't exist, create it. int dim = world.provider.getDimension(); @@ -222,18 +165,24 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { return swapper; } - private static BlockSwapper swapperFromMeta(World world, BlockPos pos, int meta) { - switch(meta) { - case 1 : return new BlockSwapper(world, pos, Blocks.DIRT.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.PODZOL)); - case 2 : return new BlockSwapper(world, pos, Blocks.MYCELIUM.getDefaultState()); - case 3 : return new BlockSwapper(world, pos, ModBlocks.altGrass.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.DRY)); - case 4 : return new BlockSwapper(world, pos, ModBlocks.altGrass.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.GOLDEN)); - case 5 : return new BlockSwapper(world, pos, ModBlocks.altGrass.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.VIVID)); - case 6 : return new BlockSwapper(world, pos, ModBlocks.altGrass.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.SCORCHED)); - case 7 : return new BlockSwapper(world, pos, ModBlocks.altGrass.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.INFUSED)); - case 8 : return new BlockSwapper(world, pos, ModBlocks.altGrass.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.MUTATED)); - default : return new BlockSwapper(world, pos, Blocks.GRASS.getDefaultState()); - } + private static IBlockState stateForType(IslandType type) { + if(type == IslandType.PODZOL) + return Blocks.DIRT.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.PODZOL); + else if(type == IslandType.MYCEL) + return Blocks.MYCELIUM.getDefaultState(); + else if(type == IslandType.DRY) + return ModBlocks.altGrass.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.DRY); + else if(type == IslandType.GOLDEN) + return ModBlocks.altGrass.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.GOLDEN); + else if(type == IslandType.VIVID) + return ModBlocks.altGrass.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.VIVID); + else if(type == IslandType.SCORCHED) + return ModBlocks.altGrass.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.SCORCHED); + else if(type == IslandType.INFUSED) + return ModBlocks.altGrass.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.INFUSED); + else if(type == IslandType.MUTATED) + return ModBlocks.altGrass.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.MUTATED); + else return Blocks.GRASS.getDefaultState(); } /** @@ -346,7 +295,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { @Override public IslandType getIslandType(ItemStack stack) { - return ISLAND_TYPES[Math.min(stack.getItemDamage(), ISLAND_TYPES.length - 1)]; + return type; } } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 998f54a5c..5347f4e24 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -21,6 +21,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.registries.IForgeRegistry; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.common.item.brew.ItemBrewFlask; import vazkii.botania.common.item.brew.ItemBrewVial; import vazkii.botania.common.item.brew.ItemIncenseStick; @@ -170,7 +171,17 @@ public final class ModItems { public static final Item manaGun = new ItemManaGun(); public static final Item manaCookie = new ItemManaCookie(); public static final Item fertilizer = new ItemFertilizer(); - public static final Item grassSeeds = new ItemGrassSeeds(); + + public static final Item grassSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.GRASS); + public static final Item podzolSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.PODZOL); + public static final Item mycelSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.MYCEL); + public static final Item drySeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.DRY); + public static final Item goldenSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.GOLDEN); + public static final Item vividSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.VIVID); + public static final Item scorchedSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.SCORCHED); + public static final Item infusedSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.INFUSED); + public static final Item mutatedSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.MUTATED); + public static final Item dirtRod = new ItemDirtRod(); public static final Item terraformRod = new ItemTerraformRod(); public static final Item grassHorn = new ItemHorn(LibItemNames.GRASS_HORN); @@ -384,6 +395,14 @@ public final class ModItems { r.register(manaCookie); r.register(fertilizer); r.register(grassSeeds); + r.register(podzolSeeds); + r.register(mycelSeeds); + r.register(drySeeds); + r.register(goldenSeeds); + r.register(vividSeeds); + r.register(scorchedSeeds); + r.register(infusedSeeds); + r.register(mutatedSeeds); r.register(dirtRod); r.register(terraformRod); r.register(grassHorn); diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 5de70b953..8aa717666 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -22,7 +22,7 @@ public final class LibItemNames { public static final String MANA_GUN = "manaGun"; public static final String MANA_COOKIE = "manaCookie"; public static final String FERTILIZER = "fertilizer"; - public static final String GRASS_SEEDS = "grassSeeds"; + public static final String GRASS_SEEDS = "seeds"; public static final String DIRT_ROD = "dirtRod"; public static final String TERRAFORM_ROD = "terraformRod"; public static final String MANA_MIRROR = "manaMirror"; diff --git a/src/main/resources/assets/botania/lang/de_de.lang b/src/main/resources/assets/botania/lang/de_de.lang index 36cdcce88..c2376af50 100644 --- a/src/main/resources/assets/botania/lang/de_de.lang +++ b/src/main/resources/assets/botania/lang/de_de.lang @@ -351,9 +351,9 @@ item.botania:manaGun.name=Mana-Blaster item.botania:compositeLens.name=Verbundmanalinse: %s %s item.botania:manaCookie.name=Manakeks item.botania:fertilizer.name=Blumendünger -item.botania:grassSeeds0.name=Weidesamen -item.botania:grassSeeds1.name=Boreale Samen -item.botania:grassSeeds2.name=Seuchensamen +item.botania:seeds_grass.name=Weidesamen +item.botania:seeds_podzol.name=Boreale Samen +item.botania:seeds_mycel.name=Seuchensamen item.botania:livingwood_twig.name=Lebeholzzweig item.botania:dirtRod.name=Stab der Böden item.botania:terraformRod.name=Terrafirmastab diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index 4abc72be1..7c666d43a 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -1369,15 +1369,15 @@ item.botania:manaGun.name=Mana Blaster item.botania:compositeLens.name=Composite Mana Lens: %s %s item.botania:manaCookie.name=Biscuit of Totality item.botania:fertilizer.name=Floral Fertilizer -item.botania:grassSeeds0.name=Pasture Seeds -item.botania:grassSeeds1.name=Boreal Seeds -item.botania:grassSeeds2.name=Infestation Spores -item.botania:grassSeeds3.name=Dry Pasture Seeds -item.botania:grassSeeds4.name=Golden Pasture Seeds -item.botania:grassSeeds5.name=Vivid Pasture Seeds -item.botania:grassSeeds6.name=Scorched Pasture Seeds -item.botania:grassSeeds7.name=Infused Pasture Seeds -item.botania:grassSeeds8.name=Mutated Pasture Seeds +item.botania:seeds_grass.name=Pasture Seeds +item.botania:seeds_podzol.name=Boreal Seeds +item.botania:seeds_mycel.name=Infestation Spores +item.botania:seeds_dry.name=Dry Pasture Seeds +item.botania:seeds_golden.name=Golden Pasture Seeds +item.botania:seeds_vivid.name=Vivid Pasture Seeds +item.botania:seeds_scorched.name=Scorched Pasture Seeds +item.botania:seeds_infused.name=Infused Pasture Seeds +item.botania:seeds_mutated.name=Mutated Pasture Seeds item.botania:livingwood_twig.name=Livingwood Twig item.botania:dirtRod.name=Rod of the Lands item.botania:terraformRod.name=Rod of the Terra Firma diff --git a/src/main/resources/assets/botania/lang/es_es.lang b/src/main/resources/assets/botania/lang/es_es.lang index b2c4923ba..4cbc38522 100644 --- a/src/main/resources/assets/botania/lang/es_es.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -1135,9 +1135,9 @@ item.botania:manaGun.name=Pistola de maná item.botania:compositeLens.name=Lentes de maná compuestas: %s %s item.botania:manaCookie.name=Galleta de maná item.botania:fertilizer.name=Fertilizante floral -item.botania:grassSeeds0.name=Semillas de pasto -item.botania:grassSeeds1.name=Semillas boreales -item.botania:grassSeeds2.name=Esporas de infestación +item.botania:seeds_grass.name=Semillas de pasto +item.botania:seeds_podzol.name=Semillas boreales +item.botania:seeds_mycel.name=Esporas de infestación item.botania:livingwood_twig.name=Ramita de madera viviente item.botania:dirtRod.name=Vara de las tierras item.botania:terraformRod.name=Vara de Terra Firma diff --git a/src/main/resources/assets/botania/lang/fr_fr.lang b/src/main/resources/assets/botania/lang/fr_fr.lang index a8a6664d0..9e3bd2594 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -997,9 +997,9 @@ item.botania:manaGun.name=Exploseur de mana item.botania:compositeLens.name=Lentilles de mana composite: %s %s item.botania:manaCookie.name=Biscuit de mana item.botania:fertilizer.name=Fertilisant floral -item.botania:grassSeeds0.name=Graines de pâturage -item.botania:grassSeeds1.name=Graines boréales -item.botania:grassSeeds2.name=Spore d'infestation +item.botania:seeds_grass.name=Graines de pâturage +item.botania:seeds_podzol.name=Graines boréales +item.botania:seeds_mycel.name=Spore d'infestation item.botania:livingwood_twig.name=Brindille de vifbois item.botania:dirtRod.name=Bâton des landes item.botania:terraformRod.name=Bâton de la terre ferme diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index 4a4ac1224..1a5693cf9 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -1154,15 +1154,15 @@ item.botania:manaGun.name=マナ銃 item.botania:compositeLens.name=複合マナレンズ: %s %s item.botania:manaCookie.name=全快クッキー item.botania:fertilizer.name=花の肥料 -item.botania:grassSeeds0.name=牧草の種 -item.botania:grassSeeds1.name=北国の種 -item.botania:grassSeeds2.name=寄生の種 -item.botania:grassSeeds3.name=乾燥した牧草の種 -item.botania:grassSeeds4.name=金色の牧草の種 -item.botania:grassSeeds5.name=鮮やかな牧草の種 -item.botania:grassSeeds6.name=枯れた牧草の種 -item.botania:grassSeeds7.name=マナで満たされた牧草の種 -item.botania:grassSeeds8.name=変異した牧草の種 +item.botania:seeds_grass.name=牧草の種 +item.botania:seeds_podzol.name=北国の種 +item.botania:seeds_mycel.name=寄生の種 +item.botania:seeds_dry.name=乾燥した牧草の種 +item.botania:seeds_golden.name=金色の牧草の種 +item.botania:seeds_vivid.name=鮮やかな牧草の種 +item.botania:seeds_scorched.name=枯れた牧草の種 +item.botania:seeds_infused.name=マナで満たされた牧草の種 +item.botania:seeds_mutated.name=変異した牧草の種 item.botania:livingwood_twig.name=リビングングウッドの小枝 item.botania:dirtRod.name=土の杖 item.botania:terraformRod.name=大地の杖 diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index 62cec4507..599ec0596 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -1096,9 +1096,9 @@ item.botania:manaGun.name=마나 블래스터 item.botania:compositeLens.name=합성 마나렌즈: %s %s item.botania:manaCookie.name=마나 쿠키 item.botania:fertilizer.name=꽃의 비료 -item.botania:grassSeeds0.name=초원의 씨 -item.botania:grassSeeds1.name=북극의 씨 -item.botania:grassSeeds2.name=감염 포자 +item.botania:seeds_grass.name=초원의 씨 +item.botania:seeds_podzol.name=북극의 씨 +item.botania:seeds_mycel.name=감염 포자 item.botania:livingwood_twig.name=생명의 나뭇가지 item.botania:dirtRod.name=땅의 막대 item.botania:terraformRod.name=땅의 기동 막대 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index ff36fcdee..f12bd6312 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -1228,9 +1228,9 @@ item.botania:manaGun.name=Mana Blaster item.botania:compositeLens.name=Samengestelde Mana Lens: %s %s item.botania:manaCookie.name=Biscuit der Totaalheid item.botania:fertilizer.name=Bloemenvoeding -item.botania:grassSeeds0.name=Weidezaden -item.botania:grassSeeds1.name=Boreale Zaden -item.botania:grassSeeds2.name=Ziektezaden +item.botania:seeds_grass.name=Weidezaden +item.botania:seeds_podzol.name=Boreale Zaden +item.botania:seeds_mycel.name=Ziektezaden item.botania:livingwood_twig.name=Levenshout Twijgje item.botania:dirtRod.name=Staf van het Land item.botania:terraformRod.name=Terraformstaf diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index 297f156fa..cbb132260 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -1372,15 +1372,15 @@ item.botania:manaGun.name=Disparador de Mana item.botania:compositeLens.name=Lentes de Mana Compostas: %s %s item.botania:manaCookie.name=Biscuit of Totality item.botania:fertilizer.name=Fertilizante Floral -item.botania:grassSeeds0.name=Sementes de Pasto -item.botania:grassSeeds1.name=Sementes Boreais -item.botania:grassSeeds2.name=Espóros Infestantes -item.botania:grassSeeds3.name=Sementes Secas -item.botania:grassSeeds4.name=Sementes Douradas -item.botania:grassSeeds5.name=Sementes Vívidas -item.botania:grassSeeds6.name=Sementes Queimadas -item.botania:grassSeeds7.name=Sementes Infusas -item.botania:grassSeeds8.name=Sementes Mutantes +item.botania:seeds_grass.name=Sementes de Pasto +item.botania:seeds_podzol.name=Sementes Boreais +item.botania:seeds_mycel.name=Espóros Infestantes +item.botania:seeds_dry.name=Sementes Secas +item.botania:seeds_golden.name=Sementes Douradas +item.botania:seeds_vivid.name=Sementes Vívidas +item.botania:seeds_scorched.name=Sementes Queimadas +item.botania:seeds_infused.name=Sementes Infusas +item.botania:seeds_mutated.name=Sementes Mutantes item.botania:livingwood_twig.name=Graveto de Madeira-viva item.botania:dirtRod.name=Cajado das Terras item.botania:terraformRod.name=Cajado de Terra Firma diff --git a/src/main/resources/assets/botania/lang/ru_ru.lang b/src/main/resources/assets/botania/lang/ru_ru.lang index 25763fbdc..93adfd7c5 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.lang +++ b/src/main/resources/assets/botania/lang/ru_ru.lang @@ -624,9 +624,9 @@ item.botania:manaGun.name=Излучатель item.botania:compositeLens.name=Совмещённые линзы маны: %s %s item.botania:manaCookie.name=Печенье маны item.botania:fertilizer.name=Цветочное удобрение -item.botania:grassSeeds0.name=Луговое семя -item.botania:grassSeeds1.name=Таёжное семя -item.botania:grassSeeds2.name=Грибные споры +item.botania:seeds_grass.name=Луговое семя +item.botania:seeds_podzol.name=Таёжное семя +item.botania:seeds_mycel.name=Грибные споры item.botania:livingwood_twig.name=Ветка жизнедерева item.botania:dirtRod.name=Жезл Земель item.botania:terraformRod.name=Жезл Терраформер diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index 8c0dfeba5..314422f48 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -1369,15 +1369,15 @@ item.botania:manaGun.name=魔力脉冲枪 item.botania:compositeLens.name=复合透镜: %s %s item.botania:manaCookie.name=魔力曲奇 item.botania:fertilizer.name=花肥 -item.botania:grassSeeds0.name=草地之种 -item.botania:grassSeeds1.name=寒地之种 -item.botania:grassSeeds2.name=菌丝孢子 -item.botania:grassSeeds3.name=干草之种 -item.botania:grassSeeds4.name=黄金草种 -item.botania:grassSeeds5.name=鲜草之种 -item.botania:grassSeeds6.name=焦土草种 -item.botania:grassSeeds7.name=注魔草种 -item.botania:grassSeeds8.name=异变草种 +item.botania:seeds_grass.name=草地之种 +item.botania:seeds_podzol.name=寒地之种 +item.botania:seeds_mycel.name=菌丝孢子 +item.botania:seeds_dry.name=干草之种 +item.botania:seeds_golden.name=黄金草种 +item.botania:seeds_vivid.name=鲜草之种 +item.botania:seeds_scorched.name=焦土草种 +item.botania:seeds_infused.name=注魔草种 +item.botania:seeds_mutated.name=异变草种 item.botania:livingwood_twig.name=活木枝 item.botania:dirtRod.name=大地法杖 item.botania:terraformRod.name=大地权杖 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index cc89130f8..82d8d7063 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -1335,15 +1335,15 @@ item.botania:manaGun.name=瑪那脈衝槍 item.botania:compositeLens.name=複合透鏡: %s %s item.botania:manaCookie.name=瑪那餅乾 item.botania:fertilizer.name=花肥 -item.botania:grassSeeds0.name=草地之種 -item.botania:grassSeeds1.name=寒地之種 -item.botania:grassSeeds2.name=菌絲孢子 -item.botania:grassSeeds3.name=乾草之種 -item.botania:grassSeeds4.name=黃金草種 -item.botania:grassSeeds5.name=鮮草之種 -item.botania:grassSeeds6.name=焦土草種 -item.botania:grassSeeds7.name=注魔草種 -item.botania:grassSeeds8.name=異變草種 +item.botania:seeds_grass.name=草地之種 +item.botania:seeds_podzol.name=寒地之種 +item.botania:seeds_mycel.name=菌絲孢子 +item.botania:seeds_dry.name=乾草之種 +item.botania:seeds_golden.name=黃金草種 +item.botania:seeds_vivid.name=鮮草之種 +item.botania:seeds_scorched.name=焦土草種 +item.botania:seeds_infused.name=注魔草種 +item.botania:seeds_mutated.name=異變草種 item.botania:livingwood_twig.name=活木枝 item.botania:dirtRod.name=大地法杖 item.botania:terraformRod.name=大地權杖 diff --git a/src/main/resources/assets/botania/models/item/grassseeds3.json b/src/main/resources/assets/botania/models/item/seeds_dry.json similarity index 100% rename from src/main/resources/assets/botania/models/item/grassseeds3.json rename to src/main/resources/assets/botania/models/item/seeds_dry.json diff --git a/src/main/resources/assets/botania/models/item/grassseeds4.json b/src/main/resources/assets/botania/models/item/seeds_golden.json similarity index 100% rename from src/main/resources/assets/botania/models/item/grassseeds4.json rename to src/main/resources/assets/botania/models/item/seeds_golden.json diff --git a/src/main/resources/assets/botania/models/item/grassseeds0.json b/src/main/resources/assets/botania/models/item/seeds_grass.json similarity index 100% rename from src/main/resources/assets/botania/models/item/grassseeds0.json rename to src/main/resources/assets/botania/models/item/seeds_grass.json diff --git a/src/main/resources/assets/botania/models/item/grassseeds7.json b/src/main/resources/assets/botania/models/item/seeds_infused.json similarity index 100% rename from src/main/resources/assets/botania/models/item/grassseeds7.json rename to src/main/resources/assets/botania/models/item/seeds_infused.json diff --git a/src/main/resources/assets/botania/models/item/grassseeds8.json b/src/main/resources/assets/botania/models/item/seeds_mutated.json similarity index 100% rename from src/main/resources/assets/botania/models/item/grassseeds8.json rename to src/main/resources/assets/botania/models/item/seeds_mutated.json diff --git a/src/main/resources/assets/botania/models/item/grassseeds2.json b/src/main/resources/assets/botania/models/item/seeds_mycel.json similarity index 100% rename from src/main/resources/assets/botania/models/item/grassseeds2.json rename to src/main/resources/assets/botania/models/item/seeds_mycel.json diff --git a/src/main/resources/assets/botania/models/item/grassseeds1.json b/src/main/resources/assets/botania/models/item/seeds_podzol.json similarity index 100% rename from src/main/resources/assets/botania/models/item/grassseeds1.json rename to src/main/resources/assets/botania/models/item/seeds_podzol.json diff --git a/src/main/resources/assets/botania/models/item/grassseeds6.json b/src/main/resources/assets/botania/models/item/seeds_scorched.json similarity index 100% rename from src/main/resources/assets/botania/models/item/grassseeds6.json rename to src/main/resources/assets/botania/models/item/seeds_scorched.json diff --git a/src/main/resources/assets/botania/models/item/grassseeds5.json b/src/main/resources/assets/botania/models/item/seeds_vivid.json similarity index 100% rename from src/main/resources/assets/botania/models/item/grassseeds5.json rename to src/main/resources/assets/botania/models/item/seeds_vivid.json diff --git a/src/main/resources/assets/botania/recipes/horn_grass.json b/src/main/resources/assets/botania/recipes/horn_grass.json index b08616423..39e588935 100644 --- a/src/main/resources/assets/botania/recipes/horn_grass.json +++ b/src/main/resources/assets/botania/recipes/horn_grass.json @@ -10,8 +10,7 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, "W": { "item": "#LIVINGWOOD" diff --git a/src/main/resources/assets/botania/recipes/miniisland_0.json b/src/main/resources/assets/botania/recipes/miniisland_0.json index 2cdc5fcbd..686377bf0 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_0.json +++ b/src/main/resources/assets/botania/recipes/miniisland_0.json @@ -12,8 +12,7 @@ "group": "botania:miniisland", "key": { "S": { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, "D": { "item": "minecraft:dirt", diff --git a/src/main/resources/assets/botania/recipes/miniisland_1.json b/src/main/resources/assets/botania/recipes/miniisland_1.json index e307743cb..75390d0a5 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_1.json +++ b/src/main/resources/assets/botania/recipes/miniisland_1.json @@ -12,8 +12,7 @@ "group": "botania:miniisland", "key": { "S": { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, "D": { "item": "minecraft:dirt", diff --git a/src/main/resources/assets/botania/recipes/miniisland_10.json b/src/main/resources/assets/botania/recipes/miniisland_10.json index 9b8d992db..040c1b77c 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_10.json +++ b/src/main/resources/assets/botania/recipes/miniisland_10.json @@ -12,8 +12,7 @@ "group": "botania:miniisland", "key": { "S": { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, "D": { "item": "minecraft:dirt", diff --git a/src/main/resources/assets/botania/recipes/miniisland_11.json b/src/main/resources/assets/botania/recipes/miniisland_11.json index 75e4c1107..c77238c45 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_11.json +++ b/src/main/resources/assets/botania/recipes/miniisland_11.json @@ -12,8 +12,7 @@ "group": "botania:miniisland", "key": { "S": { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, "D": { "item": "minecraft:dirt", diff --git a/src/main/resources/assets/botania/recipes/miniisland_12.json b/src/main/resources/assets/botania/recipes/miniisland_12.json index d866cda47..6d2f0f80a 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_12.json +++ b/src/main/resources/assets/botania/recipes/miniisland_12.json @@ -12,8 +12,7 @@ "group": "botania:miniisland", "key": { "S": { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, "D": { "item": "minecraft:dirt", diff --git a/src/main/resources/assets/botania/recipes/miniisland_13.json b/src/main/resources/assets/botania/recipes/miniisland_13.json index fc5487b5b..0d55e7926 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_13.json +++ b/src/main/resources/assets/botania/recipes/miniisland_13.json @@ -12,8 +12,7 @@ "group": "botania:miniisland", "key": { "S": { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, "D": { "item": "minecraft:dirt", diff --git a/src/main/resources/assets/botania/recipes/miniisland_14.json b/src/main/resources/assets/botania/recipes/miniisland_14.json index 759f1a493..ef7b8769f 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_14.json +++ b/src/main/resources/assets/botania/recipes/miniisland_14.json @@ -12,8 +12,7 @@ "group": "botania:miniisland", "key": { "S": { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, "D": { "item": "minecraft:dirt", diff --git a/src/main/resources/assets/botania/recipes/miniisland_15.json b/src/main/resources/assets/botania/recipes/miniisland_15.json index 6a35dd18a..05a37eb86 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_15.json +++ b/src/main/resources/assets/botania/recipes/miniisland_15.json @@ -12,8 +12,7 @@ "group": "botania:miniisland", "key": { "S": { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, "D": { "item": "minecraft:dirt", diff --git a/src/main/resources/assets/botania/recipes/miniisland_2.json b/src/main/resources/assets/botania/recipes/miniisland_2.json index e8a785488..4e3edd2d8 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_2.json +++ b/src/main/resources/assets/botania/recipes/miniisland_2.json @@ -12,8 +12,7 @@ "group": "botania:miniisland", "key": { "S": { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, "D": { "item": "minecraft:dirt", diff --git a/src/main/resources/assets/botania/recipes/miniisland_3.json b/src/main/resources/assets/botania/recipes/miniisland_3.json index e6d01f0af..b879617f6 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_3.json +++ b/src/main/resources/assets/botania/recipes/miniisland_3.json @@ -12,8 +12,7 @@ "group": "botania:miniisland", "key": { "S": { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, "D": { "item": "minecraft:dirt", diff --git a/src/main/resources/assets/botania/recipes/miniisland_4.json b/src/main/resources/assets/botania/recipes/miniisland_4.json index 9bd59ee26..2260447c1 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_4.json +++ b/src/main/resources/assets/botania/recipes/miniisland_4.json @@ -12,8 +12,7 @@ "group": "botania:miniisland", "key": { "S": { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, "D": { "item": "minecraft:dirt", diff --git a/src/main/resources/assets/botania/recipes/miniisland_5.json b/src/main/resources/assets/botania/recipes/miniisland_5.json index 3d3058413..f74880d5a 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_5.json +++ b/src/main/resources/assets/botania/recipes/miniisland_5.json @@ -12,8 +12,7 @@ "group": "botania:miniisland", "key": { "S": { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, "D": { "item": "minecraft:dirt", diff --git a/src/main/resources/assets/botania/recipes/miniisland_6.json b/src/main/resources/assets/botania/recipes/miniisland_6.json index 82c18c4d1..15a994d07 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_6.json +++ b/src/main/resources/assets/botania/recipes/miniisland_6.json @@ -12,8 +12,7 @@ "group": "botania:miniisland", "key": { "S": { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, "D": { "item": "minecraft:dirt", diff --git a/src/main/resources/assets/botania/recipes/miniisland_7.json b/src/main/resources/assets/botania/recipes/miniisland_7.json index f6c3e20e9..1bb995e47 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_7.json +++ b/src/main/resources/assets/botania/recipes/miniisland_7.json @@ -12,8 +12,7 @@ "group": "botania:miniisland", "key": { "S": { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, "D": { "item": "minecraft:dirt", diff --git a/src/main/resources/assets/botania/recipes/miniisland_8.json b/src/main/resources/assets/botania/recipes/miniisland_8.json index 38c12bbd9..187d4d98b 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_8.json +++ b/src/main/resources/assets/botania/recipes/miniisland_8.json @@ -12,8 +12,7 @@ "group": "botania:miniisland", "key": { "S": { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, "D": { "item": "minecraft:dirt", diff --git a/src/main/resources/assets/botania/recipes/miniisland_9.json b/src/main/resources/assets/botania/recipes/miniisland_9.json index cb9f19367..0a69887e3 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_9.json +++ b/src/main/resources/assets/botania/recipes/miniisland_9.json @@ -12,8 +12,7 @@ "group": "botania:miniisland", "key": { "S": { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, "D": { "item": "minecraft:dirt", diff --git a/src/main/resources/assets/botania/recipes/grassseeds_3.json b/src/main/resources/assets/botania/recipes/seeds_dry.json similarity index 52% rename from src/main/resources/assets/botania/recipes/grassseeds_3.json rename to src/main/resources/assets/botania/recipes/seeds_dry.json index 0c5dcaba0..6eaff13c1 100644 --- a/src/main/resources/assets/botania/recipes/grassseeds_3.json +++ b/src/main/resources/assets/botania/recipes/seeds_dry.json @@ -1,13 +1,11 @@ { "result": { - "item": "botania:grassseeds", - "data": 3 + "item": "botania:seeds_dry" }, - "group": "botania:grassseeds", + "group": "botania:seeds", "ingredients": [ { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, { "item": "minecraft:deadbush" diff --git a/src/main/resources/assets/botania/recipes/grassseeds_4.json b/src/main/resources/assets/botania/recipes/seeds_golden.json similarity index 51% rename from src/main/resources/assets/botania/recipes/grassseeds_4.json rename to src/main/resources/assets/botania/recipes/seeds_golden.json index 504721617..7e0f2bafb 100644 --- a/src/main/resources/assets/botania/recipes/grassseeds_4.json +++ b/src/main/resources/assets/botania/recipes/seeds_golden.json @@ -1,13 +1,11 @@ { "result": { - "item": "botania:grassseeds", - "data": 4 + "item": "botania:seeds_golden" }, - "group": "botania:grassseeds", + "group": "botania:seeds", "ingredients": [ { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, { "item": "minecraft:wheat" diff --git a/src/main/resources/assets/botania/recipes/grassseeds_7.json b/src/main/resources/assets/botania/recipes/seeds_infused.json similarity index 53% rename from src/main/resources/assets/botania/recipes/grassseeds_7.json rename to src/main/resources/assets/botania/recipes/seeds_infused.json index 3b222211a..971f34fc1 100644 --- a/src/main/resources/assets/botania/recipes/grassseeds_7.json +++ b/src/main/resources/assets/botania/recipes/seeds_infused.json @@ -1,13 +1,11 @@ { "result": { - "item": "botania:grassseeds", - "data": 7 + "item": "botania:seeds_infused" }, - "group": "botania:grassseeds", + "group": "botania:seeds", "ingredients": [ { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, { "item": "minecraft:prismarine_shard" diff --git a/src/main/resources/assets/botania/recipes/grassseeds_8.json b/src/main/resources/assets/botania/recipes/seeds_mutated.json similarity index 52% rename from src/main/resources/assets/botania/recipes/grassseeds_8.json rename to src/main/resources/assets/botania/recipes/seeds_mutated.json index bdd909399..0c0a71c02 100644 --- a/src/main/resources/assets/botania/recipes/grassseeds_8.json +++ b/src/main/resources/assets/botania/recipes/seeds_mutated.json @@ -1,13 +1,11 @@ { "result": { - "item": "botania:grassseeds", - "data": 8 + "item": "botania:seeds_mutated" }, - "group": "botania:grassseeds", + "group": "botania:seeds", "ingredients": [ { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, { "item": "minecraft:spider_eye" diff --git a/src/main/resources/assets/botania/recipes/grassseeds_6.json b/src/main/resources/assets/botania/recipes/seeds_scorched.json similarity index 53% rename from src/main/resources/assets/botania/recipes/grassseeds_6.json rename to src/main/resources/assets/botania/recipes/seeds_scorched.json index 66724c823..c866d644b 100644 --- a/src/main/resources/assets/botania/recipes/grassseeds_6.json +++ b/src/main/resources/assets/botania/recipes/seeds_scorched.json @@ -1,13 +1,11 @@ { "result": { - "item": "botania:grassseeds", - "data": 6 + "item": "botania:seeds_scorched" }, - "group": "botania:grassseeds", + "group": "botania:seeds", "ingredients": [ { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, { "item": "minecraft:blaze_powder" diff --git a/src/main/resources/assets/botania/recipes/grassseeds_5.json b/src/main/resources/assets/botania/recipes/seeds_vivid.json similarity index 54% rename from src/main/resources/assets/botania/recipes/grassseeds_5.json rename to src/main/resources/assets/botania/recipes/seeds_vivid.json index c79d2d3ca..e7674c372 100644 --- a/src/main/resources/assets/botania/recipes/grassseeds_5.json +++ b/src/main/resources/assets/botania/recipes/seeds_vivid.json @@ -1,13 +1,11 @@ { "result": { - "item": "botania:grassseeds", - "data": 5 + "item": "botania:seeds_vivid" }, - "group": "botania:grassseeds", + "group": "botania:seeds", "ingredients": [ { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, { "item": "minecraft:dye", diff --git a/src/main/resources/assets/botania/recipes/speedupbelt.json b/src/main/resources/assets/botania/recipes/speedupbelt.json index ddac07cd1..8c818f7e1 100644 --- a/src/main/resources/assets/botania/recipes/speedupbelt.json +++ b/src/main/resources/assets/botania/recipes/speedupbelt.json @@ -10,8 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, "B": { "item": "botania:travelbelt" diff --git a/src/main/resources/assets/botania/recipes/terraformrod.json b/src/main/resources/assets/botania/recipes/terraformrod.json index 7ed77309f..1a01f29e7 100644 --- a/src/main/resources/assets/botania/recipes/terraformrod.json +++ b/src/main/resources/assets/botania/recipes/terraformrod.json @@ -22,8 +22,7 @@ "item": "#INGOTTERRASTEEL" }, "G": { - "item": "botania:grassseeds", - "data": 0 + "item": "botania:seeds_grass" }, "W": { "item": "#RUNEWINTERB"