From 400bc19d084b023d6107b4adba902333caf2610f Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 8 Feb 2024 16:56:32 +0000 Subject: [PATCH] Added zap planks, stairs, and slabs --- assets/zap_planks.xcf | Bin 0 -> 4553 bytes .../block/BlockConstructionUtils.java | 2 +- .../unicopia/block/UBlocks.java | 44 ++-- .../unicopia/block/UMapColors.java | 15 ++ .../{ => zap}/BaseZapAppleLeavesBlock.java | 9 +- .../block/{ => zap}/ZapAppleLeavesBlock.java | 4 +- .../ZapAppleLeavesPlaceholderBlock.java | 4 +- .../block/{ => zap}/ZapAppleLogBlock.java | 6 +- .../unicopia/block/{ => zap}/ZapBlock.java | 35 +-- .../unicopia/block/zap/ZapSlabBlock.java | 26 +++ .../block/{ => zap}/ZapStagedBlock.java | 3 +- .../unicopia/block/zap/ZapStairsBlock.java | 22 ++ .../blockstates/waxed_zap_planks.json | 7 + .../unicopia/blockstates/waxed_zap_slab.json | 13 ++ .../blockstates/waxed_zap_stairs.json | 209 ++++++++++++++++++ .../unicopia/blockstates/zap_planks.json | 7 + .../assets/unicopia/blockstates/zap_slab.json | 13 ++ .../unicopia/blockstates/zap_stairs.json | 209 ++++++++++++++++++ .../resources/assets/unicopia/lang/en_us.json | 6 + .../unicopia/models/block/zap_planks.json | 6 + .../unicopia/models/block/zap_slab.json | 8 + .../unicopia/models/block/zap_slab_top.json | 8 + .../unicopia/models/block/zap_stairs.json | 8 + .../models/block/zap_stairs_inner.json | 8 + .../models/block/zap_stairs_outer.json | 8 + .../models/item/waxed_zap_planks.json | 3 + .../unicopia/models/item/waxed_zap_slab.json | 3 + .../models/item/waxed_zap_stairs.json | 3 + .../unicopia/models/item/zap_planks.json | 3 + .../assets/unicopia/models/item/zap_slab.json | 3 + .../unicopia/models/item/zap_stairs.json | 3 + .../unicopia/textures/block/zap_planks.png | Bin 0 -> 7013 bytes .../minecraft/tags/blocks/mineable/axe.json | 3 +- .../data/minecraft/tags/blocks/planks.json | 3 +- .../minecraft/tags/blocks/wooden_slabs.json | 4 +- .../minecraft/tags/blocks/wooden_stairs.json | 4 +- .../data/minecraft/tags/items/planks.json | 3 +- .../minecraft/tags/items/wooden_slabs.json | 4 +- .../minecraft/tags/items/wooden_stairs.json | 4 +- .../blocks/waxed_stripped_zap_log.json | 20 ++ .../blocks/waxed_stripped_zap_wood.json | 20 ++ .../loot_tables/blocks/waxed_zap_log.json | 20 ++ .../loot_tables/blocks/waxed_zap_planks.json | 20 ++ .../loot_tables/blocks/waxed_zap_slab.json | 20 ++ .../loot_tables/blocks/waxed_zap_stairs.json | 20 ++ .../loot_tables/blocks/waxed_zap_wood.json | 20 ++ .../loot_tables/blocks/zap_planks.json | 20 ++ .../unicopia/loot_tables/blocks/zap_slab.json | 20 ++ .../loot_tables/blocks/zap_stairs.json | 20 ++ .../unicopia/recipes/waxed_zap_planks.json | 8 + .../data/unicopia/recipes/waxed_zap_slab.json | 8 + .../unicopia/recipes/waxed_zap_stairs.json | 8 + .../data/unicopia/recipes/zap_planks.json | 12 + .../data/unicopia/recipes/zap_slab.json | 16 ++ .../data/unicopia/recipes/zap_stairs.json | 18 ++ .../data/unicopia/tags/items/zap_logs.json | 9 + 56 files changed, 940 insertions(+), 62 deletions(-) create mode 100644 assets/zap_planks.xcf create mode 100644 src/main/java/com/minelittlepony/unicopia/block/UMapColors.java rename src/main/java/com/minelittlepony/unicopia/block/{ => zap}/BaseZapAppleLeavesBlock.java (90%) rename src/main/java/com/minelittlepony/unicopia/block/{ => zap}/ZapAppleLeavesBlock.java (92%) rename src/main/java/com/minelittlepony/unicopia/block/{ => zap}/ZapAppleLeavesPlaceholderBlock.java (91%) rename src/main/java/com/minelittlepony/unicopia/block/{ => zap}/ZapAppleLogBlock.java (90%) rename src/main/java/com/minelittlepony/unicopia/block/{ => zap}/ZapBlock.java (67%) create mode 100644 src/main/java/com/minelittlepony/unicopia/block/zap/ZapSlabBlock.java rename src/main/java/com/minelittlepony/unicopia/block/{ => zap}/ZapStagedBlock.java (97%) create mode 100644 src/main/java/com/minelittlepony/unicopia/block/zap/ZapStairsBlock.java create mode 100644 src/main/resources/assets/unicopia/blockstates/waxed_zap_planks.json create mode 100644 src/main/resources/assets/unicopia/blockstates/waxed_zap_slab.json create mode 100644 src/main/resources/assets/unicopia/blockstates/waxed_zap_stairs.json create mode 100644 src/main/resources/assets/unicopia/blockstates/zap_planks.json create mode 100644 src/main/resources/assets/unicopia/blockstates/zap_slab.json create mode 100644 src/main/resources/assets/unicopia/blockstates/zap_stairs.json create mode 100644 src/main/resources/assets/unicopia/models/block/zap_planks.json create mode 100644 src/main/resources/assets/unicopia/models/block/zap_slab.json create mode 100644 src/main/resources/assets/unicopia/models/block/zap_slab_top.json create mode 100644 src/main/resources/assets/unicopia/models/block/zap_stairs.json create mode 100644 src/main/resources/assets/unicopia/models/block/zap_stairs_inner.json create mode 100644 src/main/resources/assets/unicopia/models/block/zap_stairs_outer.json create mode 100644 src/main/resources/assets/unicopia/models/item/waxed_zap_planks.json create mode 100644 src/main/resources/assets/unicopia/models/item/waxed_zap_slab.json create mode 100644 src/main/resources/assets/unicopia/models/item/waxed_zap_stairs.json create mode 100644 src/main/resources/assets/unicopia/models/item/zap_planks.json create mode 100644 src/main/resources/assets/unicopia/models/item/zap_slab.json create mode 100644 src/main/resources/assets/unicopia/models/item/zap_stairs.json create mode 100644 src/main/resources/assets/unicopia/textures/block/zap_planks.png create mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/waxed_stripped_zap_log.json create mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/waxed_stripped_zap_wood.json create mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_log.json create mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_planks.json create mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_slab.json create mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_stairs.json create mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_wood.json create mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/zap_planks.json create mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/zap_slab.json create mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/zap_stairs.json create mode 100644 src/main/resources/data/unicopia/recipes/waxed_zap_planks.json create mode 100644 src/main/resources/data/unicopia/recipes/waxed_zap_slab.json create mode 100644 src/main/resources/data/unicopia/recipes/waxed_zap_stairs.json create mode 100644 src/main/resources/data/unicopia/recipes/zap_planks.json create mode 100644 src/main/resources/data/unicopia/recipes/zap_slab.json create mode 100644 src/main/resources/data/unicopia/recipes/zap_stairs.json create mode 100644 src/main/resources/data/unicopia/tags/items/zap_logs.json diff --git a/assets/zap_planks.xcf b/assets/zap_planks.xcf new file mode 100644 index 0000000000000000000000000000000000000000..dc4a15cdd2cd32172c7307fdd9901487b3e312be GIT binary patch literal 4553 zcmeHKPix#(5Z6j})^Yy0b<-BZ9#q@K$rgLPn_8%>qd-DZr-@VJBs7JE<=NKCLi?}# z2U%;xhPjM0dY_ki97N~PfIJ)of*PdN?=#wDNupbvpQha^C<*FePK{tuU_xmi_3+NkPlSB5WFwADtn(Go9*({xK)A>wTK$zOr( zm1DN^V)(&rn>NX+Uf0C@EUY$PSw)NKjk<1%dVO_WrD)NpRH$l-p?-qzv9Btl&zBN$ z)KrtK5tE=CViA6szi!v6;uEz+^+x^LRDNc5N>uBsjWuxT+SH?mx2NT)>&ozaY^V&2 z;=D;Tu}*60weefFUYWUrDVn*Vn{-KSJs`DaRUKDk5kB)dP(9fsG`y$QHFJGj$@iuG zmA=-O@|P`Lt((Mzr~vvkek`kSmm8@22r@mc6kenM_{d;fxjH+Wd))zF_iwPY-Y^?8 zH?g7~KxIHCPX>RuzENAL6TSNPl7D1&vr%idREl>$u1F_FePr;;jTPqlHi@pSKZ`Gx zZhd~IZmO--byC;V+l^L@z^&x3e%gnJ#~L5i*k>nK*-@1DRqMgVN=2`#4>y~A-avS7 z@RYRl)zEjyYg~T)WU2Sq-~+Uz+iDfc>bO`R*P1h?Ua8C+Ti)}zqo))f@WdEg=q-kS z>&+KFNo>X}c1~=H*yJuO5o)Sy;ytpdwork`FBoTluxoaKK0^Nb7JNfz1wuI*pN)8! zxbXy^N$|r7UQF=k68!lDe<8t-0FUQ!T^KN>f#Od7G4ddO3G-ycqs~M^9(R7UNsKd( z5{oz)kVFPeF$TZpUY~4K}XNTpO*tpyLMHo*#hRWAKLa7}~cP zLqz6toNa@a@3-L`p8vtX3f5!aK9Y_xI z+uN9&9u7F#OAjBU?3b)F$fW`#o_m|rw@LlKRBE>iHQP;dLN~9{iskzO>Ndy!bj35YuL zd3>dsDEGUP zSMCBScY*S}lH$5~!8xD~ZBr^Zd+^^=ah8_}(TJd>$bMT11?{%rbSdxb69)y9IBB}$ zXcQKCM{_9XYlKjTPz0ca(q(}@hbhuW6{=}eqdg;q_9O(vV1zKCM4&qw7)2)XO$yR;m?C{tkqQN=AoYwgQcscvF&H6CC=sNc0vJUoh&u_$ z38S>M8|lNbvNRy?&P9jHg=}Fcdl>r1%PHwVmM|t>K17cp)V(2e7M!9U1jh<1_=t)W-1|x(CC4#Y22BQcCaTftO yVU#v@BYim5G6t;Ot>{pzTq+Nh4nzNVD`gy52FAo&hv+ecx)(>iP%Qov-RVzp+X6fQ literal 0 HcmV?d00001 diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockConstructionUtils.java b/src/main/java/com/minelittlepony/unicopia/block/BlockConstructionUtils.java index 963d38a2..8d4742d2 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/BlockConstructionUtils.java +++ b/src/main/java/com/minelittlepony/unicopia/block/BlockConstructionUtils.java @@ -15,7 +15,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.BlockView; -interface BlockConstructionUtils { +public interface BlockConstructionUtils { static ButtonBlock woodenButton() { return woodenButton(BlockSoundGroup.WOOD, BlockSetType.OAK); } diff --git a/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java b/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java index 59f50cb0..a19d2e39 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java +++ b/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java @@ -21,6 +21,13 @@ import com.minelittlepony.unicopia.block.cloud.SoggyCloudBlock; import com.minelittlepony.unicopia.block.cloud.SoggyCloudSlabBlock; import com.minelittlepony.unicopia.block.cloud.SoggyCloudStairsBlock; import com.minelittlepony.unicopia.block.cloud.UnstableCloudBlock; +import com.minelittlepony.unicopia.block.zap.BaseZapAppleLeavesBlock; +import com.minelittlepony.unicopia.block.zap.ZapAppleLeavesBlock; +import com.minelittlepony.unicopia.block.zap.ZapAppleLeavesPlaceholderBlock; +import com.minelittlepony.unicopia.block.zap.ZapAppleLogBlock; +import com.minelittlepony.unicopia.block.zap.ZapBlock; +import com.minelittlepony.unicopia.block.zap.ZapSlabBlock; +import com.minelittlepony.unicopia.block.zap.ZapStairsBlock; import com.minelittlepony.unicopia.entity.effect.UEffects; import com.minelittlepony.unicopia.item.UItems; import com.minelittlepony.unicopia.item.cloud.CloudBlockItem; @@ -60,30 +67,36 @@ public interface UBlocks { Block FROSTED_OBSIDIAN = register("frosted_obsidian", new FrostedObsidianBlock(FabricBlockSettings.copy(Blocks.OBSIDIAN).ticksRandomly())); - Block ZAP_LOG = register("zap_log", new ZapAppleLogBlock(Blocks.OAK_LOG, MapColor.GRAY, MapColor.DEEPSLATE_GRAY), ItemGroups.BUILDING_BLOCKS); - Block ZAP_WOOD = register("zap_wood", new ZapAppleLogBlock(Blocks.OAK_WOOD, MapColor.DEEPSLATE_GRAY, MapColor.DEEPSLATE_GRAY), ItemGroups.BUILDING_BLOCKS); + Block ZAP_LOG = register("zap_log", new ZapAppleLogBlock(Blocks.OAK_LOG, UMapColors.ZAP_LOG_END, UMapColors.ZAP_LOG_SIDE), ItemGroups.BUILDING_BLOCKS); + Block ZAP_WOOD = register("zap_wood", new ZapAppleLogBlock(Blocks.OAK_WOOD, UMapColors.ZAP_LOG_SIDE, UMapColors.ZAP_LOG_SIDE), ItemGroups.BUILDING_BLOCKS); + Block STRIPPED_ZAP_LOG = register("stripped_zap_log", new ZapAppleLogBlock(Blocks.STRIPPED_OAK_LOG, UMapColors.ZAP_LOG_END, UMapColors.STRIPPED_ZAP_LOG_SIDE), ItemGroups.BUILDING_BLOCKS); + Block STRIPPED_ZAP_WOOD = register("stripped_zap_wood", new ZapAppleLogBlock(Blocks.STRIPPED_OAK_WOOD, UMapColors.STRIPPED_ZAP_LOG_SIDE, UMapColors.STRIPPED_ZAP_LOG_SIDE), ItemGroups.BUILDING_BLOCKS); - Block STRIPPED_ZAP_LOG = register("stripped_zap_log", new ZapAppleLogBlock(Blocks.STRIPPED_OAK_LOG, MapColor.LIGHT_GRAY, MapColor.GRAY), ItemGroups.BUILDING_BLOCKS); - Block STRIPPED_ZAP_WOOD = register("stripped_zap_wood", new ZapAppleLogBlock(Blocks.STRIPPED_OAK_WOOD, MapColor.GRAY, MapColor.GRAY), ItemGroups.BUILDING_BLOCKS); + Block WAXED_ZAP_LOG = register("waxed_zap_log", BlockConstructionUtils.createLogBlock(UMapColors.ZAP_LOG_END, UMapColors.ZAP_LOG_SIDE), ItemGroups.BUILDING_BLOCKS); + Block WAXED_ZAP_WOOD = register("waxed_zap_wood", BlockConstructionUtils.createLogBlock(UMapColors.ZAP_LOG_SIDE, UMapColors.ZAP_LOG_SIDE), ItemGroups.BUILDING_BLOCKS); + Block WAXED_STRIPPED_ZAP_LOG = register("waxed_stripped_zap_log", BlockConstructionUtils.createLogBlock(UMapColors.ZAP_LOG_END, UMapColors.STRIPPED_ZAP_LOG_SIDE), ItemGroups.BUILDING_BLOCKS); + Block WAXED_STRIPPED_ZAP_WOOD = register("waxed_stripped_zap_wood", BlockConstructionUtils.createLogBlock(UMapColors.STRIPPED_ZAP_LOG_SIDE, UMapColors.STRIPPED_ZAP_LOG_SIDE), ItemGroups.BUILDING_BLOCKS); - Block WAXED_ZAP_LOG = register("waxed_zap_log", BlockConstructionUtils.createLogBlock(MapColor.GRAY, MapColor.DEEPSLATE_GRAY), ItemGroups.BUILDING_BLOCKS); - Block WAXED_ZAP_WOOD = register("waxed_zap_wood", BlockConstructionUtils.createLogBlock(MapColor.DEEPSLATE_GRAY, MapColor.DEEPSLATE_GRAY), ItemGroups.BUILDING_BLOCKS); + Block ZAP_PLANKS = register("zap_planks", new ZapBlock(Settings.create().mapColor(UMapColors.ZAP_PLANKS).strength(2, 3).sounds(BlockSoundGroup.WOOD).pistonBehavior(PistonBehavior.NORMAL)), ItemGroups.BUILDING_BLOCKS); + Block ZAP_STAIRS = register("zap_stairs", new ZapStairsBlock(ZAP_PLANKS.getDefaultState(), Settings.copy(ZAP_PLANKS).pistonBehavior(PistonBehavior.NORMAL)), ItemGroups.BUILDING_BLOCKS); + Block ZAP_SLAB = register("zap_slab", new ZapSlabBlock(Settings.create().mapColor(ZAP_PLANKS.getDefaultMapColor()).strength(2, 3).sounds(BlockSoundGroup.WOOD).pistonBehavior(PistonBehavior.NORMAL)), ItemGroups.BUILDING_BLOCKS); - Block WAXED_STRIPPED_ZAP_LOG = register("waxed_stripped_zap_log", BlockConstructionUtils.createLogBlock(MapColor.LIGHT_GRAY, MapColor.GRAY), ItemGroups.BUILDING_BLOCKS); - Block WAXED_STRIPPED_ZAP_WOOD = register("waxed_stripped_zap_wood", BlockConstructionUtils.createLogBlock(MapColor.GRAY, MapColor.GRAY), ItemGroups.BUILDING_BLOCKS); + Block WAXED_ZAP_PLANKS = register("waxed_zap_planks", new Block(Settings.create().mapColor(UMapColors.ZAP_PLANKS).strength(2, 3).sounds(BlockSoundGroup.WOOD).pistonBehavior(PistonBehavior.NORMAL)), ItemGroups.BUILDING_BLOCKS); + Block WAXED_ZAP_STAIRS = register("waxed_zap_stairs", new StairsBlock(WAXED_ZAP_PLANKS.getDefaultState(), Settings.copy(WAXED_ZAP_PLANKS).pistonBehavior(PistonBehavior.NORMAL)), ItemGroups.BUILDING_BLOCKS); + Block WAXED_ZAP_SLAB = register("waxed_zap_slab", new ZapSlabBlock(Settings.create().mapColor(WAXED_ZAP_PLANKS.getDefaultMapColor()).strength(2, 3).sounds(BlockSoundGroup.WOOD).pistonBehavior(PistonBehavior.NORMAL)), ItemGroups.BUILDING_BLOCKS); Block ZAP_LEAVES = register("zap_leaves", new ZapAppleLeavesBlock(), ItemGroups.NATURAL); Block FLOWERING_ZAP_LEAVES = register("flowering_zap_leaves", new BaseZapAppleLeavesBlock(), ItemGroups.NATURAL); Block ZAP_LEAVES_PLACEHOLDER = register("zap_leaves_placeholder", new ZapAppleLeavesPlaceholderBlock()); Block ZAP_BULB = register("zap_bulb", new FruitBlock(Settings.create().mapColor(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(Settings.create().mapColor(MapColor.GRAY).sounds(BlockSoundGroup.AZALEA_LEAVES), Direction.DOWN, ZAP_LEAVES, FruitBlock.DEFAULT_SHAPE, false)); + Block ZAP_APPLE = register("zap_apple", new FruitBlock(Settings.create().mapColor(MapColor.YELLOW).sounds(BlockSoundGroup.AZALEA_LEAVES), Direction.DOWN, ZAP_LEAVES, FruitBlock.DEFAULT_SHAPE, false)); - Block PALM_LOG = register("palm_log", BlockConstructionUtils.createLogBlock(MapColor.OFF_WHITE, MapColor.SPRUCE_BROWN), ItemGroups.BUILDING_BLOCKS); - Block PALM_WOOD = register("palm_wood", BlockConstructionUtils.createWoodBlock(MapColor.OFF_WHITE), ItemGroups.BUILDING_BLOCKS); - Block STRIPPED_PALM_LOG = register("stripped_palm_log", BlockConstructionUtils.createLogBlock(MapColor.OFF_WHITE, MapColor.OFF_WHITE), ItemGroups.BUILDING_BLOCKS); - Block STRIPPED_PALM_WOOD = register("stripped_palm_wood", BlockConstructionUtils.createWoodBlock(MapColor.OFF_WHITE), ItemGroups.BUILDING_BLOCKS); + Block PALM_LOG = register("palm_log", BlockConstructionUtils.createLogBlock(UMapColors.PALM_LOG_END, UMapColors.PALM_LOG_SIDE), ItemGroups.BUILDING_BLOCKS); + Block PALM_WOOD = register("palm_wood", BlockConstructionUtils.createWoodBlock(UMapColors.PALM_LOG_SIDE), ItemGroups.BUILDING_BLOCKS); + Block STRIPPED_PALM_LOG = register("stripped_palm_log", BlockConstructionUtils.createLogBlock(UMapColors.PALM_LOG_END, UMapColors.STRIPPED_PALM_LOG_SIDE), ItemGroups.BUILDING_BLOCKS); + Block STRIPPED_PALM_WOOD = register("stripped_palm_wood", BlockConstructionUtils.createWoodBlock(UMapColors.STRIPPED_PALM_LOG_SIDE), ItemGroups.BUILDING_BLOCKS); - Block PALM_PLANKS = register("palm_planks", new Block(Settings.create().mapColor(MapColor.OFF_WHITE).strength(2, 3).sounds(BlockSoundGroup.WOOD).pistonBehavior(PistonBehavior.NORMAL)), ItemGroups.BUILDING_BLOCKS); + Block PALM_PLANKS = register("palm_planks", new Block(Settings.create().mapColor(UMapColors.PALM_PLANKS).strength(2, 3).sounds(BlockSoundGroup.WOOD).pistonBehavior(PistonBehavior.NORMAL)), ItemGroups.BUILDING_BLOCKS); Block PALM_STAIRS = register("palm_stairs", new StairsBlock(PALM_PLANKS.getDefaultState(), Settings.copy(PALM_PLANKS).pistonBehavior(PistonBehavior.NORMAL)), ItemGroups.BUILDING_BLOCKS); Block PALM_SLAB = register("palm_slab", new SlabBlock(Settings.create().mapColor(PALM_PLANKS.getDefaultMapColor()).strength(2, 3).sounds(BlockSoundGroup.WOOD).pistonBehavior(PistonBehavior.NORMAL)), ItemGroups.BUILDING_BLOCKS); Block PALM_FENCE = register("palm_fence", new FenceBlock(Settings.create().mapColor(PALM_PLANKS.getDefaultMapColor()).strength(2, 3).sounds(BlockSoundGroup.WOOD).pistonBehavior(PistonBehavior.NORMAL)), ItemGroups.BUILDING_BLOCKS); @@ -279,6 +292,9 @@ public interface UBlocks { OxidizableBlocksRegistry.registerWaxableBlockPair(ZAP_WOOD, WAXED_ZAP_WOOD); OxidizableBlocksRegistry.registerWaxableBlockPair(STRIPPED_ZAP_LOG, WAXED_STRIPPED_ZAP_LOG); OxidizableBlocksRegistry.registerWaxableBlockPair(STRIPPED_ZAP_WOOD, WAXED_STRIPPED_ZAP_WOOD); + OxidizableBlocksRegistry.registerWaxableBlockPair(ZAP_PLANKS, WAXED_ZAP_PLANKS); + OxidizableBlocksRegistry.registerWaxableBlockPair(ZAP_STAIRS, WAXED_ZAP_STAIRS); + OxidizableBlocksRegistry.registerWaxableBlockPair(ZAP_SLAB, WAXED_ZAP_SLAB); Collections.addAll(TRANSLUCENT_BLOCKS, WEATHER_VANE, CHITIN_SPIKES, PLUNDER_VINE, PLUNDER_VINE_BUD, CLAM_SHELL, SCALLOP_SHELL, TURRET_SHELL, CURING_JOKE, SPECTRAL_FIRE); TintedBlock.REGISTRY.add(PALM_LEAVES); diff --git a/src/main/java/com/minelittlepony/unicopia/block/UMapColors.java b/src/main/java/com/minelittlepony/unicopia/block/UMapColors.java new file mode 100644 index 00000000..019176e4 --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/block/UMapColors.java @@ -0,0 +1,15 @@ +package com.minelittlepony.unicopia.block; + +import net.minecraft.block.MapColor; + +public interface UMapColors { + MapColor ZAP_LEAVES = MapColor.MAGENTA; + MapColor ZAP_PLANKS = MapColor.MAGENTA; + MapColor ZAP_LOG_SIDE = MapColor.PURPLE; + MapColor ZAP_LOG_END = MapColor.MAGENTA; + MapColor STRIPPED_ZAP_LOG_SIDE = MapColor.PURPLE; + MapColor PALM_PLANKS = MapColor.OFF_WHITE; + MapColor PALM_LOG_END = MapColor.OFF_WHITE; + MapColor PALM_LOG_SIDE = MapColor.SPRUCE_BROWN; + MapColor STRIPPED_PALM_LOG_SIDE = MapColor.OFF_WHITE; +} diff --git a/src/main/java/com/minelittlepony/unicopia/block/BaseZapAppleLeavesBlock.java b/src/main/java/com/minelittlepony/unicopia/block/zap/BaseZapAppleLeavesBlock.java similarity index 90% rename from src/main/java/com/minelittlepony/unicopia/block/BaseZapAppleLeavesBlock.java rename to src/main/java/com/minelittlepony/unicopia/block/zap/BaseZapAppleLeavesBlock.java index 902b5a11..093f9270 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/BaseZapAppleLeavesBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/zap/BaseZapAppleLeavesBlock.java @@ -1,7 +1,10 @@ -package com.minelittlepony.unicopia.block; +package com.minelittlepony.unicopia.block.zap; import org.jetbrains.annotations.Nullable; +import com.minelittlepony.unicopia.block.BlockConstructionUtils; +import com.minelittlepony.unicopia.block.TintedBlock; +import com.minelittlepony.unicopia.block.UMapColors; import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.server.world.ZapAppleStageStore; @@ -15,9 +18,9 @@ import net.minecraft.world.*; public class BaseZapAppleLeavesBlock extends LeavesBlock implements TintedBlock, ZapStagedBlock { - BaseZapAppleLeavesBlock() { + public BaseZapAppleLeavesBlock() { super(Settings.create() - .mapColor(MapColor.PURPLE) + .mapColor(UMapColors.ZAP_LEAVES) .strength(500, 1200) .ticksRandomly() .sounds(BlockSoundGroup.AZALEA_LEAVES) diff --git a/src/main/java/com/minelittlepony/unicopia/block/ZapAppleLeavesBlock.java b/src/main/java/com/minelittlepony/unicopia/block/zap/ZapAppleLeavesBlock.java similarity index 92% rename from src/main/java/com/minelittlepony/unicopia/block/ZapAppleLeavesBlock.java rename to src/main/java/com/minelittlepony/unicopia/block/zap/ZapAppleLeavesBlock.java index e94f3475..1fcfc3a6 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/ZapAppleLeavesBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/zap/ZapAppleLeavesBlock.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.block; +package com.minelittlepony.unicopia.block.zap; import com.minelittlepony.unicopia.server.world.ZapAppleStageStore; @@ -10,7 +10,7 @@ import net.minecraft.state.property.*; public class ZapAppleLeavesBlock extends BaseZapAppleLeavesBlock { public static final EnumProperty STAGE = EnumProperty.of("stage", ZapAppleStageStore.Stage.class); - ZapAppleLeavesBlock() { + public ZapAppleLeavesBlock() { setDefaultState(getDefaultState().with(STAGE, ZapAppleStageStore.Stage.GREENING)); } diff --git a/src/main/java/com/minelittlepony/unicopia/block/ZapAppleLeavesPlaceholderBlock.java b/src/main/java/com/minelittlepony/unicopia/block/zap/ZapAppleLeavesPlaceholderBlock.java similarity index 91% rename from src/main/java/com/minelittlepony/unicopia/block/ZapAppleLeavesPlaceholderBlock.java rename to src/main/java/com/minelittlepony/unicopia/block/zap/ZapAppleLeavesPlaceholderBlock.java index 40fa9fc2..181bfc88 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/ZapAppleLeavesPlaceholderBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/zap/ZapAppleLeavesPlaceholderBlock.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.block; +package com.minelittlepony.unicopia.block.zap; import com.minelittlepony.unicopia.server.world.ZapAppleStageStore; import com.minelittlepony.unicopia.server.world.ZapAppleStageStore.Stage; @@ -11,7 +11,7 @@ import net.minecraft.world.World; public class ZapAppleLeavesPlaceholderBlock extends AirBlock implements ZapStagedBlock { - ZapAppleLeavesPlaceholderBlock() { + public ZapAppleLeavesPlaceholderBlock() { super(Settings.create().replaceable().noCollision().dropsNothing().air()); } diff --git a/src/main/java/com/minelittlepony/unicopia/block/ZapAppleLogBlock.java b/src/main/java/com/minelittlepony/unicopia/block/zap/ZapAppleLogBlock.java similarity index 90% rename from src/main/java/com/minelittlepony/unicopia/block/ZapAppleLogBlock.java rename to src/main/java/com/minelittlepony/unicopia/block/zap/ZapAppleLogBlock.java index 9605412b..e0c117ff 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/ZapAppleLogBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/zap/ZapAppleLogBlock.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.block; +package com.minelittlepony.unicopia.block.zap; import com.minelittlepony.unicopia.entity.player.Pony; @@ -14,11 +14,11 @@ import net.minecraft.world.BlockView; import net.minecraft.world.World; public class ZapAppleLogBlock extends PillarBlock { - public static final BooleanProperty NATURAL = ZapBlock.NATURAL; + public static final BooleanProperty NATURAL = BooleanProperty.of("natural"); private final Block artifialModelBlock; - ZapAppleLogBlock(Block artifialModelBlock, MapColor topMapColor, MapColor sideMapColor) { + public ZapAppleLogBlock(Block artifialModelBlock, MapColor topMapColor, MapColor sideMapColor) { super(AbstractBlock.Settings.create().mapColor( state -> state.get(PillarBlock.AXIS) == Direction.Axis.Y ? topMapColor : sideMapColor ) diff --git a/src/main/java/com/minelittlepony/unicopia/block/ZapBlock.java b/src/main/java/com/minelittlepony/unicopia/block/zap/ZapBlock.java similarity index 67% rename from src/main/java/com/minelittlepony/unicopia/block/ZapBlock.java rename to src/main/java/com/minelittlepony/unicopia/block/zap/ZapBlock.java index dcc0e5f7..29ae5f9a 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/ZapBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/zap/ZapBlock.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.block; +package com.minelittlepony.unicopia.block.zap; import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.particle.LightningBoltParticleEffect; @@ -8,35 +8,15 @@ import net.minecraft.entity.EntityType; import net.minecraft.entity.ItemEntity; import net.minecraft.entity.LightningEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemPlacementContext; import net.minecraft.server.world.ServerWorld; -import net.minecraft.state.StateManager; -import net.minecraft.state.property.BooleanProperty; import net.minecraft.util.math.*; import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.event.GameEvent; public class ZapBlock extends Block { - public static final BooleanProperty NATURAL = BooleanProperty.of("natural"); - - private final Block artificialModelBlock; - - ZapBlock(Settings settings, Block artificialModelBlock) { - super(settings.strength(500, 1200)); - setDefaultState(getDefaultState().with(NATURAL, true)); - this.artificialModelBlock = artificialModelBlock; - } - - @Override - protected void appendProperties(StateManager.Builder builder) { - super.appendProperties(builder); - builder.add(NATURAL); - } - - @Override - public BlockState getPlacementState(ItemPlacementContext ctx) { - return getDefaultState().with(NATURAL, false); + public ZapBlock(Settings settings) { + super(settings); } @Deprecated @@ -48,12 +28,10 @@ public class ZapBlock extends Block { @Deprecated @Override public float calcBlockBreakingDelta(BlockState state, PlayerEntity player, BlockView world, BlockPos pos) { - if (!state.get(NATURAL)) { - return artificialModelBlock.calcBlockBreakingDelta(artificialModelBlock.getDefaultState(), player, world, pos); - } - - float delta = super.calcBlockBreakingDelta(state, player, world, pos); + return getBlockBreakingDelta(super.calcBlockBreakingDelta(state, player, world, pos), player); + } + public static float getBlockBreakingDelta(float delta, PlayerEntity player) { if (Pony.of(player).getCompositeRace().canUseEarth()) { delta *= 50; } @@ -61,7 +39,6 @@ public class ZapBlock extends Block { return MathHelper.clamp(delta, 0, 0.9F); } - public static void triggerLightning(BlockState state, World world, BlockPos pos, PlayerEntity player) { if (world instanceof ServerWorld serverWorld) { Vec3d center = Vec3d.ofCenter(pos); diff --git a/src/main/java/com/minelittlepony/unicopia/block/zap/ZapSlabBlock.java b/src/main/java/com/minelittlepony/unicopia/block/zap/ZapSlabBlock.java new file mode 100644 index 00000000..535e9b5d --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/block/zap/ZapSlabBlock.java @@ -0,0 +1,26 @@ +package com.minelittlepony.unicopia.block.zap; + +import net.minecraft.block.BlockState; +import net.minecraft.block.SlabBlock; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockView; +import net.minecraft.world.World; + +public class ZapSlabBlock extends SlabBlock { + public ZapSlabBlock(Settings settings) { + super(settings); + } + + @Deprecated + @Override + public void onBlockBreakStart(BlockState state, World world, BlockPos pos, PlayerEntity player) { + ZapBlock.triggerLightning(state, world, pos, player); + } + + @Deprecated + @Override + public float calcBlockBreakingDelta(BlockState state, PlayerEntity player, BlockView world, BlockPos pos) { + return ZapBlock.getBlockBreakingDelta(super.calcBlockBreakingDelta(state, player, world, pos), player); + } +} diff --git a/src/main/java/com/minelittlepony/unicopia/block/ZapStagedBlock.java b/src/main/java/com/minelittlepony/unicopia/block/zap/ZapStagedBlock.java similarity index 97% rename from src/main/java/com/minelittlepony/unicopia/block/ZapStagedBlock.java rename to src/main/java/com/minelittlepony/unicopia/block/zap/ZapStagedBlock.java index 5e3f41d4..72ce0d28 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/ZapStagedBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/zap/ZapStagedBlock.java @@ -1,5 +1,6 @@ -package com.minelittlepony.unicopia.block; +package com.minelittlepony.unicopia.block.zap; +import com.minelittlepony.unicopia.block.UBlocks; import com.minelittlepony.unicopia.server.world.ZapAppleStageStore; import net.minecraft.block.Block; diff --git a/src/main/java/com/minelittlepony/unicopia/block/zap/ZapStairsBlock.java b/src/main/java/com/minelittlepony/unicopia/block/zap/ZapStairsBlock.java new file mode 100644 index 00000000..8d13fadd --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/block/zap/ZapStairsBlock.java @@ -0,0 +1,22 @@ +package com.minelittlepony.unicopia.block.zap; + +import net.minecraft.block.BlockState; +import net.minecraft.block.StairsBlock; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockView; + +public class ZapStairsBlock extends StairsBlock { + private final BlockState baseBlock; + + public ZapStairsBlock(BlockState baseBlockState, Settings settings) { + super(baseBlockState, settings); + this.baseBlock = baseBlockState; + } + + @Deprecated + @Override + public float calcBlockBreakingDelta(BlockState state, PlayerEntity player, BlockView world, BlockPos pos) { + return baseBlock.calcBlockBreakingDelta(player, world, pos); + } +} diff --git a/src/main/resources/assets/unicopia/blockstates/waxed_zap_planks.json b/src/main/resources/assets/unicopia/blockstates/waxed_zap_planks.json new file mode 100644 index 00000000..ac083bd3 --- /dev/null +++ b/src/main/resources/assets/unicopia/blockstates/waxed_zap_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "unicopia:block/zap_planks" + } + } +} diff --git a/src/main/resources/assets/unicopia/blockstates/waxed_zap_slab.json b/src/main/resources/assets/unicopia/blockstates/waxed_zap_slab.json new file mode 100644 index 00000000..4de01681 --- /dev/null +++ b/src/main/resources/assets/unicopia/blockstates/waxed_zap_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "unicopia:block/zap_slab" + }, + "type=double": { + "model": "unicopia:block/zap_planks" + }, + "type=top": { + "model": "unicopia:block/zap_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/waxed_zap_stairs.json b/src/main/resources/assets/unicopia/blockstates/waxed_zap_stairs.json new file mode 100644 index 00000000..2fdbab92 --- /dev/null +++ b/src/main/resources/assets/unicopia/blockstates/waxed_zap_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "unicopia:block/zap_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "unicopia:block/zap_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "unicopia:block/zap_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "unicopia:block/zap_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "unicopia:block/zap_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "unicopia:block/zap_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "unicopia:block/zap_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "unicopia:block/zap_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "unicopia:block/zap_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "unicopia:block/zap_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "unicopia:block/zap_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "unicopia:block/zap_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/zap_planks.json b/src/main/resources/assets/unicopia/blockstates/zap_planks.json new file mode 100644 index 00000000..ac083bd3 --- /dev/null +++ b/src/main/resources/assets/unicopia/blockstates/zap_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "unicopia:block/zap_planks" + } + } +} diff --git a/src/main/resources/assets/unicopia/blockstates/zap_slab.json b/src/main/resources/assets/unicopia/blockstates/zap_slab.json new file mode 100644 index 00000000..4de01681 --- /dev/null +++ b/src/main/resources/assets/unicopia/blockstates/zap_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "unicopia:block/zap_slab" + }, + "type=double": { + "model": "unicopia:block/zap_planks" + }, + "type=top": { + "model": "unicopia:block/zap_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/zap_stairs.json b/src/main/resources/assets/unicopia/blockstates/zap_stairs.json new file mode 100644 index 00000000..2fdbab92 --- /dev/null +++ b/src/main/resources/assets/unicopia/blockstates/zap_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "unicopia:block/zap_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "unicopia:block/zap_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "unicopia:block/zap_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "unicopia:block/zap_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "unicopia:block/zap_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "unicopia:block/zap_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "unicopia:block/zap_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "unicopia:block/zap_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "unicopia:block/zap_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "unicopia:block/zap_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "unicopia:block/zap_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "unicopia:block/zap_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "unicopia:block/zap_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "unicopia:block/zap_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ 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 fa0d2924..9bf87f93 100644 --- a/src/main/resources/assets/unicopia/lang/en_us.json +++ b/src/main/resources/assets/unicopia/lang/en_us.json @@ -232,10 +232,16 @@ "block.unicopia.zap_wood": "Zap Apple Wood", "block.unicopia.stripped_zap_log": "Stripped Zap Apple Log", "block.unicopia.stripped_zap_wood": "Stripped Zap Apple Wood", + "block.unicopia.zap_planks": "Zap Apple Planks", + "block.unicopia.zap_stairs": "Zap Apple Stairs", + "block.unicopia.zap_slab": "Zap Apple Slab", "block.unicopia.waxed_zap_log": "Waxed Zap Apple Log", "block.unicopia.waxed_zap_wood": "Waxed Zap Apple Wood", "block.unicopia.waxed_stripped_zap_log": "Waxed Stripped Zap Apple Log", "block.unicopia.waxed_stripped_zap_wood": "Waxed Stripped Zap Apple Wood", + "block.unicopia.waxed_zap_planks": "Waxed Zap Apple Planks", + "block.unicopia.waxed_zap_stairs": "Waxed Zap Apple Stairs", + "block.unicopia.waxed_zap_slab": "Waxed Zap Apple Slab", "block.unicopia.zap_leaves": "Zap Apple Leaves", "block.unicopia.flowering_zap_leaves": "Flowering Zap Apple Leaves", "block.unicopia.zap_apple": "Zap Apple", diff --git a/src/main/resources/assets/unicopia/models/block/zap_planks.json b/src/main/resources/assets/unicopia/models/block/zap_planks.json new file mode 100644 index 00000000..a3b0506c --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/zap_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "unicopia:block/zap_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/zap_slab.json b/src/main/resources/assets/unicopia/models/block/zap_slab.json new file mode 100644 index 00000000..019be187 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/zap_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "unicopia:block/zap_planks", + "side": "unicopia:block/zap_planks", + "top": "unicopia:block/zap_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/zap_slab_top.json b/src/main/resources/assets/unicopia/models/block/zap_slab_top.json new file mode 100644 index 00000000..c842f9e8 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/zap_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "unicopia:block/zap_planks", + "side": "unicopia:block/zap_planks", + "top": "unicopia:block/zap_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/zap_stairs.json b/src/main/resources/assets/unicopia/models/block/zap_stairs.json new file mode 100644 index 00000000..56f63e69 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/zap_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "unicopia:block/zap_planks", + "side": "unicopia:block/zap_planks", + "top": "unicopia:block/zap_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/zap_stairs_inner.json b/src/main/resources/assets/unicopia/models/block/zap_stairs_inner.json new file mode 100644 index 00000000..7653e732 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/zap_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "unicopia:block/zap_planks", + "side": "unicopia:block/zap_planks", + "top": "unicopia:block/zap_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/zap_stairs_outer.json b/src/main/resources/assets/unicopia/models/block/zap_stairs_outer.json new file mode 100644 index 00000000..57424f35 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/zap_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "unicopia:block/zap_planks", + "side": "unicopia:block/zap_planks", + "top": "unicopia:block/zap_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/waxed_zap_planks.json b/src/main/resources/assets/unicopia/models/item/waxed_zap_planks.json new file mode 100644 index 00000000..67af01e5 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/waxed_zap_planks.json @@ -0,0 +1,3 @@ +{ + "parent": "unicopia:block/zap_planks" +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/waxed_zap_slab.json b/src/main/resources/assets/unicopia/models/item/waxed_zap_slab.json new file mode 100644 index 00000000..f4b16226 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/waxed_zap_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "unicopia:block/zap_slab" +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/waxed_zap_stairs.json b/src/main/resources/assets/unicopia/models/item/waxed_zap_stairs.json new file mode 100644 index 00000000..1a16895f --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/waxed_zap_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "unicopia:block/zap_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/zap_planks.json b/src/main/resources/assets/unicopia/models/item/zap_planks.json new file mode 100644 index 00000000..67af01e5 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/zap_planks.json @@ -0,0 +1,3 @@ +{ + "parent": "unicopia:block/zap_planks" +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/zap_slab.json b/src/main/resources/assets/unicopia/models/item/zap_slab.json new file mode 100644 index 00000000..f4b16226 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/zap_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "unicopia:block/zap_slab" +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/zap_stairs.json b/src/main/resources/assets/unicopia/models/item/zap_stairs.json new file mode 100644 index 00000000..1a16895f --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/zap_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "unicopia:block/zap_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/textures/block/zap_planks.png b/src/main/resources/assets/unicopia/textures/block/zap_planks.png new file mode 100644 index 0000000000000000000000000000000000000000..55b0a5808a47e6f65a70125950f95e613e0d752e GIT binary patch literal 7013 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