From e8b1d8cc55cf40b143f45bd8d0ee9e622c045ef6 Mon Sep 17 00:00:00 2001 From: Vos Date: Tue, 18 Nov 2025 21:49:08 -0600 Subject: [PATCH] Ashes and Endtropy --- .../blockstates/infernal_ashes_block.json | 7 ++++ .../models/block/infernal_ashes_block.json | 6 ++++ .../models/item/infernal_ashes_block.json | 3 ++ .../acesbs/models/item/raw_endtropy.json | 6 ++++ .../acesbs/models/item/stable_endtropy.json | 6 ++++ .../building_blocks/infernal_ashes.json | 32 ++++++++++++++++++ .../decorations/infernal_ashes_block.json | 32 ++++++++++++++++++ ..._endtropy_from_blasting_endtropy_ore.json} | 4 +-- ...e_endtropy_from_blasting_raw_endtropy.json | 32 ++++++++++++++++++ .../blocks/infernal_ashes_block.json | 20 +++++++++++ .../data/acesbs/recipe/infernal_ashes.json | 13 +++++++ .../acesbs/recipe/infernal_ashes_block.json | 18 ++++++++++ ..._endtropy_from_blasting_endtropy_ore.json} | 4 +-- ...e_endtropy_from_blasting_raw_endtropy.json | 13 +++++++ .../minecraft/tags/block/mineable/shovel.json | 5 +++ .../acesbs/block/ModBlocks.java | 17 ++++++++++ .../acesbs/datagen/ModBlockTagProvider.java | 2 ++ .../acesbs/datagen/ModLootTableProvider.java | 1 + .../acesbs/datagen/ModModelProvider.java | 5 ++- .../acesbs/datagen/ModRecipeProvider.java | 9 ++++- .../acesbs/item/ModItemGroups.java | 19 ++++++----- .../acethewildfire/acesbs/item/ModItems.java | 2 ++ .../resources/assets/acesbs/lang/en_us.json | 3 ++ .../textures/block/infernal_ashes_block.png | Bin 0 -> 2952 bytes .../acesbs/textures/item/raw_endtropy.png | Bin 0 -> 2457 bytes .../acesbs/textures/item/stable_endtropy.png | Bin 0 -> 2417 bytes 26 files changed, 245 insertions(+), 14 deletions(-) create mode 100644 src/main/generated/assets/acesbs/blockstates/infernal_ashes_block.json create mode 100644 src/main/generated/assets/acesbs/models/block/infernal_ashes_block.json create mode 100644 src/main/generated/assets/acesbs/models/item/infernal_ashes_block.json create mode 100644 src/main/generated/assets/acesbs/models/item/raw_endtropy.json create mode 100644 src/main/generated/assets/acesbs/models/item/stable_endtropy.json create mode 100644 src/main/generated/data/acesbs/advancement/recipes/building_blocks/infernal_ashes.json create mode 100644 src/main/generated/data/acesbs/advancement/recipes/decorations/infernal_ashes_block.json rename src/main/generated/data/acesbs/advancement/recipes/misc/{stable_entropy_from_blasting_endtropy_ore.json => stable_endtropy_from_blasting_endtropy_ore.json} (79%) create mode 100644 src/main/generated/data/acesbs/advancement/recipes/misc/stable_endtropy_from_blasting_raw_endtropy.json create mode 100644 src/main/generated/data/acesbs/loot_table/blocks/infernal_ashes_block.json create mode 100644 src/main/generated/data/acesbs/recipe/infernal_ashes.json create mode 100644 src/main/generated/data/acesbs/recipe/infernal_ashes_block.json rename src/main/generated/data/acesbs/recipe/{stable_entropy_from_blasting_endtropy_ore.json => stable_endtropy_from_blasting_endtropy_ore.json} (73%) create mode 100644 src/main/generated/data/acesbs/recipe/stable_endtropy_from_blasting_raw_endtropy.json create mode 100644 src/main/generated/data/minecraft/tags/block/mineable/shovel.json create mode 100644 src/main/resources/assets/acesbs/textures/block/infernal_ashes_block.png create mode 100644 src/main/resources/assets/acesbs/textures/item/raw_endtropy.png create mode 100644 src/main/resources/assets/acesbs/textures/item/stable_endtropy.png diff --git a/src/main/generated/assets/acesbs/blockstates/infernal_ashes_block.json b/src/main/generated/assets/acesbs/blockstates/infernal_ashes_block.json new file mode 100644 index 0000000..55c91fa --- /dev/null +++ b/src/main/generated/assets/acesbs/blockstates/infernal_ashes_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "acesbs:block/infernal_ashes_block" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/infernal_ashes_block.json b/src/main/generated/assets/acesbs/models/block/infernal_ashes_block.json new file mode 100644 index 0000000..01d8992 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/infernal_ashes_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "acesbs:block/infernal_ashes_block" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/infernal_ashes_block.json b/src/main/generated/assets/acesbs/models/item/infernal_ashes_block.json new file mode 100644 index 0000000..ec736bb --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/infernal_ashes_block.json @@ -0,0 +1,3 @@ +{ + "parent": "acesbs:block/infernal_ashes_block" +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/raw_endtropy.json b/src/main/generated/assets/acesbs/models/item/raw_endtropy.json new file mode 100644 index 0000000..f38a354 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/raw_endtropy.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/raw_endtropy" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/stable_endtropy.json b/src/main/generated/assets/acesbs/models/item/stable_endtropy.json new file mode 100644 index 0000000..d0a3736 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/stable_endtropy.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/stable_endtropy" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/building_blocks/infernal_ashes.json b/src/main/generated/data/acesbs/advancement/recipes/building_blocks/infernal_ashes.json new file mode 100644 index 0000000..9a9ce5d --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/building_blocks/infernal_ashes.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_infernal_ashes_block": { + "conditions": { + "items": [ + { + "items": "acesbs:infernal_ashes_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:infernal_ashes" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_infernal_ashes_block" + ] + ], + "rewards": { + "recipes": [ + "acesbs:infernal_ashes" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/decorations/infernal_ashes_block.json b/src/main/generated/data/acesbs/advancement/recipes/decorations/infernal_ashes_block.json new file mode 100644 index 0000000..74facd3 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/decorations/infernal_ashes_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_infernal_ashes": { + "conditions": { + "items": [ + { + "items": "acesbs:infernal_ashes" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:infernal_ashes_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_infernal_ashes" + ] + ], + "rewards": { + "recipes": [ + "acesbs:infernal_ashes_block" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/misc/stable_entropy_from_blasting_endtropy_ore.json b/src/main/generated/data/acesbs/advancement/recipes/misc/stable_endtropy_from_blasting_endtropy_ore.json similarity index 79% rename from src/main/generated/data/acesbs/advancement/recipes/misc/stable_entropy_from_blasting_endtropy_ore.json rename to src/main/generated/data/acesbs/advancement/recipes/misc/stable_endtropy_from_blasting_endtropy_ore.json index f7f7d7a..c9931c6 100644 --- a/src/main/generated/data/acesbs/advancement/recipes/misc/stable_entropy_from_blasting_endtropy_ore.json +++ b/src/main/generated/data/acesbs/advancement/recipes/misc/stable_endtropy_from_blasting_endtropy_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "acesbs:stable_entropy_from_blasting_endtropy_ore" + "recipe": "acesbs:stable_endtropy_from_blasting_endtropy_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "acesbs:stable_entropy_from_blasting_endtropy_ore" + "acesbs:stable_endtropy_from_blasting_endtropy_ore" ] } } \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/misc/stable_endtropy_from_blasting_raw_endtropy.json b/src/main/generated/data/acesbs/advancement/recipes/misc/stable_endtropy_from_blasting_raw_endtropy.json new file mode 100644 index 0000000..5d29ca1 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/misc/stable_endtropy_from_blasting_raw_endtropy.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_raw_endtropy": { + "conditions": { + "items": [ + { + "items": "acesbs:raw_endtropy" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:stable_endtropy_from_blasting_raw_endtropy" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_raw_endtropy" + ] + ], + "rewards": { + "recipes": [ + "acesbs:stable_endtropy_from_blasting_raw_endtropy" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/loot_table/blocks/infernal_ashes_block.json b/src/main/generated/data/acesbs/loot_table/blocks/infernal_ashes_block.json new file mode 100644 index 0000000..39e30be --- /dev/null +++ b/src/main/generated/data/acesbs/loot_table/blocks/infernal_ashes_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "acesbs:infernal_ashes_block" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/infernal_ashes.json b/src/main/generated/data/acesbs/recipe/infernal_ashes.json new file mode 100644 index 0000000..48865d2 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/infernal_ashes.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "acesbs:infernal_ashes_block" + } + ], + "result": { + "count": 9, + "id": "acesbs:infernal_ashes" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/infernal_ashes_block.json b/src/main/generated/data/acesbs/recipe/infernal_ashes_block.json new file mode 100644 index 0000000..0dedcef --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/infernal_ashes_block.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "acesbs:infernal_ashes" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "count": 1, + "id": "acesbs:infernal_ashes_block" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/stable_entropy_from_blasting_endtropy_ore.json b/src/main/generated/data/acesbs/recipe/stable_endtropy_from_blasting_endtropy_ore.json similarity index 73% rename from src/main/generated/data/acesbs/recipe/stable_entropy_from_blasting_endtropy_ore.json rename to src/main/generated/data/acesbs/recipe/stable_endtropy_from_blasting_endtropy_ore.json index 2ddbd55..eaa0849 100644 --- a/src/main/generated/data/acesbs/recipe/stable_entropy_from_blasting_endtropy_ore.json +++ b/src/main/generated/data/acesbs/recipe/stable_endtropy_from_blasting_endtropy_ore.json @@ -3,11 +3,11 @@ "category": "misc", "cookingtime": 2000, "experience": 0.5, - "group": "stable_entropy", + "group": "stable_endtropy", "ingredient": { "item": "acesbs:endtropy_ore" }, "result": { - "id": "acesbs:stable_entropy" + "id": "acesbs:stable_endtropy" } } \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/stable_endtropy_from_blasting_raw_endtropy.json b/src/main/generated/data/acesbs/recipe/stable_endtropy_from_blasting_raw_endtropy.json new file mode 100644 index 0000000..95aa3d8 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/stable_endtropy_from_blasting_raw_endtropy.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:blasting", + "category": "misc", + "cookingtime": 2000, + "experience": 0.5, + "group": "stable_endtropy", + "ingredient": { + "item": "acesbs:raw_endtropy" + }, + "result": { + "id": "acesbs:stable_endtropy" + } +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/block/mineable/shovel.json b/src/main/generated/data/minecraft/tags/block/mineable/shovel.json new file mode 100644 index 0000000..f38efc0 --- /dev/null +++ b/src/main/generated/data/minecraft/tags/block/mineable/shovel.json @@ -0,0 +1,5 @@ +{ + "values": [ + "acesbs:infernal_ashes_block" + ] +} \ 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 6ed3638..3764027 100644 --- a/src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java +++ b/src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java @@ -7,6 +7,7 @@ import com.acethewildfire.acesbs.block.custom.StableEntropyBlock; import com.acethewildfire.acesbs.block.custom.TobaccoCrop; import com.acethewildfire.acesbs.sounds.ModSounds; import com.acethewildfire.acesbs.world.tree.ModBlockSaplingGenerator; +import com.mojang.serialization.MapCodec; import net.minecraft.block.*; import net.minecraft.block.enums.NoteBlockInstrument; import net.minecraft.block.piston.PistonBehavior; @@ -239,6 +240,22 @@ public class ModBlocks { ) ); + public static final Block INFERNAL_ASHES_BLOCK = registerBlock( + "infernal_ashes_block", + new FallingBlock( + AbstractBlock.Settings.create() + .mapColor(MapColor.LIGHT_GRAY) + .instrument(NoteBlockInstrument.SNARE) + .strength(0.5F) + .sounds(BlockSoundGroup.SAND) + ) { + @Override + protected MapCodec getCodec() { + return null; + } + } + ); + public static final Block CRYSTAL_ENTROPY = registerBlock( "crystal_entropy", new TransparentBlock( diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java index b620076..287a34d 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java @@ -38,6 +38,8 @@ public class ModBlockTagProvider extends FabricTagProvider.BlockTagProvider { .add(ModBlocks.LEMONWOOD_WALL) .add(ModBlocks.LEMONWOOD_FENCE) .add(ModBlocks.LEMONWOOD_FENCE_GATE); + getOrCreateTagBuilder(BlockTags.SHOVEL_MINEABLE) + .add(ModBlocks.INFERNAL_ASHES_BLOCK); getOrCreateTagBuilder(BlockTags.WOODEN_FENCES) .add(ModBlocks.LEMONWOOD_FENCE); getOrCreateTagBuilder(BlockTags.FENCE_GATES) diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModLootTableProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModLootTableProvider.java index fa547d2..071b7d3 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModLootTableProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModLootTableProvider.java @@ -55,6 +55,7 @@ public class ModLootTableProvider extends FabricBlockLootTableProvider { @Override public void generate() { addDrop(ModBlocks.ENTROPY_BLOCK); + addDrop(ModBlocks.INFERNAL_ASHES_BLOCK); addDrop(ModBlocks.STABLE_ENTROPY_BLOCK); addDrop(ModBlocks.PRISMA_STEEL_BLOCK); diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java index ca96634..00656cb 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java @@ -29,6 +29,7 @@ public class ModModelProvider extends FabricModelProvider { // Has a complex texture, use the default blockbench method. blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.STABLE_ENTROPY_BLOCK); blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.PRISMA_STEEL_BLOCK); + blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.INFERNAL_ASHES_BLOCK); // blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.CRYSTAL_ENTROPY); blockStateModelGenerator.registerGlassPane(ModBlocks.CRYSTAL_ENTROPY, ModBlocks.CRYSTAL_ENTROPY_PANE); @@ -73,9 +74,11 @@ public class ModModelProvider extends FabricModelProvider { itemModelGenerator.register(ModItems.LEMON, Models.GENERATED); itemModelGenerator.register(ModItems.TOBACCO, Models.GENERATED); itemModelGenerator.register(ModItems.RAW_ENTROPY, Models.GENERATED); + itemModelGenerator.register(ModItems.STABLE_ENTROPY, Models.GENERATED); + itemModelGenerator.register(ModItems.RAW_ENDTROPY, Models.GENERATED); + itemModelGenerator.register(ModItems.STABLE_ENDTROPY, Models.GENERATED); itemModelGenerator.register(ModItems.ORACLE_LEMON, Models.GENERATED); itemModelGenerator.register(ModItems.GREEN_BRICKS, Models.GENERATED); - itemModelGenerator.register(ModItems.STABLE_ENTROPY, Models.GENERATED); itemModelGenerator.register(ModItems.INFERNAL_ASHES, Models.GENERATED); // itemModelGenerator.register(ModItems.WAND, Models.HANDHELD_ROD); itemModelGenerator.register(ModItems.PRISMA_STEEL, Models.GENERATED); diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java index d831b58..e31b443 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java @@ -28,13 +28,20 @@ public class ModRecipeProvider extends FabricRecipeProvider { @Override public void generate(RecipeExporter recipeExporter) { - List ENTROPY_SMELTABLES = List.of(ModItems.RAW_ENTROPY, ModBlocks.ENTROPY_ORE, ModBlocks.DEEPSLATE_ENTROPY_ORE, ModBlocks.ENDTROPY_ORE); + List ENTROPY_SMELTABLES = List.of(ModItems.RAW_ENTROPY, ModBlocks.ENTROPY_ORE, ModBlocks.DEEPSLATE_ENTROPY_ORE); + List ENDTROPY_SMELTABLES = List.of(ModItems.RAW_ENDTROPY, ModBlocks.ENDTROPY_ORE); offerBlasting(recipeExporter, ENTROPY_SMELTABLES, RecipeCategory.MISC, ModItems.STABLE_ENTROPY, 0.5f, 2000, "stable_entropy"); + offerBlasting(recipeExporter, ENDTROPY_SMELTABLES, RecipeCategory.MISC, ModItems.STABLE_ENDTROPY, 0.5f, 2000, "stable_endtropy"); offerReversibleCompactingRecipes(recipeExporter, RecipeCategory.BUILDING_BLOCKS, ModItems.RAW_ENTROPY, RecipeCategory.DECORATIONS, ModBlocks.ENTROPY_BLOCK); offerReversibleCompactingRecipes(recipeExporter, RecipeCategory.BUILDING_BLOCKS, ModItems.STABLE_ENTROPY, RecipeCategory.DECORATIONS, ModBlocks.STABLE_ENTROPY_BLOCK); + // ENDTROPY BLOCKS + // offerReversibleCompactingRecipes(recipeExporter, RecipeCategory.BUILDING_BLOCKS, ModItems.RAW_ENTROPY, RecipeCategory.DECORATIONS, ModBlocks.ENDTROPY_BLOCK); + // offerReversibleCompactingRecipes(recipeExporter, RecipeCategory.BUILDING_BLOCKS, ModItems.STABLE_ENTROPY, RecipeCategory.DECORATIONS, ModBlocks.STABLE_ENDTROPY_BLOCK); offerReversibleCompactingRecipes(recipeExporter, RecipeCategory.BUILDING_BLOCKS, ModItems.PRISMA_STEEL, RecipeCategory.DECORATIONS, ModBlocks.PRISMA_STEEL_BLOCK); + offerReversibleCompactingRecipes(recipeExporter, RecipeCategory.BUILDING_BLOCKS, ModItems.INFERNAL_ASHES, RecipeCategory.DECORATIONS, ModBlocks.INFERNAL_ASHES_BLOCK); + offerAllFoodCookingRecipes(recipeExporter, 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 5efb2c4..a0197ea 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java +++ b/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java @@ -16,15 +16,16 @@ public class ModItemGroups { .icon(() -> new ItemStack(ModItems.RAW_ENTROPY)) .displayName(Text.translatable("itemgroup.acesbs.2_items")) .entries((displayContext, entries) -> { - entries.add(ModItems.LEMON); - entries.add(ModItems.COOKED_LEMON); - entries.add(ModItems.ORACLE_LEMON); entries.add(ModItems.RAW_ENTROPY); entries.add(ModItems.STABLE_ENTROPY); entries.add(ModItems.INFERNAL_ASHES); - entries.add(ModItems.GREEN_BRICKS); + entries.add(ModItems.RAW_ENDTROPY); + entries.add(ModItems.STABLE_ENDTROPY); entries.add(ModItems.PRISMA_STEEL); - entries.add(ModItems.PRISMA_SMITHING_TEMPLATE); + entries.add(ModItems.LEMON); + entries.add(ModItems.COOKED_LEMON); + entries.add(ModItems.ORACLE_LEMON); + entries.add(ModItems.GREEN_BRICKS); entries.add(ModItems.CRAB_RAVE_MUSIC_DISC); entries.add(ModItems.TOBACCO_SEEDS); entries.add(ModItems.TOBACCO); @@ -39,10 +40,12 @@ public class ModItemGroups { .entries((displayContext, entries) -> { entries.add(ModBlocks.ENTROPY_ORE); entries.add(ModBlocks.DEEPSLATE_ENTROPY_ORE); - entries.add(ModBlocks.INFERNAL_ASHES_ORE); - entries.add(ModBlocks.ENDTROPY_ORE); entries.add(ModBlocks.ENTROPY_BLOCK); entries.add(ModBlocks.STABLE_ENTROPY_BLOCK); + entries.add(ModBlocks.INFERNAL_ASHES_ORE); + entries.add(ModBlocks.INFERNAL_ASHES_BLOCK); + entries.add(ModBlocks.ENDTROPY_ORE); + entries.add(ModBlocks.PRISMA_STEEL_BLOCK); entries.add(ModBlocks.LIZARD_PLANKS); @@ -77,13 +80,13 @@ public class ModItemGroups { .icon(() -> new ItemStack(ModItems.PRISMA_STEEL_SWORD)) .displayName(Text.translatable("itemgroup.acesbs.4_combat")) .entries((displayContext, entries) -> { - entries.add(ModItems.PRISMA_STEEL); entries.add(ModItems.PRISMA_STEEL_SWORD); entries.add(ModItems.PRISMA_STEEL_AXE); entries.add(ModItems.PRISMA_STEEL_HELMET); entries.add(ModItems.PRISMA_STEEL_CHESTPLATE); entries.add(ModItems.PRISMA_STEEL_LEGGINGS); entries.add(ModItems.PRISMA_STEEL_BOOTS); + entries.add(ModItems.PRISMA_SMITHING_TEMPLATE); entries.add(ModItems.KAUPEN_BOW); entries.add(ModItems.BERSERKERS_PAULDRON); diff --git a/src/main/java/com/acethewildfire/acesbs/item/ModItems.java b/src/main/java/com/acethewildfire/acesbs/item/ModItems.java index 0603227..00608a9 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/ModItems.java +++ b/src/main/java/com/acethewildfire/acesbs/item/ModItems.java @@ -37,6 +37,8 @@ public class ModItems { public static final Item WAND = registerItem("wand", new Wand(new Item.Settings().maxDamage(32))); public static final Item RAW_ENTROPY = registerItem("raw_entropy", new Item(new Item.Settings())); public static final Item STABLE_ENTROPY = registerItem("stable_entropy", new Item(new Item.Settings())); + public static final Item RAW_ENDTROPY = registerItem("raw_endtropy", new Item(new Item.Settings())); + public static final Item STABLE_ENDTROPY = registerItem("stable_endtropy", new Item(new Item.Settings())); public static final Item INFERNAL_ASHES = registerItem("infernal_ashes", new Item(new Item.Settings())); public static final Item LEMON = registerItem("lemon", new Item(new Item.Settings().food(ModFoodComponent.LEMON))); public static final Item COOKED_LEMON = registerItem("cooked_lemon", new Item(new Item.Settings().food(ModFoodComponent.COOKED_LEMON))); diff --git a/src/main/resources/assets/acesbs/lang/en_us.json b/src/main/resources/assets/acesbs/lang/en_us.json index 77f00e5..771b3a5 100644 --- a/src/main/resources/assets/acesbs/lang/en_us.json +++ b/src/main/resources/assets/acesbs/lang/en_us.json @@ -3,6 +3,8 @@ "item.acesbs.raw_entropy": "Raw Entropy", "item.acesbs.stable_entropy": "Stabilized Entropy", "item.acesbs.infernal_ashes": "Infernal Ashes", + "item.acesbs.raw_endtropy": "Raw Endtropy", + "item.acesbs.stable_endtropy": "Stabilized Endtropy", "item.acesbs.lemon": "Odd Lemon", "item.acesbs.cooked_lemon": "Cooked Odd Lemon", "item.acesbs.green_bricks": "Green Bricks", @@ -88,6 +90,7 @@ "trim_pattern.acesbs.prisma": "Prisma Armor Pattern", "block.acesbs.entropy_block": "Block of Raw Entropy", + "block.acesbs.infernal_ashes_block": "Block of Infernal Ashes", "block.acesbs.prisma_steel_block": "Block of Prisma Steel", "block.acesbs.entropy_ore": "Entropic Ore", "block.acesbs.deepslate_entropy_ore": "Deepslate Entropic Ore", diff --git a/src/main/resources/assets/acesbs/textures/block/infernal_ashes_block.png b/src/main/resources/assets/acesbs/textures/block/infernal_ashes_block.png new file mode 100644 index 0000000000000000000000000000000000000000..be7ce0b063352c1f484f651985c6621fc41b409b GIT binary patch literal 2952 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/acesbs/textures/item/stable_endtropy.png b/src/main/resources/assets/acesbs/textures/item/stable_endtropy.png new file mode 100644 index 0000000000000000000000000000000000000000..4fdd8e1283e1eedd042f98009cd7abf1b887962e GIT binary patch literal 2417 zcmd5-X;4#F6uvLpOGpBQ1PPQKfhR>LkRY3u0tpbe@lh9av?YK-ZJl8WQW#qiB4S!A z)}_Kg2OloTCpA72)uUanSqAujk3G6(R`7-As|EE)(K zx9J6DVlyx%VnR3@zyzDlrR#D`Z0lz>orf{T>*RsWcxLAD#1;|L(p@lM8Y!1%lneidvh$VuPVlr4vHk-wQ=*JL8ED_tv#V3>_CN;Qgio|#A z=AB%(u&PGu==S>)<#DMwJhKTlQd>KB4^Lu}m%?wVe?VYRxKb4n8Ks`_&b;{x7RD@E z9G|dkd1BK0E7G*-t1>>y%*xfR%UhqnLI1^;t=qPLxudX%D%-Vt&))KV71cF|j~qQ# zTUXz7^3>@w%`L5GJ1$L@jry{EJ4-JYBFIa2qLJujjzM? z#k=PHdg9=$0W*TiHX>j#K^;G-+ozH&SXOw6R3*qLJ%L^UW~!d3+#;{1^lx4a&H*BV zB7&-t8SBuqUpb}k>?SBZdRPHfa|_xa*=3!Ce4G6Tys?#3X$wm(OUQQ%yR#0!r1qSw zk}NEZOVyI954Fa8`)v|(Nh0q`yUMyV!!aE)3Q}!f#quR~pFL$Z-3&-Zia}U&V3?lR zA2FZOdqqe{71F{UT8CzLC}-Q0ewb9Pa%e6gRo1ud^U@{cA_1+yh;ERu>ze^k_NeWa z2b7s5TtQGr{e8f5s%L5vDE@`k9(We6qfJ}}>7@gKUIbO!CO!a*Lj%+3LwCL{hZkBj zD#={z88~+&wYg>Van7LR_9N5@KUt*dLqR$2P_EP%Z;Lm43 zK(6~SiPHZRyeSCYXbBYb6I8Vn2p|(+b--6$_#Lq5D|zV%8%?y~uXVOY8tt$h>G&xW zu1sGCoicvwT+?00JAiJBzv}{H-!daWtWpA3oi!PHtL_SI8j(qNU1$rvOav7LO(tI| z#$VV%JAyi5X-eo%M{Yd&|9TEFbRjBN+5|t)SXy*s7}nM5y#^Mn#L(HH2vu$3k80Sk zc8-sVo{dnJ2mD>@5E=njb}vHdGKBhL5enLYkWF%NJvj{moVb~hO0*QYp&GKRLJuBZ za@3+Ug!p0_7%D23f)m%OXRGi&zL+Vt2!4F-0=RxwD?{f6oQsc@CN<>G3{yr7hWHxJ zZ#frpxw@xATE02k_3N)RjfU^vyCGjadS55n%U3374JQ?E4Gp2wi2Vth10!#K;s`0w zG~V4`8n7}i?dn#kV{sjBbKQ_+ky}>GACP5tjrH7Oa_~gYyc72-Wvj=x|^zcFZ?-cRBAyOl*@oR#Rvh+vu4&`q;Lk1M{{&#FkDq z#Mkx=+T_iOMI+~OF8G-{ ZB6Oi5cFl