From 387a510734169fc7d575becdd3d766d3b26feb17 Mon Sep 17 00:00:00 2001 From: Vos Date: Fri, 27 Mar 2026 00:45:54 -0500 Subject: [PATCH] 2.1.0 Leaf Litter --- .../blockstates/fire_oak_leaf_litter.json | 160 ++++++++++++++++++ .../blockstates/lemonwood_leaf_litter.json | 160 ++++++++++++++++++ .../acesbs/items/fire_oak_leaf_litter.json | 6 + .../acesbs/items/lemonwood_leaf_litter.json | 6 + .../models/block/fire_oak_leaf_litter_1.json | 6 + .../models/block/fire_oak_leaf_litter_2.json | 6 + .../models/block/fire_oak_leaf_litter_3.json | 6 + .../models/block/fire_oak_leaf_litter_4.json | 6 + .../models/block/lemonwood_leaf_litter_1.json | 6 + .../models/block/lemonwood_leaf_litter_2.json | 6 + .../models/block/lemonwood_leaf_litter_3.json | 6 + .../models/block/lemonwood_leaf_litter_4.json | 6 + .../models/item/fire_oak_leaf_litter.json | 6 + .../models/item/lemonwood_leaf_litter.json | 6 + ..._litter_from_smelting_fire_oak_leaves.json | 32 ++++ ...litter_from_smelting_lemonwood_leaves.json | 32 ++++ ..._litter_from_smelting_fire_oak_leaves.json | 11 ++ ...litter_from_smelting_lemonwood_leaves.json | 11 ++ .../acethewildfire/acesbs/AcesBSClient.java | 2 + .../com/acethewildfire/acesbs/PATCH_NOTES.md | 1 + .../acesbs/block/FireOakBlocks.java | 2 + .../acesbs/block/LemonWoodBlocks.java | 2 + .../acesbs/datagen/ModModelProvider.java | 2 + .../acesbs/datagen/ModRecipeProvider.java | 4 + .../acesbs/item/ModItemGroups.java | 8 +- .../resources/assets/acesbs/lang/en_us.json | 2 + .../textures/block/fire_oak_leaf_litter.png | Bin 0 -> 611 bytes .../textures/block/lemonwood_leaf_litter.png | Bin 0 -> 647 bytes .../textures/item/fire_oak_leaf_litter.png | Bin 0 -> 611 bytes .../textures/item/lemonwood_leaf_litter.png | Bin 0 -> 647 bytes .../blocks/fire_oak_leaf_litter.json | 77 +++++++++ .../blocks/lemonwood_leaf_litter.json | 77 +++++++++ 32 files changed, 652 insertions(+), 3 deletions(-) create mode 100644 src/main/generated/assets/acesbs/blockstates/fire_oak_leaf_litter.json create mode 100644 src/main/generated/assets/acesbs/blockstates/lemonwood_leaf_litter.json create mode 100644 src/main/generated/assets/acesbs/items/fire_oak_leaf_litter.json create mode 100644 src/main/generated/assets/acesbs/items/lemonwood_leaf_litter.json create mode 100644 src/main/generated/assets/acesbs/models/block/fire_oak_leaf_litter_1.json create mode 100644 src/main/generated/assets/acesbs/models/block/fire_oak_leaf_litter_2.json create mode 100644 src/main/generated/assets/acesbs/models/block/fire_oak_leaf_litter_3.json create mode 100644 src/main/generated/assets/acesbs/models/block/fire_oak_leaf_litter_4.json create mode 100644 src/main/generated/assets/acesbs/models/block/lemonwood_leaf_litter_1.json create mode 100644 src/main/generated/assets/acesbs/models/block/lemonwood_leaf_litter_2.json create mode 100644 src/main/generated/assets/acesbs/models/block/lemonwood_leaf_litter_3.json create mode 100644 src/main/generated/assets/acesbs/models/block/lemonwood_leaf_litter_4.json create mode 100644 src/main/generated/assets/acesbs/models/item/fire_oak_leaf_litter.json create mode 100644 src/main/generated/assets/acesbs/models/item/lemonwood_leaf_litter.json create mode 100644 src/main/generated/data/acesbs/advancement/recipes/decorations/fire_oak_leaf_litter_from_smelting_fire_oak_leaves.json create mode 100644 src/main/generated/data/acesbs/advancement/recipes/decorations/lemonwood_leaf_litter_from_smelting_lemonwood_leaves.json create mode 100644 src/main/generated/data/acesbs/recipe/fire_oak_leaf_litter_from_smelting_fire_oak_leaves.json create mode 100644 src/main/generated/data/acesbs/recipe/lemonwood_leaf_litter_from_smelting_lemonwood_leaves.json create mode 100644 src/main/resources/assets/acesbs/textures/block/fire_oak_leaf_litter.png create mode 100644 src/main/resources/assets/acesbs/textures/block/lemonwood_leaf_litter.png create mode 100644 src/main/resources/assets/acesbs/textures/item/fire_oak_leaf_litter.png create mode 100644 src/main/resources/assets/acesbs/textures/item/lemonwood_leaf_litter.png create mode 100644 src/main/resources/data/acesbs/loot_table/blocks/fire_oak_leaf_litter.json create mode 100644 src/main/resources/data/acesbs/loot_table/blocks/lemonwood_leaf_litter.json diff --git a/src/main/generated/assets/acesbs/blockstates/fire_oak_leaf_litter.json b/src/main/generated/assets/acesbs/blockstates/fire_oak_leaf_litter.json new file mode 100644 index 0000000..22f888d --- /dev/null +++ b/src/main/generated/assets/acesbs/blockstates/fire_oak_leaf_litter.json @@ -0,0 +1,160 @@ +{ + "multipart": [ + { + "apply": { + "model": "acesbs:block/fire_oak_leaf_litter_1" + }, + "when": { + "facing": "north", + "segment_amount": "1" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_leaf_litter_1", + "y": 90 + }, + "when": { + "facing": "east", + "segment_amount": "1" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_leaf_litter_1", + "y": 180 + }, + "when": { + "facing": "south", + "segment_amount": "1" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_leaf_litter_1", + "y": 270 + }, + "when": { + "facing": "west", + "segment_amount": "1" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_leaf_litter_2" + }, + "when": { + "facing": "north", + "segment_amount": "2|3" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_leaf_litter_2", + "y": 90 + }, + "when": { + "facing": "east", + "segment_amount": "2|3" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_leaf_litter_2", + "y": 180 + }, + "when": { + "facing": "south", + "segment_amount": "2|3" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_leaf_litter_2", + "y": 270 + }, + "when": { + "facing": "west", + "segment_amount": "2|3" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_leaf_litter_3" + }, + "when": { + "facing": "north", + "segment_amount": "3" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_leaf_litter_3", + "y": 90 + }, + "when": { + "facing": "east", + "segment_amount": "3" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_leaf_litter_3", + "y": 180 + }, + "when": { + "facing": "south", + "segment_amount": "3" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_leaf_litter_3", + "y": 270 + }, + "when": { + "facing": "west", + "segment_amount": "3" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_leaf_litter_4" + }, + "when": { + "facing": "north", + "segment_amount": "4" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_leaf_litter_4", + "y": 90 + }, + "when": { + "facing": "east", + "segment_amount": "4" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_leaf_litter_4", + "y": 180 + }, + "when": { + "facing": "south", + "segment_amount": "4" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_leaf_litter_4", + "y": 270 + }, + "when": { + "facing": "west", + "segment_amount": "4" + } + } + ] +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/blockstates/lemonwood_leaf_litter.json b/src/main/generated/assets/acesbs/blockstates/lemonwood_leaf_litter.json new file mode 100644 index 0000000..8407d7e --- /dev/null +++ b/src/main/generated/assets/acesbs/blockstates/lemonwood_leaf_litter.json @@ -0,0 +1,160 @@ +{ + "multipart": [ + { + "apply": { + "model": "acesbs:block/lemonwood_leaf_litter_1" + }, + "when": { + "facing": "north", + "segment_amount": "1" + } + }, + { + "apply": { + "model": "acesbs:block/lemonwood_leaf_litter_1", + "y": 90 + }, + "when": { + "facing": "east", + "segment_amount": "1" + } + }, + { + "apply": { + "model": "acesbs:block/lemonwood_leaf_litter_1", + "y": 180 + }, + "when": { + "facing": "south", + "segment_amount": "1" + } + }, + { + "apply": { + "model": "acesbs:block/lemonwood_leaf_litter_1", + "y": 270 + }, + "when": { + "facing": "west", + "segment_amount": "1" + } + }, + { + "apply": { + "model": "acesbs:block/lemonwood_leaf_litter_2" + }, + "when": { + "facing": "north", + "segment_amount": "2|3" + } + }, + { + "apply": { + "model": "acesbs:block/lemonwood_leaf_litter_2", + "y": 90 + }, + "when": { + "facing": "east", + "segment_amount": "2|3" + } + }, + { + "apply": { + "model": "acesbs:block/lemonwood_leaf_litter_2", + "y": 180 + }, + "when": { + "facing": "south", + "segment_amount": "2|3" + } + }, + { + "apply": { + "model": "acesbs:block/lemonwood_leaf_litter_2", + "y": 270 + }, + "when": { + "facing": "west", + "segment_amount": "2|3" + } + }, + { + "apply": { + "model": "acesbs:block/lemonwood_leaf_litter_3" + }, + "when": { + "facing": "north", + "segment_amount": "3" + } + }, + { + "apply": { + "model": "acesbs:block/lemonwood_leaf_litter_3", + "y": 90 + }, + "when": { + "facing": "east", + "segment_amount": "3" + } + }, + { + "apply": { + "model": "acesbs:block/lemonwood_leaf_litter_3", + "y": 180 + }, + "when": { + "facing": "south", + "segment_amount": "3" + } + }, + { + "apply": { + "model": "acesbs:block/lemonwood_leaf_litter_3", + "y": 270 + }, + "when": { + "facing": "west", + "segment_amount": "3" + } + }, + { + "apply": { + "model": "acesbs:block/lemonwood_leaf_litter_4" + }, + "when": { + "facing": "north", + "segment_amount": "4" + } + }, + { + "apply": { + "model": "acesbs:block/lemonwood_leaf_litter_4", + "y": 90 + }, + "when": { + "facing": "east", + "segment_amount": "4" + } + }, + { + "apply": { + "model": "acesbs:block/lemonwood_leaf_litter_4", + "y": 180 + }, + "when": { + "facing": "south", + "segment_amount": "4" + } + }, + { + "apply": { + "model": "acesbs:block/lemonwood_leaf_litter_4", + "y": 270 + }, + "when": { + "facing": "west", + "segment_amount": "4" + } + } + ] +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/fire_oak_leaf_litter.json b/src/main/generated/assets/acesbs/items/fire_oak_leaf_litter.json new file mode 100644 index 0000000..36db7a2 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/fire_oak_leaf_litter.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/fire_oak_leaf_litter" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/lemonwood_leaf_litter.json b/src/main/generated/assets/acesbs/items/lemonwood_leaf_litter.json new file mode 100644 index 0000000..29a8413 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/lemonwood_leaf_litter.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/lemonwood_leaf_litter" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_leaf_litter_1.json b/src/main/generated/assets/acesbs/models/block/fire_oak_leaf_litter_1.json new file mode 100644 index 0000000..8179b99 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_leaf_litter_1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_leaf_litter_1", + "textures": { + "texture": "acesbs:block/fire_oak_leaf_litter" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_leaf_litter_2.json b/src/main/generated/assets/acesbs/models/block/fire_oak_leaf_litter_2.json new file mode 100644 index 0000000..ee7f985 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_leaf_litter_2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_leaf_litter_2", + "textures": { + "texture": "acesbs:block/fire_oak_leaf_litter" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_leaf_litter_3.json b/src/main/generated/assets/acesbs/models/block/fire_oak_leaf_litter_3.json new file mode 100644 index 0000000..cbce72c --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_leaf_litter_3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_leaf_litter_3", + "textures": { + "texture": "acesbs:block/fire_oak_leaf_litter" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_leaf_litter_4.json b/src/main/generated/assets/acesbs/models/block/fire_oak_leaf_litter_4.json new file mode 100644 index 0000000..71017b4 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_leaf_litter_4.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_leaf_litter_4", + "textures": { + "texture": "acesbs:block/fire_oak_leaf_litter" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/lemonwood_leaf_litter_1.json b/src/main/generated/assets/acesbs/models/block/lemonwood_leaf_litter_1.json new file mode 100644 index 0000000..74abf9d --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/lemonwood_leaf_litter_1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_leaf_litter_1", + "textures": { + "texture": "acesbs:block/lemonwood_leaf_litter" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/lemonwood_leaf_litter_2.json b/src/main/generated/assets/acesbs/models/block/lemonwood_leaf_litter_2.json new file mode 100644 index 0000000..32e52a4 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/lemonwood_leaf_litter_2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_leaf_litter_2", + "textures": { + "texture": "acesbs:block/lemonwood_leaf_litter" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/lemonwood_leaf_litter_3.json b/src/main/generated/assets/acesbs/models/block/lemonwood_leaf_litter_3.json new file mode 100644 index 0000000..b1fe776 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/lemonwood_leaf_litter_3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_leaf_litter_3", + "textures": { + "texture": "acesbs:block/lemonwood_leaf_litter" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/lemonwood_leaf_litter_4.json b/src/main/generated/assets/acesbs/models/block/lemonwood_leaf_litter_4.json new file mode 100644 index 0000000..33fd234 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/lemonwood_leaf_litter_4.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_leaf_litter_4", + "textures": { + "texture": "acesbs:block/lemonwood_leaf_litter" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/fire_oak_leaf_litter.json b/src/main/generated/assets/acesbs/models/item/fire_oak_leaf_litter.json new file mode 100644 index 0000000..302217e --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/fire_oak_leaf_litter.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/fire_oak_leaf_litter" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/lemonwood_leaf_litter.json b/src/main/generated/assets/acesbs/models/item/lemonwood_leaf_litter.json new file mode 100644 index 0000000..f266aa2 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/lemonwood_leaf_litter.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/lemonwood_leaf_litter" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/decorations/fire_oak_leaf_litter_from_smelting_fire_oak_leaves.json b/src/main/generated/data/acesbs/advancement/recipes/decorations/fire_oak_leaf_litter_from_smelting_fire_oak_leaves.json new file mode 100644 index 0000000..df82db5 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/decorations/fire_oak_leaf_litter_from_smelting_fire_oak_leaves.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_fire_oak_leaves": { + "conditions": { + "items": [ + { + "items": "acesbs:fire_oak_leaves" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:fire_oak_leaf_litter_from_smelting_fire_oak_leaves" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_fire_oak_leaves" + ] + ], + "rewards": { + "recipes": [ + "acesbs:fire_oak_leaf_litter_from_smelting_fire_oak_leaves" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/decorations/lemonwood_leaf_litter_from_smelting_lemonwood_leaves.json b/src/main/generated/data/acesbs/advancement/recipes/decorations/lemonwood_leaf_litter_from_smelting_lemonwood_leaves.json new file mode 100644 index 0000000..2e7f864 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/decorations/lemonwood_leaf_litter_from_smelting_lemonwood_leaves.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lemonwood_leaves": { + "conditions": { + "items": [ + { + "items": "acesbs:lemonwood_leaves" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:lemonwood_leaf_litter_from_smelting_lemonwood_leaves" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lemonwood_leaves" + ] + ], + "rewards": { + "recipes": [ + "acesbs:lemonwood_leaf_litter_from_smelting_lemonwood_leaves" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/fire_oak_leaf_litter_from_smelting_fire_oak_leaves.json b/src/main/generated/data/acesbs/recipe/fire_oak_leaf_litter_from_smelting_fire_oak_leaves.json new file mode 100644 index 0000000..1fc9bb3 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/fire_oak_leaf_litter_from_smelting_fire_oak_leaves.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, + "group": "blocks", + "ingredient": "acesbs:fire_oak_leaves", + "result": { + "id": "acesbs:fire_oak_leaf_litter" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/lemonwood_leaf_litter_from_smelting_lemonwood_leaves.json b/src/main/generated/data/acesbs/recipe/lemonwood_leaf_litter_from_smelting_lemonwood_leaves.json new file mode 100644 index 0000000..91ec88f --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/lemonwood_leaf_litter_from_smelting_lemonwood_leaves.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, + "group": "blocks", + "ingredient": "acesbs:lemonwood_leaves", + "result": { + "id": "acesbs:lemonwood_leaf_litter" + } +} \ No newline at end of file diff --git a/src/main/java/com/acethewildfire/acesbs/AcesBSClient.java b/src/main/java/com/acethewildfire/acesbs/AcesBSClient.java index 3780e40..f882f30 100644 --- a/src/main/java/com/acethewildfire/acesbs/AcesBSClient.java +++ b/src/main/java/com/acethewildfire/acesbs/AcesBSClient.java @@ -35,8 +35,10 @@ public class AcesBSClient implements ClientModInitializer { BlockRenderLayerMap.putBlock(ModBlocks.TOBACCO_CROP, BlockRenderLayer.CUTOUT); BlockRenderLayerMap.putBlock(LemonWoodBlocks.LEMONWOOD_SAPLING, BlockRenderLayer.CUTOUT); BlockRenderLayerMap.putBlock(LemonWoodBlocks.POTTED_LEMONWOOD_SAPLING, BlockRenderLayer.CUTOUT); + BlockRenderLayerMap.putBlock(LemonWoodBlocks.LEMONWOOD_LEAF_LITTER, BlockRenderLayer.CUTOUT); BlockRenderLayerMap.putBlock(FireOakBlocks.FIRE_OAK_SAPLING, BlockRenderLayer.CUTOUT); BlockRenderLayerMap.putBlock(FireOakBlocks.POTTED_FIRE_OAK_SAPLING, BlockRenderLayer.CUTOUT); + BlockRenderLayerMap.putBlock(FireOakBlocks.FIRE_OAK_LEAF_LITTER, BlockRenderLayer.CUTOUT); EntityModelLayerRegistry.registerModelLayer(FrenModel.FREN, FrenModel::getTexturedModelData); EntityRendererRegistry.register(ModEntities.FREN, FrenRenderer::new); diff --git a/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md b/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md index deed1de..a484299 100644 --- a/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md +++ b/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md @@ -4,6 +4,7 @@ - Prisma Smithing Templates can be given by Armorers as a Hero of the Village Gift. - Hammers are now included in the pickaxe item tag. (aka, to other mods they will be considered a type of pickaxe) - Fire Oak Trees and associated wood blocks. Obtainable by placing an oak sapling and infernal ashes in an Entropic Entangler +- Leaf Litter for both Lemonwood and the new Fire Oak leaf types. - Fractal Diamonds can now be obtained by placing a diamond and stable entropy into an entropic entangler. They can be used to craft tools and armor. They have the same effect as Prisma Steel and drop additional ores when mining. - Hellfire Diamonds can now be obtained by placing a diamond and infernal ashes into an entropic entangler. They can be used to craft tools and armor. They automatically smelt items that are smeltable. (Ex: Ores->ingots, logs->charcoal, sand->glass). - Bag of Holding which acts as a portable double chest. diff --git a/src/main/java/com/acethewildfire/acesbs/block/FireOakBlocks.java b/src/main/java/com/acethewildfire/acesbs/block/FireOakBlocks.java index 107f356..9757185 100644 --- a/src/main/java/com/acethewildfire/acesbs/block/FireOakBlocks.java +++ b/src/main/java/com/acethewildfire/acesbs/block/FireOakBlocks.java @@ -19,6 +19,8 @@ public class FireOakBlocks { properties -> new PillarBlock(properties.mapColor(MapColor.DARK_RED).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD))); public static final Block FIRE_OAK_LEAVES = ModBlocks.registerBlock("fire_oak_leaves", properties -> new ColoredParticleLeavesBlock(0.02f, 156, 46, 59, properties.mapColor(MapColor.DARK_RED).strength(0.2F).ticksRandomly().sounds(BlockSoundGroup.GRASS).nonOpaque().allowsSpawning(Blocks::canSpawnOnLeaves).suffocates(Blocks::never).blockVision(Blocks::never).pistonBehavior(PistonBehavior.DESTROY).solidBlock(Blocks::never))); + public static final Block FIRE_OAK_LEAF_LITTER = ModBlocks.registerBlock("fire_oak_leaf_litter", + properties -> new LeafLitterBlock(properties.mapColor(MapColor.DARK_RED).replaceable().noCollision().sounds(BlockSoundGroup.LEAF_LITTER).pistonBehavior(PistonBehavior.DESTROY))); public static final Block FIRE_OAK_SAPLING = ModBlocks.registerBlock("fire_oak_sapling", properties -> new SaplingBlock(ModBlockSaplingGenerator.FIRE_OAK, properties.mapColor(MapColor.DARK_RED).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.GRASS).pistonBehavior(PistonBehavior.DESTROY))); public static final Block POTTED_FIRE_OAK_SAPLING = ModBlocks.registerBlock("potted_fire_oak_sapling", properties -> new FlowerPotBlock(FIRE_OAK_SAPLING, properties.breakInstantly().nonOpaque().pistonBehavior(PistonBehavior.DESTROY))); diff --git a/src/main/java/com/acethewildfire/acesbs/block/LemonWoodBlocks.java b/src/main/java/com/acethewildfire/acesbs/block/LemonWoodBlocks.java index 6476793..85ec0fb 100644 --- a/src/main/java/com/acethewildfire/acesbs/block/LemonWoodBlocks.java +++ b/src/main/java/com/acethewildfire/acesbs/block/LemonWoodBlocks.java @@ -19,6 +19,8 @@ public class LemonWoodBlocks { properties -> new PillarBlock(properties.mapColor(MapColor.PALE_YELLOW).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD).burnable())); public static final Block LEMONWOOD_LEAVES = ModBlocks.registerBlock("lemonwood_leaves", properties -> new ColoredParticleLeavesBlock(0.02f, 226, 193, 70, properties.mapColor(MapColor.PALE_YELLOW).strength(0.2F).ticksRandomly().sounds(BlockSoundGroup.GRASS).nonOpaque().allowsSpawning(Blocks::canSpawnOnLeaves).suffocates(Blocks::never).blockVision(Blocks::never).burnable().pistonBehavior(PistonBehavior.DESTROY).solidBlock(Blocks::never))); + public static final Block LEMONWOOD_LEAF_LITTER = ModBlocks.registerBlock("lemonwood_leaf_litter", + properties -> new LeafLitterBlock(properties.mapColor(MapColor.PALE_YELLOW).replaceable().noCollision().sounds(BlockSoundGroup.LEAF_LITTER).pistonBehavior(PistonBehavior.DESTROY))); public static final Block LEMONWOOD_SAPLING = ModBlocks.registerBlock("lemonwood_sapling", properties -> new SaplingBlock(ModBlockSaplingGenerator.LEMONWOOD, properties.mapColor(MapColor.PALE_YELLOW).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.GRASS).pistonBehavior(PistonBehavior.DESTROY))); public static final Block POTTED_LEMONWOOD_SAPLING = ModBlocks.registerBlock("potted_lemonwood_sapling", properties -> new FlowerPotBlock(LEMONWOOD_SAPLING, properties.breakInstantly().nonOpaque().pistonBehavior(PistonBehavior.DESTROY))); diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java index 40c1177..296df44 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java @@ -64,6 +64,7 @@ public class ModModelProvider extends FabricModelProvider { blockStateModelGenerator.createLogTexturePool(LemonWoodBlocks.STRIPPED_LEMONWOOD_LOG).log(LemonWoodBlocks.STRIPPED_LEMONWOOD_LOG).wood(LemonWoodBlocks.STRIPPED_LEMONWOOD_WOOD); blockStateModelGenerator.registerSingleton(LemonWoodBlocks.LEMONWOOD_LEAVES, TexturedModel.LEAVES); + blockStateModelGenerator.registerLeafLitter(LemonWoodBlocks.LEMONWOOD_LEAF_LITTER); // blockStateModelGenerator.registerFlowerPotPlant(LemonWoodBlocks.LEMONWOOD_SAPLING, LemonWoodBlocks.POTTED_LEMONWOOD_SAPLING, BlockStateModelGenerator.CrossType.NOT_TINTED); blockStateModelGenerator.registerDoor(LemonWoodBlocks.LEMONWOOD_DOOR); @@ -85,6 +86,7 @@ public class ModModelProvider extends FabricModelProvider { blockStateModelGenerator.createLogTexturePool(FireOakBlocks.STRIPPED_FIRE_OAK_LOG).log(FireOakBlocks.STRIPPED_FIRE_OAK_LOG).wood(FireOakBlocks.STRIPPED_FIRE_OAK_WOOD); blockStateModelGenerator.registerSingleton(FireOakBlocks.FIRE_OAK_LEAVES, TexturedModel.LEAVES); + blockStateModelGenerator.registerLeafLitter(FireOakBlocks.FIRE_OAK_LEAF_LITTER); // blockStateModelGenerator.registerFlowerPotPlant(FireOakBlocks.FIRE_OAK_SAPLING, FireOakBlocks.POTTED_FIRE_OAK_SAPLING, BlockStateModelGenerator.CrossType.NOT_TINTED); blockStateModelGenerator.registerDoor(FireOakBlocks.FIRE_OAK_DOOR); diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java index f3a3437..7074f02 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java @@ -23,6 +23,7 @@ import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; +import java.util.List; import java.util.concurrent.CompletableFuture; public class ModRecipeProvider extends FabricRecipeProvider { @@ -53,6 +54,9 @@ public class ModRecipeProvider extends FabricRecipeProvider { offerReversibleCompactingRecipes(RecipeCategory.BUILDING_BLOCKS, HellfireDiamondItems.HELLFIRE_DIAMOND, RecipeCategory.DECORATIONS, ModBlocks.HELLFIRE_DIAMOND_BLOCK); offerReversibleCompactingRecipes(RecipeCategory.BUILDING_BLOCKS, ModItems.INFERNAL_ASHES, RecipeCategory.DECORATIONS, ModBlocks.INFERNAL_ASHES_BLOCK); + offerSmelting(List.of(LemonWoodBlocks.LEMONWOOD_LEAVES.asItem()), RecipeCategory.DECORATIONS, LemonWoodBlocks.LEMONWOOD_LEAF_LITTER, 0.1f, 200, "blocks"); + offerSmelting(List.of(FireOakBlocks.FIRE_OAK_LEAVES.asItem()), RecipeCategory.DECORATIONS, FireOakBlocks.FIRE_OAK_LEAF_LITTER, 0.1f, 200, "blocks"); + offerAllFoodCookingRecipes(200, ModItems.LEMON, ModItems.COOKED_LEMON, 0.35F); diff --git a/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java b/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java index 95bb7b2..886ea08 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java +++ b/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java @@ -86,9 +86,10 @@ public class ModItemGroups { entries.add(LemonWoodBlocks.STRIPPED_LEMONWOOD_WOOD); entries.add(LemonWoodBlocks.LEMONWOOD_SAPLING); entries.add(LemonWoodBlocks.LEMONWOOD_LEAVES); + entries.add(LemonWoodBlocks.LEMONWOOD_LEAF_LITTER); entries.add(LemonWoodBlocks.LEMONWOOD_PLANKS); - entries.add(LemonWoodBlocks.LEMONWOOD_STAIRS); + entries.add(LemonWoodBlocks.LEMONWOOD_STAIRS); entries.add(LemonWoodBlocks.LEMONWOOD_SLAB); entries.add(LemonWoodBlocks.LEMONWOOD_BUTTON); entries.add(LemonWoodBlocks.LEMONWOOD_PRESSURE_PLATE); @@ -97,18 +98,19 @@ public class ModItemGroups { entries.add(LemonWoodBlocks.LEMONWOOD_WALL); entries.add(LemonWoodBlocks.LEMONWOOD_DOOR); entries.add(LemonWoodBlocks.LEMONWOOD_TRAPDOOR); - entries.add(ModBlocks.EVIL_BLOCK); + entries.add(ModBlocks.EVIL_BLOCK); entries.add(FireOakBlocks.FIRE_OAK_LOG); entries.add(FireOakBlocks.FIRE_OAK_WOOD); entries.add(FireOakBlocks.STRIPPED_FIRE_OAK_LOG); entries.add(FireOakBlocks.STRIPPED_FIRE_OAK_WOOD); entries.add(FireOakBlocks.FIRE_OAK_SAPLING); entries.add(FireOakBlocks.FIRE_OAK_LEAVES); + entries.add(FireOakBlocks.FIRE_OAK_LEAF_LITTER); entries.add(FireOakBlocks.FIRE_OAK_PLANKS); + entries.add(FireOakBlocks.FIRE_OAK_STAIRS); entries.add(FireOakBlocks.FIRE_OAK_SLAB); - entries.add(FireOakBlocks.FIRE_OAK_BUTTON); entries.add(FireOakBlocks.FIRE_OAK_PRESSURE_PLATE); entries.add(FireOakBlocks.FIRE_OAK_FENCE); diff --git a/src/main/resources/assets/acesbs/lang/en_us.json b/src/main/resources/assets/acesbs/lang/en_us.json index c18cb2f..1e2bc18 100644 --- a/src/main/resources/assets/acesbs/lang/en_us.json +++ b/src/main/resources/assets/acesbs/lang/en_us.json @@ -181,6 +181,7 @@ "block.acesbs.stripped_lemonwood_wood": "Stripped Lemonwood Wood", "block.acesbs.lemonwood_sapling": "Lemonwood Sapling", "block.acesbs.lemonwood_leaves": "Lemonwood Leaves", + "block.acesbs.lemonwood_leaf_litter": "Lemonwood Leaf Litter", "block.acesbs.lemonwood_planks": "Lemonwood Planks", "block.acesbs.lemonwood_stairs": "Lemonwood Stairs", @@ -199,6 +200,7 @@ "block.acesbs.stripped_fire_oak_wood": "Stripped Fire Oak Wood", "block.acesbs.fire_oak_sapling": "Fire Oak Sapling", "block.acesbs.fire_oak_leaves": "Fire Oak Leaves", + "block.acesbs.fire_oak_leaf_litter": "Fire Oak Leaf Litter", "block.acesbs.fire_oak_planks": "Fire Oak Planks", "block.acesbs.fire_oak_stairs": "Fire Oak Stairs", diff --git a/src/main/resources/assets/acesbs/textures/block/fire_oak_leaf_litter.png b/src/main/resources/assets/acesbs/textures/block/fire_oak_leaf_litter.png new file mode 100644 index 0000000000000000000000000000000000000000..37391e3ca182ebd374b0272dc4dd0b43064268a8 GIT binary patch literal 611 zcmV-p0-XJcP)z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy32;bRa{vGf6951U69E94oEQKA00(qQO+^Rl0~-YfDlnOpu>b%8 zxk*GpR5;6>lCf&rP!xv0YuVTlEhJDoSZ-}(Y7b7qWXX^R$lxW5Cr=&Py@ZZl0v!W+ zfOc)C%o+Ls-3yr-aEXH*8pp(;Se7h_(;?i8)e6$~z=g}z`M>|@oTC7GPF-xvVm+7V zXmFy~SxoA>4R`r)y@de#tq(!L+KTauP<#t1O<=Xi02p~X?{1VNZAUWGFkl)6XozauufKymAOSNj6d3XL*0SU;x xz&0)?R~PE!>OyJp4EV1&aJLex{|nfW)?5)2@f`pF002ovPDHLkV1lR~2}%F} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/acesbs/textures/block/lemonwood_leaf_litter.png b/src/main/resources/assets/acesbs/textures/block/lemonwood_leaf_litter.png new file mode 100644 index 0000000000000000000000000000000000000000..b96c61bb2e3b4e70c4011872ab142c60b9a0fa19 GIT binary patch literal 647 zcmV;20(kw2P)z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy32;bRa{vGf6951U69E94oEQKA00(qQO+^Rl0~-Yg4UC8on*aa- z-AP12R5;6(lRs!vQ5431_r3UUNlY~fu^LFlMNqN?x^xlUU4mpXh>8?Cg_0p|CW9n% z2Nj8vNEYcDap@umB~-AbMIMb!Vn|JzEH-VzagckPXNuAT7akwq`Ocs3JO!|n4T;}t zb2;Q;E>%;UAS?jC*QVPavC|r|Qi{kpp_mRzF&%Va8_P4Yu{zt=vt!q;yD z^PO7=2tczvWNmYR7Wr>vA6*bFkXs1IyTY_dw5sK(RLfBrC+h?q`IkQxz_rL}gMD~$ z<Pjgh`e~7^+QHEhpFI1aI=ztr{9c=Iz+*(_QZ@BuYrsxx$i2n7 z0+_vV*6@$Dte6gpUf%2Xy?@%O0Ny^oWM)og8WRa0Uq$5B!=wAq{A8w~EDf%%@6+v% zTw(y#a#S|A4_t!X{)pA}eU`EzF#^%)Q#kcQy8Y2ao3l618HXO+^~rp`r8M9AyKSd_ z=t_asJWeGp0MR?26~JO@N&w#E!gBv- zdV9O{_IA-ig;Gc9IrXssT)%q89Fl6C;;F2i>4EueEactmn%*sF3xs~DW6R& h;hgBtHI|N_{%`X0;J5=3ukHW<002ovPDHLkV1mCV5B&fD literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/acesbs/textures/item/fire_oak_leaf_litter.png b/src/main/resources/assets/acesbs/textures/item/fire_oak_leaf_litter.png new file mode 100644 index 0000000000000000000000000000000000000000..37391e3ca182ebd374b0272dc4dd0b43064268a8 GIT binary patch literal 611 zcmV-p0-XJcP)z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy32;bRa{vGf6951U69E94oEQKA00(qQO+^Rl0~-YfDlnOpu>b%8 zxk*GpR5;6>lCf&rP!xv0YuVTlEhJDoSZ-}(Y7b7qWXX^R$lxW5Cr=&Py@ZZl0v!W+ zfOc)C%o+Ls-3yr-aEXH*8pp(;Se7h_(;?i8)e6$~z=g}z`M>|@oTC7GPF-xvVm+7V zXmFy~SxoA>4R`r)y@de#tq(!L+KTauP<#t1O<=Xi02p~X?{1VNZAUWGFkl)6XozauufKymAOSNj6d3XL*0SU;x xz&0)?R~PE!>OyJp4EV1&aJLex{|nfW)?5)2@f`pF002ovPDHLkV1lR~2}%F} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/acesbs/textures/item/lemonwood_leaf_litter.png b/src/main/resources/assets/acesbs/textures/item/lemonwood_leaf_litter.png new file mode 100644 index 0000000000000000000000000000000000000000..b96c61bb2e3b4e70c4011872ab142c60b9a0fa19 GIT binary patch literal 647 zcmV;20(kw2P)z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy32;bRa{vGf6951U69E94oEQKA00(qQO+^Rl0~-Yg4UC8on*aa- z-AP12R5;6(lRs!vQ5431_r3UUNlY~fu^LFlMNqN?x^xlUU4mpXh>8?Cg_0p|CW9n% z2Nj8vNEYcDap@umB~-AbMIMb!Vn|JzEH-VzagckPXNuAT7akwq`Ocs3JO!|n4T;}t zb2;Q;E>%;UAS?jC*QVPavC|r|Qi{kpp_mRzF&%Va8_P4Yu{zt=vt!q;yD z^PO7=2tczvWNmYR7Wr>vA6*bFkXs1IyTY_dw5sK(RLfBrC+h?q`IkQxz_rL}gMD~$ z<Pjgh`e~7^+QHEhpFI1aI=ztr{9c=Iz+*(_QZ@BuYrsxx$i2n7 z0+_vV*6@$Dte6gpUf%2Xy?@%O0Ny^oWM)og8WRa0Uq$5B!=wAq{A8w~EDf%%@6+v% zTw(y#a#S|A4_t!X{)pA}eU`EzF#^%)Q#kcQy8Y2ao3l618HXO+^~rp`r8M9AyKSd_ z=t_asJWeGp0MR?26~JO@N&w#E!gBv- zdV9O{_IA-ig;Gc9IrXssT)%q89Fl6C;;F2i>4EueEactmn%*sF3xs~DW6R& h;hgBtHI|N_{%`X0;J5=3ukHW<002ovPDHLkV1mCV5B&fD literal 0 HcmV?d00001 diff --git a/src/main/resources/data/acesbs/loot_table/blocks/fire_oak_leaf_litter.json b/src/main/resources/data/acesbs/loot_table/blocks/fire_oak_leaf_litter.json new file mode 100644 index 0000000..4c8ef11 --- /dev/null +++ b/src/main/resources/data/acesbs/loot_table/blocks/fire_oak_leaf_litter.json @@ -0,0 +1,77 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "acesbs:fire_oak_leaf_litter", + "condition": "minecraft:block_state_property", + "properties": { + "segment_amount": "1" + } + } + ], + "count": 1.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "acesbs:fire_oak_leaf_litter", + "condition": "minecraft:block_state_property", + "properties": { + "segment_amount": "2" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "acesbs:fire_oak_leaf_litter", + "condition": "minecraft:block_state_property", + "properties": { + "segment_amount": "3" + } + } + ], + "count": 3.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "acesbs:fire_oak_leaf_litter", + "condition": "minecraft:block_state_property", + "properties": { + "segment_amount": "4" + } + } + ], + "count": 4.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "acesbs:fire_oak_leaf_litter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "acesbs:blocks/fire_oak_leaf_litter" +} \ No newline at end of file diff --git a/src/main/resources/data/acesbs/loot_table/blocks/lemonwood_leaf_litter.json b/src/main/resources/data/acesbs/loot_table/blocks/lemonwood_leaf_litter.json new file mode 100644 index 0000000..2da403a --- /dev/null +++ b/src/main/resources/data/acesbs/loot_table/blocks/lemonwood_leaf_litter.json @@ -0,0 +1,77 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "acesbs:lemonwood_leaf_litter", + "condition": "minecraft:block_state_property", + "properties": { + "segment_amount": "1" + } + } + ], + "count": 1.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "acesbs:lemonwood_leaf_litter", + "condition": "minecraft:block_state_property", + "properties": { + "segment_amount": "2" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "acesbs:lemonwood_leaf_litter", + "condition": "minecraft:block_state_property", + "properties": { + "segment_amount": "3" + } + } + ], + "count": 3.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "acesbs:lemonwood_leaf_litter", + "condition": "minecraft:block_state_property", + "properties": { + "segment_amount": "4" + } + } + ], + "count": 4.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "acesbs:lemonwood_leaf_litter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "acesbs:blocks/lemonwood_leaf_litter" +} \ No newline at end of file