PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-27 15:17:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Zap logs can now be waxed to keep them from zapping you when you mine them

Browse source
This commit is contained in:
Sollace 2024-02-08 15:19:41 +00:00
parent 17cd097d88
commit c4ab7e1bdf
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
19 changed files with 129 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/com/minelittlepony/unicopia/block/UBlocks.java
View file

@ -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);

16
src/main/resources/assets/unicopia/blockstates/waxed_stripped_zap_log.json Normal file
View file

@ -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
}
}
}

7
src/main/resources/assets/unicopia/blockstates/waxed_stripped_zap_wood.json Normal file
View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "unicopia:block/stripped_zap_wood"
}
}
}

16
src/main/resources/assets/unicopia/blockstates/waxed_zap_log.json Normal file
View file

@ -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
}
}
}

7
src/main/resources/assets/unicopia/blockstates/waxed_zap_wood.json Normal file
View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "unicopia:block/zap_wood"
}
}
}

4
src/main/resources/assets/unicopia/lang/en_us.json
View file

@ -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",

3
src/main/resources/assets/unicopia/models/item/waxed_stripped_zap_log.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "unicopia:block/stripped_zap_log"
}

3
src/main/resources/assets/unicopia/models/item/waxed_stripped_zap_wood.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "unicopia:block/stripped_zap_wood"
}

3
src/main/resources/assets/unicopia/models/item/waxed_zap_log.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "unicopia:block/zap_log"
}

3
src/main/resources/assets/unicopia/models/item/waxed_zap_wood.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "unicopia:block/zap_wood"
}

6
src/main/resources/data/minecraft/tags/blocks/logs.json
View file

@ -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"
]
}

6
src/main/resources/data/minecraft/tags/blocks/logs_that_burn.json
View file

@ -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"
]
}

6
src/main/resources/data/minecraft/tags/items/logs.json
View file

@ -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"
]
}

6
src/main/resources/data/minecraft/tags/items/logs_that_burn.json
View file

@ -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"
]
}

8
src/main/resources/data/unicopia/recipes/waxed_stripped_zap_log.json Normal file
View file

@ -0,0 +1,8 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{ "item": "unicopia:stripped_zap_log" },
{ "item": "minecraft:honeycomb" }
],
"result": { "item": "unicopia:waxed_stripped_zap_log" }
}

8
src/main/resources/data/unicopia/recipes/waxed_stripped_zap_wood.json Normal file
View file

@ -0,0 +1,8 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{ "item": "unicopia:stripped_zap_wood" },
{ "item": "minecraft:honeycomb" }
],
"result": { "item": "unicopia:waxed_stripped_zap_wood" }
}

8
src/main/resources/data/unicopia/recipes/waxed_zap_log.json Normal file
View file

@ -0,0 +1,8 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{ "item": "unicopia:zap_log" },
{ "item": "minecraft:honeycomb" }
],
"result": { "item": "unicopia:waxed_zap_log" }
}

8
src/main/resources/data/unicopia/recipes/waxed_zap_wood.json Normal file
View file

@ -0,0 +1,8 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{ "item": "unicopia:zap_wood" },
{ "item": "minecraft:honeycomb" }
],
"result": { "item": "unicopia:waxed_zap_wood" }
}

4
src/main/resources/data/unicopia/tags/items/groups/earth_pony.json
View file

@ -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",