From 043a54eabf3d94c5e75c9764f8708edb4add4239 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 25 Sep 2022 15:39:07 +0200 Subject: [PATCH] Added sweet apple trees --- .../unicopia/block/FruitBearingBlock.java | 4 +- .../unicopia/block/FruitBlock.java | 9 ++ .../unicopia/block/UBlocks.java | 15 ++- .../unicopia/block/UTreeGen.java | 1 + .../minelittlepony/unicopia/item/UItems.java | 1 + .../blockstates/green_apple_sprout.json | 16 +-- .../unicopia/blockstates/sweet_apple.json | 7 ++ .../blockstates/sweet_apple_leaves.json | 7 ++ .../blockstates/sweet_apple_sapling.json | 7 ++ .../blockstates/sweet_apple_sprout.json | 28 +++++ .../resources/assets/unicopia/lang/en_us.json | 5 + ...t_stage0.json => apple_sprout_stage0.json} | 0 ...t_stage1.json => apple_sprout_stage1.json} | 0 ...t_stage2.json => apple_sprout_stage2.json} | 0 ...t_stage3.json => apple_sprout_stage3.json} | 0 ...t_stage4.json => apple_sprout_stage4.json} | 0 ...t_stage5.json => apple_sprout_stage5.json} | 0 ...t_stage6.json => apple_sprout_stage6.json} | 0 ...t_stage7.json => apple_sprout_stage7.json} | 0 .../unicopia/models/block/sweet_apple.json | 6 + .../models/block/sweet_apple_leaves.json | 6 + .../models/block/sweet_apple_sapling.json | 6 + .../models/item/sweet_apple_leaves.json | 3 + .../models/item/sweet_apple_sapling.json | 6 + .../models/item/sweet_apple_seeds.json | 6 + .../textures/block/sweet_apple_leaves.png | Bin 0 -> 2369 bytes .../textures/item/sweet_apple_sapling.png | Bin 0 -> 1960 bytes .../textures/item/sweet_apple_seeds.png | Bin 0 -> 1346 bytes .../data/minecraft/tags/blocks/leaves.json | 3 +- .../data/minecraft/tags/items/leaves.json | 3 +- .../loot_tables/blocks/sweet_apple.json | 20 +++ .../blocks/sweet_apple_leaves.json | 116 ++++++++++++++++++ .../blocks/sweet_apple_sapling.json | 20 +++ .../recipes/sweet_apple_to_seeds.json | 7 ++ .../data/unicopia/tree_types/sweet_apple.json | 6 + 35 files changed, 292 insertions(+), 16 deletions(-) create mode 100644 src/main/resources/assets/unicopia/blockstates/sweet_apple.json create mode 100644 src/main/resources/assets/unicopia/blockstates/sweet_apple_leaves.json create mode 100644 src/main/resources/assets/unicopia/blockstates/sweet_apple_sapling.json create mode 100644 src/main/resources/assets/unicopia/blockstates/sweet_apple_sprout.json rename src/main/resources/assets/unicopia/models/block/{green_apple_sprout_stage0.json => apple_sprout_stage0.json} (100%) rename src/main/resources/assets/unicopia/models/block/{green_apple_sprout_stage1.json => apple_sprout_stage1.json} (100%) rename src/main/resources/assets/unicopia/models/block/{green_apple_sprout_stage2.json => apple_sprout_stage2.json} (100%) rename src/main/resources/assets/unicopia/models/block/{green_apple_sprout_stage3.json => apple_sprout_stage3.json} (100%) rename src/main/resources/assets/unicopia/models/block/{green_apple_sprout_stage4.json => apple_sprout_stage4.json} (100%) rename src/main/resources/assets/unicopia/models/block/{green_apple_sprout_stage5.json => apple_sprout_stage5.json} (100%) rename src/main/resources/assets/unicopia/models/block/{green_apple_sprout_stage6.json => apple_sprout_stage6.json} (100%) rename src/main/resources/assets/unicopia/models/block/{green_apple_sprout_stage7.json => apple_sprout_stage7.json} (100%) create mode 100644 src/main/resources/assets/unicopia/models/block/sweet_apple.json create mode 100644 src/main/resources/assets/unicopia/models/block/sweet_apple_leaves.json create mode 100644 src/main/resources/assets/unicopia/models/block/sweet_apple_sapling.json create mode 100644 src/main/resources/assets/unicopia/models/item/sweet_apple_leaves.json create mode 100644 src/main/resources/assets/unicopia/models/item/sweet_apple_sapling.json create mode 100644 src/main/resources/assets/unicopia/models/item/sweet_apple_seeds.json create mode 100644 src/main/resources/assets/unicopia/textures/block/sweet_apple_leaves.png create mode 100644 src/main/resources/assets/unicopia/textures/item/sweet_apple_sapling.png create mode 100644 src/main/resources/assets/unicopia/textures/item/sweet_apple_seeds.png create mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/sweet_apple.json create mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/sweet_apple_leaves.json create mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/sweet_apple_sapling.json create mode 100644 src/main/resources/data/unicopia/recipes/sweet_apple_to_seeds.json create mode 100644 src/main/resources/data/unicopia/tree_types/sweet_apple.json diff --git a/src/main/java/com/minelittlepony/unicopia/block/FruitBearingBlock.java b/src/main/java/com/minelittlepony/unicopia/block/FruitBearingBlock.java index 34236f23..7dcb29c1 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/FruitBearingBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/FruitBearingBlock.java @@ -8,6 +8,7 @@ import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.ability.EarthPonyKickAbility.Buckable; +import net.fabricmc.fabric.api.registry.FlammableBlockRegistry; import net.minecraft.block.*; import net.minecraft.item.ItemStack; import net.minecraft.server.world.ServerWorld; @@ -46,6 +47,7 @@ public class FruitBearingBlock extends LeavesBlock implements TintedBlock, Bucka this.fruit = fruit; this.rottenFruitSupplier = rottenFruitSupplier; REGISTRY.add(this); + FlammableBlockRegistry.getDefaultInstance().add(this, 30, 60); } @Override @@ -63,7 +65,7 @@ public class FruitBearingBlock extends LeavesBlock implements TintedBlock, Bucka public void randomTick(BlockState state, ServerWorld world, BlockPos pos, Random random) { super.randomTick(state, world, pos, random); - if (shouldDecay(state)) { + if (shouldDecay(state) || state.get(PERSISTENT)) { return; } diff --git a/src/main/java/com/minelittlepony/unicopia/block/FruitBlock.java b/src/main/java/com/minelittlepony/unicopia/block/FruitBlock.java index ff690c5e..d3992b56 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/FruitBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/FruitBlock.java @@ -4,6 +4,7 @@ import java.util.List; import com.minelittlepony.unicopia.ability.EarthPonyKickAbility.Buckable; +import net.fabricmc.fabric.api.registry.FlammableBlockRegistry; import net.minecraft.block.*; import net.minecraft.item.ItemStack; import net.minecraft.server.world.ServerWorld; @@ -29,10 +30,18 @@ public class FruitBlock extends Block implements Buckable { } public FruitBlock(Settings settings, Direction attachmentFace, Block stem, VoxelShape shape) { + this(settings, attachmentFace, stem, shape, true); + } + + public FruitBlock(Settings settings, Direction attachmentFace, Block stem, VoxelShape shape, boolean flammable) { super(settings.nonOpaque().suffocates(UBlocks::never).blockVision(UBlocks::never)); this.attachmentFace = attachmentFace; this.stem = stem; this.shape = shape; + + if (flammable) { + FlammableBlockRegistry.getDefaultInstance().add(this, 20, 50); + } } @Override diff --git a/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java b/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java index b2cb7f61..b1d90a9d 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java +++ b/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java @@ -8,7 +8,6 @@ import com.minelittlepony.unicopia.item.UItems; 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.registry.FlammableBlockRegistry; import net.fabricmc.fabric.api.registry.StrippableBlockRegistry; import net.minecraft.block.*; import net.minecraft.entity.EntityType; @@ -40,8 +39,8 @@ public interface UBlocks { Block STRIPPED_ZAP_WOOD = register("stripped_zap_wood", new ZapAppleLogBlock(Blocks.STRIPPED_OAK_WOOD, MapColor.GRAY, MapColor.GRAY), ItemGroup.MATERIALS); Block ZAP_LEAVES = register("zap_leaves", new ZapAppleLeavesBlock(), ItemGroup.DECORATIONS); - Block ZAP_BULB = register("zap_bulb", new FruitBlock(FabricBlockSettings.of(Material.GOURD, MapColor.GRAY).strength(500, 1200).sounds(BlockSoundGroup.AZALEA_LEAVES), Direction.DOWN, ZAP_LEAVES, FruitBlock.DEFAULT_SHAPE)); - Block ZAP_APPLE = register("zap_apple", new FruitBlock(FabricBlockSettings.of(Material.GOURD, MapColor.GRAY).sounds(BlockSoundGroup.AZALEA_LEAVES), Direction.DOWN, ZAP_LEAVES, FruitBlock.DEFAULT_SHAPE)); + Block ZAP_BULB = register("zap_bulb", new FruitBlock(FabricBlockSettings.of(Material.GOURD, MapColor.GRAY).strength(500, 1200).sounds(BlockSoundGroup.AZALEA_LEAVES), Direction.DOWN, ZAP_LEAVES, FruitBlock.DEFAULT_SHAPE, false)); + Block ZAP_APPLE = register("zap_apple", new FruitBlock(FabricBlockSettings.of(Material.GOURD, MapColor.GRAY).sounds(BlockSoundGroup.AZALEA_LEAVES), Direction.DOWN, ZAP_LEAVES, FruitBlock.DEFAULT_SHAPE, false)); Block GREEN_APPLE_LEAVES = register("green_apple_leaves", new FruitBearingBlock(FabricBlockSettings.copy(Blocks.OAK_LEAVES), 0xE5FFFF88, @@ -51,6 +50,14 @@ public interface UBlocks { Block GREEN_APPLE = register("green_apple", new FruitBlock(FabricBlockSettings.of(Material.GOURD, MapColor.GREEN).sounds(BlockSoundGroup.WOOD), Direction.DOWN, GREEN_APPLE_LEAVES, FruitBlock.DEFAULT_SHAPE)); Block GREEN_APPLE_SPROUT = register("green_apple_sprout", new SproutBlock(0xE5FFFF88, () -> UItems.GREEN_APPLE_SEEDS, () -> UTreeGen.GREEN_APPLE_TREE.sapling().map(Block::getDefaultState).get())); + Block SWEET_APPLE_LEAVES = register("sweet_apple_leaves", new FruitBearingBlock(FabricBlockSettings.copy(Blocks.OAK_LEAVES), + 0xE5FFCC88, + () -> UBlocks.SWEET_APPLE, + () -> UItems.SWEET_APPLE.getDefaultStack() + ), ItemGroup.DECORATIONS); + Block SWEET_APPLE = register("sweet_apple", new FruitBlock(FabricBlockSettings.of(Material.GOURD, MapColor.GREEN).sounds(BlockSoundGroup.WOOD), Direction.DOWN, SWEET_APPLE_LEAVES, FruitBlock.DEFAULT_SHAPE)); + Block SWEET_APPLE_SPROUT = register("sweet_apple_sprout", new SproutBlock(0xE5FFCC88, () -> UItems.SWEET_APPLE_SEEDS, () -> UTreeGen.SWEET_APPLE_TREE.sapling().map(Block::getDefaultState).get())); + static T register(String name, T item) { return register(Unicopia.id(name), item); } @@ -77,8 +84,6 @@ public interface UBlocks { static void bootstrap() { StrippableBlockRegistry.register(ZAP_LOG, STRIPPED_ZAP_LOG); StrippableBlockRegistry.register(ZAP_WOOD, STRIPPED_ZAP_WOOD); - FlammableBlockRegistry.getDefaultInstance().add(GREEN_APPLE_LEAVES, 30, 60); - FlammableBlockRegistry.getDefaultInstance().add(GREEN_APPLE, 20, 50); } static boolean never(BlockState state, BlockView world, BlockPos pos) { diff --git a/src/main/java/com/minelittlepony/unicopia/block/UTreeGen.java b/src/main/java/com/minelittlepony/unicopia/block/UTreeGen.java index 18ae4002..99cdba17 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/UTreeGen.java +++ b/src/main/java/com/minelittlepony/unicopia/block/UTreeGen.java @@ -32,6 +32,7 @@ public interface UTreeGen { .count(0, 0.01F, 1) .build(); Tree GREEN_APPLE_TREE = createAppleTree("green_apple", UBlocks.GREEN_APPLE_LEAVES); + Tree SWEET_APPLE_TREE = createAppleTree("sweet_apple", UBlocks.SWEET_APPLE_LEAVES); static Tree createAppleTree(String name, Block leaves) { return Tree.Builder.create(Unicopia.id(name + "_tree"), diff --git a/src/main/java/com/minelittlepony/unicopia/item/UItems.java b/src/main/java/com/minelittlepony/unicopia/item/UItems.java index 096dcb25..12fcec61 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/UItems.java +++ b/src/main/java/com/minelittlepony/unicopia/item/UItems.java @@ -80,6 +80,7 @@ public interface UItems { Item ROCK_STEW = register("rock_stew", new Item(new Item.Settings().group(ItemGroup.FOOD).food(FoodComponents.MUSHROOM_STEW))); Item GREEN_APPLE_SEEDS = register("green_apple_seeds", new AliasedBlockItem(UBlocks.GREEN_APPLE_SPROUT, new Item.Settings().group(ItemGroup.MATERIALS))); + Item SWEET_APPLE_SEEDS = register("sweet_apple_seeds", new AliasedBlockItem(UBlocks.SWEET_APPLE_SPROUT, new Item.Settings().group(ItemGroup.MATERIALS))); Item MUG = register("mug", new Item(new Settings().group(ItemGroup.MATERIALS).maxCount(16))); Item CIDER = register("cider", new DrinkableItem(new Item.Settings().group(ItemGroup.FOOD).food(UFoodComponents.CIDER).maxCount(1).recipeRemainder(MUG))); diff --git a/src/main/resources/assets/unicopia/blockstates/green_apple_sprout.json b/src/main/resources/assets/unicopia/blockstates/green_apple_sprout.json index 7f3b2549..f88ff7ea 100644 --- a/src/main/resources/assets/unicopia/blockstates/green_apple_sprout.json +++ b/src/main/resources/assets/unicopia/blockstates/green_apple_sprout.json @@ -1,28 +1,28 @@ { "variants": { "age=0": { - "model": "unicopia:block/green_apple_sprout_stage0" + "model": "unicopia:block/apple_sprout_stage0" }, "age=1": { - "model": "unicopia:block/green_apple_sprout_stage1" + "model": "unicopia:block/apple_sprout_stage1" }, "age=2": { - "model": "unicopia:block/green_apple_sprout_stage2" + "model": "unicopia:block/apple_sprout_stage2" }, "age=3": { - "model": "unicopia:block/green_apple_sprout_stage3" + "model": "unicopia:block/apple_sprout_stage3" }, "age=4": { - "model": "unicopia:block/green_apple_sprout_stage4" + "model": "unicopia:block/apple_sprout_stage4" }, "age=5": { - "model": "unicopia:block/green_apple_sprout_stage5" + "model": "unicopia:block/apple_sprout_stage5" }, "age=6": { - "model": "unicopia:block/green_apple_sprout_stage6" + "model": "unicopia:block/apple_sprout_stage6" }, "age=7": { - "model": "unicopia:block/green_apple_sprout_stage7" + "model": "unicopia:block/apple_sprout_stage7" } } } \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/sweet_apple.json b/src/main/resources/assets/unicopia/blockstates/sweet_apple.json new file mode 100644 index 00000000..9438a847 --- /dev/null +++ b/src/main/resources/assets/unicopia/blockstates/sweet_apple.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "unicopia:block/sweet_apple" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/sweet_apple_leaves.json b/src/main/resources/assets/unicopia/blockstates/sweet_apple_leaves.json new file mode 100644 index 00000000..c6e7da22 --- /dev/null +++ b/src/main/resources/assets/unicopia/blockstates/sweet_apple_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "unicopia:block/sweet_apple_leaves" + } + } +} diff --git a/src/main/resources/assets/unicopia/blockstates/sweet_apple_sapling.json b/src/main/resources/assets/unicopia/blockstates/sweet_apple_sapling.json new file mode 100644 index 00000000..ab178dc2 --- /dev/null +++ b/src/main/resources/assets/unicopia/blockstates/sweet_apple_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "unicopia:block/sweet_apple_sapling" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/sweet_apple_sprout.json b/src/main/resources/assets/unicopia/blockstates/sweet_apple_sprout.json new file mode 100644 index 00000000..f88ff7ea --- /dev/null +++ b/src/main/resources/assets/unicopia/blockstates/sweet_apple_sprout.json @@ -0,0 +1,28 @@ +{ + "variants": { + "age=0": { + "model": "unicopia:block/apple_sprout_stage0" + }, + "age=1": { + "model": "unicopia:block/apple_sprout_stage1" + }, + "age=2": { + "model": "unicopia:block/apple_sprout_stage2" + }, + "age=3": { + "model": "unicopia:block/apple_sprout_stage3" + }, + "age=4": { + "model": "unicopia:block/apple_sprout_stage4" + }, + "age=5": { + "model": "unicopia:block/apple_sprout_stage5" + }, + "age=6": { + "model": "unicopia:block/apple_sprout_stage6" + }, + "age=7": { + "model": "unicopia:block/apple_sprout_stage7" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json index d78689e3..d46a8859 100644 --- a/src/main/resources/assets/unicopia/lang/en_us.json +++ b/src/main/resources/assets/unicopia/lang/en_us.json @@ -58,6 +58,7 @@ "item.unicopia.weird_rock": "Weird Rock", "item.unicopia.rock_stew": "Rock Stew", "item.unicopia.green_apple_seeds": "Granny Smith Apple Seeds", + "item.unicopia.sweet_apple_seeds": "Sweet Apple Seeds", "item.unicopia.daffodil_daisy_sandwich": "Daffodil Daisy Sandwich", "item.unicopia.hay_burger": "Hay Burger", @@ -97,9 +98,13 @@ "block.unicopia.zap_leaves": "Zap Apple Leaves", "block.unicopia.zap_apple": "Zap Apple", "block.unicopia.zap_bulb": "Unripened Zap Apple", + "block.unicopia.green_apple_leaves": "Granny Smith Leaves", "block.unicopia.green_apple_sapling": "Granny Smith Sapling", "block.unicopia.green_apple_sprout": "Granny Smith Sprout", + "block.unicopia.sweet_apple_leaves": "Sweet Apple Leaves", + "block.unicopia.sweet_apple_sapling": "Sweet Apple Sapling", + "block.unicopia.sweet_apple_sprout": "Sweet Apple Sprout", "entity.unicopia.butterfly": "Butterfly", "entity.unicopia.twittermite": "Twittermite", diff --git a/src/main/resources/assets/unicopia/models/block/green_apple_sprout_stage0.json b/src/main/resources/assets/unicopia/models/block/apple_sprout_stage0.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/green_apple_sprout_stage0.json rename to src/main/resources/assets/unicopia/models/block/apple_sprout_stage0.json diff --git a/src/main/resources/assets/unicopia/models/block/green_apple_sprout_stage1.json b/src/main/resources/assets/unicopia/models/block/apple_sprout_stage1.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/green_apple_sprout_stage1.json rename to src/main/resources/assets/unicopia/models/block/apple_sprout_stage1.json diff --git a/src/main/resources/assets/unicopia/models/block/green_apple_sprout_stage2.json b/src/main/resources/assets/unicopia/models/block/apple_sprout_stage2.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/green_apple_sprout_stage2.json rename to src/main/resources/assets/unicopia/models/block/apple_sprout_stage2.json diff --git a/src/main/resources/assets/unicopia/models/block/green_apple_sprout_stage3.json b/src/main/resources/assets/unicopia/models/block/apple_sprout_stage3.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/green_apple_sprout_stage3.json rename to src/main/resources/assets/unicopia/models/block/apple_sprout_stage3.json diff --git a/src/main/resources/assets/unicopia/models/block/green_apple_sprout_stage4.json b/src/main/resources/assets/unicopia/models/block/apple_sprout_stage4.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/green_apple_sprout_stage4.json rename to src/main/resources/assets/unicopia/models/block/apple_sprout_stage4.json diff --git a/src/main/resources/assets/unicopia/models/block/green_apple_sprout_stage5.json b/src/main/resources/assets/unicopia/models/block/apple_sprout_stage5.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/green_apple_sprout_stage5.json rename to src/main/resources/assets/unicopia/models/block/apple_sprout_stage5.json diff --git a/src/main/resources/assets/unicopia/models/block/green_apple_sprout_stage6.json b/src/main/resources/assets/unicopia/models/block/apple_sprout_stage6.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/green_apple_sprout_stage6.json rename to src/main/resources/assets/unicopia/models/block/apple_sprout_stage6.json diff --git a/src/main/resources/assets/unicopia/models/block/green_apple_sprout_stage7.json b/src/main/resources/assets/unicopia/models/block/apple_sprout_stage7.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/green_apple_sprout_stage7.json rename to src/main/resources/assets/unicopia/models/block/apple_sprout_stage7.json diff --git a/src/main/resources/assets/unicopia/models/block/sweet_apple.json b/src/main/resources/assets/unicopia/models/block/sweet_apple.json new file mode 100644 index 00000000..fb677dfa --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/sweet_apple.json @@ -0,0 +1,6 @@ +{ + "parent": "unicopia:block/fruit", + "textures": { + "cross": "unicopia:item/sweet_apple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/sweet_apple_leaves.json b/src/main/resources/assets/unicopia/models/block/sweet_apple_leaves.json new file mode 100644 index 00000000..fbf5020c --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/sweet_apple_leaves.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/leaves", + "textures": { + "all": "unicopia:block/sweet_apple_leaves" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/sweet_apple_sapling.json b/src/main/resources/assets/unicopia/models/block/sweet_apple_sapling.json new file mode 100644 index 00000000..2193d3a2 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/sweet_apple_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "unicopia:item/sweet_apple_sapling" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/sweet_apple_leaves.json b/src/main/resources/assets/unicopia/models/item/sweet_apple_leaves.json new file mode 100644 index 00000000..0892ce32 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/sweet_apple_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "unicopia:block/sweet_apple_leaves" +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/sweet_apple_sapling.json b/src/main/resources/assets/unicopia/models/item/sweet_apple_sapling.json new file mode 100644 index 00000000..824db059 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/sweet_apple_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/sweet_apple_sapling" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/sweet_apple_seeds.json b/src/main/resources/assets/unicopia/models/item/sweet_apple_seeds.json new file mode 100644 index 00000000..cdbcc586 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/sweet_apple_seeds.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/sweet_apple_seeds" + } +} diff --git a/src/main/resources/assets/unicopia/textures/block/sweet_apple_leaves.png b/src/main/resources/assets/unicopia/textures/block/sweet_apple_leaves.png new file mode 100644 index 0000000000000000000000000000000000000000..2f7822b4ea7d0ce836251ebd11b14f26541159cb GIT binary patch literal 2369 zcmV-H3BLA;P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1dFvF)%8`&ShyK_s=7qje@7r2IfOsdKl{FXke_xrR1Zqh!wqsV=GVJ*V- zS3lz^c*@&(_mi`be3_8$lm61h zCuvfa%G1KY4q)V&mT+a<5$*h36<6`i4@bdIKYYhEs1lR-O@Ssg+O(eMpn(trFV1)} z50}^gQe{dJmcdH|y?kS#XW#m4H>hCaNf^n5#RxN=%UR=pz5ZNi z?{Od^WN%m@F6Ki69TesKk5M3mw$)L50JiJr55!`TfKdnLf&`oI?-D)Ir?$jBL<|B(=(PM zzuk}!h=`ITgPJN0T!j!rav_I;8fsBuh%u&^V~I7kBq^krQp)LQv1Q32$DDG`CD+`F zlu%+xC6`iaX|8e=Xf@VUb1k*j*05>A$_=wyY3S(OrH3AS>baL*dmAX95k?$oG(VXSwyggP+bG%Cf=IW!pFBXF&P43`-R)%NBHlP%hXh(c2U{yQiTi?nAE5? zjc-KpcV7rDS*$%PKq>0@CY>8Qyv8{>YO|6Tx8_k-^ieeJbMu!$Ayc~nSmHe@H6$W$=QE)_^ zaX?s3-OI{|EOZ{4zwg(RR{6Nd3mz=JbN)Y&2`Rs&Tp3 zXNtWo2FbVrR{uc8?Fz7(H4@v}J>CrZwQsdSKlJ>8 zpXme?>r16Ol*rY=u$I3y8b2uQUzT30*^^Vou$)#Jsv(B&`5y4A)#yjCs(n=J`Oq>b zjrR1T{7;IXX~>mo-yE?& z^dE)Y(&J|1rk-L2pLfYzd*++`T~H4UEHw1X;CyFlHR9CKa{x!noY!OKRpT_QuW0?1 z>f)j4`;qxX1X3aoSN^Cu$P_G`E`^ zeLBKD=CW{kft~Fgb#Rzpm?s^iY(C%A? z9tfgVsWz&3fk$(@NxR*qSS%8?B0R^#=?!``W*P*3Aem;IT|CQ~${D$^d_l@5%51&Z z;=|hySYx^W{e6i$G0T^i32Pybet9Iaa&3k3i87tT4x?kE>iHhlT3Nlf%H2D6HJq;U z;_(KfpN&db3(4|KO=gJpB3#!+*4Njy9ku!R&qppUUzF{q+nPH$<*_oStEUNq0JTc9 z*`(j=V^b?ZF;MrIi{l7Rk|ZFobajcS6=AXB`#!moV>64j7J%V!NSdUeC<=vAf%>@y z&hFMOm5GX6|LVF-%}%Lb@--+1WLd_+!2!G5yBK4r*Xx`-c@n?i)9dy~l7#kN8)sx} zgm%={8(-hh{lE5^ou4H&DT|AXbU$?|21VS0%g!G=#Bt2r#W|L)E(t(4?&9?OeKb?X zzZhq-Hp%{<`%KSF%i-Z6iWgqsV`6Ac^-L| zV+MwYKRgr>(Y@V01qf>)aVMtW71;P~L(gA0FAhLyv_x;vV{ d(0B|V~*k@R<5mJ zGDD?W!Eqc4etazmYpmW| nmHwwb7)VTlU+{VK^H2I8N+qNEJ;Lne00000NkvXXu0mjfI1`_x literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/unicopia/textures/item/sweet_apple_sapling.png b/src/main/resources/assets/unicopia/textures/item/sweet_apple_sapling.png new file mode 100644 index 0000000000000000000000000000000000000000..e0486c6529d12513cc829634eb8771f466b984e3 GIT binary patch literal 1960 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