From d387457a96ae2dbc8f7d114bd9b505dfead551fa Mon Sep 17 00:00:00 2001 From: Neko Date: Thu, 14 Jul 2022 03:18:05 +0100 Subject: [PATCH 1/5] Soul Slate -> Polished Soul Stone --- .../infernalexp/init/IEBlocks.java | 32 ++++---- .../charged_chiseled_soul_slate_bricks.json | 6 +- .../chiseled_soul_slate_bricks.json | 6 +- .../cracked_soul_slate_bricks.json | 2 +- .../infernalexp/blockstates/soul_slate.json | 2 +- .../blockstates/soul_slate_brick_slab.json | 6 +- .../blockstates/soul_slate_brick_stairs.json | 80 +++++++++---------- .../soul_slate_brick_vertical_slab.json | 10 +-- .../blockstates/soul_slate_brick_wall.json | 18 ++--- .../blockstates/soul_slate_bricks.json | 2 +- .../blockstates/soul_slate_button.json | 48 +++++------ .../soul_slate_pressure_plate.json | 4 +- .../blockstates/soul_slate_slab.json | 6 +- .../blockstates/soul_slate_stairs.json | 80 +++++++++---------- .../blockstates/soul_slate_vertical_slab.json | 10 +-- .../assets/infernalexp/lang/de_de.json | 30 +++---- .../assets/infernalexp/lang/en_us.json | 30 +++---- .../assets/infernalexp/lang/es_ar.json | 30 +++---- .../assets/infernalexp/lang/es_es.json | 30 +++---- .../assets/infernalexp/lang/fr_ca.json | 30 +++---- .../assets/infernalexp/lang/fr_fr.json | 30 +++---- .../assets/infernalexp/lang/he_il.json | 30 +++---- .../assets/infernalexp/lang/id_id.json | 30 +++---- .../assets/infernalexp/lang/ja_jp.json | 30 +++---- .../assets/infernalexp/lang/lol_us.json | 30 +++---- .../assets/infernalexp/lang/lv_lv.json | 30 +++---- .../assets/infernalexp/lang/ms_my.json | 30 +++---- .../assets/infernalexp/lang/nl_nl.json | 30 +++---- .../assets/infernalexp/lang/pl_pl.json | 30 +++---- .../assets/infernalexp/lang/pt_br.json | 30 +++---- .../assets/infernalexp/lang/ro_ro.json | 30 +++---- .../assets/infernalexp/lang/ru_ru.json | 30 +++---- .../assets/infernalexp/lang/zh_tw.json | 30 +++---- .../charged_chiseled_soul_slate_bricks.json | 4 +- .../block/chiseled_soul_slate_bricks.json | 4 +- .../block/cracked_soul_slate_bricks.json | 2 +- .../infernalexp/models/block/soul_slate.json | 2 +- .../models/block/soul_slate_brick_slab.json | 6 +- .../block/soul_slate_brick_slab_top.json | 6 +- .../models/block/soul_slate_brick_stairs.json | 6 +- .../block/soul_slate_brick_stairs_inner.json | 6 +- .../block/soul_slate_brick_stairs_outer.json | 6 +- .../block/soul_slate_brick_vertical_slab.json | 6 +- .../soul_slate_brick_wall_inventory.json | 2 +- .../block/soul_slate_brick_wall_post.json | 2 +- .../block/soul_slate_brick_wall_side.json | 2 +- .../soul_slate_brick_wall_side_tall.json | 2 +- .../models/block/soul_slate_bricks.json | 2 +- .../models/block/soul_slate_button.json | 2 +- .../block/soul_slate_button_inventory.json | 2 +- .../block/soul_slate_button_pressed.json | 2 +- .../block/soul_slate_pressure_plate.json | 2 +- .../block/soul_slate_pressure_plate_down.json | 2 +- .../models/block/soul_slate_slab.json | 6 +- .../models/block/soul_slate_slab_top.json | 6 +- .../models/block/soul_slate_stairs.json | 6 +- .../models/block/soul_slate_stairs_inner.json | 6 +- .../models/block/soul_slate_stairs_outer.json | 6 +- .../block/soul_slate_vertical_slab.json | 6 +- .../charged_chiseled_soul_slate_bricks.json | 2 +- .../item/chiseled_soul_slate_bricks.json | 2 +- .../item/cracked_soul_slate_bricks.json | 2 +- .../infernalexp/models/item/soul_slate.json | 2 +- .../models/item/soul_slate_brick_slab.json | 2 +- .../models/item/soul_slate_brick_stairs.json | 2 +- .../item/soul_slate_brick_vertical_slab.json | 2 +- .../models/item/soul_slate_brick_wall.json | 2 +- .../models/item/soul_slate_bricks.json | 2 +- .../models/item/soul_slate_button.json | 2 +- .../item/soul_slate_pressure_plate.json | 2 +- .../models/item/soul_slate_slab.json | 2 +- .../models/item/soul_slate_stairs.json | 2 +- .../models/item/soul_slate_vertical_slab.json | 2 +- ...n.json => polished_soul_stone_button.json} | 10 +-- ...> polished_soul_stone_pressure_plate.json} | 10 +-- ...d_chiseled_polished_soul_stone_bricks.json | 19 +++++ .../chiseled_polished_soul_stone_bricks.json | 19 +++++ .../cracked_polished_soul_stone_bricks.json | 19 +++++ ...e_button.json => polished_soul_stone.json} | 2 +- .../polished_soul_stone_brick_slab.json | 19 +++++ .../polished_soul_stone_brick_stairs.json | 19 +++++ ...ished_soul_stone_brick_vertical_slab.json} | 2 +- .../polished_soul_stone_brick_wall.json | 19 +++++ ...s.json => polished_soul_stone_bricks.json} | 2 +- ...s.json => polished_soul_stone_button.json} | 2 +- .../polished_soul_stone_pressure_plate.json | 19 +++++ ...ate.json => polished_soul_stone_slab.json} | 2 +- ...s.json => polished_soul_stone_stairs.json} | 2 +- ...=> polished_soul_stone_vertical_slab.json} | 2 +- .../blocks/soul_slate_brick_slab.json | 19 ----- .../blocks/soul_slate_brick_stairs.json | 19 ----- .../blocks/soul_slate_brick_wall.json | 19 ----- .../loot_tables/blocks/soul_slate_bricks.json | 19 ----- .../blocks/soul_slate_pressure_plate.json | 19 ----- .../loot_tables/blocks/soul_slate_slab.json | 19 ----- .../loot_tables/blocks/soul_slate_stairs.json | 19 ----- ..._chiseled_polished_soul_stone_bricks.json} | 4 +- ... chiseled_polished_soul_stone_bricks.json} | 4 +- ...ished_soul_stone_brick_vertical_slab.json} | 4 +- ...s.json => polished_soul_stone_bricks.json} | 4 +- ...n => polished_soul_stone_bricks_slab.json} | 4 +- ...=> polished_soul_stone_bricks_stairs.json} | 4 +- ...n => polished_soul_stone_bricks_wall.json} | 4 +- ...> polished_soul_stone_pressure_plate.json} | 4 +- ...lab.json => polished_soul_stone_slab.json} | 4 +- ...s.json => polished_soul_stone_stairs.json} | 4 +- ...=> polished_soul_stone_vertical_slab.json} | 4 +- .../polished_soul_stone_brick_slab.json | 11 +++ .../polished_soul_stone_button.json | 11 +++ .../polished_soul_stone_slab.json | 11 +++ .../soul_slate_brick_slab.json | 11 --- .../crafting_shapeless/soul_slate_button.json | 11 --- .../crafting_shapeless/soul_slate_slab.json | 11 --- .../cracked_polished_soul_stone_bricks.json | 9 +++ .../smelting/cracked_soul_slate_bricks.json | 9 --- ...ul_slate.json => polished_soul_stone.json} | 2 +- ..._stone_brick_from_polished_soul_stone.json | 8 ++ ...brick_from_polished_soul_stone_bricks.json | 8 ++ ...hed_soul_stone_brick_from_soul_stone.json} | 2 +- ...eled_soul_slate_brick_from_soul_slate.json | 8 -- ...ul_slate_brick_from_soul_slate_bricks.json | 8 -- ...e_brick_wall_from_polished_soul_stone.json | 8 ++ ..._wall_from_polished_soul_stone_bricks.json | 8 ++ .../polished_soul_stone_bricks.json | 8 ++ ..._bricks_slab_from_polished_soul_stone.json | 8 ++ ..._slab_from_polished_soul_stone_bricks.json | 8 ++ ...ricks_stairs_from_polished_soul_stone.json | 8 ++ ...tairs_from_polished_soul_stone_bricks.json | 8 ++ ...rtical_slab_from_polished_soul_stone.json} | 4 +- ...slab_from_polished_soul_stone_bricks.json} | 4 +- .../polished_soul_stone_slab.json | 8 ++ .../polished_soul_stone_stairs.json | 8 ++ ...=> polished_soul_stone_vertical_slab.json} | 4 +- ...soul_slate_brick_wall_from_soul_slate.json | 8 -- ...ate_brick_wall_from_soul_slate_bricks.json | 8 -- .../stonecutting/soul_slate_bricks.json | 8 -- ...oul_slate_bricks_slab_from_soul_slate.json | 8 -- ...te_bricks_slab_from_soul_slate_bricks.json | 8 -- ...l_slate_bricks_stairs_from_soul_slate.json | 8 -- ..._bricks_stairs_from_soul_slate_bricks.json | 8 -- .../recipes/stonecutting/soul_slate_slab.json | 8 -- .../stonecutting/soul_slate_stairs.json | 8 -- .../data/minecraft/tags/blocks/buttons.json | 2 +- .../data/minecraft/tags/blocks/slabs.json | 4 +- .../tags/blocks/soul_fire_base_blocks.json | 20 ++--- .../tags/blocks/soul_speed_blocks.json | 20 ++--- .../data/minecraft/tags/blocks/stairs.json | 4 +- .../tags/blocks/stone_pressure_plates.json | 2 +- .../data/minecraft/tags/blocks/walls.json | 2 +- .../data/minecraft/tags/items/buttons.json | 2 +- .../data/minecraft/tags/items/slabs.json | 4 +- .../data/minecraft/tags/items/stairs.json | 4 +- .../data/minecraft/tags/items/walls.json | 2 +- .../data/quark/tags/blocks/vertical_slab.json | 4 +- .../data/quark/tags/items/vertical_slab.json | 4 +- 155 files changed, 839 insertions(+), 839 deletions(-) rename src/main/resources/data/infernalexp/advancements/recipes/redstone/{soul_slate_button.json => polished_soul_stone_button.json} (59%) rename src/main/resources/data/infernalexp/advancements/recipes/redstone/{soul_slate_pressure_plate.json => polished_soul_stone_pressure_plate.json} (58%) create mode 100644 src/main/resources/data/infernalexp/loot_tables/blocks/charged_chiseled_polished_soul_stone_bricks.json create mode 100644 src/main/resources/data/infernalexp/loot_tables/blocks/chiseled_polished_soul_stone_bricks.json create mode 100644 src/main/resources/data/infernalexp/loot_tables/blocks/cracked_polished_soul_stone_bricks.json rename src/main/resources/data/infernalexp/loot_tables/blocks/{soul_slate_button.json => polished_soul_stone.json} (83%) create mode 100644 src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_brick_slab.json create mode 100644 src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_brick_stairs.json rename src/main/resources/data/infernalexp/loot_tables/blocks/{soul_slate_vertical_slab.json => polished_soul_stone_brick_vertical_slab.json} (78%) create mode 100644 src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_brick_wall.json rename src/main/resources/data/infernalexp/loot_tables/blocks/{cracked_soul_slate_bricks.json => polished_soul_stone_bricks.json} (81%) rename src/main/resources/data/infernalexp/loot_tables/blocks/{charged_chiseled_soul_slate_bricks.json => polished_soul_stone_button.json} (81%) create mode 100644 src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_pressure_plate.json rename src/main/resources/data/infernalexp/loot_tables/blocks/{soul_slate.json => polished_soul_stone_slab.json} (82%) rename src/main/resources/data/infernalexp/loot_tables/blocks/{chiseled_soul_slate_bricks.json => polished_soul_stone_stairs.json} (81%) rename src/main/resources/data/infernalexp/loot_tables/blocks/{soul_slate_brick_vertical_slab.json => polished_soul_stone_vertical_slab.json} (80%) delete mode 100644 src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_brick_slab.json delete mode 100644 src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_brick_stairs.json delete mode 100644 src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_brick_wall.json delete mode 100644 src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_bricks.json delete mode 100644 src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_pressure_plate.json delete mode 100644 src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_slab.json delete mode 100644 src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_stairs.json rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{charged_chiseled_soul_slate_bricks.json => charged_chiseled_polished_soul_stone_bricks.json} (62%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{chiseled_soul_slate_bricks.json => chiseled_polished_soul_stone_bricks.json} (55%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{soul_slate_vertical_slab.json => polished_soul_stone_brick_vertical_slab.json} (67%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{soul_slate_bricks.json => polished_soul_stone_bricks.json} (59%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{soul_slate_slab.json => polished_soul_stone_bricks_slab.json} (55%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{soul_slate_bricks_stairs.json => polished_soul_stone_bricks_stairs.json} (58%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{soul_slate_bricks_wall.json => polished_soul_stone_bricks_wall.json} (57%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{soul_slate_pressure_plate.json => polished_soul_stone_pressure_plate.json} (53%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{soul_slate_bricks_slab.json => polished_soul_stone_slab.json} (58%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{soul_slate_stairs.json => polished_soul_stone_stairs.json} (61%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{soul_slate_brick_vertical_slab.json => polished_soul_stone_vertical_slab.json} (69%) create mode 100644 src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/polished_soul_stone_brick_slab.json create mode 100644 src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/polished_soul_stone_button.json create mode 100644 src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/polished_soul_stone_slab.json delete mode 100644 src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/soul_slate_brick_slab.json delete mode 100644 src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/soul_slate_button.json delete mode 100644 src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/soul_slate_slab.json create mode 100644 src/main/resources/data/infernalexp/recipes/smelting/cracked_polished_soul_stone_bricks.json delete mode 100644 src/main/resources/data/infernalexp/recipes/smelting/cracked_soul_slate_bricks.json rename src/main/resources/data/infernalexp/recipes/smelting/{soul_slate.json => polished_soul_stone.json} (74%) create mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_polished_soul_stone_brick_from_polished_soul_stone.json create mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_polished_soul_stone_brick_from_polished_soul_stone_bricks.json rename src/main/resources/data/infernalexp/recipes/stonecutting/{chiseled_soul_stone_brick_from_soul_stone.json => chiseled_polished_soul_stone_brick_from_soul_stone.json} (64%) delete mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_soul_slate_brick_from_soul_slate.json delete mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_soul_slate_brick_from_soul_slate_bricks.json create mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_brick_wall_from_polished_soul_stone.json create mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_brick_wall_from_polished_soul_stone_bricks.json create mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks.json create mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks_slab_from_polished_soul_stone.json create mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks_slab_from_polished_soul_stone_bricks.json create mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks_stairs_from_polished_soul_stone.json create mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks_stairs_from_polished_soul_stone_bricks.json rename src/main/resources/data/infernalexp/recipes/stonecutting/{soul_slate_vertical_slab.json => polished_soul_stone_bricks_vertical_slab_from_polished_soul_stone.json} (61%) rename src/main/resources/data/infernalexp/recipes/stonecutting/{soul_slate_bricks_vertical_slab_from_soul_slate_bricks.json => polished_soul_stone_bricks_vertical_slab_from_polished_soul_stone_bricks.json} (60%) create mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_slab.json create mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_stairs.json rename src/main/resources/data/infernalexp/recipes/stonecutting/{soul_slate_bricks_vertical_slab_from_soul_slate.json => polished_soul_stone_vertical_slab.json} (62%) delete mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_brick_wall_from_soul_slate.json delete mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_brick_wall_from_soul_slate_bricks.json delete mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks.json delete mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks_slab_from_soul_slate.json delete mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks_slab_from_soul_slate_bricks.json delete mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks_stairs_from_soul_slate.json delete mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks_stairs_from_soul_slate_bricks.json delete mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_slab.json delete mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_stairs.json diff --git a/src/main/java/org/infernalstudios/infernalexp/init/IEBlocks.java b/src/main/java/org/infernalstudios/infernalexp/init/IEBlocks.java index e7f757538..da5e4a6f3 100644 --- a/src/main/java/org/infernalstudios/infernalexp/init/IEBlocks.java +++ b/src/main/java/org/infernalstudios/infernalexp/init/IEBlocks.java @@ -213,12 +213,12 @@ public class IEBlocks { public static final RegistryObject SOUL_STONE_STAIRS = registerBlockWithDefaultItem("soul_stone_stairs", () -> new StairsBlock(Blocks.COBBLESTONE::getDefaultState, getProperties(Blocks.SOUL_SOIL))); public static final RegistryObject SOUL_STONE_WALL = registerBlockWithDefaultItem("soul_stone_wall", () -> new WallBlock(getProperties(Blocks.COBBLESTONE_WALL))); - public static final RegistryObject SOUL_SLATE = registerBlockWithDefaultItem("soul_slate", () -> new Block(getProperties(Blocks.STONE_BRICKS).sound(IESoundEvents.SOUL_STONE_TYPE))); - public static final RegistryObject SOUL_SLATE_SLAB = registerBlockWithDefaultItem("soul_slate_slab", () -> new SlabBlock(getProperties(SOUL_SLATE.get()))); - public static final RegistryObject SOUL_SLATE_VERTICAL_SLAB = registerBlockWithDefaultItemConditioned("soul_slate_vertical_slab", () -> new VerticalSlabBlock(getProperties(SOUL_SLATE.get())), "quark"); - public static final RegistryObject SOUL_SLATE_STAIRS = registerBlockWithDefaultItem("soul_slate_stairs", () -> new StairsBlock(() -> SOUL_SLATE.get().getDefaultState(), getProperties(SOUL_SLATE.get()))); - public static final RegistryObject SOUL_SLATE_BUTTON = registerBlockWithDefaultItem("soul_slate_button", () -> new StoneButtonBlock(getProperties(SOUL_SLATE.get()))); - public static final RegistryObject SOUL_SLATE_PRESSURE_PLATE = registerBlockWithDefaultItem("soul_slate_pressure_plate", () -> new LightUpPressurePlateBlock(PressurePlateBlock.Sensitivity.MOBS, getProperties(SOUL_SLATE.get()).setLightLevel(getLightValueLit(15)))); + public static final RegistryObject POLISHED_SOUL_STONE = registerBlockWithDefaultItem("polished_soul_stone", () -> new Block(getProperties(Blocks.STONE_BRICKS).sound(IESoundEvents.SOUL_STONE_TYPE))); + public static final RegistryObject POLISHED_SOUL_STONE_SLAB = registerBlockWithDefaultItem("polished_soul_stone_slab", () -> new SlabBlock(getProperties(POLISHED_SOUL_STONE.get()))); + public static final RegistryObject POLISHED_SOUL_STONE_VERTICAL_SLAB = registerBlockWithDefaultItemConditioned("polished_soul_stone_vertical_slab", () -> new VerticalSlabBlock(getProperties(POLISHED_SOUL_STONE.get())), "quark"); + public static final RegistryObject POLISHED_SOUL_STONE_STAIRS = registerBlockWithDefaultItem("polished_soul_stone_stairs", () -> new StairsBlock(() -> POLISHED_SOUL_STONE.get().getDefaultState(), getProperties(POLISHED_SOUL_STONE.get()))); + public static final RegistryObject POLISHED_SOUL_STONE_BUTTON = registerBlockWithDefaultItem("polished_soul_stone_button", () -> new StoneButtonBlock(getProperties(POLISHED_SOUL_STONE.get()))); + public static final RegistryObject POLISHED_SOUL_STONE_PRESSURE_PLATE = registerBlockWithDefaultItem("polished_soul_stone_pressure_plate", () -> new LightUpPressurePlateBlock(PressurePlateBlock.Sensitivity.MOBS, getProperties(POLISHED_SOUL_STONE.get()).setLightLevel(getLightValueLit(15)))); public static final RegistryObject SOUL_STONE_BRICKS = registerBlockWithDefaultItem("soul_stone_bricks", () -> new Block(getProperties(SOUL_STONE.get()))); public static final RegistryObject SOUL_STONE_BRICK_SLAB = registerBlockWithDefaultItem("soul_stone_brick_slab", () -> new SlabBlock(getProperties(SOUL_STONE_BRICKS.get()))); @@ -227,16 +227,16 @@ public class IEBlocks { public static final RegistryObject SOUL_STONE_BRICK_WALL = registerBlockWithDefaultItem("soul_stone_brick_wall", () -> new WallBlock(getProperties(SOUL_STONE_BRICKS.get()))); public static final RegistryObject CRACKED_SOUL_STONE_BRICKS = registerBlockWithDefaultItem("cracked_soul_stone_bricks", () -> new Block(getProperties(SOUL_STONE.get()))); public static final RegistryObject CHISELED_SOUL_STONE_BRICKS = registerBlockWithDefaultItem("chiseled_soul_stone_bricks", () -> new RotatedPillarBlock(getProperties(SOUL_STONE.get()))); - public static final RegistryObject CHARGED_CHISELED_SOUL_STONE_BRICKS = registerBlockWithDefaultItem("charged_chiseled_soul_stone_bricks", () -> new RotatedPillarBlock(getProperties(SOUL_SLATE.get()))); - - public static final RegistryObject SOUL_SLATE_BRICKS = registerBlockWithDefaultItem("soul_slate_bricks", () -> new Block(getProperties(SOUL_SLATE.get()))); - public static final RegistryObject SOUL_SLATE_BRICK_SLAB = registerBlockWithDefaultItem("soul_slate_brick_slab", () -> new SlabBlock(getProperties(SOUL_SLATE_BRICKS.get()))); - public static final RegistryObject SOUL_SLATE_BRICK_VERTICAL_SLAB = registerBlockWithDefaultItemConditioned("soul_slate_brick_vertical_slab", () -> new VerticalSlabBlock(getProperties(SOUL_SLATE_BRICKS.get())), "quark"); - public static final RegistryObject SOUL_SLATE_BRICK_STAIRS = registerBlockWithDefaultItem("soul_slate_brick_stairs", () -> new StairsBlock(() -> SOUL_SLATE_BRICKS.get().getDefaultState(), getProperties(SOUL_SLATE_BRICKS.get()))); - public static final RegistryObject SOUL_SLATE_BRICK_WALL = registerBlockWithDefaultItem("soul_slate_brick_wall", () -> new WallBlock(getProperties(SOUL_SLATE_BRICKS.get()))); - public static final RegistryObject CRACKED_SOUL_SLATE_BRICKS = registerBlockWithDefaultItem("cracked_soul_slate_bricks", () -> new Block(getProperties(SOUL_SLATE.get()))); - public static final RegistryObject CHISELED_SOUL_SLATE_BRICKS = registerBlockWithDefaultItem("chiseled_soul_slate_bricks", () -> new RotatedPillarBlock(getProperties(SOUL_SLATE.get()))); - public static final RegistryObject CHARGED_CHISELED_SOUL_SLATE_BRICKS = registerBlockWithDefaultItem("charged_chiseled_soul_slate_bricks", () -> new RotatedPillarBlock(getProperties(SOUL_SLATE.get()))); + public static final RegistryObject CHARGED_CHISELED_SOUL_STONE_BRICKS = registerBlockWithDefaultItem("charged_chiseled_soul_stone_bricks", () -> new RotatedPillarBlock(getProperties(POLISHED_SOUL_STONE.get()))); + + public static final RegistryObject POLISHED_SOUL_STONE_BRICKS = registerBlockWithDefaultItem("polished_soul_stone_bricks", () -> new Block(getProperties(POLISHED_SOUL_STONE.get()))); + public static final RegistryObject POLISHED_SOUL_STONE_BRICK_SLAB = registerBlockWithDefaultItem("polished_soul_stone_brick_slab", () -> new SlabBlock(getProperties(POLISHED_SOUL_STONE_BRICKS.get()))); + public static final RegistryObject POLISHED_SOUL_STONE_BRICK_VERTICAL_SLAB = registerBlockWithDefaultItemConditioned("polished_soul_stone_brick_vertical_slab", () -> new VerticalSlabBlock(getProperties(POLISHED_SOUL_STONE_BRICKS.get())), "quark"); + public static final RegistryObject POLISHED_SOUL_STONE_BRICK_STAIRS = registerBlockWithDefaultItem("polished_soul_stone_brick_stairs", () -> new StairsBlock(() -> POLISHED_SOUL_STONE_BRICKS.get().getDefaultState(), getProperties(POLISHED_SOUL_STONE_BRICKS.get()))); + public static final RegistryObject POLISHED_SOUL_STONE_BRICK_WALL = registerBlockWithDefaultItem("polished_soul_stone_brick_wall", () -> new WallBlock(getProperties(POLISHED_SOUL_STONE_BRICKS.get()))); + public static final RegistryObject CRACKED_POLISHED_SOUL_STONE_BRICKS = registerBlockWithDefaultItem("cracked_polished_soul_stone_bricks", () -> new Block(getProperties(POLISHED_SOUL_STONE.get()))); + public static final RegistryObject CHISELED_POLISHED_SOUL_STONE_BRICKS = registerBlockWithDefaultItem("chiseled_polished_soul_stone_bricks", () -> new RotatedPillarBlock(getProperties(POLISHED_SOUL_STONE.get()))); + public static final RegistryObject CHARGED_CHISELED_POLISHED_SOUL_STONE_BRICKS = registerBlockWithDefaultItem("charged_chiseled_polished_soul_stone_bricks", () -> new RotatedPillarBlock(getProperties(POLISHED_SOUL_STONE.get()))); public static final RegistryObject CRIMSON_FUNGUS_CAP = registerBlockWithDefaultItem("crimson_fungus_cap", () -> new FungusCapBlock(AbstractBlock.Properties.from(Blocks.NETHER_WART_BLOCK))); public static final RegistryObject WARPED_FUNGUS_CAP = registerBlockWithDefaultItem("warped_fungus_cap", () -> new FungusCapBlock(AbstractBlock.Properties.from(Blocks.WARPED_WART_BLOCK))); diff --git a/src/main/resources/assets/infernalexp/blockstates/charged_chiseled_soul_slate_bricks.json b/src/main/resources/assets/infernalexp/blockstates/charged_chiseled_soul_slate_bricks.json index fb45abbe4..88f8e0c44 100644 --- a/src/main/resources/assets/infernalexp/blockstates/charged_chiseled_soul_slate_bricks.json +++ b/src/main/resources/assets/infernalexp/blockstates/charged_chiseled_soul_slate_bricks.json @@ -1,15 +1,15 @@ { "variants": { "axis=x": { - "model": "infernalexp:block/charged_chiseled_soul_slate_bricks", + "model": "infernalexp:block/charged_chiseled_polished_soul_stone_bricks", "x": 90, "y": 90 }, "axis=y": { - "model": "infernalexp:block/charged_chiseled_soul_slate_bricks" + "model": "infernalexp:block/charged_chiseled_polished_soul_stone_bricks" }, "axis=z": { - "model": "infernalexp:block/charged_chiseled_soul_slate_bricks", + "model": "infernalexp:block/charged_chiseled_polished_soul_stone_bricks", "x": 90 } } diff --git a/src/main/resources/assets/infernalexp/blockstates/chiseled_soul_slate_bricks.json b/src/main/resources/assets/infernalexp/blockstates/chiseled_soul_slate_bricks.json index df8bb2a52..7a201063a 100644 --- a/src/main/resources/assets/infernalexp/blockstates/chiseled_soul_slate_bricks.json +++ b/src/main/resources/assets/infernalexp/blockstates/chiseled_soul_slate_bricks.json @@ -1,15 +1,15 @@ { "variants": { "axis=x": { - "model": "infernalexp:block/chiseled_soul_slate_bricks", + "model": "infernalexp:block/chiseled_polished_soul_stone_bricks", "x": 90, "y": 90 }, "axis=y": { - "model": "infernalexp:block/chiseled_soul_slate_bricks" + "model": "infernalexp:block/chiseled_polished_soul_stone_bricks" }, "axis=z": { - "model": "infernalexp:block/chiseled_soul_slate_bricks", + "model": "infernalexp:block/chiseled_polished_soul_stone_bricks", "x": 90 } } diff --git a/src/main/resources/assets/infernalexp/blockstates/cracked_soul_slate_bricks.json b/src/main/resources/assets/infernalexp/blockstates/cracked_soul_slate_bricks.json index f4acccf7f..40ec5fe18 100644 --- a/src/main/resources/assets/infernalexp/blockstates/cracked_soul_slate_bricks.json +++ b/src/main/resources/assets/infernalexp/blockstates/cracked_soul_slate_bricks.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "infernalexp:block/cracked_soul_slate_bricks" + "model": "infernalexp:block/cracked_polished_soul_stone_bricks" } } } diff --git a/src/main/resources/assets/infernalexp/blockstates/soul_slate.json b/src/main/resources/assets/infernalexp/blockstates/soul_slate.json index 70c377a60..78c033f03 100644 --- a/src/main/resources/assets/infernalexp/blockstates/soul_slate.json +++ b/src/main/resources/assets/infernalexp/blockstates/soul_slate.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "infernalexp:block/soul_slate" + "model": "infernalexp:block/polished_soul_stone" } } } diff --git a/src/main/resources/assets/infernalexp/blockstates/soul_slate_brick_slab.json b/src/main/resources/assets/infernalexp/blockstates/soul_slate_brick_slab.json index 683a2f0fe..bb8f35e3f 100644 --- a/src/main/resources/assets/infernalexp/blockstates/soul_slate_brick_slab.json +++ b/src/main/resources/assets/infernalexp/blockstates/soul_slate_brick_slab.json @@ -1,13 +1,13 @@ { "variants": { "type=bottom": { - "model": "infernalexp:block/soul_slate_brick_slab" + "model": "infernalexp:block/polished_soul_stone_brick_slab" }, "type=double": { - "model": "infernalexp:block/soul_slate_bricks" + "model": "infernalexp:block/polished_soul_stone_bricks" }, "type=top": { - "model": "infernalexp:block/soul_slate_brick_slab_top" + "model": "infernalexp:block/polished_soul_stone_brick_slab_top" } } } diff --git a/src/main/resources/assets/infernalexp/blockstates/soul_slate_brick_stairs.json b/src/main/resources/assets/infernalexp/blockstates/soul_slate_brick_stairs.json index 997df5e58..643d5bd62 100644 --- a/src/main/resources/assets/infernalexp/blockstates/soul_slate_brick_stairs.json +++ b/src/main/resources/assets/infernalexp/blockstates/soul_slate_brick_stairs.json @@ -1,206 +1,206 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "infernalexp:block/soul_slate_brick_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_inner", "y": 270, "uvlock": true }, "facing=east,half=bottom,shape=inner_right": { - "model": "infernalexp:block/soul_slate_brick_stairs_inner" + "model": "infernalexp:block/polished_soul_stone_brick_stairs_inner" }, "facing=east,half=bottom,shape=outer_left": { - "model": "infernalexp:block/soul_slate_brick_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_outer", "y": 270, "uvlock": true }, "facing=east,half=bottom,shape=outer_right": { - "model": "infernalexp:block/soul_slate_brick_stairs_outer" + "model": "infernalexp:block/polished_soul_stone_brick_stairs_outer" }, "facing=east,half=bottom,shape=straight": { - "model": "infernalexp:block/soul_slate_brick_stairs" + "model": "infernalexp:block/polished_soul_stone_brick_stairs" }, "facing=east,half=top,shape=inner_left": { - "model": "infernalexp:block/soul_slate_brick_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_inner", "x": 180, "uvlock": true }, "facing=east,half=top,shape=inner_right": { - "model": "infernalexp:block/soul_slate_brick_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_inner", "x": 180, "y": 90, "uvlock": true }, "facing=east,half=top,shape=outer_left": { - "model": "infernalexp:block/soul_slate_brick_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_outer", "x": 180, "uvlock": true }, "facing=east,half=top,shape=outer_right": { - "model": "infernalexp:block/soul_slate_brick_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_outer", "x": 180, "y": 90, "uvlock": true }, "facing=east,half=top,shape=straight": { - "model": "infernalexp:block/soul_slate_brick_stairs", + "model": "infernalexp:block/polished_soul_stone_brick_stairs", "x": 180, "uvlock": true }, "facing=north,half=bottom,shape=inner_left": { - "model": "infernalexp:block/soul_slate_brick_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_inner", "y": 180, "uvlock": true }, "facing=north,half=bottom,shape=inner_right": { - "model": "infernalexp:block/soul_slate_brick_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_inner", "y": 270, "uvlock": true }, "facing=north,half=bottom,shape=outer_left": { - "model": "infernalexp:block/soul_slate_brick_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_outer", "y": 180, "uvlock": true }, "facing=north,half=bottom,shape=outer_right": { - "model": "infernalexp:block/soul_slate_brick_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_outer", "y": 270, "uvlock": true }, "facing=north,half=bottom,shape=straight": { - "model": "infernalexp:block/soul_slate_brick_stairs", + "model": "infernalexp:block/polished_soul_stone_brick_stairs", "y": 270, "uvlock": true }, "facing=north,half=top,shape=inner_left": { - "model": "infernalexp:block/soul_slate_brick_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_inner", "x": 180, "y": 270, "uvlock": true }, "facing=north,half=top,shape=inner_right": { - "model": "infernalexp:block/soul_slate_brick_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_inner", "x": 180, "uvlock": true }, "facing=north,half=top,shape=outer_left": { - "model": "infernalexp:block/soul_slate_brick_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_outer", "x": 180, "y": 270, "uvlock": true }, "facing=north,half=top,shape=outer_right": { - "model": "infernalexp:block/soul_slate_brick_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_outer", "x": 180, "uvlock": true }, "facing=north,half=top,shape=straight": { - "model": "infernalexp:block/soul_slate_brick_stairs", + "model": "infernalexp:block/polished_soul_stone_brick_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=bottom,shape=inner_left": { - "model": "infernalexp:block/soul_slate_brick_stairs_inner" + "model": "infernalexp:block/polished_soul_stone_brick_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { - "model": "infernalexp:block/soul_slate_brick_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_inner", "y": 90, "uvlock": true }, "facing=south,half=bottom,shape=outer_left": { - "model": "infernalexp:block/soul_slate_brick_stairs_outer" + "model": "infernalexp:block/polished_soul_stone_brick_stairs_outer" }, "facing=south,half=bottom,shape=outer_right": { - "model": "infernalexp:block/soul_slate_brick_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_outer", "y": 90, "uvlock": true }, "facing=south,half=bottom,shape=straight": { - "model": "infernalexp:block/soul_slate_brick_stairs", + "model": "infernalexp:block/polished_soul_stone_brick_stairs", "y": 90, "uvlock": true }, "facing=south,half=top,shape=inner_left": { - "model": "infernalexp:block/soul_slate_brick_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_inner", "x": 180, "y": 90, "uvlock": true }, "facing=south,half=top,shape=inner_right": { - "model": "infernalexp:block/soul_slate_brick_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_inner", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=outer_left": { - "model": "infernalexp:block/soul_slate_brick_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_outer", "x": 180, "y": 90, "uvlock": true }, "facing=south,half=top,shape=outer_right": { - "model": "infernalexp:block/soul_slate_brick_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_outer", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { - "model": "infernalexp:block/soul_slate_brick_stairs", + "model": "infernalexp:block/polished_soul_stone_brick_stairs", "x": 180, "y": 90, "uvlock": true }, "facing=west,half=bottom,shape=inner_left": { - "model": "infernalexp:block/soul_slate_brick_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_inner", "y": 90, "uvlock": true }, "facing=west,half=bottom,shape=inner_right": { - "model": "infernalexp:block/soul_slate_brick_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_inner", "y": 180, "uvlock": true }, "facing=west,half=bottom,shape=outer_left": { - "model": "infernalexp:block/soul_slate_brick_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_outer", "y": 90, "uvlock": true }, "facing=west,half=bottom,shape=outer_right": { - "model": "infernalexp:block/soul_slate_brick_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_outer", "y": 180, "uvlock": true }, "facing=west,half=bottom,shape=straight": { - "model": "infernalexp:block/soul_slate_brick_stairs", + "model": "infernalexp:block/polished_soul_stone_brick_stairs", "y": 180, "uvlock": true }, "facing=west,half=top,shape=inner_left": { - "model": "infernalexp:block/soul_slate_brick_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_inner", "x": 180, "y": 180, "uvlock": true }, "facing=west,half=top,shape=inner_right": { - "model": "infernalexp:block/soul_slate_brick_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_inner", "x": 180, "y": 270, "uvlock": true }, "facing=west,half=top,shape=outer_left": { - "model": "infernalexp:block/soul_slate_brick_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_outer", "x": 180, "y": 180, "uvlock": true }, "facing=west,half=top,shape=outer_right": { - "model": "infernalexp:block/soul_slate_brick_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_brick_stairs_outer", "x": 180, "y": 270, "uvlock": true }, "facing=west,half=top,shape=straight": { - "model": "infernalexp:block/soul_slate_brick_stairs", + "model": "infernalexp:block/polished_soul_stone_brick_stairs", "x": 180, "y": 180, "uvlock": true diff --git a/src/main/resources/assets/infernalexp/blockstates/soul_slate_brick_vertical_slab.json b/src/main/resources/assets/infernalexp/blockstates/soul_slate_brick_vertical_slab.json index ee9f23f7d..76237d8bf 100644 --- a/src/main/resources/assets/infernalexp/blockstates/soul_slate_brick_vertical_slab.json +++ b/src/main/resources/assets/infernalexp/blockstates/soul_slate_brick_vertical_slab.json @@ -1,27 +1,27 @@ { "variants": { "type=north": { - "model": "infernalexp:block/soul_slate_brick_vertical_slab", + "model": "infernalexp:block/polished_soul_stone_brick_vertical_slab", "y": 0, "uvlock": true }, "type=south": { - "model": "infernalexp:block/soul_slate_brick_vertical_slab", + "model": "infernalexp:block/polished_soul_stone_brick_vertical_slab", "y": 180, "uvlock": true }, "type=east": { - "model": "infernalexp:block/soul_slate_brick_vertical_slab", + "model": "infernalexp:block/polished_soul_stone_brick_vertical_slab", "y": 90, "uvlock": true }, "type=west": { - "model": "infernalexp:block/soul_slate_brick_vertical_slab", + "model": "infernalexp:block/polished_soul_stone_brick_vertical_slab", "y": 270, "uvlock": true }, "type=double": { - "model": "infernalexp:block/soul_slate_bricks" + "model": "infernalexp:block/polished_soul_stone_bricks" } } } diff --git a/src/main/resources/assets/infernalexp/blockstates/soul_slate_brick_wall.json b/src/main/resources/assets/infernalexp/blockstates/soul_slate_brick_wall.json index 528e3d97a..6b737cf2d 100644 --- a/src/main/resources/assets/infernalexp/blockstates/soul_slate_brick_wall.json +++ b/src/main/resources/assets/infernalexp/blockstates/soul_slate_brick_wall.json @@ -5,7 +5,7 @@ "up": "true" }, "apply": { - "model": "infernalexp:block/soul_slate_brick_wall_post" + "model": "infernalexp:block/polished_soul_stone_brick_wall_post" } }, { @@ -13,7 +13,7 @@ "north": "low" }, "apply": { - "model": "infernalexp:block/soul_slate_brick_wall_side", + "model": "infernalexp:block/polished_soul_stone_brick_wall_side", "uvlock": true } }, @@ -22,7 +22,7 @@ "east": "low" }, "apply": { - "model": "infernalexp:block/soul_slate_brick_wall_side", + "model": "infernalexp:block/polished_soul_stone_brick_wall_side", "y": 90, "uvlock": true } @@ -32,7 +32,7 @@ "south": "low" }, "apply": { - "model": "infernalexp:block/soul_slate_brick_wall_side", + "model": "infernalexp:block/polished_soul_stone_brick_wall_side", "y": 180, "uvlock": true } @@ -42,7 +42,7 @@ "west": "low" }, "apply": { - "model": "infernalexp:block/soul_slate_brick_wall_side", + "model": "infernalexp:block/polished_soul_stone_brick_wall_side", "y": 270, "uvlock": true } @@ -52,7 +52,7 @@ "north": "tall" }, "apply": { - "model": "infernalexp:block/soul_slate_brick_wall_side_tall", + "model": "infernalexp:block/polished_soul_stone_brick_wall_side_tall", "uvlock": true } }, @@ -61,7 +61,7 @@ "east": "tall" }, "apply": { - "model": "infernalexp:block/soul_slate_brick_wall_side_tall", + "model": "infernalexp:block/polished_soul_stone_brick_wall_side_tall", "y": 90, "uvlock": true } @@ -71,7 +71,7 @@ "south": "tall" }, "apply": { - "model": "infernalexp:block/soul_slate_brick_wall_side_tall", + "model": "infernalexp:block/polished_soul_stone_brick_wall_side_tall", "y": 180, "uvlock": true } @@ -81,7 +81,7 @@ "west": "tall" }, "apply": { - "model": "infernalexp:block/soul_slate_brick_wall_side_tall", + "model": "infernalexp:block/polished_soul_stone_brick_wall_side_tall", "y": 270, "uvlock": true } diff --git a/src/main/resources/assets/infernalexp/blockstates/soul_slate_bricks.json b/src/main/resources/assets/infernalexp/blockstates/soul_slate_bricks.json index 66d656bdc..e7ddf4bbf 100644 --- a/src/main/resources/assets/infernalexp/blockstates/soul_slate_bricks.json +++ b/src/main/resources/assets/infernalexp/blockstates/soul_slate_bricks.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "infernalexp:block/soul_slate_bricks" + "model": "infernalexp:block/polished_soul_stone_bricks" } } } diff --git a/src/main/resources/assets/infernalexp/blockstates/soul_slate_button.json b/src/main/resources/assets/infernalexp/blockstates/soul_slate_button.json index 5d645b741..676a9dcb1 100644 --- a/src/main/resources/assets/infernalexp/blockstates/soul_slate_button.json +++ b/src/main/resources/assets/infernalexp/blockstates/soul_slate_button.json @@ -1,115 +1,115 @@ { "variants": { "face=ceiling,facing=east,powered=false": { - "model": "infernalexp:block/soul_slate_button", + "model": "infernalexp:block/polished_soul_stone_button", "y": 270, "x": 180 }, "face=ceiling,facing=east,powered=true": { - "model": "infernalexp:block/soul_slate_button_pressed", + "model": "infernalexp:block/polished_soul_stone_button_pressed", "y": 270, "x": 180 }, "face=ceiling,facing=north,powered=false": { - "model": "infernalexp:block/soul_slate_button", + "model": "infernalexp:block/polished_soul_stone_button", "y": 180, "x": 180 }, "face=ceiling,facing=north,powered=true": { - "model": "infernalexp:block/soul_slate_button_pressed", + "model": "infernalexp:block/polished_soul_stone_button_pressed", "y": 180, "x": 180 }, "face=ceiling,facing=south,powered=false": { - "model": "infernalexp:block/soul_slate_button", + "model": "infernalexp:block/polished_soul_stone_button", "x": 180 }, "face=ceiling,facing=south,powered=true": { - "model": "infernalexp:block/soul_slate_button_pressed", + "model": "infernalexp:block/polished_soul_stone_button_pressed", "x": 180 }, "face=ceiling,facing=west,powered=false": { - "model": "infernalexp:block/soul_slate_button", + "model": "infernalexp:block/polished_soul_stone_button", "y": 90, "x": 180 }, "face=ceiling,facing=west,powered=true": { - "model": "infernalexp:block/soul_slate_button_pressed", + "model": "infernalexp:block/polished_soul_stone_button_pressed", "y": 90, "x": 180 }, "face=floor,facing=east,powered=false": { - "model": "infernalexp:block/soul_slate_button", + "model": "infernalexp:block/polished_soul_stone_button", "y": 90 }, "face=floor,facing=east,powered=true": { - "model": "infernalexp:block/soul_slate_button_pressed", + "model": "infernalexp:block/polished_soul_stone_button_pressed", "y": 90 }, "face=floor,facing=north,powered=false": { - "model": "infernalexp:block/soul_slate_button" + "model": "infernalexp:block/polished_soul_stone_button" }, "face=floor,facing=north,powered=true": { - "model": "infernalexp:block/soul_slate_button_pressed" + "model": "infernalexp:block/polished_soul_stone_button_pressed" }, "face=floor,facing=south,powered=false": { - "model": "infernalexp:block/soul_slate_button", + "model": "infernalexp:block/polished_soul_stone_button", "y": 180 }, "face=floor,facing=south,powered=true": { - "model": "infernalexp:block/soul_slate_button_pressed", + "model": "infernalexp:block/polished_soul_stone_button_pressed", "y": 180 }, "face=floor,facing=west,powered=false": { - "model": "infernalexp:block/soul_slate_button", + "model": "infernalexp:block/polished_soul_stone_button", "y": 270 }, "face=floor,facing=west,powered=true": { - "model": "infernalexp:block/soul_slate_button_pressed", + "model": "infernalexp:block/polished_soul_stone_button_pressed", "y": 270 }, "face=wall,facing=east,powered=false": { - "model": "infernalexp:block/soul_slate_button", + "model": "infernalexp:block/polished_soul_stone_button", "y": 90, "x": 90, "uvlock": true }, "face=wall,facing=east,powered=true": { - "model": "infernalexp:block/soul_slate_button_pressed", + "model": "infernalexp:block/polished_soul_stone_button_pressed", "y": 90, "x": 90, "uvlock": true }, "face=wall,facing=north,powered=false": { - "model": "infernalexp:block/soul_slate_button", + "model": "infernalexp:block/polished_soul_stone_button", "x": 90, "uvlock": true }, "face=wall,facing=north,powered=true": { - "model": "infernalexp:block/soul_slate_button_pressed", + "model": "infernalexp:block/polished_soul_stone_button_pressed", "x": 90, "uvlock": true }, "face=wall,facing=south,powered=false": { - "model": "infernalexp:block/soul_slate_button", + "model": "infernalexp:block/polished_soul_stone_button", "y": 180, "x": 90, "uvlock": true }, "face=wall,facing=south,powered=true": { - "model": "infernalexp:block/soul_slate_button_pressed", + "model": "infernalexp:block/polished_soul_stone_button_pressed", "y": 180, "x": 90, "uvlock": true }, "face=wall,facing=west,powered=false": { - "model": "infernalexp:block/soul_slate_button", + "model": "infernalexp:block/polished_soul_stone_button", "y": 270, "x": 90, "uvlock": true }, "face=wall,facing=west,powered=true": { - "model": "infernalexp:block/soul_slate_button_pressed", + "model": "infernalexp:block/polished_soul_stone_button_pressed", "y": 270, "x": 90, "uvlock": true diff --git a/src/main/resources/assets/infernalexp/blockstates/soul_slate_pressure_plate.json b/src/main/resources/assets/infernalexp/blockstates/soul_slate_pressure_plate.json index d5b136079..e81658a7a 100644 --- a/src/main/resources/assets/infernalexp/blockstates/soul_slate_pressure_plate.json +++ b/src/main/resources/assets/infernalexp/blockstates/soul_slate_pressure_plate.json @@ -1,10 +1,10 @@ { "variants": { "powered=false": { - "model": "infernalexp:block/soul_slate_pressure_plate" + "model": "infernalexp:block/polished_soul_stone_pressure_plate" }, "powered=true": { - "model": "infernalexp:block/soul_slate_pressure_plate_down" + "model": "infernalexp:block/polished_soul_stone_pressure_plate_down" } } } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/blockstates/soul_slate_slab.json b/src/main/resources/assets/infernalexp/blockstates/soul_slate_slab.json index 707ec3501..249702df0 100644 --- a/src/main/resources/assets/infernalexp/blockstates/soul_slate_slab.json +++ b/src/main/resources/assets/infernalexp/blockstates/soul_slate_slab.json @@ -1,13 +1,13 @@ { "variants": { "type=bottom": { - "model": "infernalexp:block/soul_slate_slab" + "model": "infernalexp:block/polished_soul_stone_slab" }, "type=double": { - "model": "infernalexp:block/soul_slate" + "model": "infernalexp:block/polished_soul_stone" }, "type=top": { - "model": "infernalexp:block/soul_slate_slab_top" + "model": "infernalexp:block/polished_soul_stone_slab_top" } } } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/blockstates/soul_slate_stairs.json b/src/main/resources/assets/infernalexp/blockstates/soul_slate_stairs.json index 550d8c939..662160d5b 100644 --- a/src/main/resources/assets/infernalexp/blockstates/soul_slate_stairs.json +++ b/src/main/resources/assets/infernalexp/blockstates/soul_slate_stairs.json @@ -1,206 +1,206 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "infernalexp:block/soul_slate_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_stairs_inner", "y": 270, "uvlock": true }, "facing=east,half=bottom,shape=inner_right": { - "model": "infernalexp:block/soul_slate_stairs_inner" + "model": "infernalexp:block/polished_soul_stone_stairs_inner" }, "facing=east,half=bottom,shape=outer_left": { - "model": "infernalexp:block/soul_slate_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_stairs_outer", "y": 270, "uvlock": true }, "facing=east,half=bottom,shape=outer_right": { - "model": "infernalexp:block/soul_slate_stairs_outer" + "model": "infernalexp:block/polished_soul_stone_stairs_outer" }, "facing=east,half=bottom,shape=straight": { - "model": "infernalexp:block/soul_slate_stairs" + "model": "infernalexp:block/polished_soul_stone_stairs" }, "facing=east,half=top,shape=inner_left": { - "model": "infernalexp:block/soul_slate_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_stairs_inner", "x": 180, "uvlock": true }, "facing=east,half=top,shape=inner_right": { - "model": "infernalexp:block/soul_slate_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_stairs_inner", "x": 180, "y": 90, "uvlock": true }, "facing=east,half=top,shape=outer_left": { - "model": "infernalexp:block/soul_slate_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_stairs_outer", "x": 180, "uvlock": true }, "facing=east,half=top,shape=outer_right": { - "model": "infernalexp:block/soul_slate_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_stairs_outer", "x": 180, "y": 90, "uvlock": true }, "facing=east,half=top,shape=straight": { - "model": "infernalexp:block/soul_slate_stairs", + "model": "infernalexp:block/polished_soul_stone_stairs", "x": 180, "uvlock": true }, "facing=north,half=bottom,shape=inner_left": { - "model": "infernalexp:block/soul_slate_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_stairs_inner", "y": 180, "uvlock": true }, "facing=north,half=bottom,shape=inner_right": { - "model": "infernalexp:block/soul_slate_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_stairs_inner", "y": 270, "uvlock": true }, "facing=north,half=bottom,shape=outer_left": { - "model": "infernalexp:block/soul_slate_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_stairs_outer", "y": 180, "uvlock": true }, "facing=north,half=bottom,shape=outer_right": { - "model": "infernalexp:block/soul_slate_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_stairs_outer", "y": 270, "uvlock": true }, "facing=north,half=bottom,shape=straight": { - "model": "infernalexp:block/soul_slate_stairs", + "model": "infernalexp:block/polished_soul_stone_stairs", "y": 270, "uvlock": true }, "facing=north,half=top,shape=inner_left": { - "model": "infernalexp:block/soul_slate_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_stairs_inner", "x": 180, "y": 270, "uvlock": true }, "facing=north,half=top,shape=inner_right": { - "model": "infernalexp:block/soul_slate_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_stairs_inner", "x": 180, "uvlock": true }, "facing=north,half=top,shape=outer_left": { - "model": "infernalexp:block/soul_slate_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_stairs_outer", "x": 180, "y": 270, "uvlock": true }, "facing=north,half=top,shape=outer_right": { - "model": "infernalexp:block/soul_slate_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_stairs_outer", "x": 180, "uvlock": true }, "facing=north,half=top,shape=straight": { - "model": "infernalexp:block/soul_slate_stairs", + "model": "infernalexp:block/polished_soul_stone_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=bottom,shape=inner_left": { - "model": "infernalexp:block/soul_slate_stairs_inner" + "model": "infernalexp:block/polished_soul_stone_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { - "model": "infernalexp:block/soul_slate_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_stairs_inner", "y": 90, "uvlock": true }, "facing=south,half=bottom,shape=outer_left": { - "model": "infernalexp:block/soul_slate_stairs_outer" + "model": "infernalexp:block/polished_soul_stone_stairs_outer" }, "facing=south,half=bottom,shape=outer_right": { - "model": "infernalexp:block/soul_slate_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_stairs_outer", "y": 90, "uvlock": true }, "facing=south,half=bottom,shape=straight": { - "model": "infernalexp:block/soul_slate_stairs", + "model": "infernalexp:block/polished_soul_stone_stairs", "y": 90, "uvlock": true }, "facing=south,half=top,shape=inner_left": { - "model": "infernalexp:block/soul_slate_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_stairs_inner", "x": 180, "y": 90, "uvlock": true }, "facing=south,half=top,shape=inner_right": { - "model": "infernalexp:block/soul_slate_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_stairs_inner", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=outer_left": { - "model": "infernalexp:block/soul_slate_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_stairs_outer", "x": 180, "y": 90, "uvlock": true }, "facing=south,half=top,shape=outer_right": { - "model": "infernalexp:block/soul_slate_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_stairs_outer", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { - "model": "infernalexp:block/soul_slate_stairs", + "model": "infernalexp:block/polished_soul_stone_stairs", "x": 180, "y": 90, "uvlock": true }, "facing=west,half=bottom,shape=inner_left": { - "model": "infernalexp:block/soul_slate_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_stairs_inner", "y": 90, "uvlock": true }, "facing=west,half=bottom,shape=inner_right": { - "model": "infernalexp:block/soul_slate_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_stairs_inner", "y": 180, "uvlock": true }, "facing=west,half=bottom,shape=outer_left": { - "model": "infernalexp:block/soul_slate_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_stairs_outer", "y": 90, "uvlock": true }, "facing=west,half=bottom,shape=outer_right": { - "model": "infernalexp:block/soul_slate_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_stairs_outer", "y": 180, "uvlock": true }, "facing=west,half=bottom,shape=straight": { - "model": "infernalexp:block/soul_slate_stairs", + "model": "infernalexp:block/polished_soul_stone_stairs", "y": 180, "uvlock": true }, "facing=west,half=top,shape=inner_left": { - "model": "infernalexp:block/soul_slate_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_stairs_inner", "x": 180, "y": 180, "uvlock": true }, "facing=west,half=top,shape=inner_right": { - "model": "infernalexp:block/soul_slate_stairs_inner", + "model": "infernalexp:block/polished_soul_stone_stairs_inner", "x": 180, "y": 270, "uvlock": true }, "facing=west,half=top,shape=outer_left": { - "model": "infernalexp:block/soul_slate_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_stairs_outer", "x": 180, "y": 180, "uvlock": true }, "facing=west,half=top,shape=outer_right": { - "model": "infernalexp:block/soul_slate_stairs_outer", + "model": "infernalexp:block/polished_soul_stone_stairs_outer", "x": 180, "y": 270, "uvlock": true }, "facing=west,half=top,shape=straight": { - "model": "infernalexp:block/soul_slate_stairs", + "model": "infernalexp:block/polished_soul_stone_stairs", "x": 180, "y": 180, "uvlock": true diff --git a/src/main/resources/assets/infernalexp/blockstates/soul_slate_vertical_slab.json b/src/main/resources/assets/infernalexp/blockstates/soul_slate_vertical_slab.json index 310cd12ad..981723058 100644 --- a/src/main/resources/assets/infernalexp/blockstates/soul_slate_vertical_slab.json +++ b/src/main/resources/assets/infernalexp/blockstates/soul_slate_vertical_slab.json @@ -1,27 +1,27 @@ { "variants": { "type=north": { - "model": "infernalexp:block/soul_slate_vertical_slab", + "model": "infernalexp:block/polished_soul_stone_vertical_slab", "y": 0, "uvlock": true }, "type=south": { - "model": "infernalexp:block/soul_slate_vertical_slab", + "model": "infernalexp:block/polished_soul_stone_vertical_slab", "y": 180, "uvlock": true }, "type=east": { - "model": "infernalexp:block/soul_slate_vertical_slab", + "model": "infernalexp:block/polished_soul_stone_vertical_slab", "y": 90, "uvlock": true }, "type=west": { - "model": "infernalexp:block/soul_slate_vertical_slab", + "model": "infernalexp:block/polished_soul_stone_vertical_slab", "y": 270, "uvlock": true }, "type=double": { - "model": "infernalexp:block/soul_slate" + "model": "infernalexp:block/polished_soul_stone" } } } diff --git a/src/main/resources/assets/infernalexp/lang/de_de.json b/src/main/resources/assets/infernalexp/lang/de_de.json index 8e4f28811..9dbf36b23 100644 --- a/src/main/resources/assets/infernalexp/lang/de_de.json +++ b/src/main/resources/assets/infernalexp/lang/de_de.json @@ -104,21 +104,21 @@ "block.infernalexp.cracked_soul_stone_bricks": "Brüchige Seelensteinziegel", "block.infernalexp.chiseled_soul_stone_bricks": "Gemeisselte Seelensteinziegel", "block.infernalexp.charged_chiseled_soul_stone_bricks": "Geladene Gemeißelte Seelensteinziegel", - "block.infernalexp.soul_slate": "Seelenschiefer", - "block.infernalexp.soul_slate_wall": "Seelenschiefermauer", - "block.infernalexp.soul_slate_stairs": "Seelenschiefertreppe", - "block.infernalexp.soul_slate_button": "Seelenschieferknopf", - "block.infernalexp.soul_slate_slab": "Seelenschieferstufe", - "block.infernalexp.soul_slate_vertical_slab": "Seelenschiefervertikalstufe", - "block.infernalexp.soul_slate_pressure_plate": "Seelenschieferdruckplatte", - "block.infernalexp.soul_slate_bricks": "Seelenschieferziegel", - "block.infernalexp.soul_slate_brick_wall": "Seelenschieferziegelmauer", - "block.infernalexp.soul_slate_brick_stairs": "Seelenschieferziegeltreppe", - "block.infernalexp.soul_slate_brick_slab": "Seelenschieferziegelstufe", - "block.infernalexp.soul_slate_brick_vertical_slab": "Seelenschieferziegelvertikalstufe", - "block.infernalexp.cracked_soul_slate_bricks": "Brüchige Seelenschieferziegel", - "block.infernalexp.chiseled_soul_slate_bricks": "Gemeißelte Seelenschieferziegel", - "block.infernalexp.charged_chiseled_soul_slate_bricks": "Geladene Gemeißelte Seelenschieferziegel", + "block.infernalexp.polished_soul_stone": "Seelenschiefer", + "block.infernalexp.polished_soul_stone_wall": "Seelenschiefermauer", + "block.infernalexp.polished_soul_stone_stairs": "Seelenschiefertreppe", + "block.infernalexp.polished_soul_stone_button": "Seelenschieferknopf", + "block.infernalexp.polished_soul_stone_slab": "Seelenschieferstufe", + "block.infernalexp.polished_soul_stone_vertical_slab": "Seelenschiefervertikalstufe", + "block.infernalexp.polished_soul_stone_pressure_plate": "Seelenschieferdruckplatte", + "block.infernalexp.polished_soul_stone_bricks": "Seelenschieferziegel", + "block.infernalexp.polished_soul_stone_brick_wall": "Seelenschieferziegelmauer", + "block.infernalexp.polished_soul_stone_brick_stairs": "Seelenschieferziegeltreppe", + "block.infernalexp.polished_soul_stone_brick_slab": "Seelenschieferziegelstufe", + "block.infernalexp.polished_soul_stone_brick_vertical_slab": "Seelenschieferziegelvertikalstufe", + "block.infernalexp.cracked_polished_soul_stone_bricks": "Brüchige Seelenschieferziegel", + "block.infernalexp.chiseled_polished_soul_stone_bricks": "Gemeißelte Seelenschieferziegel", + "block.infernalexp.charged_chiseled_polished_soul_stone_bricks": "Geladene Gemeißelte Seelenschieferziegel", "block.infernalexp.crimson_fungus_cap": "Karmesinkappe", "block.infernalexp.warped_fungus_cap": "Wirrkappe", "block.infernalexp.luminous_fungus_cap": "Luminöskappe", diff --git a/src/main/resources/assets/infernalexp/lang/en_us.json b/src/main/resources/assets/infernalexp/lang/en_us.json index 1a8869c09..ef657b185 100644 --- a/src/main/resources/assets/infernalexp/lang/en_us.json +++ b/src/main/resources/assets/infernalexp/lang/en_us.json @@ -108,21 +108,21 @@ "block.infernalexp.cracked_soul_stone_bricks": "Cracked Soul Stone Bricks", "block.infernalexp.chiseled_soul_stone_bricks": "Chiseled Soul Stone Brick", "block.infernalexp.charged_chiseled_soul_stone_bricks": "Charged Chiseled Soul Stone Brick", - "block.infernalexp.soul_slate": "Soul Slate", - "block.infernalexp.soul_slate_wall": "Soul Slate Wall", - "block.infernalexp.soul_slate_stairs": "Soul Slate Stairs", - "block.infernalexp.soul_slate_button": "Soul Slate Button", - "block.infernalexp.soul_slate_slab": "Soul Slate Slab", - "block.infernalexp.soul_slate_vertical_slab": "Soul Slate Vertical Slab", - "block.infernalexp.soul_slate_pressure_plate": "Soul Slate Pressure Plate", - "block.infernalexp.soul_slate_bricks": "Soul Slate Bricks", - "block.infernalexp.soul_slate_brick_wall": "Soul Slate Brick Wall", - "block.infernalexp.soul_slate_brick_stairs": "Soul Slate Brick Stairs", - "block.infernalexp.soul_slate_brick_slab": "Soul Slate Brick Slab", - "block.infernalexp.soul_slate_brick_vertical_slab": "Soul Slate Brick Vertical Slab", - "block.infernalexp.cracked_soul_slate_bricks": "Cracked Soul Slate Bricks", - "block.infernalexp.chiseled_soul_slate_bricks": "Chiseled Soul Slate Brick", - "block.infernalexp.charged_chiseled_soul_slate_bricks": "Charged Chiseled Soul Slate Brick", + "block.infernalexp.polished_soul_stone": "Polished Soul Stone", + "block.infernalexp.polished_soul_stone_wall": "Polished Soul Stone Wall", + "block.infernalexp.polished_soul_stone_stairs": "Polished Soul Stone Stairs", + "block.infernalexp.polished_soul_stone_button": "Polished Soul Stone Button", + "block.infernalexp.polished_soul_stone_slab": "Polished Soul Stone Slab", + "block.infernalexp.polished_soul_stone_vertical_slab": "Polished Soul Stone Vertical Slab", + "block.infernalexp.polished_soul_stone_pressure_plate": "Polished Soul Stone Pressure Plate", + "block.infernalexp.polished_soul_stone_bricks": "Polished Soul Stone Bricks", + "block.infernalexp.polished_soul_stone_brick_wall": "Polished Soul Stone Brick Wall", + "block.infernalexp.polished_soul_stone_brick_stairs": "Polished Soul Stone Brick Stairs", + "block.infernalexp.polished_soul_stone_brick_slab": "Polished Soul Stone Brick Slab", + "block.infernalexp.polished_soul_stone_brick_vertical_slab": "Polished Soul Stone Brick Vertical Slab", + "block.infernalexp.cracked_polished_soul_stone_bricks": "Cracked Polished Soul Stone Bricks", + "block.infernalexp.chiseled_polished_soul_stone_bricks": "Chiseled Polished Soul Stone Brick", + "block.infernalexp.charged_chiseled_polished_soul_stone_bricks": "Charged Chiseled Polished Soul Stone Brick", "block.infernalexp.crimson_fungus_cap": "Crimson Fungus Cap", "block.infernalexp.warped_fungus_cap": "Warped Fungus Cap", "block.infernalexp.luminous_fungus_cap": "Luminous Fungus Cap", diff --git a/src/main/resources/assets/infernalexp/lang/es_ar.json b/src/main/resources/assets/infernalexp/lang/es_ar.json index 05af847f7..78aae50b1 100644 --- a/src/main/resources/assets/infernalexp/lang/es_ar.json +++ b/src/main/resources/assets/infernalexp/lang/es_ar.json @@ -104,21 +104,21 @@ "block.infernalexp.cracked_soul_stone_bricks": "Cracked Soul Stone Bricks", "block.infernalexp.chiseled_soul_stone_bricks": "Chiseled Soul Stone Brick", "block.infernalexp.charged_chiseled_soul_stone_bricks": "Charged Chiseled Soul Stone Brick", - "block.infernalexp.soul_slate": "Pizarra de almas", - "block.infernalexp.soul_slate_wall": "Pared de pizarra de almas", - "block.infernalexp.soul_slate_stairs": "Escalera de pizarra de almas", - "block.infernalexp.soul_slate_button": "Boton de pizarra de almas", - "block.infernalexp.soul_slate_slab": "Baldosa de pizarra de almas", - "block.infernalexp.soul_slate_vertical_slab": "Soul Slate Vertical Slab", - "block.infernalexp.soul_slate_pressure_plate": "Placa de presion de pizarra de almas", - "block.infernalexp.soul_slate_bricks": "Ladrillos de pizarra de almas", - "block.infernalexp.soul_slate_brick_wall": "Pared de ladrillos de pizarra de almas", - "block.infernalexp.soul_slate_brick_stairs": "Escaleras de ladrillos de pizarra de almas", - "block.infernalexp.soul_slate_brick_slab": "Soul Slate Brick Slab", - "block.infernalexp.soul_slate_brick_vertical_slab": "Soul Slate Brick Vertical Slab", - "block.infernalexp.cracked_soul_slate_bricks": "Ladrillos de pizarra de almas agrietados", - "block.infernalexp.chiseled_soul_slate_bricks": "Chiseled Soul Slate Brick", - "block.infernalexp.charged_chiseled_soul_slate_bricks": "Charged Chiseled Soul Slate Brick", + "block.infernalexp.polished_soul_stone": "Pizarra de almas", + "block.infernalexp.polished_soul_stone_wall": "Pared de pizarra de almas", + "block.infernalexp.polished_soul_stone_stairs": "Escalera de pizarra de almas", + "block.infernalexp.polished_soul_stone_button": "Boton de pizarra de almas", + "block.infernalexp.polished_soul_stone_slab": "Baldosa de pizarra de almas", + "block.infernalexp.polished_soul_stone_vertical_slab": "Polished Soul Stone Vertical Slab", + "block.infernalexp.polished_soul_stone_pressure_plate": "Placa de presion de pizarra de almas", + "block.infernalexp.polished_soul_stone_bricks": "Ladrillos de pizarra de almas", + "block.infernalexp.polished_soul_stone_brick_wall": "Pared de ladrillos de pizarra de almas", + "block.infernalexp.polished_soul_stone_brick_stairs": "Escaleras de ladrillos de pizarra de almas", + "block.infernalexp.polished_soul_stone_brick_slab": "Polished Soul Stone Brick Slab", + "block.infernalexp.polished_soul_stone_brick_vertical_slab": "Polished Soul Stone Brick Vertical Slab", + "block.infernalexp.cracked_polished_soul_stone_bricks": "Ladrillos de pizarra de almas agrietados", + "block.infernalexp.chiseled_polished_soul_stone_bricks": "Chiseled Polished Soul Stone Brick", + "block.infernalexp.charged_chiseled_polished_soul_stone_bricks": "Charged Chiseled Polished Soul Stone Brick", "block.infernalexp.crimson_fungus_cap": "Sombrero de hongo carmesi", "block.infernalexp.warped_fungus_cap": "Sombrero de hongo distorsionado", "block.infernalexp.luminous_fungus_cap": "Sombrero de hongo resplandeciente", diff --git a/src/main/resources/assets/infernalexp/lang/es_es.json b/src/main/resources/assets/infernalexp/lang/es_es.json index 85a88ebad..09890d903 100644 --- a/src/main/resources/assets/infernalexp/lang/es_es.json +++ b/src/main/resources/assets/infernalexp/lang/es_es.json @@ -104,21 +104,21 @@ "block.infernalexp.cracked_soul_stone_bricks": "Ladrillos de piedra de almas agrietados", "block.infernalexp.chiseled_soul_stone_bricks": "Ladrillos de piedra de almas cincelados", "block.infernalexp.charged_chiseled_soul_stone_bricks": "Ladrillos de piedra de almas cincelados cargados", - "block.infernalexp.soul_slate": "Pizarra de almas", - "block.infernalexp.soul_slate_wall": "Muro de pizarra de almas", - "block.infernalexp.soul_slate_stairs": "Escaleras de pizarra de almas", - "block.infernalexp.soul_slate_button": "Botón de pizarra de almas", - "block.infernalexp.soul_slate_slab": "Losa de pizarra de almas", - "block.infernalexp.soul_slate_vertical_slab": "Losa vertical de pizarra de almas", - "block.infernalexp.soul_slate_pressure_plate": "Placa de presión de pizarra de almas", - "block.infernalexp.soul_slate_bricks": "Ladrillos de pizarra de almas", - "block.infernalexp.soul_slate_brick_wall": "Muro de ladrillos de pizarra de almas", - "block.infernalexp.soul_slate_brick_stairs": "Escaleras de ladrillos de pizarra de almas", - "block.infernalexp.soul_slate_brick_slab": "Losa de ladrillos de pizarra de almas", - "block.infernalexp.soul_slate_brick_vertical_slab": "Losa vertical de ladrillos de pizarra de almas", - "block.infernalexp.cracked_soul_slate_bricks": "Ladrillos de pizarra de almas agrietados", - "block.infernalexp.chiseled_soul_slate_bricks": "Ladrillos de pizarra de almas cincelados", - "block.infernalexp.charged_chiseled_soul_slate_bricks": "Ladrillos de pizarra de almas cincelados cargados", + "block.infernalexp.polished_soul_stone": "Pizarra de almas", + "block.infernalexp.polished_soul_stone_wall": "Muro de pizarra de almas", + "block.infernalexp.polished_soul_stone_stairs": "Escaleras de pizarra de almas", + "block.infernalexp.polished_soul_stone_button": "Botón de pizarra de almas", + "block.infernalexp.polished_soul_stone_slab": "Losa de pizarra de almas", + "block.infernalexp.polished_soul_stone_vertical_slab": "Losa vertical de pizarra de almas", + "block.infernalexp.polished_soul_stone_pressure_plate": "Placa de presión de pizarra de almas", + "block.infernalexp.polished_soul_stone_bricks": "Ladrillos de pizarra de almas", + "block.infernalexp.polished_soul_stone_brick_wall": "Muro de ladrillos de pizarra de almas", + "block.infernalexp.polished_soul_stone_brick_stairs": "Escaleras de ladrillos de pizarra de almas", + "block.infernalexp.polished_soul_stone_brick_slab": "Losa de ladrillos de pizarra de almas", + "block.infernalexp.polished_soul_stone_brick_vertical_slab": "Losa vertical de ladrillos de pizarra de almas", + "block.infernalexp.cracked_polished_soul_stone_bricks": "Ladrillos de pizarra de almas agrietados", + "block.infernalexp.chiseled_polished_soul_stone_bricks": "Ladrillos de pizarra de almas cincelados", + "block.infernalexp.charged_chiseled_polished_soul_stone_bricks": "Ladrillos de pizarra de almas cincelados cargados", "block.infernalexp.crimson_fungus_cap": "Sombrero de hongo carmesí", "block.infernalexp.warped_fungus_cap": "Sombrero de hongo distorsionado", "block.infernalexp.luminous_fungus_cap": "Sombrero de hongo luminoso", diff --git a/src/main/resources/assets/infernalexp/lang/fr_ca.json b/src/main/resources/assets/infernalexp/lang/fr_ca.json index 0d7a8a95f..252c3ed40 100644 --- a/src/main/resources/assets/infernalexp/lang/fr_ca.json +++ b/src/main/resources/assets/infernalexp/lang/fr_ca.json @@ -104,21 +104,21 @@ "block.infernalexp.cracked_soul_stone_bricks": "Cracked Soul Stone Bricks", "block.infernalexp.chiseled_soul_stone_bricks": "Chiseled Soul Stone Brick", "block.infernalexp.charged_chiseled_soul_stone_bricks": "Charged Chiseled Soul Stone Brick", - "block.infernalexp.soul_slate": "Soul Slate", - "block.infernalexp.soul_slate_wall": "Soul Slate Wall", - "block.infernalexp.soul_slate_stairs": "Soul Slate Stairs", - "block.infernalexp.soul_slate_button": "Soul Slate Button", - "block.infernalexp.soul_slate_slab": "Soul Slate Slab", - "block.infernalexp.soul_slate_vertical_slab": "Soul Slate Vertical Slab", - "block.infernalexp.soul_slate_pressure_plate": "Soul Slate Pressure Plate", - "block.infernalexp.soul_slate_bricks": "Soul Slate Bricks", - "block.infernalexp.soul_slate_brick_wall": "Soul Slate Brick Wall", - "block.infernalexp.soul_slate_brick_stairs": "Soul Slate Brick Stairs", - "block.infernalexp.soul_slate_brick_slab": "Soul Slate Brick Slab", - "block.infernalexp.soul_slate_brick_vertical_slab": "Soul Slate Brick Vertical Slab", - "block.infernalexp.cracked_soul_slate_bricks": "Cracked Soul Slate Bricks", - "block.infernalexp.chiseled_soul_slate_bricks": "Chiseled Soul Slate Brick", - "block.infernalexp.charged_chiseled_soul_slate_bricks": "Charged Chiseled Soul Slate Brick", + "block.infernalexp.polished_soul_stone": "Polished Soul Stone", + "block.infernalexp.polished_soul_stone_wall": "Polished Soul Stone Wall", + "block.infernalexp.polished_soul_stone_stairs": "Polished Soul Stone Stairs", + "block.infernalexp.polished_soul_stone_button": "Polished Soul Stone Button", + "block.infernalexp.polished_soul_stone_slab": "Polished Soul Stone Slab", + "block.infernalexp.polished_soul_stone_vertical_slab": "Polished Soul Stone Vertical Slab", + "block.infernalexp.polished_soul_stone_pressure_plate": "Polished Soul Stone Pressure Plate", + "block.infernalexp.polished_soul_stone_bricks": "Polished Soul Stone Bricks", + "block.infernalexp.polished_soul_stone_brick_wall": "Polished Soul Stone Brick Wall", + "block.infernalexp.polished_soul_stone_brick_stairs": "Polished Soul Stone Brick Stairs", + "block.infernalexp.polished_soul_stone_brick_slab": "Polished Soul Stone Brick Slab", + "block.infernalexp.polished_soul_stone_brick_vertical_slab": "Polished Soul Stone Brick Vertical Slab", + "block.infernalexp.cracked_polished_soul_stone_bricks": "Cracked Polished Soul Stone Bricks", + "block.infernalexp.chiseled_polished_soul_stone_bricks": "Chiseled Polished Soul Stone Brick", + "block.infernalexp.charged_chiseled_polished_soul_stone_bricks": "Charged Chiseled Polished Soul Stone Brick", "block.infernalexp.crimson_fungus_cap": "Crimson Fungus Cap", "block.infernalexp.warped_fungus_cap": "Warped Fungus Cap", "block.infernalexp.luminous_fungus_cap": "Luminous Fungus Cap", diff --git a/src/main/resources/assets/infernalexp/lang/fr_fr.json b/src/main/resources/assets/infernalexp/lang/fr_fr.json index 9fb764696..54bc52499 100644 --- a/src/main/resources/assets/infernalexp/lang/fr_fr.json +++ b/src/main/resources/assets/infernalexp/lang/fr_fr.json @@ -104,21 +104,21 @@ "block.infernalexp.cracked_soul_stone_bricks": "Cracked Soul Stone Bricks", "block.infernalexp.chiseled_soul_stone_bricks": "Chiseled Soul Stone Brick", "block.infernalexp.charged_chiseled_soul_stone_bricks": "Charged Chiseled Soul Stone Brick", - "block.infernalexp.soul_slate": "Soul Slate", - "block.infernalexp.soul_slate_wall": "Soul Slate Wall", - "block.infernalexp.soul_slate_stairs": "Soul Slate Stairs", - "block.infernalexp.soul_slate_button": "Soul Slate Button", - "block.infernalexp.soul_slate_slab": "Soul Slate Slab", - "block.infernalexp.soul_slate_vertical_slab": "Soul Slate Vertical Slab", - "block.infernalexp.soul_slate_pressure_plate": "Soul Slate Pressure Plate", - "block.infernalexp.soul_slate_bricks": "Soul Slate Bricks", - "block.infernalexp.soul_slate_brick_wall": "Soul Slate Brick Wall", - "block.infernalexp.soul_slate_brick_stairs": "Soul Slate Brick Stairs", - "block.infernalexp.soul_slate_brick_slab": "Soul Slate Brick Slab", - "block.infernalexp.soul_slate_brick_vertical_slab": "Soul Slate Brick Vertical Slab", - "block.infernalexp.cracked_soul_slate_bricks": "Cracked Soul Slate Bricks", - "block.infernalexp.chiseled_soul_slate_bricks": "Chiseled Soul Slate Brick", - "block.infernalexp.charged_chiseled_soul_slate_bricks": "Charged Chiseled Soul Slate Brick", + "block.infernalexp.polished_soul_stone": "Polished Soul Stone", + "block.infernalexp.polished_soul_stone_wall": "Polished Soul Stone Wall", + "block.infernalexp.polished_soul_stone_stairs": "Polished Soul Stone Stairs", + "block.infernalexp.polished_soul_stone_button": "Polished Soul Stone Button", + "block.infernalexp.polished_soul_stone_slab": "Polished Soul Stone Slab", + "block.infernalexp.polished_soul_stone_vertical_slab": "Polished Soul Stone Vertical Slab", + "block.infernalexp.polished_soul_stone_pressure_plate": "Polished Soul Stone Pressure Plate", + "block.infernalexp.polished_soul_stone_bricks": "Polished Soul Stone Bricks", + "block.infernalexp.polished_soul_stone_brick_wall": "Polished Soul Stone Brick Wall", + "block.infernalexp.polished_soul_stone_brick_stairs": "Polished Soul Stone Brick Stairs", + "block.infernalexp.polished_soul_stone_brick_slab": "Polished Soul Stone Brick Slab", + "block.infernalexp.polished_soul_stone_brick_vertical_slab": "Polished Soul Stone Brick Vertical Slab", + "block.infernalexp.cracked_polished_soul_stone_bricks": "Cracked Polished Soul Stone Bricks", + "block.infernalexp.chiseled_polished_soul_stone_bricks": "Chiseled Polished Soul Stone Brick", + "block.infernalexp.charged_chiseled_polished_soul_stone_bricks": "Charged Chiseled Polished Soul Stone Brick", "block.infernalexp.crimson_fungus_cap": "Crimson Fungus Cap", "block.infernalexp.warped_fungus_cap": "Warped Fungus Cap", "block.infernalexp.luminous_fungus_cap": "Luminous Fungus Cap", diff --git a/src/main/resources/assets/infernalexp/lang/he_il.json b/src/main/resources/assets/infernalexp/lang/he_il.json index 9535b9e71..c8779eaf4 100644 --- a/src/main/resources/assets/infernalexp/lang/he_il.json +++ b/src/main/resources/assets/infernalexp/lang/he_il.json @@ -104,21 +104,21 @@ "block.infernalexp.cracked_soul_stone_bricks": "Cracked Soul Stone Bricks", "block.infernalexp.chiseled_soul_stone_bricks": "Chiseled Soul Stone Brick", "block.infernalexp.charged_chiseled_soul_stone_bricks": "Charged Chiseled Soul Stone Brick", - "block.infernalexp.soul_slate": "Soul Slate", - "block.infernalexp.soul_slate_wall": "Soul Slate Wall", - "block.infernalexp.soul_slate_stairs": "Soul Slate Stairs", - "block.infernalexp.soul_slate_button": "Soul Slate Button", - "block.infernalexp.soul_slate_slab": "Soul Slate Slab", - "block.infernalexp.soul_slate_vertical_slab": "Soul Slate Vertical Slab", - "block.infernalexp.soul_slate_pressure_plate": "Soul Slate Pressure Plate", - "block.infernalexp.soul_slate_bricks": "Soul Slate Bricks", - "block.infernalexp.soul_slate_brick_wall": "Soul Slate Brick Wall", - "block.infernalexp.soul_slate_brick_stairs": "Soul Slate Brick Stairs", - "block.infernalexp.soul_slate_brick_slab": "Soul Slate Brick Slab", - "block.infernalexp.soul_slate_brick_vertical_slab": "Soul Slate Brick Vertical Slab", - "block.infernalexp.cracked_soul_slate_bricks": "Cracked Soul Slate Bricks", - "block.infernalexp.chiseled_soul_slate_bricks": "Chiseled Soul Slate Brick", - "block.infernalexp.charged_chiseled_soul_slate_bricks": "Charged Chiseled Soul Slate Brick", + "block.infernalexp.polished_soul_stone": "Polished Soul Stone", + "block.infernalexp.polished_soul_stone_wall": "Polished Soul Stone Wall", + "block.infernalexp.polished_soul_stone_stairs": "Polished Soul Stone Stairs", + "block.infernalexp.polished_soul_stone_button": "Polished Soul Stone Button", + "block.infernalexp.polished_soul_stone_slab": "Polished Soul Stone Slab", + "block.infernalexp.polished_soul_stone_vertical_slab": "Polished Soul Stone Vertical Slab", + "block.infernalexp.polished_soul_stone_pressure_plate": "Polished Soul Stone Pressure Plate", + "block.infernalexp.polished_soul_stone_bricks": "Polished Soul Stone Bricks", + "block.infernalexp.polished_soul_stone_brick_wall": "Polished Soul Stone Brick Wall", + "block.infernalexp.polished_soul_stone_brick_stairs": "Polished Soul Stone Brick Stairs", + "block.infernalexp.polished_soul_stone_brick_slab": "Polished Soul Stone Brick Slab", + "block.infernalexp.polished_soul_stone_brick_vertical_slab": "Polished Soul Stone Brick Vertical Slab", + "block.infernalexp.cracked_polished_soul_stone_bricks": "Cracked Polished Soul Stone Bricks", + "block.infernalexp.chiseled_polished_soul_stone_bricks": "Chiseled Polished Soul Stone Brick", + "block.infernalexp.charged_chiseled_polished_soul_stone_bricks": "Charged Chiseled Polished Soul Stone Brick", "block.infernalexp.crimson_fungus_cap": "Crimson Fungus Cap", "block.infernalexp.warped_fungus_cap": "Warped Fungus Cap", "block.infernalexp.luminous_fungus_cap": "Luminous Fungus Cap", diff --git a/src/main/resources/assets/infernalexp/lang/id_id.json b/src/main/resources/assets/infernalexp/lang/id_id.json index da9ff4e39..867ad0bc9 100644 --- a/src/main/resources/assets/infernalexp/lang/id_id.json +++ b/src/main/resources/assets/infernalexp/lang/id_id.json @@ -104,21 +104,21 @@ "block.infernalexp.cracked_soul_stone_bricks": "Cracked Soul Stone Bricks", "block.infernalexp.chiseled_soul_stone_bricks": "Chiseled Soul Stone Brick", "block.infernalexp.charged_chiseled_soul_stone_bricks": "Charged Chiseled Soul Stone Brick", - "block.infernalexp.soul_slate": "Soul Slate", - "block.infernalexp.soul_slate_wall": "Soul Slate Wall", - "block.infernalexp.soul_slate_stairs": "Soul Slate Stairs", - "block.infernalexp.soul_slate_button": "Soul Slate Button", - "block.infernalexp.soul_slate_slab": "Soul Slate Slab", - "block.infernalexp.soul_slate_vertical_slab": "Soul Slate Vertical Slab", - "block.infernalexp.soul_slate_pressure_plate": "Soul Slate Pressure Plate", - "block.infernalexp.soul_slate_bricks": "Soul Slate Bricks", - "block.infernalexp.soul_slate_brick_wall": "Soul Slate Brick Wall", - "block.infernalexp.soul_slate_brick_stairs": "Soul Slate Brick Stairs", - "block.infernalexp.soul_slate_brick_slab": "Soul Slate Brick Slab", - "block.infernalexp.soul_slate_brick_vertical_slab": "Soul Slate Brick Vertical Slab", - "block.infernalexp.cracked_soul_slate_bricks": "Cracked Soul Slate Bricks", - "block.infernalexp.chiseled_soul_slate_bricks": "Chiseled Soul Slate Brick", - "block.infernalexp.charged_chiseled_soul_slate_bricks": "Charged Chiseled Soul Slate Brick", + "block.infernalexp.polished_soul_stone": "Polished Soul Stone", + "block.infernalexp.polished_soul_stone_wall": "Polished Soul Stone Wall", + "block.infernalexp.polished_soul_stone_stairs": "Polished Soul Stone Stairs", + "block.infernalexp.polished_soul_stone_button": "Polished Soul Stone Button", + "block.infernalexp.polished_soul_stone_slab": "Polished Soul Stone Slab", + "block.infernalexp.polished_soul_stone_vertical_slab": "Polished Soul Stone Vertical Slab", + "block.infernalexp.polished_soul_stone_pressure_plate": "Polished Soul Stone Pressure Plate", + "block.infernalexp.polished_soul_stone_bricks": "Polished Soul Stone Bricks", + "block.infernalexp.polished_soul_stone_brick_wall": "Polished Soul Stone Brick Wall", + "block.infernalexp.polished_soul_stone_brick_stairs": "Polished Soul Stone Brick Stairs", + "block.infernalexp.polished_soul_stone_brick_slab": "Polished Soul Stone Brick Slab", + "block.infernalexp.polished_soul_stone_brick_vertical_slab": "Polished Soul Stone Brick Vertical Slab", + "block.infernalexp.cracked_polished_soul_stone_bricks": "Cracked Polished Soul Stone Bricks", + "block.infernalexp.chiseled_polished_soul_stone_bricks": "Chiseled Polished Soul Stone Brick", + "block.infernalexp.charged_chiseled_polished_soul_stone_bricks": "Charged Chiseled Polished Soul Stone Brick", "block.infernalexp.crimson_fungus_cap": "Crimson Fungus Cap", "block.infernalexp.warped_fungus_cap": "Warped Fungus Cap", "block.infernalexp.luminous_fungus_cap": "Luminous Fungus Cap", diff --git a/src/main/resources/assets/infernalexp/lang/ja_jp.json b/src/main/resources/assets/infernalexp/lang/ja_jp.json index 102941047..c53499a0a 100644 --- a/src/main/resources/assets/infernalexp/lang/ja_jp.json +++ b/src/main/resources/assets/infernalexp/lang/ja_jp.json @@ -104,21 +104,21 @@ "block.infernalexp.cracked_soul_stone_bricks": "ひび割れたソウルストーンレンガ", "block.infernalexp.chiseled_soul_stone_bricks": "模様入りのソウルストーンレンガ", "block.infernalexp.charged_chiseled_soul_stone_bricks": "チャージされた模様入りのソウルストーンレンガ", - "block.infernalexp.soul_slate": "ソウルスレート", - "block.infernalexp.soul_slate_wall": "ソウルスレートの塀", - "block.infernalexp.soul_slate_stairs": "ソウルスレートの階段", - "block.infernalexp.soul_slate_button": "ソウルスレートのボタン", - "block.infernalexp.soul_slate_slab": "ソウルスレートのハーフブロック", - "block.infernalexp.soul_slate_vertical_slab": "ソウルスレートの縦ハーフブロック", - "block.infernalexp.soul_slate_pressure_plate": "ソウルスレートの感圧板", - "block.infernalexp.soul_slate_bricks": "ソウルスレートレンガ", - "block.infernalexp.soul_slate_brick_wall": "ソウルスレートレンガの塀", - "block.infernalexp.soul_slate_brick_stairs": "ソウルスレートレンガの階段", - "block.infernalexp.soul_slate_brick_slab": "ソウルスレートレンガのハーフブロック", - "block.infernalexp.soul_slate_brick_vertical_slab": "ソウルスレートレンガの縦ハーフブロック", - "block.infernalexp.cracked_soul_slate_bricks": "ひび割れたソウルスレートレンガ", - "block.infernalexp.chiseled_soul_slate_bricks": "模様入りのソウルスレートレンガ", - "block.infernalexp.charged_chiseled_soul_slate_bricks": "チャージされた模様入りのソウルスレートレンガ", + "block.infernalexp.polished_soul_stone": "ソウルスレート", + "block.infernalexp.polished_soul_stone_wall": "ソウルスレートの塀", + "block.infernalexp.polished_soul_stone_stairs": "ソウルスレートの階段", + "block.infernalexp.polished_soul_stone_button": "ソウルスレートのボタン", + "block.infernalexp.polished_soul_stone_slab": "ソウルスレートのハーフブロック", + "block.infernalexp.polished_soul_stone_vertical_slab": "ソウルスレートの縦ハーフブロック", + "block.infernalexp.polished_soul_stone_pressure_plate": "ソウルスレートの感圧板", + "block.infernalexp.polished_soul_stone_bricks": "ソウルスレートレンガ", + "block.infernalexp.polished_soul_stone_brick_wall": "ソウルスレートレンガの塀", + "block.infernalexp.polished_soul_stone_brick_stairs": "ソウルスレートレンガの階段", + "block.infernalexp.polished_soul_stone_brick_slab": "ソウルスレートレンガのハーフブロック", + "block.infernalexp.polished_soul_stone_brick_vertical_slab": "ソウルスレートレンガの縦ハーフブロック", + "block.infernalexp.cracked_polished_soul_stone_bricks": "ひび割れたソウルスレートレンガ", + "block.infernalexp.chiseled_polished_soul_stone_bricks": "模様入りのソウルスレートレンガ", + "block.infernalexp.charged_chiseled_polished_soul_stone_bricks": "チャージされた模様入りのソウルスレートレンガ", "block.infernalexp.crimson_fungus_cap": "真紅のキノコの笠", "block.infernalexp.warped_fungus_cap": "歪んだキノコの笠", "block.infernalexp.luminous_fungus_cap": "輝くキノコの笠", diff --git a/src/main/resources/assets/infernalexp/lang/lol_us.json b/src/main/resources/assets/infernalexp/lang/lol_us.json index 7490af65c..a66128df8 100644 --- a/src/main/resources/assets/infernalexp/lang/lol_us.json +++ b/src/main/resources/assets/infernalexp/lang/lol_us.json @@ -104,21 +104,21 @@ "block.infernalexp.cracked_soul_stone_bricks": "Cracked Soul Stone Bricks", "block.infernalexp.chiseled_soul_stone_bricks": "Chiseled Soul Stone Brick", "block.infernalexp.charged_chiseled_soul_stone_bricks": "Charged Chiseled Soul Stone Brick", - "block.infernalexp.soul_slate": "Soul Slate", - "block.infernalexp.soul_slate_wall": "Soul Slate Wall", - "block.infernalexp.soul_slate_stairs": "Soul Slate Stairs", - "block.infernalexp.soul_slate_button": "Soul Slate Button", - "block.infernalexp.soul_slate_slab": "Soul Slate Slab", - "block.infernalexp.soul_slate_vertical_slab": "Soul Slate Vertical Slab", - "block.infernalexp.soul_slate_pressure_plate": "Soul Slate Pressure Plate", - "block.infernalexp.soul_slate_bricks": "Soul Slate Bricks", - "block.infernalexp.soul_slate_brick_wall": "Soul Slate Brick Wall", - "block.infernalexp.soul_slate_brick_stairs": "Soul Slate Brick Stairs", - "block.infernalexp.soul_slate_brick_slab": "Soul Slate Brick Slab", - "block.infernalexp.soul_slate_brick_vertical_slab": "Soul Slate Brick Vertical Slab", - "block.infernalexp.cracked_soul_slate_bricks": "Cracked Soul Slate Bricks", - "block.infernalexp.chiseled_soul_slate_bricks": "Chiseled Soul Slate Brick", - "block.infernalexp.charged_chiseled_soul_slate_bricks": "Charged Chiseled Soul Slate Brick", + "block.infernalexp.polished_soul_stone": "Polished Soul Stone", + "block.infernalexp.polished_soul_stone_wall": "Polished Soul Stone Wall", + "block.infernalexp.polished_soul_stone_stairs": "Polished Soul Stone Stairs", + "block.infernalexp.polished_soul_stone_button": "Polished Soul Stone Button", + "block.infernalexp.polished_soul_stone_slab": "Polished Soul Stone Slab", + "block.infernalexp.polished_soul_stone_vertical_slab": "Polished Soul Stone Vertical Slab", + "block.infernalexp.polished_soul_stone_pressure_plate": "Polished Soul Stone Pressure Plate", + "block.infernalexp.polished_soul_stone_bricks": "Polished Soul Stone Bricks", + "block.infernalexp.polished_soul_stone_brick_wall": "Polished Soul Stone Brick Wall", + "block.infernalexp.polished_soul_stone_brick_stairs": "Polished Soul Stone Brick Stairs", + "block.infernalexp.polished_soul_stone_brick_slab": "Polished Soul Stone Brick Slab", + "block.infernalexp.polished_soul_stone_brick_vertical_slab": "Polished Soul Stone Brick Vertical Slab", + "block.infernalexp.cracked_polished_soul_stone_bricks": "Cracked Polished Soul Stone Bricks", + "block.infernalexp.chiseled_polished_soul_stone_bricks": "Chiseled Polished Soul Stone Brick", + "block.infernalexp.charged_chiseled_polished_soul_stone_bricks": "Charged Chiseled Polished Soul Stone Brick", "block.infernalexp.crimson_fungus_cap": "Crimson Fungus Cap", "block.infernalexp.warped_fungus_cap": "Warped Fungus Cap", "block.infernalexp.luminous_fungus_cap": "Luminous Fungus Cap", diff --git a/src/main/resources/assets/infernalexp/lang/lv_lv.json b/src/main/resources/assets/infernalexp/lang/lv_lv.json index 6898c4156..414de52e2 100644 --- a/src/main/resources/assets/infernalexp/lang/lv_lv.json +++ b/src/main/resources/assets/infernalexp/lang/lv_lv.json @@ -104,21 +104,21 @@ "block.infernalexp.cracked_soul_stone_bricks": "Cracked Soul Stone Bricks", "block.infernalexp.chiseled_soul_stone_bricks": "Chiseled Soul Stone Brick", "block.infernalexp.charged_chiseled_soul_stone_bricks": "Charged Chiseled Soul Stone Brick", - "block.infernalexp.soul_slate": "Soul Slate", - "block.infernalexp.soul_slate_wall": "Soul Slate Wall", - "block.infernalexp.soul_slate_stairs": "Soul Slate Stairs", - "block.infernalexp.soul_slate_button": "Soul Slate Button", - "block.infernalexp.soul_slate_slab": "Soul Slate Slab", - "block.infernalexp.soul_slate_vertical_slab": "Soul Slate Vertical Slab", - "block.infernalexp.soul_slate_pressure_plate": "Soul Slate Pressure Plate", - "block.infernalexp.soul_slate_bricks": "Soul Slate Bricks", - "block.infernalexp.soul_slate_brick_wall": "Soul Slate Brick Wall", - "block.infernalexp.soul_slate_brick_stairs": "Soul Slate Brick Stairs", - "block.infernalexp.soul_slate_brick_slab": "Soul Slate Brick Slab", - "block.infernalexp.soul_slate_brick_vertical_slab": "Soul Slate Brick Vertical Slab", - "block.infernalexp.cracked_soul_slate_bricks": "Cracked Soul Slate Bricks", - "block.infernalexp.chiseled_soul_slate_bricks": "Chiseled Soul Slate Brick", - "block.infernalexp.charged_chiseled_soul_slate_bricks": "Charged Chiseled Soul Slate Brick", + "block.infernalexp.polished_soul_stone": "Polished Soul Stone", + "block.infernalexp.polished_soul_stone_wall": "Polished Soul Stone Wall", + "block.infernalexp.polished_soul_stone_stairs": "Polished Soul Stone Stairs", + "block.infernalexp.polished_soul_stone_button": "Polished Soul Stone Button", + "block.infernalexp.polished_soul_stone_slab": "Polished Soul Stone Slab", + "block.infernalexp.polished_soul_stone_vertical_slab": "Polished Soul Stone Vertical Slab", + "block.infernalexp.polished_soul_stone_pressure_plate": "Polished Soul Stone Pressure Plate", + "block.infernalexp.polished_soul_stone_bricks": "Polished Soul Stone Bricks", + "block.infernalexp.polished_soul_stone_brick_wall": "Polished Soul Stone Brick Wall", + "block.infernalexp.polished_soul_stone_brick_stairs": "Polished Soul Stone Brick Stairs", + "block.infernalexp.polished_soul_stone_brick_slab": "Polished Soul Stone Brick Slab", + "block.infernalexp.polished_soul_stone_brick_vertical_slab": "Polished Soul Stone Brick Vertical Slab", + "block.infernalexp.cracked_polished_soul_stone_bricks": "Cracked Polished Soul Stone Bricks", + "block.infernalexp.chiseled_polished_soul_stone_bricks": "Chiseled Polished Soul Stone Brick", + "block.infernalexp.charged_chiseled_polished_soul_stone_bricks": "Charged Chiseled Polished Soul Stone Brick", "block.infernalexp.crimson_fungus_cap": "Crimson Fungus Cap", "block.infernalexp.warped_fungus_cap": "Warped Fungus Cap", "block.infernalexp.luminous_fungus_cap": "Luminous Fungus Cap", diff --git a/src/main/resources/assets/infernalexp/lang/ms_my.json b/src/main/resources/assets/infernalexp/lang/ms_my.json index ed819569b..65e0c4960 100644 --- a/src/main/resources/assets/infernalexp/lang/ms_my.json +++ b/src/main/resources/assets/infernalexp/lang/ms_my.json @@ -104,21 +104,21 @@ "block.infernalexp.cracked_soul_stone_bricks": "Cracked Soul Stone Bricks", "block.infernalexp.chiseled_soul_stone_bricks": "Chiseled Soul Stone Brick", "block.infernalexp.charged_chiseled_soul_stone_bricks": "Charged Chiseled Soul Stone Brick", - "block.infernalexp.soul_slate": "Soul Slate", - "block.infernalexp.soul_slate_wall": "Soul Slate Wall", - "block.infernalexp.soul_slate_stairs": "Soul Slate Stairs", - "block.infernalexp.soul_slate_button": "Soul Slate Button", - "block.infernalexp.soul_slate_slab": "Soul Slate Slab", - "block.infernalexp.soul_slate_vertical_slab": "Soul Slate Vertical Slab", - "block.infernalexp.soul_slate_pressure_plate": "Soul Slate Pressure Plate", - "block.infernalexp.soul_slate_bricks": "Soul Slate Bricks", - "block.infernalexp.soul_slate_brick_wall": "Soul Slate Brick Wall", - "block.infernalexp.soul_slate_brick_stairs": "Soul Slate Brick Stairs", - "block.infernalexp.soul_slate_brick_slab": "Soul Slate Brick Slab", - "block.infernalexp.soul_slate_brick_vertical_slab": "Soul Slate Brick Vertical Slab", - "block.infernalexp.cracked_soul_slate_bricks": "Cracked Soul Slate Bricks", - "block.infernalexp.chiseled_soul_slate_bricks": "Chiseled Soul Slate Brick", - "block.infernalexp.charged_chiseled_soul_slate_bricks": "Charged Chiseled Soul Slate Brick", + "block.infernalexp.polished_soul_stone": "Polished Soul Stone", + "block.infernalexp.polished_soul_stone_wall": "Polished Soul Stone Wall", + "block.infernalexp.polished_soul_stone_stairs": "Polished Soul Stone Stairs", + "block.infernalexp.polished_soul_stone_button": "Polished Soul Stone Button", + "block.infernalexp.polished_soul_stone_slab": "Polished Soul Stone Slab", + "block.infernalexp.polished_soul_stone_vertical_slab": "Polished Soul Stone Vertical Slab", + "block.infernalexp.polished_soul_stone_pressure_plate": "Polished Soul Stone Pressure Plate", + "block.infernalexp.polished_soul_stone_bricks": "Polished Soul Stone Bricks", + "block.infernalexp.polished_soul_stone_brick_wall": "Polished Soul Stone Brick Wall", + "block.infernalexp.polished_soul_stone_brick_stairs": "Polished Soul Stone Brick Stairs", + "block.infernalexp.polished_soul_stone_brick_slab": "Polished Soul Stone Brick Slab", + "block.infernalexp.polished_soul_stone_brick_vertical_slab": "Polished Soul Stone Brick Vertical Slab", + "block.infernalexp.cracked_polished_soul_stone_bricks": "Cracked Polished Soul Stone Bricks", + "block.infernalexp.chiseled_polished_soul_stone_bricks": "Chiseled Polished Soul Stone Brick", + "block.infernalexp.charged_chiseled_polished_soul_stone_bricks": "Charged Chiseled Polished Soul Stone Brick", "block.infernalexp.crimson_fungus_cap": "Crimson Fungus Cap", "block.infernalexp.warped_fungus_cap": "Warped Fungus Cap", "block.infernalexp.luminous_fungus_cap": "Luminous Fungus Cap", diff --git a/src/main/resources/assets/infernalexp/lang/nl_nl.json b/src/main/resources/assets/infernalexp/lang/nl_nl.json index 61215357a..cc726e4f9 100644 --- a/src/main/resources/assets/infernalexp/lang/nl_nl.json +++ b/src/main/resources/assets/infernalexp/lang/nl_nl.json @@ -104,21 +104,21 @@ "block.infernalexp.cracked_soul_stone_bricks": "Cracked Soul Stone Bricks", "block.infernalexp.chiseled_soul_stone_bricks": "Chiseled Soul Stone Brick", "block.infernalexp.charged_chiseled_soul_stone_bricks": "Charged Chiseled Soul Stone Brick", - "block.infernalexp.soul_slate": "Soul Slate", - "block.infernalexp.soul_slate_wall": "Soul Slate Wall", - "block.infernalexp.soul_slate_stairs": "Soul Slate Stairs", - "block.infernalexp.soul_slate_button": "Soul Slate Button", - "block.infernalexp.soul_slate_slab": "Soul Slate Slab", - "block.infernalexp.soul_slate_vertical_slab": "Soul Slate Vertical Slab", - "block.infernalexp.soul_slate_pressure_plate": "Soul Slate Pressure Plate", - "block.infernalexp.soul_slate_bricks": "Soul Slate Bricks", - "block.infernalexp.soul_slate_brick_wall": "Soul Slate Brick Wall", - "block.infernalexp.soul_slate_brick_stairs": "Soul Slate Brick Stairs", - "block.infernalexp.soul_slate_brick_slab": "Soul Slate Brick Slab", - "block.infernalexp.soul_slate_brick_vertical_slab": "Soul Slate Brick Vertical Slab", - "block.infernalexp.cracked_soul_slate_bricks": "Cracked Soul Slate Bricks", - "block.infernalexp.chiseled_soul_slate_bricks": "Chiseled Soul Slate Brick", - "block.infernalexp.charged_chiseled_soul_slate_bricks": "Charged Chiseled Soul Slate Brick", + "block.infernalexp.polished_soul_stone": "Polished Soul Stone", + "block.infernalexp.polished_soul_stone_wall": "Polished Soul Stone Wall", + "block.infernalexp.polished_soul_stone_stairs": "Polished Soul Stone Stairs", + "block.infernalexp.polished_soul_stone_button": "Polished Soul Stone Button", + "block.infernalexp.polished_soul_stone_slab": "Polished Soul Stone Slab", + "block.infernalexp.polished_soul_stone_vertical_slab": "Polished Soul Stone Vertical Slab", + "block.infernalexp.polished_soul_stone_pressure_plate": "Polished Soul Stone Pressure Plate", + "block.infernalexp.polished_soul_stone_bricks": "Polished Soul Stone Bricks", + "block.infernalexp.polished_soul_stone_brick_wall": "Polished Soul Stone Brick Wall", + "block.infernalexp.polished_soul_stone_brick_stairs": "Polished Soul Stone Brick Stairs", + "block.infernalexp.polished_soul_stone_brick_slab": "Polished Soul Stone Brick Slab", + "block.infernalexp.polished_soul_stone_brick_vertical_slab": "Polished Soul Stone Brick Vertical Slab", + "block.infernalexp.cracked_polished_soul_stone_bricks": "Cracked Polished Soul Stone Bricks", + "block.infernalexp.chiseled_polished_soul_stone_bricks": "Chiseled Polished Soul Stone Brick", + "block.infernalexp.charged_chiseled_polished_soul_stone_bricks": "Charged Chiseled Polished Soul Stone Brick", "block.infernalexp.crimson_fungus_cap": "Crimson Fungus Cap", "block.infernalexp.warped_fungus_cap": "Warped Fungus Cap", "block.infernalexp.luminous_fungus_cap": "Luminous Fungus Cap", diff --git a/src/main/resources/assets/infernalexp/lang/pl_pl.json b/src/main/resources/assets/infernalexp/lang/pl_pl.json index 21571065c..ced5da20d 100644 --- a/src/main/resources/assets/infernalexp/lang/pl_pl.json +++ b/src/main/resources/assets/infernalexp/lang/pl_pl.json @@ -104,21 +104,21 @@ "block.infernalexp.cracked_soul_stone_bricks": "Popękane kamienne cegły dusz", "block.infernalexp.chiseled_soul_stone_bricks": "Rzeźbione kamienne cegły dusz", "block.infernalexp.charged_chiseled_soul_stone_bricks": "Wcielone kamienne cegły dusz", - "block.infernalexp.soul_slate": "Łupek dusz", - "block.infernalexp.soul_slate_wall": "Murek z łupku dusz", - "block.infernalexp.soul_slate_stairs": "Schody z łupku dusz", - "block.infernalexp.soul_slate_button": "Przycisk z łupku dusz", - "block.infernalexp.soul_slate_slab": "Płyta z łupku dusz", - "block.infernalexp.soul_slate_vertical_slab": "Pionowa płyta z łupku dusz", - "block.infernalexp.soul_slate_pressure_plate": "Płyta naciskowa z łupku dusz", - "block.infernalexp.soul_slate_bricks": "Cegły łupku dusz", - "block.infernalexp.soul_slate_brick_wall": "Murek z ciegieł łupku dusz", - "block.infernalexp.soul_slate_brick_stairs": "Schody z ciegieł łupku dusz", - "block.infernalexp.soul_slate_brick_slab": "Płyta z ciegieł łupku dusz", - "block.infernalexp.soul_slate_brick_vertical_slab": "Pionowa płyta z ciegieł łupku dusz", - "block.infernalexp.cracked_soul_slate_bricks": "Popękane cegły łupku dusz", - "block.infernalexp.chiseled_soul_slate_bricks": "Rzeźbione cegły łupku dusz", - "block.infernalexp.charged_chiseled_soul_slate_bricks": "Wcielone cegły łupku dusz", + "block.infernalexp.polished_soul_stone": "Łupek dusz", + "block.infernalexp.polished_soul_stone_wall": "Murek z łupku dusz", + "block.infernalexp.polished_soul_stone_stairs": "Schody z łupku dusz", + "block.infernalexp.polished_soul_stone_button": "Przycisk z łupku dusz", + "block.infernalexp.polished_soul_stone_slab": "Płyta z łupku dusz", + "block.infernalexp.polished_soul_stone_vertical_slab": "Pionowa płyta z łupku dusz", + "block.infernalexp.polished_soul_stone_pressure_plate": "Płyta naciskowa z łupku dusz", + "block.infernalexp.polished_soul_stone_bricks": "Cegły łupku dusz", + "block.infernalexp.polished_soul_stone_brick_wall": "Murek z ciegieł łupku dusz", + "block.infernalexp.polished_soul_stone_brick_stairs": "Schody z ciegieł łupku dusz", + "block.infernalexp.polished_soul_stone_brick_slab": "Płyta z ciegieł łupku dusz", + "block.infernalexp.polished_soul_stone_brick_vertical_slab": "Pionowa płyta z ciegieł łupku dusz", + "block.infernalexp.cracked_polished_soul_stone_bricks": "Popękane cegły łupku dusz", + "block.infernalexp.chiseled_polished_soul_stone_bricks": "Rzeźbione cegły łupku dusz", + "block.infernalexp.charged_chiseled_polished_soul_stone_bricks": "Wcielone cegły łupku dusz", "block.infernalexp.crimson_fungus_cap": "Kapelusz szkarłatnego grzyba", "block.infernalexp.warped_fungus_cap": "Kapelusz spaczonego grzyba", "block.infernalexp.luminous_fungus_cap": "Kapelusz świetlistego grzyba", diff --git a/src/main/resources/assets/infernalexp/lang/pt_br.json b/src/main/resources/assets/infernalexp/lang/pt_br.json index 836028533..d5d09e8e8 100644 --- a/src/main/resources/assets/infernalexp/lang/pt_br.json +++ b/src/main/resources/assets/infernalexp/lang/pt_br.json @@ -104,21 +104,21 @@ "block.infernalexp.cracked_soul_stone_bricks": "Cracked Soul Stone Bricks", "block.infernalexp.chiseled_soul_stone_bricks": "Chiseled Soul Stone Brick", "block.infernalexp.charged_chiseled_soul_stone_bricks": "Charged Chiseled Soul Stone Brick", - "block.infernalexp.soul_slate": "Soul Slate", - "block.infernalexp.soul_slate_wall": "Soul Slate Wall", - "block.infernalexp.soul_slate_stairs": "Soul Slate Stairs", - "block.infernalexp.soul_slate_button": "Soul Slate Button", - "block.infernalexp.soul_slate_slab": "Soul Slate Slab", - "block.infernalexp.soul_slate_vertical_slab": "Soul Slate Vertical Slab", - "block.infernalexp.soul_slate_pressure_plate": "Soul Slate Pressure Plate", - "block.infernalexp.soul_slate_bricks": "Soul Slate Bricks", - "block.infernalexp.soul_slate_brick_wall": "Soul Slate Brick Wall", - "block.infernalexp.soul_slate_brick_stairs": "Soul Slate Brick Stairs", - "block.infernalexp.soul_slate_brick_slab": "Soul Slate Brick Slab", - "block.infernalexp.soul_slate_brick_vertical_slab": "Soul Slate Brick Vertical Slab", - "block.infernalexp.cracked_soul_slate_bricks": "Cracked Soul Slate Bricks", - "block.infernalexp.chiseled_soul_slate_bricks": "Chiseled Soul Slate Brick", - "block.infernalexp.charged_chiseled_soul_slate_bricks": "Charged Chiseled Soul Slate Brick", + "block.infernalexp.polished_soul_stone": "Polished Soul Stone", + "block.infernalexp.polished_soul_stone_wall": "Polished Soul Stone Wall", + "block.infernalexp.polished_soul_stone_stairs": "Polished Soul Stone Stairs", + "block.infernalexp.polished_soul_stone_button": "Polished Soul Stone Button", + "block.infernalexp.polished_soul_stone_slab": "Polished Soul Stone Slab", + "block.infernalexp.polished_soul_stone_vertical_slab": "Polished Soul Stone Vertical Slab", + "block.infernalexp.polished_soul_stone_pressure_plate": "Polished Soul Stone Pressure Plate", + "block.infernalexp.polished_soul_stone_bricks": "Polished Soul Stone Bricks", + "block.infernalexp.polished_soul_stone_brick_wall": "Polished Soul Stone Brick Wall", + "block.infernalexp.polished_soul_stone_brick_stairs": "Polished Soul Stone Brick Stairs", + "block.infernalexp.polished_soul_stone_brick_slab": "Polished Soul Stone Brick Slab", + "block.infernalexp.polished_soul_stone_brick_vertical_slab": "Polished Soul Stone Brick Vertical Slab", + "block.infernalexp.cracked_polished_soul_stone_bricks": "Cracked Polished Soul Stone Bricks", + "block.infernalexp.chiseled_polished_soul_stone_bricks": "Chiseled Polished Soul Stone Brick", + "block.infernalexp.charged_chiseled_polished_soul_stone_bricks": "Charged Chiseled Polished Soul Stone Brick", "block.infernalexp.crimson_fungus_cap": "Crimson Fungus Cap", "block.infernalexp.warped_fungus_cap": "Warped Fungus Cap", "block.infernalexp.luminous_fungus_cap": "Luminous Fungus Cap", diff --git a/src/main/resources/assets/infernalexp/lang/ro_ro.json b/src/main/resources/assets/infernalexp/lang/ro_ro.json index a1741ec0c..69e46472b 100644 --- a/src/main/resources/assets/infernalexp/lang/ro_ro.json +++ b/src/main/resources/assets/infernalexp/lang/ro_ro.json @@ -104,21 +104,21 @@ "block.infernalexp.cracked_soul_stone_bricks": "Cracked Soul Stone Bricks", "block.infernalexp.chiseled_soul_stone_bricks": "Chiseled Soul Stone Brick", "block.infernalexp.charged_chiseled_soul_stone_bricks": "Charged Chiseled Soul Stone Brick", - "block.infernalexp.soul_slate": "Soul Slate", - "block.infernalexp.soul_slate_wall": "Soul Slate Wall", - "block.infernalexp.soul_slate_stairs": "Soul Slate Stairs", - "block.infernalexp.soul_slate_button": "Soul Slate Button", - "block.infernalexp.soul_slate_slab": "Soul Slate Slab", - "block.infernalexp.soul_slate_vertical_slab": "Soul Slate Vertical Slab", - "block.infernalexp.soul_slate_pressure_plate": "Soul Slate Pressure Plate", - "block.infernalexp.soul_slate_bricks": "Soul Slate Bricks", - "block.infernalexp.soul_slate_brick_wall": "Soul Slate Brick Wall", - "block.infernalexp.soul_slate_brick_stairs": "Soul Slate Brick Stairs", - "block.infernalexp.soul_slate_brick_slab": "Soul Slate Brick Slab", - "block.infernalexp.soul_slate_brick_vertical_slab": "Soul Slate Brick Vertical Slab", - "block.infernalexp.cracked_soul_slate_bricks": "Cracked Soul Slate Bricks", - "block.infernalexp.chiseled_soul_slate_bricks": "Chiseled Soul Slate Brick", - "block.infernalexp.charged_chiseled_soul_slate_bricks": "Charged Chiseled Soul Slate Brick", + "block.infernalexp.polished_soul_stone": "Polished Soul Stone", + "block.infernalexp.polished_soul_stone_wall": "Polished Soul Stone Wall", + "block.infernalexp.polished_soul_stone_stairs": "Polished Soul Stone Stairs", + "block.infernalexp.polished_soul_stone_button": "Polished Soul Stone Button", + "block.infernalexp.polished_soul_stone_slab": "Polished Soul Stone Slab", + "block.infernalexp.polished_soul_stone_vertical_slab": "Polished Soul Stone Vertical Slab", + "block.infernalexp.polished_soul_stone_pressure_plate": "Polished Soul Stone Pressure Plate", + "block.infernalexp.polished_soul_stone_bricks": "Polished Soul Stone Bricks", + "block.infernalexp.polished_soul_stone_brick_wall": "Polished Soul Stone Brick Wall", + "block.infernalexp.polished_soul_stone_brick_stairs": "Polished Soul Stone Brick Stairs", + "block.infernalexp.polished_soul_stone_brick_slab": "Polished Soul Stone Brick Slab", + "block.infernalexp.polished_soul_stone_brick_vertical_slab": "Polished Soul Stone Brick Vertical Slab", + "block.infernalexp.cracked_polished_soul_stone_bricks": "Cracked Polished Soul Stone Bricks", + "block.infernalexp.chiseled_polished_soul_stone_bricks": "Chiseled Polished Soul Stone Brick", + "block.infernalexp.charged_chiseled_polished_soul_stone_bricks": "Charged Chiseled Polished Soul Stone Brick", "block.infernalexp.crimson_fungus_cap": "Crimson Fungus Cap", "block.infernalexp.warped_fungus_cap": "Warped Fungus Cap", "block.infernalexp.luminous_fungus_cap": "Luminous Fungus Cap", diff --git a/src/main/resources/assets/infernalexp/lang/ru_ru.json b/src/main/resources/assets/infernalexp/lang/ru_ru.json index d4302e3cd..77fef4c4e 100644 --- a/src/main/resources/assets/infernalexp/lang/ru_ru.json +++ b/src/main/resources/assets/infernalexp/lang/ru_ru.json @@ -104,21 +104,21 @@ "block.infernalexp.cracked_soul_stone_bricks": "Потрескавшиеся кирпичи из камня душ", "block.infernalexp.chiseled_soul_stone_bricks": "Резные кирпичи из камня душ", "block.infernalexp.charged_chiseled_soul_stone_bricks": "Заряженные резные кирпичи из камня душ", - "block.infernalexp.soul_slate": "Шифер душ", - "block.infernalexp.soul_slate_wall": "Ограда из шифера душ", - "block.infernalexp.soul_slate_stairs": "Ступени из шифера душ", - "block.infernalexp.soul_slate_button": "Кнопка из шифера душ", - "block.infernalexp.soul_slate_slab": "Плита из шифера душ", - "block.infernalexp.soul_slate_vertical_slab": "Вертикальная плита из шифера душ", - "block.infernalexp.soul_slate_pressure_plate": "Нажимная плита из шифера душ", - "block.infernalexp.soul_slate_bricks": "Кирпичи из шифера душ", - "block.infernalexp.soul_slate_brick_wall": "Ограда из кирпичного шифера душ", - "block.infernalexp.soul_slate_brick_stairs": "Ступени из кирпичного шифера душ", - "block.infernalexp.soul_slate_brick_slab": "Плита из кирпичного шифера душ", - "block.infernalexp.soul_slate_brick_vertical_slab": "Вертикальная плита из кирпичного шифера душ", - "block.infernalexp.cracked_soul_slate_bricks": "Потрескавшиеся кирпичи из шифера душ", - "block.infernalexp.chiseled_soul_slate_bricks": "Резные кирпичи из шифера душ", - "block.infernalexp.charged_chiseled_soul_slate_bricks": "Заряженные кирпичи из шифера душ", + "block.infernalexp.polished_soul_stone": "Шифер душ", + "block.infernalexp.polished_soul_stone_wall": "Ограда из шифера душ", + "block.infernalexp.polished_soul_stone_stairs": "Ступени из шифера душ", + "block.infernalexp.polished_soul_stone_button": "Кнопка из шифера душ", + "block.infernalexp.polished_soul_stone_slab": "Плита из шифера душ", + "block.infernalexp.polished_soul_stone_vertical_slab": "Вертикальная плита из шифера душ", + "block.infernalexp.polished_soul_stone_pressure_plate": "Нажимная плита из шифера душ", + "block.infernalexp.polished_soul_stone_bricks": "Кирпичи из шифера душ", + "block.infernalexp.polished_soul_stone_brick_wall": "Ограда из кирпичного шифера душ", + "block.infernalexp.polished_soul_stone_brick_stairs": "Ступени из кирпичного шифера душ", + "block.infernalexp.polished_soul_stone_brick_slab": "Плита из кирпичного шифера душ", + "block.infernalexp.polished_soul_stone_brick_vertical_slab": "Вертикальная плита из кирпичного шифера душ", + "block.infernalexp.cracked_polished_soul_stone_bricks": "Потрескавшиеся кирпичи из шифера душ", + "block.infernalexp.chiseled_polished_soul_stone_bricks": "Резные кирпичи из шифера душ", + "block.infernalexp.charged_chiseled_polished_soul_stone_bricks": "Заряженные кирпичи из шифера душ", "block.infernalexp.crimson_fungus_cap": "Шляпка багрового гриба", "block.infernalexp.warped_fungus_cap": "Шляпка искаженного гриба", "block.infernalexp.luminous_fungus_cap": "Шляпка светящегося гриба", diff --git a/src/main/resources/assets/infernalexp/lang/zh_tw.json b/src/main/resources/assets/infernalexp/lang/zh_tw.json index 95db4234a..7af43c429 100644 --- a/src/main/resources/assets/infernalexp/lang/zh_tw.json +++ b/src/main/resources/assets/infernalexp/lang/zh_tw.json @@ -104,21 +104,21 @@ "block.infernalexp.cracked_soul_stone_bricks": "Cracked Soul Stone Bricks", "block.infernalexp.chiseled_soul_stone_bricks": "Chiseled Soul Stone Brick", "block.infernalexp.charged_chiseled_soul_stone_bricks": "Charged Chiseled Soul Stone Brick", - "block.infernalexp.soul_slate": "Soul Slate", - "block.infernalexp.soul_slate_wall": "Soul Slate Wall", - "block.infernalexp.soul_slate_stairs": "Soul Slate Stairs", - "block.infernalexp.soul_slate_button": "Soul Slate Button", - "block.infernalexp.soul_slate_slab": "Soul Slate Slab", - "block.infernalexp.soul_slate_vertical_slab": "Soul Slate Vertical Slab", - "block.infernalexp.soul_slate_pressure_plate": "Soul Slate Pressure Plate", - "block.infernalexp.soul_slate_bricks": "Soul Slate Bricks", - "block.infernalexp.soul_slate_brick_wall": "Soul Slate Brick Wall", - "block.infernalexp.soul_slate_brick_stairs": "Soul Slate Brick Stairs", - "block.infernalexp.soul_slate_brick_slab": "Soul Slate Brick Slab", - "block.infernalexp.soul_slate_brick_vertical_slab": "Soul Slate Brick Vertical Slab", - "block.infernalexp.cracked_soul_slate_bricks": "Cracked Soul Slate Bricks", - "block.infernalexp.chiseled_soul_slate_bricks": "Chiseled Soul Slate Brick", - "block.infernalexp.charged_chiseled_soul_slate_bricks": "Charged Chiseled Soul Slate Brick", + "block.infernalexp.polished_soul_stone": "Polished Soul Stone", + "block.infernalexp.polished_soul_stone_wall": "Polished Soul Stone Wall", + "block.infernalexp.polished_soul_stone_stairs": "Polished Soul Stone Stairs", + "block.infernalexp.polished_soul_stone_button": "Polished Soul Stone Button", + "block.infernalexp.polished_soul_stone_slab": "Polished Soul Stone Slab", + "block.infernalexp.polished_soul_stone_vertical_slab": "Polished Soul Stone Vertical Slab", + "block.infernalexp.polished_soul_stone_pressure_plate": "Polished Soul Stone Pressure Plate", + "block.infernalexp.polished_soul_stone_bricks": "Polished Soul Stone Bricks", + "block.infernalexp.polished_soul_stone_brick_wall": "Polished Soul Stone Brick Wall", + "block.infernalexp.polished_soul_stone_brick_stairs": "Polished Soul Stone Brick Stairs", + "block.infernalexp.polished_soul_stone_brick_slab": "Polished Soul Stone Brick Slab", + "block.infernalexp.polished_soul_stone_brick_vertical_slab": "Polished Soul Stone Brick Vertical Slab", + "block.infernalexp.cracked_polished_soul_stone_bricks": "Cracked Polished Soul Stone Bricks", + "block.infernalexp.chiseled_polished_soul_stone_bricks": "Chiseled Polished Soul Stone Brick", + "block.infernalexp.charged_chiseled_polished_soul_stone_bricks": "Charged Chiseled Polished Soul Stone Brick", "block.infernalexp.crimson_fungus_cap": "Crimson Fungus Cap", "block.infernalexp.warped_fungus_cap": "Warped Fungus Cap", "block.infernalexp.luminous_fungus_cap": "Luminous Fungus Cap", diff --git a/src/main/resources/assets/infernalexp/models/block/charged_chiseled_soul_slate_bricks.json b/src/main/resources/assets/infernalexp/models/block/charged_chiseled_soul_slate_bricks.json index c974e0e28..382e4f8c2 100644 --- a/src/main/resources/assets/infernalexp/models/block/charged_chiseled_soul_slate_bricks.json +++ b/src/main/resources/assets/infernalexp/models/block/charged_chiseled_soul_slate_bricks.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_column", "textures": { - "end": "infernalexp:block/charged_chiseled_soul_slate_bricks_top", - "side": "infernalexp:block/charged_chiseled_soul_slate_bricks_anim" + "end": "infernalexp:block/charged_chiseled_polished_soul_stone_bricks_top", + "side": "infernalexp:block/charged_chiseled_polished_soul_stone_bricks_anim" } } diff --git a/src/main/resources/assets/infernalexp/models/block/chiseled_soul_slate_bricks.json b/src/main/resources/assets/infernalexp/models/block/chiseled_soul_slate_bricks.json index 0726f0a46..4438d06c4 100644 --- a/src/main/resources/assets/infernalexp/models/block/chiseled_soul_slate_bricks.json +++ b/src/main/resources/assets/infernalexp/models/block/chiseled_soul_slate_bricks.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_column", "textures": { - "end": "infernalexp:block/chiseled_soul_slate_bricks_top", - "side": "infernalexp:block/chiseled_soul_slate_bricks" + "end": "infernalexp:block/chiseled_polished_soul_stone_bricks_top", + "side": "infernalexp:block/chiseled_polished_soul_stone_bricks" } } diff --git a/src/main/resources/assets/infernalexp/models/block/cracked_soul_slate_bricks.json b/src/main/resources/assets/infernalexp/models/block/cracked_soul_slate_bricks.json index 77c221b63..ec86a2f1b 100644 --- a/src/main/resources/assets/infernalexp/models/block/cracked_soul_slate_bricks.json +++ b/src/main/resources/assets/infernalexp/models/block/cracked_soul_slate_bricks.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "infernalexp:block/cracked_soul_slate_bricks" + "all": "infernalexp:block/cracked_polished_soul_stone_bricks" } } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate.json b/src/main/resources/assets/infernalexp/models/block/soul_slate.json index 7e14ee9b7..6b60b6be8 100644 --- a/src/main/resources/assets/infernalexp/models/block/soul_slate.json +++ b/src/main/resources/assets/infernalexp/models/block/soul_slate.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "infernalexp:block/soul_slate" + "all": "infernalexp:block/polished_soul_stone" } } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_slab.json b/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_slab.json index 43b71f92b..02117284c 100644 --- a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_slab.json +++ b/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "bottom": "infernalexp:block/soul_slate_bricks", - "top": "infernalexp:block/soul_slate_bricks", - "side": "infernalexp:block/soul_slate_bricks" + "bottom": "infernalexp:block/polished_soul_stone_bricks", + "top": "infernalexp:block/polished_soul_stone_bricks", + "side": "infernalexp:block/polished_soul_stone_bricks" } } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_slab_top.json b/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_slab_top.json index a41ece773..f59296e4c 100644 --- a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_slab_top.json +++ b/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "bottom": "infernalexp:block/soul_slate_bricks", - "top": "infernalexp:block/soul_slate_bricks", - "side": "infernalexp:block/soul_slate_bricks" + "bottom": "infernalexp:block/polished_soul_stone_bricks", + "top": "infernalexp:block/polished_soul_stone_bricks", + "side": "infernalexp:block/polished_soul_stone_bricks" } } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_stairs.json b/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_stairs.json index be8c61619..2abd12c01 100644 --- a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_stairs.json +++ b/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/stairs", "textures": { - "bottom": "infernalexp:block/soul_slate_bricks", - "top": "infernalexp:block/soul_slate_bricks", - "side": "infernalexp:block/soul_slate_bricks" + "bottom": "infernalexp:block/polished_soul_stone_bricks", + "top": "infernalexp:block/polished_soul_stone_bricks", + "side": "infernalexp:block/polished_soul_stone_bricks" } } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_stairs_inner.json b/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_stairs_inner.json index 33c9bc126..899003f41 100644 --- a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_stairs_inner.json +++ b/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "block/inner_stairs", "textures": { - "bottom": "infernalexp:block/soul_slate_bricks", - "top": "infernalexp:block/soul_slate_bricks", - "side": "infernalexp:block/soul_slate_bricks" + "bottom": "infernalexp:block/polished_soul_stone_bricks", + "top": "infernalexp:block/polished_soul_stone_bricks", + "side": "infernalexp:block/polished_soul_stone_bricks" } } diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_stairs_outer.json b/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_stairs_outer.json index 93a98fe2c..19ad8ac87 100644 --- a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_stairs_outer.json +++ b/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "block/outer_stairs", "textures": { - "bottom": "infernalexp:block/soul_slate_bricks", - "top": "infernalexp:block/soul_slate_bricks", - "side": "infernalexp:block/soul_slate_bricks" + "bottom": "infernalexp:block/polished_soul_stone_bricks", + "top": "infernalexp:block/polished_soul_stone_bricks", + "side": "infernalexp:block/polished_soul_stone_bricks" } } diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_vertical_slab.json b/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_vertical_slab.json index 87dc87a0c..6afa506c5 100644 --- a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_vertical_slab.json +++ b/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_vertical_slab.json @@ -1,8 +1,8 @@ { "parent": "infernalexp:block/vertical_slab", "textures": { - "bottom": "infernalexp:block/soul_slate_bricks", - "top": "infernalexp:block/soul_slate_bricks", - "side": "infernalexp:block/soul_slate_bricks" + "bottom": "infernalexp:block/polished_soul_stone_bricks", + "top": "infernalexp:block/polished_soul_stone_bricks", + "side": "infernalexp:block/polished_soul_stone_bricks" } } diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_wall_inventory.json b/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_wall_inventory.json index 092f58755..c49478309 100644 --- a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_wall_inventory.json +++ b/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_wall_inventory.json @@ -1,6 +1,6 @@ { "parent": "block/wall_inventory", "textures": { - "wall": "infernalexp:block/soul_slate_bricks" + "wall": "infernalexp:block/polished_soul_stone_bricks" } } diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_wall_post.json b/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_wall_post.json index ce0351779..95d1d90f5 100644 --- a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_wall_post.json +++ b/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_wall_post.json @@ -1,6 +1,6 @@ { "parent": "block/template_wall_post", "textures": { - "wall": "infernalexp:block/soul_slate_bricks" + "wall": "infernalexp:block/polished_soul_stone_bricks" } } diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_wall_side.json b/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_wall_side.json index 433de963f..8000aa2ee 100644 --- a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_wall_side.json +++ b/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_wall_side.json @@ -1,6 +1,6 @@ { "parent": "block/template_wall_side", "textures": { - "wall": "infernalexp:block/soul_slate_bricks" + "wall": "infernalexp:block/polished_soul_stone_bricks" } } diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_wall_side_tall.json b/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_wall_side_tall.json index 5a3997350..e91cedb1e 100644 --- a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_wall_side_tall.json +++ b/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_wall_side_tall.json @@ -1,6 +1,6 @@ { "parent": "block/template_wall_side_tall", "textures": { - "wall": "infernalexp:block/soul_slate_bricks" + "wall": "infernalexp:block/polished_soul_stone_bricks" } } diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_bricks.json b/src/main/resources/assets/infernalexp/models/block/soul_slate_bricks.json index cbef25a8b..ae5b90406 100644 --- a/src/main/resources/assets/infernalexp/models/block/soul_slate_bricks.json +++ b/src/main/resources/assets/infernalexp/models/block/soul_slate_bricks.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "infernalexp:block/soul_slate_bricks" + "all": "infernalexp:block/polished_soul_stone_bricks" } } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_button.json b/src/main/resources/assets/infernalexp/models/block/soul_slate_button.json index 3f1f9fba4..e613b7b6c 100644 --- a/src/main/resources/assets/infernalexp/models/block/soul_slate_button.json +++ b/src/main/resources/assets/infernalexp/models/block/soul_slate_button.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/button", "textures": { - "texture": "infernalexp:block/soul_slate" + "texture": "infernalexp:block/polished_soul_stone" } } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_button_inventory.json b/src/main/resources/assets/infernalexp/models/block/soul_slate_button_inventory.json index 735935072..0ef1f36fb 100644 --- a/src/main/resources/assets/infernalexp/models/block/soul_slate_button_inventory.json +++ b/src/main/resources/assets/infernalexp/models/block/soul_slate_button_inventory.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/button_inventory", "textures": { - "texture": "infernalexp:block/soul_slate" + "texture": "infernalexp:block/polished_soul_stone" } } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_button_pressed.json b/src/main/resources/assets/infernalexp/models/block/soul_slate_button_pressed.json index 0cde97416..587ebdf87 100644 --- a/src/main/resources/assets/infernalexp/models/block/soul_slate_button_pressed.json +++ b/src/main/resources/assets/infernalexp/models/block/soul_slate_button_pressed.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/button_pressed", "textures": { - "texture": "infernalexp:block/soul_slate" + "texture": "infernalexp:block/polished_soul_stone" } } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_pressure_plate.json b/src/main/resources/assets/infernalexp/models/block/soul_slate_pressure_plate.json index 7656d222c..3b771f689 100644 --- a/src/main/resources/assets/infernalexp/models/block/soul_slate_pressure_plate.json +++ b/src/main/resources/assets/infernalexp/models/block/soul_slate_pressure_plate.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/pressure_plate_up", "textures": { - "texture": "infernalexp:block/soul_slate" + "texture": "infernalexp:block/polished_soul_stone" } } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_pressure_plate_down.json b/src/main/resources/assets/infernalexp/models/block/soul_slate_pressure_plate_down.json index 7cd83aad2..3bc4145f6 100644 --- a/src/main/resources/assets/infernalexp/models/block/soul_slate_pressure_plate_down.json +++ b/src/main/resources/assets/infernalexp/models/block/soul_slate_pressure_plate_down.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/pressure_plate_down", "textures": { - "texture": "infernalexp:block/soul_slate_lit" + "texture": "infernalexp:block/polished_soul_stone_lit" } } diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_slab.json b/src/main/resources/assets/infernalexp/models/block/soul_slate_slab.json index 55dcbc050..a257d6167 100644 --- a/src/main/resources/assets/infernalexp/models/block/soul_slate_slab.json +++ b/src/main/resources/assets/infernalexp/models/block/soul_slate_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "bottom": "infernalexp:block/soul_slate", - "top": "infernalexp:block/soul_slate", - "side": "infernalexp:block/soul_slate" + "bottom": "infernalexp:block/polished_soul_stone", + "top": "infernalexp:block/polished_soul_stone", + "side": "infernalexp:block/polished_soul_stone" } } diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_slab_top.json b/src/main/resources/assets/infernalexp/models/block/soul_slate_slab_top.json index 35faa837c..55a95567a 100644 --- a/src/main/resources/assets/infernalexp/models/block/soul_slate_slab_top.json +++ b/src/main/resources/assets/infernalexp/models/block/soul_slate_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "bottom": "infernalexp:block/soul_slate", - "top": "infernalexp:block/soul_slate", - "side": "infernalexp:block/soul_slate" + "bottom": "infernalexp:block/polished_soul_stone", + "top": "infernalexp:block/polished_soul_stone", + "side": "infernalexp:block/polished_soul_stone" } } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_stairs.json b/src/main/resources/assets/infernalexp/models/block/soul_slate_stairs.json index 625a8ba82..cbbdabc9b 100644 --- a/src/main/resources/assets/infernalexp/models/block/soul_slate_stairs.json +++ b/src/main/resources/assets/infernalexp/models/block/soul_slate_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/stairs", "textures": { - "bottom": "infernalexp:block/soul_slate", - "top": "infernalexp:block/soul_slate", - "side": "infernalexp:block/soul_slate" + "bottom": "infernalexp:block/polished_soul_stone", + "top": "infernalexp:block/polished_soul_stone", + "side": "infernalexp:block/polished_soul_stone" } } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_stairs_inner.json b/src/main/resources/assets/infernalexp/models/block/soul_slate_stairs_inner.json index cfe80cd8e..18562ebd2 100644 --- a/src/main/resources/assets/infernalexp/models/block/soul_slate_stairs_inner.json +++ b/src/main/resources/assets/infernalexp/models/block/soul_slate_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "block/inner_stairs", "textures": { - "bottom": "infernalexp:block/soul_slate", - "top": "infernalexp:block/soul_slate", - "side": "infernalexp:block/soul_slate" + "bottom": "infernalexp:block/polished_soul_stone", + "top": "infernalexp:block/polished_soul_stone", + "side": "infernalexp:block/polished_soul_stone" } } diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_stairs_outer.json b/src/main/resources/assets/infernalexp/models/block/soul_slate_stairs_outer.json index ccbc16973..f4568f548 100644 --- a/src/main/resources/assets/infernalexp/models/block/soul_slate_stairs_outer.json +++ b/src/main/resources/assets/infernalexp/models/block/soul_slate_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "block/outer_stairs", "textures": { - "bottom": "infernalexp:block/soul_slate", - "top": "infernalexp:block/soul_slate", - "side": "infernalexp:block/soul_slate" + "bottom": "infernalexp:block/polished_soul_stone", + "top": "infernalexp:block/polished_soul_stone", + "side": "infernalexp:block/polished_soul_stone" } } diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_vertical_slab.json b/src/main/resources/assets/infernalexp/models/block/soul_slate_vertical_slab.json index 431a14110..59dcc8e9a 100644 --- a/src/main/resources/assets/infernalexp/models/block/soul_slate_vertical_slab.json +++ b/src/main/resources/assets/infernalexp/models/block/soul_slate_vertical_slab.json @@ -1,8 +1,8 @@ { "parent": "infernalexp:block/vertical_slab", "textures": { - "bottom": "infernalexp:block/soul_slate", - "top": "infernalexp:block/soul_slate", - "side": "infernalexp:block/soul_slate" + "bottom": "infernalexp:block/polished_soul_stone", + "top": "infernalexp:block/polished_soul_stone", + "side": "infernalexp:block/polished_soul_stone" } } diff --git a/src/main/resources/assets/infernalexp/models/item/charged_chiseled_soul_slate_bricks.json b/src/main/resources/assets/infernalexp/models/item/charged_chiseled_soul_slate_bricks.json index 617a6f08a..f18d28e25 100644 --- a/src/main/resources/assets/infernalexp/models/item/charged_chiseled_soul_slate_bricks.json +++ b/src/main/resources/assets/infernalexp/models/item/charged_chiseled_soul_slate_bricks.json @@ -1,3 +1,3 @@ { - "parent": "infernalexp:block/charged_chiseled_soul_slate_bricks" + "parent": "infernalexp:block/charged_chiseled_polished_soul_stone_bricks" } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/chiseled_soul_slate_bricks.json b/src/main/resources/assets/infernalexp/models/item/chiseled_soul_slate_bricks.json index 79b52e236..ba86903ec 100644 --- a/src/main/resources/assets/infernalexp/models/item/chiseled_soul_slate_bricks.json +++ b/src/main/resources/assets/infernalexp/models/item/chiseled_soul_slate_bricks.json @@ -1,3 +1,3 @@ { - "parent": "infernalexp:block/chiseled_soul_slate_bricks" + "parent": "infernalexp:block/chiseled_polished_soul_stone_bricks" } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/cracked_soul_slate_bricks.json b/src/main/resources/assets/infernalexp/models/item/cracked_soul_slate_bricks.json index 1455078d2..997660dbd 100644 --- a/src/main/resources/assets/infernalexp/models/item/cracked_soul_slate_bricks.json +++ b/src/main/resources/assets/infernalexp/models/item/cracked_soul_slate_bricks.json @@ -1,3 +1,3 @@ { - "parent": "infernalexp:block/cracked_soul_slate_bricks" + "parent": "infernalexp:block/cracked_polished_soul_stone_bricks" } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/soul_slate.json b/src/main/resources/assets/infernalexp/models/item/soul_slate.json index fe05f2835..d27f3050a 100644 --- a/src/main/resources/assets/infernalexp/models/item/soul_slate.json +++ b/src/main/resources/assets/infernalexp/models/item/soul_slate.json @@ -1,3 +1,3 @@ { - "parent": "infernalexp:block/soul_slate" + "parent": "infernalexp:block/polished_soul_stone" } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/soul_slate_brick_slab.json b/src/main/resources/assets/infernalexp/models/item/soul_slate_brick_slab.json index e02fcf62f..d6f190160 100644 --- a/src/main/resources/assets/infernalexp/models/item/soul_slate_brick_slab.json +++ b/src/main/resources/assets/infernalexp/models/item/soul_slate_brick_slab.json @@ -1,3 +1,3 @@ { - "parent": "infernalexp:block/soul_slate_brick_slab" + "parent": "infernalexp:block/polished_soul_stone_brick_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/soul_slate_brick_stairs.json b/src/main/resources/assets/infernalexp/models/item/soul_slate_brick_stairs.json index 37acea33d..e76c9e77c 100644 --- a/src/main/resources/assets/infernalexp/models/item/soul_slate_brick_stairs.json +++ b/src/main/resources/assets/infernalexp/models/item/soul_slate_brick_stairs.json @@ -1,3 +1,3 @@ { - "parent": "infernalexp:block/soul_slate_brick_stairs" + "parent": "infernalexp:block/polished_soul_stone_brick_stairs" } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/soul_slate_brick_vertical_slab.json b/src/main/resources/assets/infernalexp/models/item/soul_slate_brick_vertical_slab.json index dda2ad739..72934f392 100644 --- a/src/main/resources/assets/infernalexp/models/item/soul_slate_brick_vertical_slab.json +++ b/src/main/resources/assets/infernalexp/models/item/soul_slate_brick_vertical_slab.json @@ -1,3 +1,3 @@ { - "parent": "infernalexp:block/soul_slate_brick_vertical_slab" + "parent": "infernalexp:block/polished_soul_stone_brick_vertical_slab" } diff --git a/src/main/resources/assets/infernalexp/models/item/soul_slate_brick_wall.json b/src/main/resources/assets/infernalexp/models/item/soul_slate_brick_wall.json index 6e7f057bc..23a6f6076 100644 --- a/src/main/resources/assets/infernalexp/models/item/soul_slate_brick_wall.json +++ b/src/main/resources/assets/infernalexp/models/item/soul_slate_brick_wall.json @@ -1,3 +1,3 @@ { - "parent": "infernalexp:block/soul_slate_brick_wall_inventory" + "parent": "infernalexp:block/polished_soul_stone_brick_wall_inventory" } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/soul_slate_bricks.json b/src/main/resources/assets/infernalexp/models/item/soul_slate_bricks.json index bd9418204..37d6e8d44 100644 --- a/src/main/resources/assets/infernalexp/models/item/soul_slate_bricks.json +++ b/src/main/resources/assets/infernalexp/models/item/soul_slate_bricks.json @@ -1,3 +1,3 @@ { - "parent": "infernalexp:block/soul_slate_bricks" + "parent": "infernalexp:block/polished_soul_stone_bricks" } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/soul_slate_button.json b/src/main/resources/assets/infernalexp/models/item/soul_slate_button.json index dd901a5ef..826b7f7bf 100644 --- a/src/main/resources/assets/infernalexp/models/item/soul_slate_button.json +++ b/src/main/resources/assets/infernalexp/models/item/soul_slate_button.json @@ -1,3 +1,3 @@ { - "parent": "infernalexp:block/soul_slate_button_inventory" + "parent": "infernalexp:block/polished_soul_stone_button_inventory" } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/soul_slate_pressure_plate.json b/src/main/resources/assets/infernalexp/models/item/soul_slate_pressure_plate.json index 879c822af..679c194db 100644 --- a/src/main/resources/assets/infernalexp/models/item/soul_slate_pressure_plate.json +++ b/src/main/resources/assets/infernalexp/models/item/soul_slate_pressure_plate.json @@ -1,3 +1,3 @@ { - "parent": "infernalexp:block/soul_slate_pressure_plate" + "parent": "infernalexp:block/polished_soul_stone_pressure_plate" } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/soul_slate_slab.json b/src/main/resources/assets/infernalexp/models/item/soul_slate_slab.json index ae760b993..b27ebc3a1 100644 --- a/src/main/resources/assets/infernalexp/models/item/soul_slate_slab.json +++ b/src/main/resources/assets/infernalexp/models/item/soul_slate_slab.json @@ -1,3 +1,3 @@ { - "parent": "infernalexp:block/soul_slate_slab" + "parent": "infernalexp:block/polished_soul_stone_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/soul_slate_stairs.json b/src/main/resources/assets/infernalexp/models/item/soul_slate_stairs.json index 2b25a0940..54225f030 100644 --- a/src/main/resources/assets/infernalexp/models/item/soul_slate_stairs.json +++ b/src/main/resources/assets/infernalexp/models/item/soul_slate_stairs.json @@ -1,3 +1,3 @@ { - "parent": "infernalexp:block/soul_slate_stairs" + "parent": "infernalexp:block/polished_soul_stone_stairs" } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/soul_slate_vertical_slab.json b/src/main/resources/assets/infernalexp/models/item/soul_slate_vertical_slab.json index 89da3aba5..e2ee0bd2f 100644 --- a/src/main/resources/assets/infernalexp/models/item/soul_slate_vertical_slab.json +++ b/src/main/resources/assets/infernalexp/models/item/soul_slate_vertical_slab.json @@ -1,3 +1,3 @@ { - "parent": "infernalexp:block/soul_slate_vertical_slab" + "parent": "infernalexp:block/polished_soul_stone_vertical_slab" } diff --git a/src/main/resources/data/infernalexp/advancements/recipes/redstone/soul_slate_button.json b/src/main/resources/data/infernalexp/advancements/recipes/redstone/polished_soul_stone_button.json similarity index 59% rename from src/main/resources/data/infernalexp/advancements/recipes/redstone/soul_slate_button.json rename to src/main/resources/data/infernalexp/advancements/recipes/redstone/polished_soul_stone_button.json index 3d22d8d82..53df553f3 100644 --- a/src/main/resources/data/infernalexp/advancements/recipes/redstone/soul_slate_button.json +++ b/src/main/resources/data/infernalexp/advancements/recipes/redstone/polished_soul_stone_button.json @@ -2,16 +2,16 @@ "parent": "infernalexp:recipes/root", "rewards": { "recipes": [ - "infernalexp:crafting/crafting_shapeless/soul_slate_button" + "infernalexp:crafting/crafting_shapeless/polished_soul_stone_button" ] }, "criteria": { - "has_soul_slate": { + "has_polished_soul_stone": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "infernalexp:soul_slate" + "item": "infernalexp:polished_soul_stone" } ] } @@ -19,13 +19,13 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "infernalexp:crafting/crafting_shapeless/soul_slate_button" + "recipe": "infernalexp:crafting/crafting_shapeless/polished_soul_stone_button" } } }, "requirements": [ [ - "has_soul_slate", + "has_polished_soul_stone", "has_the_recipe" ] ] diff --git a/src/main/resources/data/infernalexp/advancements/recipes/redstone/soul_slate_pressure_plate.json b/src/main/resources/data/infernalexp/advancements/recipes/redstone/polished_soul_stone_pressure_plate.json similarity index 58% rename from src/main/resources/data/infernalexp/advancements/recipes/redstone/soul_slate_pressure_plate.json rename to src/main/resources/data/infernalexp/advancements/recipes/redstone/polished_soul_stone_pressure_plate.json index 1609127a4..a27046409 100644 --- a/src/main/resources/data/infernalexp/advancements/recipes/redstone/soul_slate_pressure_plate.json +++ b/src/main/resources/data/infernalexp/advancements/recipes/redstone/polished_soul_stone_pressure_plate.json @@ -2,16 +2,16 @@ "parent": "infernalexp:recipes/root", "rewards": { "recipes": [ - "infernalexp:crafting/crafting_shaped/soul_slate_pressure_plate" + "infernalexp:crafting/crafting_shaped/polished_soul_stone_pressure_plate" ] }, "criteria": { - "has_soul_slate": { + "has_polished_soul_stone": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "infernalexp:soul_slate" + "item": "infernalexp:polished_soul_stone" } ] } @@ -19,13 +19,13 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "infernalexp:crafting/crafting_shaped/soul_slate_pressure_plate" + "recipe": "infernalexp:crafting/crafting_shaped/polished_soul_stone_pressure_plate" } } }, "requirements": [ [ - "has_soul_slate", + "has_polished_soul_stone", "has_the_recipe" ] ] diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/charged_chiseled_polished_soul_stone_bricks.json b/src/main/resources/data/infernalexp/loot_tables/blocks/charged_chiseled_polished_soul_stone_bricks.json new file mode 100644 index 000000000..a394a57d2 --- /dev/null +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/charged_chiseled_polished_soul_stone_bricks.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "infernalexp:chiseled_polished_soul_stone_bricks" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/chiseled_polished_soul_stone_bricks.json b/src/main/resources/data/infernalexp/loot_tables/blocks/chiseled_polished_soul_stone_bricks.json new file mode 100644 index 000000000..a394a57d2 --- /dev/null +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/chiseled_polished_soul_stone_bricks.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "infernalexp:chiseled_polished_soul_stone_bricks" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/cracked_polished_soul_stone_bricks.json b/src/main/resources/data/infernalexp/loot_tables/blocks/cracked_polished_soul_stone_bricks.json new file mode 100644 index 000000000..e0c6250d8 --- /dev/null +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/cracked_polished_soul_stone_bricks.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "infernalexp:cracked_polished_soul_stone_bricks" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_button.json b/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone.json similarity index 83% rename from src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_button.json rename to src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone.json index 76428cbc0..e87c5d71e 100644 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_button.json +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "infernalexp:soul_slate_button" + "name": "infernalexp:polished_soul_stone" } ], "conditions": [ diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_brick_slab.json b/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_brick_slab.json new file mode 100644 index 000000000..28fdbcd3a --- /dev/null +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_brick_slab.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "infernalexp:polished_soul_stone_brick_slab" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_brick_stairs.json b/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_brick_stairs.json new file mode 100644 index 000000000..32c1d3817 --- /dev/null +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_brick_stairs.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "infernalexp:polished_soul_stone_brick_stairs" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_vertical_slab.json b/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_brick_vertical_slab.json similarity index 78% rename from src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_vertical_slab.json rename to src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_brick_vertical_slab.json index 3b6ae280c..6c0a87cc8 100644 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_vertical_slab.json +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_brick_vertical_slab.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "infernalexp:soul_slate_vertical_slab" + "name": "infernalexp:polished_soul_stone_brick_vertical_slab" } ], "conditions": [ diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_brick_wall.json b/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_brick_wall.json new file mode 100644 index 000000000..9a38cb45d --- /dev/null +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_brick_wall.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "infernalexp:polished_soul_stone_brick_wall" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/cracked_soul_slate_bricks.json b/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_bricks.json similarity index 81% rename from src/main/resources/data/infernalexp/loot_tables/blocks/cracked_soul_slate_bricks.json rename to src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_bricks.json index f345ea743..8a3712413 100644 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/cracked_soul_slate_bricks.json +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_bricks.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "infernalexp:cracked_soul_slate_bricks" + "name": "infernalexp:polished_soul_stone_bricks" } ], "conditions": [ diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/charged_chiseled_soul_slate_bricks.json b/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_button.json similarity index 81% rename from src/main/resources/data/infernalexp/loot_tables/blocks/charged_chiseled_soul_slate_bricks.json rename to src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_button.json index 7443e7def..9fbb4f215 100644 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/charged_chiseled_soul_slate_bricks.json +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_button.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "infernalexp:chiseled_soul_slate_bricks" + "name": "infernalexp:polished_soul_stone_button" } ], "conditions": [ diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_pressure_plate.json b/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_pressure_plate.json new file mode 100644 index 000000000..11f17f774 --- /dev/null +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_pressure_plate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "infernalexp:polished_soul_stone_pressure_plate" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate.json b/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_slab.json similarity index 82% rename from src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate.json rename to src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_slab.json index 4f8bf8e3d..c15cdf961 100644 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate.json +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_slab.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "infernalexp:soul_slate" + "name": "infernalexp:polished_soul_stone_slab" } ], "conditions": [ diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/chiseled_soul_slate_bricks.json b/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_stairs.json similarity index 81% rename from src/main/resources/data/infernalexp/loot_tables/blocks/chiseled_soul_slate_bricks.json rename to src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_stairs.json index 7443e7def..113d21b6d 100644 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/chiseled_soul_slate_bricks.json +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_stairs.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "infernalexp:chiseled_soul_slate_bricks" + "name": "infernalexp:polished_soul_stone_stairs" } ], "conditions": [ diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_brick_vertical_slab.json b/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_vertical_slab.json similarity index 80% rename from src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_brick_vertical_slab.json rename to src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_vertical_slab.json index 12ae87747..066efaf83 100644 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_brick_vertical_slab.json +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/polished_soul_stone_vertical_slab.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "infernalexp:soul_slate_brick_vertical_slab" + "name": "infernalexp:polished_soul_stone_vertical_slab" } ], "conditions": [ diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_brick_slab.json b/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_brick_slab.json deleted file mode 100644 index 81aa1bdc8..000000000 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_brick_slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "infernalexp:soul_slate_brick_slab" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_brick_stairs.json b/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_brick_stairs.json deleted file mode 100644 index 986a22a20..000000000 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_brick_stairs.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "infernalexp:soul_slate_brick_stairs" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_brick_wall.json b/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_brick_wall.json deleted file mode 100644 index f3035dfe6..000000000 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_brick_wall.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "infernalexp:soul_slate_brick_wall" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_bricks.json b/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_bricks.json deleted file mode 100644 index 4bb434f11..000000000 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_bricks.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "infernalexp:soul_slate_bricks" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_pressure_plate.json b/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_pressure_plate.json deleted file mode 100644 index 6f550e150..000000000 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_pressure_plate.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "infernalexp:soul_slate_pressure_plate" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_slab.json b/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_slab.json deleted file mode 100644 index 0b39676b4..000000000 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "infernalexp:soul_slate_slab" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_stairs.json b/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_stairs.json deleted file mode 100644 index 37362f86c..000000000 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/soul_slate_stairs.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "infernalexp:soul_slate_stairs" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/charged_chiseled_soul_slate_bricks.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/charged_chiseled_polished_soul_stone_bricks.json similarity index 62% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/charged_chiseled_soul_slate_bricks.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/charged_chiseled_polished_soul_stone_bricks.json index 65ef1669b..0c35aaa8f 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/charged_chiseled_soul_slate_bricks.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/charged_chiseled_polished_soul_stone_bricks.json @@ -7,14 +7,14 @@ ], "key": { "x": { - "item": "infernalexp:soul_slate_brick_slab" + "item": "infernalexp:polished_soul_stone_brick_slab" }, "y": { "item": "infernalexp:soul_salt_clump" } }, "result": { - "item": "infernalexp:charged_chiseled_soul_slate_bricks", + "item": "infernalexp:charged_chiseled_polished_soul_stone_bricks", "count": 1 } } diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/chiseled_soul_slate_bricks.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/chiseled_polished_soul_stone_bricks.json similarity index 55% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/chiseled_soul_slate_bricks.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/chiseled_polished_soul_stone_bricks.json index d008148da..66c813ce4 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/chiseled_soul_slate_bricks.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/chiseled_polished_soul_stone_bricks.json @@ -6,11 +6,11 @@ ], "key": { "x": { - "item": "infernalexp:soul_slate_brick_slab" + "item": "infernalexp:polished_soul_stone_brick_slab" } }, "result": { - "item": "infernalexp:chiseled_soul_slate_bricks", + "item": "infernalexp:chiseled_polished_soul_stone_bricks", "count": 1 } } diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_vertical_slab.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_brick_vertical_slab.json similarity index 67% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_vertical_slab.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_brick_vertical_slab.json index d18094831..d6684574c 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_vertical_slab.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_brick_vertical_slab.json @@ -7,11 +7,11 @@ ], "key": { "#": { - "item": "infernalexp:soul_slate_slab" + "item": "infernalexp:polished_soul_stone_brick_slab" } }, "result": { - "item": "infernalexp:soul_slate_vertical_slab", + "item": "infernalexp:polished_soul_stone_brick_vertical_slab", "count": 3 }, "conditions": [ diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_bricks.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_bricks.json similarity index 59% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_bricks.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_bricks.json index a1eceded2..b0e2de308 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_bricks.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_bricks.json @@ -6,11 +6,11 @@ ], "key": { "x": { - "item": "infernalexp:soul_slate" + "item": "infernalexp:polished_soul_stone" } }, "result": { - "item": "infernalexp:soul_slate_bricks", + "item": "infernalexp:polished_soul_stone_bricks", "count": 4 } } diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_slab.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_bricks_slab.json similarity index 55% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_slab.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_bricks_slab.json index a51ba6cea..58aeac4fa 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_slab.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_bricks_slab.json @@ -5,11 +5,11 @@ ], "key": { "x": { - "item": "infernalexp:soul_slate" + "item": "infernalexp:polished_soul_stone_bricks" } }, "result": { - "item": "infernalexp:soul_slate_slab", + "item": "infernalexp:polished_soul_stone_brick_slab", "count": 6 } } diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_bricks_stairs.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_bricks_stairs.json similarity index 58% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_bricks_stairs.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_bricks_stairs.json index 83ff06bfc..b6c58b89a 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_bricks_stairs.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_bricks_stairs.json @@ -7,11 +7,11 @@ ], "key": { "x": { - "item": "infernalexp:soul_slate_bricks" + "item": "infernalexp:polished_soul_stone_bricks" } }, "result": { - "item": "infernalexp:soul_slate_brick_stairs", + "item": "infernalexp:polished_soul_stone_brick_stairs", "count": 4 } } diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_bricks_wall.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_bricks_wall.json similarity index 57% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_bricks_wall.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_bricks_wall.json index 348ad22a6..d0c123ba4 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_bricks_wall.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_bricks_wall.json @@ -6,11 +6,11 @@ ], "key": { "x": { - "item": "infernalexp:soul_slate_bricks" + "item": "infernalexp:polished_soul_stone_bricks" } }, "result": { - "item": "infernalexp:soul_slate_brick_wall", + "item": "infernalexp:polished_soul_stone_brick_wall", "count": 6 } } diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_pressure_plate.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_pressure_plate.json similarity index 53% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_pressure_plate.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_pressure_plate.json index 680bb2cc5..1ddb534aa 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_pressure_plate.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_pressure_plate.json @@ -5,10 +5,10 @@ ], "key": { "x": { - "item": "infernalexp:soul_slate" + "item": "infernalexp:polished_soul_stone" } }, "result": { - "item": "infernalexp:soul_slate_pressure_plate" + "item": "infernalexp:polished_soul_stone_pressure_plate" } } diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_bricks_slab.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_slab.json similarity index 58% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_bricks_slab.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_slab.json index 7de2b2eff..5bf8a91c9 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_bricks_slab.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_slab.json @@ -5,11 +5,11 @@ ], "key": { "x": { - "item": "infernalexp:soul_slate_bricks" + "item": "infernalexp:polished_soul_stone" } }, "result": { - "item": "infernalexp:soul_slate_brick_slab", + "item": "infernalexp:polished_soul_stone_slab", "count": 6 } } diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_stairs.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_stairs.json similarity index 61% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_stairs.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_stairs.json index a56c06ee6..104c389c7 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_stairs.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_stairs.json @@ -7,11 +7,11 @@ ], "key": { "x": { - "item": "infernalexp:soul_slate" + "item": "infernalexp:polished_soul_stone" } }, "result": { - "item": "infernalexp:soul_slate_stairs", + "item": "infernalexp:polished_soul_stone_stairs", "count": 4 } } diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_brick_vertical_slab.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_vertical_slab.json similarity index 69% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_brick_vertical_slab.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_vertical_slab.json index 611b6dfde..3ee20fd4b 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/soul_slate_brick_vertical_slab.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/polished_soul_stone_vertical_slab.json @@ -7,11 +7,11 @@ ], "key": { "#": { - "item": "infernalexp:soul_slate_brick_slab" + "item": "infernalexp:polished_soul_stone_slab" } }, "result": { - "item": "infernalexp:soul_slate_brick_vertical_slab", + "item": "infernalexp:polished_soul_stone_vertical_slab", "count": 3 }, "conditions": [ diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/polished_soul_stone_brick_slab.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/polished_soul_stone_brick_slab.json new file mode 100644 index 000000000..f96c4b15a --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/polished_soul_stone_brick_slab.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "infernalexp:polished_soul_stone_brick_vertical_slab" + } + ], + "result": { + "item": "infernalexp:polished_soul_stone_brick_slab" + } +} diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/polished_soul_stone_button.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/polished_soul_stone_button.json new file mode 100644 index 000000000..8e63e00c3 --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/polished_soul_stone_button.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "infernalexp:polished_soul_stone" + } + ], + "result": { + "item": "infernalexp:polished_soul_stone_button" + } +} diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/polished_soul_stone_slab.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/polished_soul_stone_slab.json new file mode 100644 index 000000000..a9bc5af42 --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/polished_soul_stone_slab.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "infernalexp:polished_soul_stone_vertical_slab" + } + ], + "result": { + "item": "infernalexp:polished_soul_stone_slab" + } +} diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/soul_slate_brick_slab.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/soul_slate_brick_slab.json deleted file mode 100644 index dc0053b04..000000000 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/soul_slate_brick_slab.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "infernalexp:soul_slate_brick_vertical_slab" - } - ], - "result": { - "item": "infernalexp:soul_slate_brick_slab" - } -} diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/soul_slate_button.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/soul_slate_button.json deleted file mode 100644 index 6190143c7..000000000 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/soul_slate_button.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "infernalexp:soul_slate" - } - ], - "result": { - "item": "infernalexp:soul_slate_button" - } -} diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/soul_slate_slab.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/soul_slate_slab.json deleted file mode 100644 index 5890b52da..000000000 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/soul_slate_slab.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "infernalexp:soul_slate_vertical_slab" - } - ], - "result": { - "item": "infernalexp:soul_slate_slab" - } -} diff --git a/src/main/resources/data/infernalexp/recipes/smelting/cracked_polished_soul_stone_bricks.json b/src/main/resources/data/infernalexp/recipes/smelting/cracked_polished_soul_stone_bricks.json new file mode 100644 index 000000000..247d21659 --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/smelting/cracked_polished_soul_stone_bricks.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "infernalexp:polished_soul_stone_bricks" + }, + "result": "infernalexp:cracked_polished_soul_stone_bricks", + "experience": 0.1, + "cookingtime": 200 +} diff --git a/src/main/resources/data/infernalexp/recipes/smelting/cracked_soul_slate_bricks.json b/src/main/resources/data/infernalexp/recipes/smelting/cracked_soul_slate_bricks.json deleted file mode 100644 index 8520604b6..000000000 --- a/src/main/resources/data/infernalexp/recipes/smelting/cracked_soul_slate_bricks.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "item": "infernalexp:soul_slate_bricks" - }, - "result": "infernalexp:cracked_soul_slate_bricks", - "experience": 0.1, - "cookingtime": 200 -} diff --git a/src/main/resources/data/infernalexp/recipes/smelting/soul_slate.json b/src/main/resources/data/infernalexp/recipes/smelting/polished_soul_stone.json similarity index 74% rename from src/main/resources/data/infernalexp/recipes/smelting/soul_slate.json rename to src/main/resources/data/infernalexp/recipes/smelting/polished_soul_stone.json index b6b5a74a2..2632ec8c9 100644 --- a/src/main/resources/data/infernalexp/recipes/smelting/soul_slate.json +++ b/src/main/resources/data/infernalexp/recipes/smelting/polished_soul_stone.json @@ -3,7 +3,7 @@ "ingredient": { "item": "minecraft:soul_soil" }, - "result": "infernalexp:soul_slate", + "result": "infernalexp:polished_soul_stone", "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_polished_soul_stone_brick_from_polished_soul_stone.json b/src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_polished_soul_stone_brick_from_polished_soul_stone.json new file mode 100644 index 000000000..6036a1761 --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_polished_soul_stone_brick_from_polished_soul_stone.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "infernalexp:polished_soul_stone" + }, + "result": "infernalexp:chiseled_polished_soul_stone_bricks", + "count": 1 +} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_polished_soul_stone_brick_from_polished_soul_stone_bricks.json b/src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_polished_soul_stone_brick_from_polished_soul_stone_bricks.json new file mode 100644 index 000000000..dd7c40d78 --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_polished_soul_stone_brick_from_polished_soul_stone_bricks.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "infernalexp:polished_soul_stone_bricks" + }, + "result": "infernalexp:chiseled_polished_soul_stone_bricks", + "count": 1 +} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_soul_stone_brick_from_soul_stone.json b/src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_polished_soul_stone_brick_from_soul_stone.json similarity index 64% rename from src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_soul_stone_brick_from_soul_stone.json rename to src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_polished_soul_stone_brick_from_soul_stone.json index 47fcf3281..453e10bee 100644 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_soul_stone_brick_from_soul_stone.json +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_polished_soul_stone_brick_from_soul_stone.json @@ -3,6 +3,6 @@ "ingredient": { "item": "infernalexp:soul_stone" }, - "result": "infernalexp:chiseled_soul_slate_bricks", + "result": "infernalexp:chiseled_polished_soul_stone_bricks", "count": 1 } diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_soul_slate_brick_from_soul_slate.json b/src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_soul_slate_brick_from_soul_slate.json deleted file mode 100644 index 3fbc6adce..000000000 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_soul_slate_brick_from_soul_slate.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "infernalexp:soul_slate" - }, - "result": "infernalexp:chiseled_soul_slate_bricks", - "count": 1 -} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_soul_slate_brick_from_soul_slate_bricks.json b/src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_soul_slate_brick_from_soul_slate_bricks.json deleted file mode 100644 index 970bf36d1..000000000 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_soul_slate_brick_from_soul_slate_bricks.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "infernalexp:soul_slate_bricks" - }, - "result": "infernalexp:chiseled_soul_slate_bricks", - "count": 1 -} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_brick_wall_from_polished_soul_stone.json b/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_brick_wall_from_polished_soul_stone.json new file mode 100644 index 000000000..6d6e6a7e6 --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_brick_wall_from_polished_soul_stone.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "infernalexp:polished_soul_stone" + }, + "result": "infernalexp:polished_soul_stone_brick_wall", + "count": 1 +} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_brick_wall_from_polished_soul_stone_bricks.json b/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_brick_wall_from_polished_soul_stone_bricks.json new file mode 100644 index 000000000..235a82dc3 --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_brick_wall_from_polished_soul_stone_bricks.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "infernalexp:polished_soul_stone_bricks" + }, + "result": "infernalexp:polished_soul_stone_brick_wall", + "count": 1 +} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks.json b/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks.json new file mode 100644 index 000000000..b60b61fc6 --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "infernalexp:polished_soul_stone" + }, + "result": "infernalexp:polished_soul_stone_bricks", + "count": 1 +} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks_slab_from_polished_soul_stone.json b/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks_slab_from_polished_soul_stone.json new file mode 100644 index 000000000..fa96c7eb7 --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks_slab_from_polished_soul_stone.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "infernalexp:polished_soul_stone" + }, + "result": "infernalexp:polished_soul_stone_brick_slab", + "count": 2 +} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks_slab_from_polished_soul_stone_bricks.json b/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks_slab_from_polished_soul_stone_bricks.json new file mode 100644 index 000000000..430a09671 --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks_slab_from_polished_soul_stone_bricks.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "infernalexp:polished_soul_stone_bricks" + }, + "result": "infernalexp:polished_soul_stone_brick_slab", + "count": 2 +} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks_stairs_from_polished_soul_stone.json b/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks_stairs_from_polished_soul_stone.json new file mode 100644 index 000000000..a5856af4c --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks_stairs_from_polished_soul_stone.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "infernalexp:polished_soul_stone" + }, + "result": "infernalexp:polished_soul_stone_brick_stairs", + "count": 1 +} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks_stairs_from_polished_soul_stone_bricks.json b/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks_stairs_from_polished_soul_stone_bricks.json new file mode 100644 index 000000000..652f2ffbe --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks_stairs_from_polished_soul_stone_bricks.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "infernalexp:polished_soul_stone_bricks" + }, + "result": "infernalexp:polished_soul_stone_brick_stairs", + "count": 1 +} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_vertical_slab.json b/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks_vertical_slab_from_polished_soul_stone.json similarity index 61% rename from src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_vertical_slab.json rename to src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks_vertical_slab_from_polished_soul_stone.json index 988a7cc9a..879c66d69 100644 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_vertical_slab.json +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks_vertical_slab_from_polished_soul_stone.json @@ -1,9 +1,9 @@ { "type": "minecraft:stonecutting", "ingredient": { - "item": "infernalexp:soul_slate" + "item": "infernalexp:polished_soul_stone" }, - "result": "infernalexp:soul_slate_vertical_slab", + "result": "infernalexp:polished_soul_stone_brick_vertical_slab", "count": 2, "conditions": [ { diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks_vertical_slab_from_soul_slate_bricks.json b/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks_vertical_slab_from_polished_soul_stone_bricks.json similarity index 60% rename from src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks_vertical_slab_from_soul_slate_bricks.json rename to src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks_vertical_slab_from_polished_soul_stone_bricks.json index 3e5367948..82ebec947 100644 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks_vertical_slab_from_soul_slate_bricks.json +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_bricks_vertical_slab_from_polished_soul_stone_bricks.json @@ -1,9 +1,9 @@ { "type": "minecraft:stonecutting", "ingredient": { - "item": "infernalexp:soul_slate_bricks" + "item": "infernalexp:polished_soul_stone_bricks" }, - "result": "infernalexp:soul_slate_brick_vertical_slab", + "result": "infernalexp:polished_soul_stone_brick_vertical_slab", "count": 2, "conditions": [ { diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_slab.json b/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_slab.json new file mode 100644 index 000000000..902ed566d --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_slab.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "infernalexp:polished_soul_stone" + }, + "result": "infernalexp:polished_soul_stone_slab", + "count": 2 +} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_stairs.json b/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_stairs.json new file mode 100644 index 000000000..53d4391d7 --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_stairs.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "infernalexp:polished_soul_stone" + }, + "result": "infernalexp:polished_soul_stone_stairs", + "count": 1 +} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks_vertical_slab_from_soul_slate.json b/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_vertical_slab.json similarity index 62% rename from src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks_vertical_slab_from_soul_slate.json rename to src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_vertical_slab.json index dbba9a17f..73e92f74c 100644 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks_vertical_slab_from_soul_slate.json +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/polished_soul_stone_vertical_slab.json @@ -1,9 +1,9 @@ { "type": "minecraft:stonecutting", "ingredient": { - "item": "infernalexp:soul_slate" + "item": "infernalexp:polished_soul_stone" }, - "result": "infernalexp:soul_slate_brick_vertical_slab", + "result": "infernalexp:polished_soul_stone_vertical_slab", "count": 2, "conditions": [ { diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_brick_wall_from_soul_slate.json b/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_brick_wall_from_soul_slate.json deleted file mode 100644 index 90c0ee9a3..000000000 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_brick_wall_from_soul_slate.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "infernalexp:soul_slate" - }, - "result": "infernalexp:soul_slate_brick_wall", - "count": 1 -} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_brick_wall_from_soul_slate_bricks.json b/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_brick_wall_from_soul_slate_bricks.json deleted file mode 100644 index c837a91e2..000000000 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_brick_wall_from_soul_slate_bricks.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "infernalexp:soul_slate_bricks" - }, - "result": "infernalexp:soul_slate_brick_wall", - "count": 1 -} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks.json b/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks.json deleted file mode 100644 index 793664cae..000000000 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "infernalexp:soul_slate" - }, - "result": "infernalexp:soul_slate_bricks", - "count": 1 -} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks_slab_from_soul_slate.json b/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks_slab_from_soul_slate.json deleted file mode 100644 index cd63f8f04..000000000 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks_slab_from_soul_slate.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "infernalexp:soul_slate" - }, - "result": "infernalexp:soul_slate_brick_slab", - "count": 2 -} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks_slab_from_soul_slate_bricks.json b/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks_slab_from_soul_slate_bricks.json deleted file mode 100644 index fbecc6345..000000000 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks_slab_from_soul_slate_bricks.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "infernalexp:soul_slate_bricks" - }, - "result": "infernalexp:soul_slate_brick_slab", - "count": 2 -} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks_stairs_from_soul_slate.json b/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks_stairs_from_soul_slate.json deleted file mode 100644 index 3122174b4..000000000 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks_stairs_from_soul_slate.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "infernalexp:soul_slate" - }, - "result": "infernalexp:soul_slate_brick_stairs", - "count": 1 -} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks_stairs_from_soul_slate_bricks.json b/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks_stairs_from_soul_slate_bricks.json deleted file mode 100644 index d06351ae9..000000000 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_bricks_stairs_from_soul_slate_bricks.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "infernalexp:soul_slate_bricks" - }, - "result": "infernalexp:soul_slate_brick_stairs", - "count": 1 -} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_slab.json b/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_slab.json deleted file mode 100644 index 1f4b731bb..000000000 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "infernalexp:soul_slate" - }, - "result": "infernalexp:soul_slate_slab", - "count": 2 -} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_stairs.json b/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_stairs.json deleted file mode 100644 index 58d9a3b4e..000000000 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/soul_slate_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "infernalexp:soul_slate" - }, - "result": "infernalexp:soul_slate_stairs", - "count": 1 -} diff --git a/src/main/resources/data/minecraft/tags/blocks/buttons.json b/src/main/resources/data/minecraft/tags/blocks/buttons.json index fc22b83d5..112156892 100644 --- a/src/main/resources/data/minecraft/tags/blocks/buttons.json +++ b/src/main/resources/data/minecraft/tags/blocks/buttons.json @@ -5,6 +5,6 @@ "infernalexp:smooth_dimstone_button", "infernalexp:smooth_dullstone_button", "infernalexp:basalt_button", - "infernalexp:soul_slate_button" + "infernalexp:polished_soul_stone_button" ] } diff --git a/src/main/resources/data/minecraft/tags/blocks/slabs.json b/src/main/resources/data/minecraft/tags/blocks/slabs.json index 594fcc288..66c5dd871 100644 --- a/src/main/resources/data/minecraft/tags/blocks/slabs.json +++ b/src/main/resources/data/minecraft/tags/blocks/slabs.json @@ -17,8 +17,8 @@ "infernalexp:soul_sand_slab", "infernalexp:soul_soil_slab", "infernalexp:soul_stone_slab", - "infernalexp:soul_slate_slab", + "infernalexp:polished_soul_stone_slab", "infernalexp:soul_stone_brick_slab", - "infernalexp:soul_slate_brick_slab" + "infernalexp:polished_soul_stone_brick_slab" ] } diff --git a/src/main/resources/data/minecraft/tags/blocks/soul_fire_base_blocks.json b/src/main/resources/data/minecraft/tags/blocks/soul_fire_base_blocks.json index 2e1bb056a..37a8a63d1 100644 --- a/src/main/resources/data/minecraft/tags/blocks/soul_fire_base_blocks.json +++ b/src/main/resources/data/minecraft/tags/blocks/soul_fire_base_blocks.json @@ -8,16 +8,16 @@ "infernalexp:soul_stone", "infernalexp:soul_stone_slab", "infernalexp:soul_stone_stairs", - "infernalexp:soul_slate", - "infernalexp:soul_slate_slab", - "infernalexp:soul_slate_stairs", - "infernalexp:soul_slate_pressure_plate", - "infernalexp:soul_slate_bricks", - "infernalexp:soul_slate_brick_slab", - "infernalexp:soul_slate_brick_stairs", - "infernalexp:cracked_soul_slate_bricks", - "infernalexp:chiseled_soul_slate_bricks", - "infernalexp:charged_chiseled_soul_slate_bricks", + "infernalexp:polished_soul_stone", + "infernalexp:polished_soul_stone_slab", + "infernalexp:polished_soul_stone_stairs", + "infernalexp:polished_soul_stone_pressure_plate", + "infernalexp:polished_soul_stone_bricks", + "infernalexp:polished_soul_stone_brick_slab", + "infernalexp:polished_soul_stone_brick_stairs", + "infernalexp:cracked_polished_soul_stone_bricks", + "infernalexp:chiseled_polished_soul_stone_bricks", + "infernalexp:charged_chiseled_polished_soul_stone_bricks", "infernalexp:soul_stone_bricks", "infernalexp:soul_stone_brick_slab", "infernalexp:soul_stone_brick_stairs", diff --git a/src/main/resources/data/minecraft/tags/blocks/soul_speed_blocks.json b/src/main/resources/data/minecraft/tags/blocks/soul_speed_blocks.json index 2e1bb056a..37a8a63d1 100644 --- a/src/main/resources/data/minecraft/tags/blocks/soul_speed_blocks.json +++ b/src/main/resources/data/minecraft/tags/blocks/soul_speed_blocks.json @@ -8,16 +8,16 @@ "infernalexp:soul_stone", "infernalexp:soul_stone_slab", "infernalexp:soul_stone_stairs", - "infernalexp:soul_slate", - "infernalexp:soul_slate_slab", - "infernalexp:soul_slate_stairs", - "infernalexp:soul_slate_pressure_plate", - "infernalexp:soul_slate_bricks", - "infernalexp:soul_slate_brick_slab", - "infernalexp:soul_slate_brick_stairs", - "infernalexp:cracked_soul_slate_bricks", - "infernalexp:chiseled_soul_slate_bricks", - "infernalexp:charged_chiseled_soul_slate_bricks", + "infernalexp:polished_soul_stone", + "infernalexp:polished_soul_stone_slab", + "infernalexp:polished_soul_stone_stairs", + "infernalexp:polished_soul_stone_pressure_plate", + "infernalexp:polished_soul_stone_bricks", + "infernalexp:polished_soul_stone_brick_slab", + "infernalexp:polished_soul_stone_brick_stairs", + "infernalexp:cracked_polished_soul_stone_bricks", + "infernalexp:chiseled_polished_soul_stone_bricks", + "infernalexp:charged_chiseled_polished_soul_stone_bricks", "infernalexp:soul_stone_bricks", "infernalexp:soul_stone_brick_slab", "infernalexp:soul_stone_brick_stairs", diff --git a/src/main/resources/data/minecraft/tags/blocks/stairs.json b/src/main/resources/data/minecraft/tags/blocks/stairs.json index ff552a715..f3bd25a3e 100644 --- a/src/main/resources/data/minecraft/tags/blocks/stairs.json +++ b/src/main/resources/data/minecraft/tags/blocks/stairs.json @@ -14,8 +14,8 @@ "infernalexp:soul_sand_stairs", "infernalexp:soul_soil_stairs", "infernalexp:soul_stone_stairs", - "infernalexp:soul_slate_stairs", + "infernalexp:polished_soul_stone_stairs", "infernalexp:soul_stone_brick_stairs", - "infernalexp:soul_slate_brick_stairs" + "infernalexp:polished_soul_stone_brick_stairs" ] } diff --git a/src/main/resources/data/minecraft/tags/blocks/stone_pressure_plates.json b/src/main/resources/data/minecraft/tags/blocks/stone_pressure_plates.json index 0b479cd5e..3b622f1ab 100644 --- a/src/main/resources/data/minecraft/tags/blocks/stone_pressure_plates.json +++ b/src/main/resources/data/minecraft/tags/blocks/stone_pressure_plates.json @@ -3,6 +3,6 @@ "values": [ "infernalexp:smooth_glowstone_pressure_plate", "infernalexp:polished_basalt_pressure_plate", - "infernalexp:soul_slate_pressure_plate" + "infernalexp:polished_soul_stone_pressure_plate" ] } diff --git a/src/main/resources/data/minecraft/tags/blocks/walls.json b/src/main/resources/data/minecraft/tags/blocks/walls.json index 8ba0146e1..2255a8c1c 100644 --- a/src/main/resources/data/minecraft/tags/blocks/walls.json +++ b/src/main/resources/data/minecraft/tags/blocks/walls.json @@ -8,7 +8,7 @@ "infernalexp:dullstone_brick_wall", "infernalexp:basalt_wall", "infernalexp:basalt_brick_wall", - "infernalexp:soul_slate_brick_wall", + "infernalexp:polished_soul_stone_brick_wall", "infernalexp:soul_stone_wall", "infernalexp:soul_stone_brick_wall" ] diff --git a/src/main/resources/data/minecraft/tags/items/buttons.json b/src/main/resources/data/minecraft/tags/items/buttons.json index fc22b83d5..112156892 100644 --- a/src/main/resources/data/minecraft/tags/items/buttons.json +++ b/src/main/resources/data/minecraft/tags/items/buttons.json @@ -5,6 +5,6 @@ "infernalexp:smooth_dimstone_button", "infernalexp:smooth_dullstone_button", "infernalexp:basalt_button", - "infernalexp:soul_slate_button" + "infernalexp:polished_soul_stone_button" ] } diff --git a/src/main/resources/data/minecraft/tags/items/slabs.json b/src/main/resources/data/minecraft/tags/items/slabs.json index 594fcc288..66c5dd871 100644 --- a/src/main/resources/data/minecraft/tags/items/slabs.json +++ b/src/main/resources/data/minecraft/tags/items/slabs.json @@ -17,8 +17,8 @@ "infernalexp:soul_sand_slab", "infernalexp:soul_soil_slab", "infernalexp:soul_stone_slab", - "infernalexp:soul_slate_slab", + "infernalexp:polished_soul_stone_slab", "infernalexp:soul_stone_brick_slab", - "infernalexp:soul_slate_brick_slab" + "infernalexp:polished_soul_stone_brick_slab" ] } diff --git a/src/main/resources/data/minecraft/tags/items/stairs.json b/src/main/resources/data/minecraft/tags/items/stairs.json index ff552a715..f3bd25a3e 100644 --- a/src/main/resources/data/minecraft/tags/items/stairs.json +++ b/src/main/resources/data/minecraft/tags/items/stairs.json @@ -14,8 +14,8 @@ "infernalexp:soul_sand_stairs", "infernalexp:soul_soil_stairs", "infernalexp:soul_stone_stairs", - "infernalexp:soul_slate_stairs", + "infernalexp:polished_soul_stone_stairs", "infernalexp:soul_stone_brick_stairs", - "infernalexp:soul_slate_brick_stairs" + "infernalexp:polished_soul_stone_brick_stairs" ] } diff --git a/src/main/resources/data/minecraft/tags/items/walls.json b/src/main/resources/data/minecraft/tags/items/walls.json index 8ba0146e1..2255a8c1c 100644 --- a/src/main/resources/data/minecraft/tags/items/walls.json +++ b/src/main/resources/data/minecraft/tags/items/walls.json @@ -8,7 +8,7 @@ "infernalexp:dullstone_brick_wall", "infernalexp:basalt_wall", "infernalexp:basalt_brick_wall", - "infernalexp:soul_slate_brick_wall", + "infernalexp:polished_soul_stone_brick_wall", "infernalexp:soul_stone_wall", "infernalexp:soul_stone_brick_wall" ] diff --git a/src/main/resources/data/quark/tags/blocks/vertical_slab.json b/src/main/resources/data/quark/tags/blocks/vertical_slab.json index a9583ebb7..4f9c3d53d 100644 --- a/src/main/resources/data/quark/tags/blocks/vertical_slab.json +++ b/src/main/resources/data/quark/tags/blocks/vertical_slab.json @@ -17,8 +17,8 @@ "infernalexp:soul_sand_vertical_slab", "infernalexp:soul_soil_vertical_slab", "infernalexp:soul_stone_vertical_slab", - "infernalexp:soul_slate_vertical_slab", + "infernalexp:polished_soul_stone_vertical_slab", "infernalexp:soul_stone_brick_vertical_slab", - "infernalexp:soul_slate_brick_vertical_slab" + "infernalexp:polished_soul_stone_brick_vertical_slab" ] } diff --git a/src/main/resources/data/quark/tags/items/vertical_slab.json b/src/main/resources/data/quark/tags/items/vertical_slab.json index a9583ebb7..4f9c3d53d 100644 --- a/src/main/resources/data/quark/tags/items/vertical_slab.json +++ b/src/main/resources/data/quark/tags/items/vertical_slab.json @@ -17,8 +17,8 @@ "infernalexp:soul_sand_vertical_slab", "infernalexp:soul_soil_vertical_slab", "infernalexp:soul_stone_vertical_slab", - "infernalexp:soul_slate_vertical_slab", + "infernalexp:polished_soul_stone_vertical_slab", "infernalexp:soul_stone_brick_vertical_slab", - "infernalexp:soul_slate_brick_vertical_slab" + "infernalexp:polished_soul_stone_brick_vertical_slab" ] } From fdf3b5c8f5ef9411a8bb25b9cd81a3e9c98cd9f1 Mon Sep 17 00:00:00 2001 From: Neko Date: Thu, 14 Jul 2022 03:43:27 +0100 Subject: [PATCH 2/5] Glowdust (X) -> Shimmer (X) - Updated texture names for the Soul Blocks in addition to the Shimmer blocks. - Fixed missing item/model file refactors --- .../infernalexp/InfernalExpansion.java | 2 +- .../infernalexp/blocks/GlowdustBlock.java | 2 +- .../blocks/LuminousFungusBlock.java | 2 +- .../blocks/TrappedGlowSandBlock.java | 2 +- .../infernalexp/init/IEBlocks.java | 34 ++++---- .../init/IEConfiguredFeatures.java | 6 +- .../infernalexp/init/IEFeatures.java | 4 +- .../infernalexp/init/IESurfaceBuilders.java | 4 +- .../netherbiomes/GlowstoneCanyonBiome.java | 2 +- .../gen/carvers/GlowstoneRavineCarver.java | 4 +- .../world/gen/features/BoulderFeature.java | 2 +- .../world/gen/features/DullthornsFeature.java | 2 +- .../world/gen/features/GlowLayerFeature.java | 26 +++--- .../world/gen/features/GlowSpikeFeature.java | 2 +- .../gen/features/GlowstoneRavineFeature.java | 2 +- .../gen/features/LuminousFungusFeature.java | 2 +- .../world/gen/features/SinkHoleFeature.java | 6 +- .../world/gen/structures/IEStructure.java | 4 +- .../GlowstoneCanyonSurfaceBuilder.java | 6 +- ..._chiseled_polished_soul_stone_bricks.json} | 0 .../chiseled_glowdust_stone_bricks.json | 7 -- ... chiseled_polished_soul_stone_bricks.json} | 0 .../chiseled_shimmer_stone_bricks.json | 7 ++ .../cracked_glowdust_stone_bricks.json | 7 -- ...> cracked_polished_soul_stone_bricks.json} | 0 .../cracked_shimmer_stone_bricks.json | 7 ++ .../infernalexp/blockstates/glowdust.json | 28 ------ .../blockstates/glowdust_sand.json | 78 ----------------- .../blockstates/glowdust_stone.json | 7 -- .../glowdust_stone_brick_slab.json | 13 --- .../glowdust_stone_brick_vertical_slab.json | 27 ------ .../blockstates/glowdust_stone_bricks.json | 7 -- .../blockstates/glowdust_stone_slab.json | 13 --- .../glowdust_stone_vertical_slab.json | 27 ------ ...ul_slate.json => polished_soul_stone.json} | 0 ...on => polished_soul_stone_brick_slab.json} | 0 ... => polished_soul_stone_brick_stairs.json} | 0 ...ished_soul_stone_brick_vertical_slab.json} | 0 ...on => polished_soul_stone_brick_wall.json} | 0 ...s.json => polished_soul_stone_bricks.json} | 0 ...n.json => polished_soul_stone_button.json} | 0 ...> polished_soul_stone_pressure_plate.json} | 0 ...lab.json => polished_soul_stone_slab.json} | 0 ...s.json => polished_soul_stone_stairs.json} | 0 ...=> polished_soul_stone_vertical_slab.json} | 0 .../infernalexp/blockstates/shimmer_sand.json | 78 +++++++++++++++++ .../blockstates/shimmer_sheet.json | 28 ++++++ .../blockstates/shimmer_stone.json | 7 ++ .../blockstates/shimmer_stone_brick_slab.json | 13 +++ ...s.json => shimmer_stone_brick_stairs.json} | 80 +++++++++--------- .../shimmer_stone_brick_vertical_slab.json | 27 ++++++ ...all.json => shimmer_stone_brick_wall.json} | 18 ++-- .../blockstates/shimmer_stone_bricks.json | 7 ++ .../blockstates/shimmer_stone_slab.json | 13 +++ ..._stairs.json => shimmer_stone_stairs.json} | 80 +++++++++--------- .../shimmer_stone_vertical_slab.json | 27 ++++++ ...tone_wall.json => shimmer_stone_wall.json} | 18 ++-- .../blockstates/trapped_glowdust_sand.json | 78 ----------------- .../blockstates/trapped_shimmer_sand.json | 78 +++++++++++++++++ .../assets/infernalexp/lang/de_de.json | 30 +++---- .../assets/infernalexp/lang/en_us.json | 30 +++---- .../assets/infernalexp/lang/es_ar.json | 30 +++---- .../assets/infernalexp/lang/es_es.json | 30 +++---- .../assets/infernalexp/lang/fr_ca.json | 30 +++---- .../assets/infernalexp/lang/fr_fr.json | 30 +++---- .../assets/infernalexp/lang/he_il.json | 30 +++---- .../assets/infernalexp/lang/id_id.json | 30 +++---- .../assets/infernalexp/lang/ja_jp.json | 30 +++---- .../assets/infernalexp/lang/lol_us.json | 30 +++---- .../assets/infernalexp/lang/lv_lv.json | 30 +++---- .../assets/infernalexp/lang/ms_my.json | 30 +++---- .../assets/infernalexp/lang/nl_nl.json | 30 +++---- .../assets/infernalexp/lang/pl_pl.json | 30 +++---- .../assets/infernalexp/lang/pt_br.json | 30 +++---- .../assets/infernalexp/lang/ro_ro.json | 30 +++---- .../assets/infernalexp/lang/ru_ru.json | 30 +++---- .../assets/infernalexp/lang/zh_tw.json | 30 +++---- ..._chiseled_polished_soul_stone_bricks.json} | 0 .../block/chiseled_glowdust_sandstone.json | 7 -- .../block/chiseled_glowdust_stone_bricks.json | 6 -- ... chiseled_polished_soul_stone_bricks.json} | 0 .../block/chiseled_shimmer_sandstone.json | 7 ++ .../block/chiseled_shimmer_stone_bricks.json | 6 ++ .../block/cracked_glowdust_stone_bricks.json | 6 -- ...> cracked_polished_soul_stone_bricks.json} | 0 .../block/cracked_shimmer_stone_bricks.json | 6 ++ .../models/block/glowdust_sand.json | 6 -- .../models/block/glowdust_stone.json | 6 -- .../block/glowdust_stone_brick_slab.json | 8 -- .../block/glowdust_stone_brick_slab_top.json | 8 -- .../block/glowdust_stone_brick_stairs.json | 8 -- .../glowdust_stone_brick_stairs_inner.json | 8 -- .../glowdust_stone_brick_stairs_outer.json | 8 -- .../glowdust_stone_brick_vertical_slab.json | 8 -- .../models/block/glowdust_stone_bricks.json | 6 -- .../models/block/glowdust_stone_slab.json | 8 -- .../models/block/glowdust_stone_slab_top.json | 8 -- .../models/block/glowdust_stone_stairs.json | 8 -- .../block/glowdust_stone_stairs_inner.json | 8 -- .../block/glowdust_stone_stairs_outer.json | 8 -- .../block/glowdust_stone_vertical_slab.json | 8 -- ...ul_slate.json => polished_soul_stone.json} | 0 ...on => polished_soul_stone_brick_slab.json} | 0 ...> polished_soul_stone_brick_slab_top.json} | 0 ... => polished_soul_stone_brick_stairs.json} | 0 ...lished_soul_stone_brick_stairs_inner.json} | 0 ...lished_soul_stone_brick_stairs_outer.json} | 0 ...ished_soul_stone_brick_vertical_slab.json} | 0 ...shed_soul_stone_brick_wall_inventory.json} | 0 ... polished_soul_stone_brick_wall_post.json} | 0 ... polished_soul_stone_brick_wall_side.json} | 0 ...shed_soul_stone_brick_wall_side_tall.json} | 0 ...s.json => polished_soul_stone_bricks.json} | 0 ...n.json => polished_soul_stone_button.json} | 0 ...polished_soul_stone_button_inventory.json} | 0 ...> polished_soul_stone_button_pressed.json} | 0 ...> polished_soul_stone_pressure_plate.json} | 0 ...ished_soul_stone_pressure_plate_down.json} | 0 ...lab.json => polished_soul_stone_slab.json} | 0 ...json => polished_soul_stone_slab_top.json} | 0 ...s.json => polished_soul_stone_stairs.json} | 0 ... => polished_soul_stone_stairs_inner.json} | 0 ... => polished_soul_stone_stairs_outer.json} | 0 ...=> polished_soul_stone_vertical_slab.json} | 0 .../models/block/shimmer_sand.json | 6 ++ ...ght10.json => shimmer_sheet_height10.json} | 4 +- ...ght12.json => shimmer_sheet_height12.json} | 4 +- ...ght14.json => shimmer_sheet_height14.json} | 4 +- ...eight2.json => shimmer_sheet_height2.json} | 4 +- ...eight4.json => shimmer_sheet_height4.json} | 4 +- ...eight6.json => shimmer_sheet_height6.json} | 4 +- ...eight8.json => shimmer_sheet_height8.json} | 4 +- .../models/block/shimmer_stone.json | 6 ++ .../block/shimmer_stone_brick_slab.json | 8 ++ .../block/shimmer_stone_brick_slab_top.json | 8 ++ .../block/shimmer_stone_brick_stairs.json | 8 ++ .../shimmer_stone_brick_stairs_inner.json | 8 ++ .../shimmer_stone_brick_stairs_outer.json | 8 ++ .../shimmer_stone_brick_vertical_slab.json | 8 ++ ...> shimmer_stone_brick_wall_inventory.json} | 2 +- ...son => shimmer_stone_brick_wall_post.json} | 2 +- ...son => shimmer_stone_brick_wall_side.json} | 2 +- ...> shimmer_stone_brick_wall_side_tall.json} | 2 +- .../models/block/shimmer_stone_bricks.json | 6 ++ .../models/block/shimmer_stone_slab.json | 8 ++ .../models/block/shimmer_stone_slab_top.json | 8 ++ .../models/block/shimmer_stone_stairs.json | 8 ++ .../block/shimmer_stone_stairs_inner.json | 8 ++ .../block/shimmer_stone_stairs_outer.json | 8 ++ .../block/shimmer_stone_vertical_slab.json | 8 ++ ...json => shimmer_stone_wall_inventory.json} | 2 +- ...post.json => shimmer_stone_wall_post.json} | 2 +- ...side.json => shimmer_stone_wall_side.json} | 2 +- ...json => shimmer_stone_wall_side_tall.json} | 2 +- .../models/block/trapped_glowdust_sand.json | 6 -- .../models/block/trapped_shimmer_sand.json | 6 ++ ..._chiseled_polished_soul_stone_bricks.json} | 0 .../item/chiseled_glowdust_stone_bricks.json | 3 - ... chiseled_polished_soul_stone_bricks.json} | 0 .../item/chiseled_shimmer_stone_bricks.json | 3 + .../item/cracked_glowdust_stone_bricks.json | 3 - ...> cracked_polished_soul_stone_bricks.json} | 0 .../item/cracked_shimmer_stone_bricks.json | 3 + .../models/item/cut_glowdust_sandstone.json | 3 - .../item/cut_glowdust_sandstone_slab.json | 3 - .../cut_glowdust_sandstone_vertical_slab.json | 3 - .../models/item/cut_shimmer_sandstone.json | 3 + .../item/cut_shimmer_sandstone_slab.json | 3 + .../cut_shimmer_sandstone_vertical_slab.json | 3 + .../infernalexp/models/item/glowdust.json | 3 - .../models/item/glowdust_sand.json | 3 - .../models/item/glowdust_stone.json | 3 - .../item/glowdust_stone_brick_slab.json | 3 - .../item/glowdust_stone_brick_stairs.json | 3 - .../glowdust_stone_brick_vertical_slab.json | 3 - .../item/glowdust_stone_brick_wall.json | 3 - .../models/item/glowdust_stone_bricks.json | 3 - .../models/item/glowdust_stone_slab.json | 3 - .../models/item/glowdust_stone_stairs.json | 3 - .../item/glowdust_stone_vertical_slab.json | 3 - .../models/item/glowdust_stone_wall.json | 3 - ...ul_slate.json => polished_soul_stone.json} | 0 ...on => polished_soul_stone_brick_slab.json} | 0 ... => polished_soul_stone_brick_stairs.json} | 0 ...ished_soul_stone_brick_vertical_slab.json} | 0 ...on => polished_soul_stone_brick_wall.json} | 0 ...s.json => polished_soul_stone_bricks.json} | 0 ...n.json => polished_soul_stone_button.json} | 0 ...> polished_soul_stone_pressure_plate.json} | 0 ...lab.json => polished_soul_stone_slab.json} | 0 ...s.json => polished_soul_stone_stairs.json} | 0 ...=> polished_soul_stone_vertical_slab.json} | 0 .../infernalexp/models/item/shimmer_sand.json | 3 + .../models/item/shimmer_sheet.json | 3 + .../models/item/shimmer_stone.json | 3 + .../models/item/shimmer_stone_brick_slab.json | 3 + .../item/shimmer_stone_brick_stairs.json | 3 + .../shimmer_stone_brick_vertical_slab.json | 3 + .../models/item/shimmer_stone_brick_wall.json | 3 + .../models/item/shimmer_stone_bricks.json | 3 + .../models/item/shimmer_stone_slab.json | 3 + .../models/item/shimmer_stone_stairs.json | 3 + .../item/shimmer_stone_vertical_slab.json | 3 + .../models/item/shimmer_stone_wall.json | 3 + .../models/item/trapped_glowdust_sand.json | 3 - .../models/item/trapped_shimmer_sand.json | 3 + ...d_chiseled_polished_soul_stone_bricks.png} | Bin ...seled_polished_soul_stone_bricks_anim.png} | Bin ...olished_soul_stone_bricks_anim.png.mcmeta} | 0 ...iseled_polished_soul_stone_bricks_top.png} | Bin ...> chiseled_polished_soul_stone_bricks.png} | Bin ...iseled_polished_soul_stone_bricks_top.png} | Bin ...hiseled_shimmer_stone_bricks_animated.png} | Bin ..._shimmer_stone_bricks_animated.png.mcmeta} | 0 ...=> cracked_polished_soul_stone_bricks.png} | Bin ...cracked_shimmer_stone_bricks_animated.png} | Bin ..._shimmer_stone_bricks_animated.png.mcmeta} | 0 ...andstone.png => cut_shimmer_sandstone.png} | Bin ...soul_slate.png => polished_soul_stone.png} | Bin ...cks.png => polished_soul_stone_bricks.png} | Bin ...te_lit.png => polished_soul_stone_lit.png} | Bin .../{glowdust_sand.png => shimmer_sand.png} | Bin ...animated.png => shimmer_sand_animated.png} | Bin ...cmeta => shimmer_sand_animated.png.mcmeta} | 0 .../{glowdust_stone.png => shimmer_stone.png} | Bin ...nimated.png => shimmer_stone_animated.png} | Bin ...meta => shimmer_stone_animated.png.mcmeta} | 0 ...ne_bricks.png => shimmer_stone_bricks.png} | Bin ....png => shimmer_stone_bricks_animated.png} | Bin ... shimmer_stone_bricks_animated.png.mcmeta} | 0 ...dust_sand.png => trapped_shimmer_sand.png} | Bin ....png => trapped_shimmer_sand_animated.png} | Bin ... trapped_shimmer_sand_animated.png.mcmeta} | 0 .../chiseled_glowdust_stone_bricks.json | 19 ----- ...son => chiseled_shimmer_stone_bricks.json} | 2 +- .../blocks/cracked_shimmer_stone_bricks.json | 19 +++++ .../glowdust_stone_brick_vertical_slab.json | 19 ----- .../{glowdust_sand.json => shimmer_sand.json} | 2 +- .../{glowdust.json => shimmer_sheet.json} | 44 +++++----- ...glowdust_stone.json => shimmer_stone.json} | 2 +- ...lab.json => shimmer_stone_brick_slab.json} | 2 +- ...s.json => shimmer_stone_brick_stairs.json} | 2 +- ...=> shimmer_stone_brick_vertical_slab.json} | 2 +- ...all.json => shimmer_stone_brick_wall.json} | 2 +- ..._bricks.json => shimmer_stone_bricks.json} | 2 +- ...tone_wall.json => shimmer_stone_slab.json} | 2 +- ..._stairs.json => shimmer_stone_stairs.json} | 2 +- .../blocks/shimmer_stone_vertical_slab.json | 19 +++++ ...tone_slab.json => shimmer_stone_wall.json} | 2 +- .../chiseled_glowdust_stone_bricks.json | 4 +- .../crafting/crafting_shaped/glowdust.json | 2 +- .../crafting_shaped/glowdust_stone.json | 4 +- .../glowdust_stone_brick_slab.json | 4 +- .../glowdust_stone_brick_stairs.json | 4 +- .../glowdust_stone_brick_vertical_slab.json | 4 +- .../glowdust_stone_brick_wall.json | 4 +- .../glowdust_stone_bricks.json | 4 +- .../crafting_shaped/glowdust_stone_slab.json | 4 +- .../glowdust_stone_stairs.json | 4 +- .../glowdust_stone_vertical_slab.json | 4 +- .../crafting_shaped/glowdust_stone_wall.json | 4 +- .../trapped_glowdust_sand.json | 2 +- .../glowdust_stone_brick_slab.json | 11 --- .../glowdust_stone_slab.json | 11 --- .../shimmer_stone_brick_slab.json | 11 +++ .../shimmer_stone_slab.json | 11 +++ .../cracked_glowdust_stone_bricks.json | 9 -- .../cracked_shimmer_stone_bricks.json | 9 ++ .../recipes/smelting/glow_glass.json | 2 +- .../chiseled_glowdust_stone_bricks.json | 8 -- .../chiseled_shimmer_stone_bricks.json | 8 ++ .../glowdust_stone_brick_slab.json | 8 -- .../glowdust_stone_brick_stairs.json | 8 -- .../glowdust_stone_brick_wall.json | 8 -- .../stonecutting/glowdust_stone_slab.json | 8 -- .../stonecutting/glowdust_stone_stairs.json | 8 -- .../stonecutting/glowdust_stone_wall.json | 8 -- .../shimmer_stone_brick_slab.json | 8 ++ .../shimmer_stone_brick_stairs.json | 8 ++ ...=> shimmer_stone_brick_vertical_slab.json} | 4 +- .../shimmer_stone_brick_wall.json | 8 ++ .../stonecutting/shimmer_stone_slab.json | 8 ++ .../stonecutting/shimmer_stone_stairs.json | 8 ++ ....json => shimmer_stone_vertical_slab.json} | 4 +- .../stonecutting/shimmer_stone_wall.json | 8 ++ .../tags/blocks/buried_bone_base_blocks.json | 2 +- .../tags/blocks/dullthorns_ground.json | 2 +- .../tags/blocks/glow_fire_base_blocks.json | 12 +-- .../blocks/planted_quartz_base_blocks.json | 2 +- .../tags/items/glowstone_canyon_blocks.json | 26 +++--- .../data/minecraft/tags/blocks/slabs.json | 4 +- .../data/minecraft/tags/blocks/stairs.json | 4 +- .../data/minecraft/tags/blocks/walls.json | 4 +- .../data/minecraft/tags/items/slabs.json | 4 +- .../data/minecraft/tags/items/stairs.json | 4 +- .../data/minecraft/tags/items/walls.json | 4 +- .../data/quark/tags/blocks/vertical_slab.json | 4 +- .../data/quark/tags/items/vertical_slab.json | 4 +- 298 files changed, 1157 insertions(+), 1157 deletions(-) rename src/main/resources/assets/infernalexp/blockstates/{charged_chiseled_soul_slate_bricks.json => charged_chiseled_polished_soul_stone_bricks.json} (100%) delete mode 100644 src/main/resources/assets/infernalexp/blockstates/chiseled_glowdust_stone_bricks.json rename src/main/resources/assets/infernalexp/blockstates/{chiseled_soul_slate_bricks.json => chiseled_polished_soul_stone_bricks.json} (100%) create mode 100644 src/main/resources/assets/infernalexp/blockstates/chiseled_shimmer_stone_bricks.json delete mode 100644 src/main/resources/assets/infernalexp/blockstates/cracked_glowdust_stone_bricks.json rename src/main/resources/assets/infernalexp/blockstates/{cracked_soul_slate_bricks.json => cracked_polished_soul_stone_bricks.json} (100%) create mode 100644 src/main/resources/assets/infernalexp/blockstates/cracked_shimmer_stone_bricks.json delete mode 100644 src/main/resources/assets/infernalexp/blockstates/glowdust.json delete mode 100644 src/main/resources/assets/infernalexp/blockstates/glowdust_sand.json delete mode 100644 src/main/resources/assets/infernalexp/blockstates/glowdust_stone.json delete mode 100644 src/main/resources/assets/infernalexp/blockstates/glowdust_stone_brick_slab.json delete mode 100644 src/main/resources/assets/infernalexp/blockstates/glowdust_stone_brick_vertical_slab.json delete mode 100644 src/main/resources/assets/infernalexp/blockstates/glowdust_stone_bricks.json delete mode 100644 src/main/resources/assets/infernalexp/blockstates/glowdust_stone_slab.json delete mode 100644 src/main/resources/assets/infernalexp/blockstates/glowdust_stone_vertical_slab.json rename src/main/resources/assets/infernalexp/blockstates/{soul_slate.json => polished_soul_stone.json} (100%) rename src/main/resources/assets/infernalexp/blockstates/{soul_slate_brick_slab.json => polished_soul_stone_brick_slab.json} (100%) rename src/main/resources/assets/infernalexp/blockstates/{soul_slate_brick_stairs.json => polished_soul_stone_brick_stairs.json} (100%) rename src/main/resources/assets/infernalexp/blockstates/{soul_slate_brick_vertical_slab.json => polished_soul_stone_brick_vertical_slab.json} (100%) rename src/main/resources/assets/infernalexp/blockstates/{soul_slate_brick_wall.json => polished_soul_stone_brick_wall.json} (100%) rename src/main/resources/assets/infernalexp/blockstates/{soul_slate_bricks.json => polished_soul_stone_bricks.json} (100%) rename src/main/resources/assets/infernalexp/blockstates/{soul_slate_button.json => polished_soul_stone_button.json} (100%) rename src/main/resources/assets/infernalexp/blockstates/{soul_slate_pressure_plate.json => polished_soul_stone_pressure_plate.json} (100%) rename src/main/resources/assets/infernalexp/blockstates/{soul_slate_slab.json => polished_soul_stone_slab.json} (100%) rename src/main/resources/assets/infernalexp/blockstates/{soul_slate_stairs.json => polished_soul_stone_stairs.json} (100%) rename src/main/resources/assets/infernalexp/blockstates/{soul_slate_vertical_slab.json => polished_soul_stone_vertical_slab.json} (100%) create mode 100644 src/main/resources/assets/infernalexp/blockstates/shimmer_sand.json create mode 100644 src/main/resources/assets/infernalexp/blockstates/shimmer_sheet.json create mode 100644 src/main/resources/assets/infernalexp/blockstates/shimmer_stone.json create mode 100644 src/main/resources/assets/infernalexp/blockstates/shimmer_stone_brick_slab.json rename src/main/resources/assets/infernalexp/blockstates/{glowdust_stone_brick_stairs.json => shimmer_stone_brick_stairs.json} (57%) create mode 100644 src/main/resources/assets/infernalexp/blockstates/shimmer_stone_brick_vertical_slab.json rename src/main/resources/assets/infernalexp/blockstates/{glowdust_stone_brick_wall.json => shimmer_stone_brick_wall.json} (62%) create mode 100644 src/main/resources/assets/infernalexp/blockstates/shimmer_stone_bricks.json create mode 100644 src/main/resources/assets/infernalexp/blockstates/shimmer_stone_slab.json rename src/main/resources/assets/infernalexp/blockstates/{glowdust_stone_stairs.json => shimmer_stone_stairs.json} (60%) create mode 100644 src/main/resources/assets/infernalexp/blockstates/shimmer_stone_vertical_slab.json rename src/main/resources/assets/infernalexp/blockstates/{glowdust_stone_wall.json => shimmer_stone_wall.json} (64%) delete mode 100644 src/main/resources/assets/infernalexp/blockstates/trapped_glowdust_sand.json create mode 100644 src/main/resources/assets/infernalexp/blockstates/trapped_shimmer_sand.json rename src/main/resources/assets/infernalexp/models/block/{charged_chiseled_soul_slate_bricks.json => charged_chiseled_polished_soul_stone_bricks.json} (100%) delete mode 100644 src/main/resources/assets/infernalexp/models/block/chiseled_glowdust_sandstone.json delete mode 100644 src/main/resources/assets/infernalexp/models/block/chiseled_glowdust_stone_bricks.json rename src/main/resources/assets/infernalexp/models/block/{chiseled_soul_slate_bricks.json => chiseled_polished_soul_stone_bricks.json} (100%) create mode 100644 src/main/resources/assets/infernalexp/models/block/chiseled_shimmer_sandstone.json create mode 100644 src/main/resources/assets/infernalexp/models/block/chiseled_shimmer_stone_bricks.json delete mode 100644 src/main/resources/assets/infernalexp/models/block/cracked_glowdust_stone_bricks.json rename src/main/resources/assets/infernalexp/models/block/{cracked_soul_slate_bricks.json => cracked_polished_soul_stone_bricks.json} (100%) create mode 100644 src/main/resources/assets/infernalexp/models/block/cracked_shimmer_stone_bricks.json delete mode 100644 src/main/resources/assets/infernalexp/models/block/glowdust_sand.json delete mode 100644 src/main/resources/assets/infernalexp/models/block/glowdust_stone.json delete mode 100644 src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_slab.json delete mode 100644 src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_slab_top.json delete mode 100644 src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_stairs.json delete mode 100644 src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_stairs_inner.json delete mode 100644 src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_stairs_outer.json delete mode 100644 src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_vertical_slab.json delete mode 100644 src/main/resources/assets/infernalexp/models/block/glowdust_stone_bricks.json delete mode 100644 src/main/resources/assets/infernalexp/models/block/glowdust_stone_slab.json delete mode 100644 src/main/resources/assets/infernalexp/models/block/glowdust_stone_slab_top.json delete mode 100644 src/main/resources/assets/infernalexp/models/block/glowdust_stone_stairs.json delete mode 100644 src/main/resources/assets/infernalexp/models/block/glowdust_stone_stairs_inner.json delete mode 100644 src/main/resources/assets/infernalexp/models/block/glowdust_stone_stairs_outer.json delete mode 100644 src/main/resources/assets/infernalexp/models/block/glowdust_stone_vertical_slab.json rename src/main/resources/assets/infernalexp/models/block/{soul_slate.json => polished_soul_stone.json} (100%) rename src/main/resources/assets/infernalexp/models/block/{soul_slate_brick_slab.json => polished_soul_stone_brick_slab.json} (100%) rename src/main/resources/assets/infernalexp/models/block/{soul_slate_brick_slab_top.json => polished_soul_stone_brick_slab_top.json} (100%) rename src/main/resources/assets/infernalexp/models/block/{soul_slate_brick_stairs.json => polished_soul_stone_brick_stairs.json} (100%) rename src/main/resources/assets/infernalexp/models/block/{soul_slate_brick_stairs_inner.json => polished_soul_stone_brick_stairs_inner.json} (100%) rename src/main/resources/assets/infernalexp/models/block/{soul_slate_brick_stairs_outer.json => polished_soul_stone_brick_stairs_outer.json} (100%) rename src/main/resources/assets/infernalexp/models/block/{soul_slate_brick_vertical_slab.json => polished_soul_stone_brick_vertical_slab.json} (100%) rename src/main/resources/assets/infernalexp/models/block/{soul_slate_brick_wall_inventory.json => polished_soul_stone_brick_wall_inventory.json} (100%) rename src/main/resources/assets/infernalexp/models/block/{soul_slate_brick_wall_post.json => polished_soul_stone_brick_wall_post.json} (100%) rename src/main/resources/assets/infernalexp/models/block/{soul_slate_brick_wall_side.json => polished_soul_stone_brick_wall_side.json} (100%) rename src/main/resources/assets/infernalexp/models/block/{soul_slate_brick_wall_side_tall.json => polished_soul_stone_brick_wall_side_tall.json} (100%) rename src/main/resources/assets/infernalexp/models/block/{soul_slate_bricks.json => polished_soul_stone_bricks.json} (100%) rename src/main/resources/assets/infernalexp/models/block/{soul_slate_button.json => polished_soul_stone_button.json} (100%) rename src/main/resources/assets/infernalexp/models/block/{soul_slate_button_inventory.json => polished_soul_stone_button_inventory.json} (100%) rename src/main/resources/assets/infernalexp/models/block/{soul_slate_button_pressed.json => polished_soul_stone_button_pressed.json} (100%) rename src/main/resources/assets/infernalexp/models/block/{soul_slate_pressure_plate.json => polished_soul_stone_pressure_plate.json} (100%) rename src/main/resources/assets/infernalexp/models/block/{soul_slate_pressure_plate_down.json => polished_soul_stone_pressure_plate_down.json} (100%) rename src/main/resources/assets/infernalexp/models/block/{soul_slate_slab.json => polished_soul_stone_slab.json} (100%) rename src/main/resources/assets/infernalexp/models/block/{soul_slate_slab_top.json => polished_soul_stone_slab_top.json} (100%) rename src/main/resources/assets/infernalexp/models/block/{soul_slate_stairs.json => polished_soul_stone_stairs.json} (100%) rename src/main/resources/assets/infernalexp/models/block/{soul_slate_stairs_inner.json => polished_soul_stone_stairs_inner.json} (100%) rename src/main/resources/assets/infernalexp/models/block/{soul_slate_stairs_outer.json => polished_soul_stone_stairs_outer.json} (100%) rename src/main/resources/assets/infernalexp/models/block/{soul_slate_vertical_slab.json => polished_soul_stone_vertical_slab.json} (100%) create mode 100644 src/main/resources/assets/infernalexp/models/block/shimmer_sand.json rename src/main/resources/assets/infernalexp/models/block/{glowdust_height10.json => shimmer_sheet_height10.json} (91%) rename src/main/resources/assets/infernalexp/models/block/{glowdust_height12.json => shimmer_sheet_height12.json} (91%) rename src/main/resources/assets/infernalexp/models/block/{glowdust_height14.json => shimmer_sheet_height14.json} (91%) rename src/main/resources/assets/infernalexp/models/block/{glowdust_height2.json => shimmer_sheet_height2.json} (91%) rename src/main/resources/assets/infernalexp/models/block/{glowdust_height4.json => shimmer_sheet_height4.json} (91%) rename src/main/resources/assets/infernalexp/models/block/{glowdust_height6.json => shimmer_sheet_height6.json} (91%) rename src/main/resources/assets/infernalexp/models/block/{glowdust_height8.json => shimmer_sheet_height8.json} (91%) create mode 100644 src/main/resources/assets/infernalexp/models/block/shimmer_stone.json create mode 100644 src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_slab.json create mode 100644 src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_slab_top.json create mode 100644 src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_stairs.json create mode 100644 src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_stairs_inner.json create mode 100644 src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_stairs_outer.json create mode 100644 src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_vertical_slab.json rename src/main/resources/assets/infernalexp/models/block/{glowdust_stone_brick_wall_inventory.json => shimmer_stone_brick_wall_inventory.json} (52%) rename src/main/resources/assets/infernalexp/models/block/{glowdust_stone_brick_wall_post.json => shimmer_stone_brick_wall_post.json} (53%) rename src/main/resources/assets/infernalexp/models/block/{glowdust_stone_brick_wall_side.json => shimmer_stone_brick_wall_side.json} (53%) rename src/main/resources/assets/infernalexp/models/block/{glowdust_stone_brick_wall_side_tall.json => shimmer_stone_brick_wall_side_tall.json} (55%) create mode 100644 src/main/resources/assets/infernalexp/models/block/shimmer_stone_bricks.json create mode 100644 src/main/resources/assets/infernalexp/models/block/shimmer_stone_slab.json create mode 100644 src/main/resources/assets/infernalexp/models/block/shimmer_stone_slab_top.json create mode 100644 src/main/resources/assets/infernalexp/models/block/shimmer_stone_stairs.json create mode 100644 src/main/resources/assets/infernalexp/models/block/shimmer_stone_stairs_inner.json create mode 100644 src/main/resources/assets/infernalexp/models/block/shimmer_stone_stairs_outer.json create mode 100644 src/main/resources/assets/infernalexp/models/block/shimmer_stone_vertical_slab.json rename src/main/resources/assets/infernalexp/models/block/{glowdust_stone_wall_inventory.json => shimmer_stone_wall_inventory.json} (51%) rename src/main/resources/assets/infernalexp/models/block/{glowdust_stone_wall_post.json => shimmer_stone_wall_post.json} (53%) rename src/main/resources/assets/infernalexp/models/block/{glowdust_stone_wall_side.json => shimmer_stone_wall_side.json} (53%) rename src/main/resources/assets/infernalexp/models/block/{glowdust_stone_wall_side_tall.json => shimmer_stone_wall_side_tall.json} (55%) delete mode 100644 src/main/resources/assets/infernalexp/models/block/trapped_glowdust_sand.json create mode 100644 src/main/resources/assets/infernalexp/models/block/trapped_shimmer_sand.json rename src/main/resources/assets/infernalexp/models/item/{charged_chiseled_soul_slate_bricks.json => charged_chiseled_polished_soul_stone_bricks.json} (100%) delete mode 100644 src/main/resources/assets/infernalexp/models/item/chiseled_glowdust_stone_bricks.json rename src/main/resources/assets/infernalexp/models/item/{chiseled_soul_slate_bricks.json => chiseled_polished_soul_stone_bricks.json} (100%) create mode 100644 src/main/resources/assets/infernalexp/models/item/chiseled_shimmer_stone_bricks.json delete mode 100644 src/main/resources/assets/infernalexp/models/item/cracked_glowdust_stone_bricks.json rename src/main/resources/assets/infernalexp/models/item/{cracked_soul_slate_bricks.json => cracked_polished_soul_stone_bricks.json} (100%) create mode 100644 src/main/resources/assets/infernalexp/models/item/cracked_shimmer_stone_bricks.json delete mode 100644 src/main/resources/assets/infernalexp/models/item/cut_glowdust_sandstone.json delete mode 100644 src/main/resources/assets/infernalexp/models/item/cut_glowdust_sandstone_slab.json delete mode 100644 src/main/resources/assets/infernalexp/models/item/cut_glowdust_sandstone_vertical_slab.json create mode 100644 src/main/resources/assets/infernalexp/models/item/cut_shimmer_sandstone.json create mode 100644 src/main/resources/assets/infernalexp/models/item/cut_shimmer_sandstone_slab.json create mode 100644 src/main/resources/assets/infernalexp/models/item/cut_shimmer_sandstone_vertical_slab.json delete mode 100644 src/main/resources/assets/infernalexp/models/item/glowdust.json delete mode 100644 src/main/resources/assets/infernalexp/models/item/glowdust_sand.json delete mode 100644 src/main/resources/assets/infernalexp/models/item/glowdust_stone.json delete mode 100644 src/main/resources/assets/infernalexp/models/item/glowdust_stone_brick_slab.json delete mode 100644 src/main/resources/assets/infernalexp/models/item/glowdust_stone_brick_stairs.json delete mode 100644 src/main/resources/assets/infernalexp/models/item/glowdust_stone_brick_vertical_slab.json delete mode 100644 src/main/resources/assets/infernalexp/models/item/glowdust_stone_brick_wall.json delete mode 100644 src/main/resources/assets/infernalexp/models/item/glowdust_stone_bricks.json delete mode 100644 src/main/resources/assets/infernalexp/models/item/glowdust_stone_slab.json delete mode 100644 src/main/resources/assets/infernalexp/models/item/glowdust_stone_stairs.json delete mode 100644 src/main/resources/assets/infernalexp/models/item/glowdust_stone_vertical_slab.json delete mode 100644 src/main/resources/assets/infernalexp/models/item/glowdust_stone_wall.json rename src/main/resources/assets/infernalexp/models/item/{soul_slate.json => polished_soul_stone.json} (100%) rename src/main/resources/assets/infernalexp/models/item/{soul_slate_brick_slab.json => polished_soul_stone_brick_slab.json} (100%) rename src/main/resources/assets/infernalexp/models/item/{soul_slate_brick_stairs.json => polished_soul_stone_brick_stairs.json} (100%) rename src/main/resources/assets/infernalexp/models/item/{soul_slate_brick_vertical_slab.json => polished_soul_stone_brick_vertical_slab.json} (100%) rename src/main/resources/assets/infernalexp/models/item/{soul_slate_brick_wall.json => polished_soul_stone_brick_wall.json} (100%) rename src/main/resources/assets/infernalexp/models/item/{soul_slate_bricks.json => polished_soul_stone_bricks.json} (100%) rename src/main/resources/assets/infernalexp/models/item/{soul_slate_button.json => polished_soul_stone_button.json} (100%) rename src/main/resources/assets/infernalexp/models/item/{soul_slate_pressure_plate.json => polished_soul_stone_pressure_plate.json} (100%) rename src/main/resources/assets/infernalexp/models/item/{soul_slate_slab.json => polished_soul_stone_slab.json} (100%) rename src/main/resources/assets/infernalexp/models/item/{soul_slate_stairs.json => polished_soul_stone_stairs.json} (100%) rename src/main/resources/assets/infernalexp/models/item/{soul_slate_vertical_slab.json => polished_soul_stone_vertical_slab.json} (100%) create mode 100644 src/main/resources/assets/infernalexp/models/item/shimmer_sand.json create mode 100644 src/main/resources/assets/infernalexp/models/item/shimmer_sheet.json create mode 100644 src/main/resources/assets/infernalexp/models/item/shimmer_stone.json create mode 100644 src/main/resources/assets/infernalexp/models/item/shimmer_stone_brick_slab.json create mode 100644 src/main/resources/assets/infernalexp/models/item/shimmer_stone_brick_stairs.json create mode 100644 src/main/resources/assets/infernalexp/models/item/shimmer_stone_brick_vertical_slab.json create mode 100644 src/main/resources/assets/infernalexp/models/item/shimmer_stone_brick_wall.json create mode 100644 src/main/resources/assets/infernalexp/models/item/shimmer_stone_bricks.json create mode 100644 src/main/resources/assets/infernalexp/models/item/shimmer_stone_slab.json create mode 100644 src/main/resources/assets/infernalexp/models/item/shimmer_stone_stairs.json create mode 100644 src/main/resources/assets/infernalexp/models/item/shimmer_stone_vertical_slab.json create mode 100644 src/main/resources/assets/infernalexp/models/item/shimmer_stone_wall.json delete mode 100644 src/main/resources/assets/infernalexp/models/item/trapped_glowdust_sand.json create mode 100644 src/main/resources/assets/infernalexp/models/item/trapped_shimmer_sand.json rename src/main/resources/assets/infernalexp/textures/block/{charged_chiseled_soul_slate_bricks.png => charged_chiseled_polished_soul_stone_bricks.png} (100%) rename src/main/resources/assets/infernalexp/textures/block/{charged_chiseled_soul_slate_bricks_anim.png => charged_chiseled_polished_soul_stone_bricks_anim.png} (100%) rename src/main/resources/assets/infernalexp/textures/block/{charged_chiseled_soul_slate_bricks_anim.png.mcmeta => charged_chiseled_polished_soul_stone_bricks_anim.png.mcmeta} (100%) rename src/main/resources/assets/infernalexp/textures/block/{charged_chiseled_soul_slate_bricks_top.png => charged_chiseled_polished_soul_stone_bricks_top.png} (100%) rename src/main/resources/assets/infernalexp/textures/block/{chiseled_soul_slate_bricks.png => chiseled_polished_soul_stone_bricks.png} (100%) rename src/main/resources/assets/infernalexp/textures/block/{chiseled_soul_slate_bricks_top.png => chiseled_polished_soul_stone_bricks_top.png} (100%) rename src/main/resources/assets/infernalexp/textures/block/{chiseled_glowdust_stone_bricks_animated.png => chiseled_shimmer_stone_bricks_animated.png} (100%) rename src/main/resources/assets/infernalexp/textures/block/{chiseled_glowdust_stone_bricks_animated.png.mcmeta => chiseled_shimmer_stone_bricks_animated.png.mcmeta} (100%) rename src/main/resources/assets/infernalexp/textures/block/{cracked_soul_slate_bricks.png => cracked_polished_soul_stone_bricks.png} (100%) rename src/main/resources/assets/infernalexp/textures/block/{cracked_glowdust_stone_bricks_animated.png => cracked_shimmer_stone_bricks_animated.png} (100%) rename src/main/resources/assets/infernalexp/textures/block/{cracked_glowdust_stone_bricks_animated.png.mcmeta => cracked_shimmer_stone_bricks_animated.png.mcmeta} (100%) rename src/main/resources/assets/infernalexp/textures/block/{cut_glowdust_sandstone.png => cut_shimmer_sandstone.png} (100%) rename src/main/resources/assets/infernalexp/textures/block/{soul_slate.png => polished_soul_stone.png} (100%) rename src/main/resources/assets/infernalexp/textures/block/{soul_slate_bricks.png => polished_soul_stone_bricks.png} (100%) rename src/main/resources/assets/infernalexp/textures/block/{soul_slate_lit.png => polished_soul_stone_lit.png} (100%) rename src/main/resources/assets/infernalexp/textures/block/{glowdust_sand.png => shimmer_sand.png} (100%) rename src/main/resources/assets/infernalexp/textures/block/{glowdust_sand_animated.png => shimmer_sand_animated.png} (100%) rename src/main/resources/assets/infernalexp/textures/block/{glowdust_sand_animated.png.mcmeta => shimmer_sand_animated.png.mcmeta} (100%) rename src/main/resources/assets/infernalexp/textures/block/{glowdust_stone.png => shimmer_stone.png} (100%) rename src/main/resources/assets/infernalexp/textures/block/{glowdust_stone_animated.png => shimmer_stone_animated.png} (100%) rename src/main/resources/assets/infernalexp/textures/block/{glowdust_stone_animated.png.mcmeta => shimmer_stone_animated.png.mcmeta} (100%) rename src/main/resources/assets/infernalexp/textures/block/{glowdust_stone_bricks.png => shimmer_stone_bricks.png} (100%) rename src/main/resources/assets/infernalexp/textures/block/{glowdust_stone_bricks_animated.png => shimmer_stone_bricks_animated.png} (100%) rename src/main/resources/assets/infernalexp/textures/block/{glowdust_stone_bricks_animated.png.mcmeta => shimmer_stone_bricks_animated.png.mcmeta} (100%) rename src/main/resources/assets/infernalexp/textures/block/{trapped_glowdust_sand.png => trapped_shimmer_sand.png} (100%) rename src/main/resources/assets/infernalexp/textures/block/{trapped_glowdust_sand_animated.png => trapped_shimmer_sand_animated.png} (100%) rename src/main/resources/assets/infernalexp/textures/block/{trapped_glowdust_sand_animated.png.mcmeta => trapped_shimmer_sand_animated.png.mcmeta} (100%) delete mode 100644 src/main/resources/data/infernalexp/loot_tables/blocks/chiseled_glowdust_stone_bricks.json rename src/main/resources/data/infernalexp/loot_tables/blocks/{cracked_glowdust_stone_bricks.json => chiseled_shimmer_stone_bricks.json} (81%) create mode 100644 src/main/resources/data/infernalexp/loot_tables/blocks/cracked_shimmer_stone_bricks.json delete mode 100644 src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_brick_vertical_slab.json rename src/main/resources/data/infernalexp/loot_tables/blocks/{glowdust_sand.json => shimmer_sand.json} (96%) rename src/main/resources/data/infernalexp/loot_tables/blocks/{glowdust.json => shimmer_sheet.json} (89%) rename src/main/resources/data/infernalexp/loot_tables/blocks/{glowdust_stone.json => shimmer_stone.json} (85%) rename src/main/resources/data/infernalexp/loot_tables/blocks/{glowdust_stone_brick_slab.json => shimmer_stone_brick_slab.json} (82%) rename src/main/resources/data/infernalexp/loot_tables/blocks/{glowdust_stone_brick_stairs.json => shimmer_stone_brick_stairs.json} (81%) rename src/main/resources/data/infernalexp/loot_tables/blocks/{glowdust_stone_vertical_slab.json => shimmer_stone_brick_vertical_slab.json} (80%) rename src/main/resources/data/infernalexp/loot_tables/blocks/{glowdust_stone_brick_wall.json => shimmer_stone_brick_wall.json} (82%) rename src/main/resources/data/infernalexp/loot_tables/blocks/{glowdust_stone_bricks.json => shimmer_stone_bricks.json} (83%) rename src/main/resources/data/infernalexp/loot_tables/blocks/{glowdust_stone_wall.json => shimmer_stone_slab.json} (83%) rename src/main/resources/data/infernalexp/loot_tables/blocks/{glowdust_stone_stairs.json => shimmer_stone_stairs.json} (83%) create mode 100644 src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_vertical_slab.json rename src/main/resources/data/infernalexp/loot_tables/blocks/{glowdust_stone_slab.json => shimmer_stone_wall.json} (83%) delete mode 100644 src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/glowdust_stone_brick_slab.json delete mode 100644 src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/glowdust_stone_slab.json create mode 100644 src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/shimmer_stone_brick_slab.json create mode 100644 src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/shimmer_stone_slab.json delete mode 100644 src/main/resources/data/infernalexp/recipes/smelting/cracked_glowdust_stone_bricks.json create mode 100644 src/main/resources/data/infernalexp/recipes/smelting/cracked_shimmer_stone_bricks.json delete mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_glowdust_stone_bricks.json create mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_shimmer_stone_bricks.json delete mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_brick_slab.json delete mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_brick_stairs.json delete mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_brick_wall.json delete mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_slab.json delete mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_stairs.json delete mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_wall.json create mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_brick_slab.json create mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_brick_stairs.json rename src/main/resources/data/infernalexp/recipes/stonecutting/{glowdust_stone_brick_vertical_slab.json => shimmer_stone_brick_vertical_slab.json} (62%) create mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_brick_wall.json create mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_slab.json create mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_stairs.json rename src/main/resources/data/infernalexp/recipes/stonecutting/{glowdust_stone_vertical_slab.json => shimmer_stone_vertical_slab.json} (65%) create mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_wall.json diff --git a/src/main/java/org/infernalstudios/infernalexp/InfernalExpansion.java b/src/main/java/org/infernalstudios/infernalexp/InfernalExpansion.java index a7284ad39..4646d9354 100644 --- a/src/main/java/org/infernalstudios/infernalexp/InfernalExpansion.java +++ b/src/main/java/org/infernalstudios/infernalexp/InfernalExpansion.java @@ -142,7 +142,7 @@ private void commonSetup(final FMLCommonSetupEvent event) { // Add custom blocks to nether cave carver event.enqueueWork(() -> { - Set newCarvableBlocks = Stream.of(IEBlocks.DULLSTONE.get(), IEBlocks.DIMSTONE.get(), Blocks.GLOWSTONE, IEBlocks.GLOWDUST_SAND.get(), IEBlocks.GLOWDUST.get()).collect(Collectors.toCollection(HashSet::new)); + Set newCarvableBlocks = Stream.of(IEBlocks.DULLSTONE.get(), IEBlocks.DIMSTONE.get(), Blocks.GLOWSTONE, IEBlocks.SHIMMER_SAND.get(), IEBlocks.SHIMMER_SHEET.get()).collect(Collectors.toCollection(HashSet::new)); newCarvableBlocks.addAll(((WorldCarverAccessor) WorldCarver.NETHER_CAVE).getCarvableBlocks()); ((WorldCarverAccessor) WorldCarver.NETHER_CAVE).setCarvableBlocks(newCarvableBlocks); diff --git a/src/main/java/org/infernalstudios/infernalexp/blocks/GlowdustBlock.java b/src/main/java/org/infernalstudios/infernalexp/blocks/GlowdustBlock.java index 6494ccc67..d3c71071d 100644 --- a/src/main/java/org/infernalstudios/infernalexp/blocks/GlowdustBlock.java +++ b/src/main/java/org/infernalstudios/infernalexp/blocks/GlowdustBlock.java @@ -38,7 +38,7 @@ public BlockState getStateForPlacement(BlockItemUseContext context) { if (i < 7) { return blockstate.with(LAYERS, Integer.valueOf(Math.min(8, i + 1))); } else { - return IEBlocks.GLOWDUST_SAND.get().getDefaultState(); + return IEBlocks.SHIMMER_SAND.get().getDefaultState(); } } else { return super.getStateForPlacement(context); diff --git a/src/main/java/org/infernalstudios/infernalexp/blocks/LuminousFungusBlock.java b/src/main/java/org/infernalstudios/infernalexp/blocks/LuminousFungusBlock.java index 13bb6de09..e0e3e755f 100644 --- a/src/main/java/org/infernalstudios/infernalexp/blocks/LuminousFungusBlock.java +++ b/src/main/java/org/infernalstudios/infernalexp/blocks/LuminousFungusBlock.java @@ -66,7 +66,7 @@ public boolean hasTileEntity(BlockState state) { @Override protected boolean isValidGround(BlockState state, IBlockReader worldIn, BlockPos pos) { return - state.matchesBlock(IEBlocks.GLOWDUST_SAND.get()) || state.matchesBlock(Blocks.SAND) || state.matchesBlock(Blocks.RED_SAND) + state.matchesBlock(IEBlocks.SHIMMER_SAND.get()) || state.matchesBlock(Blocks.SAND) || state.matchesBlock(Blocks.RED_SAND) || state.matchesBlock(Blocks.GRASS) || state.matchesBlock(Blocks.GRASS_BLOCK) || state.matchesBlock(Blocks.DIRT) || state.matchesBlock(Blocks.COARSE_DIRT) || state.matchesBlock(Blocks.FARMLAND) || state.matchesBlock(Blocks.PODZOL) || state.matchesBlock(Blocks.MYCELIUM) || diff --git a/src/main/java/org/infernalstudios/infernalexp/blocks/TrappedGlowSandBlock.java b/src/main/java/org/infernalstudios/infernalexp/blocks/TrappedGlowSandBlock.java index 8608173dc..20d036f03 100644 --- a/src/main/java/org/infernalstudios/infernalexp/blocks/TrappedGlowSandBlock.java +++ b/src/main/java/org/infernalstudios/infernalexp/blocks/TrappedGlowSandBlock.java @@ -51,7 +51,7 @@ public void onEntityWalk(World world, BlockPos pos, Entity entity) { for (int x = -updateRadius; x <= updateRadius; x++) { for (int y = -updateRadius; y <= updateRadius; y++) { for (int z = -updateRadius; z <= updateRadius; z++) { - if (world.getBlockState(pos.add(x, y, z)) == IEBlocks.TRAPPED_GLOWDUST_SAND.get().getDefaultState()) { + if (world.getBlockState(pos.add(x, y, z)) == IEBlocks.TRAPPED_SHIMMER_SAND.get().getDefaultState()) { ((TrappedGlowSandBlock) world.getBlockState(pos.add(x, y, z)).getBlock()).startFalling((ServerWorld) world, pos.add(x, y, z)); } } diff --git a/src/main/java/org/infernalstudios/infernalexp/init/IEBlocks.java b/src/main/java/org/infernalstudios/infernalexp/init/IEBlocks.java index da5e4a6f3..8ffc41e8f 100644 --- a/src/main/java/org/infernalstudios/infernalexp/init/IEBlocks.java +++ b/src/main/java/org/infernalstudios/infernalexp/init/IEBlocks.java @@ -148,23 +148,23 @@ public class IEBlocks { public static final RegistryObject STRIPPED_LUMINOUS_STEM = registerBlockWithDefaultItem("stripped_luminous_stem", () -> new RotatedPillarBlock(getProperties(Blocks.STRIPPED_CRIMSON_STEM))); public static final RegistryObject STRIPPED_LUMINOUS_HYPHAE = registerBlockWithDefaultItem("stripped_luminous_hyphae", () -> new RotatedPillarBlock(getProperties(Blocks.STRIPPED_CRIMSON_HYPHAE))); - public static final RegistryObject GLOWDUST_SAND = registerBlockWithDefaultItem("glowdust_sand", () -> new GlowSandBlock(0xFFC267, AbstractBlock.Properties.create(Material.SNOW_BLOCK, MaterialColor.SAND).setRequiresTool().harvestTool(ToolType.SHOVEL).hardnessAndResistance(0.5F).sound(SoundType.SAND))); - public static final RegistryObject GLOWDUST = registerBlockWithDefaultItem("glowdust", () -> new GlowdustBlock(AbstractBlock.Properties.create(Material.SNOW, MaterialColor.SAND).setRequiresTool().harvestTool(ToolType.SHOVEL).hardnessAndResistance(0.2f).sound(SoundType.SAND))); - public static final RegistryObject TRAPPED_GLOWDUST_SAND = registerBlockWithDefaultItem("trapped_glowdust_sand", () -> new TrappedGlowSandBlock(0xFFC267, getProperties(GLOWDUST_SAND.get()).hardnessAndResistance(0.2F))); - - public static final RegistryObject GLOWDUST_STONE = registerBlockWithDefaultItem("glowdust_stone", () -> new Block(getProperties(Blocks.SANDSTONE))); - public static final RegistryObject GLOWDUST_STONE_SLAB = registerBlockWithDefaultItem("glowdust_stone_slab", () -> new SlabBlock(getProperties(GLOWDUST_STONE.get()))); - public static final RegistryObject GLOWDUST_STONE_VERTICAL_SLAB = registerBlockWithDefaultItemConditioned("glowdust_stone_vertical_slab", () -> new VerticalSlabBlock(getProperties(GLOWDUST_STONE.get())), "quark"); - public static final RegistryObject GLOWDUST_STONE_STAIRS = registerBlockWithDefaultItem("glowdust_stone_stairs", () -> new StairsBlock(() -> GLOWDUST_STONE.get().getDefaultState(), getProperties(GLOWDUST_STONE.get()))); - public static final RegistryObject GLOWDUST_STONE_WALL = registerBlockWithDefaultItem("glowdust_stone_wall", () -> new WallBlock(getProperties(GLOWDUST_STONE.get()))); - - public static final RegistryObject GLOWDUST_STONE_BRICKS = registerBlockWithDefaultItem("glowdust_stone_bricks", () -> new Block(getProperties(Blocks.SANDSTONE))); - public static final RegistryObject GLOWDUST_STONE_BRICK_SLAB = registerBlockWithDefaultItem("glowdust_stone_brick_slab", () -> new SlabBlock(getProperties(GLOWDUST_STONE_BRICKS.get()))); - public static final RegistryObject GLOWDUST_STONE_BRICK_VERTICAL_SLAB = registerBlockWithDefaultItemConditioned("glowdust_stone_brick_vertical_slab", () -> new VerticalSlabBlock(getProperties(GLOWDUST_STONE_BRICKS.get())), "quark"); - public static final RegistryObject GLOWDUST_STONE_BRICK_STAIRS = registerBlockWithDefaultItem("glowdust_stone_brick_stairs", () -> new StairsBlock(() -> GLOWDUST_STONE_BRICKS.get().getDefaultState(), getProperties(GLOWDUST_STONE_BRICKS.get()))); - public static final RegistryObject GLOWDUST_STONE_BRICK_WALL = registerBlockWithDefaultItem("glowdust_stone_brick_wall", () -> new WallBlock(getProperties(GLOWDUST_STONE_BRICKS.get()))); - public static final RegistryObject CRACKED_GLOWDUST_STONE_BRICKS = registerBlockWithDefaultItem("cracked_glowdust_stone_bricks", () -> new Block(getProperties(GLOWDUST_STONE_BRICKS.get()))); - public static final RegistryObject CHISELED_GLOWDUST_STONE_BRICKS = registerBlockWithDefaultItem("chiseled_glowdust_stone_bricks", () -> new Block(getProperties(GLOWDUST_STONE_BRICKS.get()))); + public static final RegistryObject SHIMMER_SAND = registerBlockWithDefaultItem("shimmer_sand", () -> new GlowSandBlock(0xFFC267, AbstractBlock.Properties.create(Material.SNOW_BLOCK, MaterialColor.SAND).setRequiresTool().harvestTool(ToolType.SHOVEL).hardnessAndResistance(0.5F).sound(SoundType.SAND))); + public static final RegistryObject SHIMMER_SHEET = registerBlockWithDefaultItem("shimmer_sheet", () -> new GlowdustBlock(AbstractBlock.Properties.create(Material.SNOW, MaterialColor.SAND).setRequiresTool().harvestTool(ToolType.SHOVEL).hardnessAndResistance(0.2f).sound(SoundType.SAND))); + public static final RegistryObject TRAPPED_SHIMMER_SAND = registerBlockWithDefaultItem("trapped_shimmer_sand", () -> new TrappedGlowSandBlock(0xFFC267, getProperties(SHIMMER_SAND.get()).hardnessAndResistance(0.2F))); + + public static final RegistryObject SHIMMER_STONE = registerBlockWithDefaultItem("shimmer_stone", () -> new Block(getProperties(Blocks.SANDSTONE))); + public static final RegistryObject SHIMMER_STONE_SLAB = registerBlockWithDefaultItem("shimmer_stone_slab", () -> new SlabBlock(getProperties(SHIMMER_STONE.get()))); + public static final RegistryObject SHIMMER_STONE_VERTICAL_SLAB = registerBlockWithDefaultItemConditioned("shimmer_stone_vertical_slab", () -> new VerticalSlabBlock(getProperties(SHIMMER_STONE.get())), "quark"); + public static final RegistryObject SHIMMER_STONE_STAIRS = registerBlockWithDefaultItem("shimmer_stone_stairs", () -> new StairsBlock(() -> SHIMMER_STONE.get().getDefaultState(), getProperties(SHIMMER_STONE.get()))); + public static final RegistryObject SHIMMER_STONE_WALL = registerBlockWithDefaultItem("shimmer_stone_wall", () -> new WallBlock(getProperties(SHIMMER_STONE.get()))); + + public static final RegistryObject SHIMMER_STONE_BRICKS = registerBlockWithDefaultItem("shimmer_stone_bricks", () -> new Block(getProperties(Blocks.SANDSTONE))); + public static final RegistryObject SHIMMER_STONE_BRICK_SLAB = registerBlockWithDefaultItem("shimmer_stone_brick_slab", () -> new SlabBlock(getProperties(SHIMMER_STONE_BRICKS.get()))); + public static final RegistryObject SHIMMER_STONE_BRICK_VERTICAL_SLAB = registerBlockWithDefaultItemConditioned("shimmer_stone_brick_vertical_slab", () -> new VerticalSlabBlock(getProperties(SHIMMER_STONE_BRICKS.get())), "quark"); + public static final RegistryObject SHIMMER_STONE_BRICK_STAIRS = registerBlockWithDefaultItem("shimmer_stone_brick_stairs", () -> new StairsBlock(() -> SHIMMER_STONE_BRICKS.get().getDefaultState(), getProperties(SHIMMER_STONE_BRICKS.get()))); + public static final RegistryObject SHIMMER_STONE_BRICK_WALL = registerBlockWithDefaultItem("shimmer_stone_brick_wall", () -> new WallBlock(getProperties(SHIMMER_STONE_BRICKS.get()))); + public static final RegistryObject CRACKED_SHIMMER_STONE_BRICKS = registerBlockWithDefaultItem("cracked_shimmer_stone_bricks", () -> new Block(getProperties(SHIMMER_STONE_BRICKS.get()))); + public static final RegistryObject CHISELED_SHIMMER_STONE_BRICKS = registerBlockWithDefaultItem("chiseled_shimmer_stone_bricks", () -> new Block(getProperties(SHIMMER_STONE_BRICKS.get()))); public static final RegistryObject CRUMBLING_BLACKSTONE = registerBlockWithDefaultItem("crumbling_blackstone", () -> new CrumblingBlackstoneBlock(AbstractBlock.Properties.from(Blocks.NETHERRACK))); public static final RegistryObject RUBBLE = registerBlockWithDefaultItem("rubble", () -> new Block(getProperties(Blocks.GRAVEL))); diff --git a/src/main/java/org/infernalstudios/infernalexp/init/IEConfiguredFeatures.java b/src/main/java/org/infernalstudios/infernalexp/init/IEConfiguredFeatures.java index 825910fb1..8e69417f8 100644 --- a/src/main/java/org/infernalstudios/infernalexp/init/IEConfiguredFeatures.java +++ b/src/main/java/org/infernalstudios/infernalexp/init/IEConfiguredFeatures.java @@ -51,10 +51,10 @@ public class IEConfiguredFeatures { public static final RuleTest BASALT = new BlockMatchRuleTest(Blocks.BASALT); public static final RuleTest SOUL_SOIL = new BlockMatchRuleTest(Blocks.SOUL_SOIL); - public static ConfiguredFeature GLOWDUST_LAYER = registerConfiguredFeature("glowdust_layer", IEFeatures.GLOWDUST_LAYER.withConfiguration(IFeatureConfig.NO_FEATURE_CONFIG)); + public static ConfiguredFeature SHIMMER_SHEET_LAYER = registerConfiguredFeature("shimmer_sheet_layer", IEFeatures.SHIMMER_SHEET_LAYER.withConfiguration(IFeatureConfig.NO_FEATURE_CONFIG)); public static ConfiguredFeature GLOWSPIKE = registerConfiguredFeature("glowspike", IEFeatures.GLOWSPIKE.withConfiguration(new GlowSpikeFeatureConfig(3, 5, 8, 24, 7, 7, 0.3f, true)).withPlacement(Features.Placements.PATCH_PLACEMENT.count(30))); public static ConfiguredFeature GLOWSPIKELARGE = registerConfiguredFeature("glowspikelarge", IEFeatures.GLOWSPIKE.withConfiguration(new GlowSpikeFeatureConfig(4, 7, 12, 98, 12, 12, 0.2f, false)).withPlacement(Features.Placements.PATCH_PLACEMENT.count(30))); - public static ConfiguredFeature DULLTHORN_TREE_PLANTED = registerConfiguredFeature("dullthorn_tree_planted", Feature.HUGE_FUNGUS.withConfiguration(new HugeFungusConfig(IEBlocks.GLOWDUST_SAND.get().getDefaultState(), IEBlocks.DULLTHORNS_BLOCK.get().getDefaultState(), IEBlocks.LUMINOUS_WART_BLOCK.get().getDefaultState(), IEBlocks.LUMINOUS_WART_BLOCK.get().getDefaultState(), true))); + public static ConfiguredFeature DULLTHORN_TREE_PLANTED = registerConfiguredFeature("dullthorn_tree_planted", Feature.HUGE_FUNGUS.withConfiguration(new HugeFungusConfig(IEBlocks.SHIMMER_SAND.get().getDefaultState(), IEBlocks.DULLTHORNS_BLOCK.get().getDefaultState(), IEBlocks.LUMINOUS_WART_BLOCK.get().getDefaultState(), IEBlocks.LUMINOUS_WART_BLOCK.get().getDefaultState(), true))); public static ConfiguredFeature GLOWSTONE_RAVINE = registerConfiguredFeature("glowstone_ravine", IEFeatures.GLOWSTONE_RAVINE.withConfiguration(IFeatureConfig.NO_FEATURE_CONFIG).withPlacement(Features.Placements.PATCH_PLACEMENT.count(120))); public static ConfiguredFeature HANGING_GIANT_BROWN_MUSHROOM = registerConfiguredFeature("hanging_giant_brown_mushroom", IEFeatures.HANGING_GIANT_BROWN_MUSHROOM.withConfiguration(IFeatureConfig.NO_FEATURE_CONFIG).withPlacement(Features.Placements.PATCH_PLACEMENT.count(120))); public static ConfiguredFeature DULLSTONE_DEATH_PIT = registerConfiguredFeature("dullstone_death_pit", IEFeatures.DULLSTONE_DEATH_PIT.withConfiguration(IFeatureConfig.NO_FEATURE_CONFIG).withPlacement(Features.Placements.PATCH_PLACEMENT.count(90))); @@ -67,7 +67,7 @@ public class IEConfiguredFeatures { public static ConfiguredFeature ORE_GLOWSILK_COCOON = registerConfiguredFeature("ore_glowsilk_cocoon", Feature.NO_SURFACE_ORE.withConfiguration(new OreFeatureConfig(OreFeatureConfig.FillerBlockType.BASE_STONE_NETHER, IEBlocks.GLOWSILK_COCOON.get().getDefaultState(), 2)).withPlacement(Placement.DEPTH_AVERAGE.configure(new DepthAverageConfig(20, 10))).square()); public static ConfiguredFeature ORE_BASALT_IRON_BASALT_DELTA = registerConfiguredFeature("ore_basalt_iron_basalt_deltas", Feature.ORE.withConfiguration(new OreFeatureConfig(BASALT, IEBlocks.BASALT_IRON_ORE.get().getDefaultState(), 8)).withPlacement(Features.Placements.NETHER_SPRING_ORE_PLACEMENT).square().count(18)); public static ConfiguredFeature ORE_BASALT_IRON_DELTA_SHORES = registerConfiguredFeature("ore_basalt_iron_delta_shores", Feature.ORE.withConfiguration(new OreFeatureConfig(BASALT, IEBlocks.BASALT_IRON_ORE.get().getDefaultState(), 8)).withPlacement(Features.Placements.NETHER_SPRING_ORE_PLACEMENT).square().count(8)); - public static ConfiguredFeature PATCH_GLOW_FIRE = registerConfiguredFeature("patch_glow_fire", Feature.RANDOM_PATCH.withConfiguration((new BlockClusterFeatureConfig.Builder(new SimpleBlockStateProvider(IEBlocks.GLOW_FIRE.get().getDefaultState()), SimpleBlockPlacer.PLACER)).tries(64).whitelist(ImmutableSet.of(IEBlocks.GLOWDUST_SAND.get())).preventProjection().build()).withPlacement(Features.Placements.FIRE_PLACEMENT)); + public static ConfiguredFeature PATCH_GLOW_FIRE = registerConfiguredFeature("patch_glow_fire", Feature.RANDOM_PATCH.withConfiguration((new BlockClusterFeatureConfig.Builder(new SimpleBlockStateProvider(IEBlocks.GLOW_FIRE.get().getDefaultState()), SimpleBlockPlacer.PLACER)).tries(64).whitelist(ImmutableSet.of(IEBlocks.SHIMMER_SAND.get())).preventProjection().build()).withPlacement(Features.Placements.FIRE_PLACEMENT)); public static ConfiguredFeature BASALTIC_MAGMA = registerConfiguredFeature("basaltic_magma", Feature.ORE.withConfiguration(new OreFeatureConfig(BASALT, IEBlocks.BASALTIC_MAGMA.get().getDefaultState(), 10)).withPlacement(Features.Placements.NETHER_SPRING_ORE_PLACEMENT).square().count(8)); public static ConfiguredFeature PATCH_WARPED_CAP = registerConfiguredFeature("patch_warped_cap", Feature.RANDOM_PATCH.withConfiguration((new BlockClusterFeatureConfig.Builder(new SimpleBlockStateProvider(IEBlocks.WARPED_FUNGUS_CAP.get().getDefaultState()), new SimpleBlockPlacer())).tries(64).whitelist(ImmutableSet.of(Blocks.WARPED_NYLIUM.getBlock())).preventProjection().build()).range(128).chance(16)); public static ConfiguredFeature PATCH_CRIMSON_CAP = registerConfiguredFeature("patch_crimson_cap", Feature.RANDOM_PATCH.withConfiguration((new BlockClusterFeatureConfig.Builder(new SimpleBlockStateProvider(IEBlocks.CRIMSON_FUNGUS_CAP.get().getDefaultState()), new SimpleBlockPlacer())).tries(64).whitelist(ImmutableSet.of(Blocks.WARPED_NYLIUM.getBlock())).preventProjection().build()).range(128).chance(16)); diff --git a/src/main/java/org/infernalstudios/infernalexp/init/IEFeatures.java b/src/main/java/org/infernalstudios/infernalexp/init/IEFeatures.java index f6861fc4b..bab111eb2 100644 --- a/src/main/java/org/infernalstudios/infernalexp/init/IEFeatures.java +++ b/src/main/java/org/infernalstudios/infernalexp/init/IEFeatures.java @@ -43,14 +43,14 @@ public class IEFeatures { public static List> features = new ArrayList<>(); - public static final Feature GLOWDUST_LAYER = registerFeature("glowdust_layer", new GlowLayerFeature(NoFeatureConfig.CODEC)); + public static final Feature SHIMMER_SHEET_LAYER = registerFeature("shimmer_sheet_layer", new GlowLayerFeature(NoFeatureConfig.CODEC)); public static final Feature GLOWSPIKE = registerFeature("glowspike", new GlowSpikeFeature(GlowSpikeFeatureConfig.CODEC)); public static final Feature GLOWSTONE_RAVINE = registerFeature("glowstone_ravine", new GlowstoneRavineFeature(NoFeatureConfig.CODEC)); public static final Feature HANGING_GIANT_BROWN_MUSHROOM = registerFeature("hanging_giant_brown_mushroom", new HangingGiantBrownMushroomFeature(NoFeatureConfig.CODEC)); public static final Feature LUMINOUS_FUNGUS = registerFeature("luminous_fungus", new LuminousFungusFeature(NoFeatureConfig.CODEC)); public static final Feature DULLTHORNS = registerFeature("dullthorns", new DullthornsFeature(NoFeatureConfig.CODEC)); public static final Feature BOULDER = registerFeature("blackstone_boulder", new BoulderFeature(BlockStateFeatureConfig.CODEC)); - public static final Feature DULLSTONE_DEATH_PIT = registerFeature("glowdust_sink_hole", new SinkHoleFeature(NoFeatureConfig.CODEC)); + public static final Feature DULLSTONE_DEATH_PIT = registerFeature("shimmer_sheet_sink_hole", new SinkHoleFeature(NoFeatureConfig.CODEC)); public static final Feature SHROOMLIGHT_TEAR = registerFeature("shroomlight_tear", new ShroomlightTearFeature(NoFeatureConfig.CODEC)); public static final Feature PATCH_PLANTED_QUARTZ = registerFeature("planted_quartz_patch", new PlantedQuartzFeature(PlantedQuartzFeatureConfig.CODEC)); diff --git a/src/main/java/org/infernalstudios/infernalexp/init/IESurfaceBuilders.java b/src/main/java/org/infernalstudios/infernalexp/init/IESurfaceBuilders.java index 6b1cdad22..1e4df8f28 100644 --- a/src/main/java/org/infernalstudios/infernalexp/init/IESurfaceBuilders.java +++ b/src/main/java/org/infernalstudios/infernalexp/init/IESurfaceBuilders.java @@ -39,8 +39,8 @@ public class IESurfaceBuilders { // Surface Builder Configs public static class ModSurfaceBuilderConfig { public static final SurfaceBuilderConfig GLOWSTONE_CANYON_CONFIG = new SurfaceBuilderConfig( - IEBlocks.GLOWDUST_SAND.get().getDefaultState(), - IEBlocks.GLOWDUST_STONE.get().getDefaultState(), + IEBlocks.SHIMMER_SAND.get().getDefaultState(), + IEBlocks.SHIMMER_STONE.get().getDefaultState(), Blocks.GLOWSTONE.getDefaultState()); public static final SurfaceBuilderConfig DELTA_SHORES_CONFIG = new SurfaceBuilderConfig( diff --git a/src/main/java/org/infernalstudios/infernalexp/world/biome/netherbiomes/GlowstoneCanyonBiome.java b/src/main/java/org/infernalstudios/infernalexp/world/biome/netherbiomes/GlowstoneCanyonBiome.java index a6818fa0e..a3f4a9646 100644 --- a/src/main/java/org/infernalstudios/infernalexp/world/biome/netherbiomes/GlowstoneCanyonBiome.java +++ b/src/main/java/org/infernalstudios/infernalexp/world/biome/netherbiomes/GlowstoneCanyonBiome.java @@ -116,7 +116,7 @@ protected void configureGeneration(BiomeGenerationSettings.Builder generation) { generation.withFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, Features.SPRING_CLOSED_DOUBLE); generation.withFeature(GenerationStage.Decoration.UNDERGROUND_ORES, IEConfiguredFeatures.ORE_GLOWSILK_COCOON); generation.withFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, IEConfiguredFeatures.PATCH_GLOW_FIRE); - generation.withFeature(GenerationStage.Decoration.TOP_LAYER_MODIFICATION, IEConfiguredFeatures.GLOWDUST_LAYER); + generation.withFeature(GenerationStage.Decoration.TOP_LAYER_MODIFICATION, IEConfiguredFeatures.SHIMMER_SHEET_LAYER); DefaultBiomeFeatures.withCommonNetherBlocks(generation); } diff --git a/src/main/java/org/infernalstudios/infernalexp/world/gen/carvers/GlowstoneRavineCarver.java b/src/main/java/org/infernalstudios/infernalexp/world/gen/carvers/GlowstoneRavineCarver.java index 4b5f79d18..784a6c65e 100644 --- a/src/main/java/org/infernalstudios/infernalexp/world/gen/carvers/GlowstoneRavineCarver.java +++ b/src/main/java/org/infernalstudios/infernalexp/world/gen/carvers/GlowstoneRavineCarver.java @@ -40,7 +40,7 @@ public class GlowstoneRavineCarver extends CanyonWorldCarver { public GlowstoneRavineCarver(Codec p_i231916_1_) { super(p_i231916_1_); - this.carvableBlocks = ImmutableSet.of(Blocks.BLACKSTONE, Blocks.GLOWSTONE, IEBlocks.DULLSTONE.get(), IEBlocks.DIMSTONE.get(), IEBlocks.GLOWDUST_SAND.get(), IEBlocks.GLOWDUST_STONE.get(), IEBlocks.GLOWDUST.get(), IEBlocks.CRUMBLING_BLACKSTONE.get()); + this.carvableBlocks = ImmutableSet.of(Blocks.BLACKSTONE, Blocks.GLOWSTONE, IEBlocks.DULLSTONE.get(), IEBlocks.DIMSTONE.get(), IEBlocks.SHIMMER_SAND.get(), IEBlocks.SHIMMER_STONE.get(), IEBlocks.SHIMMER_SHEET.get(), IEBlocks.CRUMBLING_BLACKSTONE.get()); } private final float[] heightToHorizontalStretchFactor = new float[256]; @@ -121,7 +121,7 @@ private double findYPos(IChunk chunk, Random random, double x, double z) { // If there are multiple levels in current part of biome, add some randomness to which level the ravine generates on with a bias towards generating on the bottom levels if (random.nextInt(3) != 0) { - if (chunk.getBlockState(new BlockPos(x, yCheck, z)) == IEBlocks.GLOWDUST_SAND.get().getDefaultState()) { + if (chunk.getBlockState(new BlockPos(x, yCheck, z)) == IEBlocks.SHIMMER_SAND.get().getDefaultState()) { return yCheck - 5; } } diff --git a/src/main/java/org/infernalstudios/infernalexp/world/gen/features/BoulderFeature.java b/src/main/java/org/infernalstudios/infernalexp/world/gen/features/BoulderFeature.java index 518294643..87efe07b0 100644 --- a/src/main/java/org/infernalstudios/infernalexp/world/gen/features/BoulderFeature.java +++ b/src/main/java/org/infernalstudios/infernalexp/world/gen/features/BoulderFeature.java @@ -39,7 +39,7 @@ public BoulderFeature(Codec codec) { public boolean generate(ISeedReader world, ChunkGenerator generator, Random random, BlockPos pos, BlockStateFeatureConfig config) { int radius = new int[]{1, 1, 2, 2, 2, 2, 3}[random.nextInt(7)]; - if (!world.isAirBlock(pos) || world.getBlockState(pos.down()).getBlock() != IEBlocks.GLOWDUST_SAND.get() || world.isAirBlock(pos.down(radius)) || random.nextInt(3) == 2) { + if (!world.isAirBlock(pos) || world.getBlockState(pos.down()).getBlock() != IEBlocks.SHIMMER_SAND.get() || world.isAirBlock(pos.down(radius)) || random.nextInt(3) == 2) { return false; } else { placeSphere(world, random, pos.down(Math.floorDiv(radius, 3)), radius, config); diff --git a/src/main/java/org/infernalstudios/infernalexp/world/gen/features/DullthornsFeature.java b/src/main/java/org/infernalstudios/infernalexp/world/gen/features/DullthornsFeature.java index e38134852..1f904f644 100644 --- a/src/main/java/org/infernalstudios/infernalexp/world/gen/features/DullthornsFeature.java +++ b/src/main/java/org/infernalstudios/infernalexp/world/gen/features/DullthornsFeature.java @@ -38,7 +38,7 @@ public boolean generate(ISeedReader worldIn, ChunkGenerator generator, Random ra int height = random.nextInt(9) + 1; int top = 0; - if (!worldIn.isAirBlock(pos) || worldIn.getBlockState(pos.down()).getBlock() != IEBlocks.GLOWDUST_SAND.get()) { + if (!worldIn.isAirBlock(pos) || worldIn.getBlockState(pos.down()).getBlock() != IEBlocks.SHIMMER_SAND.get()) { return false; } else { // Generate dullthorns up "height" blocks unless there is something in the way diff --git a/src/main/java/org/infernalstudios/infernalexp/world/gen/features/GlowLayerFeature.java b/src/main/java/org/infernalstudios/infernalexp/world/gen/features/GlowLayerFeature.java index 3bb6fdbd4..b1efd8353 100644 --- a/src/main/java/org/infernalstudios/infernalexp/world/gen/features/GlowLayerFeature.java +++ b/src/main/java/org/infernalstudios/infernalexp/world/gen/features/GlowLayerFeature.java @@ -51,7 +51,7 @@ public boolean generate(ISeedReader world, ChunkGenerator generator, Random rand for (int z = minimumRange; z < maxRange; z++) { // Only check between top land and sealevel. - // Prevents glowdust in caves below sealevel and better performance if player removes ceiling of Nether with datapack. + // Prevents shimmer_sheet in caves below sealevel and better performance if player removes ceiling of Nether with datapack. int maxY = generator.getHeight(pos.getX() + x, pos.getZ() + z, Heightmap.Type.MOTION_BLOCKING); for (int y = maxY; y > generator.getSeaLevel(); y--) { mutableBlockPos.setPos(pos).move(x, y, z); @@ -61,15 +61,15 @@ public boolean generate(ISeedReader world, ChunkGenerator generator, Random rand cachedChunk = world.getChunk(mutableBlockPos); } - // Checks for if we are at glowdust sand and moves up to check for air space. + // Checks for if we are at shimmer_sheet sand and moves up to check for air space. BlockState currentBlock = cachedChunk.getBlockState(mutableBlockPos); - if (currentBlock.matchesBlock(IEBlocks.GLOWDUST_SAND.get()) && + if (currentBlock.matchesBlock(IEBlocks.SHIMMER_SAND.get()) && cachedChunk.getBlockState(mutableBlockPos.move(Direction.UP)).isAir()) { - // we are now in the air space above Glowdust sand. Check if any of the 8 blocks around it is glowdust sand + // we are now in the air space above Glowdust sand. Check if any of the 8 blocks around it is shimmer_sheet sand // maximum return is 8. - int glowdustLayerHeight = numberOfGlowdustSandNearby(world, mutableBlockPos, mutableBlockPosNeighbors); - if (glowdustLayerHeight > 0) { - world.setBlockState(mutableBlockPos, IEBlocks.GLOWDUST.get().getDefaultState().with(GlowdustBlock.LAYERS, glowdustLayerHeight), 3); + int shimmer_sheetLayerHeight = numberOfGlowdustSandNearby(world, mutableBlockPos, mutableBlockPosNeighbors); + if (shimmer_sheetLayerHeight > 0) { + world.setBlockState(mutableBlockPos, IEBlocks.SHIMMER_SHEET.get().getDefaultState().with(GlowdustBlock.LAYERS, shimmer_sheetLayerHeight), 3); } } } @@ -103,7 +103,7 @@ private boolean isMultipleBiomesInChunk(ISeedReader world, BlockPos pos, BlockPo } private int numberOfGlowdustSandNearby(ISeedReader world, BlockPos.Mutable mutableBlockPos, BlockPos.Mutable mutableBlockPosNeighbors) { - int glowdustSandCount = 0; + int shimmer_sheetSandCount = 0; int radius = 2; for (int x = -radius; x <= radius; x++) { for (int z = -radius; z <= radius; z++) { @@ -112,17 +112,17 @@ private int numberOfGlowdustSandNearby(ISeedReader world, BlockPos.Mutable mutab mutableBlockPosNeighbors.setPos(mutableBlockPos).move(x, 0, z); BlockState neighborBlock = world.getBlockState(mutableBlockPosNeighbors); // Do not use .isSolid check because Glowdust Sand is marked notSolid (cause it uses Glowstone properties) - if (neighborBlock.matchesBlock(IEBlocks.GLOWDUST_SAND.get())) { - glowdustSandCount++; + if (neighborBlock.matchesBlock(IEBlocks.SHIMMER_SAND.get())) { + shimmer_sheetSandCount++; } } } // changes the shape and height of layers. Modify the algorithm for neat effects - // change radius to 1 and use this version for only 1 layer high glowdust layer right next to ledges - //return Math.min(glowdustSandCount, 1); + // change radius to 1 and use this version for only 1 layer high shimmer_sheet layer right next to ledges + //return Math.min(shimmer_sheetSandCount, 1); // change radius to 2 and use this version for 2x2 barely sloping dust that looks neat - return Math.min((int) Math.ceil((glowdustSandCount) / 6D), 8); + return Math.min((int) Math.ceil((shimmer_sheetSandCount) / 6D), 8); } } diff --git a/src/main/java/org/infernalstudios/infernalexp/world/gen/features/GlowSpikeFeature.java b/src/main/java/org/infernalstudios/infernalexp/world/gen/features/GlowSpikeFeature.java index 3d1cc635e..b8711f657 100644 --- a/src/main/java/org/infernalstudios/infernalexp/world/gen/features/GlowSpikeFeature.java +++ b/src/main/java/org/infernalstudios/infernalexp/world/gen/features/GlowSpikeFeature.java @@ -40,7 +40,7 @@ public GlowSpikeFeature(Codec codec) { @Override public boolean generate(ISeedReader world, ChunkGenerator generator, Random random, BlockPos pos, GlowSpikeFeatureConfig config) { - if ((world.isAirBlock(pos) || world.getBlockState(pos.down()).getBlock() == IEBlocks.GLOWDUST_SAND.get()) || (world.getBlockState(pos).getBlock() == Blocks.LAVA && world.getBlockState(pos.down()).getBlock() != Blocks.LAVA)) { + if ((world.isAirBlock(pos) || world.getBlockState(pos.down()).getBlock() == IEBlocks.SHIMMER_SAND.get()) || (world.getBlockState(pos).getBlock() == Blocks.LAVA && world.getBlockState(pos.down()).getBlock() != Blocks.LAVA)) { // Generate a random height, diameter and offset int height = config.minHeight + random.nextInt(config.maxHeight - config.minHeight); int diameter = config.minDiameter + random.nextInt(config.maxDiameter - config.minDiameter); diff --git a/src/main/java/org/infernalstudios/infernalexp/world/gen/features/GlowstoneRavineFeature.java b/src/main/java/org/infernalstudios/infernalexp/world/gen/features/GlowstoneRavineFeature.java index 889f9ae4c..b57065275 100644 --- a/src/main/java/org/infernalstudios/infernalexp/world/gen/features/GlowstoneRavineFeature.java +++ b/src/main/java/org/infernalstudios/infernalexp/world/gen/features/GlowstoneRavineFeature.java @@ -45,7 +45,7 @@ public GlowstoneRavineFeature(Codec codec) { public boolean generate(ISeedReader world, ChunkGenerator generator, Random random, BlockPos pos, NoFeatureConfig config) { BlockPos endPos = pos.add((40 + random.nextInt(20)) * (random.nextInt(2) == 0 ? -1 : 1), 0, (40 + random.nextInt(20)) * (random.nextInt(2) == 0 ? -1 : 1)); - if (!world.isAirBlock(pos) || world.getBlockState(pos.down()) != IEBlocks.GLOWDUST_SAND.get().getDefaultState() || world.getBlockState(endPos.down()) == Blocks.LAVA.getDefaultState()) { + if (!world.isAirBlock(pos) || world.getBlockState(pos.down()) != IEBlocks.SHIMMER_SAND.get().getDefaultState() || world.getBlockState(endPos.down()) == Blocks.LAVA.getDefaultState()) { return false; } else { List centerLine = ShapeUtil.generateLine(pos, endPos); diff --git a/src/main/java/org/infernalstudios/infernalexp/world/gen/features/LuminousFungusFeature.java b/src/main/java/org/infernalstudios/infernalexp/world/gen/features/LuminousFungusFeature.java index 6dbaff6b0..b130c6684 100644 --- a/src/main/java/org/infernalstudios/infernalexp/world/gen/features/LuminousFungusFeature.java +++ b/src/main/java/org/infernalstudios/infernalexp/world/gen/features/LuminousFungusFeature.java @@ -60,7 +60,7 @@ public boolean generate(ISeedReader world, ChunkGenerator generator, Random rand BlockPos blockpos = pos.add(random.nextInt(10) - random.nextInt(20), random.nextInt(4) - random.nextInt(8), random.nextInt(10) - random.nextInt(20)); // If the randomly chosen location is valid, then place the fungus - if (world.isAirBlock(blockpos) && state.isValidPosition(world, blockpos) && (world.getBlockState(blockpos.up()) == IEBlocks.DULLSTONE.get().getDefaultState() || world.getBlockState(blockpos.down()) == IEBlocks.GLOWDUST_SAND.get().getDefaultState())) { + if (world.isAirBlock(blockpos) && state.isValidPosition(world, blockpos) && (world.getBlockState(blockpos.up()) == IEBlocks.DULLSTONE.get().getDefaultState() || world.getBlockState(blockpos.down()) == IEBlocks.SHIMMER_SAND.get().getDefaultState())) { world.setBlockState(blockpos, state, 2); i++; } diff --git a/src/main/java/org/infernalstudios/infernalexp/world/gen/features/SinkHoleFeature.java b/src/main/java/org/infernalstudios/infernalexp/world/gen/features/SinkHoleFeature.java index d0a0fd305..05a829017 100644 --- a/src/main/java/org/infernalstudios/infernalexp/world/gen/features/SinkHoleFeature.java +++ b/src/main/java/org/infernalstudios/infernalexp/world/gen/features/SinkHoleFeature.java @@ -42,7 +42,7 @@ public SinkHoleFeature(Codec codec) { @Override public boolean generate(ISeedReader world, ChunkGenerator generator, Random random, BlockPos pos, NoFeatureConfig config) { BlockPos.Mutable mutableBlockPos = new BlockPos.Mutable().setPos(pos); - if (!world.isAirBlock(mutableBlockPos) || world.getBlockState(mutableBlockPos.move(Direction.DOWN)).getBlock() != IEBlocks.GLOWDUST_SAND.get()) { + if (!world.isAirBlock(mutableBlockPos) || world.getBlockState(mutableBlockPos.move(Direction.DOWN)).getBlock() != IEBlocks.SHIMMER_SAND.get()) { return false; } else { int radius = minRadius + random.nextInt(maxRadius - minRadius); @@ -60,7 +60,7 @@ public boolean generate(ISeedReader world, ChunkGenerator generator, Random rand mutableBlockPos.setPos(pos); mutableBlockPos.move(point.getX(), point.getY(), point.getZ()); for (int y = 0; y < 3; y++) { - world.setBlockState(mutableBlockPos.move(Direction.DOWN), IEBlocks.GLOWDUST_SAND.get().getDefaultState(), 2); + world.setBlockState(mutableBlockPos.move(Direction.DOWN), IEBlocks.SHIMMER_SAND.get().getDefaultState(), 2); } } @@ -69,7 +69,7 @@ public boolean generate(ISeedReader world, ChunkGenerator generator, Random rand mutableBlockPos.setPos(pos); mutableBlockPos.move(point.getX(), point.getY(), point.getZ()); mutableBlockPos.move(Direction.DOWN); - world.setBlockState(mutableBlockPos, IEBlocks.TRAPPED_GLOWDUST_SAND.get().getDefaultState(), 2); + world.setBlockState(mutableBlockPos, IEBlocks.TRAPPED_SHIMMER_SAND.get().getDefaultState(), 2); for (int y = 2; y < depth; y++) { mutableBlockPos.move(Direction.DOWN); diff --git a/src/main/java/org/infernalstudios/infernalexp/world/gen/structures/IEStructure.java b/src/main/java/org/infernalstudios/infernalexp/world/gen/structures/IEStructure.java index d1396a1aa..467e287b6 100644 --- a/src/main/java/org/infernalstudios/infernalexp/world/gen/structures/IEStructure.java +++ b/src/main/java/org/infernalstudios/infernalexp/world/gen/structures/IEStructure.java @@ -53,7 +53,7 @@ public static int getYPos(ChunkGenerator chunkGenerator, int x, int z, SharedSee BlockState checkAir = blockColumn.getBlockState(pos.down(y)); BlockState checkBlock = blockColumn.getBlockState(pos.down(y + 1)); - if (checkAir.isAir() && (checkBlock.matchesBlock(IEBlocks.GLOWDUST_SAND.get()) || checkBlock.isSolidSide(blockColumn, pos.down(y), Direction.UP))) { + if (checkAir.isAir() && (checkBlock.matchesBlock(IEBlocks.SHIMMER_SAND.get()) || checkBlock.isSolidSide(blockColumn, pos.down(y), Direction.UP))) { return y; } @@ -83,7 +83,7 @@ public static int getYPos(ChunkGenerator chunkGenerator, int x, int z, SharedSee BlockState checkAir = blockColumn.getBlockState(pos.down(y)); BlockState checkBlock = blockColumn.getBlockState(pos.down(y + 1)); - if (checkAir.isAir() && (checkBlock.matchesBlock(IEBlocks.GLOWDUST_SAND.get()) || checkBlock.isSolidSide(blockColumn, pos.down(y), Direction.UP))) { + if (checkAir.isAir() && (checkBlock.matchesBlock(IEBlocks.SHIMMER_SAND.get()) || checkBlock.isSolidSide(blockColumn, pos.down(y), Direction.UP))) { return y; } diff --git a/src/main/java/org/infernalstudios/infernalexp/world/gen/surfacebuilders/GlowstoneCanyonSurfaceBuilder.java b/src/main/java/org/infernalstudios/infernalexp/world/gen/surfacebuilders/GlowstoneCanyonSurfaceBuilder.java index 0a4c7fe8b..71f239e3b 100644 --- a/src/main/java/org/infernalstudios/infernalexp/world/gen/surfacebuilders/GlowstoneCanyonSurfaceBuilder.java +++ b/src/main/java/org/infernalstudios/infernalexp/world/gen/surfacebuilders/GlowstoneCanyonSurfaceBuilder.java @@ -67,7 +67,7 @@ protected void buildSurface(Random random, IChunk chunk, Biome biome, int x, int // If the block is floating, make it Glimmer Gravel, otherwise let it be the regular surface if (blockBelow.isAir()) { - chunk.setBlockState(mutable, IEBlocks.TRAPPED_GLOWDUST_SAND.get().getDefaultState(), false); + chunk.setBlockState(mutable, IEBlocks.TRAPPED_SHIMMER_SAND.get().getDefaultState(), false); } else { chunk.setBlockState(mutable, topBlock, false); } @@ -81,9 +81,9 @@ protected void buildSurface(Random random, IChunk chunk, Biome biome, int x, int } // Make this a feature instead so it places the layers correctly on edges and slopes unlike Surface Builders. -// // Place glowdust above if there is room as surface block is glowdust sand +// // Place shimmer_sheet above if there is room as surface block is shimmer_sheet sand // if(chunk.getBlockState(mutable.up()).isAir()){ -// chunk.setBlockState(mutable.up(), IEBlocks.GLOWDUST.get().getDefaultState(), false); +// chunk.setBlockState(mutable.up(), IEBlocks.SHIMMER_SHEET.get().getDefaultState(), false); // } } else if (depth <= 2 + middleBlockExtraDepth) { // Place block only when under surface and down to as deep as the scaledNoise says to go. diff --git a/src/main/resources/assets/infernalexp/blockstates/charged_chiseled_soul_slate_bricks.json b/src/main/resources/assets/infernalexp/blockstates/charged_chiseled_polished_soul_stone_bricks.json similarity index 100% rename from src/main/resources/assets/infernalexp/blockstates/charged_chiseled_soul_slate_bricks.json rename to src/main/resources/assets/infernalexp/blockstates/charged_chiseled_polished_soul_stone_bricks.json diff --git a/src/main/resources/assets/infernalexp/blockstates/chiseled_glowdust_stone_bricks.json b/src/main/resources/assets/infernalexp/blockstates/chiseled_glowdust_stone_bricks.json deleted file mode 100644 index 7fc57bd41..000000000 --- a/src/main/resources/assets/infernalexp/blockstates/chiseled_glowdust_stone_bricks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "infernalexp:block/chiseled_glowdust_stone_bricks" - } - } -} diff --git a/src/main/resources/assets/infernalexp/blockstates/chiseled_soul_slate_bricks.json b/src/main/resources/assets/infernalexp/blockstates/chiseled_polished_soul_stone_bricks.json similarity index 100% rename from src/main/resources/assets/infernalexp/blockstates/chiseled_soul_slate_bricks.json rename to src/main/resources/assets/infernalexp/blockstates/chiseled_polished_soul_stone_bricks.json diff --git a/src/main/resources/assets/infernalexp/blockstates/chiseled_shimmer_stone_bricks.json b/src/main/resources/assets/infernalexp/blockstates/chiseled_shimmer_stone_bricks.json new file mode 100644 index 000000000..76d84bf4d --- /dev/null +++ b/src/main/resources/assets/infernalexp/blockstates/chiseled_shimmer_stone_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "infernalexp:block/chiseled_shimmer_stone_bricks" + } + } +} diff --git a/src/main/resources/assets/infernalexp/blockstates/cracked_glowdust_stone_bricks.json b/src/main/resources/assets/infernalexp/blockstates/cracked_glowdust_stone_bricks.json deleted file mode 100644 index 9e7713f5c..000000000 --- a/src/main/resources/assets/infernalexp/blockstates/cracked_glowdust_stone_bricks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "infernalexp:block/cracked_glowdust_stone_bricks" - } - } -} diff --git a/src/main/resources/assets/infernalexp/blockstates/cracked_soul_slate_bricks.json b/src/main/resources/assets/infernalexp/blockstates/cracked_polished_soul_stone_bricks.json similarity index 100% rename from src/main/resources/assets/infernalexp/blockstates/cracked_soul_slate_bricks.json rename to src/main/resources/assets/infernalexp/blockstates/cracked_polished_soul_stone_bricks.json diff --git a/src/main/resources/assets/infernalexp/blockstates/cracked_shimmer_stone_bricks.json b/src/main/resources/assets/infernalexp/blockstates/cracked_shimmer_stone_bricks.json new file mode 100644 index 000000000..01887ce8b --- /dev/null +++ b/src/main/resources/assets/infernalexp/blockstates/cracked_shimmer_stone_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "infernalexp:block/cracked_shimmer_stone_bricks" + } + } +} diff --git a/src/main/resources/assets/infernalexp/blockstates/glowdust.json b/src/main/resources/assets/infernalexp/blockstates/glowdust.json deleted file mode 100644 index 2cbfd49d5..000000000 --- a/src/main/resources/assets/infernalexp/blockstates/glowdust.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "layers=1": { - "model": "infernalexp:block/glowdust_height2" - }, - "layers=2": { - "model": "infernalexp:block/glowdust_height4" - }, - "layers=3": { - "model": "infernalexp:block/glowdust_height6" - }, - "layers=4": { - "model": "infernalexp:block/glowdust_height8" - }, - "layers=5": { - "model": "infernalexp:block/glowdust_height10" - }, - "layers=6": { - "model": "infernalexp:block/glowdust_height12" - }, - "layers=7": { - "model": "infernalexp:block/glowdust_height14" - }, - "layers=8": { - "model": "infernalexp:block/glowdust_sand" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/blockstates/glowdust_sand.json b/src/main/resources/assets/infernalexp/blockstates/glowdust_sand.json deleted file mode 100644 index 932a026f0..000000000 --- a/src/main/resources/assets/infernalexp/blockstates/glowdust_sand.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "infernalexp:block/glowdust_sand" - }, - { - "model": "infernalexp:block/glowdust_sand", - "x": 90 - }, - { - "model": "infernalexp:block/glowdust_sand", - "x": 180 - }, - { - "model": "infernalexp:block/glowdust_sand", - "x": 270 - }, - { - "model": "infernalexp:block/glowdust_sand", - "y": 90 - }, - { - "model": "infernalexp:block/glowdust_sand", - "y": 90, - "x": 90 - }, - { - "model": "infernalexp:block/glowdust_sand", - "y": 90, - "x": 180 - }, - { - "model": "infernalexp:block/glowdust_sand", - "y": 90, - "x": 270 - }, - { - "model": "infernalexp:block/glowdust_sand", - "y": 180 - }, - { - "model": "infernalexp:block/glowdust_sand", - "y": 180, - "x": 90 - }, - { - "model": "infernalexp:block/glowdust_sand", - "y": 180, - "x": 180 - }, - { - "model": "infernalexp:block/glowdust_sand", - "y": 180, - "x": 270 - }, - { - "model": "infernalexp:block/glowdust_sand", - "y": 270 - }, - { - "model": "infernalexp:block/glowdust_sand", - "y": 270, - "x": 90 - }, - { - "model": "infernalexp:block/glowdust_sand", - "y": 270, - "x": 180 - }, - { - "model": "infernalexp:block/glowdust_sand", - "y": 270, - "x": 270 - } - ] - } -} diff --git a/src/main/resources/assets/infernalexp/blockstates/glowdust_stone.json b/src/main/resources/assets/infernalexp/blockstates/glowdust_stone.json deleted file mode 100644 index ab409a3dc..000000000 --- a/src/main/resources/assets/infernalexp/blockstates/glowdust_stone.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "infernalexp:block/glowdust_stone" - } - } -} diff --git a/src/main/resources/assets/infernalexp/blockstates/glowdust_stone_brick_slab.json b/src/main/resources/assets/infernalexp/blockstates/glowdust_stone_brick_slab.json deleted file mode 100644 index 39b6aa488..000000000 --- a/src/main/resources/assets/infernalexp/blockstates/glowdust_stone_brick_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "infernalexp:block/glowdust_stone_brick_slab" - }, - "type=double": { - "model": "infernalexp:block/glowdust_stone_bricks" - }, - "type=top": { - "model": "infernalexp:block/glowdust_stone_brick_slab_top" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/blockstates/glowdust_stone_brick_vertical_slab.json b/src/main/resources/assets/infernalexp/blockstates/glowdust_stone_brick_vertical_slab.json deleted file mode 100644 index a7a6a88fa..000000000 --- a/src/main/resources/assets/infernalexp/blockstates/glowdust_stone_brick_vertical_slab.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "variants": { - "type=north": { - "model": "infernalexp:block/glowdust_stone_brick_vertical_slab", - "y": 0, - "uvlock": true - }, - "type=south": { - "model": "infernalexp:block/glowdust_stone_brick_vertical_slab", - "y": 180, - "uvlock": true - }, - "type=east": { - "model": "infernalexp:block/glowdust_stone_brick_vertical_slab", - "y": 90, - "uvlock": true - }, - "type=west": { - "model": "infernalexp:block/glowdust_stone_brick_vertical_slab", - "y": 270, - "uvlock": true - }, - "type=double": { - "model": "infernalexp:block/glowdust_stone_bricks" - } - } -} diff --git a/src/main/resources/assets/infernalexp/blockstates/glowdust_stone_bricks.json b/src/main/resources/assets/infernalexp/blockstates/glowdust_stone_bricks.json deleted file mode 100644 index 9100a2344..000000000 --- a/src/main/resources/assets/infernalexp/blockstates/glowdust_stone_bricks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "infernalexp:block/glowdust_stone_bricks" - } - } -} diff --git a/src/main/resources/assets/infernalexp/blockstates/glowdust_stone_slab.json b/src/main/resources/assets/infernalexp/blockstates/glowdust_stone_slab.json deleted file mode 100644 index 6f3178f9f..000000000 --- a/src/main/resources/assets/infernalexp/blockstates/glowdust_stone_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "infernalexp:block/glowdust_stone_slab" - }, - "type=double": { - "model": "infernalexp:block/glowdust_stone" - }, - "type=top": { - "model": "infernalexp:block/glowdust_stone_slab_top" - } - } -} diff --git a/src/main/resources/assets/infernalexp/blockstates/glowdust_stone_vertical_slab.json b/src/main/resources/assets/infernalexp/blockstates/glowdust_stone_vertical_slab.json deleted file mode 100644 index 51b26ab21..000000000 --- a/src/main/resources/assets/infernalexp/blockstates/glowdust_stone_vertical_slab.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "variants": { - "type=north": { - "model": "infernalexp:block/glowdust_stone_vertical_slab", - "y": 0, - "uvlock": true - }, - "type=south": { - "model": "infernalexp:block/glowdust_stone_vertical_slab", - "y": 180, - "uvlock": true - }, - "type=east": { - "model": "infernalexp:block/glowdust_stone_vertical_slab", - "y": 90, - "uvlock": true - }, - "type=west": { - "model": "infernalexp:block/glowdust_stone_vertical_slab", - "y": 270, - "uvlock": true - }, - "type=double": { - "model": "infernalexp:block/glowdust_stone" - } - } -} diff --git a/src/main/resources/assets/infernalexp/blockstates/soul_slate.json b/src/main/resources/assets/infernalexp/blockstates/polished_soul_stone.json similarity index 100% rename from src/main/resources/assets/infernalexp/blockstates/soul_slate.json rename to src/main/resources/assets/infernalexp/blockstates/polished_soul_stone.json diff --git a/src/main/resources/assets/infernalexp/blockstates/soul_slate_brick_slab.json b/src/main/resources/assets/infernalexp/blockstates/polished_soul_stone_brick_slab.json similarity index 100% rename from src/main/resources/assets/infernalexp/blockstates/soul_slate_brick_slab.json rename to src/main/resources/assets/infernalexp/blockstates/polished_soul_stone_brick_slab.json diff --git a/src/main/resources/assets/infernalexp/blockstates/soul_slate_brick_stairs.json b/src/main/resources/assets/infernalexp/blockstates/polished_soul_stone_brick_stairs.json similarity index 100% rename from src/main/resources/assets/infernalexp/blockstates/soul_slate_brick_stairs.json rename to src/main/resources/assets/infernalexp/blockstates/polished_soul_stone_brick_stairs.json diff --git a/src/main/resources/assets/infernalexp/blockstates/soul_slate_brick_vertical_slab.json b/src/main/resources/assets/infernalexp/blockstates/polished_soul_stone_brick_vertical_slab.json similarity index 100% rename from src/main/resources/assets/infernalexp/blockstates/soul_slate_brick_vertical_slab.json rename to src/main/resources/assets/infernalexp/blockstates/polished_soul_stone_brick_vertical_slab.json diff --git a/src/main/resources/assets/infernalexp/blockstates/soul_slate_brick_wall.json b/src/main/resources/assets/infernalexp/blockstates/polished_soul_stone_brick_wall.json similarity index 100% rename from src/main/resources/assets/infernalexp/blockstates/soul_slate_brick_wall.json rename to src/main/resources/assets/infernalexp/blockstates/polished_soul_stone_brick_wall.json diff --git a/src/main/resources/assets/infernalexp/blockstates/soul_slate_bricks.json b/src/main/resources/assets/infernalexp/blockstates/polished_soul_stone_bricks.json similarity index 100% rename from src/main/resources/assets/infernalexp/blockstates/soul_slate_bricks.json rename to src/main/resources/assets/infernalexp/blockstates/polished_soul_stone_bricks.json diff --git a/src/main/resources/assets/infernalexp/blockstates/soul_slate_button.json b/src/main/resources/assets/infernalexp/blockstates/polished_soul_stone_button.json similarity index 100% rename from src/main/resources/assets/infernalexp/blockstates/soul_slate_button.json rename to src/main/resources/assets/infernalexp/blockstates/polished_soul_stone_button.json diff --git a/src/main/resources/assets/infernalexp/blockstates/soul_slate_pressure_plate.json b/src/main/resources/assets/infernalexp/blockstates/polished_soul_stone_pressure_plate.json similarity index 100% rename from src/main/resources/assets/infernalexp/blockstates/soul_slate_pressure_plate.json rename to src/main/resources/assets/infernalexp/blockstates/polished_soul_stone_pressure_plate.json diff --git a/src/main/resources/assets/infernalexp/blockstates/soul_slate_slab.json b/src/main/resources/assets/infernalexp/blockstates/polished_soul_stone_slab.json similarity index 100% rename from src/main/resources/assets/infernalexp/blockstates/soul_slate_slab.json rename to src/main/resources/assets/infernalexp/blockstates/polished_soul_stone_slab.json diff --git a/src/main/resources/assets/infernalexp/blockstates/soul_slate_stairs.json b/src/main/resources/assets/infernalexp/blockstates/polished_soul_stone_stairs.json similarity index 100% rename from src/main/resources/assets/infernalexp/blockstates/soul_slate_stairs.json rename to src/main/resources/assets/infernalexp/blockstates/polished_soul_stone_stairs.json diff --git a/src/main/resources/assets/infernalexp/blockstates/soul_slate_vertical_slab.json b/src/main/resources/assets/infernalexp/blockstates/polished_soul_stone_vertical_slab.json similarity index 100% rename from src/main/resources/assets/infernalexp/blockstates/soul_slate_vertical_slab.json rename to src/main/resources/assets/infernalexp/blockstates/polished_soul_stone_vertical_slab.json diff --git a/src/main/resources/assets/infernalexp/blockstates/shimmer_sand.json b/src/main/resources/assets/infernalexp/blockstates/shimmer_sand.json new file mode 100644 index 000000000..f7310e95a --- /dev/null +++ b/src/main/resources/assets/infernalexp/blockstates/shimmer_sand.json @@ -0,0 +1,78 @@ +{ + "variants": { + "": [ + { + "model": "infernalexp:block/shimmer_sand" + }, + { + "model": "infernalexp:block/shimmer_sand", + "x": 90 + }, + { + "model": "infernalexp:block/shimmer_sand", + "x": 180 + }, + { + "model": "infernalexp:block/shimmer_sand", + "x": 270 + }, + { + "model": "infernalexp:block/shimmer_sand", + "y": 90 + }, + { + "model": "infernalexp:block/shimmer_sand", + "y": 90, + "x": 90 + }, + { + "model": "infernalexp:block/shimmer_sand", + "y": 90, + "x": 180 + }, + { + "model": "infernalexp:block/shimmer_sand", + "y": 90, + "x": 270 + }, + { + "model": "infernalexp:block/shimmer_sand", + "y": 180 + }, + { + "model": "infernalexp:block/shimmer_sand", + "y": 180, + "x": 90 + }, + { + "model": "infernalexp:block/shimmer_sand", + "y": 180, + "x": 180 + }, + { + "model": "infernalexp:block/shimmer_sand", + "y": 180, + "x": 270 + }, + { + "model": "infernalexp:block/shimmer_sand", + "y": 270 + }, + { + "model": "infernalexp:block/shimmer_sand", + "y": 270, + "x": 90 + }, + { + "model": "infernalexp:block/shimmer_sand", + "y": 270, + "x": 180 + }, + { + "model": "infernalexp:block/shimmer_sand", + "y": 270, + "x": 270 + } + ] + } +} diff --git a/src/main/resources/assets/infernalexp/blockstates/shimmer_sheet.json b/src/main/resources/assets/infernalexp/blockstates/shimmer_sheet.json new file mode 100644 index 000000000..4117a1ffa --- /dev/null +++ b/src/main/resources/assets/infernalexp/blockstates/shimmer_sheet.json @@ -0,0 +1,28 @@ +{ + "variants": { + "layers=1": { + "model": "infernalexp:block/shimmer_sheet_height2" + }, + "layers=2": { + "model": "infernalexp:block/shimmer_sheet_height4" + }, + "layers=3": { + "model": "infernalexp:block/shimmer_sheet_height6" + }, + "layers=4": { + "model": "infernalexp:block/shimmer_sheet_height8" + }, + "layers=5": { + "model": "infernalexp:block/shimmer_sheet_height10" + }, + "layers=6": { + "model": "infernalexp:block/shimmer_sheet_height12" + }, + "layers=7": { + "model": "infernalexp:block/shimmer_sheet_height14" + }, + "layers=8": { + "model": "infernalexp:block/shimmer_sand" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/blockstates/shimmer_stone.json b/src/main/resources/assets/infernalexp/blockstates/shimmer_stone.json new file mode 100644 index 000000000..7c2d8101f --- /dev/null +++ b/src/main/resources/assets/infernalexp/blockstates/shimmer_stone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "infernalexp:block/shimmer_stone" + } + } +} diff --git a/src/main/resources/assets/infernalexp/blockstates/shimmer_stone_brick_slab.json b/src/main/resources/assets/infernalexp/blockstates/shimmer_stone_brick_slab.json new file mode 100644 index 000000000..43a54703d --- /dev/null +++ b/src/main/resources/assets/infernalexp/blockstates/shimmer_stone_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "infernalexp:block/shimmer_stone_brick_slab" + }, + "type=double": { + "model": "infernalexp:block/shimmer_stone_bricks" + }, + "type=top": { + "model": "infernalexp:block/shimmer_stone_brick_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/blockstates/glowdust_stone_brick_stairs.json b/src/main/resources/assets/infernalexp/blockstates/shimmer_stone_brick_stairs.json similarity index 57% rename from src/main/resources/assets/infernalexp/blockstates/glowdust_stone_brick_stairs.json rename to src/main/resources/assets/infernalexp/blockstates/shimmer_stone_brick_stairs.json index 585d69753..69b8b05c4 100644 --- a/src/main/resources/assets/infernalexp/blockstates/glowdust_stone_brick_stairs.json +++ b/src/main/resources/assets/infernalexp/blockstates/shimmer_stone_brick_stairs.json @@ -1,206 +1,206 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_inner", + "model": "infernalexp:block/shimmer_stone_brick_stairs_inner", "y": 270, "uvlock": true }, "facing=east,half=bottom,shape=inner_right": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_inner" + "model": "infernalexp:block/shimmer_stone_brick_stairs_inner" }, "facing=east,half=bottom,shape=outer_left": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_outer", + "model": "infernalexp:block/shimmer_stone_brick_stairs_outer", "y": 270, "uvlock": true }, "facing=east,half=bottom,shape=outer_right": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_outer" + "model": "infernalexp:block/shimmer_stone_brick_stairs_outer" }, "facing=east,half=bottom,shape=straight": { - "model": "infernalexp:block/glowdust_stone_brick_stairs" + "model": "infernalexp:block/shimmer_stone_brick_stairs" }, "facing=east,half=top,shape=inner_left": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_inner", + "model": "infernalexp:block/shimmer_stone_brick_stairs_inner", "x": 180, "uvlock": true }, "facing=east,half=top,shape=inner_right": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_inner", + "model": "infernalexp:block/shimmer_stone_brick_stairs_inner", "x": 180, "y": 90, "uvlock": true }, "facing=east,half=top,shape=outer_left": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_outer", + "model": "infernalexp:block/shimmer_stone_brick_stairs_outer", "x": 180, "uvlock": true }, "facing=east,half=top,shape=outer_right": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_outer", + "model": "infernalexp:block/shimmer_stone_brick_stairs_outer", "x": 180, "y": 90, "uvlock": true }, "facing=east,half=top,shape=straight": { - "model": "infernalexp:block/glowdust_stone_brick_stairs", + "model": "infernalexp:block/shimmer_stone_brick_stairs", "x": 180, "uvlock": true }, "facing=north,half=bottom,shape=inner_left": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_inner", + "model": "infernalexp:block/shimmer_stone_brick_stairs_inner", "y": 180, "uvlock": true }, "facing=north,half=bottom,shape=inner_right": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_inner", + "model": "infernalexp:block/shimmer_stone_brick_stairs_inner", "y": 270, "uvlock": true }, "facing=north,half=bottom,shape=outer_left": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_outer", + "model": "infernalexp:block/shimmer_stone_brick_stairs_outer", "y": 180, "uvlock": true }, "facing=north,half=bottom,shape=outer_right": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_outer", + "model": "infernalexp:block/shimmer_stone_brick_stairs_outer", "y": 270, "uvlock": true }, "facing=north,half=bottom,shape=straight": { - "model": "infernalexp:block/glowdust_stone_brick_stairs", + "model": "infernalexp:block/shimmer_stone_brick_stairs", "y": 270, "uvlock": true }, "facing=north,half=top,shape=inner_left": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_inner", + "model": "infernalexp:block/shimmer_stone_brick_stairs_inner", "x": 180, "y": 270, "uvlock": true }, "facing=north,half=top,shape=inner_right": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_inner", + "model": "infernalexp:block/shimmer_stone_brick_stairs_inner", "x": 180, "uvlock": true }, "facing=north,half=top,shape=outer_left": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_outer", + "model": "infernalexp:block/shimmer_stone_brick_stairs_outer", "x": 180, "y": 270, "uvlock": true }, "facing=north,half=top,shape=outer_right": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_outer", + "model": "infernalexp:block/shimmer_stone_brick_stairs_outer", "x": 180, "uvlock": true }, "facing=north,half=top,shape=straight": { - "model": "infernalexp:block/glowdust_stone_brick_stairs", + "model": "infernalexp:block/shimmer_stone_brick_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=bottom,shape=inner_left": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_inner" + "model": "infernalexp:block/shimmer_stone_brick_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_inner", + "model": "infernalexp:block/shimmer_stone_brick_stairs_inner", "y": 90, "uvlock": true }, "facing=south,half=bottom,shape=outer_left": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_outer" + "model": "infernalexp:block/shimmer_stone_brick_stairs_outer" }, "facing=south,half=bottom,shape=outer_right": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_outer", + "model": "infernalexp:block/shimmer_stone_brick_stairs_outer", "y": 90, "uvlock": true }, "facing=south,half=bottom,shape=straight": { - "model": "infernalexp:block/glowdust_stone_brick_stairs", + "model": "infernalexp:block/shimmer_stone_brick_stairs", "y": 90, "uvlock": true }, "facing=south,half=top,shape=inner_left": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_inner", + "model": "infernalexp:block/shimmer_stone_brick_stairs_inner", "x": 180, "y": 90, "uvlock": true }, "facing=south,half=top,shape=inner_right": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_inner", + "model": "infernalexp:block/shimmer_stone_brick_stairs_inner", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=outer_left": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_outer", + "model": "infernalexp:block/shimmer_stone_brick_stairs_outer", "x": 180, "y": 90, "uvlock": true }, "facing=south,half=top,shape=outer_right": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_outer", + "model": "infernalexp:block/shimmer_stone_brick_stairs_outer", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { - "model": "infernalexp:block/glowdust_stone_brick_stairs", + "model": "infernalexp:block/shimmer_stone_brick_stairs", "x": 180, "y": 90, "uvlock": true }, "facing=west,half=bottom,shape=inner_left": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_inner", + "model": "infernalexp:block/shimmer_stone_brick_stairs_inner", "y": 90, "uvlock": true }, "facing=west,half=bottom,shape=inner_right": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_inner", + "model": "infernalexp:block/shimmer_stone_brick_stairs_inner", "y": 180, "uvlock": true }, "facing=west,half=bottom,shape=outer_left": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_outer", + "model": "infernalexp:block/shimmer_stone_brick_stairs_outer", "y": 90, "uvlock": true }, "facing=west,half=bottom,shape=outer_right": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_outer", + "model": "infernalexp:block/shimmer_stone_brick_stairs_outer", "y": 180, "uvlock": true }, "facing=west,half=bottom,shape=straight": { - "model": "infernalexp:block/glowdust_stone_brick_stairs", + "model": "infernalexp:block/shimmer_stone_brick_stairs", "y": 180, "uvlock": true }, "facing=west,half=top,shape=inner_left": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_inner", + "model": "infernalexp:block/shimmer_stone_brick_stairs_inner", "x": 180, "y": 180, "uvlock": true }, "facing=west,half=top,shape=inner_right": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_inner", + "model": "infernalexp:block/shimmer_stone_brick_stairs_inner", "x": 180, "y": 270, "uvlock": true }, "facing=west,half=top,shape=outer_left": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_outer", + "model": "infernalexp:block/shimmer_stone_brick_stairs_outer", "x": 180, "y": 180, "uvlock": true }, "facing=west,half=top,shape=outer_right": { - "model": "infernalexp:block/glowdust_stone_brick_stairs_outer", + "model": "infernalexp:block/shimmer_stone_brick_stairs_outer", "x": 180, "y": 270, "uvlock": true }, "facing=west,half=top,shape=straight": { - "model": "infernalexp:block/glowdust_stone_brick_stairs", + "model": "infernalexp:block/shimmer_stone_brick_stairs", "x": 180, "y": 180, "uvlock": true diff --git a/src/main/resources/assets/infernalexp/blockstates/shimmer_stone_brick_vertical_slab.json b/src/main/resources/assets/infernalexp/blockstates/shimmer_stone_brick_vertical_slab.json new file mode 100644 index 000000000..b9ed86d5d --- /dev/null +++ b/src/main/resources/assets/infernalexp/blockstates/shimmer_stone_brick_vertical_slab.json @@ -0,0 +1,27 @@ +{ + "variants": { + "type=north": { + "model": "infernalexp:block/shimmer_stone_brick_vertical_slab", + "y": 0, + "uvlock": true + }, + "type=south": { + "model": "infernalexp:block/shimmer_stone_brick_vertical_slab", + "y": 180, + "uvlock": true + }, + "type=east": { + "model": "infernalexp:block/shimmer_stone_brick_vertical_slab", + "y": 90, + "uvlock": true + }, + "type=west": { + "model": "infernalexp:block/shimmer_stone_brick_vertical_slab", + "y": 270, + "uvlock": true + }, + "type=double": { + "model": "infernalexp:block/shimmer_stone_bricks" + } + } +} diff --git a/src/main/resources/assets/infernalexp/blockstates/glowdust_stone_brick_wall.json b/src/main/resources/assets/infernalexp/blockstates/shimmer_stone_brick_wall.json similarity index 62% rename from src/main/resources/assets/infernalexp/blockstates/glowdust_stone_brick_wall.json rename to src/main/resources/assets/infernalexp/blockstates/shimmer_stone_brick_wall.json index ada7ed232..a95ffe1b3 100644 --- a/src/main/resources/assets/infernalexp/blockstates/glowdust_stone_brick_wall.json +++ b/src/main/resources/assets/infernalexp/blockstates/shimmer_stone_brick_wall.json @@ -5,7 +5,7 @@ "up": "true" }, "apply": { - "model": "infernalexp:block/glowdust_stone_brick_wall_post" + "model": "infernalexp:block/shimmer_stone_brick_wall_post" } }, { @@ -13,7 +13,7 @@ "north": "low" }, "apply": { - "model": "infernalexp:block/glowdust_stone_brick_wall_side", + "model": "infernalexp:block/shimmer_stone_brick_wall_side", "uvlock": true } }, @@ -22,7 +22,7 @@ "east": "low" }, "apply": { - "model": "infernalexp:block/glowdust_stone_brick_wall_side", + "model": "infernalexp:block/shimmer_stone_brick_wall_side", "y": 90, "uvlock": true } @@ -32,7 +32,7 @@ "south": "low" }, "apply": { - "model": "infernalexp:block/glowdust_stone_brick_wall_side", + "model": "infernalexp:block/shimmer_stone_brick_wall_side", "y": 180, "uvlock": true } @@ -42,7 +42,7 @@ "west": "low" }, "apply": { - "model": "infernalexp:block/glowdust_stone_brick_wall_side", + "model": "infernalexp:block/shimmer_stone_brick_wall_side", "y": 270, "uvlock": true } @@ -52,7 +52,7 @@ "north": "tall" }, "apply": { - "model": "infernalexp:block/glowdust_stone_brick_wall_side_tall", + "model": "infernalexp:block/shimmer_stone_brick_wall_side_tall", "uvlock": true } }, @@ -61,7 +61,7 @@ "east": "tall" }, "apply": { - "model": "infernalexp:block/glowdust_stone_brick_wall_side_tall", + "model": "infernalexp:block/shimmer_stone_brick_wall_side_tall", "y": 90, "uvlock": true } @@ -71,7 +71,7 @@ "south": "tall" }, "apply": { - "model": "infernalexp:block/glowdust_stone_brick_wall_side_tall", + "model": "infernalexp:block/shimmer_stone_brick_wall_side_tall", "y": 180, "uvlock": true } @@ -81,7 +81,7 @@ "west": "tall" }, "apply": { - "model": "infernalexp:block/glowdust_stone_brick_wall_side_tall", + "model": "infernalexp:block/shimmer_stone_brick_wall_side_tall", "y": 270, "uvlock": true } diff --git a/src/main/resources/assets/infernalexp/blockstates/shimmer_stone_bricks.json b/src/main/resources/assets/infernalexp/blockstates/shimmer_stone_bricks.json new file mode 100644 index 000000000..4be27662b --- /dev/null +++ b/src/main/resources/assets/infernalexp/blockstates/shimmer_stone_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "infernalexp:block/shimmer_stone_bricks" + } + } +} diff --git a/src/main/resources/assets/infernalexp/blockstates/shimmer_stone_slab.json b/src/main/resources/assets/infernalexp/blockstates/shimmer_stone_slab.json new file mode 100644 index 000000000..7782f73d3 --- /dev/null +++ b/src/main/resources/assets/infernalexp/blockstates/shimmer_stone_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "infernalexp:block/shimmer_stone_slab" + }, + "type=double": { + "model": "infernalexp:block/shimmer_stone" + }, + "type=top": { + "model": "infernalexp:block/shimmer_stone_slab_top" + } + } +} diff --git a/src/main/resources/assets/infernalexp/blockstates/glowdust_stone_stairs.json b/src/main/resources/assets/infernalexp/blockstates/shimmer_stone_stairs.json similarity index 60% rename from src/main/resources/assets/infernalexp/blockstates/glowdust_stone_stairs.json rename to src/main/resources/assets/infernalexp/blockstates/shimmer_stone_stairs.json index 15dfbfcdc..90ef66513 100644 --- a/src/main/resources/assets/infernalexp/blockstates/glowdust_stone_stairs.json +++ b/src/main/resources/assets/infernalexp/blockstates/shimmer_stone_stairs.json @@ -1,206 +1,206 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "infernalexp:block/glowdust_stone_stairs_inner", + "model": "infernalexp:block/shimmer_stone_stairs_inner", "y": 270, "uvlock": true }, "facing=east,half=bottom,shape=inner_right": { - "model": "infernalexp:block/glowdust_stone_stairs_inner" + "model": "infernalexp:block/shimmer_stone_stairs_inner" }, "facing=east,half=bottom,shape=outer_left": { - "model": "infernalexp:block/glowdust_stone_stairs_outer", + "model": "infernalexp:block/shimmer_stone_stairs_outer", "y": 270, "uvlock": true }, "facing=east,half=bottom,shape=outer_right": { - "model": "infernalexp:block/glowdust_stone_stairs_outer" + "model": "infernalexp:block/shimmer_stone_stairs_outer" }, "facing=east,half=bottom,shape=straight": { - "model": "infernalexp:block/glowdust_stone_stairs" + "model": "infernalexp:block/shimmer_stone_stairs" }, "facing=east,half=top,shape=inner_left": { - "model": "infernalexp:block/glowdust_stone_stairs_inner", + "model": "infernalexp:block/shimmer_stone_stairs_inner", "x": 180, "uvlock": true }, "facing=east,half=top,shape=inner_right": { - "model": "infernalexp:block/glowdust_stone_stairs_inner", + "model": "infernalexp:block/shimmer_stone_stairs_inner", "x": 180, "y": 90, "uvlock": true }, "facing=east,half=top,shape=outer_left": { - "model": "infernalexp:block/glowdust_stone_stairs_outer", + "model": "infernalexp:block/shimmer_stone_stairs_outer", "x": 180, "uvlock": true }, "facing=east,half=top,shape=outer_right": { - "model": "infernalexp:block/glowdust_stone_stairs_outer", + "model": "infernalexp:block/shimmer_stone_stairs_outer", "x": 180, "y": 90, "uvlock": true }, "facing=east,half=top,shape=straight": { - "model": "infernalexp:block/glowdust_stone_stairs", + "model": "infernalexp:block/shimmer_stone_stairs", "x": 180, "uvlock": true }, "facing=north,half=bottom,shape=inner_left": { - "model": "infernalexp:block/glowdust_stone_stairs_inner", + "model": "infernalexp:block/shimmer_stone_stairs_inner", "y": 180, "uvlock": true }, "facing=north,half=bottom,shape=inner_right": { - "model": "infernalexp:block/glowdust_stone_stairs_inner", + "model": "infernalexp:block/shimmer_stone_stairs_inner", "y": 270, "uvlock": true }, "facing=north,half=bottom,shape=outer_left": { - "model": "infernalexp:block/glowdust_stone_stairs_outer", + "model": "infernalexp:block/shimmer_stone_stairs_outer", "y": 180, "uvlock": true }, "facing=north,half=bottom,shape=outer_right": { - "model": "infernalexp:block/glowdust_stone_stairs_outer", + "model": "infernalexp:block/shimmer_stone_stairs_outer", "y": 270, "uvlock": true }, "facing=north,half=bottom,shape=straight": { - "model": "infernalexp:block/glowdust_stone_stairs", + "model": "infernalexp:block/shimmer_stone_stairs", "y": 270, "uvlock": true }, "facing=north,half=top,shape=inner_left": { - "model": "infernalexp:block/glowdust_stone_stairs_inner", + "model": "infernalexp:block/shimmer_stone_stairs_inner", "x": 180, "y": 270, "uvlock": true }, "facing=north,half=top,shape=inner_right": { - "model": "infernalexp:block/glowdust_stone_stairs_inner", + "model": "infernalexp:block/shimmer_stone_stairs_inner", "x": 180, "uvlock": true }, "facing=north,half=top,shape=outer_left": { - "model": "infernalexp:block/glowdust_stone_stairs_outer", + "model": "infernalexp:block/shimmer_stone_stairs_outer", "x": 180, "y": 270, "uvlock": true }, "facing=north,half=top,shape=outer_right": { - "model": "infernalexp:block/glowdust_stone_stairs_outer", + "model": "infernalexp:block/shimmer_stone_stairs_outer", "x": 180, "uvlock": true }, "facing=north,half=top,shape=straight": { - "model": "infernalexp:block/glowdust_stone_stairs", + "model": "infernalexp:block/shimmer_stone_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=bottom,shape=inner_left": { - "model": "infernalexp:block/glowdust_stone_stairs_inner" + "model": "infernalexp:block/shimmer_stone_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { - "model": "infernalexp:block/glowdust_stone_stairs_inner", + "model": "infernalexp:block/shimmer_stone_stairs_inner", "y": 90, "uvlock": true }, "facing=south,half=bottom,shape=outer_left": { - "model": "infernalexp:block/glowdust_stone_stairs_outer" + "model": "infernalexp:block/shimmer_stone_stairs_outer" }, "facing=south,half=bottom,shape=outer_right": { - "model": "infernalexp:block/glowdust_stone_stairs_outer", + "model": "infernalexp:block/shimmer_stone_stairs_outer", "y": 90, "uvlock": true }, "facing=south,half=bottom,shape=straight": { - "model": "infernalexp:block/glowdust_stone_stairs", + "model": "infernalexp:block/shimmer_stone_stairs", "y": 90, "uvlock": true }, "facing=south,half=top,shape=inner_left": { - "model": "infernalexp:block/glowdust_stone_stairs_inner", + "model": "infernalexp:block/shimmer_stone_stairs_inner", "x": 180, "y": 90, "uvlock": true }, "facing=south,half=top,shape=inner_right": { - "model": "infernalexp:block/glowdust_stone_stairs_inner", + "model": "infernalexp:block/shimmer_stone_stairs_inner", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=outer_left": { - "model": "infernalexp:block/glowdust_stone_stairs_outer", + "model": "infernalexp:block/shimmer_stone_stairs_outer", "x": 180, "y": 90, "uvlock": true }, "facing=south,half=top,shape=outer_right": { - "model": "infernalexp:block/glowdust_stone_stairs_outer", + "model": "infernalexp:block/shimmer_stone_stairs_outer", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { - "model": "infernalexp:block/glowdust_stone_stairs", + "model": "infernalexp:block/shimmer_stone_stairs", "x": 180, "y": 90, "uvlock": true }, "facing=west,half=bottom,shape=inner_left": { - "model": "infernalexp:block/glowdust_stone_stairs_inner", + "model": "infernalexp:block/shimmer_stone_stairs_inner", "y": 90, "uvlock": true }, "facing=west,half=bottom,shape=inner_right": { - "model": "infernalexp:block/glowdust_stone_stairs_inner", + "model": "infernalexp:block/shimmer_stone_stairs_inner", "y": 180, "uvlock": true }, "facing=west,half=bottom,shape=outer_left": { - "model": "infernalexp:block/glowdust_stone_stairs_outer", + "model": "infernalexp:block/shimmer_stone_stairs_outer", "y": 90, "uvlock": true }, "facing=west,half=bottom,shape=outer_right": { - "model": "infernalexp:block/glowdust_stone_stairs_outer", + "model": "infernalexp:block/shimmer_stone_stairs_outer", "y": 180, "uvlock": true }, "facing=west,half=bottom,shape=straight": { - "model": "infernalexp:block/glowdust_stone_stairs", + "model": "infernalexp:block/shimmer_stone_stairs", "y": 180, "uvlock": true }, "facing=west,half=top,shape=inner_left": { - "model": "infernalexp:block/glowdust_stone_stairs_inner", + "model": "infernalexp:block/shimmer_stone_stairs_inner", "x": 180, "y": 180, "uvlock": true }, "facing=west,half=top,shape=inner_right": { - "model": "infernalexp:block/glowdust_stone_stairs_inner", + "model": "infernalexp:block/shimmer_stone_stairs_inner", "x": 180, "y": 270, "uvlock": true }, "facing=west,half=top,shape=outer_left": { - "model": "infernalexp:block/glowdust_stone_stairs_outer", + "model": "infernalexp:block/shimmer_stone_stairs_outer", "x": 180, "y": 180, "uvlock": true }, "facing=west,half=top,shape=outer_right": { - "model": "infernalexp:block/glowdust_stone_stairs_outer", + "model": "infernalexp:block/shimmer_stone_stairs_outer", "x": 180, "y": 270, "uvlock": true }, "facing=west,half=top,shape=straight": { - "model": "infernalexp:block/glowdust_stone_stairs", + "model": "infernalexp:block/shimmer_stone_stairs", "x": 180, "y": 180, "uvlock": true diff --git a/src/main/resources/assets/infernalexp/blockstates/shimmer_stone_vertical_slab.json b/src/main/resources/assets/infernalexp/blockstates/shimmer_stone_vertical_slab.json new file mode 100644 index 000000000..668fdec35 --- /dev/null +++ b/src/main/resources/assets/infernalexp/blockstates/shimmer_stone_vertical_slab.json @@ -0,0 +1,27 @@ +{ + "variants": { + "type=north": { + "model": "infernalexp:block/shimmer_stone_vertical_slab", + "y": 0, + "uvlock": true + }, + "type=south": { + "model": "infernalexp:block/shimmer_stone_vertical_slab", + "y": 180, + "uvlock": true + }, + "type=east": { + "model": "infernalexp:block/shimmer_stone_vertical_slab", + "y": 90, + "uvlock": true + }, + "type=west": { + "model": "infernalexp:block/shimmer_stone_vertical_slab", + "y": 270, + "uvlock": true + }, + "type=double": { + "model": "infernalexp:block/shimmer_stone" + } + } +} diff --git a/src/main/resources/assets/infernalexp/blockstates/glowdust_stone_wall.json b/src/main/resources/assets/infernalexp/blockstates/shimmer_stone_wall.json similarity index 64% rename from src/main/resources/assets/infernalexp/blockstates/glowdust_stone_wall.json rename to src/main/resources/assets/infernalexp/blockstates/shimmer_stone_wall.json index 82bf7cc65..29f2c93c4 100644 --- a/src/main/resources/assets/infernalexp/blockstates/glowdust_stone_wall.json +++ b/src/main/resources/assets/infernalexp/blockstates/shimmer_stone_wall.json @@ -5,7 +5,7 @@ "up": "true" }, "apply": { - "model": "infernalexp:block/glowdust_stone_wall_post" + "model": "infernalexp:block/shimmer_stone_wall_post" } }, { @@ -13,7 +13,7 @@ "north": "low" }, "apply": { - "model": "infernalexp:block/glowdust_stone_wall_side", + "model": "infernalexp:block/shimmer_stone_wall_side", "uvlock": true } }, @@ -22,7 +22,7 @@ "east": "low" }, "apply": { - "model": "infernalexp:block/glowdust_stone_wall_side", + "model": "infernalexp:block/shimmer_stone_wall_side", "y": 90, "uvlock": true } @@ -32,7 +32,7 @@ "south": "low" }, "apply": { - "model": "infernalexp:block/glowdust_stone_wall_side", + "model": "infernalexp:block/shimmer_stone_wall_side", "y": 180, "uvlock": true } @@ -42,7 +42,7 @@ "west": "low" }, "apply": { - "model": "infernalexp:block/glowdust_stone_wall_side", + "model": "infernalexp:block/shimmer_stone_wall_side", "y": 270, "uvlock": true } @@ -52,7 +52,7 @@ "north": "tall" }, "apply": { - "model": "infernalexp:block/glowdust_stone_wall_side_tall", + "model": "infernalexp:block/shimmer_stone_wall_side_tall", "uvlock": true } }, @@ -61,7 +61,7 @@ "east": "tall" }, "apply": { - "model": "infernalexp:block/glowdust_stone_wall_side_tall", + "model": "infernalexp:block/shimmer_stone_wall_side_tall", "y": 90, "uvlock": true } @@ -71,7 +71,7 @@ "south": "tall" }, "apply": { - "model": "infernalexp:block/glowdust_stone_wall_side_tall", + "model": "infernalexp:block/shimmer_stone_wall_side_tall", "y": 180, "uvlock": true } @@ -81,7 +81,7 @@ "west": "tall" }, "apply": { - "model": "infernalexp:block/glowdust_stone_wall_side_tall", + "model": "infernalexp:block/shimmer_stone_wall_side_tall", "y": 270, "uvlock": true } diff --git a/src/main/resources/assets/infernalexp/blockstates/trapped_glowdust_sand.json b/src/main/resources/assets/infernalexp/blockstates/trapped_glowdust_sand.json deleted file mode 100644 index f53db93ad..000000000 --- a/src/main/resources/assets/infernalexp/blockstates/trapped_glowdust_sand.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "infernalexp:block/trapped_glowdust_sand" - }, - { - "model": "infernalexp:block/trapped_glowdust_sand", - "x": 90 - }, - { - "model": "infernalexp:block/trapped_glowdust_sand", - "x": 180 - }, - { - "model": "infernalexp:block/trapped_glowdust_sand", - "x": 270 - }, - { - "model": "infernalexp:block/trapped_glowdust_sand", - "y": 90 - }, - { - "model": "infernalexp:block/trapped_glowdust_sand", - "y": 90, - "x": 90 - }, - { - "model": "infernalexp:block/trapped_glowdust_sand", - "y": 90, - "x": 180 - }, - { - "model": "infernalexp:block/trapped_glowdust_sand", - "y": 90, - "x": 270 - }, - { - "model": "infernalexp:block/trapped_glowdust_sand", - "y": 180 - }, - { - "model": "infernalexp:block/trapped_glowdust_sand", - "y": 180, - "x": 90 - }, - { - "model": "infernalexp:block/trapped_glowdust_sand", - "y": 180, - "x": 180 - }, - { - "model": "infernalexp:block/trapped_glowdust_sand", - "y": 180, - "x": 270 - }, - { - "model": "infernalexp:block/trapped_glowdust_sand", - "y": 270 - }, - { - "model": "infernalexp:block/trapped_glowdust_sand", - "y": 270, - "x": 90 - }, - { - "model": "infernalexp:block/trapped_glowdust_sand", - "y": 270, - "x": 180 - }, - { - "model": "infernalexp:block/trapped_glowdust_sand", - "y": 270, - "x": 270 - } - ] - } -} diff --git a/src/main/resources/assets/infernalexp/blockstates/trapped_shimmer_sand.json b/src/main/resources/assets/infernalexp/blockstates/trapped_shimmer_sand.json new file mode 100644 index 000000000..5bc55d394 --- /dev/null +++ b/src/main/resources/assets/infernalexp/blockstates/trapped_shimmer_sand.json @@ -0,0 +1,78 @@ +{ + "variants": { + "": [ + { + "model": "infernalexp:block/trapped_shimmer_sand" + }, + { + "model": "infernalexp:block/trapped_shimmer_sand", + "x": 90 + }, + { + "model": "infernalexp:block/trapped_shimmer_sand", + "x": 180 + }, + { + "model": "infernalexp:block/trapped_shimmer_sand", + "x": 270 + }, + { + "model": "infernalexp:block/trapped_shimmer_sand", + "y": 90 + }, + { + "model": "infernalexp:block/trapped_shimmer_sand", + "y": 90, + "x": 90 + }, + { + "model": "infernalexp:block/trapped_shimmer_sand", + "y": 90, + "x": 180 + }, + { + "model": "infernalexp:block/trapped_shimmer_sand", + "y": 90, + "x": 270 + }, + { + "model": "infernalexp:block/trapped_shimmer_sand", + "y": 180 + }, + { + "model": "infernalexp:block/trapped_shimmer_sand", + "y": 180, + "x": 90 + }, + { + "model": "infernalexp:block/trapped_shimmer_sand", + "y": 180, + "x": 180 + }, + { + "model": "infernalexp:block/trapped_shimmer_sand", + "y": 180, + "x": 270 + }, + { + "model": "infernalexp:block/trapped_shimmer_sand", + "y": 270 + }, + { + "model": "infernalexp:block/trapped_shimmer_sand", + "y": 270, + "x": 90 + }, + { + "model": "infernalexp:block/trapped_shimmer_sand", + "y": 270, + "x": 180 + }, + { + "model": "infernalexp:block/trapped_shimmer_sand", + "y": 270, + "x": 270 + } + ] + } +} diff --git a/src/main/resources/assets/infernalexp/lang/de_de.json b/src/main/resources/assets/infernalexp/lang/de_de.json index 9dbf36b23..7cd163466 100644 --- a/src/main/resources/assets/infernalexp/lang/de_de.json +++ b/src/main/resources/assets/infernalexp/lang/de_de.json @@ -41,22 +41,22 @@ "block.infernalexp.dullstone_brick_stairs": "Mattsteinziegeltreppe", "block.infernalexp.dullstone_brick_wall": "Mattsteinziegelwand", "block.infernalexp.luminous_wart_block": "Luminöswarzenblock", - "block.infernalexp.glowdust": "Schimmerstaub", - "block.infernalexp.glowdust_sand": "Schimmersand", - "block.infernalexp.glowdust_stone": "Schimmerstein", - "block.infernalexp.glowdust_stone_slab": "Schimmersteinstufe", - "block.infernalexp.glowdust_stone_vertical_slab": "Schimmersteinvertikalstufe", - "block.infernalexp.glowdust_stone_stairs": "Schimmersteintreppe", - "block.infernalexp.glowdust_stone_wall": "Schimmersteinmauer", - "block.infernalexp.trapped_glowdust_sand": "Instabiler Schimmersand", + "block.infernalexp.shimmer_sheet": "Schimmerstaub", + "block.infernalexp.shimmer_sand": "Schimmersand", + "block.infernalexp.shimmer_stone": "Schimmerstein", + "block.infernalexp.shimmer_stone_slab": "Schimmersteinstufe", + "block.infernalexp.shimmer_stone_vertical_slab": "Schimmersteinvertikalstufe", + "block.infernalexp.shimmer_stone_stairs": "Schimmersteintreppe", + "block.infernalexp.shimmer_stone_wall": "Schimmersteinmauer", + "block.infernalexp.trapped_shimmer_sand": "Instabiler Schimmersand", "block.infernalexp.glow_fire": "Glow Fire", - "block.infernalexp.glowdust_stone_bricks": "Schimmersteinziegel", - "block.infernalexp.glowdust_stone_brick_slab": "Schimmersteinziegelstufe", - "block.infernalexp.glowdust_stone_brick_vertical_slab": "Schimmersteinziegelvertikalstufe", - "block.infernalexp.glowdust_stone_brick_stairs": "Schimmersteinziegeltreppe", - "block.infernalexp.glowdust_stone_brick_wall": "Schimmersteinziegelmauer", - "block.infernalexp.cracked_glowdust_stone_bricks": "Rissige Schimmersteinziegel", - "block.infernalexp.chiseled_glowdust_stone_bricks": "Gemeißelte Schimmersteinziegel", + "block.infernalexp.shimmer_stone_bricks": "Schimmersteinziegel", + "block.infernalexp.shimmer_stone_brick_slab": "Schimmersteinziegelstufe", + "block.infernalexp.shimmer_stone_brick_vertical_slab": "Schimmersteinziegelvertikalstufe", + "block.infernalexp.shimmer_stone_brick_stairs": "Schimmersteinziegeltreppe", + "block.infernalexp.shimmer_stone_brick_wall": "Schimmersteinziegelmauer", + "block.infernalexp.cracked_shimmer_stone_bricks": "Rissige Schimmersteinziegel", + "block.infernalexp.chiseled_shimmer_stone_bricks": "Gemeißelte Schimmersteinziegel", "block.infernalexp.crumbling_blackstone": "Bröckelnder Schwarzstein", "block.infernalexp.silt": "Basaltschlick", "block.infernalexp.rubble": "Schwarzsteinschutt", diff --git a/src/main/resources/assets/infernalexp/lang/en_us.json b/src/main/resources/assets/infernalexp/lang/en_us.json index ef657b185..d17ca86b9 100644 --- a/src/main/resources/assets/infernalexp/lang/en_us.json +++ b/src/main/resources/assets/infernalexp/lang/en_us.json @@ -45,22 +45,22 @@ "block.infernalexp.stripped_luminous_stem": "Stripped Luminous Stem", "block.infernalexp.luminous_hyphae": "Luminous Hyphae", "block.infernalexp.stripped_luminous_hyphae": "Stripped Luminous Hyphae", - "block.infernalexp.glowdust": "Shimmer Sheet", - "block.infernalexp.glowdust_sand": "Shimmer Sand", - "block.infernalexp.glowdust_stone": "Shimmer Stone", - "block.infernalexp.glowdust_stone_slab": "Shimmer Stone Slab", - "block.infernalexp.glowdust_stone_vertical_slab": "Shimmer Stone Vertical Slab", - "block.infernalexp.glowdust_stone_stairs": "Shimmer Stone Stairs", - "block.infernalexp.glowdust_stone_wall": "Shimmer Stone Wall", - "block.infernalexp.trapped_glowdust_sand": "Glimmer Gravel", + "block.infernalexp.shimmer_sheet": "Shimmer Sheet", + "block.infernalexp.shimmer_sand": "Shimmer Sand", + "block.infernalexp.shimmer_stone": "Shimmer Stone", + "block.infernalexp.shimmer_stone_slab": "Shimmer Stone Slab", + "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", + "block.infernalexp.shimmer_stone_stairs": "Shimmer Stone Stairs", + "block.infernalexp.shimmer_stone_wall": "Shimmer Stone Wall", + "block.infernalexp.trapped_shimmer_sand": "Glimmer Gravel", "block.infernalexp.glow_fire": "Glow Fire", - "block.infernalexp.glowdust_stone_bricks": "Shimmer Stone Bricks", - "block.infernalexp.glowdust_stone_brick_slab": "Shimmer Stone Brick Slab", - "block.infernalexp.glowdust_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", - "block.infernalexp.glowdust_stone_brick_stairs": "Shimmer Stone Brick Stairs", - "block.infernalexp.glowdust_stone_brick_wall": "Shimmer Stone Brick Wall", - "block.infernalexp.cracked_glowdust_stone_bricks": "Cracked Shimmer Stone Bricks", - "block.infernalexp.chiseled_glowdust_stone_bricks": "Chiseled Shimmer Stone Brick", + "block.infernalexp.shimmer_stone_bricks": "Shimmer Stone Bricks", + "block.infernalexp.shimmer_stone_brick_slab": "Shimmer Stone Brick Slab", + "block.infernalexp.shimmer_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", + "block.infernalexp.shimmer_stone_brick_stairs": "Shimmer Stone Brick Stairs", + "block.infernalexp.shimmer_stone_brick_wall": "Shimmer Stone Brick Wall", + "block.infernalexp.cracked_shimmer_stone_bricks": "Cracked Shimmer Stone Bricks", + "block.infernalexp.chiseled_shimmer_stone_bricks": "Chiseled Shimmer Stone Brick", "block.infernalexp.crumbling_blackstone": "Crumbling Blackstone", "block.infernalexp.silt": "Basalt Silt", "block.infernalexp.rubble": "Blackstone Rubble", diff --git a/src/main/resources/assets/infernalexp/lang/es_ar.json b/src/main/resources/assets/infernalexp/lang/es_ar.json index 78aae50b1..6fb39cb80 100644 --- a/src/main/resources/assets/infernalexp/lang/es_ar.json +++ b/src/main/resources/assets/infernalexp/lang/es_ar.json @@ -41,22 +41,22 @@ "block.infernalexp.dullstone_brick_stairs": "Escaleras de ladrillos de piedra apagada", "block.infernalexp.dullstone_brick_wall": "Pared de ladrillos de piedra apagada", "block.infernalexp.luminous_wart_block": "Bloque de verrugas luminosas", - "block.infernalexp.glowdust": "Polvo luminoso", - "block.infernalexp.glowdust_sand": "Arena de polvo luminoso", - "block.infernalexp.glowdust_stone": "Piedra de polvo luminoso", - "block.infernalexp.glowdust_stone_slab": "Baldosa de piedra de polvo luminoso", - "block.infernalexp.glowdust_stone_vertical_slab": "Shimmer Stone Vertical Slab", - "block.infernalexp.glowdust_stone_stairs": "Escaleras de piedra de polvo luminoso", - "block.infernalexp.glowdust_stone_wall": "Pared de piedra de polvo luminoso", - "block.infernalexp.trapped_glowdust_sand": "Polvo luminoso inestable", + "block.infernalexp.shimmer_sheet": "Polvo luminoso", + "block.infernalexp.shimmer_sand": "Arena de polvo luminoso", + "block.infernalexp.shimmer_stone": "Piedra de polvo luminoso", + "block.infernalexp.shimmer_stone_slab": "Baldosa de piedra de polvo luminoso", + "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", + "block.infernalexp.shimmer_stone_stairs": "Escaleras de piedra de polvo luminoso", + "block.infernalexp.shimmer_stone_wall": "Pared de piedra de polvo luminoso", + "block.infernalexp.trapped_shimmer_sand": "Polvo luminoso inestable", "block.infernalexp.glow_fire": "Glow Fire", - "block.infernalexp.glowdust_stone_bricks": "Ladrillos de piedra de polvo luminoso", - "block.infernalexp.glowdust_stone_brick_slab": "Baldosa de ladrillos de piedra de polvo luminoso", - "block.infernalexp.glowdust_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", - "block.infernalexp.glowdust_stone_brick_stairs": "Escalera de ladrillos de piedra de polvo luminoso", - "block.infernalexp.glowdust_stone_brick_wall": "Pared de ladrillos de piedra de polvo luminoso", - "block.infernalexp.cracked_glowdust_stone_bricks": "Ladrillos de piedra de polvo luminoso agrietados", - "block.infernalexp.chiseled_glowdust_stone_bricks": "Ladrillos de piedra de polvo luminoso cincelados", + "block.infernalexp.shimmer_stone_bricks": "Ladrillos de piedra de polvo luminoso", + "block.infernalexp.shimmer_stone_brick_slab": "Baldosa de ladrillos de piedra de polvo luminoso", + "block.infernalexp.shimmer_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", + "block.infernalexp.shimmer_stone_brick_stairs": "Escalera de ladrillos de piedra de polvo luminoso", + "block.infernalexp.shimmer_stone_brick_wall": "Pared de ladrillos de piedra de polvo luminoso", + "block.infernalexp.cracked_shimmer_stone_bricks": "Ladrillos de piedra de polvo luminoso agrietados", + "block.infernalexp.chiseled_shimmer_stone_bricks": "Ladrillos de piedra de polvo luminoso cincelados", "block.infernalexp.crumbling_blackstone": "Piedra negra desmoronada", "block.infernalexp.silt": "Cieno de basalto", "block.infernalexp.rubble": "Escombros de piedra negra", diff --git a/src/main/resources/assets/infernalexp/lang/es_es.json b/src/main/resources/assets/infernalexp/lang/es_es.json index 09890d903..86664b720 100644 --- a/src/main/resources/assets/infernalexp/lang/es_es.json +++ b/src/main/resources/assets/infernalexp/lang/es_es.json @@ -41,22 +41,22 @@ "block.infernalexp.dullstone_brick_stairs": "Escaleras de ladrillos de piedra sombría", "block.infernalexp.dullstone_brick_wall": "Muro de ladrillos de piedra sombría", "block.infernalexp.luminous_wart_block": "Bloque de verrugas luminosas", - "block.infernalexp.glowdust": "Polvo luminoso", - "block.infernalexp.glowdust_sand": "Arena de polvo luminoso", - "block.infernalexp.glowdust_stone": "Piedra de polvo luminoso", - "block.infernalexp.glowdust_stone_slab": "Losa de piedra de polvo luminoso", - "block.infernalexp.glowdust_stone_vertical_slab": "Losa vertical de piedra de polvo luminoso", - "block.infernalexp.glowdust_stone_stairs": "Escaleras de piedra de polvo luminoso", - "block.infernalexp.glowdust_stone_wall": "Muro de piedra de polvo luminoso", - "block.infernalexp.trapped_glowdust_sand": "Arena de polvo luminoso inestable", + "block.infernalexp.shimmer_sheet": "Polvo luminoso", + "block.infernalexp.shimmer_sand": "Arena de polvo luminoso", + "block.infernalexp.shimmer_stone": "Piedra de polvo luminoso", + "block.infernalexp.shimmer_stone_slab": "Losa de piedra de polvo luminoso", + "block.infernalexp.shimmer_stone_vertical_slab": "Losa vertical de piedra de polvo luminoso", + "block.infernalexp.shimmer_stone_stairs": "Escaleras de piedra de polvo luminoso", + "block.infernalexp.shimmer_stone_wall": "Muro de piedra de polvo luminoso", + "block.infernalexp.trapped_shimmer_sand": "Arena de polvo luminoso inestable", "block.infernalexp.glow_fire": "Glow Fire", - "block.infernalexp.glowdust_stone_bricks": "Ladrillos de piedra de polvo luminoso", - "block.infernalexp.glowdust_stone_brick_slab": "Losa de ladrillos de piedra de polvo luminoso", - "block.infernalexp.glowdust_stone_brick_vertical_slab": "Losa vertical de ladrillos de piedra de polvo luminoso", - "block.infernalexp.glowdust_stone_brick_stairs": "Escaleras de ladrillos de piedra de polvo luminoso", - "block.infernalexp.glowdust_stone_brick_wall": "Muro de ladrillos de piedra de polvo luminoso", - "block.infernalexp.cracked_glowdust_stone_bricks": "Ladrillos de piedra de polvo luminoso agrietados", - "block.infernalexp.chiseled_glowdust_stone_bricks": "Ladrillos de piedra de polvo luminoso cincelados", + "block.infernalexp.shimmer_stone_bricks": "Ladrillos de piedra de polvo luminoso", + "block.infernalexp.shimmer_stone_brick_slab": "Losa de ladrillos de piedra de polvo luminoso", + "block.infernalexp.shimmer_stone_brick_vertical_slab": "Losa vertical de ladrillos de piedra de polvo luminoso", + "block.infernalexp.shimmer_stone_brick_stairs": "Escaleras de ladrillos de piedra de polvo luminoso", + "block.infernalexp.shimmer_stone_brick_wall": "Muro de ladrillos de piedra de polvo luminoso", + "block.infernalexp.cracked_shimmer_stone_bricks": "Ladrillos de piedra de polvo luminoso agrietados", + "block.infernalexp.chiseled_shimmer_stone_bricks": "Ladrillos de piedra de polvo luminoso cincelados", "block.infernalexp.crumbling_blackstone": "Piedra negra desmoronada", "block.infernalexp.silt": "Cieno de basalto", "block.infernalexp.rubble": "Escombros de piedra negra", diff --git a/src/main/resources/assets/infernalexp/lang/fr_ca.json b/src/main/resources/assets/infernalexp/lang/fr_ca.json index 252c3ed40..e98015c0d 100644 --- a/src/main/resources/assets/infernalexp/lang/fr_ca.json +++ b/src/main/resources/assets/infernalexp/lang/fr_ca.json @@ -41,22 +41,22 @@ "block.infernalexp.dullstone_brick_stairs": "Escaliers de briques de dullstone", "block.infernalexp.dullstone_brick_wall": "Dullstone Brick Wall", "block.infernalexp.luminous_wart_block": "Luminous Wart Block", - "block.infernalexp.glowdust": "Glowdust", - "block.infernalexp.glowdust_sand": "Sable de glowdust", - "block.infernalexp.glowdust_stone": "Pierre de glowdust", - "block.infernalexp.glowdust_stone_slab": "Glowdust Stone Slab", - "block.infernalexp.glowdust_stone_vertical_slab": "Shimmer Stone Vertical Slab", - "block.infernalexp.glowdust_stone_stairs": "Glowdust Stone Stairs", - "block.infernalexp.glowdust_stone_wall": "Glowdust Stone Wall", - "block.infernalexp.trapped_glowdust_sand": "Unstable Glowdust Sand", + "block.infernalexp.shimmer_sheet": "Glowdust", + "block.infernalexp.shimmer_sand": "Sable de shimmer_sheet", + "block.infernalexp.shimmer_stone": "Pierre de shimmer_sheet", + "block.infernalexp.shimmer_stone_slab": "Glowdust Stone Slab", + "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", + "block.infernalexp.shimmer_stone_stairs": "Glowdust Stone Stairs", + "block.infernalexp.shimmer_stone_wall": "Glowdust Stone Wall", + "block.infernalexp.trapped_shimmer_sand": "Unstable Glowdust Sand", "block.infernalexp.glow_fire": "Glow Fire", - "block.infernalexp.glowdust_stone_bricks": "Glowdust Stone Bricks", - "block.infernalexp.glowdust_stone_brick_slab": "Glowdust Stone Brick Slab", - "block.infernalexp.glowdust_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", - "block.infernalexp.glowdust_stone_brick_stairs": "Glowdust Stone Brick Stairs", - "block.infernalexp.glowdust_stone_brick_wall": "Glowdust Stone Brick Wall", - "block.infernalexp.cracked_glowdust_stone_bricks": "Cracked Glowdust Stone Bricks", - "block.infernalexp.chiseled_glowdust_stone_bricks": "Chiseled Glowdust Stone Brick", + "block.infernalexp.shimmer_stone_bricks": "Glowdust Stone Bricks", + "block.infernalexp.shimmer_stone_brick_slab": "Glowdust Stone Brick Slab", + "block.infernalexp.shimmer_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", + "block.infernalexp.shimmer_stone_brick_stairs": "Glowdust Stone Brick Stairs", + "block.infernalexp.shimmer_stone_brick_wall": "Glowdust Stone Brick Wall", + "block.infernalexp.cracked_shimmer_stone_bricks": "Cracked Glowdust Stone Bricks", + "block.infernalexp.chiseled_shimmer_stone_bricks": "Chiseled Glowdust Stone Brick", "block.infernalexp.crumbling_blackstone": "Roche noire effritée", "block.infernalexp.silt": "Limon de basalte", "block.infernalexp.rubble": "Décombres de roche noire", diff --git a/src/main/resources/assets/infernalexp/lang/fr_fr.json b/src/main/resources/assets/infernalexp/lang/fr_fr.json index 54bc52499..097c27ce9 100644 --- a/src/main/resources/assets/infernalexp/lang/fr_fr.json +++ b/src/main/resources/assets/infernalexp/lang/fr_fr.json @@ -41,22 +41,22 @@ "block.infernalexp.dullstone_brick_stairs": "Escalier en briques de pierre terne", "block.infernalexp.dullstone_brick_wall": "Dullstone Brick Wall", "block.infernalexp.luminous_wart_block": "Luminous Wart Block", - "block.infernalexp.glowdust": "Poudre lumineuse", - "block.infernalexp.glowdust_sand": "Sable lumineux", - "block.infernalexp.glowdust_stone": "Pierre de sable lumineux", - "block.infernalexp.glowdust_stone_slab": "Glowdust Stone Slab", - "block.infernalexp.glowdust_stone_vertical_slab": "Shimmer Stone Vertical Slab", - "block.infernalexp.glowdust_stone_stairs": "Glowdust Stone Stairs", - "block.infernalexp.glowdust_stone_wall": "Glowdust Stone Wall", - "block.infernalexp.trapped_glowdust_sand": "Unstable Glowdust Sand", + "block.infernalexp.shimmer_sheet": "Poudre lumineuse", + "block.infernalexp.shimmer_sand": "Sable lumineux", + "block.infernalexp.shimmer_stone": "Pierre de sable lumineux", + "block.infernalexp.shimmer_stone_slab": "Glowdust Stone Slab", + "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", + "block.infernalexp.shimmer_stone_stairs": "Glowdust Stone Stairs", + "block.infernalexp.shimmer_stone_wall": "Glowdust Stone Wall", + "block.infernalexp.trapped_shimmer_sand": "Unstable Glowdust Sand", "block.infernalexp.glow_fire": "Glow Fire", - "block.infernalexp.glowdust_stone_bricks": "Glowdust Stone Bricks", - "block.infernalexp.glowdust_stone_brick_slab": "Glowdust Stone Brick Slab", - "block.infernalexp.glowdust_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", - "block.infernalexp.glowdust_stone_brick_stairs": "Glowdust Stone Brick Stairs", - "block.infernalexp.glowdust_stone_brick_wall": "Glowdust Stone Brick Wall", - "block.infernalexp.cracked_glowdust_stone_bricks": "Cracked Glowdust Stone Bricks", - "block.infernalexp.chiseled_glowdust_stone_bricks": "Chiseled Glowdust Stone Brick", + "block.infernalexp.shimmer_stone_bricks": "Glowdust Stone Bricks", + "block.infernalexp.shimmer_stone_brick_slab": "Glowdust Stone Brick Slab", + "block.infernalexp.shimmer_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", + "block.infernalexp.shimmer_stone_brick_stairs": "Glowdust Stone Brick Stairs", + "block.infernalexp.shimmer_stone_brick_wall": "Glowdust Stone Brick Wall", + "block.infernalexp.cracked_shimmer_stone_bricks": "Cracked Glowdust Stone Bricks", + "block.infernalexp.chiseled_shimmer_stone_bricks": "Chiseled Glowdust Stone Brick", "block.infernalexp.crumbling_blackstone": "Roche noire effritée", "block.infernalexp.silt": "Limon de basalte", "block.infernalexp.rubble": "Décombres de roche noire", diff --git a/src/main/resources/assets/infernalexp/lang/he_il.json b/src/main/resources/assets/infernalexp/lang/he_il.json index c8779eaf4..05c5c8db4 100644 --- a/src/main/resources/assets/infernalexp/lang/he_il.json +++ b/src/main/resources/assets/infernalexp/lang/he_il.json @@ -41,22 +41,22 @@ "block.infernalexp.dullstone_brick_stairs": "מדרגות לבני אטומסטון", "block.infernalexp.dullstone_brick_wall": "Dullstone Brick Wall", "block.infernalexp.luminous_wart_block": "Luminous Wart Block", - "block.infernalexp.glowdust": "אבק גלוחול", - "block.infernalexp.glowdust_sand": "גלוחול", - "block.infernalexp.glowdust_stone": "גלוסטון מוקשה", - "block.infernalexp.glowdust_stone_slab": "Glowdust Stone Slab", - "block.infernalexp.glowdust_stone_vertical_slab": "Shimmer Stone Vertical Slab", - "block.infernalexp.glowdust_stone_stairs": "Glowdust Stone Stairs", - "block.infernalexp.glowdust_stone_wall": "Glowdust Stone Wall", - "block.infernalexp.trapped_glowdust_sand": "Unstable Glowdust Sand", + "block.infernalexp.shimmer_sheet": "אבק גלוחול", + "block.infernalexp.shimmer_sand": "גלוחול", + "block.infernalexp.shimmer_stone": "גלוסטון מוקשה", + "block.infernalexp.shimmer_stone_slab": "Glowdust Stone Slab", + "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", + "block.infernalexp.shimmer_stone_stairs": "Glowdust Stone Stairs", + "block.infernalexp.shimmer_stone_wall": "Glowdust Stone Wall", + "block.infernalexp.trapped_shimmer_sand": "Unstable Glowdust Sand", "block.infernalexp.glow_fire": "Glow Fire", - "block.infernalexp.glowdust_stone_bricks": "Glowdust Stone Bricks", - "block.infernalexp.glowdust_stone_brick_slab": "Glowdust Stone Brick Slab", - "block.infernalexp.glowdust_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", - "block.infernalexp.glowdust_stone_brick_stairs": "Glowdust Stone Brick Stairs", - "block.infernalexp.glowdust_stone_brick_wall": "Glowdust Stone Brick Wall", - "block.infernalexp.cracked_glowdust_stone_bricks": "Cracked Glowdust Stone Bricks", - "block.infernalexp.chiseled_glowdust_stone_bricks": "Chiseled Glowdust Stone Brick", + "block.infernalexp.shimmer_stone_bricks": "Glowdust Stone Bricks", + "block.infernalexp.shimmer_stone_brick_slab": "Glowdust Stone Brick Slab", + "block.infernalexp.shimmer_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", + "block.infernalexp.shimmer_stone_brick_stairs": "Glowdust Stone Brick Stairs", + "block.infernalexp.shimmer_stone_brick_wall": "Glowdust Stone Brick Wall", + "block.infernalexp.cracked_shimmer_stone_bricks": "Cracked Glowdust Stone Bricks", + "block.infernalexp.chiseled_shimmer_stone_bricks": "Chiseled Glowdust Stone Brick", "block.infernalexp.crumbling_blackstone": "אבן שחורה מתפוררת", "block.infernalexp.silt": "טין בזלת", "block.infernalexp.rubble": "שברי אבן שחורה", diff --git a/src/main/resources/assets/infernalexp/lang/id_id.json b/src/main/resources/assets/infernalexp/lang/id_id.json index 867ad0bc9..2c2272bf5 100644 --- a/src/main/resources/assets/infernalexp/lang/id_id.json +++ b/src/main/resources/assets/infernalexp/lang/id_id.json @@ -41,22 +41,22 @@ "block.infernalexp.dullstone_brick_stairs": "Tangga Bata Batu Pudar", "block.infernalexp.dullstone_brick_wall": "Dullstone Brick Wall", "block.infernalexp.luminous_wart_block": "Luminous Wart Block", - "block.infernalexp.glowdust": "Serbuk Bersinar", - "block.infernalexp.glowdust_sand": "Pasir Serbuk Bersinar", - "block.infernalexp.glowdust_stone": "Batu Serbuk Bersinar", - "block.infernalexp.glowdust_stone_slab": "Glowdust Stone Slab", - "block.infernalexp.glowdust_stone_vertical_slab": "Shimmer Stone Vertical Slab", - "block.infernalexp.glowdust_stone_stairs": "Glowdust Stone Stairs", - "block.infernalexp.glowdust_stone_wall": "Glowdust Stone Wall", - "block.infernalexp.trapped_glowdust_sand": "Unstable Glowdust Sand", + "block.infernalexp.shimmer_sheet": "Serbuk Bersinar", + "block.infernalexp.shimmer_sand": "Pasir Serbuk Bersinar", + "block.infernalexp.shimmer_stone": "Batu Serbuk Bersinar", + "block.infernalexp.shimmer_stone_slab": "Glowdust Stone Slab", + "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", + "block.infernalexp.shimmer_stone_stairs": "Glowdust Stone Stairs", + "block.infernalexp.shimmer_stone_wall": "Glowdust Stone Wall", + "block.infernalexp.trapped_shimmer_sand": "Unstable Glowdust Sand", "block.infernalexp.glow_fire": "Glow Fire", - "block.infernalexp.glowdust_stone_bricks": "Glowdust Stone Bricks", - "block.infernalexp.glowdust_stone_brick_slab": "Glowdust Stone Brick Slab", - "block.infernalexp.glowdust_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", - "block.infernalexp.glowdust_stone_brick_stairs": "Glowdust Stone Brick Stairs", - "block.infernalexp.glowdust_stone_brick_wall": "Glowdust Stone Brick Wall", - "block.infernalexp.cracked_glowdust_stone_bricks": "Cracked Glowdust Stone Bricks", - "block.infernalexp.chiseled_glowdust_stone_bricks": "Chiseled Glowdust Stone Brick", + "block.infernalexp.shimmer_stone_bricks": "Glowdust Stone Bricks", + "block.infernalexp.shimmer_stone_brick_slab": "Glowdust Stone Brick Slab", + "block.infernalexp.shimmer_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", + "block.infernalexp.shimmer_stone_brick_stairs": "Glowdust Stone Brick Stairs", + "block.infernalexp.shimmer_stone_brick_wall": "Glowdust Stone Brick Wall", + "block.infernalexp.cracked_shimmer_stone_bricks": "Cracked Glowdust Stone Bricks", + "block.infernalexp.chiseled_shimmer_stone_bricks": "Chiseled Glowdust Stone Brick", "block.infernalexp.crumbling_blackstone": "Batu Hitam Hancur", "block.infernalexp.silt": "Endapan Basal", "block.infernalexp.rubble": "Puing Batu Hitam", diff --git a/src/main/resources/assets/infernalexp/lang/ja_jp.json b/src/main/resources/assets/infernalexp/lang/ja_jp.json index c53499a0a..133fbab42 100644 --- a/src/main/resources/assets/infernalexp/lang/ja_jp.json +++ b/src/main/resources/assets/infernalexp/lang/ja_jp.json @@ -41,22 +41,22 @@ "block.infernalexp.dullstone_brick_stairs": "ダルストーンレンガの階段", "block.infernalexp.dullstone_brick_wall": "ダルストーンレンガの塀", "block.infernalexp.luminous_wart_block": "輝くウォートブロック", - "block.infernalexp.glowdust": "きらめく塵", - "block.infernalexp.glowdust_sand": "きらめく砂", - "block.infernalexp.glowdust_stone": "きらめく石", - "block.infernalexp.glowdust_stone_slab": "きらめく石のハーフブロック", - "block.infernalexp.glowdust_stone_vertical_slab": "きらめく石の縦ハーフブロック", - "block.infernalexp.glowdust_stone_stairs": "きらめく石の階段", - "block.infernalexp.glowdust_stone_wall": "きらめく石の塀", - "block.infernalexp.trapped_glowdust_sand": "きらめく砂利", + "block.infernalexp.shimmer_sheet": "きらめく塵", + "block.infernalexp.shimmer_sand": "きらめく砂", + "block.infernalexp.shimmer_stone": "きらめく石", + "block.infernalexp.shimmer_stone_slab": "きらめく石のハーフブロック", + "block.infernalexp.shimmer_stone_vertical_slab": "きらめく石の縦ハーフブロック", + "block.infernalexp.shimmer_stone_stairs": "きらめく石の階段", + "block.infernalexp.shimmer_stone_wall": "きらめく石の塀", + "block.infernalexp.trapped_shimmer_sand": "きらめく砂利", "block.infernalexp.glow_fire": "Glow Fire", - "block.infernalexp.glowdust_stone_bricks": "きらめく石レンガ", - "block.infernalexp.glowdust_stone_brick_slab": "きらめく石レンガのハーフブロック", - "block.infernalexp.glowdust_stone_brick_vertical_slab": "きらめく石レンガの縦ハーフブロック", - "block.infernalexp.glowdust_stone_brick_stairs": "きらめく石レンガの階段", - "block.infernalexp.glowdust_stone_brick_wall": "きらめく石レンガの塀", - "block.infernalexp.cracked_glowdust_stone_bricks": "ひび割れたきらめく石レンガ", - "block.infernalexp.chiseled_glowdust_stone_bricks": "模様入りのきらめく石レンガ", + "block.infernalexp.shimmer_stone_bricks": "きらめく石レンガ", + "block.infernalexp.shimmer_stone_brick_slab": "きらめく石レンガのハーフブロック", + "block.infernalexp.shimmer_stone_brick_vertical_slab": "きらめく石レンガの縦ハーフブロック", + "block.infernalexp.shimmer_stone_brick_stairs": "きらめく石レンガの階段", + "block.infernalexp.shimmer_stone_brick_wall": "きらめく石レンガの塀", + "block.infernalexp.cracked_shimmer_stone_bricks": "ひび割れたきらめく石レンガ", + "block.infernalexp.chiseled_shimmer_stone_bricks": "模様入りのきらめく石レンガ", "block.infernalexp.crumbling_blackstone": "ひび割れたブラックストーン", "block.infernalexp.silt": "玄武岩の泥土", "block.infernalexp.rubble": "ブラックストーンのがれき", diff --git a/src/main/resources/assets/infernalexp/lang/lol_us.json b/src/main/resources/assets/infernalexp/lang/lol_us.json index a66128df8..84d56fe38 100644 --- a/src/main/resources/assets/infernalexp/lang/lol_us.json +++ b/src/main/resources/assets/infernalexp/lang/lol_us.json @@ -41,22 +41,22 @@ "block.infernalexp.dullstone_brick_stairs": "Not-glowy brik stairz", "block.infernalexp.dullstone_brick_wall": "Dullstone Brick Wall", "block.infernalexp.luminous_wart_block": "Luminous Wart Block", - "block.infernalexp.glowdust": "Shiney dust", - "block.infernalexp.glowdust_sand": "shiney beach dust", - "block.infernalexp.glowdust_stone": "Shiney dust rock", - "block.infernalexp.glowdust_stone_slab": "Glowdust Stone Slab", - "block.infernalexp.glowdust_stone_vertical_slab": "Shimmer Stone Vertical Slab", - "block.infernalexp.glowdust_stone_stairs": "Glowdust Stone Stairs", - "block.infernalexp.glowdust_stone_wall": "Glowdust Stone Wall", - "block.infernalexp.trapped_glowdust_sand": "Unstable Glowdust Sand", + "block.infernalexp.shimmer_sheet": "Shiney dust", + "block.infernalexp.shimmer_sand": "shiney beach dust", + "block.infernalexp.shimmer_stone": "Shiney dust rock", + "block.infernalexp.shimmer_stone_slab": "Glowdust Stone Slab", + "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", + "block.infernalexp.shimmer_stone_stairs": "Glowdust Stone Stairs", + "block.infernalexp.shimmer_stone_wall": "Glowdust Stone Wall", + "block.infernalexp.trapped_shimmer_sand": "Unstable Glowdust Sand", "block.infernalexp.glow_fire": "Glow Fire", - "block.infernalexp.glowdust_stone_bricks": "Glowdust Stone Bricks", - "block.infernalexp.glowdust_stone_brick_slab": "Glowdust Stone Brick Slab", - "block.infernalexp.glowdust_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", - "block.infernalexp.glowdust_stone_brick_stairs": "Glowdust Stone Brick Stairs", - "block.infernalexp.glowdust_stone_brick_wall": "Glowdust Stone Brick Wall", - "block.infernalexp.cracked_glowdust_stone_bricks": "Cracked Glowdust Stone Bricks", - "block.infernalexp.chiseled_glowdust_stone_bricks": "Chiseled Glowdust Stone Brick", + "block.infernalexp.shimmer_stone_bricks": "Glowdust Stone Bricks", + "block.infernalexp.shimmer_stone_brick_slab": "Glowdust Stone Brick Slab", + "block.infernalexp.shimmer_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", + "block.infernalexp.shimmer_stone_brick_stairs": "Glowdust Stone Brick Stairs", + "block.infernalexp.shimmer_stone_brick_wall": "Glowdust Stone Brick Wall", + "block.infernalexp.cracked_shimmer_stone_bricks": "Cracked Glowdust Stone Bricks", + "block.infernalexp.chiseled_shimmer_stone_bricks": "Chiseled Glowdust Stone Brick", "block.infernalexp.crumbling_blackstone": "bleck rock in poor conditoinsn", "block.infernalexp.silt": "Blec sand", "block.infernalexp.rubble": "Blecston peaces", diff --git a/src/main/resources/assets/infernalexp/lang/lv_lv.json b/src/main/resources/assets/infernalexp/lang/lv_lv.json index 414de52e2..24060e0c6 100644 --- a/src/main/resources/assets/infernalexp/lang/lv_lv.json +++ b/src/main/resources/assets/infernalexp/lang/lv_lv.json @@ -41,22 +41,22 @@ "block.infernalexp.dullstone_brick_stairs": "Dullstone Brick Stairs", "block.infernalexp.dullstone_brick_wall": "Dullstone Brick Wall", "block.infernalexp.luminous_wart_block": "Luminous Wart Block", - "block.infernalexp.glowdust": "Shimmer Sheet", - "block.infernalexp.glowdust_sand": "Shimmer Sand", - "block.infernalexp.glowdust_stone": "Shimmer Stone", - "block.infernalexp.glowdust_stone_slab": "Shimmer Stone Slab", - "block.infernalexp.glowdust_stone_vertical_slab": "Shimmer Stone Vertical Slab", - "block.infernalexp.glowdust_stone_stairs": "Shimmer Stone Stairs", - "block.infernalexp.glowdust_stone_wall": "Shimmer Stone Wall", - "block.infernalexp.trapped_glowdust_sand": "Glimmer Gravel", + "block.infernalexp.shimmer_sheet": "Shimmer Sheet", + "block.infernalexp.shimmer_sand": "Shimmer Sand", + "block.infernalexp.shimmer_stone": "Shimmer Stone", + "block.infernalexp.shimmer_stone_slab": "Shimmer Stone Slab", + "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", + "block.infernalexp.shimmer_stone_stairs": "Shimmer Stone Stairs", + "block.infernalexp.shimmer_stone_wall": "Shimmer Stone Wall", + "block.infernalexp.trapped_shimmer_sand": "Glimmer Gravel", "block.infernalexp.glow_fire": "Glow Fire", - "block.infernalexp.glowdust_stone_bricks": "Shimmer Stone Bricks", - "block.infernalexp.glowdust_stone_brick_slab": "Shimmer Stone Brick Slab", - "block.infernalexp.glowdust_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", - "block.infernalexp.glowdust_stone_brick_stairs": "Shimmer Stone Brick Stairs", - "block.infernalexp.glowdust_stone_brick_wall": "Shimmer Stone Brick Wall", - "block.infernalexp.cracked_glowdust_stone_bricks": "Cracked Shimmer Stone Bricks", - "block.infernalexp.chiseled_glowdust_stone_bricks": "Chiseled Shimmer Stone Brick", + "block.infernalexp.shimmer_stone_bricks": "Shimmer Stone Bricks", + "block.infernalexp.shimmer_stone_brick_slab": "Shimmer Stone Brick Slab", + "block.infernalexp.shimmer_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", + "block.infernalexp.shimmer_stone_brick_stairs": "Shimmer Stone Brick Stairs", + "block.infernalexp.shimmer_stone_brick_wall": "Shimmer Stone Brick Wall", + "block.infernalexp.cracked_shimmer_stone_bricks": "Cracked Shimmer Stone Bricks", + "block.infernalexp.chiseled_shimmer_stone_bricks": "Chiseled Shimmer Stone Brick", "block.infernalexp.crumbling_blackstone": "Crumbling Blackstone", "block.infernalexp.silt": "Basalt Silt", "block.infernalexp.rubble": "Blackstone Rubble", diff --git a/src/main/resources/assets/infernalexp/lang/ms_my.json b/src/main/resources/assets/infernalexp/lang/ms_my.json index 65e0c4960..f4fe0395a 100644 --- a/src/main/resources/assets/infernalexp/lang/ms_my.json +++ b/src/main/resources/assets/infernalexp/lang/ms_my.json @@ -41,22 +41,22 @@ "block.infernalexp.dullstone_brick_stairs": "Tangga Bata Batu Pudar", "block.infernalexp.dullstone_brick_wall": "Dullstone Brick Wall", "block.infernalexp.luminous_wart_block": "Luminous Wart Block", - "block.infernalexp.glowdust": "Serbuk Berkilau", - "block.infernalexp.glowdust_sand": "Pasir Serbuk Berkilau", - "block.infernalexp.glowdust_stone": "Batu Serbuk Berkilau", - "block.infernalexp.glowdust_stone_slab": "Glowdust Stone Slab", - "block.infernalexp.glowdust_stone_vertical_slab": "Shimmer Stone Vertical Slab", - "block.infernalexp.glowdust_stone_stairs": "Glowdust Stone Stairs", - "block.infernalexp.glowdust_stone_wall": "Glowdust Stone Wall", - "block.infernalexp.trapped_glowdust_sand": "Unstable Glowdust Sand", + "block.infernalexp.shimmer_sheet": "Serbuk Berkilau", + "block.infernalexp.shimmer_sand": "Pasir Serbuk Berkilau", + "block.infernalexp.shimmer_stone": "Batu Serbuk Berkilau", + "block.infernalexp.shimmer_stone_slab": "Glowdust Stone Slab", + "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", + "block.infernalexp.shimmer_stone_stairs": "Glowdust Stone Stairs", + "block.infernalexp.shimmer_stone_wall": "Glowdust Stone Wall", + "block.infernalexp.trapped_shimmer_sand": "Unstable Glowdust Sand", "block.infernalexp.glow_fire": "Glow Fire", - "block.infernalexp.glowdust_stone_bricks": "Glowdust Stone Bricks", - "block.infernalexp.glowdust_stone_brick_slab": "Glowdust Stone Brick Slab", - "block.infernalexp.glowdust_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", - "block.infernalexp.glowdust_stone_brick_stairs": "Glowdust Stone Brick Stairs", - "block.infernalexp.glowdust_stone_brick_wall": "Glowdust Stone Brick Wall", - "block.infernalexp.cracked_glowdust_stone_bricks": "Cracked Glowdust Stone Bricks", - "block.infernalexp.chiseled_glowdust_stone_bricks": "Chiseled Glowdust Stone Brick", + "block.infernalexp.shimmer_stone_bricks": "Glowdust Stone Bricks", + "block.infernalexp.shimmer_stone_brick_slab": "Glowdust Stone Brick Slab", + "block.infernalexp.shimmer_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", + "block.infernalexp.shimmer_stone_brick_stairs": "Glowdust Stone Brick Stairs", + "block.infernalexp.shimmer_stone_brick_wall": "Glowdust Stone Brick Wall", + "block.infernalexp.cracked_shimmer_stone_bricks": "Cracked Glowdust Stone Bricks", + "block.infernalexp.chiseled_shimmer_stone_bricks": "Chiseled Glowdust Stone Brick", "block.infernalexp.crumbling_blackstone": "Batu Hitam Runtuh", "block.infernalexp.silt": "Kelodak Basalt", "block.infernalexp.rubble": "Serpihan Batu Hitam", diff --git a/src/main/resources/assets/infernalexp/lang/nl_nl.json b/src/main/resources/assets/infernalexp/lang/nl_nl.json index cc726e4f9..b4bae08eb 100644 --- a/src/main/resources/assets/infernalexp/lang/nl_nl.json +++ b/src/main/resources/assets/infernalexp/lang/nl_nl.json @@ -41,22 +41,22 @@ "block.infernalexp.dullstone_brick_stairs": "Dofstenen Blokstenen Trap", "block.infernalexp.dullstone_brick_wall": "Dullstone Brick Wall", "block.infernalexp.luminous_wart_block": "Luminous Wart Block", - "block.infernalexp.glowdust": "Gloeistof", - "block.infernalexp.glowdust_sand": "Gloeistof Zand", - "block.infernalexp.glowdust_stone": "Gloeistof Steen", - "block.infernalexp.glowdust_stone_slab": "Glowdust Stone Slab", - "block.infernalexp.glowdust_stone_vertical_slab": "Shimmer Stone Vertical Slab", - "block.infernalexp.glowdust_stone_stairs": "Glowdust Stone Stairs", - "block.infernalexp.glowdust_stone_wall": "Glowdust Stone Wall", - "block.infernalexp.trapped_glowdust_sand": "Unstable Glowdust Sand", + "block.infernalexp.shimmer_sheet": "Gloeistof", + "block.infernalexp.shimmer_sand": "Gloeistof Zand", + "block.infernalexp.shimmer_stone": "Gloeistof Steen", + "block.infernalexp.shimmer_stone_slab": "Glowdust Stone Slab", + "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", + "block.infernalexp.shimmer_stone_stairs": "Glowdust Stone Stairs", + "block.infernalexp.shimmer_stone_wall": "Glowdust Stone Wall", + "block.infernalexp.trapped_shimmer_sand": "Unstable Glowdust Sand", "block.infernalexp.glow_fire": "Glow Fire", - "block.infernalexp.glowdust_stone_bricks": "Glowdust Stone Bricks", - "block.infernalexp.glowdust_stone_brick_slab": "Glowdust Stone Brick Slab", - "block.infernalexp.glowdust_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", - "block.infernalexp.glowdust_stone_brick_stairs": "Glowdust Stone Brick Stairs", - "block.infernalexp.glowdust_stone_brick_wall": "Glowdust Stone Brick Wall", - "block.infernalexp.cracked_glowdust_stone_bricks": "Cracked Glowdust Stone Bricks", - "block.infernalexp.chiseled_glowdust_stone_bricks": "Chiseled Glowdust Stone Brick", + "block.infernalexp.shimmer_stone_bricks": "Glowdust Stone Bricks", + "block.infernalexp.shimmer_stone_brick_slab": "Glowdust Stone Brick Slab", + "block.infernalexp.shimmer_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", + "block.infernalexp.shimmer_stone_brick_stairs": "Glowdust Stone Brick Stairs", + "block.infernalexp.shimmer_stone_brick_wall": "Glowdust Stone Brick Wall", + "block.infernalexp.cracked_shimmer_stone_bricks": "Cracked Glowdust Stone Bricks", + "block.infernalexp.chiseled_shimmer_stone_bricks": "Chiseled Glowdust Stone Brick", "block.infernalexp.crumbling_blackstone": "Afbrokkelend Zwartsteen", "block.infernalexp.silt": "Basalt Slib", "block.infernalexp.rubble": "Zwartsteen Puin", diff --git a/src/main/resources/assets/infernalexp/lang/pl_pl.json b/src/main/resources/assets/infernalexp/lang/pl_pl.json index ced5da20d..0042e8043 100644 --- a/src/main/resources/assets/infernalexp/lang/pl_pl.json +++ b/src/main/resources/assets/infernalexp/lang/pl_pl.json @@ -41,22 +41,22 @@ "block.infernalexp.dullstone_brick_stairs": "Cieniogłazowe ceglane schody", "block.infernalexp.dullstone_brick_wall": "Cieniogłazowy ceglany murek", "block.infernalexp.luminous_wart_block": "Blok świetlistej brodawki", - "block.infernalexp.glowdust": "Warstwa jasnopyłu", - "block.infernalexp.glowdust_sand": "Jasnopyłowy piasek", - "block.infernalexp.glowdust_stone": "Jasnopyłowy kamień", - "block.infernalexp.glowdust_stone_slab": "Jasnopyłowa kamienna płyta", - "block.infernalexp.glowdust_stone_vertical_slab": "Pionowa jasnopyłowa kamienna płyta", - "block.infernalexp.glowdust_stone_stairs": "Jasnopyłowe kamienne schody", - "block.infernalexp.glowdust_stone_wall": "Jasnopyłowy kamienny murek", - "block.infernalexp.trapped_glowdust_sand": "Ruchomy jasnopyłowy piasek", + "block.infernalexp.shimmer_sheet": "Warstwa jasnopyłu", + "block.infernalexp.shimmer_sand": "Jasnopyłowy piasek", + "block.infernalexp.shimmer_stone": "Jasnopyłowy kamień", + "block.infernalexp.shimmer_stone_slab": "Jasnopyłowa kamienna płyta", + "block.infernalexp.shimmer_stone_vertical_slab": "Pionowa jasnopyłowa kamienna płyta", + "block.infernalexp.shimmer_stone_stairs": "Jasnopyłowe kamienne schody", + "block.infernalexp.shimmer_stone_wall": "Jasnopyłowy kamienny murek", + "block.infernalexp.trapped_shimmer_sand": "Ruchomy jasnopyłowy piasek", "block.infernalexp.glow_fire": "Glow Fire", - "block.infernalexp.glowdust_stone_bricks": "Jasnopyłowe kamienne cegły", - "block.infernalexp.glowdust_stone_brick_slab": "Jasnopyłowa kamienna ceglana płyta", - "block.infernalexp.glowdust_stone_brick_vertical_slab": "Pionowa jasnopyłowa kamienna ceglana płyta", - "block.infernalexp.glowdust_stone_brick_stairs": "Jasnopyłowe kamienne ceglane schody", - "block.infernalexp.glowdust_stone_brick_wall": "Jasnopyłowy kamienny ceglany murek", - "block.infernalexp.cracked_glowdust_stone_bricks": "Popękane jasnopyłowe kamienne cegły", - "block.infernalexp.chiseled_glowdust_stone_bricks": "Rzeźbione jasnopyłowe kamienne cegły", + "block.infernalexp.shimmer_stone_bricks": "Jasnopyłowe kamienne cegły", + "block.infernalexp.shimmer_stone_brick_slab": "Jasnopyłowa kamienna ceglana płyta", + "block.infernalexp.shimmer_stone_brick_vertical_slab": "Pionowa jasnopyłowa kamienna ceglana płyta", + "block.infernalexp.shimmer_stone_brick_stairs": "Jasnopyłowe kamienne ceglane schody", + "block.infernalexp.shimmer_stone_brick_wall": "Jasnopyłowy kamienny ceglany murek", + "block.infernalexp.cracked_shimmer_stone_bricks": "Popękane jasnopyłowe kamienne cegły", + "block.infernalexp.chiseled_shimmer_stone_bricks": "Rzeźbione jasnopyłowe kamienne cegły", "block.infernalexp.crumbling_blackstone": "Kruchy czernit", "block.infernalexp.silt": "Sypki bazalt", "block.infernalexp.rubble": "Czernitowy gruz", diff --git a/src/main/resources/assets/infernalexp/lang/pt_br.json b/src/main/resources/assets/infernalexp/lang/pt_br.json index d5d09e8e8..7ff1a49b3 100644 --- a/src/main/resources/assets/infernalexp/lang/pt_br.json +++ b/src/main/resources/assets/infernalexp/lang/pt_br.json @@ -41,22 +41,22 @@ "block.infernalexp.dullstone_brick_stairs": "Escadas de Tijolos de Pedra Opaca", "block.infernalexp.dullstone_brick_wall": "Dullstone Brick Wall", "block.infernalexp.luminous_wart_block": "Luminous Wart Block", - "block.infernalexp.glowdust": "Pó Luminoso", - "block.infernalexp.glowdust_sand": "Areia de Pó Luminoso", - "block.infernalexp.glowdust_stone": "Pedra de Pó Luminoso", - "block.infernalexp.glowdust_stone_slab": "Shimmer Stone Slab", - "block.infernalexp.glowdust_stone_vertical_slab": "Shimmer Stone Vertical Slab", - "block.infernalexp.glowdust_stone_stairs": "Shimmer Stone Stairs", - "block.infernalexp.glowdust_stone_wall": "Shimmer Stone Wall", - "block.infernalexp.trapped_glowdust_sand": "Glimmer Gravel", + "block.infernalexp.shimmer_sheet": "Pó Luminoso", + "block.infernalexp.shimmer_sand": "Areia de Pó Luminoso", + "block.infernalexp.shimmer_stone": "Pedra de Pó Luminoso", + "block.infernalexp.shimmer_stone_slab": "Shimmer Stone Slab", + "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", + "block.infernalexp.shimmer_stone_stairs": "Shimmer Stone Stairs", + "block.infernalexp.shimmer_stone_wall": "Shimmer Stone Wall", + "block.infernalexp.trapped_shimmer_sand": "Glimmer Gravel", "block.infernalexp.glow_fire": "Glow Fire", - "block.infernalexp.glowdust_stone_bricks": "Shimmer Stone Bricks", - "block.infernalexp.glowdust_stone_brick_slab": "Shimmer Stone Brick Slab", - "block.infernalexp.glowdust_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", - "block.infernalexp.glowdust_stone_brick_stairs": "Shimmer Stone Brick Stairs", - "block.infernalexp.glowdust_stone_brick_wall": "Shimmer Stone Brick Wall", - "block.infernalexp.cracked_glowdust_stone_bricks": "Cracked Shimmer Stone Bricks", - "block.infernalexp.chiseled_glowdust_stone_bricks": "Chiseled Shimmer Stone Brick", + "block.infernalexp.shimmer_stone_bricks": "Shimmer Stone Bricks", + "block.infernalexp.shimmer_stone_brick_slab": "Shimmer Stone Brick Slab", + "block.infernalexp.shimmer_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", + "block.infernalexp.shimmer_stone_brick_stairs": "Shimmer Stone Brick Stairs", + "block.infernalexp.shimmer_stone_brick_wall": "Shimmer Stone Brick Wall", + "block.infernalexp.cracked_shimmer_stone_bricks": "Cracked Shimmer Stone Bricks", + "block.infernalexp.chiseled_shimmer_stone_bricks": "Chiseled Shimmer Stone Brick", "block.infernalexp.crumbling_blackstone": "Pedra Negra Desintegrada", "block.infernalexp.silt": "Lodo de Basalto", "block.infernalexp.rubble": "Escombros de Pedra Negra ", diff --git a/src/main/resources/assets/infernalexp/lang/ro_ro.json b/src/main/resources/assets/infernalexp/lang/ro_ro.json index 69e46472b..a11ac5036 100644 --- a/src/main/resources/assets/infernalexp/lang/ro_ro.json +++ b/src/main/resources/assets/infernalexp/lang/ro_ro.json @@ -41,22 +41,22 @@ "block.infernalexp.dullstone_brick_stairs": "Scari de Caramizi de Piatra Stinsa", "block.infernalexp.dullstone_brick_wall": "Dullstone Brick Wall", "block.infernalexp.luminous_wart_block": "Luminous Wart Block", - "block.infernalexp.glowdust": "Praf Luminos", - "block.infernalexp.glowdust_sand": "Nisip Luminos", - "block.infernalexp.glowdust_stone": "Piatra de Praf Luminos", - "block.infernalexp.glowdust_stone_slab": "Shimmer Stone Slab", - "block.infernalexp.glowdust_stone_vertical_slab": "Shimmer Stone Vertical Slab", - "block.infernalexp.glowdust_stone_stairs": "Shimmer Stone Stairs", - "block.infernalexp.glowdust_stone_wall": "Shimmer Stone Wall", - "block.infernalexp.trapped_glowdust_sand": "Glimmer Gravel", + "block.infernalexp.shimmer_sheet": "Praf Luminos", + "block.infernalexp.shimmer_sand": "Nisip Luminos", + "block.infernalexp.shimmer_stone": "Piatra de Praf Luminos", + "block.infernalexp.shimmer_stone_slab": "Shimmer Stone Slab", + "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", + "block.infernalexp.shimmer_stone_stairs": "Shimmer Stone Stairs", + "block.infernalexp.shimmer_stone_wall": "Shimmer Stone Wall", + "block.infernalexp.trapped_shimmer_sand": "Glimmer Gravel", "block.infernalexp.glow_fire": "Glow Fire", - "block.infernalexp.glowdust_stone_bricks": "Shimmer Stone Bricks", - "block.infernalexp.glowdust_stone_brick_slab": "Shimmer Stone Brick Slab", - "block.infernalexp.glowdust_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", - "block.infernalexp.glowdust_stone_brick_stairs": "Shimmer Stone Brick Stairs", - "block.infernalexp.glowdust_stone_brick_wall": "Shimmer Stone Brick Wall", - "block.infernalexp.cracked_glowdust_stone_bricks": "Cracked Shimmer Stone Bricks", - "block.infernalexp.chiseled_glowdust_stone_bricks": "Chiseled Shimmer Stone Brick", + "block.infernalexp.shimmer_stone_bricks": "Shimmer Stone Bricks", + "block.infernalexp.shimmer_stone_brick_slab": "Shimmer Stone Brick Slab", + "block.infernalexp.shimmer_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", + "block.infernalexp.shimmer_stone_brick_stairs": "Shimmer Stone Brick Stairs", + "block.infernalexp.shimmer_stone_brick_wall": "Shimmer Stone Brick Wall", + "block.infernalexp.cracked_shimmer_stone_bricks": "Cracked Shimmer Stone Bricks", + "block.infernalexp.chiseled_shimmer_stone_bricks": "Chiseled Shimmer Stone Brick", "block.infernalexp.crumbling_blackstone": "Piatra Neagra Sfarmata", "block.infernalexp.silt": "Nisip Basaltic", "block.infernalexp.rubble": "Moloz de Piatra Neagra", diff --git a/src/main/resources/assets/infernalexp/lang/ru_ru.json b/src/main/resources/assets/infernalexp/lang/ru_ru.json index 77fef4c4e..43cd16df7 100644 --- a/src/main/resources/assets/infernalexp/lang/ru_ru.json +++ b/src/main/resources/assets/infernalexp/lang/ru_ru.json @@ -41,22 +41,22 @@ "block.infernalexp.dullstone_brick_stairs": "Кирпичные угасшекаменные ступени", "block.infernalexp.dullstone_brick_wall": "Кирпичная угасшекаменная ограда", "block.infernalexp.luminous_wart_block": "Блок светящегося нароста", - "block.infernalexp.glowdust": "Светопесок", - "block.infernalexp.glowdust_sand": "Светопесок", - "block.infernalexp.glowdust_stone": "Светопесчаник", - "block.infernalexp.glowdust_stone_slab": "Плита из светопесчаника", - "block.infernalexp.glowdust_stone_vertical_slab": "Вертикальная плита из светопесчаника", - "block.infernalexp.glowdust_stone_stairs": "Ступени из светопесчаника", - "block.infernalexp.glowdust_stone_wall": "Ограда из светопесчаника", - "block.infernalexp.trapped_glowdust_sand": "Светогравий", + "block.infernalexp.shimmer_sheet": "Светопесок", + "block.infernalexp.shimmer_sand": "Светопесок", + "block.infernalexp.shimmer_stone": "Светопесчаник", + "block.infernalexp.shimmer_stone_slab": "Плита из светопесчаника", + "block.infernalexp.shimmer_stone_vertical_slab": "Вертикальная плита из светопесчаника", + "block.infernalexp.shimmer_stone_stairs": "Ступени из светопесчаника", + "block.infernalexp.shimmer_stone_wall": "Ограда из светопесчаника", + "block.infernalexp.trapped_shimmer_sand": "Светогравий", "block.infernalexp.glow_fire": "Glow Fire", - "block.infernalexp.glowdust_stone_bricks": "Кирпичи из светопесчаника", - "block.infernalexp.glowdust_stone_brick_slab": "Кирпичная плита из светопесчаника", - "block.infernalexp.glowdust_stone_brick_vertical_slab": "Кирпичная вертикальная плита из светопесчаника", - "block.infernalexp.glowdust_stone_brick_stairs": "Кирпичные ступени из светопесчаника", - "block.infernalexp.glowdust_stone_brick_wall": "Кирпичная ограда из светопесчаника", - "block.infernalexp.cracked_glowdust_stone_bricks": "Пострескавшиеся светопесчаные кирпичи", - "block.infernalexp.chiseled_glowdust_stone_bricks": "Резные светопесчаные кирпичи", + "block.infernalexp.shimmer_stone_bricks": "Кирпичи из светопесчаника", + "block.infernalexp.shimmer_stone_brick_slab": "Кирпичная плита из светопесчаника", + "block.infernalexp.shimmer_stone_brick_vertical_slab": "Кирпичная вертикальная плита из светопесчаника", + "block.infernalexp.shimmer_stone_brick_stairs": "Кирпичные ступени из светопесчаника", + "block.infernalexp.shimmer_stone_brick_wall": "Кирпичная ограда из светопесчаника", + "block.infernalexp.cracked_shimmer_stone_bricks": "Пострескавшиеся светопесчаные кирпичи", + "block.infernalexp.chiseled_shimmer_stone_bricks": "Резные светопесчаные кирпичи", "block.infernalexp.crumbling_blackstone": "Рассыпающийся чернит", "block.infernalexp.silt": "Базальтовый ил", "block.infernalexp.rubble": "Чернитный щебень", diff --git a/src/main/resources/assets/infernalexp/lang/zh_tw.json b/src/main/resources/assets/infernalexp/lang/zh_tw.json index 7af43c429..58e847ed8 100644 --- a/src/main/resources/assets/infernalexp/lang/zh_tw.json +++ b/src/main/resources/assets/infernalexp/lang/zh_tw.json @@ -41,22 +41,22 @@ "block.infernalexp.dullstone_brick_stairs": "黯淡石磚階梯", "block.infernalexp.dullstone_brick_wall": "Dullstone Brick Wall", "block.infernalexp.luminous_wart_block": "Luminous Wart Block", - "block.infernalexp.glowdust": "螢光土", - "block.infernalexp.glowdust_sand": "螢光沙", - "block.infernalexp.glowdust_stone": "螢光岩", - "block.infernalexp.glowdust_stone_slab": "Glowdust Stone Slab", - "block.infernalexp.glowdust_stone_vertical_slab": "Shimmer Stone Vertical Slab", - "block.infernalexp.glowdust_stone_stairs": "Glowdust Stone Stairs", - "block.infernalexp.glowdust_stone_wall": "Glowdust Stone Wall", - "block.infernalexp.trapped_glowdust_sand": "Unstable Glowdust Sand", + "block.infernalexp.shimmer_sheet": "螢光土", + "block.infernalexp.shimmer_sand": "螢光沙", + "block.infernalexp.shimmer_stone": "螢光岩", + "block.infernalexp.shimmer_stone_slab": "Glowdust Stone Slab", + "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", + "block.infernalexp.shimmer_stone_stairs": "Glowdust Stone Stairs", + "block.infernalexp.shimmer_stone_wall": "Glowdust Stone Wall", + "block.infernalexp.trapped_shimmer_sand": "Unstable Glowdust Sand", "block.infernalexp.glow_fire": "Glow Fire", - "block.infernalexp.glowdust_stone_bricks": "Glowdust Stone Bricks", - "block.infernalexp.glowdust_stone_brick_slab": "Glowdust Stone Brick Slab", - "block.infernalexp.glowdust_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", - "block.infernalexp.glowdust_stone_brick_stairs": "Glowdust Stone Brick Stairs", - "block.infernalexp.glowdust_stone_brick_wall": "Glowdust Stone Brick Wall", - "block.infernalexp.cracked_glowdust_stone_bricks": "Cracked Glowdust Stone Bricks", - "block.infernalexp.chiseled_glowdust_stone_bricks": "Chiseled Glowdust Stone Brick", + "block.infernalexp.shimmer_stone_bricks": "Glowdust Stone Bricks", + "block.infernalexp.shimmer_stone_brick_slab": "Glowdust Stone Brick Slab", + "block.infernalexp.shimmer_stone_brick_vertical_slab": "Shimmer Stone Brick Vertical Slab", + "block.infernalexp.shimmer_stone_brick_stairs": "Glowdust Stone Brick Stairs", + "block.infernalexp.shimmer_stone_brick_wall": "Glowdust Stone Brick Wall", + "block.infernalexp.cracked_shimmer_stone_bricks": "Cracked Glowdust Stone Bricks", + "block.infernalexp.chiseled_shimmer_stone_bricks": "Chiseled Glowdust Stone Brick", "block.infernalexp.crumbling_blackstone": "破碎黑石", "block.infernalexp.silt": "玄武岩粉砂", "block.infernalexp.rubble": "黑石粉砂", diff --git a/src/main/resources/assets/infernalexp/models/block/charged_chiseled_soul_slate_bricks.json b/src/main/resources/assets/infernalexp/models/block/charged_chiseled_polished_soul_stone_bricks.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/charged_chiseled_soul_slate_bricks.json rename to src/main/resources/assets/infernalexp/models/block/charged_chiseled_polished_soul_stone_bricks.json diff --git a/src/main/resources/assets/infernalexp/models/block/chiseled_glowdust_sandstone.json b/src/main/resources/assets/infernalexp/models/block/chiseled_glowdust_sandstone.json deleted file mode 100644 index a99964e49..000000000 --- a/src/main/resources/assets/infernalexp/models/block/chiseled_glowdust_sandstone.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "infernalexp:block/glowdust_sandstone_top", - "side": "infernalexp:block/chiseled_glowdust_sandstone" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/chiseled_glowdust_stone_bricks.json b/src/main/resources/assets/infernalexp/models/block/chiseled_glowdust_stone_bricks.json deleted file mode 100644 index 80fd5ac4d..000000000 --- a/src/main/resources/assets/infernalexp/models/block/chiseled_glowdust_stone_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "infernalexp:block/chiseled_glowdust_stone_bricks_animated" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/chiseled_soul_slate_bricks.json b/src/main/resources/assets/infernalexp/models/block/chiseled_polished_soul_stone_bricks.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/chiseled_soul_slate_bricks.json rename to src/main/resources/assets/infernalexp/models/block/chiseled_polished_soul_stone_bricks.json diff --git a/src/main/resources/assets/infernalexp/models/block/chiseled_shimmer_sandstone.json b/src/main/resources/assets/infernalexp/models/block/chiseled_shimmer_sandstone.json new file mode 100644 index 000000000..7006a4283 --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/block/chiseled_shimmer_sandstone.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "infernalexp:block/shimmer_sandstone_top", + "side": "infernalexp:block/chiseled_shimmer_sandstone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/chiseled_shimmer_stone_bricks.json b/src/main/resources/assets/infernalexp/models/block/chiseled_shimmer_stone_bricks.json new file mode 100644 index 000000000..3b1d2bdd1 --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/block/chiseled_shimmer_stone_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "infernalexp:block/chiseled_shimmer_stone_bricks_animated" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/cracked_glowdust_stone_bricks.json b/src/main/resources/assets/infernalexp/models/block/cracked_glowdust_stone_bricks.json deleted file mode 100644 index 81b4fba41..000000000 --- a/src/main/resources/assets/infernalexp/models/block/cracked_glowdust_stone_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "infernalexp:block/cracked_glowdust_stone_bricks_animated" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/cracked_soul_slate_bricks.json b/src/main/resources/assets/infernalexp/models/block/cracked_polished_soul_stone_bricks.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/cracked_soul_slate_bricks.json rename to src/main/resources/assets/infernalexp/models/block/cracked_polished_soul_stone_bricks.json diff --git a/src/main/resources/assets/infernalexp/models/block/cracked_shimmer_stone_bricks.json b/src/main/resources/assets/infernalexp/models/block/cracked_shimmer_stone_bricks.json new file mode 100644 index 000000000..c92dbee74 --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/block/cracked_shimmer_stone_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "infernalexp:block/cracked_shimmer_stone_bricks_animated" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_sand.json b/src/main/resources/assets/infernalexp/models/block/glowdust_sand.json deleted file mode 100644 index 3e30f66f6..000000000 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_sand.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "infernalexp:block/glowdust_sand_animated" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_stone.json b/src/main/resources/assets/infernalexp/models/block/glowdust_stone.json deleted file mode 100644 index 6d09d301a..000000000 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_stone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "infernalexp:block/glowdust_stone_animated" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_slab.json b/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_slab.json deleted file mode 100644 index 8c876dd32..000000000 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "infernalexp:block/glowdust_stone_bricks_animated", - "top": "infernalexp:block/glowdust_stone_bricks_animated", - "side": "infernalexp:block/glowdust_stone_bricks_animated" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_slab_top.json b/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_slab_top.json deleted file mode 100644 index a9eee9fce..000000000 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "infernalexp:block/glowdust_stone_bricks_animated", - "top": "infernalexp:block/glowdust_stone_bricks_animated", - "side": "infernalexp:block/glowdust_stone_bricks_animated" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_stairs.json b/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_stairs.json deleted file mode 100644 index 2e8c0a5f8..000000000 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "infernalexp:block/glowdust_stone_bricks_animated", - "top": "infernalexp:block/glowdust_stone_bricks_animated", - "side": "infernalexp:block/glowdust_stone_bricks_animated" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_stairs_inner.json b/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_stairs_inner.json deleted file mode 100644 index 4b00aea44..000000000 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "infernalexp:block/glowdust_stone_bricks_animated", - "top": "infernalexp:block/glowdust_stone_bricks_animated", - "side": "infernalexp:block/glowdust_stone_bricks_animated" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_stairs_outer.json b/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_stairs_outer.json deleted file mode 100644 index 64178397f..000000000 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "infernalexp:block/glowdust_stone_bricks_animated", - "top": "infernalexp:block/glowdust_stone_bricks_animated", - "side": "infernalexp:block/glowdust_stone_bricks_animated" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_vertical_slab.json b/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_vertical_slab.json deleted file mode 100644 index 39bd7b9c5..000000000 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_vertical_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "infernalexp:block/vertical_slab", - "textures": { - "bottom": "infernalexp:block/glowdust_stone_bricks_animated", - "top": "infernalexp:block/glowdust_stone_bricks_animated", - "side": "infernalexp:block/glowdust_stone_bricks_animated" - } -} diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_bricks.json b/src/main/resources/assets/infernalexp/models/block/glowdust_stone_bricks.json deleted file mode 100644 index ff966770c..000000000 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "infernalexp:block/glowdust_stone_bricks_animated" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_slab.json b/src/main/resources/assets/infernalexp/models/block/glowdust_stone_slab.json deleted file mode 100644 index 630be45b3..000000000 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "infernalexp:block/glowdust_stone_animated", - "top": "infernalexp:block/glowdust_stone_animated", - "side": "infernalexp:block/glowdust_stone_animated" - } -} diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_slab_top.json b/src/main/resources/assets/infernalexp/models/block/glowdust_stone_slab_top.json deleted file mode 100644 index 605eeb34a..000000000 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "infernalexp:block/glowdust_stone_animated", - "top": "infernalexp:block/glowdust_stone_animated", - "side": "infernalexp:block/glowdust_stone_animated" - } -} diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_stairs.json b/src/main/resources/assets/infernalexp/models/block/glowdust_stone_stairs.json deleted file mode 100644 index 6b8d905d6..000000000 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "infernalexp:block/glowdust_stone_animated", - "top": "infernalexp:block/glowdust_stone_animated", - "side": "infernalexp:block/glowdust_stone_animated" - } -} diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_stairs_inner.json b/src/main/resources/assets/infernalexp/models/block/glowdust_stone_stairs_inner.json deleted file mode 100644 index 450a9d5c5..000000000 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "infernalexp:block/glowdust_stone_animated", - "top": "infernalexp:block/glowdust_stone_animated", - "side": "infernalexp:block/glowdust_stone_animated" - } -} diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_stairs_outer.json b/src/main/resources/assets/infernalexp/models/block/glowdust_stone_stairs_outer.json deleted file mode 100644 index b341de4d8..000000000 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "infernalexp:block/glowdust_stone_animated", - "top": "infernalexp:block/glowdust_stone_animated", - "side": "infernalexp:block/glowdust_stone_animated" - } -} diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_vertical_slab.json b/src/main/resources/assets/infernalexp/models/block/glowdust_stone_vertical_slab.json deleted file mode 100644 index 103e05530..000000000 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_vertical_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "infernalexp:block/vertical_slab", - "textures": { - "bottom": "infernalexp:block/glowdust_stone_animated", - "top": "infernalexp:block/glowdust_stone_animated", - "side": "infernalexp:block/glowdust_stone_animated" - } -} diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate.json b/src/main/resources/assets/infernalexp/models/block/polished_soul_stone.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/soul_slate.json rename to src/main/resources/assets/infernalexp/models/block/polished_soul_stone.json diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_slab.json b/src/main/resources/assets/infernalexp/models/block/polished_soul_stone_brick_slab.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/soul_slate_brick_slab.json rename to src/main/resources/assets/infernalexp/models/block/polished_soul_stone_brick_slab.json diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_slab_top.json b/src/main/resources/assets/infernalexp/models/block/polished_soul_stone_brick_slab_top.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/soul_slate_brick_slab_top.json rename to src/main/resources/assets/infernalexp/models/block/polished_soul_stone_brick_slab_top.json diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_stairs.json b/src/main/resources/assets/infernalexp/models/block/polished_soul_stone_brick_stairs.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/soul_slate_brick_stairs.json rename to src/main/resources/assets/infernalexp/models/block/polished_soul_stone_brick_stairs.json diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_stairs_inner.json b/src/main/resources/assets/infernalexp/models/block/polished_soul_stone_brick_stairs_inner.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/soul_slate_brick_stairs_inner.json rename to src/main/resources/assets/infernalexp/models/block/polished_soul_stone_brick_stairs_inner.json diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_stairs_outer.json b/src/main/resources/assets/infernalexp/models/block/polished_soul_stone_brick_stairs_outer.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/soul_slate_brick_stairs_outer.json rename to src/main/resources/assets/infernalexp/models/block/polished_soul_stone_brick_stairs_outer.json diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_vertical_slab.json b/src/main/resources/assets/infernalexp/models/block/polished_soul_stone_brick_vertical_slab.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/soul_slate_brick_vertical_slab.json rename to src/main/resources/assets/infernalexp/models/block/polished_soul_stone_brick_vertical_slab.json diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_wall_inventory.json b/src/main/resources/assets/infernalexp/models/block/polished_soul_stone_brick_wall_inventory.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/soul_slate_brick_wall_inventory.json rename to src/main/resources/assets/infernalexp/models/block/polished_soul_stone_brick_wall_inventory.json diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_wall_post.json b/src/main/resources/assets/infernalexp/models/block/polished_soul_stone_brick_wall_post.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/soul_slate_brick_wall_post.json rename to src/main/resources/assets/infernalexp/models/block/polished_soul_stone_brick_wall_post.json diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_wall_side.json b/src/main/resources/assets/infernalexp/models/block/polished_soul_stone_brick_wall_side.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/soul_slate_brick_wall_side.json rename to src/main/resources/assets/infernalexp/models/block/polished_soul_stone_brick_wall_side.json diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_brick_wall_side_tall.json b/src/main/resources/assets/infernalexp/models/block/polished_soul_stone_brick_wall_side_tall.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/soul_slate_brick_wall_side_tall.json rename to src/main/resources/assets/infernalexp/models/block/polished_soul_stone_brick_wall_side_tall.json diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_bricks.json b/src/main/resources/assets/infernalexp/models/block/polished_soul_stone_bricks.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/soul_slate_bricks.json rename to src/main/resources/assets/infernalexp/models/block/polished_soul_stone_bricks.json diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_button.json b/src/main/resources/assets/infernalexp/models/block/polished_soul_stone_button.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/soul_slate_button.json rename to src/main/resources/assets/infernalexp/models/block/polished_soul_stone_button.json diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_button_inventory.json b/src/main/resources/assets/infernalexp/models/block/polished_soul_stone_button_inventory.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/soul_slate_button_inventory.json rename to src/main/resources/assets/infernalexp/models/block/polished_soul_stone_button_inventory.json diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_button_pressed.json b/src/main/resources/assets/infernalexp/models/block/polished_soul_stone_button_pressed.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/soul_slate_button_pressed.json rename to src/main/resources/assets/infernalexp/models/block/polished_soul_stone_button_pressed.json diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_pressure_plate.json b/src/main/resources/assets/infernalexp/models/block/polished_soul_stone_pressure_plate.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/soul_slate_pressure_plate.json rename to src/main/resources/assets/infernalexp/models/block/polished_soul_stone_pressure_plate.json diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_pressure_plate_down.json b/src/main/resources/assets/infernalexp/models/block/polished_soul_stone_pressure_plate_down.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/soul_slate_pressure_plate_down.json rename to src/main/resources/assets/infernalexp/models/block/polished_soul_stone_pressure_plate_down.json diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_slab.json b/src/main/resources/assets/infernalexp/models/block/polished_soul_stone_slab.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/soul_slate_slab.json rename to src/main/resources/assets/infernalexp/models/block/polished_soul_stone_slab.json diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_slab_top.json b/src/main/resources/assets/infernalexp/models/block/polished_soul_stone_slab_top.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/soul_slate_slab_top.json rename to src/main/resources/assets/infernalexp/models/block/polished_soul_stone_slab_top.json diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_stairs.json b/src/main/resources/assets/infernalexp/models/block/polished_soul_stone_stairs.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/soul_slate_stairs.json rename to src/main/resources/assets/infernalexp/models/block/polished_soul_stone_stairs.json diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_stairs_inner.json b/src/main/resources/assets/infernalexp/models/block/polished_soul_stone_stairs_inner.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/soul_slate_stairs_inner.json rename to src/main/resources/assets/infernalexp/models/block/polished_soul_stone_stairs_inner.json diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_stairs_outer.json b/src/main/resources/assets/infernalexp/models/block/polished_soul_stone_stairs_outer.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/soul_slate_stairs_outer.json rename to src/main/resources/assets/infernalexp/models/block/polished_soul_stone_stairs_outer.json diff --git a/src/main/resources/assets/infernalexp/models/block/soul_slate_vertical_slab.json b/src/main/resources/assets/infernalexp/models/block/polished_soul_stone_vertical_slab.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/block/soul_slate_vertical_slab.json rename to src/main/resources/assets/infernalexp/models/block/polished_soul_stone_vertical_slab.json diff --git a/src/main/resources/assets/infernalexp/models/block/shimmer_sand.json b/src/main/resources/assets/infernalexp/models/block/shimmer_sand.json new file mode 100644 index 000000000..eafba1c6e --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_sand.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "infernalexp:block/shimmer_sand_animated" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_height10.json b/src/main/resources/assets/infernalexp/models/block/shimmer_sheet_height10.json similarity index 91% rename from src/main/resources/assets/infernalexp/models/block/glowdust_height10.json rename to src/main/resources/assets/infernalexp/models/block/shimmer_sheet_height10.json index 0b996646e..2e9d1c637 100644 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_height10.json +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_sheet_height10.json @@ -1,7 +1,7 @@ { "textures": { - "particle": "infernalexp:block/glowdust_sand_animated", - "texture": "infernalexp:block/glowdust_sand_animated" + "particle": "infernalexp:block/shimmer_sand_animated", + "texture": "infernalexp:block/shimmer_sand_animated" }, "elements": [ { diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_height12.json b/src/main/resources/assets/infernalexp/models/block/shimmer_sheet_height12.json similarity index 91% rename from src/main/resources/assets/infernalexp/models/block/glowdust_height12.json rename to src/main/resources/assets/infernalexp/models/block/shimmer_sheet_height12.json index 45cea5624..225fda0e9 100644 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_height12.json +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_sheet_height12.json @@ -1,7 +1,7 @@ { "textures": { - "particle": "infernalexp:block/glowdust_sand_animated", - "texture": "infernalexp:block/glowdust_sand_animated" + "particle": "infernalexp:block/shimmer_sand_animated", + "texture": "infernalexp:block/shimmer_sand_animated" }, "elements": [ { diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_height14.json b/src/main/resources/assets/infernalexp/models/block/shimmer_sheet_height14.json similarity index 91% rename from src/main/resources/assets/infernalexp/models/block/glowdust_height14.json rename to src/main/resources/assets/infernalexp/models/block/shimmer_sheet_height14.json index 05b1bb2cc..7068b8820 100644 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_height14.json +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_sheet_height14.json @@ -1,7 +1,7 @@ { "textures": { - "particle": "infernalexp:block/glowdust_sand_animated", - "texture": "infernalexp:block/glowdust_sand_animated" + "particle": "infernalexp:block/shimmer_sand_animated", + "texture": "infernalexp:block/shimmer_sand_animated" }, "elements": [ { diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_height2.json b/src/main/resources/assets/infernalexp/models/block/shimmer_sheet_height2.json similarity index 91% rename from src/main/resources/assets/infernalexp/models/block/glowdust_height2.json rename to src/main/resources/assets/infernalexp/models/block/shimmer_sheet_height2.json index ecb3108ab..8cfc2949d 100644 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_height2.json +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_sheet_height2.json @@ -1,8 +1,8 @@ { "parent": "block/thin_block", "textures": { - "particle": "infernalexp:block/glowdust_sand_animated", - "texture": "infernalexp:block/glowdust_sand_animated" + "particle": "infernalexp:block/shimmer_sand_animated", + "texture": "infernalexp:block/shimmer_sand_animated" }, "elements": [ { diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_height4.json b/src/main/resources/assets/infernalexp/models/block/shimmer_sheet_height4.json similarity index 91% rename from src/main/resources/assets/infernalexp/models/block/glowdust_height4.json rename to src/main/resources/assets/infernalexp/models/block/shimmer_sheet_height4.json index 9dcc12e9c..0a58a8980 100644 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_height4.json +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_sheet_height4.json @@ -1,7 +1,7 @@ { "textures": { - "particle": "infernalexp:block/glowdust_sand_animated", - "texture": "infernalexp:block/glowdust_sand_animated" + "particle": "infernalexp:block/shimmer_sand_animated", + "texture": "infernalexp:block/shimmer_sand_animated" }, "elements": [ { diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_height6.json b/src/main/resources/assets/infernalexp/models/block/shimmer_sheet_height6.json similarity index 91% rename from src/main/resources/assets/infernalexp/models/block/glowdust_height6.json rename to src/main/resources/assets/infernalexp/models/block/shimmer_sheet_height6.json index 2b612e218..b49016845 100644 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_height6.json +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_sheet_height6.json @@ -1,7 +1,7 @@ { "textures": { - "particle": "infernalexp:block/glowdust_sand_animated", - "texture": "infernalexp:block/glowdust_sand_animated" + "particle": "infernalexp:block/shimmer_sand_animated", + "texture": "infernalexp:block/shimmer_sand_animated" }, "elements": [ { diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_height8.json b/src/main/resources/assets/infernalexp/models/block/shimmer_sheet_height8.json similarity index 91% rename from src/main/resources/assets/infernalexp/models/block/glowdust_height8.json rename to src/main/resources/assets/infernalexp/models/block/shimmer_sheet_height8.json index d95b0c6b0..1c92bee78 100644 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_height8.json +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_sheet_height8.json @@ -1,7 +1,7 @@ { "textures": { - "particle": "infernalexp:block/glowdust_sand_animated", - "texture": "infernalexp:block/glowdust_sand_animated" + "particle": "infernalexp:block/shimmer_sand_animated", + "texture": "infernalexp:block/shimmer_sand_animated" }, "elements": [ { diff --git a/src/main/resources/assets/infernalexp/models/block/shimmer_stone.json b/src/main/resources/assets/infernalexp/models/block/shimmer_stone.json new file mode 100644 index 000000000..67d317657 --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "infernalexp:block/shimmer_stone_animated" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_slab.json b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_slab.json new file mode 100644 index 000000000..fd1f8da75 --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "infernalexp:block/shimmer_stone_bricks_animated", + "top": "infernalexp:block/shimmer_stone_bricks_animated", + "side": "infernalexp:block/shimmer_stone_bricks_animated" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_slab_top.json b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_slab_top.json new file mode 100644 index 000000000..eeeeeb85c --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "infernalexp:block/shimmer_stone_bricks_animated", + "top": "infernalexp:block/shimmer_stone_bricks_animated", + "side": "infernalexp:block/shimmer_stone_bricks_animated" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_stairs.json b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_stairs.json new file mode 100644 index 000000000..180762112 --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "infernalexp:block/shimmer_stone_bricks_animated", + "top": "infernalexp:block/shimmer_stone_bricks_animated", + "side": "infernalexp:block/shimmer_stone_bricks_animated" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_stairs_inner.json b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_stairs_inner.json new file mode 100644 index 000000000..c620f4ee1 --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "infernalexp:block/shimmer_stone_bricks_animated", + "top": "infernalexp:block/shimmer_stone_bricks_animated", + "side": "infernalexp:block/shimmer_stone_bricks_animated" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_stairs_outer.json b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_stairs_outer.json new file mode 100644 index 000000000..f95ac0f02 --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "infernalexp:block/shimmer_stone_bricks_animated", + "top": "infernalexp:block/shimmer_stone_bricks_animated", + "side": "infernalexp:block/shimmer_stone_bricks_animated" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_vertical_slab.json b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_vertical_slab.json new file mode 100644 index 000000000..a7237a749 --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_vertical_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "infernalexp:block/vertical_slab", + "textures": { + "bottom": "infernalexp:block/shimmer_stone_bricks_animated", + "top": "infernalexp:block/shimmer_stone_bricks_animated", + "side": "infernalexp:block/shimmer_stone_bricks_animated" + } +} diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_wall_inventory.json b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_wall_inventory.json similarity index 52% rename from src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_wall_inventory.json rename to src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_wall_inventory.json index f3f6fcfe1..4c7c1d540 100644 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_wall_inventory.json +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_wall_inventory.json @@ -1,6 +1,6 @@ { "parent": "block/wall_inventory", "textures": { - "wall": "infernalexp:block/glowdust_stone_bricks" + "wall": "infernalexp:block/shimmer_stone_bricks" } } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_wall_post.json b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_wall_post.json similarity index 53% rename from src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_wall_post.json rename to src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_wall_post.json index d7933bed5..033577978 100644 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_wall_post.json +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_wall_post.json @@ -1,6 +1,6 @@ { "parent": "block/template_wall_post", "textures": { - "wall": "infernalexp:block/glowdust_stone_bricks" + "wall": "infernalexp:block/shimmer_stone_bricks" } } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_wall_side.json b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_wall_side.json similarity index 53% rename from src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_wall_side.json rename to src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_wall_side.json index 5bde569de..32867f61e 100644 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_wall_side.json +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_wall_side.json @@ -1,6 +1,6 @@ { "parent": "block/template_wall_side", "textures": { - "wall": "infernalexp:block/glowdust_stone_bricks" + "wall": "infernalexp:block/shimmer_stone_bricks" } } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_wall_side_tall.json b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_wall_side_tall.json similarity index 55% rename from src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_wall_side_tall.json rename to src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_wall_side_tall.json index 044af426f..74072778c 100644 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_brick_wall_side_tall.json +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_brick_wall_side_tall.json @@ -1,6 +1,6 @@ { "parent": "block/template_wall_side_tall", "textures": { - "wall": "infernalexp:block/glowdust_stone_bricks" + "wall": "infernalexp:block/shimmer_stone_bricks" } } \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/shimmer_stone_bricks.json b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_bricks.json new file mode 100644 index 000000000..ad095967b --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "infernalexp:block/shimmer_stone_bricks_animated" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/shimmer_stone_slab.json b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_slab.json new file mode 100644 index 000000000..1a596492e --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "infernalexp:block/shimmer_stone_animated", + "top": "infernalexp:block/shimmer_stone_animated", + "side": "infernalexp:block/shimmer_stone_animated" + } +} diff --git a/src/main/resources/assets/infernalexp/models/block/shimmer_stone_slab_top.json b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_slab_top.json new file mode 100644 index 000000000..30f38951b --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "infernalexp:block/shimmer_stone_animated", + "top": "infernalexp:block/shimmer_stone_animated", + "side": "infernalexp:block/shimmer_stone_animated" + } +} diff --git a/src/main/resources/assets/infernalexp/models/block/shimmer_stone_stairs.json b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_stairs.json new file mode 100644 index 000000000..aa69f06d3 --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "infernalexp:block/shimmer_stone_animated", + "top": "infernalexp:block/shimmer_stone_animated", + "side": "infernalexp:block/shimmer_stone_animated" + } +} diff --git a/src/main/resources/assets/infernalexp/models/block/shimmer_stone_stairs_inner.json b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_stairs_inner.json new file mode 100644 index 000000000..d9b113727 --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "infernalexp:block/shimmer_stone_animated", + "top": "infernalexp:block/shimmer_stone_animated", + "side": "infernalexp:block/shimmer_stone_animated" + } +} diff --git a/src/main/resources/assets/infernalexp/models/block/shimmer_stone_stairs_outer.json b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_stairs_outer.json new file mode 100644 index 000000000..fa06cc17b --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "infernalexp:block/shimmer_stone_animated", + "top": "infernalexp:block/shimmer_stone_animated", + "side": "infernalexp:block/shimmer_stone_animated" + } +} diff --git a/src/main/resources/assets/infernalexp/models/block/shimmer_stone_vertical_slab.json b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_vertical_slab.json new file mode 100644 index 000000000..ac82c059e --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_vertical_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "infernalexp:block/vertical_slab", + "textures": { + "bottom": "infernalexp:block/shimmer_stone_animated", + "top": "infernalexp:block/shimmer_stone_animated", + "side": "infernalexp:block/shimmer_stone_animated" + } +} diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_wall_inventory.json b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_wall_inventory.json similarity index 51% rename from src/main/resources/assets/infernalexp/models/block/glowdust_stone_wall_inventory.json rename to src/main/resources/assets/infernalexp/models/block/shimmer_stone_wall_inventory.json index eea8f5bad..a15ec9dfe 100644 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_wall_inventory.json +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_wall_inventory.json @@ -1,6 +1,6 @@ { "parent": "block/wall_inventory", "textures": { - "wall": "infernalexp:block/glowdust_stone_animated" + "wall": "infernalexp:block/shimmer_stone_animated" } } diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_wall_post.json b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_wall_post.json similarity index 53% rename from src/main/resources/assets/infernalexp/models/block/glowdust_stone_wall_post.json rename to src/main/resources/assets/infernalexp/models/block/shimmer_stone_wall_post.json index 5db71ecdd..70df1e6d9 100644 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_wall_post.json +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_wall_post.json @@ -1,6 +1,6 @@ { "parent": "block/template_wall_post", "textures": { - "wall": "infernalexp:block/glowdust_stone_animated" + "wall": "infernalexp:block/shimmer_stone_animated" } } diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_wall_side.json b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_wall_side.json similarity index 53% rename from src/main/resources/assets/infernalexp/models/block/glowdust_stone_wall_side.json rename to src/main/resources/assets/infernalexp/models/block/shimmer_stone_wall_side.json index 0b2126a9c..426f4767a 100644 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_wall_side.json +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_wall_side.json @@ -1,6 +1,6 @@ { "parent": "block/template_wall_side", "textures": { - "wall": "infernalexp:block/glowdust_stone_animated" + "wall": "infernalexp:block/shimmer_stone_animated" } } diff --git a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_wall_side_tall.json b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_wall_side_tall.json similarity index 55% rename from src/main/resources/assets/infernalexp/models/block/glowdust_stone_wall_side_tall.json rename to src/main/resources/assets/infernalexp/models/block/shimmer_stone_wall_side_tall.json index 88ed1a484..a67ebc2e6 100644 --- a/src/main/resources/assets/infernalexp/models/block/glowdust_stone_wall_side_tall.json +++ b/src/main/resources/assets/infernalexp/models/block/shimmer_stone_wall_side_tall.json @@ -1,6 +1,6 @@ { "parent": "block/template_wall_side_tall", "textures": { - "wall": "infernalexp:block/glowdust_stone_animated" + "wall": "infernalexp:block/shimmer_stone_animated" } } diff --git a/src/main/resources/assets/infernalexp/models/block/trapped_glowdust_sand.json b/src/main/resources/assets/infernalexp/models/block/trapped_glowdust_sand.json deleted file mode 100644 index 787aa3484..000000000 --- a/src/main/resources/assets/infernalexp/models/block/trapped_glowdust_sand.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "infernalexp:block/trapped_glowdust_sand_animated" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/trapped_shimmer_sand.json b/src/main/resources/assets/infernalexp/models/block/trapped_shimmer_sand.json new file mode 100644 index 000000000..903113a7d --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/block/trapped_shimmer_sand.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "infernalexp:block/trapped_shimmer_sand_animated" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/charged_chiseled_soul_slate_bricks.json b/src/main/resources/assets/infernalexp/models/item/charged_chiseled_polished_soul_stone_bricks.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/item/charged_chiseled_soul_slate_bricks.json rename to src/main/resources/assets/infernalexp/models/item/charged_chiseled_polished_soul_stone_bricks.json diff --git a/src/main/resources/assets/infernalexp/models/item/chiseled_glowdust_stone_bricks.json b/src/main/resources/assets/infernalexp/models/item/chiseled_glowdust_stone_bricks.json deleted file mode 100644 index b586407f1..000000000 --- a/src/main/resources/assets/infernalexp/models/item/chiseled_glowdust_stone_bricks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "infernalexp:block/chiseled_glowdust_stone_bricks" -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/chiseled_soul_slate_bricks.json b/src/main/resources/assets/infernalexp/models/item/chiseled_polished_soul_stone_bricks.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/item/chiseled_soul_slate_bricks.json rename to src/main/resources/assets/infernalexp/models/item/chiseled_polished_soul_stone_bricks.json diff --git a/src/main/resources/assets/infernalexp/models/item/chiseled_shimmer_stone_bricks.json b/src/main/resources/assets/infernalexp/models/item/chiseled_shimmer_stone_bricks.json new file mode 100644 index 000000000..22e28606a --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/item/chiseled_shimmer_stone_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "infernalexp:block/chiseled_shimmer_stone_bricks" +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/cracked_glowdust_stone_bricks.json b/src/main/resources/assets/infernalexp/models/item/cracked_glowdust_stone_bricks.json deleted file mode 100644 index ace3d8ba8..000000000 --- a/src/main/resources/assets/infernalexp/models/item/cracked_glowdust_stone_bricks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "infernalexp:block/cracked_glowdust_stone_bricks" -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/cracked_soul_slate_bricks.json b/src/main/resources/assets/infernalexp/models/item/cracked_polished_soul_stone_bricks.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/item/cracked_soul_slate_bricks.json rename to src/main/resources/assets/infernalexp/models/item/cracked_polished_soul_stone_bricks.json diff --git a/src/main/resources/assets/infernalexp/models/item/cracked_shimmer_stone_bricks.json b/src/main/resources/assets/infernalexp/models/item/cracked_shimmer_stone_bricks.json new file mode 100644 index 000000000..c33302cea --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/item/cracked_shimmer_stone_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "infernalexp:block/cracked_shimmer_stone_bricks" +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/cut_glowdust_sandstone.json b/src/main/resources/assets/infernalexp/models/item/cut_glowdust_sandstone.json deleted file mode 100644 index 896c50f30..000000000 --- a/src/main/resources/assets/infernalexp/models/item/cut_glowdust_sandstone.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "infernalexp:block/cut_glowdust_sandstone" -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/cut_glowdust_sandstone_slab.json b/src/main/resources/assets/infernalexp/models/item/cut_glowdust_sandstone_slab.json deleted file mode 100644 index 9d6a60adf..000000000 --- a/src/main/resources/assets/infernalexp/models/item/cut_glowdust_sandstone_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "infernalexp:block/cut_glowdust_sandstone_slab" -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/cut_glowdust_sandstone_vertical_slab.json b/src/main/resources/assets/infernalexp/models/item/cut_glowdust_sandstone_vertical_slab.json deleted file mode 100644 index 52337e568..000000000 --- a/src/main/resources/assets/infernalexp/models/item/cut_glowdust_sandstone_vertical_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "infernalexp:block/cut_glowdust_sandstone_vertical_slab" -} diff --git a/src/main/resources/assets/infernalexp/models/item/cut_shimmer_sandstone.json b/src/main/resources/assets/infernalexp/models/item/cut_shimmer_sandstone.json new file mode 100644 index 000000000..72e45342d --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/item/cut_shimmer_sandstone.json @@ -0,0 +1,3 @@ +{ + "parent": "infernalexp:block/cut_shimmer_sandstone" +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/cut_shimmer_sandstone_slab.json b/src/main/resources/assets/infernalexp/models/item/cut_shimmer_sandstone_slab.json new file mode 100644 index 000000000..3b6cce04a --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/item/cut_shimmer_sandstone_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "infernalexp:block/cut_shimmer_sandstone_slab" +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/cut_shimmer_sandstone_vertical_slab.json b/src/main/resources/assets/infernalexp/models/item/cut_shimmer_sandstone_vertical_slab.json new file mode 100644 index 000000000..3158e3d2a --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/item/cut_shimmer_sandstone_vertical_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "infernalexp:block/cut_shimmer_sandstone_vertical_slab" +} diff --git a/src/main/resources/assets/infernalexp/models/item/glowdust.json b/src/main/resources/assets/infernalexp/models/item/glowdust.json deleted file mode 100644 index 44b14dc2d..000000000 --- a/src/main/resources/assets/infernalexp/models/item/glowdust.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "infernalexp:block/glowdust_height2" -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/glowdust_sand.json b/src/main/resources/assets/infernalexp/models/item/glowdust_sand.json deleted file mode 100644 index 609f10295..000000000 --- a/src/main/resources/assets/infernalexp/models/item/glowdust_sand.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "infernalexp:block/glowdust_sand" -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/glowdust_stone.json b/src/main/resources/assets/infernalexp/models/item/glowdust_stone.json deleted file mode 100644 index dea71e689..000000000 --- a/src/main/resources/assets/infernalexp/models/item/glowdust_stone.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "infernalexp:block/glowdust_stone" -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/glowdust_stone_brick_slab.json b/src/main/resources/assets/infernalexp/models/item/glowdust_stone_brick_slab.json deleted file mode 100644 index a261d64eb..000000000 --- a/src/main/resources/assets/infernalexp/models/item/glowdust_stone_brick_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "infernalexp:block/glowdust_stone_brick_slab" -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/glowdust_stone_brick_stairs.json b/src/main/resources/assets/infernalexp/models/item/glowdust_stone_brick_stairs.json deleted file mode 100644 index 1c25b63ef..000000000 --- a/src/main/resources/assets/infernalexp/models/item/glowdust_stone_brick_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "infernalexp:block/glowdust_stone_brick_stairs" -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/glowdust_stone_brick_vertical_slab.json b/src/main/resources/assets/infernalexp/models/item/glowdust_stone_brick_vertical_slab.json deleted file mode 100644 index 552c5e247..000000000 --- a/src/main/resources/assets/infernalexp/models/item/glowdust_stone_brick_vertical_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "infernalexp:block/glowdust_stone_brick_vertical_slab" -} diff --git a/src/main/resources/assets/infernalexp/models/item/glowdust_stone_brick_wall.json b/src/main/resources/assets/infernalexp/models/item/glowdust_stone_brick_wall.json deleted file mode 100644 index e040cba63..000000000 --- a/src/main/resources/assets/infernalexp/models/item/glowdust_stone_brick_wall.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "infernalexp:block/glowdust_stone_brick_wall_inventory" -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/glowdust_stone_bricks.json b/src/main/resources/assets/infernalexp/models/item/glowdust_stone_bricks.json deleted file mode 100644 index 8c36c107a..000000000 --- a/src/main/resources/assets/infernalexp/models/item/glowdust_stone_bricks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "infernalexp:block/glowdust_stone_bricks" -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/glowdust_stone_slab.json b/src/main/resources/assets/infernalexp/models/item/glowdust_stone_slab.json deleted file mode 100644 index 8d38aecc4..000000000 --- a/src/main/resources/assets/infernalexp/models/item/glowdust_stone_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "infernalexp:block/glowdust_stone_slab" -} diff --git a/src/main/resources/assets/infernalexp/models/item/glowdust_stone_stairs.json b/src/main/resources/assets/infernalexp/models/item/glowdust_stone_stairs.json deleted file mode 100644 index a329b8957..000000000 --- a/src/main/resources/assets/infernalexp/models/item/glowdust_stone_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "infernalexp:block/glowdust_stone_stairs" -} diff --git a/src/main/resources/assets/infernalexp/models/item/glowdust_stone_vertical_slab.json b/src/main/resources/assets/infernalexp/models/item/glowdust_stone_vertical_slab.json deleted file mode 100644 index 8e0e22990..000000000 --- a/src/main/resources/assets/infernalexp/models/item/glowdust_stone_vertical_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "infernalexp:block/glowdust_stone_vertical_slab" -} diff --git a/src/main/resources/assets/infernalexp/models/item/glowdust_stone_wall.json b/src/main/resources/assets/infernalexp/models/item/glowdust_stone_wall.json deleted file mode 100644 index 1da9655a0..000000000 --- a/src/main/resources/assets/infernalexp/models/item/glowdust_stone_wall.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "infernalexp:block/glowdust_stone_wall_inventory" -} diff --git a/src/main/resources/assets/infernalexp/models/item/soul_slate.json b/src/main/resources/assets/infernalexp/models/item/polished_soul_stone.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/item/soul_slate.json rename to src/main/resources/assets/infernalexp/models/item/polished_soul_stone.json diff --git a/src/main/resources/assets/infernalexp/models/item/soul_slate_brick_slab.json b/src/main/resources/assets/infernalexp/models/item/polished_soul_stone_brick_slab.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/item/soul_slate_brick_slab.json rename to src/main/resources/assets/infernalexp/models/item/polished_soul_stone_brick_slab.json diff --git a/src/main/resources/assets/infernalexp/models/item/soul_slate_brick_stairs.json b/src/main/resources/assets/infernalexp/models/item/polished_soul_stone_brick_stairs.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/item/soul_slate_brick_stairs.json rename to src/main/resources/assets/infernalexp/models/item/polished_soul_stone_brick_stairs.json diff --git a/src/main/resources/assets/infernalexp/models/item/soul_slate_brick_vertical_slab.json b/src/main/resources/assets/infernalexp/models/item/polished_soul_stone_brick_vertical_slab.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/item/soul_slate_brick_vertical_slab.json rename to src/main/resources/assets/infernalexp/models/item/polished_soul_stone_brick_vertical_slab.json diff --git a/src/main/resources/assets/infernalexp/models/item/soul_slate_brick_wall.json b/src/main/resources/assets/infernalexp/models/item/polished_soul_stone_brick_wall.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/item/soul_slate_brick_wall.json rename to src/main/resources/assets/infernalexp/models/item/polished_soul_stone_brick_wall.json diff --git a/src/main/resources/assets/infernalexp/models/item/soul_slate_bricks.json b/src/main/resources/assets/infernalexp/models/item/polished_soul_stone_bricks.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/item/soul_slate_bricks.json rename to src/main/resources/assets/infernalexp/models/item/polished_soul_stone_bricks.json diff --git a/src/main/resources/assets/infernalexp/models/item/soul_slate_button.json b/src/main/resources/assets/infernalexp/models/item/polished_soul_stone_button.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/item/soul_slate_button.json rename to src/main/resources/assets/infernalexp/models/item/polished_soul_stone_button.json diff --git a/src/main/resources/assets/infernalexp/models/item/soul_slate_pressure_plate.json b/src/main/resources/assets/infernalexp/models/item/polished_soul_stone_pressure_plate.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/item/soul_slate_pressure_plate.json rename to src/main/resources/assets/infernalexp/models/item/polished_soul_stone_pressure_plate.json diff --git a/src/main/resources/assets/infernalexp/models/item/soul_slate_slab.json b/src/main/resources/assets/infernalexp/models/item/polished_soul_stone_slab.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/item/soul_slate_slab.json rename to src/main/resources/assets/infernalexp/models/item/polished_soul_stone_slab.json diff --git a/src/main/resources/assets/infernalexp/models/item/soul_slate_stairs.json b/src/main/resources/assets/infernalexp/models/item/polished_soul_stone_stairs.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/item/soul_slate_stairs.json rename to src/main/resources/assets/infernalexp/models/item/polished_soul_stone_stairs.json diff --git a/src/main/resources/assets/infernalexp/models/item/soul_slate_vertical_slab.json b/src/main/resources/assets/infernalexp/models/item/polished_soul_stone_vertical_slab.json similarity index 100% rename from src/main/resources/assets/infernalexp/models/item/soul_slate_vertical_slab.json rename to src/main/resources/assets/infernalexp/models/item/polished_soul_stone_vertical_slab.json diff --git a/src/main/resources/assets/infernalexp/models/item/shimmer_sand.json b/src/main/resources/assets/infernalexp/models/item/shimmer_sand.json new file mode 100644 index 000000000..133c78996 --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/item/shimmer_sand.json @@ -0,0 +1,3 @@ +{ + "parent": "infernalexp:block/shimmer_sand" +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/shimmer_sheet.json b/src/main/resources/assets/infernalexp/models/item/shimmer_sheet.json new file mode 100644 index 000000000..7e8c3d9ba --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/item/shimmer_sheet.json @@ -0,0 +1,3 @@ +{ + "parent": "infernalexp:block/shimmer_sheet_height2" +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/shimmer_stone.json b/src/main/resources/assets/infernalexp/models/item/shimmer_stone.json new file mode 100644 index 000000000..c64c13918 --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/item/shimmer_stone.json @@ -0,0 +1,3 @@ +{ + "parent": "infernalexp:block/shimmer_stone" +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/shimmer_stone_brick_slab.json b/src/main/resources/assets/infernalexp/models/item/shimmer_stone_brick_slab.json new file mode 100644 index 000000000..2332545a1 --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/item/shimmer_stone_brick_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "infernalexp:block/shimmer_stone_brick_slab" +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/shimmer_stone_brick_stairs.json b/src/main/resources/assets/infernalexp/models/item/shimmer_stone_brick_stairs.json new file mode 100644 index 000000000..eb81ea287 --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/item/shimmer_stone_brick_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "infernalexp:block/shimmer_stone_brick_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/shimmer_stone_brick_vertical_slab.json b/src/main/resources/assets/infernalexp/models/item/shimmer_stone_brick_vertical_slab.json new file mode 100644 index 000000000..0a8e5e4fe --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/item/shimmer_stone_brick_vertical_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "infernalexp:block/shimmer_stone_brick_vertical_slab" +} diff --git a/src/main/resources/assets/infernalexp/models/item/shimmer_stone_brick_wall.json b/src/main/resources/assets/infernalexp/models/item/shimmer_stone_brick_wall.json new file mode 100644 index 000000000..37f0dd0fa --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/item/shimmer_stone_brick_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "infernalexp:block/shimmer_stone_brick_wall_inventory" +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/shimmer_stone_bricks.json b/src/main/resources/assets/infernalexp/models/item/shimmer_stone_bricks.json new file mode 100644 index 000000000..3d18c67cd --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/item/shimmer_stone_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "infernalexp:block/shimmer_stone_bricks" +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/shimmer_stone_slab.json b/src/main/resources/assets/infernalexp/models/item/shimmer_stone_slab.json new file mode 100644 index 000000000..e18dcd738 --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/item/shimmer_stone_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "infernalexp:block/shimmer_stone_slab" +} diff --git a/src/main/resources/assets/infernalexp/models/item/shimmer_stone_stairs.json b/src/main/resources/assets/infernalexp/models/item/shimmer_stone_stairs.json new file mode 100644 index 000000000..701bd1e66 --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/item/shimmer_stone_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "infernalexp:block/shimmer_stone_stairs" +} diff --git a/src/main/resources/assets/infernalexp/models/item/shimmer_stone_vertical_slab.json b/src/main/resources/assets/infernalexp/models/item/shimmer_stone_vertical_slab.json new file mode 100644 index 000000000..fb712be0b --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/item/shimmer_stone_vertical_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "infernalexp:block/shimmer_stone_vertical_slab" +} diff --git a/src/main/resources/assets/infernalexp/models/item/shimmer_stone_wall.json b/src/main/resources/assets/infernalexp/models/item/shimmer_stone_wall.json new file mode 100644 index 000000000..e76718c73 --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/item/shimmer_stone_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "infernalexp:block/shimmer_stone_wall_inventory" +} diff --git a/src/main/resources/assets/infernalexp/models/item/trapped_glowdust_sand.json b/src/main/resources/assets/infernalexp/models/item/trapped_glowdust_sand.json deleted file mode 100644 index 8c36f73da..000000000 --- a/src/main/resources/assets/infernalexp/models/item/trapped_glowdust_sand.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "infernalexp:block/trapped_glowdust_sand" -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/trapped_shimmer_sand.json b/src/main/resources/assets/infernalexp/models/item/trapped_shimmer_sand.json new file mode 100644 index 000000000..1fd37bbe8 --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/item/trapped_shimmer_sand.json @@ -0,0 +1,3 @@ +{ + "parent": "infernalexp:block/trapped_shimmer_sand" +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/textures/block/charged_chiseled_soul_slate_bricks.png b/src/main/resources/assets/infernalexp/textures/block/charged_chiseled_polished_soul_stone_bricks.png similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/charged_chiseled_soul_slate_bricks.png rename to src/main/resources/assets/infernalexp/textures/block/charged_chiseled_polished_soul_stone_bricks.png diff --git a/src/main/resources/assets/infernalexp/textures/block/charged_chiseled_soul_slate_bricks_anim.png b/src/main/resources/assets/infernalexp/textures/block/charged_chiseled_polished_soul_stone_bricks_anim.png similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/charged_chiseled_soul_slate_bricks_anim.png rename to src/main/resources/assets/infernalexp/textures/block/charged_chiseled_polished_soul_stone_bricks_anim.png diff --git a/src/main/resources/assets/infernalexp/textures/block/charged_chiseled_soul_slate_bricks_anim.png.mcmeta b/src/main/resources/assets/infernalexp/textures/block/charged_chiseled_polished_soul_stone_bricks_anim.png.mcmeta similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/charged_chiseled_soul_slate_bricks_anim.png.mcmeta rename to src/main/resources/assets/infernalexp/textures/block/charged_chiseled_polished_soul_stone_bricks_anim.png.mcmeta diff --git a/src/main/resources/assets/infernalexp/textures/block/charged_chiseled_soul_slate_bricks_top.png b/src/main/resources/assets/infernalexp/textures/block/charged_chiseled_polished_soul_stone_bricks_top.png similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/charged_chiseled_soul_slate_bricks_top.png rename to src/main/resources/assets/infernalexp/textures/block/charged_chiseled_polished_soul_stone_bricks_top.png diff --git a/src/main/resources/assets/infernalexp/textures/block/chiseled_soul_slate_bricks.png b/src/main/resources/assets/infernalexp/textures/block/chiseled_polished_soul_stone_bricks.png similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/chiseled_soul_slate_bricks.png rename to src/main/resources/assets/infernalexp/textures/block/chiseled_polished_soul_stone_bricks.png diff --git a/src/main/resources/assets/infernalexp/textures/block/chiseled_soul_slate_bricks_top.png b/src/main/resources/assets/infernalexp/textures/block/chiseled_polished_soul_stone_bricks_top.png similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/chiseled_soul_slate_bricks_top.png rename to src/main/resources/assets/infernalexp/textures/block/chiseled_polished_soul_stone_bricks_top.png diff --git a/src/main/resources/assets/infernalexp/textures/block/chiseled_glowdust_stone_bricks_animated.png b/src/main/resources/assets/infernalexp/textures/block/chiseled_shimmer_stone_bricks_animated.png similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/chiseled_glowdust_stone_bricks_animated.png rename to src/main/resources/assets/infernalexp/textures/block/chiseled_shimmer_stone_bricks_animated.png diff --git a/src/main/resources/assets/infernalexp/textures/block/chiseled_glowdust_stone_bricks_animated.png.mcmeta b/src/main/resources/assets/infernalexp/textures/block/chiseled_shimmer_stone_bricks_animated.png.mcmeta similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/chiseled_glowdust_stone_bricks_animated.png.mcmeta rename to src/main/resources/assets/infernalexp/textures/block/chiseled_shimmer_stone_bricks_animated.png.mcmeta diff --git a/src/main/resources/assets/infernalexp/textures/block/cracked_soul_slate_bricks.png b/src/main/resources/assets/infernalexp/textures/block/cracked_polished_soul_stone_bricks.png similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/cracked_soul_slate_bricks.png rename to src/main/resources/assets/infernalexp/textures/block/cracked_polished_soul_stone_bricks.png diff --git a/src/main/resources/assets/infernalexp/textures/block/cracked_glowdust_stone_bricks_animated.png b/src/main/resources/assets/infernalexp/textures/block/cracked_shimmer_stone_bricks_animated.png similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/cracked_glowdust_stone_bricks_animated.png rename to src/main/resources/assets/infernalexp/textures/block/cracked_shimmer_stone_bricks_animated.png diff --git a/src/main/resources/assets/infernalexp/textures/block/cracked_glowdust_stone_bricks_animated.png.mcmeta b/src/main/resources/assets/infernalexp/textures/block/cracked_shimmer_stone_bricks_animated.png.mcmeta similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/cracked_glowdust_stone_bricks_animated.png.mcmeta rename to src/main/resources/assets/infernalexp/textures/block/cracked_shimmer_stone_bricks_animated.png.mcmeta diff --git a/src/main/resources/assets/infernalexp/textures/block/cut_glowdust_sandstone.png b/src/main/resources/assets/infernalexp/textures/block/cut_shimmer_sandstone.png similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/cut_glowdust_sandstone.png rename to src/main/resources/assets/infernalexp/textures/block/cut_shimmer_sandstone.png diff --git a/src/main/resources/assets/infernalexp/textures/block/soul_slate.png b/src/main/resources/assets/infernalexp/textures/block/polished_soul_stone.png similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/soul_slate.png rename to src/main/resources/assets/infernalexp/textures/block/polished_soul_stone.png diff --git a/src/main/resources/assets/infernalexp/textures/block/soul_slate_bricks.png b/src/main/resources/assets/infernalexp/textures/block/polished_soul_stone_bricks.png similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/soul_slate_bricks.png rename to src/main/resources/assets/infernalexp/textures/block/polished_soul_stone_bricks.png diff --git a/src/main/resources/assets/infernalexp/textures/block/soul_slate_lit.png b/src/main/resources/assets/infernalexp/textures/block/polished_soul_stone_lit.png similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/soul_slate_lit.png rename to src/main/resources/assets/infernalexp/textures/block/polished_soul_stone_lit.png diff --git a/src/main/resources/assets/infernalexp/textures/block/glowdust_sand.png b/src/main/resources/assets/infernalexp/textures/block/shimmer_sand.png similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/glowdust_sand.png rename to src/main/resources/assets/infernalexp/textures/block/shimmer_sand.png diff --git a/src/main/resources/assets/infernalexp/textures/block/glowdust_sand_animated.png b/src/main/resources/assets/infernalexp/textures/block/shimmer_sand_animated.png similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/glowdust_sand_animated.png rename to src/main/resources/assets/infernalexp/textures/block/shimmer_sand_animated.png diff --git a/src/main/resources/assets/infernalexp/textures/block/glowdust_sand_animated.png.mcmeta b/src/main/resources/assets/infernalexp/textures/block/shimmer_sand_animated.png.mcmeta similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/glowdust_sand_animated.png.mcmeta rename to src/main/resources/assets/infernalexp/textures/block/shimmer_sand_animated.png.mcmeta diff --git a/src/main/resources/assets/infernalexp/textures/block/glowdust_stone.png b/src/main/resources/assets/infernalexp/textures/block/shimmer_stone.png similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/glowdust_stone.png rename to src/main/resources/assets/infernalexp/textures/block/shimmer_stone.png diff --git a/src/main/resources/assets/infernalexp/textures/block/glowdust_stone_animated.png b/src/main/resources/assets/infernalexp/textures/block/shimmer_stone_animated.png similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/glowdust_stone_animated.png rename to src/main/resources/assets/infernalexp/textures/block/shimmer_stone_animated.png diff --git a/src/main/resources/assets/infernalexp/textures/block/glowdust_stone_animated.png.mcmeta b/src/main/resources/assets/infernalexp/textures/block/shimmer_stone_animated.png.mcmeta similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/glowdust_stone_animated.png.mcmeta rename to src/main/resources/assets/infernalexp/textures/block/shimmer_stone_animated.png.mcmeta diff --git a/src/main/resources/assets/infernalexp/textures/block/glowdust_stone_bricks.png b/src/main/resources/assets/infernalexp/textures/block/shimmer_stone_bricks.png similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/glowdust_stone_bricks.png rename to src/main/resources/assets/infernalexp/textures/block/shimmer_stone_bricks.png diff --git a/src/main/resources/assets/infernalexp/textures/block/glowdust_stone_bricks_animated.png b/src/main/resources/assets/infernalexp/textures/block/shimmer_stone_bricks_animated.png similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/glowdust_stone_bricks_animated.png rename to src/main/resources/assets/infernalexp/textures/block/shimmer_stone_bricks_animated.png diff --git a/src/main/resources/assets/infernalexp/textures/block/glowdust_stone_bricks_animated.png.mcmeta b/src/main/resources/assets/infernalexp/textures/block/shimmer_stone_bricks_animated.png.mcmeta similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/glowdust_stone_bricks_animated.png.mcmeta rename to src/main/resources/assets/infernalexp/textures/block/shimmer_stone_bricks_animated.png.mcmeta diff --git a/src/main/resources/assets/infernalexp/textures/block/trapped_glowdust_sand.png b/src/main/resources/assets/infernalexp/textures/block/trapped_shimmer_sand.png similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/trapped_glowdust_sand.png rename to src/main/resources/assets/infernalexp/textures/block/trapped_shimmer_sand.png diff --git a/src/main/resources/assets/infernalexp/textures/block/trapped_glowdust_sand_animated.png b/src/main/resources/assets/infernalexp/textures/block/trapped_shimmer_sand_animated.png similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/trapped_glowdust_sand_animated.png rename to src/main/resources/assets/infernalexp/textures/block/trapped_shimmer_sand_animated.png diff --git a/src/main/resources/assets/infernalexp/textures/block/trapped_glowdust_sand_animated.png.mcmeta b/src/main/resources/assets/infernalexp/textures/block/trapped_shimmer_sand_animated.png.mcmeta similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/trapped_glowdust_sand_animated.png.mcmeta rename to src/main/resources/assets/infernalexp/textures/block/trapped_shimmer_sand_animated.png.mcmeta diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/chiseled_glowdust_stone_bricks.json b/src/main/resources/data/infernalexp/loot_tables/blocks/chiseled_glowdust_stone_bricks.json deleted file mode 100644 index f000192ff..000000000 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/chiseled_glowdust_stone_bricks.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "infernalexp:chiseled_glowdust_stone_bricks" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/cracked_glowdust_stone_bricks.json b/src/main/resources/data/infernalexp/loot_tables/blocks/chiseled_shimmer_stone_bricks.json similarity index 81% rename from src/main/resources/data/infernalexp/loot_tables/blocks/cracked_glowdust_stone_bricks.json rename to src/main/resources/data/infernalexp/loot_tables/blocks/chiseled_shimmer_stone_bricks.json index aae3512c0..1607e1dcb 100644 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/cracked_glowdust_stone_bricks.json +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/chiseled_shimmer_stone_bricks.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "infernalexp:cracked_glowdust_stone_bricks" + "name": "infernalexp:chiseled_shimmer_stone_bricks" } ], "conditions": [ diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/cracked_shimmer_stone_bricks.json b/src/main/resources/data/infernalexp/loot_tables/blocks/cracked_shimmer_stone_bricks.json new file mode 100644 index 000000000..adde7fdd7 --- /dev/null +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/cracked_shimmer_stone_bricks.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "infernalexp:cracked_shimmer_stone_bricks" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_brick_vertical_slab.json b/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_brick_vertical_slab.json deleted file mode 100644 index 164ae2a29..000000000 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_brick_vertical_slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "infernalexp:glowdust_stone_brick_vertical_slab" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_sand.json b/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_sand.json similarity index 96% rename from src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_sand.json rename to src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_sand.json index 774447828..c39b4b69b 100644 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_sand.json +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_sand.json @@ -24,7 +24,7 @@ } } ], - "name": "infernalexp:glowdust_sand" + "name": "infernalexp:shimmer_sand" }, { "type": "minecraft:item", diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust.json b/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_sheet.json similarity index 89% rename from src/main/resources/data/infernalexp/loot_tables/blocks/glowdust.json rename to src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_sheet.json index 40a393f5a..18a1fcae9 100644 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust.json +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_sheet.json @@ -33,7 +33,7 @@ "conditions": [ { "condition": "minecraft:block_state_property", - "block": "infernalexp:glowdust", + "block": "infernalexp:shimmer_sheet", "properties": { "layers": "1" } @@ -56,7 +56,7 @@ "conditions": [ { "condition": "minecraft:block_state_property", - "block": "infernalexp:glowdust", + "block": "infernalexp:shimmer_sheet", "properties": { "layers": "2" } @@ -79,7 +79,7 @@ "conditions": [ { "condition": "minecraft:block_state_property", - "block": "infernalexp:glowdust", + "block": "infernalexp:shimmer_sheet", "properties": { "layers": "3" } @@ -102,7 +102,7 @@ "conditions": [ { "condition": "minecraft:block_state_property", - "block": "infernalexp:glowdust", + "block": "infernalexp:shimmer_sheet", "properties": { "layers": "4" } @@ -125,7 +125,7 @@ "conditions": [ { "condition": "minecraft:block_state_property", - "block": "infernalexp:glowdust", + "block": "infernalexp:shimmer_sheet", "properties": { "layers": "5" } @@ -148,7 +148,7 @@ "conditions": [ { "condition": "minecraft:block_state_property", - "block": "infernalexp:glowdust", + "block": "infernalexp:shimmer_sheet", "properties": { "layers": "6" } @@ -171,7 +171,7 @@ "conditions": [ { "condition": "minecraft:block_state_property", - "block": "infernalexp:glowdust", + "block": "infernalexp:shimmer_sheet", "properties": { "layers": "7" } @@ -213,20 +213,20 @@ "conditions": [ { "condition": "minecraft:block_state_property", - "block": "infernalexp:glowdust", + "block": "infernalexp:shimmer_sheet", "properties": { "layers": "1" } } ], - "name": "infernalexp:glowdust" + "name": "infernalexp:shimmer_sheet" }, { "type": "minecraft:item", "conditions": [ { "condition": "minecraft:block_state_property", - "block": "infernalexp:glowdust", + "block": "infernalexp:shimmer_sheet", "properties": { "layers": "2" } @@ -238,14 +238,14 @@ "count": 2 } ], - "name": "infernalexp:glowdust" + "name": "infernalexp:shimmer_sheet" }, { "type": "minecraft:item", "conditions": [ { "condition": "minecraft:block_state_property", - "block": "infernalexp:glowdust", + "block": "infernalexp:shimmer_sheet", "properties": { "layers": "3" } @@ -257,14 +257,14 @@ "count": 3 } ], - "name": "infernalexp:glowdust" + "name": "infernalexp:shimmer_sheet" }, { "type": "minecraft:item", "conditions": [ { "condition": "minecraft:block_state_property", - "block": "infernalexp:glowdust", + "block": "infernalexp:shimmer_sheet", "properties": { "layers": "4" } @@ -276,14 +276,14 @@ "count": 4 } ], - "name": "infernalexp:glowdust" + "name": "infernalexp:shimmer_sheet" }, { "type": "minecraft:item", "conditions": [ { "condition": "minecraft:block_state_property", - "block": "infernalexp:glowdust", + "block": "infernalexp:shimmer_sheet", "properties": { "layers": "5" } @@ -295,14 +295,14 @@ "count": 5 } ], - "name": "infernalexp:glowdust" + "name": "infernalexp:shimmer_sheet" }, { "type": "minecraft:item", "conditions": [ { "condition": "minecraft:block_state_property", - "block": "infernalexp:glowdust", + "block": "infernalexp:shimmer_sheet", "properties": { "layers": "6" } @@ -314,14 +314,14 @@ "count": 6 } ], - "name": "infernalexp:glowdust" + "name": "infernalexp:shimmer_sheet" }, { "type": "minecraft:item", "conditions": [ { "condition": "minecraft:block_state_property", - "block": "infernalexp:glowdust", + "block": "infernalexp:shimmer_sheet", "properties": { "layers": "7" } @@ -333,11 +333,11 @@ "count": 7 } ], - "name": "infernalexp:glowdust" + "name": "infernalexp:shimmer_sheet" }, { "type": "minecraft:item", - "name": "infernalexp:glowdust_sand" + "name": "infernalexp:shimmer_sand" } ] } diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone.json b/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone.json similarity index 85% rename from src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone.json rename to src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone.json index 44748fef5..a8eac37bd 100644 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone.json +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "infernalexp:glowdust_stone" + "name": "infernalexp:shimmer_stone" } ], "conditions": [ diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_brick_slab.json b/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_brick_slab.json similarity index 82% rename from src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_brick_slab.json rename to src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_brick_slab.json index 06318e3ed..ea19ddbb4 100644 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_brick_slab.json +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_brick_slab.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "infernalexp:glowdust_stone_brick_slab" + "name": "infernalexp:shimmer_stone_brick_slab" } ], "conditions": [ diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_brick_stairs.json b/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_brick_stairs.json similarity index 81% rename from src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_brick_stairs.json rename to src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_brick_stairs.json index cc6f67245..3ae66a15d 100644 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_brick_stairs.json +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_brick_stairs.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "infernalexp:glowdust_stone_brick_stairs" + "name": "infernalexp:shimmer_stone_brick_stairs" } ], "conditions": [ diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_vertical_slab.json b/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_brick_vertical_slab.json similarity index 80% rename from src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_vertical_slab.json rename to src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_brick_vertical_slab.json index 3477d3b46..f8461d01a 100644 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_vertical_slab.json +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_brick_vertical_slab.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "infernalexp:glowdust_stone_vertical_slab" + "name": "infernalexp:shimmer_stone_brick_vertical_slab" } ], "conditions": [ diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_brick_wall.json b/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_brick_wall.json similarity index 82% rename from src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_brick_wall.json rename to src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_brick_wall.json index 4fc52555d..f68ac9487 100644 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_brick_wall.json +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_brick_wall.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "infernalexp:glowdust_stone_brick_wall" + "name": "infernalexp:shimmer_stone_brick_wall" } ], "conditions": [ diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_bricks.json b/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_bricks.json similarity index 83% rename from src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_bricks.json rename to src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_bricks.json index 9bbfc9438..2c4dfde9c 100644 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_bricks.json +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_bricks.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "infernalexp:glowdust_stone_bricks" + "name": "infernalexp:shimmer_stone_bricks" } ], "conditions": [ diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_wall.json b/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_slab.json similarity index 83% rename from src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_wall.json rename to src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_slab.json index 827b91240..5cdad1e39 100644 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_wall.json +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_slab.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "infernalexp:glowdust_stone_wall" + "name": "infernalexp:shimmer_stone_slab" } ], "conditions": [ diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_stairs.json b/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_stairs.json similarity index 83% rename from src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_stairs.json rename to src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_stairs.json index 74b432f60..79714a3fb 100644 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_stairs.json +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_stairs.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "infernalexp:glowdust_stone_stairs" + "name": "infernalexp:shimmer_stone_stairs" } ], "conditions": [ diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_vertical_slab.json b/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_vertical_slab.json new file mode 100644 index 000000000..90fa7a3d2 --- /dev/null +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_vertical_slab.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "infernalexp:shimmer_stone_vertical_slab" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_slab.json b/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_wall.json similarity index 83% rename from src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_slab.json rename to src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_wall.json index 07f3cd9d1..27bb07d8f 100644 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/glowdust_stone_slab.json +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/shimmer_stone_wall.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "infernalexp:glowdust_stone_slab" + "name": "infernalexp:shimmer_stone_wall" } ], "conditions": [ diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/chiseled_glowdust_stone_bricks.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/chiseled_glowdust_stone_bricks.json index 123e65293..9343ccfc9 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/chiseled_glowdust_stone_bricks.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/chiseled_glowdust_stone_bricks.json @@ -6,11 +6,11 @@ ], "key": { "x": { - "item": "infernalexp:glowdust_stone_brick_slab" + "item": "infernalexp:shimmer_stone_brick_slab" } }, "result": { - "item": "infernalexp:chiseled_glowdust_stone_bricks", + "item": "infernalexp:chiseled_shimmer_stone_bricks", "count": 1 } } diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust.json index 5b6e44f5d..26662cd15 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "infernalexp:glowdust_sand", + "item": "infernalexp:shimmer_sand", "count": 4 } } diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone.json index 4d4b227e2..2708933ce 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone.json @@ -7,11 +7,11 @@ ], "key": { "x": { - "item": "infernalexp:glowdust_sand" + "item": "infernalexp:shimmer_sand" } }, "result": { - "item": "infernalexp:glowdust_stone", + "item": "infernalexp:shimmer_stone", "count": 4 } } diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_brick_slab.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_brick_slab.json index 3321bb227..8237a87e0 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_brick_slab.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_brick_slab.json @@ -5,11 +5,11 @@ ], "key": { "x": { - "item": "infernalexp:glowdust_stone_bricks" + "item": "infernalexp:shimmer_stone_bricks" } }, "result": { - "item": "infernalexp:glowdust_stone_brick_slab", + "item": "infernalexp:shimmer_stone_brick_slab", "count": 6 } } diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_brick_stairs.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_brick_stairs.json index 8ed2899d8..0e623ce4b 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_brick_stairs.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_brick_stairs.json @@ -7,11 +7,11 @@ ], "key": { "x": { - "item": "infernalexp:glowdust_stone_bricks" + "item": "infernalexp:shimmer_stone_bricks" } }, "result": { - "item": "infernalexp:glowdust_stone_brick_stairs", + "item": "infernalexp:shimmer_stone_brick_stairs", "count": 4 } } diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_brick_vertical_slab.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_brick_vertical_slab.json index 20f5200f5..89788ad90 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_brick_vertical_slab.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_brick_vertical_slab.json @@ -7,11 +7,11 @@ ], "key": { "#": { - "item": "infernalexp:glowdust_stone_brick_slab" + "item": "infernalexp:shimmer_stone_brick_slab" } }, "result": { - "item": "infernalexp:glowdust_stone_brick_vertical_slab", + "item": "infernalexp:shimmer_stone_brick_vertical_slab", "count": 3 }, "conditions": [ diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_brick_wall.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_brick_wall.json index 0ed8fe017..11e2e4a46 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_brick_wall.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_brick_wall.json @@ -6,11 +6,11 @@ ], "key": { "x": { - "item": "infernalexp:glowdust_stone_bricks" + "item": "infernalexp:shimmer_stone_bricks" } }, "result": { - "item": "infernalexp:glowdust_stone_brick_wall", + "item": "infernalexp:shimmer_stone_brick_wall", "count": 6 } } diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_bricks.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_bricks.json index 41bbc23b1..f12d13936 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_bricks.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_bricks.json @@ -6,11 +6,11 @@ ], "key": { "x": { - "item": "infernalexp:glowdust_stone" + "item": "infernalexp:shimmer_stone" } }, "result": { - "item": "infernalexp:glowdust_stone_bricks", + "item": "infernalexp:shimmer_stone_bricks", "count": 4 } } diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_slab.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_slab.json index 57fa725e9..9cf1c0d53 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_slab.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_slab.json @@ -5,11 +5,11 @@ ], "key": { "x": { - "item": "infernalexp:glowdust_stone" + "item": "infernalexp:shimmer_stone" } }, "result": { - "item": "infernalexp:glowdust_stone_slab", + "item": "infernalexp:shimmer_stone_slab", "count": 6 } } diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_stairs.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_stairs.json index 493c18f60..a4d394260 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_stairs.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_stairs.json @@ -7,11 +7,11 @@ ], "key": { "x": { - "item": "infernalexp:glowdust_stone" + "item": "infernalexp:shimmer_stone" } }, "result": { - "item": "infernalexp:glowdust_stone_stairs", + "item": "infernalexp:shimmer_stone_stairs", "count": 4 } } diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_vertical_slab.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_vertical_slab.json index 37496e878..f0d246b86 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_vertical_slab.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_vertical_slab.json @@ -7,11 +7,11 @@ ], "key": { "#": { - "item": "infernalexp:glowdust_stone_slab" + "item": "infernalexp:shimmer_stone_slab" } }, "result": { - "item": "infernalexp:glowdust_stone_vertical_slab", + "item": "infernalexp:shimmer_stone_vertical_slab", "count": 3 }, "conditions": [ diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_wall.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_wall.json index c3921044c..3f9375cb3 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_wall.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_wall.json @@ -6,11 +6,11 @@ ], "key": { "x": { - "item": "infernalexp:glowdust_stone" + "item": "infernalexp:shimmer_stone" } }, "result": { - "item": "infernalexp:glowdust_stone_wall", + "item": "infernalexp:shimmer_stone_wall", "count": 6 } } diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/trapped_glowdust_sand.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/trapped_glowdust_sand.json index 5c14ad0f6..4a3d85714 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/trapped_glowdust_sand.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/trapped_glowdust_sand.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "infernalexp:trapped_glowdust_sand", + "item": "infernalexp:trapped_shimmer_sand", "count": 1 } } diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/glowdust_stone_brick_slab.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/glowdust_stone_brick_slab.json deleted file mode 100644 index 1deabc726..000000000 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/glowdust_stone_brick_slab.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "infernalexp:glowdust_stone_brick_vertical_slab" - } - ], - "result": { - "item": "infernalexp:glowdust_stone_brick_slab" - } -} diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/glowdust_stone_slab.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/glowdust_stone_slab.json deleted file mode 100644 index 31b822d16..000000000 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/glowdust_stone_slab.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "infernalexp:glowdust_stone_vertical_slab" - } - ], - "result": { - "item": "infernalexp:glowdust_stone_slab" - } -} diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/shimmer_stone_brick_slab.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/shimmer_stone_brick_slab.json new file mode 100644 index 000000000..8bbb589b9 --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/shimmer_stone_brick_slab.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "infernalexp:shimmer_stone_brick_vertical_slab" + } + ], + "result": { + "item": "infernalexp:shimmer_stone_brick_slab" + } +} diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/shimmer_stone_slab.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/shimmer_stone_slab.json new file mode 100644 index 000000000..2edc4e07e --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/shimmer_stone_slab.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "infernalexp:shimmer_stone_vertical_slab" + } + ], + "result": { + "item": "infernalexp:shimmer_stone_slab" + } +} diff --git a/src/main/resources/data/infernalexp/recipes/smelting/cracked_glowdust_stone_bricks.json b/src/main/resources/data/infernalexp/recipes/smelting/cracked_glowdust_stone_bricks.json deleted file mode 100644 index 8052bb554..000000000 --- a/src/main/resources/data/infernalexp/recipes/smelting/cracked_glowdust_stone_bricks.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "item": "infernalexp:glowdust_stone_bricks" - }, - "result": "infernalexp:cracked_glowdust_stone_bricks", - "experience": 0.1, - "cookingtime": 200 -} diff --git a/src/main/resources/data/infernalexp/recipes/smelting/cracked_shimmer_stone_bricks.json b/src/main/resources/data/infernalexp/recipes/smelting/cracked_shimmer_stone_bricks.json new file mode 100644 index 000000000..713ee9f8e --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/smelting/cracked_shimmer_stone_bricks.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "infernalexp:shimmer_stone_bricks" + }, + "result": "infernalexp:cracked_shimmer_stone_bricks", + "experience": 0.1, + "cookingtime": 200 +} diff --git a/src/main/resources/data/infernalexp/recipes/smelting/glow_glass.json b/src/main/resources/data/infernalexp/recipes/smelting/glow_glass.json index 8d40cb675..2b3a59d01 100644 --- a/src/main/resources/data/infernalexp/recipes/smelting/glow_glass.json +++ b/src/main/resources/data/infernalexp/recipes/smelting/glow_glass.json @@ -1,7 +1,7 @@ { "type": "minecraft:smelting", "ingredient": { - "item": "infernalexp:glowdust_sand" + "item": "infernalexp:shimmer_sand" }, "result": "infernalexp:glow_glass", "experience": 0.1, diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_glowdust_stone_bricks.json b/src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_glowdust_stone_bricks.json deleted file mode 100644 index ed5cb415e..000000000 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_glowdust_stone_bricks.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "infernalexp:glowdust_stone_bricks" - }, - "result": "infernalexp:chiseled_glowdust_stone_bricks", - "count": 1 -} \ No newline at end of file diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_shimmer_stone_bricks.json b/src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_shimmer_stone_bricks.json new file mode 100644 index 000000000..1a5a3a2c3 --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/chiseled_shimmer_stone_bricks.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "infernalexp:shimmer_stone_bricks" + }, + "result": "infernalexp:chiseled_shimmer_stone_bricks", + "count": 1 +} \ No newline at end of file diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_brick_slab.json b/src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_brick_slab.json deleted file mode 100644 index a47c56128..000000000 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_brick_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "infernalexp:glowdust_stone_bricks" - }, - "result": "infernalexp:glowdust_stone_brick_slab", - "count": 2 -} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_brick_stairs.json b/src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_brick_stairs.json deleted file mode 100644 index 1e683a737..000000000 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_brick_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "infernalexp:glowdust_stone_bricks" - }, - "result": "infernalexp:glowdust_stone_brick_stairs", - "count": 1 -} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_brick_wall.json b/src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_brick_wall.json deleted file mode 100644 index e1b31fdff..000000000 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_brick_wall.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "infernalexp:glowdust_stone_bricks" - }, - "result": "infernalexp:glowdust_stone_brick_wall", - "count": 1 -} \ No newline at end of file diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_slab.json b/src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_slab.json deleted file mode 100644 index 8dcac2571..000000000 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "infernalexp:glowdust_stone" - }, - "result": "infernalexp:glowdust_stone_slab", - "count": 2 -} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_stairs.json b/src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_stairs.json deleted file mode 100644 index 4ddbe6ef9..000000000 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "infernalexp:glowdust_stone" - }, - "result": "infernalexp:glowdust_stone_stairs", - "count": 1 -} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_wall.json b/src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_wall.json deleted file mode 100644 index 6f649dc92..000000000 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_wall.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "infernalexp:glowdust_stone" - }, - "result": "infernalexp:glowdust_stone_wall", - "count": 1 -} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_brick_slab.json b/src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_brick_slab.json new file mode 100644 index 000000000..5a77604e9 --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_brick_slab.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "infernalexp:shimmer_stone_bricks" + }, + "result": "infernalexp:shimmer_stone_brick_slab", + "count": 2 +} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_brick_stairs.json b/src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_brick_stairs.json new file mode 100644 index 000000000..28c68119c --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "infernalexp:shimmer_stone_bricks" + }, + "result": "infernalexp:shimmer_stone_brick_stairs", + "count": 1 +} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_brick_vertical_slab.json b/src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_brick_vertical_slab.json similarity index 62% rename from src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_brick_vertical_slab.json rename to src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_brick_vertical_slab.json index 2240663b1..62c187f65 100644 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_brick_vertical_slab.json +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_brick_vertical_slab.json @@ -1,9 +1,9 @@ { "type": "minecraft:stonecutting", "ingredient": { - "item": "infernalexp:glowdust_stone_bricks" + "item": "infernalexp:shimmer_stone_bricks" }, - "result": "infernalexp:glowdust_stone_brick_vertical_slab", + "result": "infernalexp:shimmer_stone_brick_vertical_slab", "count": 2, "conditions": [ { diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_brick_wall.json b/src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_brick_wall.json new file mode 100644 index 000000000..9fd348a05 --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_brick_wall.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "infernalexp:shimmer_stone_bricks" + }, + "result": "infernalexp:shimmer_stone_brick_wall", + "count": 1 +} \ No newline at end of file diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_slab.json b/src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_slab.json new file mode 100644 index 000000000..6986241d2 --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_slab.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "infernalexp:shimmer_stone" + }, + "result": "infernalexp:shimmer_stone_slab", + "count": 2 +} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_stairs.json b/src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_stairs.json new file mode 100644 index 000000000..7a1b6b608 --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_stairs.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "infernalexp:shimmer_stone" + }, + "result": "infernalexp:shimmer_stone_stairs", + "count": 1 +} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_vertical_slab.json b/src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_vertical_slab.json similarity index 65% rename from src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_vertical_slab.json rename to src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_vertical_slab.json index d5e98cc76..6306c8594 100644 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/glowdust_stone_vertical_slab.json +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_vertical_slab.json @@ -1,9 +1,9 @@ { "type": "minecraft:stonecutting", "ingredient": { - "item": "infernalexp:glowdust_stone" + "item": "infernalexp:shimmer_stone" }, - "result": "infernalexp:glowdust_stone_vertical_slab", + "result": "infernalexp:shimmer_stone_vertical_slab", "count": 2, "conditions": [ { diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_wall.json b/src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_wall.json new file mode 100644 index 000000000..94486598c --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/shimmer_stone_wall.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "infernalexp:shimmer_stone" + }, + "result": "infernalexp:shimmer_stone_wall", + "count": 1 +} diff --git a/src/main/resources/data/infernalexp/tags/blocks/buried_bone_base_blocks.json b/src/main/resources/data/infernalexp/tags/blocks/buried_bone_base_blocks.json index e8a0204d6..694d6ddbd 100644 --- a/src/main/resources/data/infernalexp/tags/blocks/buried_bone_base_blocks.json +++ b/src/main/resources/data/infernalexp/tags/blocks/buried_bone_base_blocks.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "infernalexp:glowdust_sand", + "infernalexp:shimmer_sand", "infernalexp:crimson_fungus_cap", "infernalexp:warped_fungus_cap", "infernalexp:luminous_fungus_cap", diff --git a/src/main/resources/data/infernalexp/tags/blocks/dullthorns_ground.json b/src/main/resources/data/infernalexp/tags/blocks/dullthorns_ground.json index b8ef20b07..f00d940d4 100644 --- a/src/main/resources/data/infernalexp/tags/blocks/dullthorns_ground.json +++ b/src/main/resources/data/infernalexp/tags/blocks/dullthorns_ground.json @@ -4,7 +4,7 @@ "infernalexp:dimstone", "infernalexp:dullstone", "infernalexp:dullthorns", - "infernalexp:glowdust_sand", + "infernalexp:shimmer_sand", "minecraft:coarse_dirt", "minecraft:crimson_nylium", "minecraft:dirt", diff --git a/src/main/resources/data/infernalexp/tags/blocks/glow_fire_base_blocks.json b/src/main/resources/data/infernalexp/tags/blocks/glow_fire_base_blocks.json index be2d1f6bd..b625bdd0b 100644 --- a/src/main/resources/data/infernalexp/tags/blocks/glow_fire_base_blocks.json +++ b/src/main/resources/data/infernalexp/tags/blocks/glow_fire_base_blocks.json @@ -1,12 +1,12 @@ { "replace": false, "values": [ - "infernalexp:glowdust_sand", + "infernalexp:shimmer_sand", "infernalexp:luminous_wart_block", - "infernalexp:glowdust_stone", - "infernalexp:glowdust_stone_bricks", - "infernalexp:glowdust_stone_brick_slab", - "infernalexp:glowdust_stone_brick_stairs", - "infernalexp:trapped_glowdust_sand" + "infernalexp:shimmer_stone", + "infernalexp:shimmer_stone_bricks", + "infernalexp:shimmer_stone_brick_slab", + "infernalexp:shimmer_stone_brick_stairs", + "infernalexp:trapped_shimmer_sand" ] } diff --git a/src/main/resources/data/infernalexp/tags/blocks/planted_quartz_base_blocks.json b/src/main/resources/data/infernalexp/tags/blocks/planted_quartz_base_blocks.json index b2bbbe151..e9680d453 100644 --- a/src/main/resources/data/infernalexp/tags/blocks/planted_quartz_base_blocks.json +++ b/src/main/resources/data/infernalexp/tags/blocks/planted_quartz_base_blocks.json @@ -43,7 +43,7 @@ "minecraft:green_terracotta", "minecraft:red_terracotta", "minecraft:black_terracotta", - "infernalexp:glowdust_sand", + "infernalexp:shimmer_sand", "#forge:end_stones", "#forge:cobblestone", "#forge:sandstone", diff --git a/src/main/resources/data/infernalexp/tags/items/glowstone_canyon_blocks.json b/src/main/resources/data/infernalexp/tags/items/glowstone_canyon_blocks.json index 9b0a25c0e..6fb31da88 100644 --- a/src/main/resources/data/infernalexp/tags/items/glowstone_canyon_blocks.json +++ b/src/main/resources/data/infernalexp/tags/items/glowstone_canyon_blocks.json @@ -36,19 +36,19 @@ "infernalexp:dullstone_brick_stairs", "infernalexp:dullstone_brick_wall", "infernalexp:luminous_wart_block", - "infernalexp:glowdust", - "infernalexp:glowdust_sand", - "infernalexp:glowdust_stone", - "infernalexp:glowdust_stone_slab", - "infernalexp:glowdust_stone_stairs", - "infernalexp:glowdust_stone_wall", - "infernalexp:trapped_glowdust_sand", - "infernalexp:glowdust_stone_bricks", - "infernalexp:glowdust_stone_brick_slab", - "infernalexp:glowdust_stone_brick_stairs", - "infernalexp:glowdust_stone_brick_wall", - "infernalexp:cracked_glowdust_stone_bricks", - "infernalexp:chiseled_glowdust_stone_bricks", + "infernalexp:shimmer_sheet", + "infernalexp:shimmer_sand", + "infernalexp:shimmer_stone", + "infernalexp:shimmer_stone_slab", + "infernalexp:shimmer_stone_stairs", + "infernalexp:shimmer_stone_wall", + "infernalexp:trapped_shimmer_sand", + "infernalexp:shimmer_stone_bricks", + "infernalexp:shimmer_stone_brick_slab", + "infernalexp:shimmer_stone_brick_stairs", + "infernalexp:shimmer_stone_brick_wall", + "infernalexp:cracked_shimmer_stone_bricks", + "infernalexp:chiseled_shimmer_stone_bricks", "infernalexp:crumbling_blackstone", "infernalexp:dullthorns_block" ] diff --git a/src/main/resources/data/minecraft/tags/blocks/slabs.json b/src/main/resources/data/minecraft/tags/blocks/slabs.json index 66c5dd871..899272f4d 100644 --- a/src/main/resources/data/minecraft/tags/blocks/slabs.json +++ b/src/main/resources/data/minecraft/tags/blocks/slabs.json @@ -7,8 +7,8 @@ "infernalexp:glowstone_brick_slab", "infernalexp:dimstone_brick_slab", "infernalexp:dullstone_brick_slab", - "infernalexp:glowdust_stone_slab", - "infernalexp:glowdust_stone_brick_slab", + "infernalexp:shimmer_stone_slab", + "infernalexp:shimmer_stone_brick_slab", "infernalexp:basalt_cobbled_slab", "infernalexp:basalt_slab", "infernalexp:polished_basalt_slab", diff --git a/src/main/resources/data/minecraft/tags/blocks/stairs.json b/src/main/resources/data/minecraft/tags/blocks/stairs.json index f3bd25a3e..754a13970 100644 --- a/src/main/resources/data/minecraft/tags/blocks/stairs.json +++ b/src/main/resources/data/minecraft/tags/blocks/stairs.json @@ -7,8 +7,8 @@ "infernalexp:glowstone_brick_stairs", "infernalexp:dimstone_brick_stairs", "infernalexp:dullstone_brick_stairs", - "infernalexp:glowdust_stone_stairs", - "infernalexp:glowdust_stone_brick_stairs", + "infernalexp:shimmer_stone_stairs", + "infernalexp:shimmer_stone_brick_stairs", "infernalexp:basalt_stairs", "infernalexp:basalt_brick_stairs", "infernalexp:soul_sand_stairs", diff --git a/src/main/resources/data/minecraft/tags/blocks/walls.json b/src/main/resources/data/minecraft/tags/blocks/walls.json index 2255a8c1c..e8ef8f46e 100644 --- a/src/main/resources/data/minecraft/tags/blocks/walls.json +++ b/src/main/resources/data/minecraft/tags/blocks/walls.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "infernalexp:glowdust_stone_wall", - "infernalexp:glowdust_stone_brick_wall", + "infernalexp:shimmer_stone_wall", + "infernalexp:shimmer_stone_brick_wall", "infernalexp:glowstone_brick_wall", "infernalexp:dimstone_brick_wall", "infernalexp:dullstone_brick_wall", diff --git a/src/main/resources/data/minecraft/tags/items/slabs.json b/src/main/resources/data/minecraft/tags/items/slabs.json index 66c5dd871..899272f4d 100644 --- a/src/main/resources/data/minecraft/tags/items/slabs.json +++ b/src/main/resources/data/minecraft/tags/items/slabs.json @@ -7,8 +7,8 @@ "infernalexp:glowstone_brick_slab", "infernalexp:dimstone_brick_slab", "infernalexp:dullstone_brick_slab", - "infernalexp:glowdust_stone_slab", - "infernalexp:glowdust_stone_brick_slab", + "infernalexp:shimmer_stone_slab", + "infernalexp:shimmer_stone_brick_slab", "infernalexp:basalt_cobbled_slab", "infernalexp:basalt_slab", "infernalexp:polished_basalt_slab", diff --git a/src/main/resources/data/minecraft/tags/items/stairs.json b/src/main/resources/data/minecraft/tags/items/stairs.json index f3bd25a3e..754a13970 100644 --- a/src/main/resources/data/minecraft/tags/items/stairs.json +++ b/src/main/resources/data/minecraft/tags/items/stairs.json @@ -7,8 +7,8 @@ "infernalexp:glowstone_brick_stairs", "infernalexp:dimstone_brick_stairs", "infernalexp:dullstone_brick_stairs", - "infernalexp:glowdust_stone_stairs", - "infernalexp:glowdust_stone_brick_stairs", + "infernalexp:shimmer_stone_stairs", + "infernalexp:shimmer_stone_brick_stairs", "infernalexp:basalt_stairs", "infernalexp:basalt_brick_stairs", "infernalexp:soul_sand_stairs", diff --git a/src/main/resources/data/minecraft/tags/items/walls.json b/src/main/resources/data/minecraft/tags/items/walls.json index 2255a8c1c..e8ef8f46e 100644 --- a/src/main/resources/data/minecraft/tags/items/walls.json +++ b/src/main/resources/data/minecraft/tags/items/walls.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "infernalexp:glowdust_stone_wall", - "infernalexp:glowdust_stone_brick_wall", + "infernalexp:shimmer_stone_wall", + "infernalexp:shimmer_stone_brick_wall", "infernalexp:glowstone_brick_wall", "infernalexp:dimstone_brick_wall", "infernalexp:dullstone_brick_wall", diff --git a/src/main/resources/data/quark/tags/blocks/vertical_slab.json b/src/main/resources/data/quark/tags/blocks/vertical_slab.json index 4f9c3d53d..e7c82a9dc 100644 --- a/src/main/resources/data/quark/tags/blocks/vertical_slab.json +++ b/src/main/resources/data/quark/tags/blocks/vertical_slab.json @@ -7,8 +7,8 @@ "infernalexp:glowstone_brick_vertical_slab", "infernalexp:dimstone_brick_vertical_slab", "infernalexp:dullstone_brick_vertical_slab", - "infernalexp:glowdust_stone_vertical_slab", - "infernalexp:glowdust_stone_brick_vertical_slab", + "infernalexp:shimmer_stone_vertical_slab", + "infernalexp:shimmer_stone_brick_vertical_slab", "infernalexp:basalt_cobbled_vertical_slab", "infernalexp:basalt_vertical_slab", "infernalexp:polished_basalt_vertical_slab", diff --git a/src/main/resources/data/quark/tags/items/vertical_slab.json b/src/main/resources/data/quark/tags/items/vertical_slab.json index 4f9c3d53d..e7c82a9dc 100644 --- a/src/main/resources/data/quark/tags/items/vertical_slab.json +++ b/src/main/resources/data/quark/tags/items/vertical_slab.json @@ -7,8 +7,8 @@ "infernalexp:glowstone_brick_vertical_slab", "infernalexp:dimstone_brick_vertical_slab", "infernalexp:dullstone_brick_vertical_slab", - "infernalexp:glowdust_stone_vertical_slab", - "infernalexp:glowdust_stone_brick_vertical_slab", + "infernalexp:shimmer_stone_vertical_slab", + "infernalexp:shimmer_stone_brick_vertical_slab", "infernalexp:basalt_cobbled_vertical_slab", "infernalexp:basalt_vertical_slab", "infernalexp:polished_basalt_vertical_slab", From a3bcd06ad119081d34ea2f42df9cc91f067b4633 Mon Sep 17 00:00:00 2001 From: Neko Date: Thu, 14 Jul 2022 04:00:22 +0100 Subject: [PATCH 3/5] Added missing crafting recipe refactors --- ...wdust_stone_bricks.json => chiseled_shimmer_stone_bricks.json} | 0 .../crafting_shaped/{glowdust.json => shimmer_sheet.json} | 0 .../crafting_shaped/{glowdust_stone.json => shimmer_stone.json} | 0 ...owdust_stone_brick_slab.json => shimmer_stone_brick_slab.json} | 0 ...st_stone_brick_stairs.json => shimmer_stone_brick_stairs.json} | 0 ..._vertical_slab.json => shimmer_stone_brick_vertical_slab.json} | 0 ...owdust_stone_brick_wall.json => shimmer_stone_brick_wall.json} | 0 .../{glowdust_stone_bricks.json => shimmer_stone_bricks.json} | 0 .../{glowdust_stone_slab.json => shimmer_stone_slab.json} | 0 .../{glowdust_stone_stairs.json => shimmer_stone_stairs.json} | 0 ..._stone_vertical_slab.json => shimmer_stone_vertical_slab.json} | 0 .../{glowdust_stone_wall.json => shimmer_stone_wall.json} | 0 .../{trapped_glowdust_sand.json => trapped_shimmer_sand.json} | 0 13 files changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{chiseled_glowdust_stone_bricks.json => chiseled_shimmer_stone_bricks.json} (100%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{glowdust.json => shimmer_sheet.json} (100%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{glowdust_stone.json => shimmer_stone.json} (100%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{glowdust_stone_brick_slab.json => shimmer_stone_brick_slab.json} (100%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{glowdust_stone_brick_stairs.json => shimmer_stone_brick_stairs.json} (100%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{glowdust_stone_brick_vertical_slab.json => shimmer_stone_brick_vertical_slab.json} (100%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{glowdust_stone_brick_wall.json => shimmer_stone_brick_wall.json} (100%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{glowdust_stone_bricks.json => shimmer_stone_bricks.json} (100%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{glowdust_stone_slab.json => shimmer_stone_slab.json} (100%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{glowdust_stone_stairs.json => shimmer_stone_stairs.json} (100%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{glowdust_stone_vertical_slab.json => shimmer_stone_vertical_slab.json} (100%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{glowdust_stone_wall.json => shimmer_stone_wall.json} (100%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{trapped_glowdust_sand.json => trapped_shimmer_sand.json} (100%) diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/chiseled_glowdust_stone_bricks.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/chiseled_shimmer_stone_bricks.json similarity index 100% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/chiseled_glowdust_stone_bricks.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/chiseled_shimmer_stone_bricks.json diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/shimmer_sheet.json similarity index 100% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/shimmer_sheet.json diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/shimmer_stone.json similarity index 100% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/shimmer_stone.json diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_brick_slab.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/shimmer_stone_brick_slab.json similarity index 100% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_brick_slab.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/shimmer_stone_brick_slab.json diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_brick_stairs.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/shimmer_stone_brick_stairs.json similarity index 100% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_brick_stairs.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/shimmer_stone_brick_stairs.json diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_brick_vertical_slab.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/shimmer_stone_brick_vertical_slab.json similarity index 100% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_brick_vertical_slab.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/shimmer_stone_brick_vertical_slab.json diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_brick_wall.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/shimmer_stone_brick_wall.json similarity index 100% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_brick_wall.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/shimmer_stone_brick_wall.json diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_bricks.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/shimmer_stone_bricks.json similarity index 100% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_bricks.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/shimmer_stone_bricks.json diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_slab.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/shimmer_stone_slab.json similarity index 100% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_slab.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/shimmer_stone_slab.json diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_stairs.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/shimmer_stone_stairs.json similarity index 100% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_stairs.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/shimmer_stone_stairs.json diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_vertical_slab.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/shimmer_stone_vertical_slab.json similarity index 100% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_vertical_slab.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/shimmer_stone_vertical_slab.json diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_wall.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/shimmer_stone_wall.json similarity index 100% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glowdust_stone_wall.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/shimmer_stone_wall.json diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/trapped_glowdust_sand.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/trapped_shimmer_sand.json similarity index 100% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/trapped_glowdust_sand.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/trapped_shimmer_sand.json From 2911520ea3082ac43fcb447d7d06bbfbe0176ef2 Mon Sep 17 00:00:00 2001 From: Neko Date: Thu, 14 Jul 2022 04:14:37 +0100 Subject: [PATCH 4/5] Basalt Cobbled -> Cobbled Basalt --- .../infernalexp/init/IEBlocks.java | 6 +++--- .../infernalexp/blockstates/basalt_cobbled.json | 16 ---------------- .../blockstates/basalt_cobbled_slab.json | 13 ------------- .../infernalexp/blockstates/cobbled_basalt.json | 16 ++++++++++++++++ .../blockstates/cobbled_basalt_slab.json | 13 +++++++++++++ ...b.json => cobbled_basalt_vertical_slab.json} | 10 +++++----- .../assets/infernalexp/lang/de_de.json | 6 +++--- .../assets/infernalexp/lang/en_us.json | 6 +++--- .../assets/infernalexp/lang/es_ar.json | 6 +++--- .../assets/infernalexp/lang/fr_ca.json | 6 +++--- .../assets/infernalexp/lang/fr_fr.json | 6 +++--- .../assets/infernalexp/lang/lol_us.json | 6 +++--- .../assets/infernalexp/lang/lv_lv.json | 6 +++--- .../assets/infernalexp/lang/pt_br.json | 6 +++--- .../assets/infernalexp/lang/ro_ro.json | 6 +++--- .../models/block/basalt_cobbled.json | 7 ------- .../models/block/basalt_cobbled_slab.json | 8 -------- .../models/block/basalt_cobbled_slab_top.json | 8 -------- .../block/basalt_cobbled_vertical_slab.json | 8 -------- .../models/block/cobbled_basalt.json | 7 +++++++ .../models/block/cobbled_basalt_slab.json | 8 ++++++++ .../models/block/cobbled_basalt_slab_top.json | 8 ++++++++ .../block/cobbled_basalt_vertical_slab.json | 8 ++++++++ .../infernalexp/models/item/basalt_cobbled.json | 3 --- .../models/item/basalt_cobbled_slab.json | 3 --- .../item/basalt_cobbled_vertical_slab.json | 3 --- .../infernalexp/models/item/cobbled_basalt.json | 3 +++ .../models/item/cobbled_basalt_slab.json | 3 +++ .../item/cobbled_basalt_vertical_slab.json | 3 +++ .../{basalt_cobbled.png => cobbled_basalt.png} | Bin ...{basalt_cobbled.json => cobbled_basalt.json} | 2 +- ...bbled_slab.json => cobbled_basalt_slab.json} | 2 +- ...bbled_slab.json => cobbled_basalt_slab.json} | 4 ++-- ...b.json => cobbled_basalt_vertical_slab.json} | 4 ++-- .../crafting_shapeless/basalt_cobbled_slab.json | 11 ----------- .../crafting_shapeless/cobbled_basalt_slab.json | 11 +++++++++++ ...{basalt_cobbled.json => cobbled_basalt.json} | 2 +- .../stonecutting/basalt_cobbled_slab.json | 8 -------- .../recipes/stonecutting/cobbled_basalt.json | 8 ++++++++ .../stonecutting/cobbled_basalt_slab.json | 8 ++++++++ ...l.json => cobbled_basalt_slab_vertical.json} | 4 ++-- 41 files changed, 140 insertions(+), 132 deletions(-) delete mode 100644 src/main/resources/assets/infernalexp/blockstates/basalt_cobbled.json delete mode 100644 src/main/resources/assets/infernalexp/blockstates/basalt_cobbled_slab.json create mode 100644 src/main/resources/assets/infernalexp/blockstates/cobbled_basalt.json create mode 100644 src/main/resources/assets/infernalexp/blockstates/cobbled_basalt_slab.json rename src/main/resources/assets/infernalexp/blockstates/{basalt_cobbled_vertical_slab.json => cobbled_basalt_vertical_slab.json} (50%) delete mode 100644 src/main/resources/assets/infernalexp/models/block/basalt_cobbled.json delete mode 100644 src/main/resources/assets/infernalexp/models/block/basalt_cobbled_slab.json delete mode 100644 src/main/resources/assets/infernalexp/models/block/basalt_cobbled_slab_top.json delete mode 100644 src/main/resources/assets/infernalexp/models/block/basalt_cobbled_vertical_slab.json create mode 100644 src/main/resources/assets/infernalexp/models/block/cobbled_basalt.json create mode 100644 src/main/resources/assets/infernalexp/models/block/cobbled_basalt_slab.json create mode 100644 src/main/resources/assets/infernalexp/models/block/cobbled_basalt_slab_top.json create mode 100644 src/main/resources/assets/infernalexp/models/block/cobbled_basalt_vertical_slab.json delete mode 100644 src/main/resources/assets/infernalexp/models/item/basalt_cobbled.json delete mode 100644 src/main/resources/assets/infernalexp/models/item/basalt_cobbled_slab.json delete mode 100644 src/main/resources/assets/infernalexp/models/item/basalt_cobbled_vertical_slab.json create mode 100644 src/main/resources/assets/infernalexp/models/item/cobbled_basalt.json create mode 100644 src/main/resources/assets/infernalexp/models/item/cobbled_basalt_slab.json create mode 100644 src/main/resources/assets/infernalexp/models/item/cobbled_basalt_vertical_slab.json rename src/main/resources/assets/infernalexp/textures/block/{basalt_cobbled.png => cobbled_basalt.png} (100%) rename src/main/resources/data/infernalexp/loot_tables/blocks/{basalt_cobbled.json => cobbled_basalt.json} (85%) rename src/main/resources/data/infernalexp/loot_tables/blocks/{basalt_cobbled_slab.json => cobbled_basalt_slab.json} (83%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{basalt_cobbled_slab.json => cobbled_basalt_slab.json} (60%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{basalt_cobbles_vertical_slab.json => cobbled_basalt_vertical_slab.json} (71%) delete mode 100644 src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/basalt_cobbled_slab.json create mode 100644 src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/cobbled_basalt_slab.json rename src/main/resources/data/infernalexp/recipes/smelting/{basalt_cobbled.json => cobbled_basalt.json} (75%) delete mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/basalt_cobbled_slab.json create mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/cobbled_basalt.json create mode 100644 src/main/resources/data/infernalexp/recipes/stonecutting/cobbled_basalt_slab.json rename src/main/resources/data/infernalexp/recipes/stonecutting/{basalt_cobbled_slab_vertical.json => cobbled_basalt_slab_vertical.json} (65%) diff --git a/src/main/java/org/infernalstudios/infernalexp/init/IEBlocks.java b/src/main/java/org/infernalstudios/infernalexp/init/IEBlocks.java index 8ffc41e8f..e5d3d368c 100644 --- a/src/main/java/org/infernalstudios/infernalexp/init/IEBlocks.java +++ b/src/main/java/org/infernalstudios/infernalexp/init/IEBlocks.java @@ -170,9 +170,9 @@ public class IEBlocks { public static final RegistryObject RUBBLE = registerBlockWithDefaultItem("rubble", () -> new Block(getProperties(Blocks.GRAVEL))); public static final RegistryObject SILT = registerBlockWithDefaultItem("silt", () -> new Block(getProperties(Blocks.SAND))); - public static final RegistryObject BASALT_COBBLED = registerBlockWithDefaultItem("basalt_cobbled", () -> new RotatedPillarBlock(getProperties(Blocks.GRAVEL).sound(SoundType.BASALT))); - public static final RegistryObject BASALT_COBBLED_SLAB = registerBlockWithDefaultItem("basalt_cobbled_slab", () -> new SlabBlock(getProperties(Blocks.GRAVEL).sound(SoundType.BASALT))); - public static final RegistryObject BASALT_COBBLED_VERTICAL_SLAB = registerBlockWithDefaultItemConditioned("basalt_cobbled_vertical_slab", () -> new VerticalSlabBlock(getProperties(Blocks.GRAVEL).sound(SoundType.BASALT)), "quark"); + public static final RegistryObject COBBLED_BASALT = registerBlockWithDefaultItem("cobbled_basalt", () -> new RotatedPillarBlock(getProperties(Blocks.GRAVEL).sound(SoundType.BASALT))); + public static final RegistryObject COBBLED_BASALT_SLAB = registerBlockWithDefaultItem("cobbled_basalt_slab", () -> new SlabBlock(getProperties(Blocks.GRAVEL).sound(SoundType.BASALT))); + public static final RegistryObject COBBLED_BASALT_VERTICAL_SLAB = registerBlockWithDefaultItemConditioned("cobbled_basalt_vertical_slab", () -> new VerticalSlabBlock(getProperties(Blocks.GRAVEL).sound(SoundType.BASALT)), "quark"); public static final RegistryObject BASALT_SLAB = registerBlockWithDefaultItem("basalt_slab", () -> new SlabBlock(getProperties(Blocks.BASALT))); public static final RegistryObject BASALT_VERTICAL_SLAB = registerBlockWithDefaultItemConditioned("basalt_vertical_slab", () -> new VerticalSlabBlock(getProperties(Blocks.BASALT)), "quark"); diff --git a/src/main/resources/assets/infernalexp/blockstates/basalt_cobbled.json b/src/main/resources/assets/infernalexp/blockstates/basalt_cobbled.json deleted file mode 100644 index 16a3c4dd9..000000000 --- a/src/main/resources/assets/infernalexp/blockstates/basalt_cobbled.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "infernalexp:block/basalt_cobbled", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "infernalexp:block/basalt_cobbled" - }, - "axis=z": { - "model": "infernalexp:block/basalt_cobbled", - "x": 90 - } - } -} diff --git a/src/main/resources/assets/infernalexp/blockstates/basalt_cobbled_slab.json b/src/main/resources/assets/infernalexp/blockstates/basalt_cobbled_slab.json deleted file mode 100644 index ed282c3c9..000000000 --- a/src/main/resources/assets/infernalexp/blockstates/basalt_cobbled_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "infernalexp:block/basalt_cobbled_slab" - }, - "type=double": { - "model": "infernalexp:block/basalt_cobbled" - }, - "type=top": { - "model": "infernalexp:block/basalt_cobbled_slab_top" - } - } -} diff --git a/src/main/resources/assets/infernalexp/blockstates/cobbled_basalt.json b/src/main/resources/assets/infernalexp/blockstates/cobbled_basalt.json new file mode 100644 index 000000000..34dc5f2af --- /dev/null +++ b/src/main/resources/assets/infernalexp/blockstates/cobbled_basalt.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "infernalexp:block/cobbled_basalt", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "infernalexp:block/cobbled_basalt" + }, + "axis=z": { + "model": "infernalexp:block/cobbled_basalt", + "x": 90 + } + } +} diff --git a/src/main/resources/assets/infernalexp/blockstates/cobbled_basalt_slab.json b/src/main/resources/assets/infernalexp/blockstates/cobbled_basalt_slab.json new file mode 100644 index 000000000..4cc140606 --- /dev/null +++ b/src/main/resources/assets/infernalexp/blockstates/cobbled_basalt_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "infernalexp:block/cobbled_basalt_slab" + }, + "type=double": { + "model": "infernalexp:block/cobbled_basalt" + }, + "type=top": { + "model": "infernalexp:block/cobbled_basalt_slab_top" + } + } +} diff --git a/src/main/resources/assets/infernalexp/blockstates/basalt_cobbled_vertical_slab.json b/src/main/resources/assets/infernalexp/blockstates/cobbled_basalt_vertical_slab.json similarity index 50% rename from src/main/resources/assets/infernalexp/blockstates/basalt_cobbled_vertical_slab.json rename to src/main/resources/assets/infernalexp/blockstates/cobbled_basalt_vertical_slab.json index 3e0f68f6d..f082edccd 100644 --- a/src/main/resources/assets/infernalexp/blockstates/basalt_cobbled_vertical_slab.json +++ b/src/main/resources/assets/infernalexp/blockstates/cobbled_basalt_vertical_slab.json @@ -1,27 +1,27 @@ { "variants": { "type=north": { - "model": "infernalexp:block/basalt_cobbled_vertical_slab", + "model": "infernalexp:block/cobbled_basalt_vertical_slab", "y": 0, "uvlock": true }, "type=south": { - "model": "infernalexp:block/basalt_cobbled_vertical_slab", + "model": "infernalexp:block/cobbled_basalt_vertical_slab", "y": 180, "uvlock": true }, "type=east": { - "model": "infernalexp:block/basalt_cobbled_vertical_slab", + "model": "infernalexp:block/cobbled_basalt_vertical_slab", "y": 90, "uvlock": true }, "type=west": { - "model": "infernalexp:block/basalt_cobbled_vertical_slab", + "model": "infernalexp:block/cobbled_basalt_vertical_slab", "y": 270, "uvlock": true }, "type=double": { - "model": "infernalexp:block/basalt_cobbled" + "model": "infernalexp:block/cobbled_basalt" } } } diff --git a/src/main/resources/assets/infernalexp/lang/de_de.json b/src/main/resources/assets/infernalexp/lang/de_de.json index 7cd163466..bc5bb5ec8 100644 --- a/src/main/resources/assets/infernalexp/lang/de_de.json +++ b/src/main/resources/assets/infernalexp/lang/de_de.json @@ -61,9 +61,9 @@ "block.infernalexp.silt": "Basaltschlick", "block.infernalexp.rubble": "Schwarzsteinschutt", "block.infernalexp.dullthorns_block": "Mattdornenblock", - "block.infernalexp.basalt_cobbled": "Bruchbasalt", - "block.infernalexp.basalt_cobbled_slab": "Bruchbasaltstufe", - "block.infernalexp.basalt_cobbled_vertical_slab": "Bruchbasaltvertikalstufe", + "block.infernalexp.cobbled_basalt": "Bruchbasalt", + "block.infernalexp.cobbled_basalt_slab": "Bruchbasaltstufe", + "block.infernalexp.cobbled_basalt_vertical_slab": "Bruchbasaltvertikalstufe", "block.infernalexp.basalt_wall": "Basaltmauer", "block.infernalexp.basalt_stairs": "Basalttreppe", "block.infernalexp.basalt_button": "Basaltknopf", diff --git a/src/main/resources/assets/infernalexp/lang/en_us.json b/src/main/resources/assets/infernalexp/lang/en_us.json index d17ca86b9..ac4886601 100644 --- a/src/main/resources/assets/infernalexp/lang/en_us.json +++ b/src/main/resources/assets/infernalexp/lang/en_us.json @@ -65,9 +65,9 @@ "block.infernalexp.silt": "Basalt Silt", "block.infernalexp.rubble": "Blackstone Rubble", "block.infernalexp.dullthorns_block": "Dullthorns Block", - "block.infernalexp.basalt_cobbled": "Cobbled Basalt", - "block.infernalexp.basalt_cobbled_slab": "Cobbled Basalt Slab", - "block.infernalexp.basalt_cobbled_vertical_slab": "Cobbled Basalt Vertical Slab", + "block.infernalexp.cobbled_basalt": "Cobbled Basalt", + "block.infernalexp.cobbled_basalt_slab": "Cobbled Basalt Slab", + "block.infernalexp.cobbled_basalt_vertical_slab": "Cobbled Basalt Vertical Slab", "block.infernalexp.basalt_wall": "Basalt Wall", "block.infernalexp.basalt_stairs": "Basalt Stairs", "block.infernalexp.basalt_button": "Basalt Button", diff --git a/src/main/resources/assets/infernalexp/lang/es_ar.json b/src/main/resources/assets/infernalexp/lang/es_ar.json index 6fb39cb80..4d11a9181 100644 --- a/src/main/resources/assets/infernalexp/lang/es_ar.json +++ b/src/main/resources/assets/infernalexp/lang/es_ar.json @@ -61,9 +61,9 @@ "block.infernalexp.silt": "Cieno de basalto", "block.infernalexp.rubble": "Escombros de piedra negra", "block.infernalexp.dullthorns_block": "Bloque de cardos tenues", - "block.infernalexp.basalt_cobbled": "Adoquin de basalto", - "block.infernalexp.basalt_cobbled_slab": "Baldosa de adoquin de basalto", - "block.infernalexp.basalt_cobbled_vertical_slab": "Cobbled Basalt Vertical Slab", + "block.infernalexp.cobbled_basalt": "Adoquin de basalto", + "block.infernalexp.cobbled_basalt_slab": "Baldosa de adoquin de basalto", + "block.infernalexp.cobbled_basalt_vertical_slab": "Cobbled Basalt Vertical Slab", "block.infernalexp.basalt_wall": "Pared de basalto", "block.infernalexp.basalt_stairs": "Escaleras de basalto", "block.infernalexp.basalt_button": "Boton de basalto", diff --git a/src/main/resources/assets/infernalexp/lang/fr_ca.json b/src/main/resources/assets/infernalexp/lang/fr_ca.json index e98015c0d..d94e8a103 100644 --- a/src/main/resources/assets/infernalexp/lang/fr_ca.json +++ b/src/main/resources/assets/infernalexp/lang/fr_ca.json @@ -61,9 +61,9 @@ "block.infernalexp.silt": "Limon de basalte", "block.infernalexp.rubble": "Décombres de roche noire", "block.infernalexp.dullthorns_block": "Dullthorns Block", - "block.infernalexp.basalt_cobbled": "Cobbled Basalt", - "block.infernalexp.basalt_cobbled_slab": "Cobbled Basalt Slab", - "block.infernalexp.basalt_cobbled_vertical_slab": "Cobbled Basalt Vertical Slab", + "block.infernalexp.cobbled_basalt": "Cobbled Basalt", + "block.infernalexp.cobbled_basalt_slab": "Cobbled Basalt Slab", + "block.infernalexp.cobbled_basalt_vertical_slab": "Cobbled Basalt Vertical Slab", "block.infernalexp.basalt_wall": "Basalt Wall", "block.infernalexp.basalt_stairs": "Basalt Stairs", "block.infernalexp.basalt_button": "Basalt Button", diff --git a/src/main/resources/assets/infernalexp/lang/fr_fr.json b/src/main/resources/assets/infernalexp/lang/fr_fr.json index 097c27ce9..18fcabc0c 100644 --- a/src/main/resources/assets/infernalexp/lang/fr_fr.json +++ b/src/main/resources/assets/infernalexp/lang/fr_fr.json @@ -61,9 +61,9 @@ "block.infernalexp.silt": "Limon de basalte", "block.infernalexp.rubble": "Décombres de roche noire", "block.infernalexp.dullthorns_block": "Dullthorns Block", - "block.infernalexp.basalt_cobbled": "Cobbled Basalt", - "block.infernalexp.basalt_cobbled_slab": "Cobbled Basalt Slab", - "block.infernalexp.basalt_cobbled_vertical_slab": "Cobbled Basalt Vertical Slab", + "block.infernalexp.cobbled_basalt": "Cobbled Basalt", + "block.infernalexp.cobbled_basalt_slab": "Cobbled Basalt Slab", + "block.infernalexp.cobbled_basalt_vertical_slab": "Cobbled Basalt Vertical Slab", "block.infernalexp.basalt_wall": "Basalt Wall", "block.infernalexp.basalt_stairs": "Basalt Stairs", "block.infernalexp.basalt_button": "Basalt Button", diff --git a/src/main/resources/assets/infernalexp/lang/lol_us.json b/src/main/resources/assets/infernalexp/lang/lol_us.json index 84d56fe38..40b9c5d9b 100644 --- a/src/main/resources/assets/infernalexp/lang/lol_us.json +++ b/src/main/resources/assets/infernalexp/lang/lol_us.json @@ -61,9 +61,9 @@ "block.infernalexp.silt": "Blec sand", "block.infernalexp.rubble": "Blecston peaces", "block.infernalexp.dullthorns_block": "Dullthorns Block", - "block.infernalexp.basalt_cobbled": "Cobbled Basalt", - "block.infernalexp.basalt_cobbled_slab": "Cobbled Basalt Slab", - "block.infernalexp.basalt_cobbled_vertical_slab": "Cobbled Basalt Vertical Slab", + "block.infernalexp.cobbled_basalt": "Cobbled Basalt", + "block.infernalexp.cobbled_basalt_slab": "Cobbled Basalt Slab", + "block.infernalexp.cobbled_basalt_vertical_slab": "Cobbled Basalt Vertical Slab", "block.infernalexp.basalt_wall": "Basalt Wall", "block.infernalexp.basalt_stairs": "Basalt Stairs", "block.infernalexp.basalt_button": "Basalt Button", diff --git a/src/main/resources/assets/infernalexp/lang/lv_lv.json b/src/main/resources/assets/infernalexp/lang/lv_lv.json index 24060e0c6..6a825bd9f 100644 --- a/src/main/resources/assets/infernalexp/lang/lv_lv.json +++ b/src/main/resources/assets/infernalexp/lang/lv_lv.json @@ -61,9 +61,9 @@ "block.infernalexp.silt": "Basalt Silt", "block.infernalexp.rubble": "Blackstone Rubble", "block.infernalexp.dullthorns_block": "Dullthorns Block", - "block.infernalexp.basalt_cobbled": "Cobbled Basalt", - "block.infernalexp.basalt_cobbled_slab": "Cobbled Basalt Slab", - "block.infernalexp.basalt_cobbled_vertical_slab": "Cobbled Basalt Vertical Slab", + "block.infernalexp.cobbled_basalt": "Cobbled Basalt", + "block.infernalexp.cobbled_basalt_slab": "Cobbled Basalt Slab", + "block.infernalexp.cobbled_basalt_vertical_slab": "Cobbled Basalt Vertical Slab", "block.infernalexp.basalt_wall": "Basalt Wall", "block.infernalexp.basalt_stairs": "Basalt Stairs", "block.infernalexp.basalt_button": "Basalt Button", diff --git a/src/main/resources/assets/infernalexp/lang/pt_br.json b/src/main/resources/assets/infernalexp/lang/pt_br.json index 7ff1a49b3..5621951f4 100644 --- a/src/main/resources/assets/infernalexp/lang/pt_br.json +++ b/src/main/resources/assets/infernalexp/lang/pt_br.json @@ -61,9 +61,9 @@ "block.infernalexp.silt": "Lodo de Basalto", "block.infernalexp.rubble": "Escombros de Pedra Negra ", "block.infernalexp.dullthorns_block": "Dullthorns Block", - "block.infernalexp.basalt_cobbled": "Cobbled Basalt", - "block.infernalexp.basalt_cobbled_slab": "Cobbled Basalt Slab", - "block.infernalexp.basalt_cobbled_vertical_slab": "Cobbled Basalt Vertical Slab", + "block.infernalexp.cobbled_basalt": "Cobbled Basalt", + "block.infernalexp.cobbled_basalt_slab": "Cobbled Basalt Slab", + "block.infernalexp.cobbled_basalt_vertical_slab": "Cobbled Basalt Vertical Slab", "block.infernalexp.basalt_wall": "Basalt Wall", "block.infernalexp.basalt_stairs": "Basalt Stairs", "block.infernalexp.basalt_button": "Basalt Button", diff --git a/src/main/resources/assets/infernalexp/lang/ro_ro.json b/src/main/resources/assets/infernalexp/lang/ro_ro.json index a11ac5036..65e2df992 100644 --- a/src/main/resources/assets/infernalexp/lang/ro_ro.json +++ b/src/main/resources/assets/infernalexp/lang/ro_ro.json @@ -61,9 +61,9 @@ "block.infernalexp.silt": "Nisip Basaltic", "block.infernalexp.rubble": "Moloz de Piatra Neagra", "block.infernalexp.dullthorns_block": "Dullthorns Block", - "block.infernalexp.basalt_cobbled": "Cobbled Basalt", - "block.infernalexp.basalt_cobbled_slab": "Cobbled Basalt Slab", - "block.infernalexp.basalt_cobbled_vertical_slab": "Cobbled Basalt Vertical Slab", + "block.infernalexp.cobbled_basalt": "Cobbled Basalt", + "block.infernalexp.cobbled_basalt_slab": "Cobbled Basalt Slab", + "block.infernalexp.cobbled_basalt_vertical_slab": "Cobbled Basalt Vertical Slab", "block.infernalexp.basalt_wall": "Basalt Wall", "block.infernalexp.basalt_stairs": "Basalt Stairs", "block.infernalexp.basalt_button": "Basalt Button", diff --git a/src/main/resources/assets/infernalexp/models/block/basalt_cobbled.json b/src/main/resources/assets/infernalexp/models/block/basalt_cobbled.json deleted file mode 100644 index fa3eaa2af..000000000 --- a/src/main/resources/assets/infernalexp/models/block/basalt_cobbled.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "infernalexp:block/basalt_cobbled", - "side": "infernalexp:block/basalt_cobbled" - } -} diff --git a/src/main/resources/assets/infernalexp/models/block/basalt_cobbled_slab.json b/src/main/resources/assets/infernalexp/models/block/basalt_cobbled_slab.json deleted file mode 100644 index 58f216774..000000000 --- a/src/main/resources/assets/infernalexp/models/block/basalt_cobbled_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "infernalexp:block/basalt_cobbled", - "top": "infernalexp:block/basalt_cobbled", - "side": "infernalexp:block/basalt_cobbled" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/basalt_cobbled_slab_top.json b/src/main/resources/assets/infernalexp/models/block/basalt_cobbled_slab_top.json deleted file mode 100644 index a2428b452..000000000 --- a/src/main/resources/assets/infernalexp/models/block/basalt_cobbled_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "infernalexp:block/basalt_cobbled", - "top": "infernalexp:block/basalt_cobbled", - "side": "infernalexp:block/basalt_cobbled" - } -} diff --git a/src/main/resources/assets/infernalexp/models/block/basalt_cobbled_vertical_slab.json b/src/main/resources/assets/infernalexp/models/block/basalt_cobbled_vertical_slab.json deleted file mode 100644 index 40ec01d88..000000000 --- a/src/main/resources/assets/infernalexp/models/block/basalt_cobbled_vertical_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "infernalexp:block/vertical_slab", - "textures": { - "bottom": "infernalexp:block/basalt_cobbled", - "top": "infernalexp:block/basalt_cobbled", - "side": "infernalexp:block/basalt_cobbled" - } -} diff --git a/src/main/resources/assets/infernalexp/models/block/cobbled_basalt.json b/src/main/resources/assets/infernalexp/models/block/cobbled_basalt.json new file mode 100644 index 000000000..dbb5ce510 --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/block/cobbled_basalt.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "infernalexp:block/cobbled_basalt", + "side": "infernalexp:block/cobbled_basalt" + } +} diff --git a/src/main/resources/assets/infernalexp/models/block/cobbled_basalt_slab.json b/src/main/resources/assets/infernalexp/models/block/cobbled_basalt_slab.json new file mode 100644 index 000000000..e23bef4f9 --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/block/cobbled_basalt_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "infernalexp:block/cobbled_basalt", + "top": "infernalexp:block/cobbled_basalt", + "side": "infernalexp:block/cobbled_basalt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/cobbled_basalt_slab_top.json b/src/main/resources/assets/infernalexp/models/block/cobbled_basalt_slab_top.json new file mode 100644 index 000000000..087fd30a4 --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/block/cobbled_basalt_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "infernalexp:block/cobbled_basalt", + "top": "infernalexp:block/cobbled_basalt", + "side": "infernalexp:block/cobbled_basalt" + } +} diff --git a/src/main/resources/assets/infernalexp/models/block/cobbled_basalt_vertical_slab.json b/src/main/resources/assets/infernalexp/models/block/cobbled_basalt_vertical_slab.json new file mode 100644 index 000000000..754c44efb --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/block/cobbled_basalt_vertical_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "infernalexp:block/vertical_slab", + "textures": { + "bottom": "infernalexp:block/cobbled_basalt", + "top": "infernalexp:block/cobbled_basalt", + "side": "infernalexp:block/cobbled_basalt" + } +} diff --git a/src/main/resources/assets/infernalexp/models/item/basalt_cobbled.json b/src/main/resources/assets/infernalexp/models/item/basalt_cobbled.json deleted file mode 100644 index 7eb82eccb..000000000 --- a/src/main/resources/assets/infernalexp/models/item/basalt_cobbled.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "infernalexp:block/basalt_cobbled" -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/basalt_cobbled_slab.json b/src/main/resources/assets/infernalexp/models/item/basalt_cobbled_slab.json deleted file mode 100644 index fcab42a66..000000000 --- a/src/main/resources/assets/infernalexp/models/item/basalt_cobbled_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "infernalexp:block/basalt_cobbled_slab" -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/basalt_cobbled_vertical_slab.json b/src/main/resources/assets/infernalexp/models/item/basalt_cobbled_vertical_slab.json deleted file mode 100644 index b3577a868..000000000 --- a/src/main/resources/assets/infernalexp/models/item/basalt_cobbled_vertical_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "infernalexp:block/basalt_cobbled_vertical_slab" -} diff --git a/src/main/resources/assets/infernalexp/models/item/cobbled_basalt.json b/src/main/resources/assets/infernalexp/models/item/cobbled_basalt.json new file mode 100644 index 000000000..5a75ca16c --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/item/cobbled_basalt.json @@ -0,0 +1,3 @@ +{ + "parent": "infernalexp:block/cobbled_basalt" +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/cobbled_basalt_slab.json b/src/main/resources/assets/infernalexp/models/item/cobbled_basalt_slab.json new file mode 100644 index 000000000..7f4fb3a11 --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/item/cobbled_basalt_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "infernalexp:block/cobbled_basalt_slab" +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/cobbled_basalt_vertical_slab.json b/src/main/resources/assets/infernalexp/models/item/cobbled_basalt_vertical_slab.json new file mode 100644 index 000000000..e916a500d --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/item/cobbled_basalt_vertical_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "infernalexp:block/cobbled_basalt_vertical_slab" +} diff --git a/src/main/resources/assets/infernalexp/textures/block/basalt_cobbled.png b/src/main/resources/assets/infernalexp/textures/block/cobbled_basalt.png similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/basalt_cobbled.png rename to src/main/resources/assets/infernalexp/textures/block/cobbled_basalt.png diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/basalt_cobbled.json b/src/main/resources/data/infernalexp/loot_tables/blocks/cobbled_basalt.json similarity index 85% rename from src/main/resources/data/infernalexp/loot_tables/blocks/basalt_cobbled.json rename to src/main/resources/data/infernalexp/loot_tables/blocks/cobbled_basalt.json index 05a3bf5ae..affee1528 100644 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/basalt_cobbled.json +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/cobbled_basalt.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "infernalexp:basalt_cobbled" + "name": "infernalexp:cobbled_basalt" } ], "conditions": [ diff --git a/src/main/resources/data/infernalexp/loot_tables/blocks/basalt_cobbled_slab.json b/src/main/resources/data/infernalexp/loot_tables/blocks/cobbled_basalt_slab.json similarity index 83% rename from src/main/resources/data/infernalexp/loot_tables/blocks/basalt_cobbled_slab.json rename to src/main/resources/data/infernalexp/loot_tables/blocks/cobbled_basalt_slab.json index 56a12bd92..2eb8ad3c7 100644 --- a/src/main/resources/data/infernalexp/loot_tables/blocks/basalt_cobbled_slab.json +++ b/src/main/resources/data/infernalexp/loot_tables/blocks/cobbled_basalt_slab.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "infernalexp:basalt_cobbled_slab" + "name": "infernalexp:cobbled_basalt_slab" } ], "conditions": [ diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/basalt_cobbled_slab.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/cobbled_basalt_slab.json similarity index 60% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/basalt_cobbled_slab.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/cobbled_basalt_slab.json index 7fde0f163..adcb82d65 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/basalt_cobbled_slab.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/cobbled_basalt_slab.json @@ -5,11 +5,11 @@ ], "key": { "x": { - "item": "infernalexp:basalt_cobbled" + "item": "infernalexp:cobbled_basalt" } }, "result": { - "item": "infernalexp:basalt_cobbled_slab", + "item": "infernalexp:cobbled_basalt_slab", "count": 6 } } diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/basalt_cobbles_vertical_slab.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/cobbled_basalt_vertical_slab.json similarity index 71% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/basalt_cobbles_vertical_slab.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/cobbled_basalt_vertical_slab.json index 56a34ef59..f1795857b 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/basalt_cobbles_vertical_slab.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/cobbled_basalt_vertical_slab.json @@ -7,11 +7,11 @@ ], "key": { "#": { - "item": "infernalexp:basalt_cobbled_slab" + "item": "infernalexp:cobbled_basalt_slab" } }, "result": { - "item": "infernalexp:basalt_cobbled_vertical_slab", + "item": "infernalexp:cobbled_basalt_vertical_slab", "count": 3 }, "conditions": [ diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/basalt_cobbled_slab.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/basalt_cobbled_slab.json deleted file mode 100644 index f30976362..000000000 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/basalt_cobbled_slab.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "infernalexp:basalt_cobbled_vertical_slab" - } - ], - "result": { - "item": "infernalexp:basalt_cobbled_slab" - } -} diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/cobbled_basalt_slab.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/cobbled_basalt_slab.json new file mode 100644 index 000000000..3779ba28c --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shapeless/cobbled_basalt_slab.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "infernalexp:cobbled_basalt_vertical_slab" + } + ], + "result": { + "item": "infernalexp:cobbled_basalt_slab" + } +} diff --git a/src/main/resources/data/infernalexp/recipes/smelting/basalt_cobbled.json b/src/main/resources/data/infernalexp/recipes/smelting/cobbled_basalt.json similarity index 75% rename from src/main/resources/data/infernalexp/recipes/smelting/basalt_cobbled.json rename to src/main/resources/data/infernalexp/recipes/smelting/cobbled_basalt.json index ee4ff85b4..82eca90a3 100644 --- a/src/main/resources/data/infernalexp/recipes/smelting/basalt_cobbled.json +++ b/src/main/resources/data/infernalexp/recipes/smelting/cobbled_basalt.json @@ -3,7 +3,7 @@ "ingredient": { "item": "minecraft:basalt" }, - "result": "infernalexp:basalt_cobbled", + "result": "infernalexp:cobbled_basalt", "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/basalt_cobbled_slab.json b/src/main/resources/data/infernalexp/recipes/stonecutting/basalt_cobbled_slab.json deleted file mode 100644 index 89d34bd7a..000000000 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/basalt_cobbled_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "infernalexp:basalt_cobbled" - }, - "result": "infernalexp:basalt_cobbled_slab", - "count": 2 -} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/cobbled_basalt.json b/src/main/resources/data/infernalexp/recipes/stonecutting/cobbled_basalt.json new file mode 100644 index 000000000..199dbe08b --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/cobbled_basalt.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:basalt" + }, + "result": "infernalexp:cobbled_basalt", + "count": 2 +} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/cobbled_basalt_slab.json b/src/main/resources/data/infernalexp/recipes/stonecutting/cobbled_basalt_slab.json new file mode 100644 index 000000000..8710d57d9 --- /dev/null +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/cobbled_basalt_slab.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "infernalexp:cobbled_basalt" + }, + "result": "infernalexp:cobbled_basalt_slab", + "count": 2 +} diff --git a/src/main/resources/data/infernalexp/recipes/stonecutting/basalt_cobbled_slab_vertical.json b/src/main/resources/data/infernalexp/recipes/stonecutting/cobbled_basalt_slab_vertical.json similarity index 65% rename from src/main/resources/data/infernalexp/recipes/stonecutting/basalt_cobbled_slab_vertical.json rename to src/main/resources/data/infernalexp/recipes/stonecutting/cobbled_basalt_slab_vertical.json index 24aad81e5..665d1bbec 100644 --- a/src/main/resources/data/infernalexp/recipes/stonecutting/basalt_cobbled_slab_vertical.json +++ b/src/main/resources/data/infernalexp/recipes/stonecutting/cobbled_basalt_slab_vertical.json @@ -1,9 +1,9 @@ { "type": "minecraft:stonecutting", "ingredient": { - "item": "infernalexp:basalt_cobbled" + "item": "infernalexp:cobbled_basalt" }, - "result": "infernalexp:basalt_cobbled_vertical_slab", + "result": "infernalexp:cobbled_basalt_vertical_slab", "count": 2, "conditions": [ { From 46e7ff753aaab62794253ae2f581bcabb13ce49b Mon Sep 17 00:00:00 2001 From: Neko Date: Thu, 14 Jul 2022 12:09:12 +0100 Subject: [PATCH 5/5] Trapped Shimmer Sand -> Glimmer Gravel --- .../blocks/TrappedGlowSandBlock.java | 2 +- .../infernalexp/init/IEBlocks.java | 2 +- .../world/gen/features/SinkHoleFeature.java | 2 +- .../GlowstoneCanyonSurfaceBuilder.java | 2 +- .../blockstates/glimmer_gravel.json | 78 ++++++++++++++++++ .../blockstates/trapped_shimmer_sand.json | 78 ------------------ .../assets/infernalexp/lang/de_de.json | 2 +- .../assets/infernalexp/lang/en_us.json | 2 +- .../assets/infernalexp/lang/es_ar.json | 2 +- .../assets/infernalexp/lang/es_es.json | 2 +- .../assets/infernalexp/lang/fr_ca.json | 2 +- .../assets/infernalexp/lang/fr_fr.json | 2 +- .../assets/infernalexp/lang/he_il.json | 2 +- .../assets/infernalexp/lang/id_id.json | 2 +- .../assets/infernalexp/lang/ja_jp.json | 2 +- .../assets/infernalexp/lang/lol_us.json | 2 +- .../assets/infernalexp/lang/lv_lv.json | 2 +- .../assets/infernalexp/lang/ms_my.json | 2 +- .../assets/infernalexp/lang/nl_nl.json | 2 +- .../assets/infernalexp/lang/pl_pl.json | 2 +- .../assets/infernalexp/lang/pt_br.json | 2 +- .../assets/infernalexp/lang/ro_ro.json | 2 +- .../assets/infernalexp/lang/ru_ru.json | 2 +- .../assets/infernalexp/lang/zh_tw.json | 2 +- .../models/block/glimmer_gravel.json | 6 ++ .../models/block/trapped_shimmer_sand.json | 6 -- .../models/item/glimmer_gravel.json | 3 + .../models/item/trapped_shimmer_sand.json | 3 - ...ed_shimmer_sand.png => glimmer_gravel.png} | Bin ...imated.png => glimmer_gravel_animated.png} | Bin ...eta => glimmer_gravel_animated.png.mcmeta} | 0 ..._shimmer_sand.json => glimmer_gravel.json} | 2 +- .../tags/blocks/glow_fire_base_blocks.json | 2 +- .../tags/items/glowstone_canyon_blocks.json | 2 +- .../data/minecraft/tags/blocks/slabs.json | 2 +- .../data/minecraft/tags/items/slabs.json | 2 +- .../data/quark/tags/blocks/vertical_slab.json | 2 +- .../data/quark/tags/items/vertical_slab.json | 2 +- 38 files changed, 116 insertions(+), 116 deletions(-) create mode 100644 src/main/resources/assets/infernalexp/blockstates/glimmer_gravel.json delete mode 100644 src/main/resources/assets/infernalexp/blockstates/trapped_shimmer_sand.json create mode 100644 src/main/resources/assets/infernalexp/models/block/glimmer_gravel.json delete mode 100644 src/main/resources/assets/infernalexp/models/block/trapped_shimmer_sand.json create mode 100644 src/main/resources/assets/infernalexp/models/item/glimmer_gravel.json delete mode 100644 src/main/resources/assets/infernalexp/models/item/trapped_shimmer_sand.json rename src/main/resources/assets/infernalexp/textures/block/{trapped_shimmer_sand.png => glimmer_gravel.png} (100%) rename src/main/resources/assets/infernalexp/textures/block/{trapped_shimmer_sand_animated.png => glimmer_gravel_animated.png} (100%) rename src/main/resources/assets/infernalexp/textures/block/{trapped_shimmer_sand_animated.png.mcmeta => glimmer_gravel_animated.png.mcmeta} (100%) rename src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/{trapped_shimmer_sand.json => glimmer_gravel.json} (84%) diff --git a/src/main/java/org/infernalstudios/infernalexp/blocks/TrappedGlowSandBlock.java b/src/main/java/org/infernalstudios/infernalexp/blocks/TrappedGlowSandBlock.java index 20d036f03..19a0e1592 100644 --- a/src/main/java/org/infernalstudios/infernalexp/blocks/TrappedGlowSandBlock.java +++ b/src/main/java/org/infernalstudios/infernalexp/blocks/TrappedGlowSandBlock.java @@ -51,7 +51,7 @@ public void onEntityWalk(World world, BlockPos pos, Entity entity) { for (int x = -updateRadius; x <= updateRadius; x++) { for (int y = -updateRadius; y <= updateRadius; y++) { for (int z = -updateRadius; z <= updateRadius; z++) { - if (world.getBlockState(pos.add(x, y, z)) == IEBlocks.TRAPPED_SHIMMER_SAND.get().getDefaultState()) { + if (world.getBlockState(pos.add(x, y, z)) == IEBlocks.GLIMMER_GRAVEL.get().getDefaultState()) { ((TrappedGlowSandBlock) world.getBlockState(pos.add(x, y, z)).getBlock()).startFalling((ServerWorld) world, pos.add(x, y, z)); } } diff --git a/src/main/java/org/infernalstudios/infernalexp/init/IEBlocks.java b/src/main/java/org/infernalstudios/infernalexp/init/IEBlocks.java index e5d3d368c..d42e20ad4 100644 --- a/src/main/java/org/infernalstudios/infernalexp/init/IEBlocks.java +++ b/src/main/java/org/infernalstudios/infernalexp/init/IEBlocks.java @@ -150,7 +150,7 @@ public class IEBlocks { public static final RegistryObject SHIMMER_SAND = registerBlockWithDefaultItem("shimmer_sand", () -> new GlowSandBlock(0xFFC267, AbstractBlock.Properties.create(Material.SNOW_BLOCK, MaterialColor.SAND).setRequiresTool().harvestTool(ToolType.SHOVEL).hardnessAndResistance(0.5F).sound(SoundType.SAND))); public static final RegistryObject SHIMMER_SHEET = registerBlockWithDefaultItem("shimmer_sheet", () -> new GlowdustBlock(AbstractBlock.Properties.create(Material.SNOW, MaterialColor.SAND).setRequiresTool().harvestTool(ToolType.SHOVEL).hardnessAndResistance(0.2f).sound(SoundType.SAND))); - public static final RegistryObject TRAPPED_SHIMMER_SAND = registerBlockWithDefaultItem("trapped_shimmer_sand", () -> new TrappedGlowSandBlock(0xFFC267, getProperties(SHIMMER_SAND.get()).hardnessAndResistance(0.2F))); + public static final RegistryObject GLIMMER_GRAVEL = registerBlockWithDefaultItem("glimmer_gravel", () -> new TrappedGlowSandBlock(0xFFC267, getProperties(SHIMMER_SAND.get()).hardnessAndResistance(0.2F))); public static final RegistryObject SHIMMER_STONE = registerBlockWithDefaultItem("shimmer_stone", () -> new Block(getProperties(Blocks.SANDSTONE))); public static final RegistryObject SHIMMER_STONE_SLAB = registerBlockWithDefaultItem("shimmer_stone_slab", () -> new SlabBlock(getProperties(SHIMMER_STONE.get()))); diff --git a/src/main/java/org/infernalstudios/infernalexp/world/gen/features/SinkHoleFeature.java b/src/main/java/org/infernalstudios/infernalexp/world/gen/features/SinkHoleFeature.java index 05a829017..a07597c0e 100644 --- a/src/main/java/org/infernalstudios/infernalexp/world/gen/features/SinkHoleFeature.java +++ b/src/main/java/org/infernalstudios/infernalexp/world/gen/features/SinkHoleFeature.java @@ -69,7 +69,7 @@ public boolean generate(ISeedReader world, ChunkGenerator generator, Random rand mutableBlockPos.setPos(pos); mutableBlockPos.move(point.getX(), point.getY(), point.getZ()); mutableBlockPos.move(Direction.DOWN); - world.setBlockState(mutableBlockPos, IEBlocks.TRAPPED_SHIMMER_SAND.get().getDefaultState(), 2); + world.setBlockState(mutableBlockPos, IEBlocks.GLIMMER_GRAVEL.get().getDefaultState(), 2); for (int y = 2; y < depth; y++) { mutableBlockPos.move(Direction.DOWN); diff --git a/src/main/java/org/infernalstudios/infernalexp/world/gen/surfacebuilders/GlowstoneCanyonSurfaceBuilder.java b/src/main/java/org/infernalstudios/infernalexp/world/gen/surfacebuilders/GlowstoneCanyonSurfaceBuilder.java index 71f239e3b..cfa9d74fa 100644 --- a/src/main/java/org/infernalstudios/infernalexp/world/gen/surfacebuilders/GlowstoneCanyonSurfaceBuilder.java +++ b/src/main/java/org/infernalstudios/infernalexp/world/gen/surfacebuilders/GlowstoneCanyonSurfaceBuilder.java @@ -67,7 +67,7 @@ protected void buildSurface(Random random, IChunk chunk, Biome biome, int x, int // If the block is floating, make it Glimmer Gravel, otherwise let it be the regular surface if (blockBelow.isAir()) { - chunk.setBlockState(mutable, IEBlocks.TRAPPED_SHIMMER_SAND.get().getDefaultState(), false); + chunk.setBlockState(mutable, IEBlocks.GLIMMER_GRAVEL.get().getDefaultState(), false); } else { chunk.setBlockState(mutable, topBlock, false); } diff --git a/src/main/resources/assets/infernalexp/blockstates/glimmer_gravel.json b/src/main/resources/assets/infernalexp/blockstates/glimmer_gravel.json new file mode 100644 index 000000000..f4addc3f2 --- /dev/null +++ b/src/main/resources/assets/infernalexp/blockstates/glimmer_gravel.json @@ -0,0 +1,78 @@ +{ + "variants": { + "": [ + { + "model": "infernalexp:block/glimmer_gravel" + }, + { + "model": "infernalexp:block/glimmer_gravel", + "x": 90 + }, + { + "model": "infernalexp:block/glimmer_gravel", + "x": 180 + }, + { + "model": "infernalexp:block/glimmer_gravel", + "x": 270 + }, + { + "model": "infernalexp:block/glimmer_gravel", + "y": 90 + }, + { + "model": "infernalexp:block/glimmer_gravel", + "y": 90, + "x": 90 + }, + { + "model": "infernalexp:block/glimmer_gravel", + "y": 90, + "x": 180 + }, + { + "model": "infernalexp:block/glimmer_gravel", + "y": 90, + "x": 270 + }, + { + "model": "infernalexp:block/glimmer_gravel", + "y": 180 + }, + { + "model": "infernalexp:block/glimmer_gravel", + "y": 180, + "x": 90 + }, + { + "model": "infernalexp:block/glimmer_gravel", + "y": 180, + "x": 180 + }, + { + "model": "infernalexp:block/glimmer_gravel", + "y": 180, + "x": 270 + }, + { + "model": "infernalexp:block/glimmer_gravel", + "y": 270 + }, + { + "model": "infernalexp:block/glimmer_gravel", + "y": 270, + "x": 90 + }, + { + "model": "infernalexp:block/glimmer_gravel", + "y": 270, + "x": 180 + }, + { + "model": "infernalexp:block/glimmer_gravel", + "y": 270, + "x": 270 + } + ] + } +} diff --git a/src/main/resources/assets/infernalexp/blockstates/trapped_shimmer_sand.json b/src/main/resources/assets/infernalexp/blockstates/trapped_shimmer_sand.json deleted file mode 100644 index 5bc55d394..000000000 --- a/src/main/resources/assets/infernalexp/blockstates/trapped_shimmer_sand.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "infernalexp:block/trapped_shimmer_sand" - }, - { - "model": "infernalexp:block/trapped_shimmer_sand", - "x": 90 - }, - { - "model": "infernalexp:block/trapped_shimmer_sand", - "x": 180 - }, - { - "model": "infernalexp:block/trapped_shimmer_sand", - "x": 270 - }, - { - "model": "infernalexp:block/trapped_shimmer_sand", - "y": 90 - }, - { - "model": "infernalexp:block/trapped_shimmer_sand", - "y": 90, - "x": 90 - }, - { - "model": "infernalexp:block/trapped_shimmer_sand", - "y": 90, - "x": 180 - }, - { - "model": "infernalexp:block/trapped_shimmer_sand", - "y": 90, - "x": 270 - }, - { - "model": "infernalexp:block/trapped_shimmer_sand", - "y": 180 - }, - { - "model": "infernalexp:block/trapped_shimmer_sand", - "y": 180, - "x": 90 - }, - { - "model": "infernalexp:block/trapped_shimmer_sand", - "y": 180, - "x": 180 - }, - { - "model": "infernalexp:block/trapped_shimmer_sand", - "y": 180, - "x": 270 - }, - { - "model": "infernalexp:block/trapped_shimmer_sand", - "y": 270 - }, - { - "model": "infernalexp:block/trapped_shimmer_sand", - "y": 270, - "x": 90 - }, - { - "model": "infernalexp:block/trapped_shimmer_sand", - "y": 270, - "x": 180 - }, - { - "model": "infernalexp:block/trapped_shimmer_sand", - "y": 270, - "x": 270 - } - ] - } -} diff --git a/src/main/resources/assets/infernalexp/lang/de_de.json b/src/main/resources/assets/infernalexp/lang/de_de.json index bc5bb5ec8..d7b46bf32 100644 --- a/src/main/resources/assets/infernalexp/lang/de_de.json +++ b/src/main/resources/assets/infernalexp/lang/de_de.json @@ -48,7 +48,7 @@ "block.infernalexp.shimmer_stone_vertical_slab": "Schimmersteinvertikalstufe", "block.infernalexp.shimmer_stone_stairs": "Schimmersteintreppe", "block.infernalexp.shimmer_stone_wall": "Schimmersteinmauer", - "block.infernalexp.trapped_shimmer_sand": "Instabiler Schimmersand", + "block.infernalexp.glimmer_gravel": "Instabiler Schimmersand", "block.infernalexp.glow_fire": "Glow Fire", "block.infernalexp.shimmer_stone_bricks": "Schimmersteinziegel", "block.infernalexp.shimmer_stone_brick_slab": "Schimmersteinziegelstufe", diff --git a/src/main/resources/assets/infernalexp/lang/en_us.json b/src/main/resources/assets/infernalexp/lang/en_us.json index ac4886601..40d74a423 100644 --- a/src/main/resources/assets/infernalexp/lang/en_us.json +++ b/src/main/resources/assets/infernalexp/lang/en_us.json @@ -52,7 +52,7 @@ "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", "block.infernalexp.shimmer_stone_stairs": "Shimmer Stone Stairs", "block.infernalexp.shimmer_stone_wall": "Shimmer Stone Wall", - "block.infernalexp.trapped_shimmer_sand": "Glimmer Gravel", + "block.infernalexp.glimmer_gravel": "Glimmer Gravel", "block.infernalexp.glow_fire": "Glow Fire", "block.infernalexp.shimmer_stone_bricks": "Shimmer Stone Bricks", "block.infernalexp.shimmer_stone_brick_slab": "Shimmer Stone Brick Slab", diff --git a/src/main/resources/assets/infernalexp/lang/es_ar.json b/src/main/resources/assets/infernalexp/lang/es_ar.json index 4d11a9181..dfcdd7280 100644 --- a/src/main/resources/assets/infernalexp/lang/es_ar.json +++ b/src/main/resources/assets/infernalexp/lang/es_ar.json @@ -48,7 +48,7 @@ "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", "block.infernalexp.shimmer_stone_stairs": "Escaleras de piedra de polvo luminoso", "block.infernalexp.shimmer_stone_wall": "Pared de piedra de polvo luminoso", - "block.infernalexp.trapped_shimmer_sand": "Polvo luminoso inestable", + "block.infernalexp.glimmer_gravel": "Polvo luminoso inestable", "block.infernalexp.glow_fire": "Glow Fire", "block.infernalexp.shimmer_stone_bricks": "Ladrillos de piedra de polvo luminoso", "block.infernalexp.shimmer_stone_brick_slab": "Baldosa de ladrillos de piedra de polvo luminoso", diff --git a/src/main/resources/assets/infernalexp/lang/es_es.json b/src/main/resources/assets/infernalexp/lang/es_es.json index 86664b720..d7cdcc822 100644 --- a/src/main/resources/assets/infernalexp/lang/es_es.json +++ b/src/main/resources/assets/infernalexp/lang/es_es.json @@ -48,7 +48,7 @@ "block.infernalexp.shimmer_stone_vertical_slab": "Losa vertical de piedra de polvo luminoso", "block.infernalexp.shimmer_stone_stairs": "Escaleras de piedra de polvo luminoso", "block.infernalexp.shimmer_stone_wall": "Muro de piedra de polvo luminoso", - "block.infernalexp.trapped_shimmer_sand": "Arena de polvo luminoso inestable", + "block.infernalexp.glimmer_gravel": "Arena de polvo luminoso inestable", "block.infernalexp.glow_fire": "Glow Fire", "block.infernalexp.shimmer_stone_bricks": "Ladrillos de piedra de polvo luminoso", "block.infernalexp.shimmer_stone_brick_slab": "Losa de ladrillos de piedra de polvo luminoso", diff --git a/src/main/resources/assets/infernalexp/lang/fr_ca.json b/src/main/resources/assets/infernalexp/lang/fr_ca.json index d94e8a103..880261770 100644 --- a/src/main/resources/assets/infernalexp/lang/fr_ca.json +++ b/src/main/resources/assets/infernalexp/lang/fr_ca.json @@ -48,7 +48,7 @@ "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", "block.infernalexp.shimmer_stone_stairs": "Glowdust Stone Stairs", "block.infernalexp.shimmer_stone_wall": "Glowdust Stone Wall", - "block.infernalexp.trapped_shimmer_sand": "Unstable Glowdust Sand", + "block.infernalexp.glimmer_gravel": "Unstable Glowdust Sand", "block.infernalexp.glow_fire": "Glow Fire", "block.infernalexp.shimmer_stone_bricks": "Glowdust Stone Bricks", "block.infernalexp.shimmer_stone_brick_slab": "Glowdust Stone Brick Slab", diff --git a/src/main/resources/assets/infernalexp/lang/fr_fr.json b/src/main/resources/assets/infernalexp/lang/fr_fr.json index 18fcabc0c..bf5e83803 100644 --- a/src/main/resources/assets/infernalexp/lang/fr_fr.json +++ b/src/main/resources/assets/infernalexp/lang/fr_fr.json @@ -48,7 +48,7 @@ "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", "block.infernalexp.shimmer_stone_stairs": "Glowdust Stone Stairs", "block.infernalexp.shimmer_stone_wall": "Glowdust Stone Wall", - "block.infernalexp.trapped_shimmer_sand": "Unstable Glowdust Sand", + "block.infernalexp.glimmer_gravel": "Unstable Glowdust Sand", "block.infernalexp.glow_fire": "Glow Fire", "block.infernalexp.shimmer_stone_bricks": "Glowdust Stone Bricks", "block.infernalexp.shimmer_stone_brick_slab": "Glowdust Stone Brick Slab", diff --git a/src/main/resources/assets/infernalexp/lang/he_il.json b/src/main/resources/assets/infernalexp/lang/he_il.json index 05c5c8db4..c7d211a35 100644 --- a/src/main/resources/assets/infernalexp/lang/he_il.json +++ b/src/main/resources/assets/infernalexp/lang/he_il.json @@ -48,7 +48,7 @@ "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", "block.infernalexp.shimmer_stone_stairs": "Glowdust Stone Stairs", "block.infernalexp.shimmer_stone_wall": "Glowdust Stone Wall", - "block.infernalexp.trapped_shimmer_sand": "Unstable Glowdust Sand", + "block.infernalexp.glimmer_gravel": "Unstable Glowdust Sand", "block.infernalexp.glow_fire": "Glow Fire", "block.infernalexp.shimmer_stone_bricks": "Glowdust Stone Bricks", "block.infernalexp.shimmer_stone_brick_slab": "Glowdust Stone Brick Slab", diff --git a/src/main/resources/assets/infernalexp/lang/id_id.json b/src/main/resources/assets/infernalexp/lang/id_id.json index 2c2272bf5..0a9b92928 100644 --- a/src/main/resources/assets/infernalexp/lang/id_id.json +++ b/src/main/resources/assets/infernalexp/lang/id_id.json @@ -48,7 +48,7 @@ "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", "block.infernalexp.shimmer_stone_stairs": "Glowdust Stone Stairs", "block.infernalexp.shimmer_stone_wall": "Glowdust Stone Wall", - "block.infernalexp.trapped_shimmer_sand": "Unstable Glowdust Sand", + "block.infernalexp.glimmer_gravel": "Unstable Glowdust Sand", "block.infernalexp.glow_fire": "Glow Fire", "block.infernalexp.shimmer_stone_bricks": "Glowdust Stone Bricks", "block.infernalexp.shimmer_stone_brick_slab": "Glowdust Stone Brick Slab", diff --git a/src/main/resources/assets/infernalexp/lang/ja_jp.json b/src/main/resources/assets/infernalexp/lang/ja_jp.json index 133fbab42..8201d0924 100644 --- a/src/main/resources/assets/infernalexp/lang/ja_jp.json +++ b/src/main/resources/assets/infernalexp/lang/ja_jp.json @@ -48,7 +48,7 @@ "block.infernalexp.shimmer_stone_vertical_slab": "きらめく石の縦ハーフブロック", "block.infernalexp.shimmer_stone_stairs": "きらめく石の階段", "block.infernalexp.shimmer_stone_wall": "きらめく石の塀", - "block.infernalexp.trapped_shimmer_sand": "きらめく砂利", + "block.infernalexp.glimmer_gravel": "きらめく砂利", "block.infernalexp.glow_fire": "Glow Fire", "block.infernalexp.shimmer_stone_bricks": "きらめく石レンガ", "block.infernalexp.shimmer_stone_brick_slab": "きらめく石レンガのハーフブロック", diff --git a/src/main/resources/assets/infernalexp/lang/lol_us.json b/src/main/resources/assets/infernalexp/lang/lol_us.json index 40b9c5d9b..ce112ca30 100644 --- a/src/main/resources/assets/infernalexp/lang/lol_us.json +++ b/src/main/resources/assets/infernalexp/lang/lol_us.json @@ -48,7 +48,7 @@ "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", "block.infernalexp.shimmer_stone_stairs": "Glowdust Stone Stairs", "block.infernalexp.shimmer_stone_wall": "Glowdust Stone Wall", - "block.infernalexp.trapped_shimmer_sand": "Unstable Glowdust Sand", + "block.infernalexp.glimmer_gravel": "Unstable Glowdust Sand", "block.infernalexp.glow_fire": "Glow Fire", "block.infernalexp.shimmer_stone_bricks": "Glowdust Stone Bricks", "block.infernalexp.shimmer_stone_brick_slab": "Glowdust Stone Brick Slab", diff --git a/src/main/resources/assets/infernalexp/lang/lv_lv.json b/src/main/resources/assets/infernalexp/lang/lv_lv.json index 6a825bd9f..1c2dd58ea 100644 --- a/src/main/resources/assets/infernalexp/lang/lv_lv.json +++ b/src/main/resources/assets/infernalexp/lang/lv_lv.json @@ -48,7 +48,7 @@ "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", "block.infernalexp.shimmer_stone_stairs": "Shimmer Stone Stairs", "block.infernalexp.shimmer_stone_wall": "Shimmer Stone Wall", - "block.infernalexp.trapped_shimmer_sand": "Glimmer Gravel", + "block.infernalexp.glimmer_gravel": "Glimmer Gravel", "block.infernalexp.glow_fire": "Glow Fire", "block.infernalexp.shimmer_stone_bricks": "Shimmer Stone Bricks", "block.infernalexp.shimmer_stone_brick_slab": "Shimmer Stone Brick Slab", diff --git a/src/main/resources/assets/infernalexp/lang/ms_my.json b/src/main/resources/assets/infernalexp/lang/ms_my.json index f4fe0395a..c293b7627 100644 --- a/src/main/resources/assets/infernalexp/lang/ms_my.json +++ b/src/main/resources/assets/infernalexp/lang/ms_my.json @@ -48,7 +48,7 @@ "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", "block.infernalexp.shimmer_stone_stairs": "Glowdust Stone Stairs", "block.infernalexp.shimmer_stone_wall": "Glowdust Stone Wall", - "block.infernalexp.trapped_shimmer_sand": "Unstable Glowdust Sand", + "block.infernalexp.glimmer_gravel": "Unstable Glowdust Sand", "block.infernalexp.glow_fire": "Glow Fire", "block.infernalexp.shimmer_stone_bricks": "Glowdust Stone Bricks", "block.infernalexp.shimmer_stone_brick_slab": "Glowdust Stone Brick Slab", diff --git a/src/main/resources/assets/infernalexp/lang/nl_nl.json b/src/main/resources/assets/infernalexp/lang/nl_nl.json index b4bae08eb..eb7821930 100644 --- a/src/main/resources/assets/infernalexp/lang/nl_nl.json +++ b/src/main/resources/assets/infernalexp/lang/nl_nl.json @@ -48,7 +48,7 @@ "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", "block.infernalexp.shimmer_stone_stairs": "Glowdust Stone Stairs", "block.infernalexp.shimmer_stone_wall": "Glowdust Stone Wall", - "block.infernalexp.trapped_shimmer_sand": "Unstable Glowdust Sand", + "block.infernalexp.glimmer_gravel": "Unstable Glowdust Sand", "block.infernalexp.glow_fire": "Glow Fire", "block.infernalexp.shimmer_stone_bricks": "Glowdust Stone Bricks", "block.infernalexp.shimmer_stone_brick_slab": "Glowdust Stone Brick Slab", diff --git a/src/main/resources/assets/infernalexp/lang/pl_pl.json b/src/main/resources/assets/infernalexp/lang/pl_pl.json index 0042e8043..5cc5d6d22 100644 --- a/src/main/resources/assets/infernalexp/lang/pl_pl.json +++ b/src/main/resources/assets/infernalexp/lang/pl_pl.json @@ -48,7 +48,7 @@ "block.infernalexp.shimmer_stone_vertical_slab": "Pionowa jasnopyłowa kamienna płyta", "block.infernalexp.shimmer_stone_stairs": "Jasnopyłowe kamienne schody", "block.infernalexp.shimmer_stone_wall": "Jasnopyłowy kamienny murek", - "block.infernalexp.trapped_shimmer_sand": "Ruchomy jasnopyłowy piasek", + "block.infernalexp.glimmer_gravel": "Ruchomy jasnopyłowy piasek", "block.infernalexp.glow_fire": "Glow Fire", "block.infernalexp.shimmer_stone_bricks": "Jasnopyłowe kamienne cegły", "block.infernalexp.shimmer_stone_brick_slab": "Jasnopyłowa kamienna ceglana płyta", diff --git a/src/main/resources/assets/infernalexp/lang/pt_br.json b/src/main/resources/assets/infernalexp/lang/pt_br.json index 5621951f4..402d0ef72 100644 --- a/src/main/resources/assets/infernalexp/lang/pt_br.json +++ b/src/main/resources/assets/infernalexp/lang/pt_br.json @@ -48,7 +48,7 @@ "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", "block.infernalexp.shimmer_stone_stairs": "Shimmer Stone Stairs", "block.infernalexp.shimmer_stone_wall": "Shimmer Stone Wall", - "block.infernalexp.trapped_shimmer_sand": "Glimmer Gravel", + "block.infernalexp.glimmer_gravel": "Glimmer Gravel", "block.infernalexp.glow_fire": "Glow Fire", "block.infernalexp.shimmer_stone_bricks": "Shimmer Stone Bricks", "block.infernalexp.shimmer_stone_brick_slab": "Shimmer Stone Brick Slab", diff --git a/src/main/resources/assets/infernalexp/lang/ro_ro.json b/src/main/resources/assets/infernalexp/lang/ro_ro.json index 65e2df992..d9e7db546 100644 --- a/src/main/resources/assets/infernalexp/lang/ro_ro.json +++ b/src/main/resources/assets/infernalexp/lang/ro_ro.json @@ -48,7 +48,7 @@ "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", "block.infernalexp.shimmer_stone_stairs": "Shimmer Stone Stairs", "block.infernalexp.shimmer_stone_wall": "Shimmer Stone Wall", - "block.infernalexp.trapped_shimmer_sand": "Glimmer Gravel", + "block.infernalexp.glimmer_gravel": "Glimmer Gravel", "block.infernalexp.glow_fire": "Glow Fire", "block.infernalexp.shimmer_stone_bricks": "Shimmer Stone Bricks", "block.infernalexp.shimmer_stone_brick_slab": "Shimmer Stone Brick Slab", diff --git a/src/main/resources/assets/infernalexp/lang/ru_ru.json b/src/main/resources/assets/infernalexp/lang/ru_ru.json index 43cd16df7..360be589f 100644 --- a/src/main/resources/assets/infernalexp/lang/ru_ru.json +++ b/src/main/resources/assets/infernalexp/lang/ru_ru.json @@ -48,7 +48,7 @@ "block.infernalexp.shimmer_stone_vertical_slab": "Вертикальная плита из светопесчаника", "block.infernalexp.shimmer_stone_stairs": "Ступени из светопесчаника", "block.infernalexp.shimmer_stone_wall": "Ограда из светопесчаника", - "block.infernalexp.trapped_shimmer_sand": "Светогравий", + "block.infernalexp.glimmer_gravel": "Светогравий", "block.infernalexp.glow_fire": "Glow Fire", "block.infernalexp.shimmer_stone_bricks": "Кирпичи из светопесчаника", "block.infernalexp.shimmer_stone_brick_slab": "Кирпичная плита из светопесчаника", diff --git a/src/main/resources/assets/infernalexp/lang/zh_tw.json b/src/main/resources/assets/infernalexp/lang/zh_tw.json index 58e847ed8..f02cde54a 100644 --- a/src/main/resources/assets/infernalexp/lang/zh_tw.json +++ b/src/main/resources/assets/infernalexp/lang/zh_tw.json @@ -48,7 +48,7 @@ "block.infernalexp.shimmer_stone_vertical_slab": "Shimmer Stone Vertical Slab", "block.infernalexp.shimmer_stone_stairs": "Glowdust Stone Stairs", "block.infernalexp.shimmer_stone_wall": "Glowdust Stone Wall", - "block.infernalexp.trapped_shimmer_sand": "Unstable Glowdust Sand", + "block.infernalexp.glimmer_gravel": "Unstable Glowdust Sand", "block.infernalexp.glow_fire": "Glow Fire", "block.infernalexp.shimmer_stone_bricks": "Glowdust Stone Bricks", "block.infernalexp.shimmer_stone_brick_slab": "Glowdust Stone Brick Slab", diff --git a/src/main/resources/assets/infernalexp/models/block/glimmer_gravel.json b/src/main/resources/assets/infernalexp/models/block/glimmer_gravel.json new file mode 100644 index 000000000..86c97070c --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/block/glimmer_gravel.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "infernalexp:block/glimmer_gravel_animated" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/block/trapped_shimmer_sand.json b/src/main/resources/assets/infernalexp/models/block/trapped_shimmer_sand.json deleted file mode 100644 index 903113a7d..000000000 --- a/src/main/resources/assets/infernalexp/models/block/trapped_shimmer_sand.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "infernalexp:block/trapped_shimmer_sand_animated" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/glimmer_gravel.json b/src/main/resources/assets/infernalexp/models/item/glimmer_gravel.json new file mode 100644 index 000000000..5e72de404 --- /dev/null +++ b/src/main/resources/assets/infernalexp/models/item/glimmer_gravel.json @@ -0,0 +1,3 @@ +{ + "parent": "infernalexp:block/glimmer_gravel" +} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/models/item/trapped_shimmer_sand.json b/src/main/resources/assets/infernalexp/models/item/trapped_shimmer_sand.json deleted file mode 100644 index 1fd37bbe8..000000000 --- a/src/main/resources/assets/infernalexp/models/item/trapped_shimmer_sand.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "infernalexp:block/trapped_shimmer_sand" -} \ No newline at end of file diff --git a/src/main/resources/assets/infernalexp/textures/block/trapped_shimmer_sand.png b/src/main/resources/assets/infernalexp/textures/block/glimmer_gravel.png similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/trapped_shimmer_sand.png rename to src/main/resources/assets/infernalexp/textures/block/glimmer_gravel.png diff --git a/src/main/resources/assets/infernalexp/textures/block/trapped_shimmer_sand_animated.png b/src/main/resources/assets/infernalexp/textures/block/glimmer_gravel_animated.png similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/trapped_shimmer_sand_animated.png rename to src/main/resources/assets/infernalexp/textures/block/glimmer_gravel_animated.png diff --git a/src/main/resources/assets/infernalexp/textures/block/trapped_shimmer_sand_animated.png.mcmeta b/src/main/resources/assets/infernalexp/textures/block/glimmer_gravel_animated.png.mcmeta similarity index 100% rename from src/main/resources/assets/infernalexp/textures/block/trapped_shimmer_sand_animated.png.mcmeta rename to src/main/resources/assets/infernalexp/textures/block/glimmer_gravel_animated.png.mcmeta diff --git a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/trapped_shimmer_sand.json b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glimmer_gravel.json similarity index 84% rename from src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/trapped_shimmer_sand.json rename to src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glimmer_gravel.json index 4a3d85714..ca402ca41 100644 --- a/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/trapped_shimmer_sand.json +++ b/src/main/resources/data/infernalexp/recipes/crafting/crafting_shaped/glimmer_gravel.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "infernalexp:trapped_shimmer_sand", + "item": "infernalexp:glimmer_gravel", "count": 1 } } diff --git a/src/main/resources/data/infernalexp/tags/blocks/glow_fire_base_blocks.json b/src/main/resources/data/infernalexp/tags/blocks/glow_fire_base_blocks.json index b625bdd0b..39d3d5374 100644 --- a/src/main/resources/data/infernalexp/tags/blocks/glow_fire_base_blocks.json +++ b/src/main/resources/data/infernalexp/tags/blocks/glow_fire_base_blocks.json @@ -7,6 +7,6 @@ "infernalexp:shimmer_stone_bricks", "infernalexp:shimmer_stone_brick_slab", "infernalexp:shimmer_stone_brick_stairs", - "infernalexp:trapped_shimmer_sand" + "infernalexp:glimmer_gravel" ] } diff --git a/src/main/resources/data/infernalexp/tags/items/glowstone_canyon_blocks.json b/src/main/resources/data/infernalexp/tags/items/glowstone_canyon_blocks.json index 6fb31da88..52aaed227 100644 --- a/src/main/resources/data/infernalexp/tags/items/glowstone_canyon_blocks.json +++ b/src/main/resources/data/infernalexp/tags/items/glowstone_canyon_blocks.json @@ -42,7 +42,7 @@ "infernalexp:shimmer_stone_slab", "infernalexp:shimmer_stone_stairs", "infernalexp:shimmer_stone_wall", - "infernalexp:trapped_shimmer_sand", + "infernalexp:glimmer_gravel", "infernalexp:shimmer_stone_bricks", "infernalexp:shimmer_stone_brick_slab", "infernalexp:shimmer_stone_brick_stairs", diff --git a/src/main/resources/data/minecraft/tags/blocks/slabs.json b/src/main/resources/data/minecraft/tags/blocks/slabs.json index 899272f4d..06f76587a 100644 --- a/src/main/resources/data/minecraft/tags/blocks/slabs.json +++ b/src/main/resources/data/minecraft/tags/blocks/slabs.json @@ -9,7 +9,7 @@ "infernalexp:dullstone_brick_slab", "infernalexp:shimmer_stone_slab", "infernalexp:shimmer_stone_brick_slab", - "infernalexp:basalt_cobbled_slab", + "infernalexp:cobbled_basalt_slab", "infernalexp:basalt_slab", "infernalexp:polished_basalt_slab", "infernalexp:polished_basalt_tiles_slab", diff --git a/src/main/resources/data/minecraft/tags/items/slabs.json b/src/main/resources/data/minecraft/tags/items/slabs.json index 899272f4d..06f76587a 100644 --- a/src/main/resources/data/minecraft/tags/items/slabs.json +++ b/src/main/resources/data/minecraft/tags/items/slabs.json @@ -9,7 +9,7 @@ "infernalexp:dullstone_brick_slab", "infernalexp:shimmer_stone_slab", "infernalexp:shimmer_stone_brick_slab", - "infernalexp:basalt_cobbled_slab", + "infernalexp:cobbled_basalt_slab", "infernalexp:basalt_slab", "infernalexp:polished_basalt_slab", "infernalexp:polished_basalt_tiles_slab", diff --git a/src/main/resources/data/quark/tags/blocks/vertical_slab.json b/src/main/resources/data/quark/tags/blocks/vertical_slab.json index e7c82a9dc..696294e22 100644 --- a/src/main/resources/data/quark/tags/blocks/vertical_slab.json +++ b/src/main/resources/data/quark/tags/blocks/vertical_slab.json @@ -9,7 +9,7 @@ "infernalexp:dullstone_brick_vertical_slab", "infernalexp:shimmer_stone_vertical_slab", "infernalexp:shimmer_stone_brick_vertical_slab", - "infernalexp:basalt_cobbled_vertical_slab", + "infernalexp:cobbled_basalt_vertical_slab", "infernalexp:basalt_vertical_slab", "infernalexp:polished_basalt_vertical_slab", "infernalexp:polished_basalt_tiles_vertical_slab", diff --git a/src/main/resources/data/quark/tags/items/vertical_slab.json b/src/main/resources/data/quark/tags/items/vertical_slab.json index e7c82a9dc..696294e22 100644 --- a/src/main/resources/data/quark/tags/items/vertical_slab.json +++ b/src/main/resources/data/quark/tags/items/vertical_slab.json @@ -9,7 +9,7 @@ "infernalexp:dullstone_brick_vertical_slab", "infernalexp:shimmer_stone_vertical_slab", "infernalexp:shimmer_stone_brick_vertical_slab", - "infernalexp:basalt_cobbled_vertical_slab", + "infernalexp:cobbled_basalt_vertical_slab", "infernalexp:basalt_vertical_slab", "infernalexp:polished_basalt_vertical_slab", "infernalexp:polished_basalt_tiles_vertical_slab",