diff --git a/helps/ResourcesMapping.md b/helps/ResourcesMapping.md index 109199e..97c917c 100644 --- a/helps/ResourcesMapping.md +++ b/helps/ResourcesMapping.md @@ -3,8 +3,8 @@ |**材料**|可种植|用原版代替|和村民交易|可由加工得来|野外采集|矿物|未映射| |:---|:---:|:---:|:---:|:---:|:---:|:---:|:---:| |嘟嘟莲|||||一次性，沼泽||| -|石珀||||||√|| -|蒲公英籽|||||可反复||| +|石珀||||||恶地|| +|蒲公英籽|||||一次性||| |绝云椒椒|||||可反复||| |小灯草|||||一次性||| |琉璃袋||兰花|||||| @@ -20,7 +20,7 @@ |面粉||||√|||| |甜甜花|||||一次性||| |洋葱|√||||||| -|熏禽肉|||||||√| +|熏禽肉|||屠夫||||| |卷心菜|√||||||| |树莓|||||可反复||| |土豆||√|||||| @@ -61,7 +61,7 @@ |竹笋|||||||√| |发光髓|||||||√| |「冷鲜肉」|||||||√| -|星银矿石||||||√|| +|星银矿石||||||高山|| |奇异的「牙齿」|||||||√| |汲取了生命力的龙牙|||||||√| |马尾|||||一次性，沼泽||| @@ -73,19 +73,21 @@ |北陆法器原胚|||||||√| |苹果||√|||||| |日落果|||||白桦树叶掉落||| -|塞西莉亚花|||||一次性||| +|塞西莉亚花|||||一次性，高山||| |琉璃百合|||||一次性||| -|夜泊石||||||√|| +|夜泊石||||||恶地|| |慕风蘑菇|||||一次性||| |霓裳花|||||可反复||| |落落莓|||||可反复||| |风车菊|||||一次性||| |钩钩果|||||可反复||| -|清心|||||一次性||| +|清心|||||一次性，高山||| |星螺|||牧师||||| * 所有可种植物品，加入农民一级收购列表，尝试将这些作物设为农民可接受的作物，就像原版作物一样，如果不行就将作物种子设定为流浪商人贩卖 -* 野外采集的，一次性表示类似于花的处理方式，采完就没了，可用刷花机量产。可反复表示类似于浆果丛的处理方式，可以反复采摘，但是只能在原地采摘，不能重新集中化种植。树叶掉落的，按照类似橡木树叶掉落苹果的方式处理掉落。后面标识沼泽等Biome的，按类似于兰花只在沼泽Biome生成的这种特性进行生成。其他未标识的，按普通花的生成方式生成。 +* 野外采集的，一次性表示类似于花的处理方式，采完就没了，可用刷花机量产。可反复表示类似于浆果丛的处理方式，可以反复采摘，但是只能在原地采摘，不能重新集中化种植。树叶掉落的，按照类似橡木树叶掉落苹果的方式处理掉落。 +* 后面标识沼泽等生物群系的，按类似于兰花只在沼泽生物群系生成，绿宝石只在高山生物群系的这种特性进行生成。其他未标识的，则在主世界普遍生成。 +* 所有不在特殊生物群系的类花植物，将加入繁花森林生成。 # 食物与药水 diff --git a/src/main/java/net/yyc12345/teyvatcraft/blocks/TeyvatCropBlock.java b/src/main/java/net/yyc12345/teyvatcraft/blocks/TeyvatCropBlock.java index 84a95ba..37f3e2b 100644 --- a/src/main/java/net/yyc12345/teyvatcraft/blocks/TeyvatCropBlock.java +++ b/src/main/java/net/yyc12345/teyvatcraft/blocks/TeyvatCropBlock.java @@ -1,13 +1,16 @@ package net.yyc12345.teyvatcraft.blocks; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.CropBlock; +import net.minecraft.block.Material; import net.minecraft.block.ShapeContext; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemConvertible; +import net.minecraft.sound.BlockSoundGroup; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; @@ -29,8 +32,8 @@ public class TeyvatCropBlock extends CropBlock { private Item seed; - public TeyvatCropBlock(Settings settings) { - super(settings); + public TeyvatCropBlock() { + super(FabricBlockSettings.of(Material.PLANT).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP)); } @Override diff --git a/src/main/java/net/yyc12345/teyvatcraft/blocks/TeyvatFlowerLikePlantBlock.java b/src/main/java/net/yyc12345/teyvatcraft/blocks/TeyvatFlowerLikePlantBlock.java new file mode 100644 index 0000000..5969627 --- /dev/null +++ b/src/main/java/net/yyc12345/teyvatcraft/blocks/TeyvatFlowerLikePlantBlock.java @@ -0,0 +1,13 @@ +package net.yyc12345.teyvatcraft.blocks; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.FlowerBlock; +import net.minecraft.block.Material; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.sound.BlockSoundGroup; + +public class TeyvatFlowerLikePlantBlock extends FlowerBlock { + public TeyvatFlowerLikePlantBlock() { + super(StatusEffects.LUCK, 1, FabricBlockSettings.of(Material.PLANT).noCollision().breakInstantly().sounds(BlockSoundGroup.GRASS)); + } +} diff --git a/src/main/java/net/yyc12345/teyvatcraft/blocks/TeyvatHarvestablePlantBlock.java b/src/main/java/net/yyc12345/teyvatcraft/blocks/TeyvatSweetBerryBushLikePlantBlock.java similarity index 83% rename from src/main/java/net/yyc12345/teyvatcraft/blocks/TeyvatHarvestablePlantBlock.java rename to src/main/java/net/yyc12345/teyvatcraft/blocks/TeyvatSweetBerryBushLikePlantBlock.java index 106b412..36e4d28 100644 --- a/src/main/java/net/yyc12345/teyvatcraft/blocks/TeyvatHarvestablePlantBlock.java +++ b/src/main/java/net/yyc12345/teyvatcraft/blocks/TeyvatSweetBerryBushLikePlantBlock.java @@ -16,15 +16,20 @@ import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class TeyvatHarvestablePlantBlock extends SweetBerryBushBlock { +public class TeyvatSweetBerryBushLikePlantBlock extends SweetBerryBushBlock { private Item droppedItem; - public TeyvatHarvestablePlantBlock(Settings settings, Item droppedItem) { + public TeyvatSweetBerryBushLikePlantBlock(Settings settings, Item droppedItem) { super(settings); this.droppedItem = droppedItem; } + @Environment(EnvType.CLIENT) + public ItemStack getPickStack(BlockView world, BlockPos pos, BlockState state) { + return new ItemStack((ItemConvertible)droppedItem); + } + @Override public void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) { // revoke sweet berry bush default operation diff --git a/src/main/java/net/yyc12345/teyvatcraft/init/BlocksManager.java b/src/main/java/net/yyc12345/teyvatcraft/init/BlocksManager.java index aa1f39b..c847946 100644 --- a/src/main/java/net/yyc12345/teyvatcraft/init/BlocksManager.java +++ b/src/main/java/net/yyc12345/teyvatcraft/init/BlocksManager.java @@ -5,31 +5,68 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.object.builder.v1.block.FabricMaterialBuilder; import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; import net.minecraft.block.Block; -import net.minecraft.block.Material; import net.minecraft.block.MaterialColor; import net.minecraft.block.OreBlock; import net.minecraft.client.render.RenderLayer; -import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.item.Item; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import net.yyc12345.teyvatcraft.blocks.TeyvatCropBlock; + +import net.yyc12345.teyvatcraft.blocks.*; public class BlocksManager { // ==================== ore - public static final Block MAGICAL_CRYSTAL_CHUNK_ORE = new OreBlock(FabricBlockSettings.of(new FabricMaterialBuilder(MaterialColor.STONE).build()).breakByTool(FabricToolTags.PICKAXES, 4).requiresTool().strength(4.0F, 4.0F)); - public static final Block CRYSTAL_CHUNK_ORE = new OreBlock(FabricBlockSettings.of(new FabricMaterialBuilder(MaterialColor.STONE).build()).breakByTool(FabricToolTags.PICKAXES, 3).requiresTool().strength(4.0F, 4.0F)); - public static final Block WHITE_IRON_CHUNK_ORE = new OreBlock(FabricBlockSettings.of(new FabricMaterialBuilder(MaterialColor.STONE).build()).breakByTool(FabricToolTags.PICKAXES, 2).requiresTool().strength(3.0F, 3.0F)); - public static final Block IRON_CHUNK_ORE = new OreBlock(FabricBlockSettings.of(new FabricMaterialBuilder(MaterialColor.STONE).build()).breakByTool(FabricToolTags.PICKAXES, 1).requiresTool().strength(3.0F, 3.0F)); - public static final Block STARSILVER_ORE = new OreBlock(FabricBlockSettings.of(new FabricMaterialBuilder(MaterialColor.STONE).build()).breakByTool(FabricToolTags.PICKAXES, 1).requiresTool().strength(2.0F, 2.0F)); + public static final Block MAGICAL_CRYSTAL_CHUNK_ORE = new OreBlock(getOreBlockSettings(4, 4.0f)); + public static final Block CRYSTAL_CHUNK_ORE = new OreBlock(getOreBlockSettings(3, 4.0f)); + public static final Block WHITE_IRON_CHUNK_ORE = new OreBlock(getOreBlockSettings(2, 3.0f)); + public static final Block IRON_CHUNK_ORE = new OreBlock(getOreBlockSettings(1, 3.0f)); + public static final Block STARSILVER_ORE = new OreBlock(getOreBlockSettings(1, 2.0f)); + public static final Block NOCTILUCOUS_JADE = new OreBlock(getOreBlockSettings(1, 3.0f)); + public static final Block COR_LAPIS = new OreBlock(getOreBlockSettings(1, 3.0f)); // ==================== crops - public static final Block RICE = new TeyvatCropBlock(FabricBlockSettings.of(Material.PLANT).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP).nonOpaque()); - public static final Block TOMATO = new TeyvatCropBlock(FabricBlockSettings.of(Material.PLANT).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP)); - public static final Block ONION = new TeyvatCropBlock(FabricBlockSettings.of(Material.PLANT).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP)); - public static final Block CABBAGE = new TeyvatCropBlock(FabricBlockSettings.of(Material.PLANT).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP)); - public static final Block RADISH = new TeyvatCropBlock(FabricBlockSettings.of(Material.PLANT).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP)); + public static final Block RICE = new TeyvatCropBlock(); + public static final Block TOMATO = new TeyvatCropBlock(); + public static final Block ONION = new TeyvatCropBlock(); + public static final Block CABBAGE = new TeyvatCropBlock(); + public static final Block RADISH = new TeyvatCropBlock(); + + // flower & sweet berry bush like plant + public static final Block CALLA_LILY = new TeyvatFlowerLikePlantBlock(); + public static final Block DANDELION_SEED = new TeyvatFlowerLikePlantBlock(); + public static final Block JUEYUN_CHILI = new TeyvatSweetBerryBushLikePlantBlock(ItemsManager.JUEYUN_CHILI); + public static final Block SMALL_LAMP_GRASS = new TeyvatFlowerLikePlantBlock(); + public static final Block MINT = new TeyvatFlowerLikePlantBlock(); + public static final Block SWEET_FLOWER = new TeyvatFlowerLikePlantBlock(); + public static final Block BERRY = new TeyvatSweetBerryBushLikePlantBlock(ItemsManager.BERRY); + public static final Block SNAPDRAGON = new TeyvatFlowerLikePlantBlock(); + public static final Block MATSUTAKE = new TeyvatFlowerLikePlantBlock(); + public static final Block HORSETAIL = new TeyvatFlowerLikePlantBlock(); + public static final Block CECILIA = new TeyvatFlowerLikePlantBlock(); + public static final Block GLAZE_LILY = new TeyvatFlowerLikePlantBlock(); + public static final Block PHILANEMO_MUSHROOM = new TeyvatFlowerLikePlantBlock(); + public static final Block SILK_FLOWER = new TeyvatSweetBerryBushLikePlantBlock(ItemsManager.SILK_FLOWER); + public static final Block VALBERRY = new TeyvatSweetBerryBushLikePlantBlock(ItemsManager.VALBERRY); + public static final Block WINDWHEEL_ASTER = new TeyvatFlowerLikePlantBlock(); + public static final Block WOLFHOOK = new TeyvatSweetBerryBushLikePlantBlock(ItemsManager.WOLFHOOK); + public static final Block QINGXIN = new TeyvatFlowerLikePlantBlock(); + + private static FabricBlockSettings getOreBlockSettings(int pickaxeLevel, float strength) { + return FabricBlockSettings.of(new FabricMaterialBuilder(MaterialColor.STONE).build()).breakByTool(FabricToolTags.PICKAXES, pickaxeLevel).requiresTool().strength(strength, strength); + } + + private static void registerCrop(Block bl, Item blItem, String name) { + ((TeyvatCropBlock)bl).setSeedsItem(blItem); // set seeds + BlockRenderLayerMap.INSTANCE.putBlock(bl, RenderLayer.getCutoutMipped()); // set transparent display mode + Registry.register(Registry.BLOCK, new Identifier("teyvatcraft", name), bl); //register block self + } + + private static void registerTeyvatPlant(Block bl, String name) { + //BlockRenderLayerMap.INSTANCE.putBlock(bl, RenderLayer.getCutoutMipped()); // set transparent display mode + Registry.register(Registry.BLOCK, new Identifier("teyvatcraft", name), bl); + } public static void RegisterAll() { Registry.register(Registry.BLOCK, new Identifier("teyvatcraft", "magical_crystal_chunk_ore"), MAGICAL_CRYSTAL_CHUNK_ORE); @@ -37,24 +74,36 @@ public class BlocksManager { Registry.register(Registry.BLOCK, new Identifier("teyvatcraft", "white_iron_chunk_ore"), WHITE_IRON_CHUNK_ORE); Registry.register(Registry.BLOCK, new Identifier("teyvatcraft", "iron_chunk_ore"), IRON_CHUNK_ORE); Registry.register(Registry.BLOCK, new Identifier("teyvatcraft", "starsilver_ore"), STARSILVER_ORE); + Registry.register(Registry.BLOCK, new Identifier("teyvatcraft", "noctilucous_jade_ore"), NOCTILUCOUS_JADE); + Registry.register(Registry.BLOCK, new Identifier("teyvatcraft", "cor_lapis_ore"), COR_LAPIS); // crops - ((TeyvatCropBlock)RICE).setSeedsItem(ItemsManager.RICE_SEED); - ((TeyvatCropBlock)TOMATO).setSeedsItem(ItemsManager.TOMATO); - ((TeyvatCropBlock)ONION).setSeedsItem(ItemsManager.ONION); - ((TeyvatCropBlock)CABBAGE).setSeedsItem(ItemsManager.CABBAGE); - ((TeyvatCropBlock)RADISH).setSeedsItem(ItemsManager.RADISH); - - BlockRenderLayerMap.INSTANCE.putBlock(RICE, RenderLayer.getCutoutMipped()); - BlockRenderLayerMap.INSTANCE.putBlock(TOMATO, RenderLayer.getCutoutMipped()); - BlockRenderLayerMap.INSTANCE.putBlock(ONION, RenderLayer.getCutoutMipped()); - BlockRenderLayerMap.INSTANCE.putBlock(CABBAGE, RenderLayer.getCutoutMipped()); - BlockRenderLayerMap.INSTANCE.putBlock(RADISH, RenderLayer.getCutoutMipped()); + registerCrop(RICE, ItemsManager.RICE_SEED, "rice"); + registerCrop(TOMATO, ItemsManager.TOMATO, "tomato"); + registerCrop(ONION, ItemsManager.ONION, "onion"); + registerCrop(CABBAGE, ItemsManager.CABBAGE, "cabbage"); + registerCrop(RADISH, ItemsManager.RADISH, "radish"); + + // flower & sweet berry bush like plant + registerTeyvatPlant(CALLA_LILY, "calla_lily"); + registerTeyvatPlant(DANDELION_SEED, "dandelion_seed"); + registerTeyvatPlant(JUEYUN_CHILI, "jueyun_chili"); + registerTeyvatPlant(SMALL_LAMP_GRASS, "small_lamp_grass"); + registerTeyvatPlant(MINT, "mint"); + registerTeyvatPlant(SWEET_FLOWER, "sweet_flower"); + registerTeyvatPlant(BERRY, "berry"); + registerTeyvatPlant(SNAPDRAGON, "snapdragon"); + registerTeyvatPlant(MATSUTAKE, "matsutake"); + registerTeyvatPlant(HORSETAIL, "horsetail"); + registerTeyvatPlant(CECILIA, "cecilia"); + registerTeyvatPlant(GLAZE_LILY, "glaze_lily"); + registerTeyvatPlant(PHILANEMO_MUSHROOM, "philanemo_mushroom"); + registerTeyvatPlant(SILK_FLOWER, "silk_flower"); + registerTeyvatPlant(VALBERRY, "valberry"); + registerTeyvatPlant(WINDWHEEL_ASTER, "windwheel_aster"); + registerTeyvatPlant(WOLFHOOK, "wolfhook"); + registerTeyvatPlant(QINGXIN, "qingxin"); + - Registry.register(Registry.BLOCK, new Identifier("teyvatcraft", "rice"), RICE); - Registry.register(Registry.BLOCK, new Identifier("teyvatcraft", "tomato"), TOMATO); - Registry.register(Registry.BLOCK, new Identifier("teyvatcraft", "onion"), ONION); - Registry.register(Registry.BLOCK, new Identifier("teyvatcraft", "cabbage"), CABBAGE); - Registry.register(Registry.BLOCK, new Identifier("teyvatcraft", "radish"), RADISH); } } diff --git a/src/main/java/net/yyc12345/teyvatcraft/init/ItemsManager.java b/src/main/java/net/yyc12345/teyvatcraft/init/ItemsManager.java index 239e2ac..5129172 100644 --- a/src/main/java/net/yyc12345/teyvatcraft/init/ItemsManager.java +++ b/src/main/java/net/yyc12345/teyvatcraft/init/ItemsManager.java @@ -8,14 +8,11 @@ import net.minecraft.util.Identifier; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.item.FoodComponent.Builder; import net.minecraft.util.Rarity; -import net.minecraft.entity.effect.StatusEffects; -import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.item.AliasedBlockItem; import net.minecraft.item.BlockItem; import net.minecraft.item.FoodComponent; import net.minecraft.item.Item; -import net.minecraft.item.ItemConvertible; import static net.minecraft.block.ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE; import java.util.EnumSet; @@ -49,6 +46,7 @@ public class ItemsManager { public static final Item IRON_CHUNK = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); public static final Item STARSILVER = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); public static final Item NOCTILUCOUS_JADE = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); + public static final Item COR_LAPIS = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); // ==================== weapon enhancement public static final Item MYSTIC_ENHANCEMENT_ORE = new Item(new FabricItemSettings().group(ITEMGROUP_MISC)); @@ -63,21 +61,20 @@ public class ItemsManager { public static final Item RADISH = new SeedItem(BlocksManager.RADISH, new FabricItemSettings().group(ITEMGROUP_HARVESTABLE).food((new FoodComponent.Builder()).hunger(1).saturationModifier(0.3F).build())); public static final Item RICE_SEED = new SeedItem(BlocksManager.RICE, new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item CALLA_LILY = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item COR_LAPIS = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item DANDELION_SEED = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item JUEYUN_CHILI = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item SMALL_LAMP_GRASS = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item MINT = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); + public static final Item CALLA_LILY = new AliasedBlockItem(BlocksManager.CALLA_LILY, new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); + public static final Item DANDELION_SEED = new AliasedBlockItem(BlocksManager.DANDELION_SEED, new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); + public static final Item JUEYUN_CHILI = new AliasedBlockItem(BlocksManager.JUEYUN_CHILI, new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); + public static final Item SMALL_LAMP_GRASS = new AliasedBlockItem(BlocksManager.SMALL_LAMP_GRASS, new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); + public static final Item MINT = new AliasedBlockItem(BlocksManager.MINT, new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); public static final Item PEPPER = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); public static final Item FLOUR = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item SWEET_FLOWER = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); + public static final Item SWEET_FLOWER = new AliasedBlockItem(BlocksManager.SWEET_FLOWER, new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); public static final Item SMOKED_FOWL = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item BERRY = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); + public static final Item BERRY = new AliasedBlockItem(BlocksManager.BERRY, new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); public static final Item ALMOND = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item SNAPDRAGON = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); + public static final Item SNAPDRAGON = new AliasedBlockItem(BlocksManager.SNAPDRAGON, new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); public static final Item TOFU = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item MATSUTAKE = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); + public static final Item MATSUTAKE = new AliasedBlockItem(BlocksManager.MATSUTAKE, new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); public static final Item SHRIMP_MEAT = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); public static final Item CREAM = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); public static final Item CRAB = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); @@ -103,23 +100,17 @@ public class ItemsManager { public static final Item CHILLED_MEAT = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); public static final Item STRANGE_TOOTH = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); public static final Item VITALIZED_DRAGONTOOTH = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item HORSETAIL = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item DUST_OF_AZOTH = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item NORTHLANDER_SWORD_BILLET = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item NORTHLANDER_CLAYMORE_BILLET = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item NORTHLANDER_POLEARM_BILLET = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item NORTHLANDER_BOW_BILLET = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item NORTHLANDER_CATALYST_BILLET = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); + public static final Item HORSETAIL = new AliasedBlockItem(BlocksManager.HORSETAIL, new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); public static final Item SUNSETTIA = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item CECILIA = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item GLAZE_LILY = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item PHILANEMO_MUSHROOM = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item SILK_FLOWER = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item VALBERRY = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item WINDWHEEL_ASTER = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item WOLFHOOK = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); - public static final Item QINGXIN = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); + public static final Item CECILIA = new AliasedBlockItem(BlocksManager.CECILIA, new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); + public static final Item GLAZE_LILY = new AliasedBlockItem(BlocksManager.GLAZE_LILY, new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); + public static final Item PHILANEMO_MUSHROOM = new AliasedBlockItem(BlocksManager.PHILANEMO_MUSHROOM, new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); + public static final Item SILK_FLOWER = new AliasedBlockItem(BlocksManager.SILK_FLOWER, new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); + public static final Item VALBERRY = new AliasedBlockItem(BlocksManager.VALBERRY, new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); + public static final Item WINDWHEEL_ASTER = new AliasedBlockItem(BlocksManager.WINDWHEEL_ASTER, new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); + public static final Item WOLFHOOK = new AliasedBlockItem(BlocksManager.WOLFHOOK, new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); + public static final Item QINGXIN = new AliasedBlockItem(BlocksManager.QINGXIN, new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); public static final Item STARCONCH = new Item(new FabricItemSettings().group(ITEMGROUP_HARVESTABLE)); // mobs drops @@ -216,6 +207,13 @@ public class ItemsManager { public static final Item GILDED_SCALE = new Item(new FabricItemSettings().group(ITEMGROUP_DROPS)); public static final Item CROWN_OF_INSIGHT = new Item(new FabricItemSettings().group(ITEMGROUP_DROPS)); + public static final Item DUST_OF_AZOTH = new Item(new FabricItemSettings().group(ITEMGROUP_DROPS)); + public static final Item NORTHLANDER_SWORD_BILLET = new Item(new FabricItemSettings().group(ITEMGROUP_DROPS)); + public static final Item NORTHLANDER_CLAYMORE_BILLET = new Item(new FabricItemSettings().group(ITEMGROUP_DROPS)); + public static final Item NORTHLANDER_POLEARM_BILLET = new Item(new FabricItemSettings().group(ITEMGROUP_DROPS)); + public static final Item NORTHLANDER_BOW_BILLET = new Item(new FabricItemSettings().group(ITEMGROUP_DROPS)); + public static final Item NORTHLANDER_CATALYST_BILLET = new Item(new FabricItemSettings().group(ITEMGROUP_DROPS)); + // books public static final Item TEACHINGS_OF_BALLAD = new Item(new FabricItemSettings().group(ITEMGROUP_BOOK)); public static final Item GUIDE_TO_BALLAD = new Item(new FabricItemSettings().group(ITEMGROUP_BOOK)); @@ -346,25 +344,7 @@ public class ItemsManager { private static void registerAsCompostableItem(String name, Item it, Boolean isSeed) { Registry.register(Registry.ITEM, new Identifier("teyvatcraft", name), it); if (isSeed) ITEM_TO_LEVEL_INCREASE_CHANCE.put(it, 0.3f); - else ITEM_TO_LEVEL_INCREASE_CHANCE.put(it, 0.3f); - } - - private static FoodComponent getTeyvatFoodComponent(int star, EnumSet types) { - Builder foodComponent = (new FoodComponent.Builder()).hunger(2 * star).saturationModifier(3.0F * star).alwaysEdible(); - - if (types.contains(TeyvatFoodType.Revive)) ; - if (types.contains(TeyvatFoodType.DecreaseColdAccumulation)) ; - if (types.contains(TeyvatFoodType.DecreaseStamina_Sprint)) foodComponent.statusEffect(new StatusEffectInstance(StatusEffects.SPEED, 900 * 20, star - 1), 1.0F); - if (types.contains(TeyvatFoodType.DecreaseStamina_Climb)) foodComponent.statusEffect(new StatusEffectInstance(StatusEffects.JUMP_BOOST, 900 * 20, star - 1), 1.0F); - if (types.contains(TeyvatFoodType.DecreaseStamina_Misc)) foodComponent.statusEffect(new StatusEffectInstance(StatusEffects.HASTE, 900 * 20, star - 1), 1.0F); - if (types.contains(TeyvatFoodType.RestoreHP)) foodComponent.statusEffect(new StatusEffectInstance(StatusEffects.INSTANT_HEALTH, 1, star - 1), 1.0F); - if (types.contains(TeyvatFoodType.GraduallyRestoreHP)) foodComponent.statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 30 * 20, star - 1), 1.0F); - if (types.contains(TeyvatFoodType.RestoreStamina)) foodComponent.statusEffect(new StatusEffectInstance(StatusEffects.SATURATION, 50 * 20, star - 1), 1.0F); - if (types.contains(TeyvatFoodType.IncreaseATK_CRIT_DMG)) foodComponent.statusEffect(new StatusEffectInstance(StatusEffects.STRENGTH, 300 * 20, star - 1), 1.0F); - if (types.contains(TeyvatFoodType.IncreaseDEF)) foodComponent.statusEffect(new StatusEffectInstance(StatusEffects.RESISTANCE, 300 * 20, star - 1), 1.0F); - if (types.contains(TeyvatFoodType.IncreaseShieldStrength)) foodComponent.statusEffect(new StatusEffectInstance(StatusEffects.ABSORPTION, 300 * 20, star - 1), 1.0F); - - return foodComponent.build(); + else ITEM_TO_LEVEL_INCREASE_CHANCE.put(it, 0.6f); } /* @@ -407,6 +387,10 @@ public class ItemsManager { new BlockItem(BlocksManager.IRON_CHUNK_ORE, new Item.Settings().group(ITEMGROUP_MISC))); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "starsilver_ore"), new BlockItem(BlocksManager.STARSILVER_ORE, new Item.Settings().group(ITEMGROUP_MISC))); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "noctilucous_jade_ore"), + new BlockItem(BlocksManager.NOCTILUCOUS_JADE, new Item.Settings().group(ITEMGROUP_MISC))); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "cor_lapis_ore"), + new BlockItem(BlocksManager.COR_LAPIS, new Item.Settings().group(ITEMGROUP_MISC))); // crops & plants registerAsCompostableItem("rice", RICE, false); @@ -418,7 +402,7 @@ public class ItemsManager { Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "calla_lily"), CALLA_LILY); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "dandelion_seed"), DANDELION_SEED); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "jueyun_chili"), JUEYUN_CHILI); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "jueyun_chili"), JUEYUN_CHILI);/* Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "small_lamp_grass"), SMALL_LAMP_GRASS); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "mint"), MINT); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "pepper"), PEPPER); @@ -456,12 +440,6 @@ public class ItemsManager { Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "strange_tooth"), STRANGE_TOOTH); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "vitalized_dragontooth"), VITALIZED_DRAGONTOOTH); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "horsetail"), HORSETAIL); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "dust_of_azoth"), DUST_OF_AZOTH); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "northlander_sword_billet"), NORTHLANDER_SWORD_BILLET); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "northlander_claymore_billet"), NORTHLANDER_CLAYMORE_BILLET); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "northlander_polearm_billet"), NORTHLANDER_POLEARM_BILLET); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "northlander_bow_billet"), NORTHLANDER_BOW_BILLET); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "northlander_catalyst_billet"), NORTHLANDER_CATALYST_BILLET); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "sunsettia"), SUNSETTIA); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "cecilia"), CECILIA); @@ -473,7 +451,9 @@ public class ItemsManager { Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "wolfhook"), WOLFHOOK); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "qingxin"), QINGXIN); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "starconch"), STARCONCH); + */ + // drops Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "agnidus_agate_sliver"), AGNIDUS_AGATE_SLIVER); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "agnidus_agate_fragment"), AGNIDUS_AGATE_FRAGMENT); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "agnidus_agate_chunk"), AGNIDUS_AGATE_CHUNK); @@ -512,6 +492,20 @@ public class ItemsManager { Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "juvenile_jade"), JUVENILE_JADE); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "crystalline_bloom"), CRYSTALLINE_BLOOM); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "dvalins_plume"), DVALINS_PLUME); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "dvalins_claw"), DVALINS_CLAW); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "dvalins_sigh"), DVALINS_SIGH); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "tail_of_boreas"), TAIL_OF_BOREAS); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "ring_of_boreas"), RING_OF_BOREAS); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "spirit_locket_of_boreas"), SPIRIT_LOCKET_OF_BOREAS); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "tusk_of_monoceros_caeli"), TUSK_OF_MONOCEROS_CAELI); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "shard_of_a_foul_legacy"), SHARD_OF_A_FOUL_LEGACY); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "shadow_of_the_warrior"), SHADOW_OF_THE_WARRIOR); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "dragon_lords_crown"), DRAGON_LORDS_CROWN); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "bloodjade_branch"), BLOODJADE_BRANCH); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "gilded_scale"), GILDED_SCALE); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "crown_of_insight"), CROWN_OF_INSIGHT); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "slime_condensate"), SLIME_CONDENSATE); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "slime_secretions"), SLIME_SECRETIONS); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "slime_concentrate"), SLIME_CONCENTRATE); @@ -533,7 +527,34 @@ public class ItemsManager { Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "whopperflower_nectar"), WHOPPERFLOWER_NECTAR); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "shimmering_nectar"), SHIMMERING_NECTAR); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "energy_nectar"), ENERGY_NECTAR); + + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "heavy_horn"), HEAVY_HORN); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "black_bronze_horn"), BLACK_BRONZE_HORN); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "black_crystal_horn"), BLACK_CRYSTAL_HORN); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "dead_ley_line_branch"), DEAD_LEY_LINE_BRANCH); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "dead_ley_line_leaves"), DEAD_LEY_LINE_LEAVES); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "ley_line_sprout"), LEY_LINE_SPROUT); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "chaos_device"), CHAOS_DEVICE); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "chaos_circuit"), CHAOS_CIRCUIT); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "chaos_core"), CHAOS_CORE); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "mist_grass_pollen"), MIST_GRASS_POLLEN); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "mist_grass"), MIST_GRASS); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "mist_grass_wick"), MIST_GRASS_WICK); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "hunters_sacrificial_knife"), HUNTERS_SACRIFICIAL_KNIFE); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "agents_sacrificial_knife"), AGENTS_SACRIFICIAL_KNIFE); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "inspectors_sacrificial_knife"), INSPECTORS_SACRIFICIAL_KNIFE); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "fragile_bone_shard"), FRAGILE_BONE_SHARD); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "sturdy_bone_shard"), STURDY_BONE_SHARD); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "fossilized_bone_shard"), FOSSILIZED_BONE_SHARD); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "dust_of_azoth"), DUST_OF_AZOTH); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "northlander_sword_billet"), NORTHLANDER_SWORD_BILLET); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "northlander_claymore_billet"), NORTHLANDER_CLAYMORE_BILLET); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "northlander_polearm_billet"), NORTHLANDER_POLEARM_BILLET); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "northlander_bow_billet"), NORTHLANDER_BOW_BILLET); + Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "northlander_catalyst_billet"), NORTHLANDER_CATALYST_BILLET); + + // book Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "teachings_of_ballad"), TEACHINGS_OF_BALLAD); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "guide_to_ballad"), GUIDE_TO_BALLAD); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "philosophies_of_ballad"), PHILOSOPHIES_OF_BALLAD); @@ -552,20 +573,8 @@ public class ItemsManager { Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "teachings_of_resistance"), TEACHINGS_OF_RESISTANCE); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "guide_to_resistance"), GUIDE_TO_RESISTANCE); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "philosophies_of_resistance"), PHILOSOPHIES_OF_RESISTANCE); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "dvalins_plume"), DVALINS_PLUME); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "dvalins_claw"), DVALINS_CLAW); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "dvalins_sigh"), DVALINS_SIGH); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "tail_of_boreas"), TAIL_OF_BOREAS); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "ring_of_boreas"), RING_OF_BOREAS); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "spirit_locket_of_boreas"), SPIRIT_LOCKET_OF_BOREAS); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "tusk_of_monoceros_caeli"), TUSK_OF_MONOCEROS_CAELI); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "shard_of_a_foul_legacy"), SHARD_OF_A_FOUL_LEGACY); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "shadow_of_the_warrior"), SHADOW_OF_THE_WARRIOR); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "dragon_lords_crown"), DRAGON_LORDS_CROWN); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "bloodjade_branch"), BLOODJADE_BRANCH); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "gilded_scale"), GILDED_SCALE); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "crown_of_insight"), CROWN_OF_INSIGHT); + // weapon material Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "tile_of_decarabians_tower"), TILE_OF_DECARABIANS_TOWER); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "debris_of_decarabians_city"), DEBRIS_OF_DECARABIANS_CITY); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "fragment_of_decarabians_epic"), FRAGMENT_OF_DECARABIANS_EPIC); @@ -591,25 +600,7 @@ public class ItemsManager { Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "bit_of_aerosiderite"), BIT_OF_AEROSIDERITE); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "chunk_of_aerosiderite"), CHUNK_OF_AEROSIDERITE); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "heavy_horn"), HEAVY_HORN); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "black_bronze_horn"), BLACK_BRONZE_HORN); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "black_crystal_horn"), BLACK_CRYSTAL_HORN); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "dead_ley_line_branch"), DEAD_LEY_LINE_BRANCH); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "dead_ley_line_leaves"), DEAD_LEY_LINE_LEAVES); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "ley_line_sprout"), LEY_LINE_SPROUT); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "chaos_device"), CHAOS_DEVICE); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "chaos_circuit"), CHAOS_CIRCUIT); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "chaos_core"), CHAOS_CORE); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "mist_grass_pollen"), MIST_GRASS_POLLEN); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "mist_grass"), MIST_GRASS); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "mist_grass_wick"), MIST_GRASS_WICK); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "hunters_sacrificial_knife"), HUNTERS_SACRIFICIAL_KNIFE); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "agents_sacrificial_knife"), AGENTS_SACRIFICIAL_KNIFE); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "inspectors_sacrificial_knife"), INSPECTORS_SACRIFICIAL_KNIFE); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "fragile_bone_shard"), FRAGILE_BONE_SHARD); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "sturdy_bone_shard"), STURDY_BONE_SHARD); - Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "fossilized_bone_shard"), FOSSILIZED_BONE_SHARD); - + // potions Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "unmoving_essential_oil"), UNMOVING_ESSENTIAL_OIL); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "shocking_essential_oil"), SHOCKING_ESSENTIAL_OIL); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "gushing_essential_oil"), GUSHING_ESSENTIAL_OIL); @@ -625,6 +616,7 @@ public class ItemsManager { Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "heatshield_potion"), HEATSHIELD_POTION); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "dendrocide_potion"), DENDROCIDE_POTION); + // foods Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "chicken_mushroom_skewer"), CHICKEN_MUSHROOM_SKEWER); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "teyvat_fried_egg"), TEYVAT_FRIED_EGG); Registry.register(Registry.ITEM, new Identifier("teyvatcraft", "steak"), STEAK); diff --git a/src/main/java/net/yyc12345/teyvatcraft/init/TerrainsManager.java b/src/main/java/net/yyc12345/teyvatcraft/init/TerrainsManager.java index ea878b6..fe02644 100644 --- a/src/main/java/net/yyc12345/teyvatcraft/init/TerrainsManager.java +++ b/src/main/java/net/yyc12345/teyvatcraft/init/TerrainsManager.java @@ -62,7 +62,7 @@ public class TerrainsManager { .spreadHorizontally() .repeat(24); - private static void RegisterOreGeneration(String mIdentifier, ConfiguredFeature genStasticas) { + private static void registerOreGeneration(String mIdentifier, ConfiguredFeature genStasticas) { RegistryKey> regKey = RegistryKey.of(Registry.CONFIGURED_FEATURE_WORLDGEN, new Identifier("teyvatcraft", mIdentifier)); Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, regKey.getValue(), genStasticas); @@ -71,10 +71,10 @@ public class TerrainsManager { public static void RegisterAll() { // ore gen - RegisterOreGeneration("oregen_magical_crystal_ore", OREGEN_MAGICAL_CRYSTAL_CHUNK_ORE); - RegisterOreGeneration("oregen_crystal_ore", OREGEN_CRYSTAL_CHUNK_ORE); - RegisterOreGeneration("oregen_white_iron_ore", OREGEN_WHITE_IRON_CHUNK_ORE); - RegisterOreGeneration("oregen_iron_ore", OREGEN_IRON_CHUNK_ORE); - RegisterOreGeneration("oregen_starsilver_ore", OREGEN_STARSILVER_ORE); + registerOreGeneration("oregen_magical_crystal_ore", OREGEN_MAGICAL_CRYSTAL_CHUNK_ORE); + registerOreGeneration("oregen_crystal_ore", OREGEN_CRYSTAL_CHUNK_ORE); + registerOreGeneration("oregen_white_iron_ore", OREGEN_WHITE_IRON_CHUNK_ORE); + registerOreGeneration("oregen_iron_ore", OREGEN_IRON_CHUNK_ORE); + registerOreGeneration("oregen_starsilver_ore", OREGEN_STARSILVER_ORE); } } diff --git a/src/main/resources/assets/teyvatcraft/blockstates/berry.json b/src/main/resources/assets/teyvatcraft/blockstates/berry.json new file mode 100644 index 0000000..f613d66 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/blockstates/berry.json @@ -0,0 +1,16 @@ +{ + "variants": { + "age=0": { + "model": "teyvatcraft:block/berry_stage0" + }, + "age=1": { + "model": "teyvatcraft:block/berry_stage1" + }, + "age=2": { + "model": "teyvatcraft:block/berry_stage2" + }, + "age=3": { + "model": "teyvatcraft:block/berry_stage3" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/blockstates/calla_lily.json b/src/main/resources/assets/teyvatcraft/blockstates/calla_lily.json new file mode 100644 index 0000000..33aa0f8 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/blockstates/calla_lily.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "teyvatcraft:block/calla_lily" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/blockstates/cecilia.json b/src/main/resources/assets/teyvatcraft/blockstates/cecilia.json new file mode 100644 index 0000000..067e8bd --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/blockstates/cecilia.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "teyvatcraft:block/cecilia" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/blockstates/dandelion_seed.json b/src/main/resources/assets/teyvatcraft/blockstates/dandelion_seed.json new file mode 100644 index 0000000..b8a37f0 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/blockstates/dandelion_seed.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "teyvatcraft:block/dandelion_seed" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/blockstates/glaze_lily.json b/src/main/resources/assets/teyvatcraft/blockstates/glaze_lily.json new file mode 100644 index 0000000..30fdce6 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/blockstates/glaze_lily.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "teyvatcraft:block/glaze_lily" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/blockstates/horsetail.json b/src/main/resources/assets/teyvatcraft/blockstates/horsetail.json new file mode 100644 index 0000000..97f2751 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/blockstates/horsetail.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "teyvatcraft:block/horsetail" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/blockstates/jueyun_chili.json b/src/main/resources/assets/teyvatcraft/blockstates/jueyun_chili.json new file mode 100644 index 0000000..cb40515 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/blockstates/jueyun_chili.json @@ -0,0 +1,16 @@ +{ + "variants": { + "age=0": { + "model": "teyvatcraft:block/jueyun_chili_stage0" + }, + "age=1": { + "model": "teyvatcraft:block/jueyun_chili_stage1" + }, + "age=2": { + "model": "teyvatcraft:block/jueyun_chili_stage2" + }, + "age=3": { + "model": "teyvatcraft:block/jueyun_chili_stage3" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/blockstates/matsutake.json b/src/main/resources/assets/teyvatcraft/blockstates/matsutake.json new file mode 100644 index 0000000..5dfbbda --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/blockstates/matsutake.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "teyvatcraft:block/matsutake" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/blockstates/mint.json b/src/main/resources/assets/teyvatcraft/blockstates/mint.json new file mode 100644 index 0000000..ea4fb01 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/blockstates/mint.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "teyvatcraft:block/mint" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/blockstates/philanemo_mushroom.json b/src/main/resources/assets/teyvatcraft/blockstates/philanemo_mushroom.json new file mode 100644 index 0000000..eeba5da --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/blockstates/philanemo_mushroom.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "teyvatcraft:block/philanemo_mushroom" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/blockstates/qingxin.json b/src/main/resources/assets/teyvatcraft/blockstates/qingxin.json new file mode 100644 index 0000000..7d64aea --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/blockstates/qingxin.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "teyvatcraft:block/qingxin" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/blockstates/silk_flower.json b/src/main/resources/assets/teyvatcraft/blockstates/silk_flower.json new file mode 100644 index 0000000..4444ee5 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/blockstates/silk_flower.json @@ -0,0 +1,16 @@ +{ + "variants": { + "age=0": { + "model": "teyvatcraft:block/silk_flower_stage0" + }, + "age=1": { + "model": "teyvatcraft:block/silk_flower_stage1" + }, + "age=2": { + "model": "teyvatcraft:block/silk_flower_stage2" + }, + "age=3": { + "model": "teyvatcraft:block/silk_flower_stage3" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/blockstates/small_lamp_grass.json b/src/main/resources/assets/teyvatcraft/blockstates/small_lamp_grass.json new file mode 100644 index 0000000..53bce24 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/blockstates/small_lamp_grass.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "teyvatcraft:block/small_lamp_grass" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/blockstates/snapdragon.json b/src/main/resources/assets/teyvatcraft/blockstates/snapdragon.json new file mode 100644 index 0000000..9a99690 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/blockstates/snapdragon.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "teyvatcraft:block/snapdragon" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/blockstates/sweet_flower.json b/src/main/resources/assets/teyvatcraft/blockstates/sweet_flower.json new file mode 100644 index 0000000..fb1273a --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/blockstates/sweet_flower.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "teyvatcraft:block/sweet_flower" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/blockstates/valberry.json b/src/main/resources/assets/teyvatcraft/blockstates/valberry.json new file mode 100644 index 0000000..71bbb31 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/blockstates/valberry.json @@ -0,0 +1,16 @@ +{ + "variants": { + "age=0": { + "model": "teyvatcraft:block/valberry_stage0" + }, + "age=1": { + "model": "teyvatcraft:block/valberry_stage1" + }, + "age=2": { + "model": "teyvatcraft:block/valberry_stage2" + }, + "age=3": { + "model": "teyvatcraft:block/valberry_stage3" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/blockstates/windwheel_aster.json b/src/main/resources/assets/teyvatcraft/blockstates/windwheel_aster.json new file mode 100644 index 0000000..00a6a15 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/blockstates/windwheel_aster.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "teyvatcraft:block/windwheel_aster" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/blockstates/wolfhook.json b/src/main/resources/assets/teyvatcraft/blockstates/wolfhook.json new file mode 100644 index 0000000..4344eaa --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/blockstates/wolfhook.json @@ -0,0 +1,16 @@ +{ + "variants": { + "age=0": { + "model": "teyvatcraft:block/wolfhook_stage0" + }, + "age=1": { + "model": "teyvatcraft:block/wolfhook_stage1" + }, + "age=2": { + "model": "teyvatcraft:block/wolfhook_stage2" + }, + "age=3": { + "model": "teyvatcraft:block/wolfhook_stage3" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/lang/en_us.json b/src/main/resources/assets/teyvatcraft/lang/en_us.json index 33e07b3..95ca02f 100644 --- a/src/main/resources/assets/teyvatcraft/lang/en_us.json +++ b/src/main/resources/assets/teyvatcraft/lang/en_us.json @@ -42,6 +42,25 @@ "block.teyvatcraft.radish": "Radish", "block.teyvatcraft.rice_seed": "Rice Seed", + "block.teyvatcraft.calla_lily": "Calla Lily", + "block.teyvatcraft.dandelion_seed": "Dandelion Seed", + "block.teyvatcraft.jueyun_chili": "Jueyun Chili", + "block.teyvatcraft.small_lamp_grass": "Small Lamp Grass", + "block.teyvatcraft.mint": "Mint", + "block.teyvatcraft.sweet_flower": "Sweet Flower", + "block.teyvatcraft.berry": "Berry", + "block.teyvatcraft.snapdragon": "Snapdragon", + "block.teyvatcraft.matsutake": "Matsutake", + "block.teyvatcraft.horsetail": "Horsetail", + "block.teyvatcraft.cecilia": "Cecilia", + "block.teyvatcraft.glaze_lily": "Glaze Lily", + "block.teyvatcraft.philanemo_mushroom": "Philanemo Mushroom", + "block.teyvatcraft.silk_flower": "Silk Flower", + "block.teyvatcraft.valberry": "Valberry", + "block.teyvatcraft.windwheel_aster": "Windwheel Aster", + "block.teyvatcraft.wolfhook": "Wolfhook", + "block.teyvatcraft.qingxin": "Qingxin", + "item.teyvatcraft.rice": "Rice", "item.teyvatcraft.tomato": "Tomato", "item.teyvatcraft.onion": "Onion", diff --git a/src/main/resources/assets/teyvatcraft/lang/zh_cn.json b/src/main/resources/assets/teyvatcraft/lang/zh_cn.json index 27cb8a7..c7783fc 100644 --- a/src/main/resources/assets/teyvatcraft/lang/zh_cn.json +++ b/src/main/resources/assets/teyvatcraft/lang/zh_cn.json @@ -41,6 +41,25 @@ "block.teyvatcraft.cabbage": "卷心菜", "block.teyvatcraft.radish": "白萝卜", + "block.teyvatcraft.calla_lily": "嘟嘟莲", + "block.teyvatcraft.dandelion_seed": "蒲公英籽", + "block.teyvatcraft.jueyun_chili": "绝云椒椒", + "block.teyvatcraft.small_lamp_grass": "小灯草", + "block.teyvatcraft.mint": "薄荷", + "block.teyvatcraft.sweet_flower": "甜甜花", + "block.teyvatcraft.berry": "树莓", + "block.teyvatcraft.snapdragon": "金鱼草", + "block.teyvatcraft.matsutake": "松茸", + "block.teyvatcraft.horsetail": "马尾", + "block.teyvatcraft.cecilia": "塞西莉亚花", + "block.teyvatcraft.glaze_lily": "琉璃百合", + "block.teyvatcraft.philanemo_mushroom": "慕风蘑菇", + "block.teyvatcraft.silk_flower": "霓裳花", + "block.teyvatcraft.valberry": "落落莓", + "block.teyvatcraft.windwheel_aster": "风车菊", + "block.teyvatcraft.wolfhook": "钩钩果", + "block.teyvatcraft.qingxin": "清心", + "item.teyvatcraft.rice": "稻米", "item.teyvatcraft.tomato": "番茄", "item.teyvatcraft.onion": "洋葱", diff --git a/src/main/resources/assets/teyvatcraft/models/block/berry_stage0.json b/src/main/resources/assets/teyvatcraft/models/block/berry_stage0.json new file mode 100644 index 0000000..8d04005 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/berry_stage0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/berry_stage0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/berry_stage1.json b/src/main/resources/assets/teyvatcraft/models/block/berry_stage1.json new file mode 100644 index 0000000..e4b088b --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/berry_stage1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/berry_stage1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/berry_stage2.json b/src/main/resources/assets/teyvatcraft/models/block/berry_stage2.json new file mode 100644 index 0000000..b207798 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/berry_stage2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/berry_stage2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/berry_stage3.json b/src/main/resources/assets/teyvatcraft/models/block/berry_stage3.json new file mode 100644 index 0000000..f8fed1b --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/berry_stage3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/berry_stage3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/calla_lily.json b/src/main/resources/assets/teyvatcraft/models/block/calla_lily.json new file mode 100644 index 0000000..8621cea --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/calla_lily.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/calla_lily" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/cecilia.json b/src/main/resources/assets/teyvatcraft/models/block/cecilia.json new file mode 100644 index 0000000..36e66da --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/cecilia.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/cecilia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/dandelion_seed.json b/src/main/resources/assets/teyvatcraft/models/block/dandelion_seed.json new file mode 100644 index 0000000..f377cd5 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/dandelion_seed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/dandelion_seed" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/glaze_lily.json b/src/main/resources/assets/teyvatcraft/models/block/glaze_lily.json new file mode 100644 index 0000000..58f6176 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/glaze_lily.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/glaze_lily" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/horsetail.json b/src/main/resources/assets/teyvatcraft/models/block/horsetail.json new file mode 100644 index 0000000..8fec175 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/horsetail.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/horsetail" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/jueyun_chili_stage0.json b/src/main/resources/assets/teyvatcraft/models/block/jueyun_chili_stage0.json new file mode 100644 index 0000000..f3c2ce3 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/jueyun_chili_stage0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/jueyun_chili_stage0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/jueyun_chili_stage1.json b/src/main/resources/assets/teyvatcraft/models/block/jueyun_chili_stage1.json new file mode 100644 index 0000000..140a9c6 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/jueyun_chili_stage1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/jueyun_chili_stage1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/jueyun_chili_stage2.json b/src/main/resources/assets/teyvatcraft/models/block/jueyun_chili_stage2.json new file mode 100644 index 0000000..0b20d4e --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/jueyun_chili_stage2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/jueyun_chili_stage2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/jueyun_chili_stage3.json b/src/main/resources/assets/teyvatcraft/models/block/jueyun_chili_stage3.json new file mode 100644 index 0000000..97f6ac4 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/jueyun_chili_stage3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/jueyun_chili_stage3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/matsutake.json b/src/main/resources/assets/teyvatcraft/models/block/matsutake.json new file mode 100644 index 0000000..f9d9353 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/matsutake.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/matsutake" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/mint.json b/src/main/resources/assets/teyvatcraft/models/block/mint.json new file mode 100644 index 0000000..a897ab8 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/mint.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/mint" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/philanemo_mushroom.json b/src/main/resources/assets/teyvatcraft/models/block/philanemo_mushroom.json new file mode 100644 index 0000000..890a141 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/philanemo_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/philanemo_mushroom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/qingxin.json b/src/main/resources/assets/teyvatcraft/models/block/qingxin.json new file mode 100644 index 0000000..4c9016d --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/qingxin.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/qingxin" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/silk_flower_stage0.json b/src/main/resources/assets/teyvatcraft/models/block/silk_flower_stage0.json new file mode 100644 index 0000000..8838fd3 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/silk_flower_stage0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/silk_flower_stage0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/silk_flower_stage1.json b/src/main/resources/assets/teyvatcraft/models/block/silk_flower_stage1.json new file mode 100644 index 0000000..e3ec19a --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/silk_flower_stage1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/silk_flower_stage1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/silk_flower_stage2.json b/src/main/resources/assets/teyvatcraft/models/block/silk_flower_stage2.json new file mode 100644 index 0000000..ff70867 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/silk_flower_stage2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/silk_flower_stage2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/silk_flower_stage3.json b/src/main/resources/assets/teyvatcraft/models/block/silk_flower_stage3.json new file mode 100644 index 0000000..1031f28 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/silk_flower_stage3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/silk_flower_stage3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/small_lamp_grass.json b/src/main/resources/assets/teyvatcraft/models/block/small_lamp_grass.json new file mode 100644 index 0000000..c240295 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/small_lamp_grass.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/small_lamp_grass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/snapdragon.json b/src/main/resources/assets/teyvatcraft/models/block/snapdragon.json new file mode 100644 index 0000000..c96d018 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/snapdragon.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/snapdragon" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/sweet_flower.json b/src/main/resources/assets/teyvatcraft/models/block/sweet_flower.json new file mode 100644 index 0000000..8677eee --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/sweet_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/sweet_flower" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/valberry_stage0.json b/src/main/resources/assets/teyvatcraft/models/block/valberry_stage0.json new file mode 100644 index 0000000..ca374ad --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/valberry_stage0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/valberry_stage0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/valberry_stage1.json b/src/main/resources/assets/teyvatcraft/models/block/valberry_stage1.json new file mode 100644 index 0000000..464e2c9 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/valberry_stage1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/valberry_stage1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/valberry_stage2.json b/src/main/resources/assets/teyvatcraft/models/block/valberry_stage2.json new file mode 100644 index 0000000..1902c36 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/valberry_stage2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/valberry_stage2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/valberry_stage3.json b/src/main/resources/assets/teyvatcraft/models/block/valberry_stage3.json new file mode 100644 index 0000000..01ff17e --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/valberry_stage3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/valberry_stage3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/windwheel_aster.json b/src/main/resources/assets/teyvatcraft/models/block/windwheel_aster.json new file mode 100644 index 0000000..d012dee --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/windwheel_aster.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/windwheel_aster" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/wolfhook_stage0.json b/src/main/resources/assets/teyvatcraft/models/block/wolfhook_stage0.json new file mode 100644 index 0000000..5546c53 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/wolfhook_stage0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/wolfhook_stage0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/wolfhook_stage1.json b/src/main/resources/assets/teyvatcraft/models/block/wolfhook_stage1.json new file mode 100644 index 0000000..91c91cc --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/wolfhook_stage1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/wolfhook_stage1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/wolfhook_stage2.json b/src/main/resources/assets/teyvatcraft/models/block/wolfhook_stage2.json new file mode 100644 index 0000000..594b818 --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/wolfhook_stage2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/wolfhook_stage2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/models/block/wolfhook_stage3.json b/src/main/resources/assets/teyvatcraft/models/block/wolfhook_stage3.json new file mode 100644 index 0000000..651fc4c --- /dev/null +++ b/src/main/resources/assets/teyvatcraft/models/block/wolfhook_stage3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "teyvatcraft:block/wolfhook_stage3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/teyvatcraft/textures/block/berry_stage0.png b/src/main/resources/assets/teyvatcraft/textures/block/berry_stage0.png new file mode 100644 index 0000000..6b5854d Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/berry_stage0.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/berry_stage1.png b/src/main/resources/assets/teyvatcraft/textures/block/berry_stage1.png new file mode 100644 index 0000000..216269c Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/berry_stage1.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/berry_stage2.png b/src/main/resources/assets/teyvatcraft/textures/block/berry_stage2.png new file mode 100644 index 0000000..fbcadef Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/berry_stage2.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/berry_stage3.png b/src/main/resources/assets/teyvatcraft/textures/block/berry_stage3.png new file mode 100644 index 0000000..0528131 Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/berry_stage3.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/calla_lily.png b/src/main/resources/assets/teyvatcraft/textures/block/calla_lily.png new file mode 100644 index 0000000..5505025 Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/calla_lily.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/cecilia.png b/src/main/resources/assets/teyvatcraft/textures/block/cecilia.png new file mode 100644 index 0000000..c65a84d Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/cecilia.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/dandelion_seed.png b/src/main/resources/assets/teyvatcraft/textures/block/dandelion_seed.png new file mode 100644 index 0000000..1229586 Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/dandelion_seed.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/glaze_lily.png b/src/main/resources/assets/teyvatcraft/textures/block/glaze_lily.png new file mode 100644 index 0000000..82e10ea Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/glaze_lily.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/horsetail.png b/src/main/resources/assets/teyvatcraft/textures/block/horsetail.png new file mode 100644 index 0000000..f9e7002 Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/horsetail.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/jueyun_chili_stage0.png b/src/main/resources/assets/teyvatcraft/textures/block/jueyun_chili_stage0.png new file mode 100644 index 0000000..6b5854d Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/jueyun_chili_stage0.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/jueyun_chili_stage1.png b/src/main/resources/assets/teyvatcraft/textures/block/jueyun_chili_stage1.png new file mode 100644 index 0000000..216269c Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/jueyun_chili_stage1.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/jueyun_chili_stage2.png b/src/main/resources/assets/teyvatcraft/textures/block/jueyun_chili_stage2.png new file mode 100644 index 0000000..8f43150 Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/jueyun_chili_stage2.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/jueyun_chili_stage3.png b/src/main/resources/assets/teyvatcraft/textures/block/jueyun_chili_stage3.png new file mode 100644 index 0000000..31f087a Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/jueyun_chili_stage3.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/matsutake.png b/src/main/resources/assets/teyvatcraft/textures/block/matsutake.png new file mode 100644 index 0000000..351732f Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/matsutake.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/mint.png b/src/main/resources/assets/teyvatcraft/textures/block/mint.png new file mode 100644 index 0000000..5d3d0bf Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/mint.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/philanemo_mushroom.png b/src/main/resources/assets/teyvatcraft/textures/block/philanemo_mushroom.png new file mode 100644 index 0000000..f0fdae9 Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/philanemo_mushroom.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/qingxin.png b/src/main/resources/assets/teyvatcraft/textures/block/qingxin.png new file mode 100644 index 0000000..eed5207 Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/qingxin.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/silk_flower_stage0.png b/src/main/resources/assets/teyvatcraft/textures/block/silk_flower_stage0.png new file mode 100644 index 0000000..6b5854d Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/silk_flower_stage0.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/silk_flower_stage1.png b/src/main/resources/assets/teyvatcraft/textures/block/silk_flower_stage1.png new file mode 100644 index 0000000..216269c Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/silk_flower_stage1.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/silk_flower_stage2.png b/src/main/resources/assets/teyvatcraft/textures/block/silk_flower_stage2.png new file mode 100644 index 0000000..cdcca33 Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/silk_flower_stage2.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/silk_flower_stage3.png b/src/main/resources/assets/teyvatcraft/textures/block/silk_flower_stage3.png new file mode 100644 index 0000000..c6e2b6d Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/silk_flower_stage3.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/small_lamp_grass.png b/src/main/resources/assets/teyvatcraft/textures/block/small_lamp_grass.png new file mode 100644 index 0000000..5a4d831 Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/small_lamp_grass.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/snapdragon.png b/src/main/resources/assets/teyvatcraft/textures/block/snapdragon.png new file mode 100644 index 0000000..7b63757 Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/snapdragon.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/sweet_flower.png b/src/main/resources/assets/teyvatcraft/textures/block/sweet_flower.png new file mode 100644 index 0000000..ee2c0cd Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/sweet_flower.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/valberry_stage0.png b/src/main/resources/assets/teyvatcraft/textures/block/valberry_stage0.png new file mode 100644 index 0000000..6b5854d Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/valberry_stage0.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/valberry_stage1.png b/src/main/resources/assets/teyvatcraft/textures/block/valberry_stage1.png new file mode 100644 index 0000000..216269c Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/valberry_stage1.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/valberry_stage2.png b/src/main/resources/assets/teyvatcraft/textures/block/valberry_stage2.png new file mode 100644 index 0000000..642a06e Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/valberry_stage2.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/valberry_stage3.png b/src/main/resources/assets/teyvatcraft/textures/block/valberry_stage3.png new file mode 100644 index 0000000..7204ca2 Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/valberry_stage3.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/windwheel_aster.png b/src/main/resources/assets/teyvatcraft/textures/block/windwheel_aster.png new file mode 100644 index 0000000..7156d67 Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/windwheel_aster.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/wolfhook_stage0.png b/src/main/resources/assets/teyvatcraft/textures/block/wolfhook_stage0.png new file mode 100644 index 0000000..6b5854d Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/wolfhook_stage0.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/wolfhook_stage1.png b/src/main/resources/assets/teyvatcraft/textures/block/wolfhook_stage1.png new file mode 100644 index 0000000..216269c Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/wolfhook_stage1.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/wolfhook_stage2.png b/src/main/resources/assets/teyvatcraft/textures/block/wolfhook_stage2.png new file mode 100644 index 0000000..a490f4a Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/wolfhook_stage2.png differ diff --git a/src/main/resources/assets/teyvatcraft/textures/block/wolfhook_stage3.png b/src/main/resources/assets/teyvatcraft/textures/block/wolfhook_stage3.png new file mode 100644 index 0000000..9dcc93d Binary files /dev/null and b/src/main/resources/assets/teyvatcraft/textures/block/wolfhook_stage3.png differ diff --git a/src/main/resources/data/teyvatcraft/loot_tables/blocks/berry.json b/src/main/resources/data/teyvatcraft/loot_tables/blocks/berry.json new file mode 100644 index 0000000..29d526f --- /dev/null +++ b/src/main/resources/data/teyvatcraft/loot_tables/blocks/berry.json @@ -0,0 +1,82 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "teyvatcraft:berry" + } + ], + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "teyvatcraft:berry", + "properties": { + "age": "3" + } + } + ], + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2.0, + "max": 3.0, + "type": "minecraft:uniform" + } + }, + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "parameters": { + "bonusMultiplier": 1 + } + } + ] + }, + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "teyvatcraft:berry" + } + ], + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "teyvatcraft:berry", + "properties": { + "age": "2" + } + } + ], + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1.0, + "max": 2.0, + "type": "minecraft:uniform" + } + }, + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "parameters": { + "bonusMultiplier": 1 + } + } + ] + } + ], + "functions": [ + { + "function": "minecraft:explosion_decay" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/teyvatcraft/loot_tables/blocks/calla_lily.json b/src/main/resources/data/teyvatcraft/loot_tables/blocks/calla_lily.json new file mode 100644 index 0000000..2d93ccd --- /dev/null +++ b/src/main/resources/data/teyvatcraft/loot_tables/blocks/calla_lily.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "teyvatcraft:calla_lily" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/teyvatcraft/loot_tables/blocks/cecilia.json b/src/main/resources/data/teyvatcraft/loot_tables/blocks/cecilia.json new file mode 100644 index 0000000..6cb8dc5 --- /dev/null +++ b/src/main/resources/data/teyvatcraft/loot_tables/blocks/cecilia.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "teyvatcraft:cecilia" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/teyvatcraft/loot_tables/blocks/cor_lapis_ore.json b/src/main/resources/data/teyvatcraft/loot_tables/blocks/cor_lapis_ore.json new file mode 100644 index 0000000..3529feb --- /dev/null +++ b/src/main/resources/data/teyvatcraft/loot_tables/blocks/cor_lapis_ore.json @@ -0,0 +1,59 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "teyvatcraft:cor_lapis_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 4.0, + "max": 5.0, + "type": "minecraft:uniform" + } + }, + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "parameters": { + "bonusMultiplier": 1 + } + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "teyvatcraft:cor_lapis" + } + ] + } + ] + } + ] + } \ No newline at end of file diff --git a/src/main/resources/data/teyvatcraft/loot_tables/blocks/dandelion_seed.json b/src/main/resources/data/teyvatcraft/loot_tables/blocks/dandelion_seed.json new file mode 100644 index 0000000..a3bbf53 --- /dev/null +++ b/src/main/resources/data/teyvatcraft/loot_tables/blocks/dandelion_seed.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "teyvatcraft:dandelion_seed" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/teyvatcraft/loot_tables/blocks/glaze_lily.json b/src/main/resources/data/teyvatcraft/loot_tables/blocks/glaze_lily.json new file mode 100644 index 0000000..a3db155 --- /dev/null +++ b/src/main/resources/data/teyvatcraft/loot_tables/blocks/glaze_lily.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "teyvatcraft:glaze_lily" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/teyvatcraft/loot_tables/blocks/horsetail.json b/src/main/resources/data/teyvatcraft/loot_tables/blocks/horsetail.json new file mode 100644 index 0000000..a7aa8eb --- /dev/null +++ b/src/main/resources/data/teyvatcraft/loot_tables/blocks/horsetail.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "teyvatcraft:horsetail" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/teyvatcraft/loot_tables/blocks/jueyun_chili.json b/src/main/resources/data/teyvatcraft/loot_tables/blocks/jueyun_chili.json new file mode 100644 index 0000000..9c188f9 --- /dev/null +++ b/src/main/resources/data/teyvatcraft/loot_tables/blocks/jueyun_chili.json @@ -0,0 +1,82 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "teyvatcraft:jueyun_chili" + } + ], + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "teyvatcraft:jueyun_chili", + "properties": { + "age": "3" + } + } + ], + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2.0, + "max": 3.0, + "type": "minecraft:uniform" + } + }, + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "parameters": { + "bonusMultiplier": 1 + } + } + ] + }, + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "teyvatcraft:jueyun_chili" + } + ], + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "teyvatcraft:jueyun_chili", + "properties": { + "age": "2" + } + } + ], + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1.0, + "max": 2.0, + "type": "minecraft:uniform" + } + }, + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "parameters": { + "bonusMultiplier": 1 + } + } + ] + } + ], + "functions": [ + { + "function": "minecraft:explosion_decay" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/teyvatcraft/loot_tables/blocks/matsutake.json b/src/main/resources/data/teyvatcraft/loot_tables/blocks/matsutake.json new file mode 100644 index 0000000..5583299 --- /dev/null +++ b/src/main/resources/data/teyvatcraft/loot_tables/blocks/matsutake.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "teyvatcraft:matsutake" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/teyvatcraft/loot_tables/blocks/mint.json b/src/main/resources/data/teyvatcraft/loot_tables/blocks/mint.json new file mode 100644 index 0000000..a1f4aba --- /dev/null +++ b/src/main/resources/data/teyvatcraft/loot_tables/blocks/mint.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "teyvatcraft:mint" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/teyvatcraft/loot_tables/blocks/noctilucous_jade_ore.json b/src/main/resources/data/teyvatcraft/loot_tables/blocks/noctilucous_jade_ore.json new file mode 100644 index 0000000..f629257 --- /dev/null +++ b/src/main/resources/data/teyvatcraft/loot_tables/blocks/noctilucous_jade_ore.json @@ -0,0 +1,59 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "teyvatcraft:noctilucous_jade_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 4.0, + "max": 5.0, + "type": "minecraft:uniform" + } + }, + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "parameters": { + "bonusMultiplier": 1 + } + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "teyvatcraft:noctilucous_jade" + } + ] + } + ] + } + ] + } \ No newline at end of file diff --git a/src/main/resources/data/teyvatcraft/loot_tables/blocks/philanemo_mushroom.json b/src/main/resources/data/teyvatcraft/loot_tables/blocks/philanemo_mushroom.json new file mode 100644 index 0000000..2f30afd --- /dev/null +++ b/src/main/resources/data/teyvatcraft/loot_tables/blocks/philanemo_mushroom.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "teyvatcraft:philanemo_mushroom" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/teyvatcraft/loot_tables/blocks/qingxin.json b/src/main/resources/data/teyvatcraft/loot_tables/blocks/qingxin.json new file mode 100644 index 0000000..453f253 --- /dev/null +++ b/src/main/resources/data/teyvatcraft/loot_tables/blocks/qingxin.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "teyvatcraft:qingxin" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/teyvatcraft/loot_tables/blocks/silk_flower.json b/src/main/resources/data/teyvatcraft/loot_tables/blocks/silk_flower.json new file mode 100644 index 0000000..c8d16da --- /dev/null +++ b/src/main/resources/data/teyvatcraft/loot_tables/blocks/silk_flower.json @@ -0,0 +1,82 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "teyvatcraft:silk_flower" + } + ], + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "teyvatcraft:silk_flower", + "properties": { + "age": "3" + } + } + ], + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2.0, + "max": 3.0, + "type": "minecraft:uniform" + } + }, + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "parameters": { + "bonusMultiplier": 1 + } + } + ] + }, + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "teyvatcraft:silk_flower" + } + ], + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "teyvatcraft:silk_flower", + "properties": { + "age": "2" + } + } + ], + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1.0, + "max": 2.0, + "type": "minecraft:uniform" + } + }, + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "parameters": { + "bonusMultiplier": 1 + } + } + ] + } + ], + "functions": [ + { + "function": "minecraft:explosion_decay" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/teyvatcraft/loot_tables/blocks/small_lamp_grass.json b/src/main/resources/data/teyvatcraft/loot_tables/blocks/small_lamp_grass.json new file mode 100644 index 0000000..4f2dae7 --- /dev/null +++ b/src/main/resources/data/teyvatcraft/loot_tables/blocks/small_lamp_grass.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "teyvatcraft:small_lamp_grass" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/teyvatcraft/loot_tables/blocks/snapdragon.json b/src/main/resources/data/teyvatcraft/loot_tables/blocks/snapdragon.json new file mode 100644 index 0000000..1a5f5d0 --- /dev/null +++ b/src/main/resources/data/teyvatcraft/loot_tables/blocks/snapdragon.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "teyvatcraft:snapdragon" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/teyvatcraft/loot_tables/blocks/sweet_flower.json b/src/main/resources/data/teyvatcraft/loot_tables/blocks/sweet_flower.json new file mode 100644 index 0000000..4c4013a --- /dev/null +++ b/src/main/resources/data/teyvatcraft/loot_tables/blocks/sweet_flower.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "teyvatcraft:sweet_flower" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/teyvatcraft/loot_tables/blocks/valberry.json b/src/main/resources/data/teyvatcraft/loot_tables/blocks/valberry.json new file mode 100644 index 0000000..5690003 --- /dev/null +++ b/src/main/resources/data/teyvatcraft/loot_tables/blocks/valberry.json @@ -0,0 +1,82 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "teyvatcraft:valberry" + } + ], + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "teyvatcraft:valberry", + "properties": { + "age": "3" + } + } + ], + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2.0, + "max": 3.0, + "type": "minecraft:uniform" + } + }, + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "parameters": { + "bonusMultiplier": 1 + } + } + ] + }, + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "teyvatcraft:valberry" + } + ], + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "teyvatcraft:valberry", + "properties": { + "age": "2" + } + } + ], + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1.0, + "max": 2.0, + "type": "minecraft:uniform" + } + }, + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "parameters": { + "bonusMultiplier": 1 + } + } + ] + } + ], + "functions": [ + { + "function": "minecraft:explosion_decay" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/teyvatcraft/loot_tables/blocks/windwheel_aster.json b/src/main/resources/data/teyvatcraft/loot_tables/blocks/windwheel_aster.json new file mode 100644 index 0000000..07930b1 --- /dev/null +++ b/src/main/resources/data/teyvatcraft/loot_tables/blocks/windwheel_aster.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "teyvatcraft:windwheel_aster" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/teyvatcraft/loot_tables/blocks/wolfhook.json b/src/main/resources/data/teyvatcraft/loot_tables/blocks/wolfhook.json new file mode 100644 index 0000000..da6a08d --- /dev/null +++ b/src/main/resources/data/teyvatcraft/loot_tables/blocks/wolfhook.json @@ -0,0 +1,82 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "teyvatcraft:wolfhook" + } + ], + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "teyvatcraft:wolfhook", + "properties": { + "age": "3" + } + } + ], + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2.0, + "max": 3.0, + "type": "minecraft:uniform" + } + }, + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "parameters": { + "bonusMultiplier": 1 + } + } + ] + }, + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "teyvatcraft:wolfhook" + } + ], + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "teyvatcraft:wolfhook", + "properties": { + "age": "2" + } + } + ], + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1.0, + "max": 2.0, + "type": "minecraft:uniform" + } + }, + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "parameters": { + "bonusMultiplier": 1 + } + } + ] + } + ], + "functions": [ + { + "function": "minecraft:explosion_decay" + } + ] +} \ No newline at end of file