From c4ab7e1bdf9310d823bd23fd8555ef4b733c1446 Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 8 Feb 2024 15:19:41 +0000 Subject: [PATCH] Zap logs can now be waxed to keep them from zapping you when you mine them --- .../minelittlepony/unicopia/block/UBlocks.java | 11 +++++++++++ .../blockstates/waxed_stripped_zap_log.json | 16 ++++++++++++++++ .../blockstates/waxed_stripped_zap_wood.json | 7 +++++++ .../unicopia/blockstates/waxed_zap_log.json | 16 ++++++++++++++++ .../unicopia/blockstates/waxed_zap_wood.json | 7 +++++++ .../resources/assets/unicopia/lang/en_us.json | 4 ++++ .../models/item/waxed_stripped_zap_log.json | 3 +++ .../models/item/waxed_stripped_zap_wood.json | 3 +++ .../unicopia/models/item/waxed_zap_log.json | 3 +++ .../unicopia/models/item/waxed_zap_wood.json | 3 +++ .../data/minecraft/tags/blocks/logs.json | 6 +++++- .../minecraft/tags/blocks/logs_that_burn.json | 6 +++++- .../data/minecraft/tags/items/logs.json | 6 +++++- .../minecraft/tags/items/logs_that_burn.json | 6 +++++- .../unicopia/recipes/waxed_stripped_zap_log.json | 8 ++++++++ .../recipes/waxed_stripped_zap_wood.json | 8 ++++++++ .../data/unicopia/recipes/waxed_zap_log.json | 8 ++++++++ .../data/unicopia/recipes/waxed_zap_wood.json | 8 ++++++++ .../unicopia/tags/items/groups/earth_pony.json | 4 ++++ 19 files changed, 129 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/unicopia/blockstates/waxed_stripped_zap_log.json create mode 100644 src/main/resources/assets/unicopia/blockstates/waxed_stripped_zap_wood.json create mode 100644 src/main/resources/assets/unicopia/blockstates/waxed_zap_log.json create mode 100644 src/main/resources/assets/unicopia/blockstates/waxed_zap_wood.json create mode 100644 src/main/resources/assets/unicopia/models/item/waxed_stripped_zap_log.json create mode 100644 src/main/resources/assets/unicopia/models/item/waxed_stripped_zap_wood.json create mode 100644 src/main/resources/assets/unicopia/models/item/waxed_zap_log.json create mode 100644 src/main/resources/assets/unicopia/models/item/waxed_zap_wood.json create mode 100644 src/main/resources/data/unicopia/recipes/waxed_stripped_zap_log.json create mode 100644 src/main/resources/data/unicopia/recipes/waxed_stripped_zap_wood.json create mode 100644 src/main/resources/data/unicopia/recipes/waxed_zap_log.json create mode 100644 src/main/resources/data/unicopia/recipes/waxed_zap_wood.json diff --git a/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java b/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java index 7611e7b1..59f50cb0 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java +++ b/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java @@ -28,6 +28,7 @@ import com.minelittlepony.unicopia.item.group.ItemGroupRegistry; import com.minelittlepony.unicopia.server.world.UTreeGen; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.registry.FlammableBlockRegistry; +import net.fabricmc.fabric.api.registry.OxidizableBlocksRegistry; import net.fabricmc.fabric.api.registry.StrippableBlockRegistry; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.block.*; @@ -65,6 +66,12 @@ public interface UBlocks { 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(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 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 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()); @@ -268,6 +275,10 @@ public interface UBlocks { StrippableBlockRegistry.register(PALM_LOG, STRIPPED_PALM_LOG); StrippableBlockRegistry.register(ZAP_WOOD, STRIPPED_ZAP_WOOD); StrippableBlockRegistry.register(PALM_WOOD, STRIPPED_PALM_WOOD); + OxidizableBlocksRegistry.registerWaxableBlockPair(ZAP_LOG, WAXED_ZAP_LOG); + 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); 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/resources/assets/unicopia/blockstates/waxed_stripped_zap_log.json b/src/main/resources/assets/unicopia/blockstates/waxed_stripped_zap_log.json new file mode 100644 index 00000000..06956a0e --- /dev/null +++ b/src/main/resources/assets/unicopia/blockstates/waxed_stripped_zap_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "unicopia:block/stripped_zap_log_horizontal", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "unicopia:block/stripped_zap_log" + }, + "axis=z": { + "model": "unicopia:block/stripped_zap_log_horizontal", + "x": 90 + } + } +} diff --git a/src/main/resources/assets/unicopia/blockstates/waxed_stripped_zap_wood.json b/src/main/resources/assets/unicopia/blockstates/waxed_stripped_zap_wood.json new file mode 100644 index 00000000..c99ab1cc --- /dev/null +++ b/src/main/resources/assets/unicopia/blockstates/waxed_stripped_zap_wood.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "unicopia:block/stripped_zap_wood" + } + } +} diff --git a/src/main/resources/assets/unicopia/blockstates/waxed_zap_log.json b/src/main/resources/assets/unicopia/blockstates/waxed_zap_log.json new file mode 100644 index 00000000..c3b64c19 --- /dev/null +++ b/src/main/resources/assets/unicopia/blockstates/waxed_zap_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "unicopia:block/zap_log_horizontal", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "unicopia:block/zap_log" + }, + "axis=z": { + "model": "unicopia:block/zap_log_horizontal", + "x": 90 + } + } +} diff --git a/src/main/resources/assets/unicopia/blockstates/waxed_zap_wood.json b/src/main/resources/assets/unicopia/blockstates/waxed_zap_wood.json new file mode 100644 index 00000000..30090bc9 --- /dev/null +++ b/src/main/resources/assets/unicopia/blockstates/waxed_zap_wood.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "unicopia:block/zap_wood" + } + } +} diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json index 80b11c0b..fa0d2924 100644 --- a/src/main/resources/assets/unicopia/lang/en_us.json +++ b/src/main/resources/assets/unicopia/lang/en_us.json @@ -232,6 +232,10 @@ "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.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.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/item/waxed_stripped_zap_log.json b/src/main/resources/assets/unicopia/models/item/waxed_stripped_zap_log.json new file mode 100644 index 00000000..808e8d26 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/waxed_stripped_zap_log.json @@ -0,0 +1,3 @@ +{ + "parent": "unicopia:block/stripped_zap_log" +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/waxed_stripped_zap_wood.json b/src/main/resources/assets/unicopia/models/item/waxed_stripped_zap_wood.json new file mode 100644 index 00000000..f1d170f0 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/waxed_stripped_zap_wood.json @@ -0,0 +1,3 @@ +{ + "parent": "unicopia:block/stripped_zap_wood" +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/waxed_zap_log.json b/src/main/resources/assets/unicopia/models/item/waxed_zap_log.json new file mode 100644 index 00000000..13676b25 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/waxed_zap_log.json @@ -0,0 +1,3 @@ +{ + "parent": "unicopia:block/zap_log" +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/waxed_zap_wood.json b/src/main/resources/assets/unicopia/models/item/waxed_zap_wood.json new file mode 100644 index 00000000..31ae309b --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/waxed_zap_wood.json @@ -0,0 +1,3 @@ +{ + "parent": "unicopia:block/zap_wood" +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/logs.json b/src/main/resources/data/minecraft/tags/blocks/logs.json index f3a91e42..1748acb9 100644 --- a/src/main/resources/data/minecraft/tags/blocks/logs.json +++ b/src/main/resources/data/minecraft/tags/blocks/logs.json @@ -9,6 +9,10 @@ "unicopia:zap_log", "unicopia:zap_wood", "unicopia:stripped_zap_log", - "unicopia:stripped_zap_wood" + "unicopia:stripped_zap_wood", + "unicopia:waxed_zap_log", + "unicopia:waxed_zap_wood", + "unicopia:waxed_stripped_zap_log", + "unicopia:waxed_stripped_zap_wood" ] } diff --git a/src/main/resources/data/minecraft/tags/blocks/logs_that_burn.json b/src/main/resources/data/minecraft/tags/blocks/logs_that_burn.json index 31e49b86..61695d92 100644 --- a/src/main/resources/data/minecraft/tags/blocks/logs_that_burn.json +++ b/src/main/resources/data/minecraft/tags/blocks/logs_that_burn.json @@ -5,6 +5,10 @@ "unicopia:palm_wood", "unicopia:golden_oak_log", "unicopia:stripped_palm_log", - "unicopia:stripped_palm_wood" + "unicopia:stripped_palm_wood", + "unicopia:waxed_zap_log", + "unicopia:waxed_zap_wood", + "unicopia:waxed_stripped_zap_log", + "unicopia:waxed_stripped_zap_wood" ] } diff --git a/src/main/resources/data/minecraft/tags/items/logs.json b/src/main/resources/data/minecraft/tags/items/logs.json index 4e7dd5d0..dbc9931d 100644 --- a/src/main/resources/data/minecraft/tags/items/logs.json +++ b/src/main/resources/data/minecraft/tags/items/logs.json @@ -8,6 +8,10 @@ "unicopia:zap_log", "unicopia:zap_wood", "unicopia:stripped_zap_log", - "unicopia:stripped_zap_wood" + "unicopia:stripped_zap_wood", + "unicopia:waxed_zap_log", + "unicopia:waxed_zap_wood", + "unicopia:waxed_stripped_zap_log", + "unicopia:waxed_stripped_zap_wood" ] } diff --git a/src/main/resources/data/minecraft/tags/items/logs_that_burn.json b/src/main/resources/data/minecraft/tags/items/logs_that_burn.json index 4e7dd5d0..dbc9931d 100644 --- a/src/main/resources/data/minecraft/tags/items/logs_that_burn.json +++ b/src/main/resources/data/minecraft/tags/items/logs_that_burn.json @@ -8,6 +8,10 @@ "unicopia:zap_log", "unicopia:zap_wood", "unicopia:stripped_zap_log", - "unicopia:stripped_zap_wood" + "unicopia:stripped_zap_wood", + "unicopia:waxed_zap_log", + "unicopia:waxed_zap_wood", + "unicopia:waxed_stripped_zap_log", + "unicopia:waxed_stripped_zap_wood" ] } diff --git a/src/main/resources/data/unicopia/recipes/waxed_stripped_zap_log.json b/src/main/resources/data/unicopia/recipes/waxed_stripped_zap_log.json new file mode 100644 index 00000000..49358b05 --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/waxed_stripped_zap_log.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "unicopia:stripped_zap_log" }, + { "item": "minecraft:honeycomb" } + ], + "result": { "item": "unicopia:waxed_stripped_zap_log" } +} diff --git a/src/main/resources/data/unicopia/recipes/waxed_stripped_zap_wood.json b/src/main/resources/data/unicopia/recipes/waxed_stripped_zap_wood.json new file mode 100644 index 00000000..a025fe57 --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/waxed_stripped_zap_wood.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "unicopia:stripped_zap_wood" }, + { "item": "minecraft:honeycomb" } + ], + "result": { "item": "unicopia:waxed_stripped_zap_wood" } +} diff --git a/src/main/resources/data/unicopia/recipes/waxed_zap_log.json b/src/main/resources/data/unicopia/recipes/waxed_zap_log.json new file mode 100644 index 00000000..7196b38f --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/waxed_zap_log.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "unicopia:zap_log" }, + { "item": "minecraft:honeycomb" } + ], + "result": { "item": "unicopia:waxed_zap_log" } +} diff --git a/src/main/resources/data/unicopia/recipes/waxed_zap_wood.json b/src/main/resources/data/unicopia/recipes/waxed_zap_wood.json new file mode 100644 index 00000000..16fb5429 --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/waxed_zap_wood.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "unicopia:zap_wood" }, + { "item": "minecraft:honeycomb" } + ], + "result": { "item": "unicopia:waxed_zap_wood" } +} diff --git a/src/main/resources/data/unicopia/tags/items/groups/earth_pony.json b/src/main/resources/data/unicopia/tags/items/groups/earth_pony.json index db1c0f0b..62d3e0a6 100644 --- a/src/main/resources/data/unicopia/tags/items/groups/earth_pony.json +++ b/src/main/resources/data/unicopia/tags/items/groups/earth_pony.json @@ -10,6 +10,10 @@ "unicopia:zap_wood", "unicopia:stripped_zap_log", "unicopia:stripped_zap_wood", + "unicopia:waxed_zap_log", + "unicopia:waxed_zap_wood", + "unicopia:waxed_stripped_zap_log", + "unicopia:waxed_stripped_zap_wood", "unicopia:candied_apple", "unicopia:stable_door", "unicopia:dark_oak_stable_door",