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 0000000..be7ce0b Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/block/infernal_ashes_block.png differ diff --git a/src/main/resources/assets/acesbs/textures/item/raw_endtropy.png b/src/main/resources/assets/acesbs/textures/item/raw_endtropy.png new file mode 100644 index 0000000..11bc282 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/item/raw_endtropy.png differ 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 0000000..4fdd8e1 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/item/stable_endtropy.png differ