diff --git a/README.md b/README.md index 3d64250..555cbfe 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Add more foods to your Minecraft! You can read [a brief propuse of this Mod here](/docs/PURPOSE.md) -> 一个过时的项目,一个过气的老玩家,一个永远无法完成的坑。 +> 一个过时的项目,一个过气的老玩家,一个~~永远无法~~**当然可以**完成的坑。 > > 拿出一些时间看看吧,看看你身边的人,看看那些曾陪你欢笑,与你分享,与你争吵,一起聊天的人。 > diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 0000000..e14fd34 --- /dev/null +++ b/docs/README.md @@ -0,0 +1,20 @@ +# 食物工艺 文档 + +[~~_没有人会喜欢的 Purpose_~~](PURPOSE.md) + +食物工艺增加了很多中外菜品, 以及他们 _略微科学_ 的制作方法. 从分类来看, 本 Mod 添加了水果, 蔬菜, 调味料, 各种饮料, 小吃与大餐. + +## 主要内容 + +- [播种与收获](Planting.md) +- [热量系统](Heating.md) + +## 旧版食物工艺与新版食物工艺的异同 + +同: 材质, 机制, 基础设定 + +异: + +- 跨 Mod 兼容性新版更好, 兼容了了基本所有的矿物辞典(基于**潘马斯农场**), 增加了大量 JEI 支持, Patchouli 手册以及 TOP 支持. +- 可配置的机器, JSON 合成 +- 旧版一些未实现的内容(如酸奶,蛋糕)正在考虑以一种全新的方法添加回来. diff --git a/gradle.properties b/gradle.properties index e528ed7..e7bb611 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G # FoodCraft Reloaded Mod Properties mod_id = foodcraftreloaded -mod_version = 1.0.0-SNAPSHOT +mod_version = 1.0.0-EA mod_group = com.projecturanus.foodcraft # Minecraft & Forge diff --git a/src/main/java/com/projecturanus/foodcraft/FoodCraftReloaded.kt b/src/main/java/com/projecturanus/foodcraft/FoodCraftReloaded.kt index 964c98c..d4067e0 100644 --- a/src/main/java/com/projecturanus/foodcraft/FoodCraftReloaded.kt +++ b/src/main/java/com/projecturanus/foodcraft/FoodCraftReloaded.kt @@ -67,6 +67,11 @@ object FoodCraftReloaded { RegisterHandler.mirrorOres("listAlloil", "foodOliveoil") } + RegisterHandler.mirrorOres("circuitIngredient", "cropRice") + RegisterHandler.mirrorOres("circuitIngredient", "cropWheat") + RegisterHandler.mirrorOres("circuitIngredient", "cropSoybean") + RegisterHandler.mirrorOres("circuitIngredient", "cropPeanut") + if (!Loader.isModLoaded("commoncapabilities")) { DefaultCapabilities.registerDefaultCapabilities() } diff --git a/src/main/java/com/projecturanus/foodcraft/client/gui/widget/WidgetCookBar.kt b/src/main/java/com/projecturanus/foodcraft/client/gui/widget/WidgetCookBar.kt index f9d4635..467742a 100644 --- a/src/main/java/com/projecturanus/foodcraft/client/gui/widget/WidgetCookBar.kt +++ b/src/main/java/com/projecturanus/foodcraft/client/gui/widget/WidgetCookBar.kt @@ -18,7 +18,7 @@ class WidgetCookBar(val x: Int, val y: Int, val progress: KProperty0.Getter= 0 && FcConfig.clientConfig.enableHoverInfo) { - this.drawHoveringText(listOf("Overcooked progress: ${progress.invoke()}"), x, y, fontRenderer) + this.drawHoveringText(listOf(String.format("Overcooked progress: %.2f%%", progress.invoke() * 100.0)), x, y, fontRenderer) } } } diff --git a/src/main/java/com/projecturanus/foodcraft/common/block/BlockChoppingBoard.kt b/src/main/java/com/projecturanus/foodcraft/common/block/BlockChoppingBoard.kt index e0d87ed..c421cb9 100644 --- a/src/main/java/com/projecturanus/foodcraft/common/block/BlockChoppingBoard.kt +++ b/src/main/java/com/projecturanus/foodcraft/common/block/BlockChoppingBoard.kt @@ -4,14 +4,27 @@ import com.projecturanus.foodcraft.FoodCraftReloaded import com.projecturanus.foodcraft.common.CHOPPING_BOARD import com.projecturanus.foodcraft.common.block.entity.TileEntityChoppingBoard import net.minecraft.block.state.IBlockState +import net.minecraft.entity.Entity import net.minecraft.entity.player.EntityPlayer import net.minecraft.tileentity.TileEntity import net.minecraft.util.EnumFacing import net.minecraft.util.EnumHand +import net.minecraft.util.math.AxisAlignedBB import net.minecraft.util.math.BlockPos +import net.minecraft.world.IBlockAccess import net.minecraft.world.World class BlockChoppingBoard : BlockMachine() { + val collisionBox = AxisAlignedBB(0.0, 0.0, 2.5, 16.0, 0.8, 13.5) + + override fun getCollisionBoundingBox(blockState: IBlockState, worldIn: IBlockAccess, pos: BlockPos): AxisAlignedBB? { + return collisionBox + } + + override fun addCollisionBoxToList(state: IBlockState, worldIn: World, pos: BlockPos, entityBox: AxisAlignedBB, collidingBoxes: MutableList, entityIn: Entity?, isActualState: Boolean) { + collidingBoxes += collisionBox + } + override fun createNewTileEntity(worldIn: World, meta: Int): TileEntity = TileEntityChoppingBoard() override fun onBlockActivated(worldIn: World, pos: BlockPos, state: IBlockState, playerIn: EntityPlayer, hand: EnumHand, facing: EnumFacing, hitX: Float, hitY: Float, hitZ: Float): Boolean { diff --git a/src/main/java/com/projecturanus/foodcraft/common/block/BlockPan.kt b/src/main/java/com/projecturanus/foodcraft/common/block/BlockPan.kt index 84e313b..902d84a 100644 --- a/src/main/java/com/projecturanus/foodcraft/common/block/BlockPan.kt +++ b/src/main/java/com/projecturanus/foodcraft/common/block/BlockPan.kt @@ -4,14 +4,27 @@ import com.projecturanus.foodcraft.FoodCraftReloaded import com.projecturanus.foodcraft.common.PAN import com.projecturanus.foodcraft.common.block.entity.TileEntityPan import net.minecraft.block.state.IBlockState +import net.minecraft.entity.Entity import net.minecraft.entity.player.EntityPlayer import net.minecraft.tileentity.TileEntity import net.minecraft.util.EnumFacing import net.minecraft.util.EnumHand +import net.minecraft.util.math.AxisAlignedBB import net.minecraft.util.math.BlockPos +import net.minecraft.world.IBlockAccess import net.minecraft.world.World class BlockPan : BlockMachine() { + val collisionBox = AxisAlignedBB(3.0, 1.0, 2.5, 13.0, 0.8, 13.5) + + override fun getCollisionBoundingBox(blockState: IBlockState, worldIn: IBlockAccess, pos: BlockPos): AxisAlignedBB? { + return collisionBox + } + + override fun addCollisionBoxToList(state: IBlockState, worldIn: World, pos: BlockPos, entityBox: AxisAlignedBB, collidingBoxes: MutableList, entityIn: Entity?, isActualState: Boolean) { + collidingBoxes += collisionBox + } + override fun createNewTileEntity(worldIn: World, meta: Int): TileEntity = TileEntityPan() override fun setDefaultTemperature(worldIn: World, pos: BlockPos, temperature: Double) { diff --git a/src/main/java/com/projecturanus/foodcraft/common/block/BlockPot.kt b/src/main/java/com/projecturanus/foodcraft/common/block/BlockPot.kt index d2bff67..2242e0a 100644 --- a/src/main/java/com/projecturanus/foodcraft/common/block/BlockPot.kt +++ b/src/main/java/com/projecturanus/foodcraft/common/block/BlockPot.kt @@ -4,14 +4,27 @@ import com.projecturanus.foodcraft.FoodCraftReloaded import com.projecturanus.foodcraft.common.POT import com.projecturanus.foodcraft.common.block.entity.TileEntityPot import net.minecraft.block.state.IBlockState +import net.minecraft.entity.Entity import net.minecraft.entity.player.EntityPlayer import net.minecraft.tileentity.TileEntity import net.minecraft.util.EnumFacing import net.minecraft.util.EnumHand +import net.minecraft.util.math.AxisAlignedBB import net.minecraft.util.math.BlockPos +import net.minecraft.world.IBlockAccess import net.minecraft.world.World class BlockPot : BlockMachine() { + val collisionBox = AxisAlignedBB(0.0, 0.0, 2.5, 16.0, 0.8, 13.5) + + override fun getCollisionBoundingBox(blockState: IBlockState, worldIn: IBlockAccess, pos: BlockPos): AxisAlignedBB? { + return collisionBox + } + + override fun addCollisionBoxToList(state: IBlockState, worldIn: World, pos: BlockPos, entityBox: AxisAlignedBB, collidingBoxes: MutableList, entityIn: Entity?, isActualState: Boolean) { + collidingBoxes += collisionBox + } + override fun createNewTileEntity(worldIn: World, meta: Int): TileEntity = TileEntityPot() override fun setDefaultTemperature(worldIn: World, pos: BlockPos, temperature: Double) { diff --git a/src/main/java/com/projecturanus/foodcraft/common/block/BlockPressureCooker.kt b/src/main/java/com/projecturanus/foodcraft/common/block/BlockPressureCooker.kt index 5e6649a..f8f8ef7 100644 --- a/src/main/java/com/projecturanus/foodcraft/common/block/BlockPressureCooker.kt +++ b/src/main/java/com/projecturanus/foodcraft/common/block/BlockPressureCooker.kt @@ -4,14 +4,27 @@ import com.projecturanus.foodcraft.FoodCraftReloaded import com.projecturanus.foodcraft.common.PRESSURE_COOKER import com.projecturanus.foodcraft.common.block.entity.TileEntityPressureCooker import net.minecraft.block.state.IBlockState +import net.minecraft.entity.Entity import net.minecraft.entity.player.EntityPlayer import net.minecraft.tileentity.TileEntity import net.minecraft.util.EnumFacing import net.minecraft.util.EnumHand +import net.minecraft.util.math.AxisAlignedBB import net.minecraft.util.math.BlockPos +import net.minecraft.world.IBlockAccess import net.minecraft.world.World class BlockPressureCooker : BlockMachine() { + val collisionBox = AxisAlignedBB(0.0, 0.0, 2.5, 16.0, 0.8, 13.5) + + override fun getCollisionBoundingBox(blockState: IBlockState, worldIn: IBlockAccess, pos: BlockPos): AxisAlignedBB? { + return collisionBox + } + + override fun addCollisionBoxToList(state: IBlockState, worldIn: World, pos: BlockPos, entityBox: AxisAlignedBB, collidingBoxes: MutableList, entityIn: Entity?, isActualState: Boolean) { + collidingBoxes += collisionBox + } + override fun createNewTileEntity(worldIn: World, meta: Int): TileEntity = TileEntityPressureCooker() override fun setDefaultTemperature(worldIn: World, pos: BlockPos, temperature: Double) { diff --git a/src/main/java/com/projecturanus/foodcraft/common/block/BlockStove.kt b/src/main/java/com/projecturanus/foodcraft/common/block/BlockStove.kt index 252f3b1..3450020 100644 --- a/src/main/java/com/projecturanus/foodcraft/common/block/BlockStove.kt +++ b/src/main/java/com/projecturanus/foodcraft/common/block/BlockStove.kt @@ -3,14 +3,21 @@ package com.projecturanus.foodcraft.common.block import com.projecturanus.foodcraft.FoodCraftReloaded import com.projecturanus.foodcraft.common.STOVE import com.projecturanus.foodcraft.common.block.entity.TileEntityStove +import net.minecraft.block.BlockFurnace import net.minecraft.block.state.IBlockState import net.minecraft.entity.player.EntityPlayer +import net.minecraft.init.SoundEvents import net.minecraft.tileentity.TileEntity import net.minecraft.tileentity.TileEntityFurnace import net.minecraft.util.EnumFacing import net.minecraft.util.EnumHand +import net.minecraft.util.EnumParticleTypes +import net.minecraft.util.SoundCategory import net.minecraft.util.math.BlockPos import net.minecraft.world.World +import net.minecraftforge.fml.relauncher.Side +import net.minecraftforge.fml.relauncher.SideOnly +import java.util.* class BlockStove : BlockMachine() { override fun createNewTileEntity(worldIn: World, meta: Int): TileEntity = TileEntityStove() @@ -29,4 +36,41 @@ class BlockStove : BlockMachine() { } return true } + + /** + * Called periodically clientside on blocks near the player to show effects (like furnace fire particles). Note that + * this method is unrelated to [randomTick] and [.needsRandomTick], and will always be called regardless + * of whether the block can receive random update ticks + * @see BlockFurnace + */ + @SideOnly(Side.CLIENT) + override fun randomDisplayTick(stateIn: IBlockState, worldIn: World, pos: BlockPos, rand: Random) { + val enumfacing = stateIn.getValue(BlockFurnace.FACING) as EnumFacing + val d0 = pos.x.toDouble() + 0.5 + val d1 = pos.y.toDouble() + rand.nextDouble() * 6.0 / 16.0 + val d2 = pos.z.toDouble() + 0.5 + val d3 = 0.52 + val d4 = rand.nextDouble() * 0.6 - 0.3 + if (rand.nextDouble() < 0.1) { + worldIn.playSound(pos.x.toDouble() + 0.5, pos.y.toDouble(), pos.z.toDouble() + 0.5, SoundEvents.BLOCK_FURNACE_FIRE_CRACKLE, SoundCategory.BLOCKS, 1.0f, 1.0f, false) + } + when (enumfacing) { + EnumFacing.WEST -> { + worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 - 0.52, d1, d2 + d4, 0.0, 0.0, 0.0) + worldIn.spawnParticle(EnumParticleTypes.FLAME, d0 - 0.52, d1, d2 + d4, 0.0, 0.0, 0.0) + } + EnumFacing.EAST -> { + worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + 0.52, d1, d2 + d4, 0.0, 0.0, 0.0) + worldIn.spawnParticle(EnumParticleTypes.FLAME, d0 + 0.52, d1, d2 + d4, 0.0, 0.0, 0.0) + } + EnumFacing.NORTH -> { + worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 - 0.52, 0.0, 0.0, 0.0) + worldIn.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 - 0.52, 0.0, 0.0, 0.0) + } + EnumFacing.SOUTH -> { + worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 + 0.52, 0.0, 0.0, 0.0) + worldIn.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 + 0.52, 0.0, 0.0, 0.0) + } + } + } } diff --git a/src/main/java/com/projecturanus/foodcraft/common/block/BlockSugarLike.kt b/src/main/java/com/projecturanus/foodcraft/common/block/BlockSugarLike.kt index 08ef3c1..f2e87ab 100644 --- a/src/main/java/com/projecturanus/foodcraft/common/block/BlockSugarLike.kt +++ b/src/main/java/com/projecturanus/foodcraft/common/block/BlockSugarLike.kt @@ -7,15 +7,18 @@ import net.minecraft.item.ItemStack import net.minecraft.util.math.BlockPos import net.minecraft.world.World import net.minecraftforge.common.ForgeHooks +import net.minecraftforge.fml.common.registry.ForgeRegistries import java.util.* class BlockSugarLike : BlockReed() { + val item by lazy { ForgeRegistries.ITEMS.getValue(this.registryName)!! } + override fun getItem(worldIn: World, pos: BlockPos, state: IBlockState): ItemStack { - return ItemStack(this) + return ItemStack(item) } override fun getItemDropped(state: IBlockState?, rand: Random?, fortune: Int): Item? { - return Item.getItemFromBlock(this) + return item } override fun updateTick(worldIn: World, pos: BlockPos, state: IBlockState, rand: Random) { diff --git a/src/main/java/com/projecturanus/foodcraft/common/config/FcConfig.java b/src/main/java/com/projecturanus/foodcraft/common/config/FcConfig.java index a30a443..10af3da 100644 --- a/src/main/java/com/projecturanus/foodcraft/common/config/FcConfig.java +++ b/src/main/java/com/projecturanus/foodcraft/common/config/FcConfig.java @@ -1,10 +1,12 @@ package com.projecturanus.foodcraft.common.config; import com.projecturanus.foodcraft.FoodCraftReloadedKt; +import com.projecturanus.foodcraft.worldgen.FruitTreeWorldGen; import net.minecraftforge.common.config.Config; import net.minecraftforge.common.config.ConfigManager; import net.minecraftforge.fml.client.event.ConfigChangedEvent; import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -12,10 +14,14 @@ @Mod.EventBusSubscriber(modid = FoodCraftReloadedKt.MODID, value = Side.CLIENT) public class FcConfig { @Config.Name("Fruit Tree Generate Chance") - @Config.Comment({"Generate chance for fruit tree, default to 0.07(7%)", "This will replace vanilla tree generation by event"}) + @Config.Comment({"Generate chance for fruit tree, default to 0.08 (lower to be more rare)", "This will replace vanilla tree generation by event"}) @Config.RangeDouble(min = 0.0, max = 1.0) @Config.SlidingOption - public static double fruitTreeChance = 0.07; + public static double fruitTreeChance = 0.08; + + @Config.Name("Fruit Tree Biomes Whitelist") + @Config.Comment("Use ; to split, requires full ResourceLocation name") + public static String fruitTreeBiomes = "minecraft:jungle;minecraft:forest;minecraft:forest_hills;minecraft:birch_forest;minecraft:birch_forest_hills;minecraft:mutated_jungle;minecraft:mutated_jungle_edge"; @Config.Name("Machine Settings") public static MachineConfig machineConfig = new MachineConfig(); @@ -119,9 +125,11 @@ public static class ClientConfig { } @SideOnly(Side.CLIENT) + @SubscribeEvent public static void onReloadConfig(ConfigChangedEvent event) { if (event.getModID().equals(FoodCraftReloadedKt.MODID)) { ConfigManager.sync(FoodCraftReloadedKt.MODID, Config.Type.INSTANCE); + FruitTreeWorldGen.INSTANCE.setBiomeIds(fruitTreeBiomes); } } } diff --git a/src/main/java/com/projecturanus/foodcraft/common/heat/FuelHeatHandler.kt b/src/main/java/com/projecturanus/foodcraft/common/heat/FuelHeatHandler.kt index ddac4ae..778ef1b 100644 --- a/src/main/java/com/projecturanus/foodcraft/common/heat/FuelHeatHandler.kt +++ b/src/main/java/com/projecturanus/foodcraft/common/heat/FuelHeatHandler.kt @@ -33,7 +33,8 @@ class FuelHeatHandler : HeatHandler, FuelHandler, INBTSerializable() + + var biomeIds + get() = "" + set(value: String) { + biomeIdsInternal = value + .split(";") + .map { ResourceLocation(it) } + .filter { ForgeRegistries.BIOMES.containsKey(it) } + .map { (ForgeRegistries.BIOMES as ForgeRegistry).getID(it) } + } + @SubscribeEvent fun genFruitTrees(event: DecorateBiomeEvent.Decorate) { if (event.type == DecorateBiomeEvent.Decorate.EventType.TREE) { - val xorRand = Random(event.world.seed) - if (xorRand.nextDouble() > 1 - FcConfig.fruitTreeChance) { - val sapling = SAPLINGS.random(xorRand) - generateTree(event.world, event.world.getHeight(event.chunkPos.getBlock(xorRand.nextInt(16) + 8, 0, xorRand.nextInt(16) + 8)), sapling.defaultState, event.rand, sapling.leavesState, false) - event.result = Event.Result.DENY + if (event.rand.nextGaussian() > 1.0 - FcConfig.fruitTreeChance) { + val sapling = SAPLINGS[event.rand.nextInt(SAPLINGS.size)] + val pos = event.world.getHeight(event.chunkPos.getBlock(event.rand.nextInt(16) + 8, 0, event.rand.nextInt(16) + 8)) + if ((ForgeRegistries.BIOMES as ForgeRegistry).getID(event.world.getBiome(pos)) in biomeIdsInternal) + generateTree(event.world, pos, sapling.defaultState, event.rand, sapling.leavesState, false) } } } diff --git a/src/main/resources/assets/foodcraftreloaded/lang/en_us.lang b/src/main/resources/assets/foodcraftreloaded/lang/en_us.lang index c64d61e..e3d1ca9 100644 --- a/src/main/resources/assets/foodcraftreloaded/lang/en_us.lang +++ b/src/main/resources/assets/foodcraftreloaded/lang/en_us.lang @@ -1,3 +1,7 @@ +# Book +item.foodcraftreloaded.boiling_book.name="Boiling" Cooking Book! +item.foodcraftreloaded.boiling_book.landing=This guide can train as a FoodCraft master cook! + # Items item.foodcraftreloaded.glass_cup.name=Glass Cup item.foodcraftreloaded.wrench.name=Wrench @@ -59,6 +63,8 @@ item.foodcraftreloaded.dumpling.name=Chinese Dumpling item.foodcraftreloaded.fried_dumpling.name=Fried Dumpling item.foodcraftreloaded.chocolate_bar.name=Chocolate bar item.foodcraftreloaded.tofu.name=Tofu +item.foodcraftreloaded.curry.name=Curry +item.foodcraftreloaded.chocolate_dust.name=Chocolate Dust item.foodcraftreloaded.dehydrated_tofu.name=Dehydrated Tofu item.foodcraftreloaded.fried_potato_chips.name=Fried Potato Chips item.foodcraftreloaded.zongzi.name=Zongzi @@ -231,10 +237,7 @@ item.foodcraftreloaded.liqueur.name=%s Liqueur item.foodcraftreloaded.yogurt.name=%s Yogurt # Blocks -tile.rice.name=Rice Block -tile.drinkMachine.name=Drink Machine -tile.smeltingDrinkMachine.name=Smelting Drink Machine - +tile.foodcraftreloaded.machine_casing.name=Machine Casing tile.foodcraftreloaded.mill.name=Mill tile.foodcraftreloaded.pan.name=Pan tile.foodcraftreloaded.pressure_cooker.name=Pressure Cooker @@ -245,6 +248,8 @@ tile.foodcraftreloaded.brew_barrel.name=Brew Barrel tile.foodcraftreloaded.stove.name=Stove tile.foodcraftreloaded.beverage_making.name=Beverage Making Machine +tile.foodcraftreloaded.green_onion.name=Green Onion + # Gui container.drink_machine=Drink Machine diff --git a/src/main/resources/assets/foodcraftreloaded/lang/zh_cn.lang b/src/main/resources/assets/foodcraftreloaded/lang/zh_cn.lang index 56ce7ce..1a73b08 100644 --- a/src/main/resources/assets/foodcraftreloaded/lang/zh_cn.lang +++ b/src/main/resources/assets/foodcraftreloaded/lang/zh_cn.lang @@ -1,8 +1,10 @@ +# Book +item.foodcraftreloaded.boiling_book.name=沸腾中的烹调书! +item.foodcraftreloaded.boiling_book.landing=这本书可以指导你如何成为食物工艺的烹调大师! + # Blocks # Machines -tile.smeltingDrinkMachine.name=烧炼饮料制作机 -tile.drinkMachine.name=饮料制作机 - +tile.foodcraftreloaded.machine_casing.name=食物机器外壳 tile.foodcraftreloaded.mill.name=碾磨机 tile.foodcraftreloaded.pan.name=平底锅 tile.foodcraftreloaded.pressure_cooker.name=高压锅 @@ -13,6 +15,8 @@ tile.foodcraftreloaded.brew_barrel.name=酿桶 tile.foodcraftreloaded.stove.name=灶炉 tile.foodcraftreloaded.beverage_making.name=饮料制作机 +tile.foodcraftreloaded.green_onion.name=葱苗 + # Items item.foodcraftreloaded.glass_cup.name=玻璃杯 item.foodcraftreloaded.wrench.name=扳手 @@ -73,6 +77,8 @@ item.foodcraftreloaded.dumpling.name=饺子 item.foodcraftreloaded.fried_dumpling.name=煎饺 item.foodcraftreloaded.chocolate_bar.name=巧克力 item.foodcraftreloaded.tofu.name=豆腐 +item.foodcraftreloaded.curry.name=咖喱块 +item.foodcraftreloaded.chocolate_dust.name=巧克力粉 item.foodcraftreloaded.dehydrated_tofu.name=豆腐干 item.foodcraftreloaded.fried_potato_chips.name=炒土豆片 item.foodcraftreloaded.zongzi.name=粽子 diff --git a/src/main/resources/assets/foodcraftreloaded/loot_tables/snacks.json b/src/main/resources/assets/foodcraftreloaded/loot_tables/snacks.json new file mode 100644 index 0000000..3cbf351 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/loot_tables/snacks.json @@ -0,0 +1,108 @@ +{ + "pools": [ + { + "name": "snacks_pool", + "rolls": 2, + "entries": [ + { + "type": "item", + "name": "foodcraftreloaded:pixian_watercress", + "weight": 16, + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + }, + { + "type": "item", + "name": "foodcraftreloaded:zongye", + "weight": 16, + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 10 + } + } + ] + }, + { + "type": "item", + "name": "foodcraftreloaded:coffee", + "weight": 10, + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + }, + { + "type": "item", + "name": "foodcraftreloaded:curry", + "weight": 16, + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 10 + } + } + ] + }, + { + "type": "item", + "name": "foodcraftreloaded:walnut_shortbread", + "weight": 16, + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 4 + } + } + ] + }, + { + "type": "item", + "name": "foodcraftreloaded:sausage", + "weight": 16, + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 10 + } + } + ] + }, + { + "type": "item", + "name": "foodcraftreloaded:lawei_flavor", + "weight": 16, + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 8 + } + } + ] + } + ] + } + ] +} diff --git a/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/book.json b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/book.json new file mode 100644 index 0000000..75c1e9c --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/book.json @@ -0,0 +1,6 @@ +{ + "name": "item.foodcraftreloaded.boiling_book.name", + "landing_text": "item.foodcraftreloaded.boiling_book.landing", + "model": "patchouli:book_red", + "creative_tab": "food" +} diff --git a/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/categories/machines.json b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/categories/machines.json new file mode 100644 index 0000000..d560f31 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/categories/machines.json @@ -0,0 +1,5 @@ +{ + "name": "Machines", + "description": "Machines can be used to create a big meal", + "icon": "foodcraftreloaded:beverage_making" +} diff --git a/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/categories/snacks.json b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/categories/snacks.json new file mode 100644 index 0000000..0325f60 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/categories/snacks.json @@ -0,0 +1,5 @@ +{ + "name": "Snacks", + "description": "Fast foods", + "icon": "foodcraftreloaded:poached_egg" +} diff --git a/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/entries/beverage_making.json b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/entries/beverage_making.json new file mode 100644 index 0000000..cdd552e --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/entries/beverage_making.json @@ -0,0 +1,15 @@ +{ + "name": "Beverage Making", + "icon": "foodcraftreloaded:beverage_making", + "category": "machines", + "pages": [ + { + "type": "text", + "text": "Beverage Making machine can be used to create drinks." + }, + { + "type": "crafting", + "recipe": "foodcraftreloaded:beverage_making" + } + ] +} diff --git a/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/entries/brew_barrel.json b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/entries/brew_barrel.json new file mode 100644 index 0000000..6dceabd --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/entries/brew_barrel.json @@ -0,0 +1,15 @@ +{ + "name": "Brew Barrel", + "icon": "foodcraftreloaded:brew_barrel", + "category": "machines", + "pages": [ + { + "type": "text", + "text": "Brew Barrel machine can be used to create wines." + }, + { + "type": "crafting", + "recipe": "foodcraftreloaded:brew_barrel" + } + ] +} diff --git a/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/entries/chopping_board.json b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/entries/chopping_board.json new file mode 100644 index 0000000..4c5de7d --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/entries/chopping_board.json @@ -0,0 +1,15 @@ +{ + "name": "Chopping Board", + "icon": "foodcraftreloaded:chopping_board", + "category": "machines", + "pages": [ + { + "type": "text", + "text": "Chopping Board can be used to cut ingredients." + }, + { + "type": "crafting", + "recipe": "foodcraftreloaded:chopping_board" + } + ] +} diff --git a/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/entries/frying_pan.json b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/entries/frying_pan.json new file mode 100644 index 0000000..f862306 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/entries/frying_pan.json @@ -0,0 +1,15 @@ +{ + "name": "Frying Pan", + "icon": "foodcraftreloaded:frying_pan", + "category": "machines", + "pages": [ + { + "type": "text", + "text": "Frying Pan can be used to fry foods." + }, + { + "type": "crafting", + "recipe": "foodcraftreloaded:frying_pan" + } + ] +} diff --git a/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/entries/mill.json b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/entries/mill.json new file mode 100644 index 0000000..c42395e --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/entries/mill.json @@ -0,0 +1,15 @@ +{ + "name": "Mill", + "icon": "foodcraftreloaded:mill", + "category": "machines", + "pages": [ + { + "type": "text", + "text": "Mill can be used to mill ingredients." + }, + { + "type": "crafting", + "recipe": "foodcraftreloaded:mill" + } + ] +} diff --git a/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/entries/pan.json b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/entries/pan.json new file mode 100644 index 0000000..da93cb7 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/entries/pan.json @@ -0,0 +1,15 @@ +{ + "name": "Pan", + "icon": "foodcraftreloaded:pan", + "category": "machines", + "pages": [ + { + "type": "text", + "text": "Pan can be used to create meals. Needs external heater(Stove)." + }, + { + "type": "crafting", + "recipe": "foodcraftreloaded:pan" + } + ] +} diff --git a/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/entries/pot.json b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/entries/pot.json new file mode 100644 index 0000000..178eb62 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/entries/pot.json @@ -0,0 +1,15 @@ +{ + "name": "Pot", + "icon": "foodcraftreloaded:pot", + "category": "machines", + "pages": [ + { + "type": "text", + "text": "Pan can be used to create meals. Needs external heater(Stove)." + }, + { + "type": "crafting", + "recipe": "foodcraftreloaded:pot" + } + ] +} diff --git a/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/entries/stove.json b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/entries/stove.json new file mode 100644 index 0000000..004a832 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/en_us/entries/stove.json @@ -0,0 +1,15 @@ +{ + "name": "Stove", + "icon": "foodcraftreloaded:stove", + "category": "machines", + "pages": [ + { + "type": "text", + "text": "Stove is an external heater." + }, + { + "type": "crafting", + "recipe": "foodcraftreloaded:stove" + } + ] +} diff --git a/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/categories/machines.json b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/categories/machines.json new file mode 100644 index 0000000..39a4765 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/categories/machines.json @@ -0,0 +1,5 @@ +{ + "name": "机器", + "description": "用来制作食材和食物的机器们.", + "icon": "foodcraftreloaded:beverage_making" +} diff --git a/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/categories/snacks.json b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/categories/snacks.json new file mode 100644 index 0000000..a17eaea --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/categories/snacks.json @@ -0,0 +1,5 @@ +{ + "name": "小吃", + "description": "小吃是一类制作简单, 方便出行时快速回复饱食度的最好选择.\n一些小吃可以在地牢箱子中找到.", + "icon": "foodcraftreloaded:poached_egg" +} diff --git a/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/beverage_making.json b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/beverage_making.json new file mode 100644 index 0000000..cd78a48 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/beverage_making.json @@ -0,0 +1,15 @@ +{ + "name": "饮料制作机", + "icon": "foodcraftreloaded:beverage_making", + "category": "machines", + "pages": [ + { + "type": "text", + "text": "饮料制作机, 顾名思义, 可以为你制作饮料.$(br)饮料都需要你加热或冷却, 你可以在 JEI 中查看饮料如何制作, 并在机器中放入水桶, 燃料以及冷却剂. $(br)冷却剂为所有的冰块以及雪球." + }, + { + "type": "crafting", + "recipe": "foodcraftreloaded:beverage_making" + } + ] +} diff --git a/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/brew_barrel.json b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/brew_barrel.json new file mode 100644 index 0000000..48efecf --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/brew_barrel.json @@ -0,0 +1,15 @@ +{ + "name": "酿桶", + "icon": "foodcraftreloaded:brew_barrel", + "category": "machines", + "pages": [ + { + "type": "text", + "text": "酿桶可以为你制作需要长时间(一般为2分钟)酿制的食材.$(br)它不需要加热, 放入需要的流体以及材料即可开始制作." + }, + { + "type": "crafting", + "recipe": "foodcraftreloaded:brew_barrel" + } + ] +} diff --git a/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/chopping_board.json b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/chopping_board.json new file mode 100644 index 0000000..1d12fca --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/chopping_board.json @@ -0,0 +1,15 @@ +{ + "name": "菜板", + "icon": "foodcraftreloaded:chopping_board", + "category": "machines", + "pages": [ + { + "type": "text", + "text": "菜板可以用来切菜. 你需要放入刀具, 每次切菜都会消耗刀具的耐久.$(br)食材需要放在$(bold)合适的位置$(), 否则结果会和你预想中的不太一样!" + }, + { + "type": "crafting", + "recipe": "foodcraftreloaded:chopping_board" + } + ] +} diff --git a/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/frying_pan.json b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/frying_pan.json new file mode 100644 index 0000000..1bf32cb --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/frying_pan.json @@ -0,0 +1,15 @@ +{ + "name": "油炸机", + "icon": "foodcraftreloaded:frying_pan", + "category": "machines", + "pages": [ + { + "type": "text", + "text": "油炸机可以用来炸东西. 所有油炸机合成都需要你放入食用油(listAlloil), 并且你还需要放入燃料.$(br)当机器开始工作之后, 你就可以在屏幕前想象食物的香味了!" + }, + { + "type": "crafting", + "recipe": "foodcraftreloaded:frying_pan" + } + ] +} diff --git a/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/mill.json b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/mill.json new file mode 100644 index 0000000..b6172e8 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/mill.json @@ -0,0 +1,15 @@ +{ + "name": "碾磨机", + "icon": "foodcraftreloaded:mill", + "category": "machines", + "pages": [ + { + "type": "text", + "text": "碾磨机能把它碰到的食材都磨成粉, 需要放入燃料加热来工作." + }, + { + "type": "crafting", + "recipe": "foodcraftreloaded:mill" + } + ] +} diff --git a/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/pan.json b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/pan.json new file mode 100644 index 0000000..2861366 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/pan.json @@ -0,0 +1,15 @@ +{ + "name": "平底锅", + "icon": "foodcraftreloaded:pan", + "category": "machines", + "pages": [ + { + "type": "text", + "text": "红太狼用来打灰太狼的平底锅.$(br)左边的瓶子格没啥用, 你可以完全忘掉它.$(br)你需要把平底锅放在灶炉上才能开始将食物烤至$(6)两面金黄.$(br)$(c)$(l)注意: 不要把它放在一旁置之不理, $()你需要随时观察下方的进度条, 在食物还未烧糊之前尽快取出!" + }, + { + "type": "crafting", + "recipe": "foodcraftreloaded:pan" + } + ] +} diff --git a/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/pot.json b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/pot.json new file mode 100644 index 0000000..849d3db --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/pot.json @@ -0,0 +1,15 @@ +{ + "name": "锅", + "icon": "foodcraftreloaded:pot", + "category": "machines", + "pages": [ + { + "type": "text", + "text": "食物工艺$(l)最重要$()的机器---它可以为你制作大餐.$(br)将主料和食材放到合适的地方, 配以灶炉在下方加热, 它就可以开始工作了.$(br)$(c)$(l)注意: 不要把它放在一旁置之不理, $()你需要随时观察下方的进度条, 否则你的大餐就会变成一团碳粉!" + }, + { + "type": "crafting", + "recipe": "foodcraftreloaded:pot" + } + ] +} diff --git a/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/pressure_cooker.json b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/pressure_cooker.json new file mode 100644 index 0000000..d3d166e --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/pressure_cooker.json @@ -0,0 +1,15 @@ +{ + "name": "高压锅", + "icon": "foodcraftreloaded:pressure_cooker", + "category": "machines", + "pages": [ + { + "type": "text", + "text": "让高压蒸汽与食物紧密结合, 制造出不一样的口感. 需要加水与燃料才能工作." + }, + { + "type": "crafting", + "recipe": "foodcraftreloaded:pressure_cooker" + } + ] +} diff --git a/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/stove.json b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/stove.json new file mode 100644 index 0000000..863f307 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/patchouli_books/boiling_book/zh_cn/entries/stove.json @@ -0,0 +1,15 @@ +{ + "name": "灶炉", + "icon": "foodcraftreloaded:stove", + "category": "machines", + "pages": [ + { + "type": "text", + "text": "老式燃烧灶炉, 放入燃料即可开始燃烧.$(br)但是, 如果你不把$(l:pot)锅$()放在上面的话, 它就只会浪费燃料." + }, + { + "type": "crafting", + "recipe": "foodcraftreloaded:stove" + } + ] +} diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/boiling_book.json b/src/main/resources/assets/foodcraftreloaded/recipes/boiling_book.json new file mode 100644 index 0000000..cb0fe73 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/recipes/boiling_book.json @@ -0,0 +1,18 @@ +{ + "type": "forge:ore_shapeless", + "ingredients": [ + { + "item": "minecraft:book" + }, + { + "type": "forge:ore_dict", + "ore": "listAllwater" + } + ], + "result": { + "item": "patchouli:guide_book", + "nbt": { + "patchouli:book": "foodcraftreloaded:boiling_book" + } + } +} diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/circuit.json b/src/main/resources/assets/foodcraftreloaded/recipes/circuit.json index d9b775e..115a5a8 100644 --- a/src/main/resources/assets/foodcraftreloaded/recipes/circuit.json +++ b/src/main/resources/assets/foodcraftreloaded/recipes/circuit.json @@ -16,7 +16,7 @@ }, "A": { "type": "forge:ore_dict", - "ore": "cropWheat" + "ore": "circuitIngredient" } }, "result": { diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/circuit_1.json b/src/main/resources/assets/foodcraftreloaded/recipes/circuit_1.json deleted file mode 100644 index 08666f3..0000000 --- a/src/main/resources/assets/foodcraftreloaded/recipes/circuit_1.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "forge:ore_shaped", - "pattern": [ - "AAA", - "CBC", - "AAA" - ], - "key": { - "C": { - "type": "forge:ore_dict", - "ore": "redstone" - }, - "B": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "A": { - "type": "forge:ore_dict", - "ore": "cropPeanut" - } - }, - "result": { - "item": "foodcraftreloaded:circuit" - } -} diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/circuit_2.json b/src/main/resources/assets/foodcraftreloaded/recipes/circuit_2.json deleted file mode 100644 index 0631ece..0000000 --- a/src/main/resources/assets/foodcraftreloaded/recipes/circuit_2.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "forge:ore_shaped", - "pattern": [ - "AAA", - "CBC", - "AAA" - ], - "key": { - "C": { - "type": "forge:ore_dict", - "ore": "redstone" - }, - "B": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "A": { - "type": "forge:ore_dict", - "ore": "cropSoybean" - } - }, - "result": { - "item": "foodcraftreloaded:circuit" - } -} diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/circuit_3.json b/src/main/resources/assets/foodcraftreloaded/recipes/circuit_3.json deleted file mode 100644 index b8259d1..0000000 --- a/src/main/resources/assets/foodcraftreloaded/recipes/circuit_3.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "forge:ore_shaped", - "pattern": [ - "AAA", - "CBC", - "AAA" - ], - "key": { - "C": { - "type": "forge:ore_dict", - "ore": "redstone" - }, - "B": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "A": { - "type": "forge:ore_dict", - "ore": "cropRice" - } - }, - "result": { - "item": "foodcraftreloaded:circuit" - } -} diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/stove.json b/src/main/resources/assets/foodcraftreloaded/recipes/stove.json index 83a1632..6f3219a 100644 --- a/src/main/resources/assets/foodcraftreloaded/recipes/stove.json +++ b/src/main/resources/assets/foodcraftreloaded/recipes/stove.json @@ -22,7 +22,7 @@ }, "D": { "type": "forge:ore_dict", - "ore": "dyeBrown" + "ore": "ingotBrick" }, "E": { "type": "forge:ore_dict", diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/Caiban.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/Caiban.png deleted file mode 100644 index e3f0cd6..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/Caiban.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemBook.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemBook.png deleted file mode 100644 index c63f3ec..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemBook.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemFanqiezhong.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemFanqiezhong.png deleted file mode 100644 index cfa0213..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemFanqiezhong.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemHongjiu.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemHongjiu.png deleted file mode 100644 index 70dee53..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemHongjiu.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemHongshu.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemHongshu.png deleted file mode 100644 index 10f80f3..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemHongshu.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemHuangguazhong.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemHuangguazhong.png deleted file mode 100644 index 83fdc10..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemHuangguazhong.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJinghuashuitong.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJinghuashuitong.png deleted file mode 100644 index cf050ee..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJinghuashuitong.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJinpingguojiu.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJinpingguojiu.png deleted file mode 100644 index 4afc9f2..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJinpingguojiu.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJinpingguozhiice.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJinpingguozhiice.png deleted file mode 100644 index 7738857..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJinpingguozhiice.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJinputaoDG.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJinputaoDG.png deleted file mode 100644 index a2b731f..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJinputaoDG.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJinputaoGJ.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJinputaoGJ.png deleted file mode 100644 index 22089ef..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJinputaoGJ.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJinputaojiu.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJinputaojiu.png deleted file mode 100644 index 8349d17..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJinputaojiu.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJinputaozhiice.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJinputaozhiice.png deleted file mode 100644 index 415ac53..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJinputaozhiice.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJuzi.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJuzi.png deleted file mode 100644 index bb35515..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJuzi.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJuziBG.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJuziBG.png deleted file mode 100644 index 31f5efd..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJuziBG.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJuziDG.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJuziDG.png deleted file mode 100644 index cc68aa3..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJuziDG.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJuziGJ.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJuziGJ.png deleted file mode 100644 index 5610fac..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJuziGJ.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJuzizhiice.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJuzizhiice.png deleted file mode 100644 index aae7e98..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemJuzizhiice.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLajiao.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLajiao.png deleted file mode 100644 index c17b3cc..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLajiao.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLajiaozhong.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLajiaozhong.png deleted file mode 100644 index 40336b4..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLajiaozhong.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLi.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLi.png deleted file mode 100644 index e0f0f66..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLi.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLiBG.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLiBG.png deleted file mode 100644 index 40c3d9d..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLiBG.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLiDG.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLiDG.png deleted file mode 100644 index 8553878..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLiDG.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLiGJ.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLiGJ.png deleted file mode 100644 index 3cbc679..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLiGJ.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLizhi.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLizhi.png deleted file mode 100644 index ff0194a..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLizhi.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLizhijiu.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLizhijiu.png deleted file mode 100644 index 0dd0148..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLizhijiu.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLizhizhiice.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLizhizhiice.png deleted file mode 100644 index c1c65e5..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLizhizhiice.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLizijiu.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLizijiu.png deleted file mode 100644 index fbd1a64..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLizijiu.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLongyan.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLongyan.png deleted file mode 100644 index f463aa5..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemLongyan.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemMangguo.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemMangguo.png deleted file mode 100644 index 12d46d0..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemMangguo.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemMangguojiu.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemMangguojiu.png deleted file mode 100644 index 7055c55..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemMangguojiu.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemMangguozhiice.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemMangguozhiice.png deleted file mode 100644 index 94d7044..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemMangguozhiice.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemMugua.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemMugua.png deleted file mode 100644 index 26bb38f..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemMugua.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemMuguazhiice.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemMuguazhiice.png deleted file mode 100644 index dc9cfdd..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemMuguazhiice.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemNingmeng.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemNingmeng.png deleted file mode 100644 index 13f08a8..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemNingmeng.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemNingmengBG.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemNingmengBG.png deleted file mode 100644 index a50e965..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemNingmengBG.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemNingmengDG.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemNingmengDG.png deleted file mode 100644 index 196e999..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemNingmengDG.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemNingmengGJ.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemNingmengGJ.png deleted file mode 100644 index 468497a..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemNingmengGJ.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemNingmengjiu.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemNingmengjiu.png deleted file mode 100644 index ec2d6e8..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemNingmengjiu.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemNingmengzhiice.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemNingmengzhiice.png deleted file mode 100644 index 5fc9082..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemNingmengzhiice.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemNull.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemNull.png deleted file mode 100644 index cde7086..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemNull.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPingguojiu.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPingguojiu.png deleted file mode 100644 index 6fde807..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPingguojiu.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPingguozhiice.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPingguozhiice.png deleted file mode 100644 index 9e61309..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPingguozhiice.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPutao.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPutao.png deleted file mode 100644 index c4582ff..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPutao.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPutaoBG.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPutaoBG.png deleted file mode 100644 index 1c5f659..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPutaoBG.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPutaoDG.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPutaoDG.png deleted file mode 100644 index 523423e..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPutaoDG.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPutaoGJ.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPutaoGJ.png deleted file mode 100644 index 7399771..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPutaoGJ.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPutaojiu.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPutaojiu.png deleted file mode 100644 index 86a9b13..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPutaojiu.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPutaozhiice.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPutaozhiice.png deleted file mode 100644 index c1164cd..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPutaozhiice.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPutaozhong.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPutaozhong.png deleted file mode 100644 index f4864d9..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemPutaozhong.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemQiaokelifen.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemQiaokelifen.png deleted file mode 100644 index d599a56..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemQiaokelifen.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemQiaokelinaiice.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemQiaokelinaiice.png deleted file mode 100644 index f49daa5..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemQiaokelinaiice.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemQiezi.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemQiezi.png deleted file mode 100644 index 17e60e5..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemQiezi.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemQiezizhong.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemQiezizhong.png deleted file mode 100644 index b7d2f79..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemQiezizhong.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemQingjiao.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemQingjiao.png deleted file mode 100644 index bfd7c66..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemQingjiao.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemQingjiaozhong.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemQingjiaozhong.png deleted file mode 100644 index 1a27da3..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemQingjiaozhong.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemShanzha.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemShanzha.png deleted file mode 100644 index 79b2b59..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemShanzha.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemShaojiaodeshiwu.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemShaojiaodeshiwu.png deleted file mode 100644 index b05f6e2..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemShaojiaodeshiwu.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemShiliu.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemShiliu.png deleted file mode 100644 index 6fdfffe..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemShiliu.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemShiliujiu.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemShiliujiu.png deleted file mode 100644 index 2d99d77..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemShiliujiu.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemShizi.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemShizi.png deleted file mode 100644 index 3575a58..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemShizi.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemShucai.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemShucai.png deleted file mode 100644 index 7076ef7..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemShucai.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemShucaizhong.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemShucaizhong.png deleted file mode 100644 index 4a4dfd2..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemShucaizhong.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemShuyangrou.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemShuyangrou.png deleted file mode 100644 index e1b62dc..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemShuyangrou.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemTangyuan.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemTangyuan.png deleted file mode 100644 index 17b8f7b..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemTangyuan.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemTaozi.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemTaozi.png deleted file mode 100644 index b40323e..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemTaozi.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemTaoziBG.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemTaoziBG.png deleted file mode 100644 index 3c1b2c6..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemTaoziBG.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemTaoziDG.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemTaoziDG.png deleted file mode 100644 index 2228377..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemTaoziDG.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemTaoziGJ.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemTaoziGJ.png deleted file mode 100644 index 3f85dc8..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemTaoziGJ.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemTaozijiu.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemTaozijiu.png deleted file mode 100644 index eafac02..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemTaozijiu.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemTaozizhiice.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemTaozizhiice.png deleted file mode 100644 index 7195550..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemTaozizhiice.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemWan.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemWan.png deleted file mode 100644 index fdd8e84..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemWan.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemXiangjiao.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemXiangjiao.png deleted file mode 100644 index 55ccb96..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemXiangjiao.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemXiguazhiice.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemXiguazhiice.png deleted file mode 100644 index 486ca12..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemXiguazhiice.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemYezi.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemYezi.png deleted file mode 100644 index 076cf22..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemYezi.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemYeziBG.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemYeziBG.png deleted file mode 100644 index c00f8b2..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemYeziBG.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemYeziDG.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemYeziDG.png deleted file mode 100644 index 17e47af..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemYeziDG.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemYeziGJ.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemYeziGJ.png deleted file mode 100644 index d82dbb2..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemYeziGJ.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemYezizhiice.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemYezizhiice.png deleted file mode 100644 index 8c75805..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemYezizhiice.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemYumizhong.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemYumizhong.png deleted file mode 100644 index fdf8584..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemYumizhong.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemZongjiqianguzhishi.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemZongjiqianguzhishi.png deleted file mode 100644 index 9cebc13..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/ItemZongjiqianguzhishi.png and /dev/null differ diff --git a/src/main/resources/assets/foodcraftreloaded/textures/items/old/overlay.png b/src/main/resources/assets/foodcraftreloaded/textures/items/old/overlay.png deleted file mode 100644 index 623ce0a..0000000 Binary files a/src/main/resources/assets/foodcraftreloaded/textures/items/old/overlay.png and /dev/null differ diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 53f6b36..dff7741 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,11 +3,12 @@ "modid": "foodcraftreloaded", "name": "FoodCraft Reloaded", "description": "A China and foreign food Minecraft mod(Reloaded!)", - "version": "@version@", + "version": "${version}", + "mcversion": "${mcversion}", "credits": "Lasm Gratel", "logoFile": "", - "url": "https://github.com/NanamiArihara/FoodCraft-Reloaded", - "updateUrl": "https://lasmgratel.github.io/FoodCraft-Reloaded/update.json", + "url": "https://github.com/ProjectUranus/FoodCraft-Reloaded", + "updateUrl": "https://www.projecturanus.com/foodcraft/update.json", "authors": [ "Lasm_Gratel" ],