From f931d2f5e21d869c3b3db358522b034b971922f1 Mon Sep 17 00:00:00 2001 From: Vos Date: Tue, 18 Nov 2025 20:30:04 -0600 Subject: [PATCH] Crystal Entropy --- .../acesbs/blockstates/crystal_entropy.json | 7 ++ .../blockstates/crystal_entropy_pane.json | 77 ++++++++++++++++++ .../acesbs/models/block/crystal_entropy.json | 6 ++ .../block/crystal_entropy_pane_noside.json | 6 ++ .../crystal_entropy_pane_noside_alt.json | 6 ++ .../block/crystal_entropy_pane_post.json | 7 ++ .../block/crystal_entropy_pane_side.json | 7 ++ .../block/crystal_entropy_pane_side_alt.json | 7 ++ .../acesbs/models/item/crystal_entropy.json | 3 + .../models/item/crystal_entropy_pane.json | 6 ++ ...crystal_entropy_from_stable_and_glass.json | 32 ++++++++ .../decorations/crystal_entropy_pane.json | 32 ++++++++ .../loot_table/blocks/crystal_entropy.json | 32 ++++++++ .../blocks/crystal_entropy_pane.json | 32 ++++++++ ...crystal_entropy_from_stable_and_glass.json | 21 +++++ .../acesbs/recipe/crystal_entropy_pane.json | 17 ++++ .../data/acesbs/recipe/oracle_lemon.json | 2 +- .../minecraft/tags/block/impermeable.json | 6 ++ .../acethewildfire/acesbs/AcesBSClient.java | 2 + .../java/com/acethewildfire/acesbs/TODO.txt | 7 +- .../acesbs/block/ModBlocks.java | 26 ++++++ .../acesbs/datagen/ModBlockTagProvider.java | 3 + .../acesbs/datagen/ModLootTableProvider.java | 3 + .../acesbs/datagen/ModModelProvider.java | 3 + .../acesbs/datagen/ModRecipeProvider.java | 17 +++- .../acesbs/item/ModItemGroups.java | 2 + .../resources/assets/acesbs/lang/en_us.json | 2 + .../acesbs/textures/block/crystal_entropy.png | Bin 0 -> 2763 bytes .../block/crystal_entropy_pane_top.png | Bin 0 -> 2198 bytes 29 files changed, 368 insertions(+), 3 deletions(-) create mode 100644 src/main/generated/assets/acesbs/blockstates/crystal_entropy.json create mode 100644 src/main/generated/assets/acesbs/blockstates/crystal_entropy_pane.json create mode 100644 src/main/generated/assets/acesbs/models/block/crystal_entropy.json create mode 100644 src/main/generated/assets/acesbs/models/block/crystal_entropy_pane_noside.json create mode 100644 src/main/generated/assets/acesbs/models/block/crystal_entropy_pane_noside_alt.json create mode 100644 src/main/generated/assets/acesbs/models/block/crystal_entropy_pane_post.json create mode 100644 src/main/generated/assets/acesbs/models/block/crystal_entropy_pane_side.json create mode 100644 src/main/generated/assets/acesbs/models/block/crystal_entropy_pane_side_alt.json create mode 100644 src/main/generated/assets/acesbs/models/item/crystal_entropy.json create mode 100644 src/main/generated/assets/acesbs/models/item/crystal_entropy_pane.json create mode 100644 src/main/generated/data/acesbs/advancement/recipes/decorations/crystal_entropy_from_stable_and_glass.json create mode 100644 src/main/generated/data/acesbs/advancement/recipes/decorations/crystal_entropy_pane.json create mode 100644 src/main/generated/data/acesbs/loot_table/blocks/crystal_entropy.json create mode 100644 src/main/generated/data/acesbs/loot_table/blocks/crystal_entropy_pane.json create mode 100644 src/main/generated/data/acesbs/recipe/crystal_entropy_from_stable_and_glass.json create mode 100644 src/main/generated/data/acesbs/recipe/crystal_entropy_pane.json create mode 100644 src/main/generated/data/minecraft/tags/block/impermeable.json create mode 100644 src/main/resources/assets/acesbs/textures/block/crystal_entropy.png create mode 100644 src/main/resources/assets/acesbs/textures/block/crystal_entropy_pane_top.png diff --git a/src/main/generated/assets/acesbs/blockstates/crystal_entropy.json b/src/main/generated/assets/acesbs/blockstates/crystal_entropy.json new file mode 100644 index 0000000..cb2043b --- /dev/null +++ b/src/main/generated/assets/acesbs/blockstates/crystal_entropy.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "acesbs:block/crystal_entropy" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/blockstates/crystal_entropy_pane.json b/src/main/generated/assets/acesbs/blockstates/crystal_entropy_pane.json new file mode 100644 index 0000000..ec2d4ad --- /dev/null +++ b/src/main/generated/assets/acesbs/blockstates/crystal_entropy_pane.json @@ -0,0 +1,77 @@ +{ + "multipart": [ + { + "apply": { + "model": "acesbs:block/crystal_entropy_pane_post" + } + }, + { + "apply": { + "model": "acesbs:block/crystal_entropy_pane_side" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "acesbs:block/crystal_entropy_pane_side", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "acesbs:block/crystal_entropy_pane_side_alt" + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "acesbs:block/crystal_entropy_pane_side_alt", + "y": 90 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "acesbs:block/crystal_entropy_pane_noside" + }, + "when": { + "north": "false" + } + }, + { + "apply": { + "model": "acesbs:block/crystal_entropy_pane_noside_alt" + }, + "when": { + "east": "false" + } + }, + { + "apply": { + "model": "acesbs:block/crystal_entropy_pane_noside_alt", + "y": 90 + }, + "when": { + "south": "false" + } + }, + { + "apply": { + "model": "acesbs:block/crystal_entropy_pane_noside", + "y": 270 + }, + "when": { + "west": "false" + } + } + ] +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/crystal_entropy.json b/src/main/generated/assets/acesbs/models/block/crystal_entropy.json new file mode 100644 index 0000000..2748cb1 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/crystal_entropy.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "acesbs:block/crystal_entropy" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/crystal_entropy_pane_noside.json b/src/main/generated/assets/acesbs/models/block/crystal_entropy_pane_noside.json new file mode 100644 index 0000000..1c7e377 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/crystal_entropy_pane_noside.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_glass_pane_noside", + "textures": { + "pane": "acesbs:block/crystal_entropy" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/crystal_entropy_pane_noside_alt.json b/src/main/generated/assets/acesbs/models/block/crystal_entropy_pane_noside_alt.json new file mode 100644 index 0000000..2349219 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/crystal_entropy_pane_noside_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_glass_pane_noside_alt", + "textures": { + "pane": "acesbs:block/crystal_entropy" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/crystal_entropy_pane_post.json b/src/main/generated/assets/acesbs/models/block/crystal_entropy_pane_post.json new file mode 100644 index 0000000..0f01d7d --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/crystal_entropy_pane_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_glass_pane_post", + "textures": { + "edge": "acesbs:block/crystal_entropy_pane_top", + "pane": "acesbs:block/crystal_entropy" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/crystal_entropy_pane_side.json b/src/main/generated/assets/acesbs/models/block/crystal_entropy_pane_side.json new file mode 100644 index 0000000..11446b1 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/crystal_entropy_pane_side.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_glass_pane_side", + "textures": { + "edge": "acesbs:block/crystal_entropy_pane_top", + "pane": "acesbs:block/crystal_entropy" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/crystal_entropy_pane_side_alt.json b/src/main/generated/assets/acesbs/models/block/crystal_entropy_pane_side_alt.json new file mode 100644 index 0000000..2e14f12 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/crystal_entropy_pane_side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_glass_pane_side_alt", + "textures": { + "edge": "acesbs:block/crystal_entropy_pane_top", + "pane": "acesbs:block/crystal_entropy" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/crystal_entropy.json b/src/main/generated/assets/acesbs/models/item/crystal_entropy.json new file mode 100644 index 0000000..875cbaf --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/crystal_entropy.json @@ -0,0 +1,3 @@ +{ + "parent": "acesbs:block/crystal_entropy" +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/crystal_entropy_pane.json b/src/main/generated/assets/acesbs/models/item/crystal_entropy_pane.json new file mode 100644 index 0000000..2c7e9de --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/crystal_entropy_pane.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:block/crystal_entropy" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/decorations/crystal_entropy_from_stable_and_glass.json b/src/main/generated/data/acesbs/advancement/recipes/decorations/crystal_entropy_from_stable_and_glass.json new file mode 100644 index 0000000..eb91a7d --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/decorations/crystal_entropy_from_stable_and_glass.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stable_entropy": { + "conditions": { + "items": [ + { + "items": "acesbs:stable_entropy" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:crystal_entropy_from_stable_and_glass" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_stable_entropy" + ] + ], + "rewards": { + "recipes": [ + "acesbs:crystal_entropy_from_stable_and_glass" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/decorations/crystal_entropy_pane.json b/src/main/generated/data/acesbs/advancement/recipes/decorations/crystal_entropy_pane.json new file mode 100644 index 0000000..c30bf4d --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/decorations/crystal_entropy_pane.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_crystal_entropy": { + "conditions": { + "items": [ + { + "items": "acesbs:crystal_entropy" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:crystal_entropy_pane" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_crystal_entropy" + ] + ], + "rewards": { + "recipes": [ + "acesbs:crystal_entropy_pane" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/loot_table/blocks/crystal_entropy.json b/src/main/generated/data/acesbs/loot_table/blocks/crystal_entropy.json new file mode 100644 index 0000000..6c1dd3d --- /dev/null +++ b/src/main/generated/data/acesbs/loot_table/blocks/crystal_entropy.json @@ -0,0 +1,32 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "acesbs:crystal_entropy" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/loot_table/blocks/crystal_entropy_pane.json b/src/main/generated/data/acesbs/loot_table/blocks/crystal_entropy_pane.json new file mode 100644 index 0000000..879e579 --- /dev/null +++ b/src/main/generated/data/acesbs/loot_table/blocks/crystal_entropy_pane.json @@ -0,0 +1,32 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "acesbs:crystal_entropy_pane" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/crystal_entropy_from_stable_and_glass.json b/src/main/generated/data/acesbs/recipe/crystal_entropy_from_stable_and_glass.json new file mode 100644 index 0000000..9b984bb --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/crystal_entropy_from_stable_and_glass.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "minecraft:glass" + }, + "S": { + "item": "acesbs:stable_entropy" + } + }, + "pattern": [ + "###", + "#S#", + "###" + ], + "result": { + "count": 8, + "id": "acesbs:crystal_entropy" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/crystal_entropy_pane.json b/src/main/generated/data/acesbs/recipe/crystal_entropy_pane.json new file mode 100644 index 0000000..1382422 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/crystal_entropy_pane.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "acesbs:crystal_entropy" + } + }, + "pattern": [ + "###", + "###" + ], + "result": { + "count": 16, + "id": "acesbs:crystal_entropy_pane" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/oracle_lemon.json b/src/main/generated/data/acesbs/recipe/oracle_lemon.json index f4ab1e6..7256314 100644 --- a/src/main/generated/data/acesbs/recipe/oracle_lemon.json +++ b/src/main/generated/data/acesbs/recipe/oracle_lemon.json @@ -15,7 +15,7 @@ "###" ], "result": { - "count": 1, + "count": 4, "id": "acesbs:oracle_lemon" } } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/block/impermeable.json b/src/main/generated/data/minecraft/tags/block/impermeable.json new file mode 100644 index 0000000..9a4abda --- /dev/null +++ b/src/main/generated/data/minecraft/tags/block/impermeable.json @@ -0,0 +1,6 @@ +{ + "values": [ + "acesbs:crystal_entropy", + "acesbs:crystal_entropy_pane" + ] +} \ 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 5bde8e5..e2a4595 100644 --- a/src/main/java/com/acethewildfire/acesbs/AcesBSClient.java +++ b/src/main/java/com/acethewildfire/acesbs/AcesBSClient.java @@ -16,6 +16,8 @@ public class AcesBSClient implements ClientModInitializer { public void onInitializeClient() { BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.LEMONWOOD_DOOR, RenderLayer.getTranslucent()); BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.LEMONWOOD_TRAPDOOR, RenderLayer.getTranslucent()); + BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.CRYSTAL_ENTROPY, RenderLayer.getTranslucent()); + BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.CRYSTAL_ENTROPY_PANE, RenderLayer.getTranslucent()); BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.TOBACCO_CROP, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.LEMONWOOD_SAPLING, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.POTTED_LEMONWOOD_SAPLING, RenderLayer.getCutout()); diff --git a/src/main/java/com/acethewildfire/acesbs/TODO.txt b/src/main/java/com/acethewildfire/acesbs/TODO.txt index 53dc290..2b59921 100644 --- a/src/main/java/com/acethewildfire/acesbs/TODO.txt +++ b/src/main/java/com/acethewildfire/acesbs/TODO.txt @@ -90,4 +90,9 @@ X Fren (Stable Entropy on a Creeper) Music Disk X Crab Rave -X Lizard \ No newline at end of file +X Lizard + + +Next Mod +Aces Mysteries +Puzzle textures. \ No newline at end of file diff --git a/src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java b/src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java index 5b932b9..6ed3638 100644 --- a/src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java +++ b/src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java @@ -239,6 +239,32 @@ public class ModBlocks { ) ); + public static final Block CRYSTAL_ENTROPY = registerBlock( + "crystal_entropy", + new TransparentBlock( + AbstractBlock.Settings.create() + .instrument(NoteBlockInstrument.HAT) + .strength(0.3F) + .sounds(BlockSoundGroup.GLASS) + .nonOpaque() + .allowsSpawning(Blocks::never) + .solidBlock(Blocks::never) + .suffocates(Blocks::never) + .blockVision(Blocks::never) + ) + ); + + public static final Block CRYSTAL_ENTROPY_PANE = registerBlock( + "crystal_entropy_pane", + new PaneBlock( + AbstractBlock.Settings.create() + .instrument(NoteBlockInstrument.HAT) + .strength(0.3F) + .sounds(BlockSoundGroup.GLASS) + .nonOpaque() + ) + ); + public static final Block TOBACCO_CROP = registerBlockWithoutItem("tobacco_crop", new TobaccoCrop( AbstractBlock.Settings.create() .mapColor(MapColor.DARK_GREEN) diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java index c4a9328..b620076 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java @@ -44,6 +44,9 @@ public class ModBlockTagProvider extends FabricTagProvider.BlockTagProvider { .add(ModBlocks.LEMONWOOD_FENCE_GATE); getOrCreateTagBuilder(BlockTags.WALLS) .add(ModBlocks.LEMONWOOD_WALL); + getOrCreateTagBuilder(BlockTags.IMPERMEABLE) + .add(ModBlocks.CRYSTAL_ENTROPY) + .add(ModBlocks.CRYSTAL_ENTROPY_PANE); getOrCreateTagBuilder(ModTags.Blocks.NEEDS_PRISMA_STEEL_TOOL); // Currently Broken // .addTag(BlockTags.NEEDS_IRON_TOOL); diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModLootTableProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModLootTableProvider.java index 8440a8e..fa547d2 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModLootTableProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModLootTableProvider.java @@ -58,6 +58,9 @@ public class ModLootTableProvider extends FabricBlockLootTableProvider { addDrop(ModBlocks.STABLE_ENTROPY_BLOCK); addDrop(ModBlocks.PRISMA_STEEL_BLOCK); + addDropWithSilkTouch(ModBlocks.CRYSTAL_ENTROPY); + addDropWithSilkTouch(ModBlocks.CRYSTAL_ENTROPY_PANE); + addDrop(ModBlocks.LEMONWOOD_LOG); addDrop(ModBlocks.STRIPPED_LEMONWOOD_LOG); diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java index 78723b9..ca96634 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java @@ -30,6 +30,9 @@ public class ModModelProvider extends FabricModelProvider { blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.STABLE_ENTROPY_BLOCK); blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.PRISMA_STEEL_BLOCK); +// blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.CRYSTAL_ENTROPY); + blockStateModelGenerator.registerGlassPane(ModBlocks.CRYSTAL_ENTROPY, ModBlocks.CRYSTAL_ENTROPY_PANE); + BlockStateModelGenerator.BlockTexturePool lizardPool = blockStateModelGenerator.registerCubeAllModelTexturePool(ModBlocks.LIZARD_PLANKS); lizardPool.button(ModBlocks.LIZARD_BUTTON); diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java index 50bdb9f..d831b58 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java @@ -38,7 +38,7 @@ public class ModRecipeProvider extends FabricRecipeProvider { offerAllFoodCookingRecipes(recipeExporter, 200, ModItems.LEMON, ModItems.COOKED_LEMON, 0.35F); - ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, ModItems.ORACLE_LEMON) + ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, ModItems.ORACLE_LEMON, 4) .pattern("###") .pattern("#L#") .pattern("###") @@ -47,6 +47,21 @@ public class ModRecipeProvider extends FabricRecipeProvider { .criterion(hasItem(ModItems.LEMON), conditionsFromItem(ModItems.LEMON)) .offerTo(recipeExporter); + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, ModBlocks.CRYSTAL_ENTROPY, 8) + .pattern("###") + .pattern("#S#") + .pattern("###") + .input('#', Blocks.GLASS) + .input('S', ModItems.STABLE_ENTROPY) + .criterion(hasItem(ModItems.STABLE_ENTROPY), conditionsFromItem(ModItems.STABLE_ENTROPY)) + .offerTo(recipeExporter, Identifier.of(AcesBS.MOD_ID, "crystal_entropy_from_stable_and_glass")); + + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, ModBlocks.CRYSTAL_ENTROPY_PANE, 16) + .pattern("###") + .pattern("###") + .input('#', ModBlocks.CRYSTAL_ENTROPY) + .criterion(hasItem(ModBlocks.CRYSTAL_ENTROPY), conditionsFromItem(ModBlocks.CRYSTAL_ENTROPY)) + .offerTo(recipeExporter); ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, ModBlocks.LIZARD_PLANKS, 4) .input(Blocks.BIRCH_PLANKS, 4) diff --git a/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java b/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java index e0845d2..5efb2c4 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java +++ b/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java @@ -66,6 +66,8 @@ public class ModItemGroups { entries.add(ModBlocks.LEMONWOOD_TRAPDOOR); entries.add(ModBlocks.EVIL_BLOCK); + entries.add(ModBlocks.CRYSTAL_ENTROPY); + entries.add(ModBlocks.CRYSTAL_ENTROPY_PANE); }) .build(); diff --git a/src/main/resources/assets/acesbs/lang/en_us.json b/src/main/resources/assets/acesbs/lang/en_us.json index 81bde91..77f00e5 100644 --- a/src/main/resources/assets/acesbs/lang/en_us.json +++ b/src/main/resources/assets/acesbs/lang/en_us.json @@ -117,6 +117,8 @@ "block.acesbs.lemonwood_trapdoor": "Lemonwood Trapdoor", "block.acesbs.evil_block": "Evil Block", + "block.acesbs.crystal_entropy": "Crystallized Entropy", + "block.acesbs.crystal_entropy_pane": "Crystallized Entropy Pane", "block.acesbs.tobacco_crop": "Tobacco Crop", diff --git a/src/main/resources/assets/acesbs/textures/block/crystal_entropy.png b/src/main/resources/assets/acesbs/textures/block/crystal_entropy.png new file mode 100644 index 0000000000000000000000000000000000000000..11d1dba0a19dc54f26bc85f69836eb3cf09dc704 GIT binary patch literal 2763 zcmbVO3s6&M7XEJ@Bq4wV0wS;QQZ5gzU{=w^Addh+tzJYbPIU!QD6`{>D9A$)LG(Hd zf=bnuA{X$rrOHDQMrYNksB8rkw@6Ei?Ak=9wrCI}McMO*TsPzF?CkE%oZSCE=iKjn z-}%p-WdHJyqb$uG%@IPDs_2MVxLacrn!&eBH<5^taNUMgs*Ng@FA{%iGPv z-_zNdoaf^|J3ua%%e?0=3=XpNv#Tn>-R=ks_F&4oDPN%%JI0ikBL zRHDFRt2A(TS+&qJtl_#{Z1<4YoTP09B6Itx4$~Z`&+sOFeC5BJJ1=Pdg764sWK^^& zW<}h}_)k_PtX`kIVPi__XKCr`?K?6ucV_J=EZSSVZ$Djr=&yOBE&eYV_ojQHy z?77CK=8KnFF1NPb`10q@`|SD4SGwWXBcpG| z^jH_x$zGGnKF}orT^t^d%M)N-1SbOvm+<)R0cJL#lpt}dtw-Q)p){CJ`7{Lz7H{ zLJdx&x1!1O{%@8WLpaPD=c<%i(sUiNhC5ppzN5+dWheb9rSzUT$>g)<*R7Q9H+U79 z4DDyD38TrAQ%-6b`c-EU4tC&7oUjis44z;csJY~~Eyh~hA0fL(&z5EHoLf-7#z@tK zrh!%?1f%z8?vc#Z@Lvj`BnOve0O)y0utE(?4!^a~y8`D@#*|n!Wc2DiKv{ITDLx6U z7;Ph&D_;*{Bm)``P#!A2*UzHKuWEGH7`AyaB-6UA>&Cw+II1U^i;8>n zJV1}2f7pm$hbd)R?)&WkBqryK{i+7w;+w7_NIsQ&*_ix3Yj};6S`(!yN+X%F4aZ65 z7y*T_3GN@Jl-sJRi=@;dKA7tSQcB}bcez3^KB|*-8$ueuKAy7*lXwD8WkvO2x2egL z-AcQjU6}^r1{pce;2|Hqg9#y{0>a3A*hNaMO&F@n0#=DeR+t%|2CjlmT&TET777h} zuxpnTy7HkJ8$|rl1C7aUF9Zr@14XQ!QK)}3XOU_B0gRdQ9h>qWNfR%IG3wr1Fp0hA zmC{(RA#;*xROFb9BOX`7NM2wE#Q4T24#51J86Ub2=jc=c^I*|gmCDdRg)Cawhu@{l zCeTSG(c~!#PQO+)*^xK6!N&76ZLU24M97SjW1Jd8u3>V9R>Mq|UIB837gJFTrPpg| zVDGUE2>N+yZm?5rd^Ht0;O!1xFE@y5&S06$}Bh zq{UGYXbtj2O;pV}8a$#c(Fy4YiEXhF==cc-a0=9_rAomwu`P!Pbo_JWbYM`UiU^Gh z>Nv7u;bLy6b#7~6q3*(k3wE5{aXy-0&5sGqsEPt;xYuWgK%l#h8g(+8`p z=7+d6)~rlci<~~vBz>=~j}zp##2omc^doKkgTVZ=_fC|E&lhXFG+S%hIb_*i>I2c0 zFG{}2Js0Pjdq7d|QG2!0&duq|ptHI*zhi^7_nThri=g8rR<7rJPtANQ$*yZf2PF~R z7fV!!bEbU`)EW+l0*vvBx7Uh-xc_k%zE5G#(cy*~^$=j4l{>`@&{+Tg literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/acesbs/textures/block/crystal_entropy_pane_top.png b/src/main/resources/assets/acesbs/textures/block/crystal_entropy_pane_top.png new file mode 100644 index 0000000000000000000000000000000000000000..9b95a0e36355b844a7287ef304ee20eddf34d2f5 GIT binary patch literal 2198 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4(FKU{6Yo@J#dc)MDTOiZL+o0Wl}T zKL!>CMj#7>85kjK5QhALwE*lbC6v_svV`PGu(*|TSLD_de z8i0TU4FBKw|A0Zj%gxgbXc5SAAo2e;gEIpM8yhvcDq>wPb zh^&;noUD|LjDm`ux`L99vW$#|xu%YRp^1r!yt<{Wg^`V(v567L5JpZ;P9AO^30__a zBSjfSBa*@Y0}O&3AU82HDlsq#GBOJ?{y)MX4|FFhBN#xu0`e#`3o9Et2PYRdP{CFK z24F}rGqEtUva+xMWov=*3@n1ILW+itY{G$w>`H|qMvW5}awt1(JSZA;@q>zSQc)8p zmzcPOq?D?fx`w8fiK&^ng{76Vi>sTvho@I?NN8AiL}XNQN@`kqMrKxVNoiSmMP*fU zOKV$uM`zch$y26In?7UatVN5LEM2yI#mZHiHgDOwZTpU$yAB;ba`f2o6DLnyx_ss8 zwd*%--g@}x@sp>|p1*kc>f@)+U%r0({^RE_kiS6wgaL@p(EKF`^cNEg3o{El$X|?1 zval)|vI#i`vL_Y_D;YI%h&WALxbYyTvT@J{(WIh_Tw*FF4^=;cyax6eaUN?T z%V%(pA^dfVfrpt97eBA{;Dp0MTn+(=^DhTG=F(A-K!@|wG8T0`wh;h2jDbYV z{3=Uh(Qf{V4?qg&pC>>=N%jyZ0A2%K0Mjx{5H6h#9|p6$y-aequ6EU(fkzFBWyZ zv^xO`FjDcaNx)Q-{MZQ;^@G5eDxhnMpMYI60~qx$>~@gqA&`1%r5Y(v8ZPVX`VbVpxD28NCO+4nJa0`PlBg3pY5H=O_LtnkOo{?g{y&m|LOGr;jv*GO zlM@awuPb}^w|;B!`}&%!84?;S6}&(GeO6CpE7-Kz*hNQE;eO?=UAz95mX>OAGoL-W z@=0~$gtR8MKfk}V8!>D2xvA-i-P+yIddc8G_JOlseom=QtjmDto}AC1cw16JLV`hV Xr!>FF#L(G5dl@`k{an^LB{Ts5_dwQ| literal 0 HcmV?d00001