diff --git a/src/main/java/vazkii/botania/api/state/enums/CratePattern.java b/src/main/java/vazkii/botania/api/state/enums/CratePattern.java index 653a29776..60440854b 100644 --- a/src/main/java/vazkii/botania/api/state/enums/CratePattern.java +++ b/src/main/java/vazkii/botania/api/state/enums/CratePattern.java @@ -8,21 +8,51 @@ */ package vazkii.botania.api.state.enums; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; import net.minecraft.util.IStringSerializable; +import java.util.List; import java.util.Locale; public enum CratePattern implements IStringSerializable { - NONE, - CRAFTY_1_1, - CRAFTY_2_2, - CRAFTY_1_2, - CRAFTY_2_1, - CRAFTY_1_3, - CRAFTY_3_1, - CRAFTY_2_3, - CRAFTY_3_2, - CRAFTY_DONUT; + NONE(true, true, true, + true, true, true, + true, true, true), + CRAFTY_1_1( true, false, false, + false, false, false, + false, false, false), + CRAFTY_2_2( true, true, false, + true, true, false, + false, false, false), + CRAFTY_1_2( true, false, false, + true, false, false, + false, false, false), + CRAFTY_2_1( true, true, false, + false, false, false, + false, false, false), + CRAFTY_1_3( true, false, false, + true, false, false, + true, false, false), + CRAFTY_3_1( true, true, true, + false, false, false, + false, false, false), + CRAFTY_2_3( true, true, false, + true, true, false, + true, true, false), + CRAFTY_3_2( true, true, true, + true, true, true, + false, false, false), + CRAFTY_DONUT(true, true, true, + true, false, true, + true, true, true); + + public final List openSlots; + + CratePattern(Boolean... pattern) { + this.openSlots = ImmutableList.copyOf(pattern); + Preconditions.checkArgument(this.openSlots.size() == 9, "Malformed pattern"); + } @Override public String getName() { diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 6f5feb53a..7e7dc62ac 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -87,6 +87,7 @@ import vazkii.botania.common.entity.EntitySignalFlare; import vazkii.botania.common.entity.EntitySpark; import vazkii.botania.common.entity.ModEntities; import vazkii.botania.common.fixers.AttachedWills; +import vazkii.botania.common.fixers.CraftyCrateTE; import vazkii.botania.common.fixers.FlattenItems; import vazkii.botania.common.fixers.FlattenNBT; import vazkii.botania.common.lexicon.LexiconData; @@ -143,6 +144,7 @@ public class Botania { fixer.registerFix(FixTypes.ITEM_INSTANCE, new FlattenItems()); fixer.registerFix(FixTypes.ITEM_INSTANCE, new FlattenNBT()); fixer.registerFix(FixTypes.ITEM_INSTANCE, new AttachedWills()); + fixer.registerFix(FixTypes.BLOCK_ENTITY, new CraftyCrateTE()); if(Botania.gardenOfGlassLoaded) new WorldTypeSkyblock(); diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 43e463270..b0258ac75 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -85,7 +85,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); if (te instanceof TileCraftCrate) { TileCraftCrate tile = (TileCraftCrate) te; - state = state.withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.values()[tile.pattern + 1]); + state = state.withProperty(BotaniaStateProps.CRATE_PATTERN, tile.pattern); } else { state = state.withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.NONE); } @@ -170,8 +170,8 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, int yp = yc + i * 18; boolean enabled = true; - if(craft.pattern > -1) - enabled = TileCraftCrate.PATTERNS[craft.pattern][index]; + if(craft.pattern != CratePattern.NONE) + enabled = craft.pattern.openSlots.get(index); Gui.drawRect(xp, yp, xp + 16, yp + 16, enabled ? 0x22FFFFFF : 0x22FF0000); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index a139fd936..500672b1b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -21,55 +21,15 @@ import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.ForgeRegistries; import vazkii.botania.api.internal.VanillaPacketDispatcher; +import vazkii.botania.api.state.enums.CratePattern; import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; public class TileCraftCrate extends TileOpenCrate { + public static final String TAG_PATTERN = "pattern"; - public static final boolean[][] PATTERNS = new boolean[][] { - { - true, false, false, - false, false, false, - false, false, false - }, { - true, true, false, - true, true, false, - false, false, false - }, { - true, false, false, - true, false, false, - false, false, false - }, { - true, true, false, - false, false, false, - false, false, false - }, { - true, false, false, - true, false, false, - true, false, false - }, { - true, true, true, - false, false, false, - false, false, false - }, { - true, true, false, - true, true, false, - true, true, false - }, { - true, true, true, - true, true, true, - false, false, false - }, { - true, true, true, - true, false, true, - true, true, true - } - }; - - private static final String TAG_PATTERN = "pattern"; - - public int pattern = -1; + public CratePattern pattern = CratePattern.NONE; private int signal = 0; @Override @@ -95,8 +55,8 @@ public class TileCraftCrate extends TileOpenCrate { }; } - public boolean isLocked(int slot) { - return pattern != -1 && !PATTERNS[pattern][slot]; + private boolean isLocked(int slot) { + return !pattern.openSlots.get(slot); } @Override @@ -176,13 +136,13 @@ public class TileCraftCrate extends TileOpenCrate { @Override public void writePacketNBT(NBTTagCompound par1nbtTagCompound) { super.writePacketNBT(par1nbtTagCompound); - par1nbtTagCompound.setInteger(TAG_PATTERN, pattern); + par1nbtTagCompound.setInteger(TAG_PATTERN, pattern.ordinal()); } @Override public void readPacketNBT(NBTTagCompound par1nbtTagCompound) { super.readPacketNBT(par1nbtTagCompound); - pattern = par1nbtTagCompound.getInteger(TAG_PATTERN); + pattern = CratePattern.values()[par1nbtTagCompound.getInteger(TAG_PATTERN)]; } @Override @@ -207,7 +167,7 @@ public class TileCraftCrate extends TileOpenCrate { @Override public void onDataPacket(NetworkManager manager, SPacketUpdateTileEntity packet) { - int lastPattern = pattern; + CratePattern lastPattern = pattern; super.onDataPacket(manager, packet); if(pattern != lastPattern) world.markBlockRangeForRenderUpdate(pos, pos); diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index f6cd0005a..b8b514c8f 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -156,8 +156,18 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.livingrock); addBlock(ModBlocks.livingwood); + addBlock(ModBlocks.openCrate); - addItem(ModItems.craftPattern); + addItem(ModItems.craftPattern1_1); + addItem(ModItems.craftPattern2_2); + addItem(ModItems.craftPattern1_2); + addItem(ModItems.craftPattern2_1); + addItem(ModItems.craftPattern1_3); + addItem(ModItems.craftPattern3_1); + addItem(ModItems.craftPattern2_3); + addItem(ModItems.craftPattern3_2); + addItem(ModItems.craftPatternDonut); + addBlock(ModBlocks.platform); addBlock(ModBlocks.alfPortal); addBlock(ModBlocks.altar); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index d66974893..4c559b874 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -500,7 +500,7 @@ public final class ModCraftingRecipes { recipeGatherDrum = path("forestdrum_1"); recipePlaceholder = ModItems.placeholder.getRegistryName(); recipeCraftCrate = path("opencrate_1"); - recipesPatterns = allOfGroup("craftpattern"); + recipesPatterns = allOfGroup("craft_pattern"); recipeBrewery = ModBlocks.brewery.getRegistryName(); recipeVial = ModItems.vial.getRegistryName(); recipeFlask = ModItems.flask.getRegistryName(); diff --git a/src/main/java/vazkii/botania/common/fixers/CraftyCrateTE.java b/src/main/java/vazkii/botania/common/fixers/CraftyCrateTE.java new file mode 100644 index 000000000..7b2d55528 --- /dev/null +++ b/src/main/java/vazkii/botania/common/fixers/CraftyCrateTE.java @@ -0,0 +1,22 @@ +package vazkii.botania.common.fixers; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.datafix.IFixableData; +import vazkii.botania.common.block.tile.TileCraftCrate; + +// Shifts pattern tag in Crafty Crate TE NBT up one to account for CratePattern.NONE +public class CraftyCrateTE implements IFixableData { + @Override + public int getFixVersion() { + return 1; + } + + @Override + public NBTTagCompound fixTagCompound(NBTTagCompound compound) { + if(TileEntity.getKey(TileCraftCrate.class).toString().equals(compound.getString("id"))) { + compound.setInteger(TileCraftCrate.TAG_PATTERN, compound.getInteger(TileCraftCrate.TAG_PATTERN) + 1); + } + return compound; + } +} diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index 9d67d0e4c..4e735223d 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -5,6 +5,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.datafix.IFixableData; import vazkii.botania.api.item.IAncientWillContainer; +import vazkii.botania.api.state.enums.CratePattern; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; @@ -96,6 +97,11 @@ public class FlattenItems implements IFixableData { IAncientWillContainer.AncientWillType[] vals = IAncientWillContainer.AncientWillType.values(); return LibMisc.MOD_ID + ":" + LibItemNames.ANCIENT_WILL + "_" + vals[i & vals.length].name().toLowerCase(Locale.ROOT); }); + LOOKUP.put("botania:craftpattern", i -> { + // +1 since there was no NONE meta variant + CratePattern[] vals = CratePattern.values(); + return LibMisc.MOD_ID + ":" + LibItemNames.CRAFT_PATTERN + "_" + vals[(i + 1) % vals.length].name().toLowerCase(Locale.ROOT); + }); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index 2ea0d6608..c36297eb2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -10,29 +10,26 @@ */ package vazkii.botania.common.item; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.client.core.handler.ModelHandler; +import vazkii.botania.api.state.enums.CratePattern; import vazkii.botania.common.block.tile.TileCraftCrate; import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; +import java.util.Locale; public class ItemCraftPattern extends ItemMod { + public final CratePattern pattern; - public ItemCraftPattern() { - super(LibItemNames.CRAFT_PATTERN); - setHasSubtypes(true); + public ItemCraftPattern(CratePattern pattern) { + super(LibItemNames.CRAFT_PATTERN + "_" + pattern.name().toLowerCase(Locale.ROOT)); + this.pattern = pattern; setMaxStackSize(1); } @@ -42,31 +39,10 @@ public class ItemCraftPattern extends ItemMod { TileEntity tile = world.getTileEntity(pos); if(tile != null && tile instanceof TileCraftCrate) { TileCraftCrate crate = (TileCraftCrate) tile; - crate.pattern = p.getHeldItem(hand).getItemDamage(); + crate.pattern = this.pattern; world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 8); return EnumActionResult.SUCCESS; } return EnumActionResult.PASS; } - - @Override - public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList list) { - if(isInCreativeTab(tab)) { - for(int i = 0; i < TileCraftCrate.PATTERNS.length; 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, 9, LibItemNames.CRAFT_PATTERN); - } - } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 5442e16c8..0af03ac48 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -24,6 +24,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.mana.spark.SparkUpgradeType; import vazkii.botania.api.item.IAncientWillContainer; +import vazkii.botania.api.state.enums.CratePattern; import vazkii.botania.common.item.brew.ItemBrewFlask; import vazkii.botania.common.item.brew.ItemBrewVial; import vazkii.botania.common.item.brew.ItemIncenseStick; @@ -287,7 +288,15 @@ public final class ModItems { public static final Item thornChakram = new ItemThornChakram(LibItemNames.THORN_CHAKRAM); public static final Item flareChakram = new ItemThornChakram(LibItemNames.FLARE_CHAKRAM); public static final Item overgrowthSeed = new ItemOvergrowthSeed(); - public static final Item craftPattern = new ItemCraftPattern(); + public static final Item craftPattern1_1 = new ItemCraftPattern(CratePattern.CRAFTY_1_1); + public static final Item craftPattern2_2 = new ItemCraftPattern(CratePattern.CRAFTY_2_2); + public static final Item craftPattern1_2 = new ItemCraftPattern(CratePattern.CRAFTY_1_2); + public static final Item craftPattern2_1 = new ItemCraftPattern(CratePattern.CRAFTY_2_1); + public static final Item craftPattern1_3 = new ItemCraftPattern(CratePattern.CRAFTY_1_3); + public static final Item craftPattern3_1 = new ItemCraftPattern(CratePattern.CRAFTY_3_1); + public static final Item craftPattern2_3 = new ItemCraftPattern(CratePattern.CRAFTY_2_3); + public static final Item craftPattern3_2 = new ItemCraftPattern(CratePattern.CRAFTY_3_2); + public static final Item craftPatternDonut = new ItemCraftPattern(CratePattern.CRAFTY_DONUT); public static final Item ancientWillAhrim = new ItemAncientWill(IAncientWillContainer.AncientWillType.AHRIM); public static final Item ancientWillDharok = new ItemAncientWill(IAncientWillContainer.AncientWillType.DHAROK); public static final Item ancientWillGuthan = new ItemAncientWill(IAncientWillContainer.AncientWillType.GUTHAN); @@ -516,7 +525,15 @@ public final class ModItems { r.register(thornChakram); r.register(flareChakram); r.register(overgrowthSeed); - r.register(craftPattern); + r.register(craftPattern1_1); + r.register(craftPattern2_2); + r.register(craftPattern1_2); + r.register(craftPattern2_1); + r.register(craftPattern1_3); + r.register(craftPattern3_1); + r.register(craftPattern2_3); + r.register(craftPattern3_2); + r.register(craftPatternDonut); r.register(ancientWillAhrim); r.register(ancientWillDharok); r.register(ancientWillGuthan); diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 18327ae62..c75f1b92a 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -125,7 +125,7 @@ public final class LibItemNames { public static final String THORN_CHAKRAM = "thorn_chakram"; public static final String FLARE_CHAKRAM = "flare_chakram"; public static final String OVERGROWTH_SEED = "overgrowthSeed"; - public static final String CRAFT_PATTERN = "craftPattern"; + public static final String CRAFT_PATTERN = "pattern"; public static final String ANCIENT_WILL = "ancient_will"; public static final String CORPOREA_SPARK = "corporeaSpark"; public static final String LIVINGWOOD_BOW = "livingwoodBow"; diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index 5ebc214b5..483ec0ae6 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -1494,15 +1494,15 @@ item.botania:spellCloth.name=Spellbinding Cloth item.botania:thorn_chakram.name=Thorn Chakram item.botania:flare_chakram.name=Flare Chakram item.botania:overgrowthSeed.name=Overgrowth Seed -item.botania:craftPattern0.name=Crafting Pattern #1: 1x1 -item.botania:craftPattern1.name=Crafting Pattern #2: 2x2 -item.botania:craftPattern2.name=Crafting Pattern #3: 1x2 -item.botania:craftPattern3.name=Crafting Pattern #4: 2x1 -item.botania:craftPattern4.name=Crafting Pattern #5: 1x3 -item.botania:craftPattern5.name=Crafting Pattern #6: 3x1 -item.botania:craftPattern6.name=Crafting Pattern #7: 2x3 -item.botania:craftPattern7.name=Crafting Pattern #8: 3x2 -item.botania:craftPattern8.name=Crafting Pattern #9: Donut +item.botania:pattern_crafty_1_1.name=Crafting Pattern #1: 1x1 +item.botania:pattern_crafty_2_2.name=Crafting Pattern #2: 2x2 +item.botania:pattern_crafty_1_2.name=Crafting Pattern #3: 1x2 +item.botania:pattern_crafty_2_1.name=Crafting Pattern #4: 2x1 +item.botania:pattern_crafty_1_3.name=Crafting Pattern #5: 1x3 +item.botania:pattern_crafty_3_1.name=Crafting Pattern #6: 3x1 +item.botania:pattern_crafty_2_3.name=Crafting Pattern #7: 2x3 +item.botania:pattern_crafty_3_2.name=Crafting Pattern #8: 3x2 +item.botania:pattern_crafty_donut.name=Crafting Pattern #9: Donut item.botania:gaia_ingot.name=Gaia Spirit Ingot item.botania:ancient_will_ahrim.name=Will of Ahrim item.botania:ancient_will_dharok.name=Will of Dharok diff --git a/src/main/resources/assets/botania/lang/es_es.lang b/src/main/resources/assets/botania/lang/es_es.lang index 6b7254260..8d79d3722 100644 --- a/src/main/resources/assets/botania/lang/es_es.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -1251,15 +1251,15 @@ item.botania:worldSeed.name=Semilla del mundo item.botania:spellCloth.name=Paño de vínculo encantado item.botania:thornChakram.name=Chakram de púas item.botania:overgrowthSeed.name=Semilla de sobrecrecimiento -item.botania:craftPattern0.name=Patrón de trabajo #1: 1x1 -item.botania:craftPattern1.name=Patrón de trabajo #2: 2x2 -item.botania:craftPattern2.name=Patrón de trabajo #3: 1x2 -item.botania:craftPattern3.name=Patrón de trabajo #4: 2x1 -item.botania:craftPattern4.name=Patrón de trabajo #5: 1x3 -item.botania:craftPattern5.name=Patrón de trabajo #6: 3x1 -item.botania:craftPattern6.name=Patrón de trabajo #7: 2x3 -item.botania:craftPattern7.name=Patrón de trabajo #8: 3x2 -item.botania:craftPattern8.name=Patrón de trabajo #9: Donut +item.botania:pattern_crafty_1_1.name=Patrón de trabajo #1: 1x1 +item.botania:pattern_crafty_2_2.name=Patrón de trabajo #2: 2x2 +item.botania:pattern_crafty_1_2.name=Patrón de trabajo #3: 1x2 +item.botania:pattern_crafty_2_1.name=Patrón de trabajo #4: 2x1 +item.botania:pattern_crafty_1_3.name=Patrón de trabajo #5: 1x3 +item.botania:pattern_crafty_3_1.name=Patrón de trabajo #6: 3x1 +item.botania:pattern_crafty_2_3.name=Patrón de trabajo #7: 2x3 +item.botania:pattern_crafty_3_2.name=Patrón de trabajo #8: 3x2 +item.botania:pattern_crafty_donut.name=Patrón de trabajo #9: Donut item.botania:gaia_ingot.name=Lingote de espíritu de Gaia item.botania:ancient_will_ahrim.name=Legado de Ahrim item.botania:ancient_will_dharok.name=Legado de Dharok diff --git a/src/main/resources/assets/botania/lang/fr_fr.lang b/src/main/resources/assets/botania/lang/fr_fr.lang index 2b7f2ca7d..cd3bcd395 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -1113,15 +1113,15 @@ item.botania:worldSeed.name=Graine de monde item.botania:spellCloth.name=Tissu fascinant item.botania:thornChakram.name=Thorn Chakram item.botania:overgrowthSeed.name=Graine de surcroissance -item.botania:craftPattern0.name=Modèle d'artisanat #1: 1x1 -item.botania:craftPattern1.name=Modèle d'artisanat #2: 2x2 -item.botania:craftPattern2.name=Modèle d'artisanat #3: 1x2 -item.botania:craftPattern3.name=Modèle d'artisanat #4: 2x1 -item.botania:craftPattern4.name=Modèle d'artisanat #5: 1x3 -item.botania:craftPattern5.name=Modèle d'artisanat #6: 3x1 -item.botania:craftPattern6.name=Modèle d'artisanat #7: 2x3 -item.botania:craftPattern7.name=Modèle d'artisanat #8: 3x2 -item.botania:craftPattern8.name=Modèle d'artisanat #9: Beignet +item.botania:pattern_crafty_1_1.name=Modèle d'artisanat #1: 1x1 +item.botania:pattern_crafty_2_2.name=Modèle d'artisanat #2: 2x2 +item.botania:pattern_crafty_1_2.name=Modèle d'artisanat #3: 1x2 +item.botania:pattern_crafty_2_1.name=Modèle d'artisanat #4: 2x1 +item.botania:pattern_crafty_1_3.name=Modèle d'artisanat #5: 1x3 +item.botania:pattern_crafty_3_1.name=Modèle d'artisanat #6: 3x1 +item.botania:pattern_crafty_2_3.name=Modèle d'artisanat #7: 2x3 +item.botania:pattern_crafty_3_2.name=Modèle d'artisanat #8: 3x2 +item.botania:pattern_crafty_donut.name=Modèle d'artisanat #9: Beignet item.botania:gaia_ingot.name=Lingot d'esprit de Gaïa item.botania:ancient_will_ahrim.name=Volonté d'Ahrim item.botania:ancient_will_dharok.name=Volonté de Dharok diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index 629954a95..59a123be6 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -1279,15 +1279,15 @@ item.botania:spellCloth.name=呪文が織り込まれた布 item.botania:thorn_chakram.name=棘のチャクラム item.botania:flare_chakram.name=炎のチャクラム item.botania:overgrowthSeed.name=育ちすぎた種 -item.botania:craftPattern0.name=クラフトパターン #1: 1x1 -item.botania:craftPattern1.name=クラフトパターン #2: 2x2 -item.botania:craftPattern2.name=クラフトパターン #3: 1x2 -item.botania:craftPattern3.name=クラフトパターン #4: 2x1 -item.botania:craftPattern4.name=クラフトパターン #5: 1x3 -item.botania:craftPattern5.name=クラフトパターン #6: 3x1 -item.botania:craftPattern6.name=クラフトパターン #7: 2x3 -item.botania:craftPattern7.name=クラフトパターン #8: 3x2 -item.botania:craftPattern8.name=クラフトパターン #9: ドーナツ +item.botania:pattern_crafty_1_1.name=クラフトパターン #1: 1x1 +item.botania:pattern_crafty_2_2.name=クラフトパターン #2: 2x2 +item.botania:pattern_crafty_1_2.name=クラフトパターン #3: 1x2 +item.botania:pattern_crafty_2_1.name=クラフトパターン #4: 2x1 +item.botania:pattern_crafty_1_3.name=クラフトパターン #5: 1x3 +item.botania:pattern_crafty_3_1.name=クラフトパターン #6: 3x1 +item.botania:pattern_crafty_2_3.name=クラフトパターン #7: 2x3 +item.botania:pattern_crafty_3_2.name=クラフトパターン #8: 3x2 +item.botania:pattern_crafty_donut.name=クラフトパターン #9: ドーナツ item.botania:gaia_ingot.name=ガイアの魂インゴット item.botania:ancient_will_ahrim.name=アリムの意思 item.botania:ancient_will_dharok.name=ダロクの意思 diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index 82aa16148..36083c162 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -1213,15 +1213,15 @@ item.botania:spellCloth.name=마음을 사로잡는 옷감 item.botania:thorn_chakram.name=가시 차크람 item.botania:flare_chakram.name=Flare Chakram item.botania:overgrowthSeed.name=과성장 씨앗 -item.botania:craftPattern0.name=제작 패턴 #1: 1x1 -item.botania:craftPattern1.name=제작 패턴 #2: 2x2 -item.botania:craftPattern2.name=제작 패턴 #3: 1x2 -item.botania:craftPattern3.name=제작 패턴 #4: 2x1 -item.botania:craftPattern4.name=제작 패턴 #5: 1x3 -item.botania:craftPattern5.name=제작 패턴 #6: 3x1 -item.botania:craftPattern6.name=제작 패턴 #7: 2x3 -item.botania:craftPattern7.name=제작 패턴 #8: 3x2 -item.botania:craftPattern8.name=제작 패턴 #9: 도넛 +item.botania:pattern_crafty_1_1.name=제작 패턴 #1: 1x1 +item.botania:pattern_crafty_2_2.name=제작 패턴 #2: 2x2 +item.botania:pattern_crafty_1_2.name=제작 패턴 #3: 1x2 +item.botania:pattern_crafty_2_1.name=제작 패턴 #4: 2x1 +item.botania:pattern_crafty_1_3.name=제작 패턴 #5: 1x3 +item.botania:pattern_crafty_3_1.name=제작 패턴 #6: 3x1 +item.botania:pattern_crafty_2_3.name=제작 패턴 #7: 2x3 +item.botania:pattern_crafty_3_2.name=제작 패턴 #8: 3x2 +item.botania:pattern_crafty_donut.name=제작 패턴 #9: 도넛 item.botania:gaia_ingot.name=대지의 영혼 주괴 item.botania:ancient_will_ahrim.name=아림의 의지 item.botania:ancient_will_dharok.name=더락의 의지 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index fa97fabd3..cae5dab68 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -1346,15 +1346,15 @@ item.botania:spellCloth.name=Betoveringsdoek item.botania:thorn_chakram.name=Doorn van Chakram item.botania:flare_chakram.name=Vlam van Chakram item.botania:overgrowthSeed.name=Overwoekeringszaad -item.botania:craftPattern0.name=Vervaardigingspatroon #1: 1x1 -item.botania:craftPattern1.name=Vervaardigingspatroon #2: 2x2 -item.botania:craftPattern2.name=Vervaardigingspatroon #3: 1x2 -item.botania:craftPattern3.name=Vervaardigingspatroon #4: 2x1 -item.botania:craftPattern4.name=Vervaardigingspatroon #5: 1x3 -item.botania:craftPattern5.name=Vervaardigingspatroon #6: 3x1 -item.botania:craftPattern6.name=Vervaardigingspatroon #7: 2x3 -item.botania:craftPattern7.name=Vervaardigingspatroon #8: 3x2 -item.botania:craftPattern8.name=Vervaardigingspatroon #9: Donut +item.botania:pattern_crafty_1_1.name=Vervaardigingspatroon #1: 1x1 +item.botania:pattern_crafty_2_2.name=Vervaardigingspatroon #2: 2x2 +item.botania:pattern_crafty_1_2.name=Vervaardigingspatroon #3: 1x2 +item.botania:pattern_crafty_2_1.name=Vervaardigingspatroon #4: 2x1 +item.botania:pattern_crafty_1_3.name=Vervaardigingspatroon #5: 1x3 +item.botania:pattern_crafty_3_1.name=Vervaardigingspatroon #6: 3x1 +item.botania:pattern_crafty_2_3.name=Vervaardigingspatroon #7: 2x3 +item.botania:pattern_crafty_3_2.name=Vervaardigingspatroon #8: 3x2 +item.botania:pattern_crafty_donut.name=Vervaardigingspatroon #9: Donut item.botania:gaia_ingot.name=Staaf van Gaia item.botania:ancient_will_ahrim.name=Wil van Ahrim item.botania:ancient_will_dharok.name=Wil van Dharok diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index e8d333930..ddbcbca8a 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -1496,15 +1496,15 @@ item.botania:spellCloth.name=Tecido Encantado item.botania:thornChakram.name=Chakram Espinhento item.botania:flare_chakram.name=Chakram Flamejante item.botania:overgrowthSeed.name=Semente do super-crescimento -item.botania:craftPattern0.name=Padrão de Criação #1: 1x1 -item.botania:craftPattern1.name=Padrão de Criação #2: 2x2 -item.botania:craftPattern2.name=Padrão de Criação #3: 1x2 -item.botania:craftPattern3.name=Padrão de Criação #4: 2x1 -item.botania:craftPattern4.name=Padrão de Criação #5: 1x3 -item.botania:craftPattern5.name=Padrão de Criação #6: 3x1 -item.botania:craftPattern6.name=Padrão de Criação #7: 2x3 -item.botania:craftPattern7.name=Padrão de Criação #8: 3x2 -item.botania:craftPattern8.name=Padrão de Criação #9: Arredores +item.botania:pattern_crafty_1_1.name=Padrão de Criação #1: 1x1 +item.botania:pattern_crafty_2_2.name=Padrão de Criação #2: 2x2 +item.botania:pattern_crafty_1_2.name=Padrão de Criação #3: 1x2 +item.botania:pattern_crafty_2_1.name=Padrão de Criação #4: 2x1 +item.botania:pattern_crafty_1_3.name=Padrão de Criação #5: 1x3 +item.botania:pattern_crafty_3_1.name=Padrão de Criação #6: 3x1 +item.botania:pattern_crafty_2_3.name=Padrão de Criação #7: 2x3 +item.botania:pattern_crafty_3_2.name=Padrão de Criação #8: 3x2 +item.botania:pattern_crafty_donut.name=Padrão de Criação #9: Arredores item.botania:gaia_ingot.name=Barra de Espírito de Gaia item.botania:ancient_will_ahrim.name=Vontade de Ahrim item.botania:ancient_will_dharok.name=Vontade de Dharok diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index 6fac84826..cb3b55aa4 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -1494,15 +1494,15 @@ item.botania:spellCloth.name=封印之布 item.botania:thorn_chakram.name=荆棘飞轮 item.botania:flare_chakram.name=闪耀飞轮 item.botania:overgrowthSeed.name=增生之种 -item.botania:craftPattern0.name=合成模板#1: 1x1 -item.botania:craftPattern1.name=合成模板#2: 2x2 -item.botania:craftPattern2.name=合成模板#3: 1x2 -item.botania:craftPattern3.name=合成模板#4: 2x1 -item.botania:craftPattern4.name=合成模板#5: 1x3 -item.botania:craftPattern5.name=合成模板#6: 3x1 -item.botania:craftPattern6.name=合成模板#7: 2x3 -item.botania:craftPattern7.name=合成模板#8: 3x2 -item.botania:craftPattern8.name=合成模板#9: 圈形 +item.botania:pattern_crafty_1_1.name=合成模板#1: 1x1 +item.botania:pattern_crafty_2_2.name=合成模板#2: 2x2 +item.botania:pattern_crafty_1_2.name=合成模板#3: 1x2 +item.botania:pattern_crafty_2_1.name=合成模板#4: 2x1 +item.botania:pattern_crafty_1_3.name=合成模板#5: 1x3 +item.botania:pattern_crafty_3_1.name=合成模板#6: 3x1 +item.botania:pattern_crafty_2_3.name=合成模板#7: 2x3 +item.botania:pattern_crafty_3_2.name=合成模板#8: 3x2 +item.botania:pattern_crafty_donut.name=合成模板#9: 圈形 item.botania:gaia_ingot.name=盖亚魂锭 item.botania:ancient_will_ahrim.name=艾琳的意志 item.botania:ancient_will_dharok.name=达洛克的意志 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index 2f73d47bb..dafedfc99 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -1459,15 +1459,15 @@ item.botania:spellCloth.name=封印之布 item.botania:thorn_chakram.name=荊棘飛輪 item.botania:flare_chakram.name=閃耀飛輪 item.botania:overgrowthSeed.name=增生之種 -item.botania:craftPattern0.name=合成模板#1: 1x1 -item.botania:craftPattern1.name=合成模板#2: 2x2 -item.botania:craftPattern2.name=合成模板#3: 1x2 -item.botania:craftPattern3.name=合成模板#4: 2x1 -item.botania:craftPattern4.name=合成模板#5: 1x3 -item.botania:craftPattern5.name=合成模板#6: 3x1 -item.botania:craftPattern6.name=合成模板#7: 2x3 -item.botania:craftPattern7.name=合成模板#8: 3x2 -item.botania:craftPattern8.name=合成模板#9: 圈形 +item.botania:pattern_crafty_1_1.name=合成模板#1: 1x1 +item.botania:pattern_crafty_2_2.name=合成模板#2: 2x2 +item.botania:pattern_crafty_1_2.name=合成模板#3: 1x2 +item.botania:pattern_crafty_2_1.name=合成模板#4: 2x1 +item.botania:pattern_crafty_1_3.name=合成模板#5: 1x3 +item.botania:pattern_crafty_3_1.name=合成模板#6: 3x1 +item.botania:pattern_crafty_2_3.name=合成模板#7: 2x3 +item.botania:pattern_crafty_3_2.name=合成模板#8: 3x2 +item.botania:pattern_crafty_donut.name=合成模板#9: 圈形 item.botania:gaia_ingot.name=蓋亞魂錠 item.botania:ancient_will_ahrim.name=艾琳的意志 item.botania:ancient_will_dharok.name=達洛克的意志 diff --git a/src/main/resources/assets/botania/models/item/craftpattern0.json b/src/main/resources/assets/botania/models/item/pattern_crafty_1_1.json similarity index 100% rename from src/main/resources/assets/botania/models/item/craftpattern0.json rename to src/main/resources/assets/botania/models/item/pattern_crafty_1_1.json diff --git a/src/main/resources/assets/botania/models/item/craftpattern2.json b/src/main/resources/assets/botania/models/item/pattern_crafty_1_2.json similarity index 100% rename from src/main/resources/assets/botania/models/item/craftpattern2.json rename to src/main/resources/assets/botania/models/item/pattern_crafty_1_2.json diff --git a/src/main/resources/assets/botania/models/item/craftpattern4.json b/src/main/resources/assets/botania/models/item/pattern_crafty_1_3.json similarity index 100% rename from src/main/resources/assets/botania/models/item/craftpattern4.json rename to src/main/resources/assets/botania/models/item/pattern_crafty_1_3.json diff --git a/src/main/resources/assets/botania/models/item/craftpattern3.json b/src/main/resources/assets/botania/models/item/pattern_crafty_2_1.json similarity index 100% rename from src/main/resources/assets/botania/models/item/craftpattern3.json rename to src/main/resources/assets/botania/models/item/pattern_crafty_2_1.json diff --git a/src/main/resources/assets/botania/models/item/craftpattern1.json b/src/main/resources/assets/botania/models/item/pattern_crafty_2_2.json similarity index 100% rename from src/main/resources/assets/botania/models/item/craftpattern1.json rename to src/main/resources/assets/botania/models/item/pattern_crafty_2_2.json diff --git a/src/main/resources/assets/botania/models/item/craftpattern6.json b/src/main/resources/assets/botania/models/item/pattern_crafty_2_3.json similarity index 100% rename from src/main/resources/assets/botania/models/item/craftpattern6.json rename to src/main/resources/assets/botania/models/item/pattern_crafty_2_3.json diff --git a/src/main/resources/assets/botania/models/item/craftpattern5.json b/src/main/resources/assets/botania/models/item/pattern_crafty_3_1.json similarity index 100% rename from src/main/resources/assets/botania/models/item/craftpattern5.json rename to src/main/resources/assets/botania/models/item/pattern_crafty_3_1.json diff --git a/src/main/resources/assets/botania/models/item/craftpattern7.json b/src/main/resources/assets/botania/models/item/pattern_crafty_3_2.json similarity index 100% rename from src/main/resources/assets/botania/models/item/craftpattern7.json rename to src/main/resources/assets/botania/models/item/pattern_crafty_3_2.json diff --git a/src/main/resources/assets/botania/models/item/craftpattern8.json b/src/main/resources/assets/botania/models/item/pattern_crafty_donut.json similarity index 100% rename from src/main/resources/assets/botania/models/item/craftpattern8.json rename to src/main/resources/assets/botania/models/item/pattern_crafty_donut.json diff --git a/src/main/resources/assets/botania/recipes/craftpattern_5.json b/src/main/resources/assets/botania/recipes/pattern_craft_3_1.json similarity index 71% rename from src/main/resources/assets/botania/recipes/craftpattern_5.json rename to src/main/resources/assets/botania/recipes/pattern_craft_3_1.json index a40db7bce..2a7824ccd 100644 --- a/src/main/resources/assets/botania/recipes/craftpattern_5.json +++ b/src/main/resources/assets/botania/recipes/pattern_craft_3_1.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:craftpattern", - "data": 5 + "item": "botania:pattern_crafty_3_1" }, "pattern": [ "RRR", @@ -9,7 +8,7 @@ "PPP" ], "type": "forge:ore_shaped", - "group": "botania:craftpattern", + "group": "botania:craft_pattern", "key": { "P": { "item": "#BPLACEHOLDER" diff --git a/src/main/resources/assets/botania/recipes/craftpattern_0.json b/src/main/resources/assets/botania/recipes/pattern_crafty_1_1.json similarity index 71% rename from src/main/resources/assets/botania/recipes/craftpattern_0.json rename to src/main/resources/assets/botania/recipes/pattern_crafty_1_1.json index 13f7c06b2..510a180c2 100644 --- a/src/main/resources/assets/botania/recipes/craftpattern_0.json +++ b/src/main/resources/assets/botania/recipes/pattern_crafty_1_1.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:craftpattern", - "data": 0 + "item": "botania:pattern_crafty_1_1" }, "pattern": [ "RPP", @@ -9,7 +8,7 @@ "PPP" ], "type": "forge:ore_shaped", - "group": "botania:craftpattern", + "group": "botania:craft_pattern", "key": { "P": { "item": "#BPLACEHOLDER" diff --git a/src/main/resources/assets/botania/recipes/craftpattern_2.json b/src/main/resources/assets/botania/recipes/pattern_crafty_1_2.json similarity index 71% rename from src/main/resources/assets/botania/recipes/craftpattern_2.json rename to src/main/resources/assets/botania/recipes/pattern_crafty_1_2.json index ca94dbe32..4489dc0b7 100644 --- a/src/main/resources/assets/botania/recipes/craftpattern_2.json +++ b/src/main/resources/assets/botania/recipes/pattern_crafty_1_2.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:craftpattern", - "data": 2 + "item": "botania:pattern_crafty_1_2" }, "pattern": [ "RPP", @@ -9,7 +8,7 @@ "PPP" ], "type": "forge:ore_shaped", - "group": "botania:craftpattern", + "group": "botania:craft_pattern", "key": { "P": { "item": "#BPLACEHOLDER" diff --git a/src/main/resources/assets/botania/recipes/craftpattern_4.json b/src/main/resources/assets/botania/recipes/pattern_crafty_1_3.json similarity index 71% rename from src/main/resources/assets/botania/recipes/craftpattern_4.json rename to src/main/resources/assets/botania/recipes/pattern_crafty_1_3.json index fee6e0574..5459cac67 100644 --- a/src/main/resources/assets/botania/recipes/craftpattern_4.json +++ b/src/main/resources/assets/botania/recipes/pattern_crafty_1_3.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:craftpattern", - "data": 4 + "item": "botania:pattern_crafty_1_3" }, "pattern": [ "RPP", @@ -9,7 +8,7 @@ "RPP" ], "type": "forge:ore_shaped", - "group": "botania:craftpattern", + "group": "botania:craft_pattern", "key": { "P": { "item": "#BPLACEHOLDER" diff --git a/src/main/resources/assets/botania/recipes/craftpattern_3.json b/src/main/resources/assets/botania/recipes/pattern_crafty_2_1.json similarity index 71% rename from src/main/resources/assets/botania/recipes/craftpattern_3.json rename to src/main/resources/assets/botania/recipes/pattern_crafty_2_1.json index 41f1cd390..0e2664040 100644 --- a/src/main/resources/assets/botania/recipes/craftpattern_3.json +++ b/src/main/resources/assets/botania/recipes/pattern_crafty_2_1.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:craftpattern", - "data": 3 + "item": "botania:pattern_crafty_2_1" }, "pattern": [ "RRP", @@ -9,7 +8,7 @@ "PPP" ], "type": "forge:ore_shaped", - "group": "botania:craftpattern", + "group": "botania:craft_pattern", "key": { "P": { "item": "#BPLACEHOLDER" diff --git a/src/main/resources/assets/botania/recipes/craftpattern_1.json b/src/main/resources/assets/botania/recipes/pattern_crafty_2_2.json similarity index 71% rename from src/main/resources/assets/botania/recipes/craftpattern_1.json rename to src/main/resources/assets/botania/recipes/pattern_crafty_2_2.json index 002c8115a..acb69bf47 100644 --- a/src/main/resources/assets/botania/recipes/craftpattern_1.json +++ b/src/main/resources/assets/botania/recipes/pattern_crafty_2_2.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:craftpattern", - "data": 1 + "item": "botania:pattern_crafty_2_2" }, "pattern": [ "RRP", @@ -9,7 +8,7 @@ "PPP" ], "type": "forge:ore_shaped", - "group": "botania:craftpattern", + "group": "botania:craft_pattern", "key": { "P": { "item": "#BPLACEHOLDER" diff --git a/src/main/resources/assets/botania/recipes/craftpattern_6.json b/src/main/resources/assets/botania/recipes/pattern_crafty_2_3.json similarity index 71% rename from src/main/resources/assets/botania/recipes/craftpattern_6.json rename to src/main/resources/assets/botania/recipes/pattern_crafty_2_3.json index caa5cd286..4e58bb3e1 100644 --- a/src/main/resources/assets/botania/recipes/craftpattern_6.json +++ b/src/main/resources/assets/botania/recipes/pattern_crafty_2_3.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:craftpattern", - "data": 6 + "item": "botania:pattern_crafty_2_3" }, "pattern": [ "RRP", @@ -9,7 +8,7 @@ "RRP" ], "type": "forge:ore_shaped", - "group": "botania:craftpattern", + "group": "botania:craft_pattern", "key": { "P": { "item": "#BPLACEHOLDER" diff --git a/src/main/resources/assets/botania/recipes/craftpattern_7.json b/src/main/resources/assets/botania/recipes/pattern_crafty_3_2.json similarity index 71% rename from src/main/resources/assets/botania/recipes/craftpattern_7.json rename to src/main/resources/assets/botania/recipes/pattern_crafty_3_2.json index e98e2619c..ae1cfe8dd 100644 --- a/src/main/resources/assets/botania/recipes/craftpattern_7.json +++ b/src/main/resources/assets/botania/recipes/pattern_crafty_3_2.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:craftpattern", - "data": 7 + "item": "botania:pattern_crafty_3_2" }, "pattern": [ "RRR", @@ -9,7 +8,7 @@ "PPP" ], "type": "forge:ore_shaped", - "group": "botania:craftpattern", + "group": "botania:craft_pattern", "key": { "P": { "item": "#BPLACEHOLDER" diff --git a/src/main/resources/assets/botania/recipes/craftpattern_8.json b/src/main/resources/assets/botania/recipes/pattern_crafty_donut.json similarity index 71% rename from src/main/resources/assets/botania/recipes/craftpattern_8.json rename to src/main/resources/assets/botania/recipes/pattern_crafty_donut.json index 4b44890f9..206e67244 100644 --- a/src/main/resources/assets/botania/recipes/craftpattern_8.json +++ b/src/main/resources/assets/botania/recipes/pattern_crafty_donut.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:craftpattern", - "data": 8 + "item": "botania:pattern_crafty_donut" }, "pattern": [ "RRR", @@ -9,7 +8,7 @@ "RRR" ], "type": "forge:ore_shaped", - "group": "botania:craftpattern", + "group": "botania:craft_pattern", "key": { "P": { "item": "#BPLACEHOLDER"