diff --git a/build.gradle b/build.gradle index c73439a6..ab8e9d1b 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'maven-publish' id 'idea' id 'eclipse' - id 'fabric-loom' version '1.7.+' + id 'fabric-loom' version '1.9.+' } apply from: 'https://raw.githubusercontent.com/TerraformersMC/GradleScripts/2.7/ferry.gradle' @@ -24,6 +24,8 @@ dependencies { includeMod "cloth-config", "me.shedaniel.cloth:cloth-config-fabric:${project.clothconfig_version}" + includeMod "mixson", "com.github.ramixin:mixson:${project.mixson_version}" + if (findProject(':cinderscapes-worldgen') != null) { includeMod "biolith", "com.terraformersmc:biolith-fabric:${biolith_version}" } @@ -95,7 +97,19 @@ allprojects { // Cloth Config maven { - url = "https://maven.shedaniel.me" + url = 'https://maven.shedaniel.me' + } + + // for Mixson + exclusiveContent { + forRepository { + maven { + url 'https://jitpack.io' + } + } + filter { + includeGroup "com.github.ramixin" + } } } } @@ -115,6 +129,8 @@ subprojects { modImplementation "com.terraformersmc.terraform-api:terraform-wood-api-v1:${project.terraform_wood_api_version}" modImplementation "me.shedaniel.cloth:cloth-config-fabric:${project.clothconfig_version}" + + modImplementation "com.github.ramixin:mixson:${project.mixson_version}" } version = rootProject.version diff --git a/client/src/main/java/com/terraformersmc/cinderscapes/CinderscapesClient.java b/client/src/main/java/com/terraformersmc/cinderscapes/CinderscapesClient.java index 925e1805..002aa58a 100644 --- a/client/src/main/java/com/terraformersmc/cinderscapes/CinderscapesClient.java +++ b/client/src/main/java/com/terraformersmc/cinderscapes/CinderscapesClient.java @@ -1,5 +1,6 @@ package com.terraformersmc.cinderscapes; +import com.terraformersmc.cinderscapes.init.CinderscapesArmorTrimItemModels; import com.terraformersmc.cinderscapes.init.CinderscapesBlocks; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.EnvType; @@ -17,6 +18,7 @@ public class CinderscapesClient implements ClientModInitializer { @Override public void onInitializeClient() { + CinderscapesArmorTrimItemModels.init(); BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getTranslucent(), // Ashy Shoals diff --git a/client/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesArmorTrimItemModels.java b/client/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesArmorTrimItemModels.java new file mode 100644 index 00000000..f349c907 --- /dev/null +++ b/client/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesArmorTrimItemModels.java @@ -0,0 +1,118 @@ +package com.terraformersmc.cinderscapes.init; + +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.terraformersmc.cinderscapes.Cinderscapes; +import net.minecraft.util.Identifier; +import net.ramixin.mixson.Mixson; +import net.ramixin.mixson.events.ModificationEvent; +import org.jetbrains.annotations.NotNull; + +import java.util.List; + +public final class CinderscapesArmorTrimItemModels { + private static final List ARMORS = List.of("helmet", "chestplate", "leggings", "boots"); + private static final List ARMOR_MATERIALS = List.of("leather", "chainmail", "iron", "golden", "diamond", "netherite"); + + @SuppressWarnings("UnnecessaryReturnStatement") + private CinderscapesArmorTrimItemModels() { + return; + } + + public static void init() { + /* + * Add trim materials to each armor. + */ + ARMORS.forEach(armor -> ARMOR_MATERIALS.forEach(armorMaterial -> registerAddTrimsToArmor(armor, armorMaterial))); + + // (dare to be different) + registerAddTrimsToArmor("helmet", "turtle"); + + /* + * Add trim materials to vanilla atlases. + */ + registerAddTrimsToAtlas("armor_trims"); + registerAddTrimsToAtlas("blocks"); + } + + private static void registerAddTrimsToArmor(String armor, String armorMaterial) { + Mixson.registerModificationEvent( + Identifier.ofVanilla("items/" + armorMaterial + "_" + armor), + Identifier.of(Cinderscapes.MOD_ID, "add_trims_to_" + armorMaterial + "_" + armor), + new ModificationEvent() { + @Override + public @NotNull JsonElement run(JsonElement elem) { + JsonObject root = elem.getAsJsonObject(); + JsonObject model = root.getAsJsonObject("model"); + JsonArray cases = model.getAsJsonArray("cases"); + JsonObject case0 = cases.get(0).getAsJsonObject(); + + CinderscapesArmorTrimMaterials.TRIM_MATERIALS.forEach(trim -> { + JsonObject newCase = case0.deepCopy(); + + newCase.addProperty("when", trimMaterialId(trim).toString()); + newCase.getAsJsonObject("model") + .addProperty("model", itemModelId(armor, armorMaterial, trim).toString()); + + cases.add(newCase); + }); + + return elem; + } + + @Override + public int ordinal() { + return 0; + } + } + ); + } + + private static void registerAddTrimsToAtlas(String name) { + Mixson.registerModificationEvent( + Identifier.ofVanilla("atlases/" + name), + Identifier.of(Cinderscapes.MOD_ID, "add_trims_to_" + name + "_atlas"), + new ModificationEvent() { + @Override + public @NotNull JsonElement run(JsonElement elem) { + JsonObject root = elem.getAsJsonObject(); + JsonArray sources = root.getAsJsonArray("sources"); + + for (int i = 0; i < sources.size(); ++i) { + JsonObject source = sources.get(i).getAsJsonObject(); + + if ("paletted_permutations".equals(source.getAsJsonPrimitive("type").getAsString())) { + JsonObject permutations = source.getAsJsonObject("permutations"); + + CinderscapesArmorTrimMaterials.TRIM_MATERIALS.forEach(trim -> + permutations.addProperty(trim, paletteId(trim).toString()) + ); + + break; + } + } + + return elem; + } + + @Override + public int ordinal() { + return 0; + } + } + ); + } + + private static Identifier trimMaterialId(String trim) { + return Identifier.of(Cinderscapes.MOD_ID, trim); + } + + private static Identifier itemModelId(String armor, String armorMaterial, String trim) { + return Identifier.of(Cinderscapes.MOD_ID, "item/" + armorMaterial + "_" + armor + "_" + trim + "_trim"); + } + + private static Identifier paletteId(String trim) { + return Identifier.of(Cinderscapes.MOD_ID, "trims/color_palettes/" + trim); + } +} diff --git a/client/src/main/resources/assets/cinderscapes/atlases/armor_trims.json b/client/src/main/resources/assets/cinderscapes/atlases/armor_trims.json deleted file mode 100644 index fbc0be69..00000000 --- a/client/src/main/resources/assets/cinderscapes/atlases/armor_trims.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "sources": [ - { - "type": "paletted_permutations", - "palette_key": "cinderscapes:trims/color_palettes/trim_palette", - "permutations": { - "rose_quartz": "cinderscapes:trims/color_palettes/rose_quartz", - "smoky_quartz": "cinderscapes:trims/color_palettes/smoky_quartz", - "sulfur_quartz": "cinderscapes:trims/color_palettes/sulfur_quartz" - } - } - ] -} diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/ash.json b/client/src/main/resources/assets/cinderscapes/blockstates/ash.json deleted file mode 100644 index 5017abfe..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/ash.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "layers=1": { - "model": "cinderscapes:block/ash_height2" - }, - "layers=2": { - "model": "cinderscapes:block/ash_height4" - }, - "layers=3": { - "model": "cinderscapes:block/ash_height6" - }, - "layers=4": { - "model": "cinderscapes:block/ash_height8" - }, - "layers=5": { - "model": "cinderscapes:block/ash_height10" - }, - "layers=6": { - "model": "cinderscapes:block/ash_height12" - }, - "layers=7": { - "model": "cinderscapes:block/ash_height14" - }, - "layers=8": { - "model": "cinderscapes:block/ash_block" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/ash_block.json b/client/src/main/resources/assets/cinderscapes/blockstates/ash_block.json deleted file mode 100644 index 4568f0d4..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/ash_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/ash_block" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/bramble_berry_bush.json b/client/src/main/resources/assets/cinderscapes/blockstates/bramble_berry_bush.json deleted file mode 100644 index 0068d2cd..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/bramble_berry_bush.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "age=0": { - "model": "cinderscapes:block/bramble_berry_bush_stage0" - }, - "age=1": { - "model": "cinderscapes:block/bramble_berry_bush_stage1" - }, - "age=2": { - "model": "cinderscapes:block/bramble_berry_bush_stage2" - }, - "age=3": { - "model": "cinderscapes:block/bramble_berry_bush_stage3" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/chiseled_rose_quartz_block.json b/client/src/main/resources/assets/cinderscapes/blockstates/chiseled_rose_quartz_block.json deleted file mode 100644 index 588e8447..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/chiseled_rose_quartz_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/chiseled_rose_quartz_block" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/chiseled_smoky_quartz_block.json b/client/src/main/resources/assets/cinderscapes/blockstates/chiseled_smoky_quartz_block.json deleted file mode 100644 index da01c337..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/chiseled_smoky_quartz_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/chiseled_smoky_quartz_block" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/chiseled_sulfur_quartz_block.json b/client/src/main/resources/assets/cinderscapes/blockstates/chiseled_sulfur_quartz_block.json deleted file mode 100644 index 444c4c0f..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/chiseled_sulfur_quartz_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/chiseled_sulfur_quartz_block" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/crystalline_quartz.json b/client/src/main/resources/assets/cinderscapes/blockstates/crystalline_quartz.json deleted file mode 100644 index 04816627..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/crystalline_quartz.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/crystalline_quartz" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/crystalline_rose_quartz.json b/client/src/main/resources/assets/cinderscapes/blockstates/crystalline_rose_quartz.json deleted file mode 100644 index 0a0d8f98..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/crystalline_rose_quartz.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/crystalline_rose_quartz" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/crystalline_smoky_quartz.json b/client/src/main/resources/assets/cinderscapes/blockstates/crystalline_smoky_quartz.json deleted file mode 100644 index 63dacd34..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/crystalline_smoky_quartz.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/crystalline_smoky_quartz" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/crystalline_sulfur_quartz.json b/client/src/main/resources/assets/cinderscapes/blockstates/crystalline_sulfur_quartz.json deleted file mode 100644 index d55d274d..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/crystalline_sulfur_quartz.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/crystalline_sulfur_quartz" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/crystinium.json b/client/src/main/resources/assets/cinderscapes/blockstates/crystinium.json deleted file mode 100644 index 0fc8c0e6..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/crystinium.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/crystinium" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/ghastly_ectoplasm.json b/client/src/main/resources/assets/cinderscapes/blockstates/ghastly_ectoplasm.json deleted file mode 100644 index 889bfcb3..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/ghastly_ectoplasm.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=top": { - "model": "cinderscapes:block/ghastly_ectoplasm_top" - }, - "type=middle": { - "model": "cinderscapes:block/ghastly_ectoplasm_middle" - }, - "type=bottom": { - "model": "cinderscapes:block/ghastly_ectoplasm_bottom" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/luminous_pod.json b/client/src/main/resources/assets/cinderscapes/blockstates/luminous_pod.json deleted file mode 100644 index 9cd4dc0d..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/luminous_pod.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "half=lower": { - "model": "cinderscapes:block/luminous_pod_bottom" - }, - "half=upper": { - "model": "cinderscapes:block/luminous_pod_top" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/nodzol.json b/client/src/main/resources/assets/cinderscapes/blockstates/nodzol.json deleted file mode 100644 index 88e81f95..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/nodzol.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/nodzol" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/photofern.json b/client/src/main/resources/assets/cinderscapes/blockstates/photofern.json deleted file mode 100644 index cbda8df8..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/photofern.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/photofern" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/polypite_quartz.json b/client/src/main/resources/assets/cinderscapes/blockstates/polypite_quartz.json deleted file mode 100644 index 074c9766..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/polypite_quartz.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "variants": { - "direction=west": { - "model": "cinderscapes:block/polypite_quartz_wall", - "y": 90 - }, - "direction=south": { - "model": "cinderscapes:block/polypite_quartz_wall" - }, - "direction=north": { - "model": "cinderscapes:block/polypite_quartz_wall", - "y": 180 - }, - "direction=east": { - "model": "cinderscapes:block/polypite_quartz_wall", - "y": 270 - }, - "direction=down": { - "model": "cinderscapes:block/polypite_quartz_floor" - }, - "direction=up": { - "model": "cinderscapes:block/polypite_quartz_floor", - "x": 180 - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/polypite_rose_quartz.json b/client/src/main/resources/assets/cinderscapes/blockstates/polypite_rose_quartz.json deleted file mode 100644 index 24cc542e..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/polypite_rose_quartz.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "variants": { - "direction=west": { - "model": "cinderscapes:block/polypite_rose_quartz_wall", - "y": 90 - }, - "direction=south": { - "model": "cinderscapes:block/polypite_rose_quartz_wall" - }, - "direction=north": { - "model": "cinderscapes:block/polypite_rose_quartz_wall", - "y": 180 - }, - "direction=east": { - "model": "cinderscapes:block/polypite_rose_quartz_wall", - "y": 270 - }, - "direction=down": { - "model": "cinderscapes:block/polypite_rose_quartz_floor" - }, - "direction=up": { - "model": "cinderscapes:block/polypite_rose_quartz_floor", - "x": 180 - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/polypite_smoky_quartz.json b/client/src/main/resources/assets/cinderscapes/blockstates/polypite_smoky_quartz.json deleted file mode 100644 index 54c2cb18..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/polypite_smoky_quartz.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "variants": { - "direction=west": { - "model": "cinderscapes:block/polypite_smoky_quartz_wall", - "y": 90 - }, - "direction=south": { - "model": "cinderscapes:block/polypite_smoky_quartz_wall" - }, - "direction=north": { - "model": "cinderscapes:block/polypite_smoky_quartz_wall", - "y": 180 - }, - "direction=east": { - "model": "cinderscapes:block/polypite_smoky_quartz_wall", - "y": 270 - }, - "direction=down": { - "model": "cinderscapes:block/polypite_smoky_quartz_floor" - }, - "direction=up": { - "model": "cinderscapes:block/polypite_smoky_quartz_floor", - "x": 180 - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/polypite_sulfur_quartz.json b/client/src/main/resources/assets/cinderscapes/blockstates/polypite_sulfur_quartz.json deleted file mode 100644 index ee8ee8b0..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/polypite_sulfur_quartz.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "variants": { - "direction=west": { - "model": "cinderscapes:block/polypite_sulfur_quartz_wall", - "y": 90 - }, - "direction=south": { - "model": "cinderscapes:block/polypite_sulfur_quartz_wall" - }, - "direction=north": { - "model": "cinderscapes:block/polypite_sulfur_quartz_wall", - "y": 180 - }, - "direction=east": { - "model": "cinderscapes:block/polypite_sulfur_quartz_wall", - "y": 270 - }, - "direction=down": { - "model": "cinderscapes:block/polypite_sulfur_quartz_floor" - }, - "direction=up": { - "model": "cinderscapes:block/polypite_sulfur_quartz_floor", - "x": 180 - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/potted_crystinium.json b/client/src/main/resources/assets/cinderscapes/blockstates/potted_crystinium.json deleted file mode 100644 index d6b58d0b..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/potted_crystinium.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "cinderscapes:block/potted_crystinium" } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/potted_luminous_pod.json b/client/src/main/resources/assets/cinderscapes/blockstates/potted_luminous_pod.json deleted file mode 100644 index f302db87..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/potted_luminous_pod.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "cinderscapes:block/potted_luminous_pod" } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/potted_photofern.json b/client/src/main/resources/assets/cinderscapes/blockstates/potted_photofern.json deleted file mode 100644 index 0f6bd249..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/potted_photofern.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "cinderscapes:block/potted_photofern" } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/potted_polypite_quartz.json b/client/src/main/resources/assets/cinderscapes/blockstates/potted_polypite_quartz.json deleted file mode 100644 index c4915d6e..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/potted_polypite_quartz.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "cinderscapes:block/potted_polypite_quartz" } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/potted_polypite_rose_quartz.json b/client/src/main/resources/assets/cinderscapes/blockstates/potted_polypite_rose_quartz.json deleted file mode 100644 index d3e002fd..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/potted_polypite_rose_quartz.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "cinderscapes:block/potted_polypite_rose_quartz" } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/potted_polypite_smoky_quartz.json b/client/src/main/resources/assets/cinderscapes/blockstates/potted_polypite_smoky_quartz.json deleted file mode 100644 index ac55ac73..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/potted_polypite_smoky_quartz.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "cinderscapes:block/potted_polypite_smoky_quartz" } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/potted_polypite_sulfur_quartz.json b/client/src/main/resources/assets/cinderscapes/blockstates/potted_polypite_sulfur_quartz.json deleted file mode 100644 index 4c7b0bd0..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/potted_polypite_sulfur_quartz.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "cinderscapes:block/potted_polypite_sulfur_quartz" } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/potted_pyracinth.json b/client/src/main/resources/assets/cinderscapes/blockstates/potted_pyracinth.json deleted file mode 100644 index a5f49ecf..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/potted_pyracinth.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "cinderscapes:block/potted_pyracinth" } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/potted_scorched_shrub.json b/client/src/main/resources/assets/cinderscapes/blockstates/potted_scorched_shrub.json deleted file mode 100644 index 128889e8..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/potted_scorched_shrub.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "cinderscapes:block/potted_scorched_shrub" } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/potted_scorched_tendrils.json b/client/src/main/resources/assets/cinderscapes/blockstates/potted_scorched_tendrils.json deleted file mode 100644 index 06ad37a1..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/potted_scorched_tendrils.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "cinderscapes:block/potted_scorched_tendrils" } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/potted_twilight_tendrils.json b/client/src/main/resources/assets/cinderscapes/blockstates/potted_twilight_tendrils.json deleted file mode 100644 index 955f9990..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/potted_twilight_tendrils.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "cinderscapes:block/potted_twilight_tendrils" } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/potted_umbral_fungus.json b/client/src/main/resources/assets/cinderscapes/blockstates/potted_umbral_fungus.json deleted file mode 100644 index 56bab0ca..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/potted_umbral_fungus.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "cinderscapes:block/potted_umbral_fungus" } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/pyracinth.json b/client/src/main/resources/assets/cinderscapes/blockstates/pyracinth.json deleted file mode 100644 index cf0ee5b6..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/pyracinth.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/pyracinth" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/quartz_sand.json b/client/src/main/resources/assets/cinderscapes/blockstates/quartz_sand.json deleted file mode 100644 index 38b1f57b..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/quartz_sand.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/quartz_sand" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/rose_quartz_block.json b/client/src/main/resources/assets/cinderscapes/blockstates/rose_quartz_block.json deleted file mode 100644 index 0c5fd795..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/rose_quartz_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/rose_quartz_block" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/rose_quartz_bricks.json b/client/src/main/resources/assets/cinderscapes/blockstates/rose_quartz_bricks.json deleted file mode 100644 index 3f7c9717..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/rose_quartz_bricks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/rose_quartz_bricks" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/rose_quartz_ore.json b/client/src/main/resources/assets/cinderscapes/blockstates/rose_quartz_ore.json deleted file mode 100644 index cf2413c1..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/rose_quartz_ore.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/rose_quartz_ore" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/rose_quartz_pillar.json b/client/src/main/resources/assets/cinderscapes/blockstates/rose_quartz_pillar.json deleted file mode 100644 index 4b1d096a..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/rose_quartz_pillar.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "cinderscapes:block/rose_quartz_pillar", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "cinderscapes:block/rose_quartz_pillar" - }, - "axis=z": { - "model": "cinderscapes:block/rose_quartz_pillar", - "x": 90 - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/rose_quartz_slab.json b/client/src/main/resources/assets/cinderscapes/blockstates/rose_quartz_slab.json deleted file mode 100644 index 29e6a7d0..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/rose_quartz_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "cinderscapes:block/rose_quartz_slab" - }, - "type=double": { - "model": "cinderscapes:block/rose_quartz_block" - }, - "type=top": { - "model": "cinderscapes:block/rose_quartz_slab_top" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/rose_quartz_stairs.json b/client/src/main/resources/assets/cinderscapes/blockstates/rose_quartz_stairs.json deleted file mode 100644 index 5d8c8076..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/rose_quartz_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/rose_quartz_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/rose_quartz_stairs_inner" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/rose_quartz_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/rose_quartz_stairs_outer" - }, - "facing=east,half=bottom,shape=straight": { - "model": "cinderscapes:block/rose_quartz_stairs" - }, - "facing=east,half=top,shape=inner_left": { - "model": "cinderscapes:block/rose_quartz_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "cinderscapes:block/rose_quartz_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "cinderscapes:block/rose_quartz_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "cinderscapes:block/rose_quartz_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "cinderscapes:block/rose_quartz_stairs", - "x": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/rose_quartz_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/rose_quartz_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/rose_quartz_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/rose_quartz_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "cinderscapes:block/rose_quartz_stairs", - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "cinderscapes:block/rose_quartz_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "cinderscapes:block/rose_quartz_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "cinderscapes:block/rose_quartz_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "cinderscapes:block/rose_quartz_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "cinderscapes:block/rose_quartz_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/rose_quartz_stairs_inner" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/rose_quartz_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/rose_quartz_stairs_outer" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/rose_quartz_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "cinderscapes:block/rose_quartz_stairs", - "y": 90, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "cinderscapes:block/rose_quartz_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "cinderscapes:block/rose_quartz_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "cinderscapes:block/rose_quartz_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "cinderscapes:block/rose_quartz_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "cinderscapes:block/rose_quartz_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/rose_quartz_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/rose_quartz_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/rose_quartz_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/rose_quartz_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=west,half=bottom,shape=straight": { - "model": "cinderscapes:block/rose_quartz_stairs", - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "cinderscapes:block/rose_quartz_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "cinderscapes:block/rose_quartz_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "cinderscapes:block/rose_quartz_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "cinderscapes:block/rose_quartz_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "cinderscapes:block/rose_quartz_stairs", - "x": 180, - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_button.json b/client/src/main/resources/assets/cinderscapes/blockstates/scorched_button.json deleted file mode 100644 index f0f4c083..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=ceiling,facing=east,powered=false": { - "model": "cinderscapes:block/scorched_button", - "y": 270, - "x": 180 - }, - "face=ceiling,facing=east,powered=true": { - "model": "cinderscapes:block/scorched_button_pressed", - "y": 270, - "x": 180 - }, - "face=ceiling,facing=north,powered=false": { - "model": "cinderscapes:block/scorched_button", - "y": 180, - "x": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "cinderscapes:block/scorched_button_pressed", - "y": 180, - "x": 180 - }, - "face=ceiling,facing=south,powered=false": { - "model": "cinderscapes:block/scorched_button", - "x": 180 - }, - "face=ceiling,facing=south,powered=true": { - "model": "cinderscapes:block/scorched_button_pressed", - "x": 180 - }, - "face=ceiling,facing=west,powered=false": { - "model": "cinderscapes:block/scorched_button", - "y": 90, - "x": 180 - }, - "face=ceiling,facing=west,powered=true": { - "model": "cinderscapes:block/scorched_button_pressed", - "y": 90, - "x": 180 - }, - "face=floor,facing=east,powered=false": { - "model": "cinderscapes:block/scorched_button", - "y": 90 - }, - "face=floor,facing=east,powered=true": { - "model": "cinderscapes:block/scorched_button_pressed", - "y": 90 - }, - "face=floor,facing=north,powered=false": { - "model": "cinderscapes:block/scorched_button" - }, - "face=floor,facing=north,powered=true": { - "model": "cinderscapes:block/scorched_button_pressed" - }, - "face=floor,facing=south,powered=false": { - "model": "cinderscapes:block/scorched_button", - "y": 180 - }, - "face=floor,facing=south,powered=true": { - "model": "cinderscapes:block/scorched_button_pressed", - "y": 180 - }, - "face=floor,facing=west,powered=false": { - "model": "cinderscapes:block/scorched_button", - "y": 270 - }, - "face=floor,facing=west,powered=true": { - "model": "cinderscapes:block/scorched_button_pressed", - "y": 270 - }, - "face=wall,facing=east,powered=false": { - "model": "cinderscapes:block/scorched_button", - "y": 90, - "x": 90, - "uvlock": true - }, - "face=wall,facing=east,powered=true": { - "model": "cinderscapes:block/scorched_button_pressed", - "y": 90, - "x": 90, - "uvlock": true - }, - "face=wall,facing=north,powered=false": { - "model": "cinderscapes:block/scorched_button", - "x": 90, - "uvlock": true - }, - "face=wall,facing=north,powered=true": { - "model": "cinderscapes:block/scorched_button_pressed", - "x": 90, - "uvlock": true - }, - "face=wall,facing=south,powered=false": { - "model": "cinderscapes:block/scorched_button", - "y": 180, - "x": 90, - "uvlock": true - }, - "face=wall,facing=south,powered=true": { - "model": "cinderscapes:block/scorched_button_pressed", - "y": 180, - "x": 90, - "uvlock": true - }, - "face=wall,facing=west,powered=false": { - "model": "cinderscapes:block/scorched_button", - "y": 270, - "x": 90, - "uvlock": true - }, - "face=wall,facing=west,powered=true": { - "model": "cinderscapes:block/scorched_button_pressed", - "y": 270, - "x": 90, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_door.json b/client/src/main/resources/assets/cinderscapes/blockstates/scorched_door.json deleted file mode 100644 index 6a4717ea..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_door.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "cinderscapes:block/scorched_door_bottom_left" }, - "facing=east,half=lower,hinge=left,open=true": { "model": "cinderscapes:block/scorched_door_bottom_left_open", "y": 90 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "cinderscapes:block/scorched_door_bottom_right" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "cinderscapes:block/scorched_door_bottom_right_open", "y": 270 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "cinderscapes:block/scorched_door_top_left" }, - "facing=east,half=upper,hinge=left,open=true": { "model": "cinderscapes:block/scorched_door_top_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "cinderscapes:block/scorched_door_top_right" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "cinderscapes:block/scorched_door_top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "cinderscapes:block/scorched_door_bottom_left", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "cinderscapes:block/scorched_door_bottom_left_open" }, - "facing=north,half=lower,hinge=right,open=false": { "model": "cinderscapes:block/scorched_door_bottom_right", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "cinderscapes:block/scorched_door_bottom_right_open", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "cinderscapes:block/scorched_door_top_left", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "cinderscapes:block/scorched_door_top_left_open" }, - "facing=north,half=upper,hinge=right,open=false": { "model": "cinderscapes:block/scorched_door_top_right", "y": 270 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "cinderscapes:block/scorched_door_top_right_open", "y": 180 }, - "facing=south,half=lower,hinge=left,open=false": { "model": "cinderscapes:block/scorched_door_bottom_left", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "cinderscapes:block/scorched_door_bottom_left_open", "y": 180 }, - "facing=south,half=lower,hinge=right,open=false": { "model": "cinderscapes:block/scorched_door_bottom_right", "y": 90 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "cinderscapes:block/scorched_door_bottom_right_open" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "cinderscapes:block/scorched_door_top_left", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "cinderscapes:block/scorched_door_top_left_open", "y": 180 }, - "facing=south,half=upper,hinge=right,open=false": { "model": "cinderscapes:block/scorched_door_top_right", "y": 90 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "cinderscapes:block/scorched_door_top_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { "model": "cinderscapes:block/scorched_door_bottom_left", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "cinderscapes:block/scorched_door_bottom_left_open", "y": 270 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "cinderscapes:block/scorched_door_bottom_right", "y": 180 }, - "facing=west,half=lower,hinge=right,open=true": { "model": "cinderscapes:block/scorched_door_bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "cinderscapes:block/scorched_door_top_left", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "cinderscapes:block/scorched_door_top_left_open", "y": 270 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "cinderscapes:block/scorched_door_top_right", "y": 180 }, - "facing=west,half=upper,hinge=right,open=true": { "model": "cinderscapes:block/scorched_door_top_right_open", "y": 90 } - } -} diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_fence.json b/client/src/main/resources/assets/cinderscapes/blockstates/scorched_fence.json deleted file mode 100644 index 1776e4de..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "cinderscapes:block/scorched_fence_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "cinderscapes:block/scorched_fence_side", - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "cinderscapes:block/scorched_fence_side", - "y": 90, - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "cinderscapes:block/scorched_fence_side", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "cinderscapes:block/scorched_fence_side", - "y": 270, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_fence_gate.json b/client/src/main/resources/assets/cinderscapes/blockstates/scorched_fence_gate.json deleted file mode 100644 index 8b716a80..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=east,in_wall=false,open=false": { - "uvlock": true, - "y": 270, - "model": "cinderscapes:block/scorched_fence_gate" - }, - "facing=east,in_wall=false,open=true": { - "uvlock": true, - "y": 270, - "model": "cinderscapes:block/scorched_fence_gate_open" - }, - "facing=east,in_wall=true,open=false": { - "uvlock": true, - "y": 270, - "model": "cinderscapes:block/scorched_fence_gate_wall" - }, - "facing=east,in_wall=true,open=true": { - "uvlock": true, - "y": 270, - "model": "cinderscapes:block/scorched_fence_gate_wall_open" - }, - "facing=north,in_wall=false,open=false": { - "uvlock": true, - "y": 180, - "model": "cinderscapes:block/scorched_fence_gate" - }, - "facing=north,in_wall=false,open=true": { - "uvlock": true, - "y": 180, - "model": "cinderscapes:block/scorched_fence_gate_open" - }, - "facing=north,in_wall=true,open=false": { - "uvlock": true, - "y": 180, - "model": "cinderscapes:block/scorched_fence_gate_wall" - }, - "facing=north,in_wall=true,open=true": { - "uvlock": true, - "y": 180, - "model": "cinderscapes:block/scorched_fence_gate_wall_open" - }, - "facing=south,in_wall=false,open=false": { - "uvlock": true, - "model": "cinderscapes:block/scorched_fence_gate" - }, - "facing=south,in_wall=false,open=true": { - "uvlock": true, - "model": "cinderscapes:block/scorched_fence_gate_open" - }, - "facing=south,in_wall=true,open=false": { - "uvlock": true, - "model": "cinderscapes:block/scorched_fence_gate_wall" - }, - "facing=south,in_wall=true,open=true": { - "uvlock": true, - "model": "cinderscapes:block/scorched_fence_gate_wall_open" - }, - "facing=west,in_wall=false,open=false": { - "uvlock": true, - "y": 90, - "model": "cinderscapes:block/scorched_fence_gate" - }, - "facing=west,in_wall=false,open=true": { - "uvlock": true, - "y": 90, - "model": "cinderscapes:block/scorched_fence_gate_open" - }, - "facing=west,in_wall=true,open=false": { - "uvlock": true, - "y": 90, - "model": "cinderscapes:block/scorched_fence_gate_wall" - }, - "facing=west,in_wall=true,open=true": { - "uvlock": true, - "y": 90, - "model": "cinderscapes:block/scorched_fence_gate_wall_open" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_hanging_sign.json b/client/src/main/resources/assets/cinderscapes/blockstates/scorched_hanging_sign.json deleted file mode 100644 index d2cc51b0..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_hanging_sign.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "cinderscapes:block/scorched_hanging_sign" } - } -} diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_hyphae.json b/client/src/main/resources/assets/cinderscapes/blockstates/scorched_hyphae.json deleted file mode 100644 index 4160f32b..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_hyphae.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "cinderscapes:block/scorched_hyphae", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "cinderscapes:block/scorched_hyphae" - }, - "axis=z": { - "model": "cinderscapes:block/scorched_hyphae", - "x": 90 - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_planks.json b/client/src/main/resources/assets/cinderscapes/blockstates/scorched_planks.json deleted file mode 100644 index d97f4cd6..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/scorched_planks" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_pressure_plate.json b/client/src/main/resources/assets/cinderscapes/blockstates/scorched_pressure_plate.json deleted file mode 100644 index 0a965745..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "cinderscapes:block/scorched_pressure_plate" - }, - "powered=true": { - "model": "cinderscapes:block/scorched_pressure_plate_down" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_shrub.json b/client/src/main/resources/assets/cinderscapes/blockstates/scorched_shrub.json deleted file mode 100644 index ae0d9061..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_shrub.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/scorched_shrub" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_sign.json b/client/src/main/resources/assets/cinderscapes/blockstates/scorched_sign.json deleted file mode 100644 index b356b4fa..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/scorched_sign" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_slab.json b/client/src/main/resources/assets/cinderscapes/blockstates/scorched_slab.json deleted file mode 100644 index b986c7db..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "cinderscapes:block/scorched_slab" - }, - "type=double": { - "model": "cinderscapes:block/scorched_planks" - }, - "type=top": { - "model": "cinderscapes:block/scorched_slab_top" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_sprouts.json b/client/src/main/resources/assets/cinderscapes/blockstates/scorched_sprouts.json deleted file mode 100644 index b244210f..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_sprouts.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/scorched_sprouts" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_stairs.json b/client/src/main/resources/assets/cinderscapes/blockstates/scorched_stairs.json deleted file mode 100644 index 84f01503..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/scorched_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/scorched_stairs_inner" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/scorched_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/scorched_stairs_outer" - }, - "facing=east,half=bottom,shape=straight": { - "model": "cinderscapes:block/scorched_stairs" - }, - "facing=east,half=top,shape=inner_left": { - "model": "cinderscapes:block/scorched_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "cinderscapes:block/scorched_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "cinderscapes:block/scorched_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "cinderscapes:block/scorched_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "cinderscapes:block/scorched_stairs", - "x": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/scorched_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/scorched_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/scorched_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/scorched_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "cinderscapes:block/scorched_stairs", - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "cinderscapes:block/scorched_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "cinderscapes:block/scorched_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "cinderscapes:block/scorched_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "cinderscapes:block/scorched_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "cinderscapes:block/scorched_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/scorched_stairs_inner" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/scorched_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/scorched_stairs_outer" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/scorched_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "cinderscapes:block/scorched_stairs", - "y": 90, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "cinderscapes:block/scorched_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "cinderscapes:block/scorched_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "cinderscapes:block/scorched_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "cinderscapes:block/scorched_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "cinderscapes:block/scorched_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/scorched_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/scorched_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/scorched_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/scorched_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=west,half=bottom,shape=straight": { - "model": "cinderscapes:block/scorched_stairs", - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "cinderscapes:block/scorched_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "cinderscapes:block/scorched_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "cinderscapes:block/scorched_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "cinderscapes:block/scorched_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "cinderscapes:block/scorched_stairs", - "x": 180, - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_stem.json b/client/src/main/resources/assets/cinderscapes/blockstates/scorched_stem.json deleted file mode 100644 index 7b176e9a..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_stem.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "cinderscapes:block/scorched_stem", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "cinderscapes:block/scorched_stem" - }, - "axis=z": { - "model": "cinderscapes:block/scorched_stem", - "x": 90 - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_tendrils.json b/client/src/main/resources/assets/cinderscapes/blockstates/scorched_tendrils.json deleted file mode 100644 index 867fe331..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_tendrils.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/scorched_tendrils" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_trapdoor.json b/client/src/main/resources/assets/cinderscapes/blockstates/scorched_trapdoor.json deleted file mode 100644 index 110f0283..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_trapdoor.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,open=false": { - "model": "cinderscapes:block/scorched_trapdoor_bottom", - "y": 90 - }, - "facing=east,half=bottom,open=true": { - "model": "cinderscapes:block/scorched_trapdoor_open", - "y": 90 - }, - "facing=east,half=top,open=false": { - "model": "cinderscapes:block/scorched_trapdoor_top", - "y": 90 - }, - "facing=east,half=top,open=true": { - "model": "cinderscapes:block/scorched_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=north,half=bottom,open=false": { - "model": "cinderscapes:block/scorched_trapdoor_bottom" - }, - "facing=north,half=bottom,open=true": { - "model": "cinderscapes:block/scorched_trapdoor_open" - }, - "facing=north,half=top,open=false": { - "model": "cinderscapes:block/scorched_trapdoor_top" - }, - "facing=north,half=top,open=true": { - "model": "cinderscapes:block/scorched_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=bottom,open=false": { - "model": "cinderscapes:block/scorched_trapdoor_bottom", - "y": 180 - }, - "facing=south,half=bottom,open=true": { - "model": "cinderscapes:block/scorched_trapdoor_open", - "y": 180 - }, - "facing=south,half=top,open=false": { - "model": "cinderscapes:block/scorched_trapdoor_top", - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "cinderscapes:block/scorched_trapdoor_open", - "x": 180, - "y": 0 - }, - "facing=west,half=bottom,open=false": { - "model": "cinderscapes:block/scorched_trapdoor_bottom", - "y": 270 - }, - "facing=west,half=bottom,open=true": { - "model": "cinderscapes:block/scorched_trapdoor_open", - "y": 270 - }, - "facing=west,half=top,open=false": { - "model": "cinderscapes:block/scorched_trapdoor_top", - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "cinderscapes:block/scorched_trapdoor_open", - "x": 180, - "y": 90 - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_wall_hanging_sign.json b/client/src/main/resources/assets/cinderscapes/blockstates/scorched_wall_hanging_sign.json deleted file mode 100644 index d2cc51b0..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_wall_hanging_sign.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "cinderscapes:block/scorched_hanging_sign" } - } -} diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_wall_sign.json b/client/src/main/resources/assets/cinderscapes/blockstates/scorched_wall_sign.json deleted file mode 100644 index b356b4fa..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/scorched_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/scorched_sign" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/smoky_quartz_block.json b/client/src/main/resources/assets/cinderscapes/blockstates/smoky_quartz_block.json deleted file mode 100644 index 2498730b..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/smoky_quartz_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/smoky_quartz_block" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/smoky_quartz_bricks.json b/client/src/main/resources/assets/cinderscapes/blockstates/smoky_quartz_bricks.json deleted file mode 100644 index fc84dfd4..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/smoky_quartz_bricks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/smoky_quartz_bricks" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/smoky_quartz_ore.json b/client/src/main/resources/assets/cinderscapes/blockstates/smoky_quartz_ore.json deleted file mode 100644 index a7096c88..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/smoky_quartz_ore.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/smoky_quartz_ore" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/smoky_quartz_pillar.json b/client/src/main/resources/assets/cinderscapes/blockstates/smoky_quartz_pillar.json deleted file mode 100644 index 22d6ad96..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/smoky_quartz_pillar.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "cinderscapes:block/smoky_quartz_pillar", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "cinderscapes:block/smoky_quartz_pillar" - }, - "axis=z": { - "model": "cinderscapes:block/smoky_quartz_pillar", - "x": 90 - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/smoky_quartz_slab.json b/client/src/main/resources/assets/cinderscapes/blockstates/smoky_quartz_slab.json deleted file mode 100644 index 786c27e3..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/smoky_quartz_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "cinderscapes:block/smoky_quartz_slab" - }, - "type=double": { - "model": "cinderscapes:block/smoky_quartz_block" - }, - "type=top": { - "model": "cinderscapes:block/smoky_quartz_slab_top" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/smoky_quartz_stairs.json b/client/src/main/resources/assets/cinderscapes/blockstates/smoky_quartz_stairs.json deleted file mode 100644 index 3e2e924d..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/smoky_quartz_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/smoky_quartz_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/smoky_quartz_stairs_inner" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/smoky_quartz_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/smoky_quartz_stairs_outer" - }, - "facing=east,half=bottom,shape=straight": { - "model": "cinderscapes:block/smoky_quartz_stairs" - }, - "facing=east,half=top,shape=inner_left": { - "model": "cinderscapes:block/smoky_quartz_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "cinderscapes:block/smoky_quartz_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "cinderscapes:block/smoky_quartz_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "cinderscapes:block/smoky_quartz_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "cinderscapes:block/smoky_quartz_stairs", - "x": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/smoky_quartz_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/smoky_quartz_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/smoky_quartz_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/smoky_quartz_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "cinderscapes:block/smoky_quartz_stairs", - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "cinderscapes:block/smoky_quartz_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "cinderscapes:block/smoky_quartz_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "cinderscapes:block/smoky_quartz_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "cinderscapes:block/smoky_quartz_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "cinderscapes:block/smoky_quartz_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/smoky_quartz_stairs_inner" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/smoky_quartz_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/smoky_quartz_stairs_outer" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/smoky_quartz_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "cinderscapes:block/smoky_quartz_stairs", - "y": 90, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "cinderscapes:block/smoky_quartz_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "cinderscapes:block/smoky_quartz_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "cinderscapes:block/smoky_quartz_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "cinderscapes:block/smoky_quartz_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "cinderscapes:block/smoky_quartz_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/smoky_quartz_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/smoky_quartz_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/smoky_quartz_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/smoky_quartz_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=west,half=bottom,shape=straight": { - "model": "cinderscapes:block/smoky_quartz_stairs", - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "cinderscapes:block/smoky_quartz_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "cinderscapes:block/smoky_quartz_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "cinderscapes:block/smoky_quartz_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "cinderscapes:block/smoky_quartz_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "cinderscapes:block/smoky_quartz_stairs", - "x": 180, - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/smooth_rose_quartz.json b/client/src/main/resources/assets/cinderscapes/blockstates/smooth_rose_quartz.json deleted file mode 100644 index 9d08900e..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/smooth_rose_quartz.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/smooth_rose_quartz" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/smooth_rose_quartz_slab.json b/client/src/main/resources/assets/cinderscapes/blockstates/smooth_rose_quartz_slab.json deleted file mode 100644 index 66139918..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/smooth_rose_quartz_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "cinderscapes:block/smooth_rose_quartz_slab" - }, - "type=double": { - "model": "cinderscapes:block/smooth_rose_quartz" - }, - "type=top": { - "model": "cinderscapes:block/smooth_rose_quartz_slab_top" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/smooth_rose_quartz_stairs.json b/client/src/main/resources/assets/cinderscapes/blockstates/smooth_rose_quartz_stairs.json deleted file mode 100644 index 92fb093a..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/smooth_rose_quartz_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_inner" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_outer" - }, - "facing=east,half=bottom,shape=straight": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs" - }, - "facing=east,half=top,shape=inner_left": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs", - "x": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs", - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_inner" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_outer" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs", - "y": 90, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=west,half=bottom,shape=straight": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs", - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "cinderscapes:block/smooth_rose_quartz_stairs", - "x": 180, - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/smooth_smoky_quartz.json b/client/src/main/resources/assets/cinderscapes/blockstates/smooth_smoky_quartz.json deleted file mode 100644 index 16752ebd..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/smooth_smoky_quartz.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/smooth_smoky_quartz" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/smooth_smoky_quartz_slab.json b/client/src/main/resources/assets/cinderscapes/blockstates/smooth_smoky_quartz_slab.json deleted file mode 100644 index 61f5f4f4..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/smooth_smoky_quartz_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "cinderscapes:block/smooth_smoky_quartz_slab" - }, - "type=double": { - "model": "cinderscapes:block/smooth_smoky_quartz" - }, - "type=top": { - "model": "cinderscapes:block/smooth_smoky_quartz_slab_top" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/smooth_smoky_quartz_stairs.json b/client/src/main/resources/assets/cinderscapes/blockstates/smooth_smoky_quartz_stairs.json deleted file mode 100644 index d2111a1d..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/smooth_smoky_quartz_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_inner" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_outer" - }, - "facing=east,half=bottom,shape=straight": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs" - }, - "facing=east,half=top,shape=inner_left": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs", - "x": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs", - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_inner" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_outer" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs", - "y": 90, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=west,half=bottom,shape=straight": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs", - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "cinderscapes:block/smooth_smoky_quartz_stairs", - "x": 180, - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/smooth_sulfur_quartz.json b/client/src/main/resources/assets/cinderscapes/blockstates/smooth_sulfur_quartz.json deleted file mode 100644 index c0017c48..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/smooth_sulfur_quartz.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/smooth_sulfur_quartz" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/smooth_sulfur_quartz_slab.json b/client/src/main/resources/assets/cinderscapes/blockstates/smooth_sulfur_quartz_slab.json deleted file mode 100644 index cdf11a2f..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/smooth_sulfur_quartz_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "cinderscapes:block/smooth_sulfur_quartz_slab" - }, - "type=double": { - "model": "cinderscapes:block/smooth_sulfur_quartz" - }, - "type=top": { - "model": "cinderscapes:block/smooth_sulfur_quartz_slab_top" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/smooth_sulfur_quartz_stairs.json b/client/src/main/resources/assets/cinderscapes/blockstates/smooth_sulfur_quartz_stairs.json deleted file mode 100644 index 94644b75..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/smooth_sulfur_quartz_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_inner" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_outer" - }, - "facing=east,half=bottom,shape=straight": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs" - }, - "facing=east,half=top,shape=inner_left": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs", - "x": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs", - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_inner" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_outer" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs", - "y": 90, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=west,half=bottom,shape=straight": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs", - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "cinderscapes:block/smooth_sulfur_quartz_stairs", - "x": 180, - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/stripped_scorched_hyphae.json b/client/src/main/resources/assets/cinderscapes/blockstates/stripped_scorched_hyphae.json deleted file mode 100644 index 0aee1a14..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/stripped_scorched_hyphae.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "cinderscapes:block/stripped_scorched_hyphae", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "cinderscapes:block/stripped_scorched_hyphae" - }, - "axis=z": { - "model": "cinderscapes:block/stripped_scorched_hyphae", - "x": 90 - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/stripped_scorched_stem.json b/client/src/main/resources/assets/cinderscapes/blockstates/stripped_scorched_stem.json deleted file mode 100644 index 0d977438..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/stripped_scorched_stem.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "cinderscapes:block/stripped_scorched_stem", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "cinderscapes:block/stripped_scorched_stem" - }, - "axis=z": { - "model": "cinderscapes:block/stripped_scorched_stem", - "x": 90 - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/stripped_umbral_hyphae.json b/client/src/main/resources/assets/cinderscapes/blockstates/stripped_umbral_hyphae.json deleted file mode 100644 index e44b18c2..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/stripped_umbral_hyphae.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "cinderscapes:block/stripped_umbral_hyphae", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "cinderscapes:block/stripped_umbral_hyphae" - }, - "axis=z": { - "model": "cinderscapes:block/stripped_umbral_hyphae", - "x": 90 - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/stripped_umbral_stem.json b/client/src/main/resources/assets/cinderscapes/blockstates/stripped_umbral_stem.json deleted file mode 100644 index 7d5b96e8..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/stripped_umbral_stem.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "cinderscapes:block/stripped_umbral_stem", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "cinderscapes:block/stripped_umbral_stem" - }, - "axis=z": { - "model": "cinderscapes:block/stripped_umbral_stem", - "x": 90 - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/sulfur_block.json b/client/src/main/resources/assets/cinderscapes/blockstates/sulfur_block.json deleted file mode 100644 index 65ec44dd..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/sulfur_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/sulfur_block" - } - } -} diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/sulfur_ore.json b/client/src/main/resources/assets/cinderscapes/blockstates/sulfur_ore.json deleted file mode 100644 index 9cb7249d..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/sulfur_ore.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/sulfur_ore" - } - } -} diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/sulfur_quartz_block.json b/client/src/main/resources/assets/cinderscapes/blockstates/sulfur_quartz_block.json deleted file mode 100644 index 12de92f6..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/sulfur_quartz_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/sulfur_quartz_block" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/sulfur_quartz_bricks.json b/client/src/main/resources/assets/cinderscapes/blockstates/sulfur_quartz_bricks.json deleted file mode 100644 index 8a961705..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/sulfur_quartz_bricks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/sulfur_quartz_bricks" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/sulfur_quartz_ore.json b/client/src/main/resources/assets/cinderscapes/blockstates/sulfur_quartz_ore.json deleted file mode 100644 index df83904a..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/sulfur_quartz_ore.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/sulfur_quartz_ore" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/sulfur_quartz_pillar.json b/client/src/main/resources/assets/cinderscapes/blockstates/sulfur_quartz_pillar.json deleted file mode 100644 index 952eb7c3..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/sulfur_quartz_pillar.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "cinderscapes:block/sulfur_quartz_pillar", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "cinderscapes:block/sulfur_quartz_pillar" - }, - "axis=z": { - "model": "cinderscapes:block/sulfur_quartz_pillar", - "x": 90 - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/sulfur_quartz_slab.json b/client/src/main/resources/assets/cinderscapes/blockstates/sulfur_quartz_slab.json deleted file mode 100644 index 7360a9f1..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/sulfur_quartz_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "cinderscapes:block/sulfur_quartz_slab" - }, - "type=double": { - "model": "cinderscapes:block/sulfur_quartz_block" - }, - "type=top": { - "model": "cinderscapes:block/sulfur_quartz_slab_top" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/sulfur_quartz_stairs.json b/client/src/main/resources/assets/cinderscapes/blockstates/sulfur_quartz_stairs.json deleted file mode 100644 index 6772eb30..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/sulfur_quartz_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/sulfur_quartz_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/sulfur_quartz_stairs_inner" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/sulfur_quartz_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/sulfur_quartz_stairs_outer" - }, - "facing=east,half=bottom,shape=straight": { - "model": "cinderscapes:block/sulfur_quartz_stairs" - }, - "facing=east,half=top,shape=inner_left": { - "model": "cinderscapes:block/sulfur_quartz_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "cinderscapes:block/sulfur_quartz_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "cinderscapes:block/sulfur_quartz_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "cinderscapes:block/sulfur_quartz_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "cinderscapes:block/sulfur_quartz_stairs", - "x": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/sulfur_quartz_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/sulfur_quartz_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/sulfur_quartz_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/sulfur_quartz_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "cinderscapes:block/sulfur_quartz_stairs", - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "cinderscapes:block/sulfur_quartz_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "cinderscapes:block/sulfur_quartz_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "cinderscapes:block/sulfur_quartz_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "cinderscapes:block/sulfur_quartz_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "cinderscapes:block/sulfur_quartz_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/sulfur_quartz_stairs_inner" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/sulfur_quartz_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/sulfur_quartz_stairs_outer" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/sulfur_quartz_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "cinderscapes:block/sulfur_quartz_stairs", - "y": 90, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "cinderscapes:block/sulfur_quartz_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "cinderscapes:block/sulfur_quartz_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "cinderscapes:block/sulfur_quartz_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "cinderscapes:block/sulfur_quartz_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "cinderscapes:block/sulfur_quartz_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/sulfur_quartz_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/sulfur_quartz_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/sulfur_quartz_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/sulfur_quartz_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=west,half=bottom,shape=straight": { - "model": "cinderscapes:block/sulfur_quartz_stairs", - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "cinderscapes:block/sulfur_quartz_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "cinderscapes:block/sulfur_quartz_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "cinderscapes:block/sulfur_quartz_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "cinderscapes:block/sulfur_quartz_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "cinderscapes:block/sulfur_quartz_stairs", - "x": 180, - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/tall_photofern.json b/client/src/main/resources/assets/cinderscapes/blockstates/tall_photofern.json deleted file mode 100644 index 169f00a1..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/tall_photofern.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "half=lower": { - "model": "cinderscapes:block/tall_photofern_bottom" - }, - "half=upper": { - "model": "cinderscapes:block/tall_photofern_top" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/twilight_fescues.json b/client/src/main/resources/assets/cinderscapes/blockstates/twilight_fescues.json deleted file mode 100644 index ec88eb50..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/twilight_fescues.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/twilight_fescues" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/twilight_tendrils.json b/client/src/main/resources/assets/cinderscapes/blockstates/twilight_tendrils.json deleted file mode 100644 index c4eae6d3..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/twilight_tendrils.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/twilight_tendrils" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/twilight_vine_block.json b/client/src/main/resources/assets/cinderscapes/blockstates/twilight_vine_block.json deleted file mode 100644 index f38d79f5..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/twilight_vine_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/twilight_vine_block" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_button.json b/client/src/main/resources/assets/cinderscapes/blockstates/umbral_button.json deleted file mode 100644 index 1839cec2..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=ceiling,facing=east,powered=false": { - "model": "cinderscapes:block/umbral_button", - "y": 270, - "x": 180 - }, - "face=ceiling,facing=east,powered=true": { - "model": "cinderscapes:block/umbral_button_pressed", - "y": 270, - "x": 180 - }, - "face=ceiling,facing=north,powered=false": { - "model": "cinderscapes:block/umbral_button", - "y": 180, - "x": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "cinderscapes:block/umbral_button_pressed", - "y": 180, - "x": 180 - }, - "face=ceiling,facing=south,powered=false": { - "model": "cinderscapes:block/umbral_button", - "x": 180 - }, - "face=ceiling,facing=south,powered=true": { - "model": "cinderscapes:block/umbral_button_pressed", - "x": 180 - }, - "face=ceiling,facing=west,powered=false": { - "model": "cinderscapes:block/umbral_button", - "y": 90, - "x": 180 - }, - "face=ceiling,facing=west,powered=true": { - "model": "cinderscapes:block/umbral_button_pressed", - "y": 90, - "x": 180 - }, - "face=floor,facing=east,powered=false": { - "model": "cinderscapes:block/umbral_button", - "y": 90 - }, - "face=floor,facing=east,powered=true": { - "model": "cinderscapes:block/umbral_button_pressed", - "y": 90 - }, - "face=floor,facing=north,powered=false": { - "model": "cinderscapes:block/umbral_button" - }, - "face=floor,facing=north,powered=true": { - "model": "cinderscapes:block/umbral_button_pressed" - }, - "face=floor,facing=south,powered=false": { - "model": "cinderscapes:block/umbral_button", - "y": 180 - }, - "face=floor,facing=south,powered=true": { - "model": "cinderscapes:block/umbral_button_pressed", - "y": 180 - }, - "face=floor,facing=west,powered=false": { - "model": "cinderscapes:block/umbral_button", - "y": 270 - }, - "face=floor,facing=west,powered=true": { - "model": "cinderscapes:block/umbral_button_pressed", - "y": 270 - }, - "face=wall,facing=east,powered=false": { - "model": "cinderscapes:block/umbral_button", - "y": 90, - "x": 90, - "uvlock": true - }, - "face=wall,facing=east,powered=true": { - "model": "cinderscapes:block/umbral_button_pressed", - "y": 90, - "x": 90, - "uvlock": true - }, - "face=wall,facing=north,powered=false": { - "model": "cinderscapes:block/umbral_button", - "x": 90, - "uvlock": true - }, - "face=wall,facing=north,powered=true": { - "model": "cinderscapes:block/umbral_button_pressed", - "x": 90, - "uvlock": true - }, - "face=wall,facing=south,powered=false": { - "model": "cinderscapes:block/umbral_button", - "y": 180, - "x": 90, - "uvlock": true - }, - "face=wall,facing=south,powered=true": { - "model": "cinderscapes:block/umbral_button_pressed", - "y": 180, - "x": 90, - "uvlock": true - }, - "face=wall,facing=west,powered=false": { - "model": "cinderscapes:block/umbral_button", - "y": 270, - "x": 90, - "uvlock": true - }, - "face=wall,facing=west,powered=true": { - "model": "cinderscapes:block/umbral_button_pressed", - "y": 270, - "x": 90, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_door.json b/client/src/main/resources/assets/cinderscapes/blockstates/umbral_door.json deleted file mode 100644 index 08216961..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_door.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "cinderscapes:block/umbral_door_bottom_left" }, - "facing=east,half=lower,hinge=left,open=true": { "model": "cinderscapes:block/umbral_door_bottom_left_open", "y": 90 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "cinderscapes:block/umbral_door_bottom_right" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "cinderscapes:block/umbral_door_bottom_right_open", "y": 270 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "cinderscapes:block/umbral_door_top_left" }, - "facing=east,half=upper,hinge=left,open=true": { "model": "cinderscapes:block/umbral_door_top_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "cinderscapes:block/umbral_door_top_right" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "cinderscapes:block/umbral_door_top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "cinderscapes:block/umbral_door_bottom_left", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "cinderscapes:block/umbral_door_bottom_left_open" }, - "facing=north,half=lower,hinge=right,open=false": { "model": "cinderscapes:block/umbral_door_bottom_right", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "cinderscapes:block/umbral_door_bottom_right_open", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "cinderscapes:block/umbral_door_top_left", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "cinderscapes:block/umbral_door_top_left_open" }, - "facing=north,half=upper,hinge=right,open=false": { "model": "cinderscapes:block/umbral_door_top_right", "y": 270 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "cinderscapes:block/umbral_door_top_right_open", "y": 180 }, - "facing=south,half=lower,hinge=left,open=false": { "model": "cinderscapes:block/umbral_door_bottom_left", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "cinderscapes:block/umbral_door_bottom_left_open", "y": 180 }, - "facing=south,half=lower,hinge=right,open=false": { "model": "cinderscapes:block/umbral_door_bottom_right", "y": 90 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "cinderscapes:block/umbral_door_bottom_right_open" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "cinderscapes:block/umbral_door_top_left", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "cinderscapes:block/umbral_door_top_left_open", "y": 180 }, - "facing=south,half=upper,hinge=right,open=false": { "model": "cinderscapes:block/umbral_door_top_right", "y": 90 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "cinderscapes:block/umbral_door_top_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { "model": "cinderscapes:block/umbral_door_bottom_left", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "cinderscapes:block/umbral_door_bottom_left_open", "y": 270 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "cinderscapes:block/umbral_door_bottom_right", "y": 180 }, - "facing=west,half=lower,hinge=right,open=true": { "model": "cinderscapes:block/umbral_door_bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "cinderscapes:block/umbral_door_top_left", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "cinderscapes:block/umbral_door_top_left_open", "y": 270 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "cinderscapes:block/umbral_door_top_right", "y": 180 }, - "facing=west,half=upper,hinge=right,open=true": { "model": "cinderscapes:block/umbral_door_top_right_open", "y": 90 } - } -} diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_fence.json b/client/src/main/resources/assets/cinderscapes/blockstates/umbral_fence.json deleted file mode 100644 index ee161867..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "cinderscapes:block/umbral_fence_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "cinderscapes:block/umbral_fence_side", - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "cinderscapes:block/umbral_fence_side", - "y": 90, - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "cinderscapes:block/umbral_fence_side", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "cinderscapes:block/umbral_fence_side", - "y": 270, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_fence_gate.json b/client/src/main/resources/assets/cinderscapes/blockstates/umbral_fence_gate.json deleted file mode 100644 index 343f24e3..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=east,in_wall=false,open=false": { - "uvlock": true, - "y": 270, - "model": "cinderscapes:block/umbral_fence_gate" - }, - "facing=east,in_wall=false,open=true": { - "uvlock": true, - "y": 270, - "model": "cinderscapes:block/umbral_fence_gate_open" - }, - "facing=east,in_wall=true,open=false": { - "uvlock": true, - "y": 270, - "model": "cinderscapes:block/umbral_fence_gate_wall" - }, - "facing=east,in_wall=true,open=true": { - "uvlock": true, - "y": 270, - "model": "cinderscapes:block/umbral_fence_gate_wall_open" - }, - "facing=north,in_wall=false,open=false": { - "uvlock": true, - "y": 180, - "model": "cinderscapes:block/umbral_fence_gate" - }, - "facing=north,in_wall=false,open=true": { - "uvlock": true, - "y": 180, - "model": "cinderscapes:block/umbral_fence_gate_open" - }, - "facing=north,in_wall=true,open=false": { - "uvlock": true, - "y": 180, - "model": "cinderscapes:block/umbral_fence_gate_wall" - }, - "facing=north,in_wall=true,open=true": { - "uvlock": true, - "y": 180, - "model": "cinderscapes:block/umbral_fence_gate_wall_open" - }, - "facing=south,in_wall=false,open=false": { - "uvlock": true, - "model": "cinderscapes:block/umbral_fence_gate" - }, - "facing=south,in_wall=false,open=true": { - "uvlock": true, - "model": "cinderscapes:block/umbral_fence_gate_open" - }, - "facing=south,in_wall=true,open=false": { - "uvlock": true, - "model": "cinderscapes:block/umbral_fence_gate_wall" - }, - "facing=south,in_wall=true,open=true": { - "uvlock": true, - "model": "cinderscapes:block/umbral_fence_gate_wall_open" - }, - "facing=west,in_wall=false,open=false": { - "uvlock": true, - "y": 90, - "model": "cinderscapes:block/umbral_fence_gate" - }, - "facing=west,in_wall=false,open=true": { - "uvlock": true, - "y": 90, - "model": "cinderscapes:block/umbral_fence_gate_open" - }, - "facing=west,in_wall=true,open=false": { - "uvlock": true, - "y": 90, - "model": "cinderscapes:block/umbral_fence_gate_wall" - }, - "facing=west,in_wall=true,open=true": { - "uvlock": true, - "y": 90, - "model": "cinderscapes:block/umbral_fence_gate_wall_open" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_flesh_block.json b/client/src/main/resources/assets/cinderscapes/blockstates/umbral_flesh_block.json deleted file mode 100644 index a4abd184..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_flesh_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/umbral_flesh_block" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_fungus.json b/client/src/main/resources/assets/cinderscapes/blockstates/umbral_fungus.json deleted file mode 100644 index 72aae33d..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_fungus.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/umbral_fungus" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_hanging_sign.json b/client/src/main/resources/assets/cinderscapes/blockstates/umbral_hanging_sign.json deleted file mode 100644 index 16eca909..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_hanging_sign.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "cinderscapes:block/umbral_hanging_sign" } - } -} diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_hyphae.json b/client/src/main/resources/assets/cinderscapes/blockstates/umbral_hyphae.json deleted file mode 100644 index 429c868e..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_hyphae.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "cinderscapes:block/umbral_hyphae", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "cinderscapes:block/umbral_hyphae" - }, - "axis=z": { - "model": "cinderscapes:block/umbral_hyphae", - "x": 90 - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_nylium.json b/client/src/main/resources/assets/cinderscapes/blockstates/umbral_nylium.json deleted file mode 100644 index eb7768b9..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_nylium.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/umbral_nylium" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_planks.json b/client/src/main/resources/assets/cinderscapes/blockstates/umbral_planks.json deleted file mode 100644 index 0dc29375..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/umbral_planks" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_pressure_plate.json b/client/src/main/resources/assets/cinderscapes/blockstates/umbral_pressure_plate.json deleted file mode 100644 index cd3c7b1c..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "cinderscapes:block/umbral_pressure_plate" - }, - "powered=true": { - "model": "cinderscapes:block/umbral_pressure_plate_down" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_sign.json b/client/src/main/resources/assets/cinderscapes/blockstates/umbral_sign.json deleted file mode 100644 index 8709c1b6..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/umbral_sign" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_slab.json b/client/src/main/resources/assets/cinderscapes/blockstates/umbral_slab.json deleted file mode 100644 index 4c524cf5..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "cinderscapes:block/umbral_slab" - }, - "type=double": { - "model": "cinderscapes:block/umbral_planks" - }, - "type=top": { - "model": "cinderscapes:block/umbral_slab_top" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_stairs.json b/client/src/main/resources/assets/cinderscapes/blockstates/umbral_stairs.json deleted file mode 100644 index 5c9f5960..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/umbral_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/umbral_stairs_inner" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/umbral_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/umbral_stairs_outer" - }, - "facing=east,half=bottom,shape=straight": { - "model": "cinderscapes:block/umbral_stairs" - }, - "facing=east,half=top,shape=inner_left": { - "model": "cinderscapes:block/umbral_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "cinderscapes:block/umbral_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "cinderscapes:block/umbral_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "cinderscapes:block/umbral_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "cinderscapes:block/umbral_stairs", - "x": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/umbral_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/umbral_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/umbral_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/umbral_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "cinderscapes:block/umbral_stairs", - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "cinderscapes:block/umbral_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "cinderscapes:block/umbral_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "cinderscapes:block/umbral_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "cinderscapes:block/umbral_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "cinderscapes:block/umbral_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/umbral_stairs_inner" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/umbral_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/umbral_stairs_outer" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/umbral_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "cinderscapes:block/umbral_stairs", - "y": 90, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "cinderscapes:block/umbral_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "cinderscapes:block/umbral_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "cinderscapes:block/umbral_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "cinderscapes:block/umbral_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "cinderscapes:block/umbral_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "cinderscapes:block/umbral_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "cinderscapes:block/umbral_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "cinderscapes:block/umbral_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "cinderscapes:block/umbral_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=west,half=bottom,shape=straight": { - "model": "cinderscapes:block/umbral_stairs", - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "cinderscapes:block/umbral_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "cinderscapes:block/umbral_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "cinderscapes:block/umbral_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "cinderscapes:block/umbral_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "cinderscapes:block/umbral_stairs", - "x": 180, - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_stem.json b/client/src/main/resources/assets/cinderscapes/blockstates/umbral_stem.json deleted file mode 100644 index b5e4cdb3..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_stem.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "cinderscapes:block/umbral_stem", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "cinderscapes:block/umbral_stem" - }, - "axis=z": { - "model": "cinderscapes:block/umbral_stem", - "x": 90 - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_trapdoor.json b/client/src/main/resources/assets/cinderscapes/blockstates/umbral_trapdoor.json deleted file mode 100644 index c0079c78..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_trapdoor.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,open=false": { - "model": "cinderscapes:block/umbral_trapdoor_bottom", - "y": 90 - }, - "facing=east,half=bottom,open=true": { - "model": "cinderscapes:block/umbral_trapdoor_open", - "y": 90 - }, - "facing=east,half=top,open=false": { - "model": "cinderscapes:block/umbral_trapdoor_top", - "y": 90 - }, - "facing=east,half=top,open=true": { - "model": "cinderscapes:block/umbral_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=north,half=bottom,open=false": { - "model": "cinderscapes:block/umbral_trapdoor_bottom" - }, - "facing=north,half=bottom,open=true": { - "model": "cinderscapes:block/umbral_trapdoor_open" - }, - "facing=north,half=top,open=false": { - "model": "cinderscapes:block/umbral_trapdoor_top" - }, - "facing=north,half=top,open=true": { - "model": "cinderscapes:block/umbral_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=bottom,open=false": { - "model": "cinderscapes:block/umbral_trapdoor_bottom", - "y": 180 - }, - "facing=south,half=bottom,open=true": { - "model": "cinderscapes:block/umbral_trapdoor_open", - "y": 180 - }, - "facing=south,half=top,open=false": { - "model": "cinderscapes:block/umbral_trapdoor_top", - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "cinderscapes:block/umbral_trapdoor_open", - "x": 180, - "y": 0 - }, - "facing=west,half=bottom,open=false": { - "model": "cinderscapes:block/umbral_trapdoor_bottom", - "y": 270 - }, - "facing=west,half=bottom,open=true": { - "model": "cinderscapes:block/umbral_trapdoor_open", - "y": 270 - }, - "facing=west,half=top,open=false": { - "model": "cinderscapes:block/umbral_trapdoor_top", - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "cinderscapes:block/umbral_trapdoor_open", - "x": 180, - "y": 90 - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_wall_hanging_sign.json b/client/src/main/resources/assets/cinderscapes/blockstates/umbral_wall_hanging_sign.json deleted file mode 100644 index 16eca909..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_wall_hanging_sign.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "cinderscapes:block/umbral_hanging_sign" } - } -} diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_wall_sign.json b/client/src/main/resources/assets/cinderscapes/blockstates/umbral_wall_sign.json deleted file mode 100644 index 8709c1b6..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/umbral_sign" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_wart_block.json b/client/src/main/resources/assets/cinderscapes/blockstates/umbral_wart_block.json deleted file mode 100644 index fbbb024e..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/umbral_wart_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/umbral_wart_block" - } - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/withered_fungus.json b/client/src/main/resources/assets/cinderscapes/blockstates/withered_fungus.json deleted file mode 100644 index 44d3f05b..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/withered_fungus.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/withered_fungus" - } - } -} diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/withered_nylium.json b/client/src/main/resources/assets/cinderscapes/blockstates/withered_nylium.json deleted file mode 100644 index 50e7f2fb..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/withered_nylium.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/withered_nylium" - } - } -} diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/withered_stem.json b/client/src/main/resources/assets/cinderscapes/blockstates/withered_stem.json deleted file mode 100644 index 07c65034..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/withered_stem.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/withered_stem" - } - } -} diff --git a/client/src/main/resources/assets/cinderscapes/blockstates/withered_wart_block.json b/client/src/main/resources/assets/cinderscapes/blockstates/withered_wart_block.json deleted file mode 100644 index cdc04e25..00000000 --- a/client/src/main/resources/assets/cinderscapes/blockstates/withered_wart_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cinderscapes:block/withered_wart_block" - } - } -} diff --git a/client/src/main/resources/assets/cinderscapes/lang/en_gb.json b/client/src/main/resources/assets/cinderscapes/lang/en_gb.json index c79cfe39..4bc7df9a 100644 --- a/client/src/main/resources/assets/cinderscapes/lang/en_gb.json +++ b/client/src/main/resources/assets/cinderscapes/lang/en_gb.json @@ -1,9 +1,5 @@ { "block.cinderscapes.chiseled_sulfur_quartz_block": "Chiselled Sulfur Quartz Block", "block.cinderscapes.chiseled_rose_quartz_block": "Chiselled Rose Quartz Block", - "block.cinderscapes.chiseled_smoky_quartz_block": "Chiselled Smoky Quartz Block", - - "item.cinderscapes.chiseled_sulfur_quartz_block": "Chiselled Sulfur Quartz Block", - "item.cinderscapes.chiseled_rose_quartz_block": "Chiselled Rose Quartz Block", - "item.cinderscapes.chiseled_smoky_quartz_block": "Chiselled Smoky Quartz Block" + "block.cinderscapes.chiseled_smoky_quartz_block": "Chiselled Smoky Quartz Block" } diff --git a/client/src/main/resources/assets/cinderscapes/lang/en_us.json b/client/src/main/resources/assets/cinderscapes/lang/en_us.json index 04b68941..9d13a0b0 100644 --- a/client/src/main/resources/assets/cinderscapes/lang/en_us.json +++ b/client/src/main/resources/assets/cinderscapes/lang/en_us.json @@ -111,96 +111,6 @@ "item.cinderscapes.music_disc_luminous_plantation": "Music Disc", "item.cinderscapes.music_disc_luminous_plantation.desc": "LudoCrypt - Luminous Plantation", - "item.cinderscapes.ash": "Ash", - "item.cinderscapes.ash_block": "Ash Block", - "item.cinderscapes.chiseled_rose_quartz_block": "Chiseled Rose Quartz Block", - "item.cinderscapes.chiseled_smoky_quartz_block": "Chiseled Smoky Quartz Block", - "item.cinderscapes.chiseled_sulfur_quartz_block": "Chiseled Sulfur Quartz Block", - "item.cinderscapes.crystalline_quartz": "Crystalline Quartz", - "item.cinderscapes.crystalline_rose_quartz": "Crystalline Rose Quartz", - "item.cinderscapes.crystalline_smoky_quartz": "Crystalline Smoky Quartz", - "item.cinderscapes.crystalline_sulfur_quartz": "Crystalline Sulfur Quartz", - "item.cinderscapes.crystinium": "Crystinium", - "item.cinderscapes.ghastly_ectoplasm": "Ghastly Ectoplasm", - "item.cinderscapes.luminous_pod": "Luminous Pod", - "item.cinderscapes.photofern": "Photofern", - "item.cinderscapes.polypite_quartz": "Polypite Quartz", - "item.cinderscapes.polypite_rose_quartz": "Polypite Rose Quartz", - "item.cinderscapes.polypite_smoky_quartz": "Polypite Smoky Quartz", - "item.cinderscapes.polypite_sulfur_quartz": "Polypite Sulfur Quartz", - "item.cinderscapes.pyracinth": "Pyracinth", - "item.cinderscapes.rose_quartz_block": "Rose Quartz Block", - "item.cinderscapes.rose_quartz_bricks": "Rose Quartz Bricks", - "item.cinderscapes.rose_quartz_ore": "Rose Quartz Ore", - "item.cinderscapes.rose_quartz_pillar": "Rose Quartz Pillar", - "item.cinderscapes.rose_quartz_slab": "Rose Quartz Slab", - "item.cinderscapes.rose_quartz_stairs": "Rose Quartz Stairs", - "item.cinderscapes.scorched_button": "Scorched Button", - "item.cinderscapes.scorched_door": "Scorched Door", - "item.cinderscapes.scorched_fence": "Scorched Fence", - "item.cinderscapes.scorched_fence_gate": "Scorched Fence Gate", - "item.cinderscapes.scorched_hanging_sign": "Scorched Hanging Sign", - "item.cinderscapes.scorched_hyphae": "Scorched Hyphae", - "item.cinderscapes.scorched_planks": "Scorched Planks", - "item.cinderscapes.scorched_pressure_plate": "Scorched Pressure Plate", - "item.cinderscapes.scorched_shrub": "Scorched Shrub", - "item.cinderscapes.scorched_sign": "Scorched Sign", - "item.cinderscapes.scorched_slab": "Scorched Slab", - "item.cinderscapes.scorched_sprouts": "Scorched Sprouts", - "item.cinderscapes.scorched_stairs": "Scorched Stairs", - "item.cinderscapes.scorched_stem": "Scorched Stem", - "item.cinderscapes.scorched_tendrils": "Scorched Tendrils", - "item.cinderscapes.scorched_trapdoor": "Scorched Trapdoor", - "item.cinderscapes.smoky_quartz_block": "Smoky Quartz Block", - "item.cinderscapes.smoky_quartz_bricks": "Smoky Quartz Bricks", - "item.cinderscapes.smoky_quartz_ore": "Smoky Quartz Ore", - "item.cinderscapes.smoky_quartz_pillar": "Smoky Quartz Pillar", - "item.cinderscapes.smoky_quartz_slab": "Smoky Quartz Slab", - "item.cinderscapes.smoky_quartz_stairs": "Smoky Quartz Stairs", - "item.cinderscapes.smooth_rose_quartz": "Smooth Rose Quartz", - "item.cinderscapes.smooth_rose_quartz_slab": "Smooth Rose Quartz Slab", - "item.cinderscapes.smooth_rose_quartz_stairs": "Smooth Rose Quartz Stairs", - "item.cinderscapes.smooth_smoky_quartz": "Smooth Smoky Quartz", - "item.cinderscapes.smooth_smoky_quartz_slab": "Smooth Smoky Quartz Slab", - "item.cinderscapes.smooth_smoky_quartz_stairs": "Smooth Smoky Quartz Stairs", - "item.cinderscapes.smooth_sulfur_quartz": "Smooth Sulfur Quartz", - "item.cinderscapes.smooth_sulfur_quartz_slab": "Smooth Sulfur Quartz Slab", - "item.cinderscapes.smooth_sulfur_quartz_stairs": "Smooth Sulfur Quartz Stairs", - "item.cinderscapes.stripped_scorched_hyphae": "Stripped Scorched Hyphae", - "item.cinderscapes.stripped_scorched_stem": "Stripped Scorched Stem", - "item.cinderscapes.stripped_umbral_hyphae": "Stripped Umbral Hyphae", - "item.cinderscapes.stripped_umbral_stem": "Stripped Umbral Stem", - "item.cinderscapes.sulfur_block": "Sulfur Block", - "item.cinderscapes.sulfur_ore": "Sulfur Ore", - "item.cinderscapes.sulfur_quartz_block": "Sulfur Quartz Block", - "item.cinderscapes.sulfur_quartz_bricks": "Sulfur Quartz Bricks", - "item.cinderscapes.sulfur_quartz_ore": "Sulfur Quartz Ore", - "item.cinderscapes.sulfur_quartz_pillar": "Sulfur Quartz Pillar", - "item.cinderscapes.sulfur_quartz_slab": "Sulfur Quartz Slab", - "item.cinderscapes.sulfur_quartz_stairs": "Sulfur Quartz Stairs", - "item.cinderscapes.tall_photofern": "Tall Photofern", - "item.cinderscapes.twilight_fescues": "Twilight Fescues", - "item.cinderscapes.twilight_tendrils": "Twilight Tendrils", - "item.cinderscapes.twilight_vine_block": "Twilight Vine Block", - "item.cinderscapes.umbral_button": "Umbral Button", - "item.cinderscapes.umbral_door": "Umbral Door", - "item.cinderscapes.umbral_fence": "Umbral Fence", - "item.cinderscapes.umbral_fence_gate": "Umbral Fence Gate", - "item.cinderscapes.umbral_flesh_block": "Umbral Flesh Block", - "item.cinderscapes.umbral_fungus": "Umbral Fungus", - "item.cinderscapes.umbral_hanging_sign": "Umbral Hanging Sign", - "item.cinderscapes.umbral_hyphae": "Umbral Hyphae", - "item.cinderscapes.umbral_nylium": "Umbral Nylium", - "item.cinderscapes.umbral_planks": "Umbral Planks", - "item.cinderscapes.umbral_pressure_plate": "Umbral Pressure Plate", - "item.cinderscapes.umbral_sign": "Umbral Sign", - "item.cinderscapes.umbral_slab": "Umbral Slab", - "item.cinderscapes.umbral_stairs": "Umbral Stairs", - "item.cinderscapes.umbral_stem": "Umbral Stem", - "item.cinderscapes.umbral_trapdoor": "Umbral Trapdoor", - "item.cinderscapes.umbral_wart_block": "Umbral Wart Block", - - "item.cinderscapes.nodzol": "Nodzol", "item.cinderscapes.nodzol.description": "This block is nursed...", "tag.item.c.dark_ashes_dusts": "Dark Ashes Dusts", @@ -230,7 +140,7 @@ "text.autoconfig.cinderscapes.option.biomes.enableLuminousGrove": "Enable Luminous Grove Biome", "text.autoconfig.cinderscapes.option.biomes.enableQuartzCavern": "Enable Quartz Cavern Biome", - "trim_material.cinderscapes.rose_quartz": "Rose Quartz Material", - "trim_material.cinderscapes.smoky_quartz": "Smoky Quartz Material", - "trim_material.cinderscapes.sulfur_quartz": "Sulfur Quartz Material" + "trim_material.cinderscapes.cinderscapes_rose_quartz": "Rose Quartz Material", + "trim_material.cinderscapes.cinderscapes_smoky_quartz": "Smoky Quartz Material", + "trim_material.cinderscapes.cinderscapes_sulfur_quartz": "Sulfur Quartz Material" } \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/lang/es_ar.json b/client/src/main/resources/assets/cinderscapes/lang/es_ar.json index bae3dfde..b12d23c6 100644 --- a/client/src/main/resources/assets/cinderscapes/lang/es_ar.json +++ b/client/src/main/resources/assets/cinderscapes/lang/es_ar.json @@ -106,93 +106,6 @@ "item.cinderscapes.music_disc_luminous_plantation": "Disco", "item.cinderscapes.music_disc_luminous_plantation.desc": "LudoCrypt - Luminous Plantation", - "item.cinderscapes.ash": "Ceniza", - "item.cinderscapes.ash_block": "Bloque de ceniza", - "item.cinderscapes.chiseled_rose_quartz_block": "Cuarzo rosa cincelado", - "item.cinderscapes.chiseled_smoky_quartz_block": "Cuarzo ahumado cincelado", - "item.cinderscapes.chiseled_sulfur_quartz_block": "Cuarzo de azufre cincelado", - "item.cinderscapes.crystalline_quartz": "Cuarzo cristalino", - "item.cinderscapes.crystalline_rose_quartz": "Cuarzo rosa cristalino", - "item.cinderscapes.crystalline_smoky_quartz": "Cuarzo ahumado cristalino", - "item.cinderscapes.crystalline_sulfur_quartz": "Cuarzo de azufre cristalino", - "item.cinderscapes.crystinium": "Cristinio", - "item.cinderscapes.ghastly_ectoplasm": "Ectoplasma pálido", - "item.cinderscapes.luminous_pod": "Vaina luminosa", - "item.cinderscapes.photofern": "Fotohelecho", - "item.cinderscapes.polypite_quartz": "Polipita de cuarzo", - "item.cinderscapes.polypite_rose_quartz": "Polipita de cuarzo rosa", - "item.cinderscapes.polypite_smoky_quartz": "Polipita de cuarzo ahumado", - "item.cinderscapes.polypite_sulfur_quartz": "Polipita de cuarzo de azufre", - "item.cinderscapes.pyracinth": "Piracinto", - "item.cinderscapes.rose_quartz_block": "Cuarzo rosa", - "item.cinderscapes.rose_quartz_bricks": "Ladrillos de cuarzo rosa", - "item.cinderscapes.rose_quartz_ore": "Mineral de cuarzo rosa", - "item.cinderscapes.rose_quartz_pillar": "Columna de cuarzo rosa", - "item.cinderscapes.rose_quartz_slab": "Baldosa de cuarzo rosa", - "item.cinderscapes.rose_quartz_stairs": "Escaleras de cuarzo rosa", - "item.cinderscapes.scorched_button": "Botón chamuscado", - "item.cinderscapes.scorched_door": "Puerta chamuscada", - "item.cinderscapes.scorched_fence": "Valla chamuscada", - "item.cinderscapes.scorched_fence_gate": "Puerta de valla chamuscada", - "item.cinderscapes.scorched_hyphae": "Hifas chamuscadas", - "item.cinderscapes.scorched_planks": "Madera chamuscada", - "item.cinderscapes.scorched_pressure_plate": "Placa de presión chamuscada", - "item.cinderscapes.scorched_shrub": "Arbusto chamuscado", - "item.cinderscapes.scorched_sign": "Cartel chamuscado", - "item.cinderscapes.scorched_slab": "Baldosa chamuscada", - "item.cinderscapes.scorched_sprouts": "Brotes chamuscados", - "item.cinderscapes.scorched_stairs": "Escaleras chamuscada", - "item.cinderscapes.scorched_stem": "Tallo chamuscado", - "item.cinderscapes.scorched_tendrils": "Zarcillos chamuscados", - "item.cinderscapes.scorched_trapdoor": "Escotilla chamuscada", - "item.cinderscapes.smoky_quartz_block": "Cuarzo ahumado", - "item.cinderscapes.smoky_quartz_bricks": "Ladrillos de cuarzo ahumado", - "item.cinderscapes.smoky_quartz_ore": "Mineral de cuarzo ahumado", - "item.cinderscapes.smoky_quartz_pillar": "Columna de cuarzo ahumado", - "item.cinderscapes.smoky_quartz_slab": "Baldosa de cuarzo ahumado", - "item.cinderscapes.smoky_quartz_stairs": "Escaleras de cuarzo ahumado", - "item.cinderscapes.smooth_rose_quartz": "Cuarzo rosa liso", - "item.cinderscapes.smooth_rose_quartz_slab": "Baldosa de cuarzo rosa liso", - "item.cinderscapes.smooth_rose_quartz_stairs": "Escaleras de cuarzo rosa liso", - "item.cinderscapes.smooth_smoky_quartz": "Cuarzo ahumado liso", - "item.cinderscapes.smooth_smoky_quartz_slab": "Baldosa de cuarzo ahumado liso", - "item.cinderscapes.smooth_smoky_quartz_stairs": "Escaleras de cuarzo ahumado liso", - "item.cinderscapes.smooth_sulfur_quartz": "Cuarzo de azufre liso", - "item.cinderscapes.smooth_sulfur_quartz_slab": "Baldosa de cuarzo de azufre liso", - "item.cinderscapes.smooth_sulfur_quartz_stairs": "Escaleras de cuarzo de azufre liso", - "item.cinderscapes.stripped_scorched_hyphae": "Hifas chamuscadas sin corteza", - "item.cinderscapes.stripped_scorched_stem": "Tallo chamuscado sin corteza", - "item.cinderscapes.stripped_umbral_hyphae": "Hifas eclipsadas sin corteza", - "item.cinderscapes.stripped_umbral_stem": "Tallo eclipsado sin corteza", - "item.cinderscapes.sulfur_block": "Bloque de azufre", - "item.cinderscapes.sulfur_ore": "Mineral de azufre", - "item.cinderscapes.sulfur_quartz_block": "Cuarzo de azufre", - "item.cinderscapes.sulfur_quartz_bricks": "Ladrillos de cuarzo de azufre", - "item.cinderscapes.sulfur_quartz_ore": "Mineral de cuarzo de azufre", - "item.cinderscapes.sulfur_quartz_pillar": "Columna de cuarzo de azufre", - "item.cinderscapes.sulfur_quartz_slab": "Baldosa de cuarzo de azufre", - "item.cinderscapes.sulfur_quartz_stairs": "Escaleras de cuarzo de azufre", - "item.cinderscapes.tall_photofern": "Fotohelecho alto", - "item.cinderscapes.twilight_fescues": "Festuca crepuscular", - "item.cinderscapes.twilight_tendrils": "Zarcillos crepusculares", - "item.cinderscapes.twilight_vine_block": "Bloque de enredaderas crepusculares", - "item.cinderscapes.umbral_button": "Botón eclipsado", - "item.cinderscapes.umbral_door": "Puerta eclipsada", - "item.cinderscapes.umbral_fence": "Valla eclipsada", - "item.cinderscapes.umbral_fence_gate": "Puerta de valla eclipsada", - "item.cinderscapes.umbral_flesh_block": "Carne eclipsada", - "item.cinderscapes.umbral_fungus": "Hongo eclipsado", - "item.cinderscapes.umbral_hyphae": "Hifas eclipsadas", - "item.cinderscapes.umbral_nylium": "Nilio eclipsado", - "item.cinderscapes.umbral_planks": "Madera eclipsada", - "item.cinderscapes.umbral_pressure_plate": "Placa de presión eclipsada", - "item.cinderscapes.umbral_sign": "Cartel eclipsado", - "item.cinderscapes.umbral_slab": "Baldosa eclipsada", - "item.cinderscapes.umbral_stairs": "Escaleras eclipsadas", - "item.cinderscapes.umbral_stem": "Tallo eclipsado", - "item.cinderscapes.umbral_trapdoor": "Escotilla eclipsada", - "item.cinderscapes.umbral_wart_block": "Bloque de verrugas eclipsadas", - "text.autoconfig.cinderscapes.title": "Configuración de Cinderscapes", "text.autoconfig.cinderscapes.option.biomes": "Modificar generación de biomas", "text.autoconfig.cinderscapes.option.biomes.enableAshyShoals": "Activar bioma de bancos cenizos", diff --git a/client/src/main/resources/assets/cinderscapes/lang/es_es.json b/client/src/main/resources/assets/cinderscapes/lang/es_es.json index 5be32b63..8c9ed20d 100644 --- a/client/src/main/resources/assets/cinderscapes/lang/es_es.json +++ b/client/src/main/resources/assets/cinderscapes/lang/es_es.json @@ -106,93 +106,6 @@ "item.cinderscapes.music_disc_luminous_plantation": "Disco de música", "item.cinderscapes.music_disc_luminous_plantation.desc": "LudoCrypt - Luminous Plantation", - "item.cinderscapes.ash": "Ceniza", - "item.cinderscapes.ash_block": "Bloque de ceniza", - "item.cinderscapes.chiseled_rose_quartz_block": "Cuarzo rosa cincelado", - "item.cinderscapes.chiseled_smoky_quartz_block": "Cuarzo ahumado cincelado", - "item.cinderscapes.chiseled_sulfur_quartz_block": "Cuarzo de azufre cincelado", - "item.cinderscapes.crystalline_quartz": "Cuarzo cristalino", - "item.cinderscapes.crystalline_rose_quartz": "Cuarzo rosa cristalino", - "item.cinderscapes.crystalline_smoky_quartz": "Cuarzo ahumado cristalino", - "item.cinderscapes.crystalline_sulfur_quartz": "Cuarzo de azufre cristalino", - "item.cinderscapes.crystinium": "Cristinio", - "item.cinderscapes.ghastly_ectoplasm": "Ectoplasma pálido", - "item.cinderscapes.luminous_pod": "Vaina luminosa", - "item.cinderscapes.photofern": "Fotohelecho", - "item.cinderscapes.polypite_quartz": "Polipita de cuarzo", - "item.cinderscapes.polypite_rose_quartz": "Polipita de cuarzo rosa", - "item.cinderscapes.polypite_smoky_quartz": "Polipita de cuarzo ahumado", - "item.cinderscapes.polypite_sulfur_quartz": "Polipita de cuarzo de azufre", - "item.cinderscapes.pyracinth": "Piracinto", - "item.cinderscapes.rose_quartz_block": "Cuarzo rosa", - "item.cinderscapes.rose_quartz_bricks": "Ladrillos de cuarzo rosa", - "item.cinderscapes.rose_quartz_ore": "Mena de cuarzo rosa", - "item.cinderscapes.rose_quartz_pillar": "Pilar de cuarzo rosa", - "item.cinderscapes.rose_quartz_slab": "Losa de cuarzo rosa", - "item.cinderscapes.rose_quartz_stairs": "Escaleras de cuarzo rosa", - "item.cinderscapes.scorched_button": "Botón chamuscado", - "item.cinderscapes.scorched_door": "Puerta chamuscada", - "item.cinderscapes.scorched_fence": "Valla chamuscada", - "item.cinderscapes.scorched_fence_gate": "Puerta de valla chamuscada", - "item.cinderscapes.scorched_hyphae": "Hifas chamuscadas", - "item.cinderscapes.scorched_planks": "Madera chamuscada", - "item.cinderscapes.scorched_pressure_plate": "Placa de presión chamuscada", - "item.cinderscapes.scorched_shrub": "Arbusto chamuscado", - "item.cinderscapes.scorched_sign": "Cartel chamuscado", - "item.cinderscapes.scorched_slab": "Losa chamuscada", - "item.cinderscapes.scorched_sprouts": "Rastrojo chamuscado", - "item.cinderscapes.scorched_stairs": "Escaleras chamuscada", - "item.cinderscapes.scorched_stem": "Tallo chamuscado", - "item.cinderscapes.scorched_tendrils": "Zarcillos chamuscados", - "item.cinderscapes.scorched_trapdoor": "Trampilla chamuscada", - "item.cinderscapes.smoky_quartz_block": "Cuarzo ahumado", - "item.cinderscapes.smoky_quartz_bricks": "Ladrillos de cuarzo ahumado", - "item.cinderscapes.smoky_quartz_ore": "Mena de cuarzo ahumado", - "item.cinderscapes.smoky_quartz_pillar": "Pilar de cuarzo ahumado", - "item.cinderscapes.smoky_quartz_slab": "Losa de cuarzo ahumado", - "item.cinderscapes.smoky_quartz_stairs": "Escaleras de cuarzo ahumado", - "item.cinderscapes.smooth_rose_quartz": "Cuarzo rosa liso", - "item.cinderscapes.smooth_rose_quartz_slab": "Losa de cuarzo rosa liso", - "item.cinderscapes.smooth_rose_quartz_stairs": "Escaleras de cuarzo rosa liso", - "item.cinderscapes.smooth_smoky_quartz": "Cuarzo ahumado liso", - "item.cinderscapes.smooth_smoky_quartz_slab": "Losa de cuarzo ahumado liso", - "item.cinderscapes.smooth_smoky_quartz_stairs": "Escaleras de cuarzo ahumado liso", - "item.cinderscapes.smooth_sulfur_quartz": "Cuarzo de azufre liso", - "item.cinderscapes.smooth_sulfur_quartz_slab": "Losa de cuarzo de azufre liso", - "item.cinderscapes.smooth_sulfur_quartz_stairs": "Escaleras de cuarzo de azufre liso", - "item.cinderscapes.stripped_scorched_hyphae": "Hifas chamuscadas sin corteza", - "item.cinderscapes.stripped_scorched_stem": "Tallo chamuscado sin corteza", - "item.cinderscapes.stripped_umbral_hyphae": "Hifas eclipsadas sin corteza", - "item.cinderscapes.stripped_umbral_stem": "Tallo eclipsado sin corteza", - "item.cinderscapes.sulfur_block": "Bloque de azufre", - "item.cinderscapes.sulfur_ore": "Mena de azufre", - "item.cinderscapes.sulfur_quartz_block": "Cuarzo de azufre", - "item.cinderscapes.sulfur_quartz_bricks": "Ladrillos de cuarzo de azufre", - "item.cinderscapes.sulfur_quartz_ore": "Mena de cuarzo de azufre", - "item.cinderscapes.sulfur_quartz_pillar": "Pilar de cuarzo de azufre", - "item.cinderscapes.sulfur_quartz_slab": "Losa de cuarzo de azufre", - "item.cinderscapes.sulfur_quartz_stairs": "Escaleras de cuarzo de azufre", - "item.cinderscapes.tall_photofern": "Fotohelecho grande", - "item.cinderscapes.twilight_fescues": "Festuca crepuscular", - "item.cinderscapes.twilight_tendrils": "Zarcillos crepusculares", - "item.cinderscapes.twilight_vine_block": "Bloque de enredaderas crepusculares", - "item.cinderscapes.umbral_button": "Botón eclipsado", - "item.cinderscapes.umbral_door": "Puerta eclipsada", - "item.cinderscapes.umbral_fence": "Valla eclipsada", - "item.cinderscapes.umbral_fence_gate": "Puerta de valla eclipsada", - "item.cinderscapes.umbral_flesh_block": "Carne eclipsada", - "item.cinderscapes.umbral_fungus": "Hongo eclipsado", - "item.cinderscapes.umbral_hyphae": "Hifas eclipsadas", - "item.cinderscapes.umbral_nylium": "Necelio eclipsado", - "item.cinderscapes.umbral_planks": "Madera eclipsada", - "item.cinderscapes.umbral_pressure_plate": "Placa de presión eclipsada", - "item.cinderscapes.umbral_sign": "Cartel eclipsado", - "item.cinderscapes.umbral_slab": "Losa eclipsada", - "item.cinderscapes.umbral_stairs": "Escaleras eclipsadas", - "item.cinderscapes.umbral_stem": "Tallo eclipsado", - "item.cinderscapes.umbral_trapdoor": "Trampilla eclipsada", - "item.cinderscapes.umbral_wart_block": "Bloque de verrugas eclipsadas", - "text.autoconfig.cinderscapes.title": "Configuración de Cinderscapes", "text.autoconfig.cinderscapes.option.biomes": "Modificar generación de biomas", "text.autoconfig.cinderscapes.option.biomes.enableAshyShoals": "Activar bioma de bancos cenizos", diff --git a/client/src/main/resources/assets/cinderscapes/lang/es_mx.json b/client/src/main/resources/assets/cinderscapes/lang/es_mx.json index 9dece46f..cc09fdfd 100644 --- a/client/src/main/resources/assets/cinderscapes/lang/es_mx.json +++ b/client/src/main/resources/assets/cinderscapes/lang/es_mx.json @@ -106,93 +106,6 @@ "item.cinderscapes.music_disc_luminous_plantation": "Disco", "item.cinderscapes.music_disc_luminous_plantation.desc": "LudoCrypt - Luminous Plantation", - "item.cinderscapes.ash": "Ceniza", - "item.cinderscapes.ash_block": "Bloque de ceniza", - "item.cinderscapes.chiseled_rose_quartz_block": "Cuarzo rosa cincelado", - "item.cinderscapes.chiseled_smoky_quartz_block": "Cuarzo ahumado cincelado", - "item.cinderscapes.chiseled_sulfur_quartz_block": "Cuarzo de azufre cincelado", - "item.cinderscapes.crystalline_quartz": "Cuarzo cristalino", - "item.cinderscapes.crystalline_rose_quartz": "Cuarzo rosa cristalino", - "item.cinderscapes.crystalline_smoky_quartz": "Cuarzo ahumado cristalino", - "item.cinderscapes.crystalline_sulfur_quartz": "Cuarzo de azufre cristalino", - "item.cinderscapes.crystinium": "Cristinio", - "item.cinderscapes.ghastly_ectoplasm": "Ectoplasma pálido", - "item.cinderscapes.luminous_pod": "Vaina luminosa", - "item.cinderscapes.photofern": "Fotohelecho", - "item.cinderscapes.polypite_quartz": "Polipita de cuarzo", - "item.cinderscapes.polypite_rose_quartz": "Polipita de cuarzo rosa", - "item.cinderscapes.polypite_smoky_quartz": "Polipita de cuarzo ahumado", - "item.cinderscapes.polypite_sulfur_quartz": "Polipita de cuarzo de azufre", - "item.cinderscapes.pyracinth": "Piracinto", - "item.cinderscapes.rose_quartz_block": "Cuarzo rosa", - "item.cinderscapes.rose_quartz_bricks": "Ladrillos de cuarzo rosa", - "item.cinderscapes.rose_quartz_ore": "Mineral de cuarzo rosa", - "item.cinderscapes.rose_quartz_pillar": "Pilar de cuarzo rosa", - "item.cinderscapes.rose_quartz_slab": "Losa de cuarzo rosa", - "item.cinderscapes.rose_quartz_stairs": "Escaleras de cuarzo rosa", - "item.cinderscapes.scorched_button": "Botón chamuscado", - "item.cinderscapes.scorched_door": "Puerta chamuscada", - "item.cinderscapes.scorched_fence": "Valla chamuscada", - "item.cinderscapes.scorched_fence_gate": "Puerta de valla chamuscada", - "item.cinderscapes.scorched_hyphae": "Hifas chamuscadas", - "item.cinderscapes.scorched_planks": "Madera chamuscada", - "item.cinderscapes.scorched_pressure_plate": "Placa de presión chamuscada", - "item.cinderscapes.scorched_shrub": "Arbusto chamuscado", - "item.cinderscapes.scorched_sign": "Letrero chamuscado", - "item.cinderscapes.scorched_slab": "Losa chamuscada", - "item.cinderscapes.scorched_sprouts": "Rastrojo chamuscado", - "item.cinderscapes.scorched_stairs": "Escaleras chamuscada", - "item.cinderscapes.scorched_stem": "Tallo chamuscado", - "item.cinderscapes.scorched_tendrils": "Zarcillos chamuscados", - "item.cinderscapes.scorched_trapdoor": "Trampilla chamuscada", - "item.cinderscapes.smoky_quartz_block": "Cuarzo ahumado", - "item.cinderscapes.smoky_quartz_bricks": "Ladrillos de cuarzo ahumado", - "item.cinderscapes.smoky_quartz_ore": "Mineral de cuarzo ahumado", - "item.cinderscapes.smoky_quartz_pillar": "Pilar de cuarzo ahumado", - "item.cinderscapes.smoky_quartz_slab": "Losa de cuarzo ahumado", - "item.cinderscapes.smoky_quartz_stairs": "Escaleras de cuarzo ahumado", - "item.cinderscapes.smooth_rose_quartz": "Cuarzo rosa liso", - "item.cinderscapes.smooth_rose_quartz_slab": "Losa de cuarzo rosa liso", - "item.cinderscapes.smooth_rose_quartz_stairs": "Escaleras de cuarzo rosa liso", - "item.cinderscapes.smooth_smoky_quartz": "Cuarzo ahumado liso", - "item.cinderscapes.smooth_smoky_quartz_slab": "Losa de cuarzo ahumado liso", - "item.cinderscapes.smooth_smoky_quartz_stairs": "Escaleras de cuarzo ahumado liso", - "item.cinderscapes.smooth_sulfur_quartz": "Cuarzo de azufre liso", - "item.cinderscapes.smooth_sulfur_quartz_slab": "Losa de cuarzo de azufre liso", - "item.cinderscapes.smooth_sulfur_quartz_stairs": "Escaleras de cuarzo de azufre liso", - "item.cinderscapes.stripped_scorched_hyphae": "Hifas chamuscadas sin corteza", - "item.cinderscapes.stripped_scorched_stem": "Tallo chamuscado sin corteza", - "item.cinderscapes.stripped_umbral_hyphae": "Hifas eclipsadas sin corteza", - "item.cinderscapes.stripped_umbral_stem": "Tallo eclipsado sin corteza", - "item.cinderscapes.sulfur_block": "Bloque de azufre", - "item.cinderscapes.sulfur_ore": "Mineral de azufre", - "item.cinderscapes.sulfur_quartz_block": "Cuarzo de azufre", - "item.cinderscapes.sulfur_quartz_bricks": "Ladrillos de cuarzo de azufre", - "item.cinderscapes.sulfur_quartz_ore": "Mineral de cuarzo de azufre", - "item.cinderscapes.sulfur_quartz_pillar": "Pilar de cuarzo de azufre", - "item.cinderscapes.sulfur_quartz_slab": "Losa de cuarzo de azufre", - "item.cinderscapes.sulfur_quartz_stairs": "Escaleras de cuarzo de azufre", - "item.cinderscapes.tall_photofern": "Fotohelecho alto", - "item.cinderscapes.twilight_fescues": "Festuca crepuscular", - "item.cinderscapes.twilight_tendrils": "Zarcillos crepusculares", - "item.cinderscapes.twilight_vine_block": "Bloque de lianas crepusculares", - "item.cinderscapes.umbral_button": "Botón eclipsado", - "item.cinderscapes.umbral_door": "Puerta eclipsada", - "item.cinderscapes.umbral_fence": "Valla eclipsada", - "item.cinderscapes.umbral_fence_gate": "Puerta de valla eclipsada", - "item.cinderscapes.umbral_flesh_block": "Carne eclipsada", - "item.cinderscapes.umbral_fungus": "Hongo eclipsado", - "item.cinderscapes.umbral_hyphae": "Hifas eclipsadas", - "item.cinderscapes.umbral_nylium": "Nilio eclipsado", - "item.cinderscapes.umbral_planks": "Madera eclipsada", - "item.cinderscapes.umbral_pressure_plate": "Placa de presión eclipsada", - "item.cinderscapes.umbral_sign": "Letrero eclipsado", - "item.cinderscapes.umbral_slab": "Losa eclipsada", - "item.cinderscapes.umbral_stairs": "Escaleras eclipsadas", - "item.cinderscapes.umbral_stem": "Tallo eclipsado", - "item.cinderscapes.umbral_trapdoor": "Trampilla eclipsada", - "item.cinderscapes.umbral_wart_block": "Bloque de verrugas eclipsadas", - "text.autoconfig.cinderscapes.title": "Configuración de Cinderscapes", "text.autoconfig.cinderscapes.option.biomes": "Modificar generación de biomas", "text.autoconfig.cinderscapes.option.biomes.enableAshyShoals": "Activar bioma de bancos cenizos", diff --git a/client/src/main/resources/assets/cinderscapes/lang/fr_fr.json b/client/src/main/resources/assets/cinderscapes/lang/fr_fr.json index c2ee3a2b..5ff85b4a 100644 --- a/client/src/main/resources/assets/cinderscapes/lang/fr_fr.json +++ b/client/src/main/resources/assets/cinderscapes/lang/fr_fr.json @@ -99,92 +99,5 @@ "item.cinderscapes.rose_quartz": "Quartz rose", "item.cinderscapes.smoky_quartz": "Quartz fumé", - "item.cinderscapes.sulfur_quartz": "Quartz sulfureux", - - "item.cinderscapes.ash": "Cendre", - "item.cinderscapes.ash_block": "Bloc de cendres", - "item.cinderscapes.chiseled_rose_quartz_block": "Bloc de quartz rose sculpté", - "item.cinderscapes.chiseled_smoky_quartz_block": "Bloc de quartz fumé sculpté", - "item.cinderscapes.chiseled_sulfur_quartz_block": "Bloc de quartz sulfureux sculpté", - "item.cinderscapes.crystalline_quartz": "Quartz cristallin", - "item.cinderscapes.crystalline_rose_quartz": "Quartz rose cristallin", - "item.cinderscapes.crystalline_smoky_quartz": "Quartz fumé cristallin", - "item.cinderscapes.crystalline_sulfur_quartz": "Quartz sulfureux cristallin", - "item.cinderscapes.crystinium": "Cristinium", - "item.cinderscapes.ghastly_ectoplasm": "Ectoplasme blême", - "item.cinderscapes.luminous_pod": "Carpelle lumineuse", - "item.cinderscapes.photofern": "Photofougère", - "item.cinderscapes.polypite_quartz": "Quartz polypite", - "item.cinderscapes.polypite_rose_quartz": "Quartz rose polypite", - "item.cinderscapes.polypite_smoky_quartz": "Quartz fumé polypite", - "item.cinderscapes.polypite_sulfur_quartz": "Quartz sulfureux polypite", - "item.cinderscapes.pyracinth": "Pyracinthe", - "item.cinderscapes.rose_quartz_block": "Bloc de quartz rose", - "item.cinderscapes.rose_quartz_bricks": "Briques de quartz rose", - "item.cinderscapes.rose_quartz_ore": "Minerai de quartz rose", - "item.cinderscapes.rose_quartz_pillar": "Pilier de quartz rose", - "item.cinderscapes.rose_quartz_slab": "Dalle de quartz rose", - "item.cinderscapes.rose_quartz_stairs": "Escalier en quartz rose", - "item.cinderscapes.scorched_button": "Bouton roussi", - "item.cinderscapes.scorched_door": "Porte roussie", - "item.cinderscapes.scorched_fence": "Barrière roussie", - "item.cinderscapes.scorched_fence_gate": "Portillon roussi", - "item.cinderscapes.scorched_hyphae": "Hyphes roussies", - "item.cinderscapes.scorched_planks": "Planches roussies", - "item.cinderscapes.scorched_pressure_plate": "Plaque de pression roussie", - "item.cinderscapes.scorched_shrub": "Arbuste roussi", - "item.cinderscapes.scorched_sign": "Pancarte roussie", - "item.cinderscapes.scorched_slab": "Dalle roussie", - "item.cinderscapes.scorched_sprouts": "Germes roussis", - "item.cinderscapes.scorched_stairs": "Escalier roussi", - "item.cinderscapes.scorched_stem": "Tige roussie", - "item.cinderscapes.scorched_tendrils": "Vrilles roussies", - "item.cinderscapes.scorched_trapdoor": "Trappe roussie", - "item.cinderscapes.smoky_quartz_block": "Bloc de quartz fumé", - "item.cinderscapes.smoky_quartz_bricks": "Briques de quartz fumé", - "item.cinderscapes.smoky_quartz_ore": "Minerai de quartz fumé", - "item.cinderscapes.smoky_quartz_pillar": "Pilier de quartz fumé", - "item.cinderscapes.smoky_quartz_slab": "Dalle de quartz fumé", - "item.cinderscapes.smoky_quartz_stairs": "Escalier en quartz fumé", - "item.cinderscapes.smooth_rose_quartz": "Bloc de quartz rose lisse", - "item.cinderscapes.smooth_rose_quartz_slab": "Dalle en quartz rose lisse", - "item.cinderscapes.smooth_rose_quartz_stairs": "Escalier en quartz rose lisse", - "item.cinderscapes.smooth_smoky_quartz": "Bloc de quartz fumé lisse", - "item.cinderscapes.smooth_smoky_quartz_slab": "Dalle en quartz fumé lisse", - "item.cinderscapes.smooth_smoky_quartz_stairs": "Escalier en quartz fumé lisse", - "item.cinderscapes.smooth_sulfur_quartz": "Bloc de quartz sulfureux lisse", - "item.cinderscapes.smooth_sulfur_quartz_slab": "Dalle en quartz sulfureux lisse", - "item.cinderscapes.smooth_sulfur_quartz_stairs": "Escalier en quartz sulfureux lisse", - "item.cinderscapes.stripped_scorched_hyphae": "Hyphes roussies dénudées", - "item.cinderscapes.stripped_scorched_stem": "Tige roussie dénudée", - "item.cinderscapes.stripped_umbral_hyphae": "Hyphes éclipsées dénudées", - "item.cinderscapes.stripped_umbral_stem": "Tige éclipsée dénudée", - "item.cinderscapes.sulfur_block": "Bloc de soufre", - "item.cinderscapes.sulfur_ore": "Minerai de soufre", - "item.cinderscapes.sulfur_quartz_block": "Bloc de quartz sulfureux", - "item.cinderscapes.sulfur_quartz_bricks": "Briques de quartz sulfureux", - "item.cinderscapes.sulfur_quartz_ore": "Minerai de quartz sulfureux", - "item.cinderscapes.sulfur_quartz_pillar": "Pilier de quartz sulfureux", - "item.cinderscapes.sulfur_quartz_slab": "Dalle de quartz sulfureux", - "item.cinderscapes.sulfur_quartz_stairs": "Escalier en quartz sulfureux", - "item.cinderscapes.tall_photofern": "Grande photofougère", - "item.cinderscapes.twilight_fescues": "Fétuques crépusculaires", - "item.cinderscapes.twilight_tendrils": "Vrilles crépusculaires", - "item.cinderscapes.twilight_vine_block": "Bloc de vigne crépusculaire", - "item.cinderscapes.umbral_button": "Bouton éclipsé", - "item.cinderscapes.umbral_door": "Porte éclipsée", - "item.cinderscapes.umbral_fence": "Barrière éclipsée", - "item.cinderscapes.umbral_fence_gate": "Portillon éclipsé", - "item.cinderscapes.umbral_flesh_block": "Chair éclipsée", - "item.cinderscapes.umbral_fungus": "Champignon éclipsé", - "item.cinderscapes.umbral_hyphae": "Hyphes éclipsées", - "item.cinderscapes.umbral_nylium": "Nylium éclipsé", - "item.cinderscapes.umbral_planks": "Planches éclipsées", - "item.cinderscapes.umbral_pressure_plate": "Plaque de pression éclipsée", - "item.cinderscapes.umbral_sign": "Pancarte éclipsée", - "item.cinderscapes.umbral_slab": "Dalle éclipsée", - "item.cinderscapes.umbral_stairs": "Escalier éclipsé", - "item.cinderscapes.umbral_stem": "Tige éclipsée", - "item.cinderscapes.umbral_trapdoor": "Trappe éclipsée", - "item.cinderscapes.umbral_wart_block": "Bloc de verrues éclipsées" + "item.cinderscapes.sulfur_quartz": "Quartz sulfureux" } \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/lang/pl_pl.json b/client/src/main/resources/assets/cinderscapes/lang/pl_pl.json index 2823204f..6745acc1 100644 --- a/client/src/main/resources/assets/cinderscapes/lang/pl_pl.json +++ b/client/src/main/resources/assets/cinderscapes/lang/pl_pl.json @@ -99,92 +99,5 @@ "item.cinderscapes.rose_quartz": "Różany kwarc", "item.cinderscapes.smoky_quartz": "Dymiony kwarc", - "item.cinderscapes.sulfur_quartz": "Siarkowy kwarc", - - "item.cinderscapes.ash": "Popiół", - "item.cinderscapes.ash_block": "Blok popiołu", - "item.cinderscapes.chiseled_rose_quartz_block": "Rzeźbiony blok różanego kwarcu", - "item.cinderscapes.chiseled_smoky_quartz_block": "Rzeźbiony blok dymionego kwarcu", - "item.cinderscapes.chiseled_sulfur_quartz_block": "Rzeźbiony blok siarkowego kwarcu", - "item.cinderscapes.crystalline_quartz": "Krystaliczny kwarc", - "item.cinderscapes.crystalline_rose_quartz": "Krystaliczny różany kwarc", - "item.cinderscapes.crystalline_smoky_quartz": "Krystaliczny dymiony kwarc", - "item.cinderscapes.crystalline_sulfur_quartz": "Krystaliczny siarkowy kwarc", - "item.cinderscapes.crystinium": "Krysztynium", - "item.cinderscapes.ghastly_ectoplasm": "Upiorna ektoplazma", - "item.cinderscapes.luminous_pod": "Świetlny strąk", - "item.cinderscapes.photofern": "Grzybopaproć", - "item.cinderscapes.polypite_quartz": "Polipitowy kwarc", - "item.cinderscapes.polypite_rose_quartz": "Polipitowy różany kwarc", - "item.cinderscapes.polypite_smoky_quartz": "Polipitowy dymiony kwarc", - "item.cinderscapes.polypite_sulfur_quartz": "Polopitowy siarkowy kwarc", - "item.cinderscapes.pyracinth": "Ognisty hiacynt", - "item.cinderscapes.rose_quartz_block": "Blok różanego kwarcu", - "item.cinderscapes.rose_quartz_bricks": "Różane kwarcowe cegły", - "item.cinderscapes.rose_quartz_ore": "Ruda różanego kwarcu", - "item.cinderscapes.rose_quartz_pillar": "Różany kwarcowy filar", - "item.cinderscapes.rose_quartz_slab": "Różana kwarcowa płyta", - "item.cinderscapes.rose_quartz_stairs": "Różane kwarcowe schody", - "item.cinderscapes.scorched_button": "Przypalony przycisk", - "item.cinderscapes.scorched_door": "Przypalone drzwi", - "item.cinderscapes.scorched_fence": "Przypalony płot", - "item.cinderscapes.scorched_fence_gate": "Przypalona furtka", - "item.cinderscapes.scorched_hyphae": "Przypalone strzępki", - "item.cinderscapes.scorched_planks": "Przypalone deski", - "item.cinderscapes.scorched_pressure_plate": "Przypalona płyta naciskowa", - "item.cinderscapes.scorched_shrub": "Przypalony krzak", - "item.cinderscapes.scorched_sign": "Przypalony znak", - "item.cinderscapes.scorched_slab": "Przypalona płyta", - "item.cinderscapes.scorched_sprouts": "Przypalone kiełki", - "item.cinderscapes.scorched_stairs": "Przypalone schody", - "item.cinderscapes.scorched_stem": "Przypalony trzon", - "item.cinderscapes.scorched_tendrils": "Przypalone wicie", - "item.cinderscapes.scorched_trapdoor": "Przypalona klapa", - "item.cinderscapes.smoky_quartz_block": "Blok dymionego kwarcu", - "item.cinderscapes.smoky_quartz_bricks": "Dymione kwarcowe cegły", - "item.cinderscapes.smoky_quartz_ore": "Ruda dymionego kwarcu", - "item.cinderscapes.smoky_quartz_pillar": "Dymiony kwarcowy filar", - "item.cinderscapes.smoky_quartz_slab": "Dymiona kwarcowa płyta", - "item.cinderscapes.smoky_quartz_stairs": "Dymione kwarcowe schody", - "item.cinderscapes.smooth_rose_quartz": "Głądki różany kwarc", - "item.cinderscapes.smooth_rose_quartz_slab": "Gładka różana kwarcowa płyta", - "item.cinderscapes.smooth_rose_quartz_stairs": "Głądkie różane kwarcowe schody", - "item.cinderscapes.smooth_smoky_quartz": "Gładki dymiony kwarc", - "item.cinderscapes.smooth_smoky_quartz_slab": "Gładka dymiona kwarcowa płyta", - "item.cinderscapes.smooth_smoky_quartz_stairs": "Gładkie dymione kwarcowe schody", - "item.cinderscapes.smooth_sulfur_quartz": "Gładki siarkowy kwarc", - "item.cinderscapes.smooth_sulfur_quartz_slab": "Gładka siarkowa kwarcowa płyta", - "item.cinderscapes.smooth_sulfur_quartz_stairs": "Gładkie siarkowe kwarcowe schody", - "item.cinderscapes.stripped_scorched_hyphae": "Okorowane przypalone strzępki", - "item.cinderscapes.stripped_scorched_stem": "Okorowany przypalony trzon", - "item.cinderscapes.stripped_umbral_hyphae": "Okorowane umbralne strzępki", - "item.cinderscapes.stripped_umbral_stem": "Okorowany umbralny trzon", - "item.cinderscapes.sulfur_block": "Blok siarki", - "item.cinderscapes.sulfur_ore": "Ruda siarki", - "item.cinderscapes.sulfur_quartz_block": "Blok siarkowego kwarcu", - "item.cinderscapes.sulfur_quartz_bricks": "Siarkowe kwarcowe cegły", - "item.cinderscapes.sulfur_quartz_ore": "Ruda siarkowego kwarcu", - "item.cinderscapes.sulfur_quartz_pillar": "Siarkowy kwarcowy filar", - "item.cinderscapes.sulfur_quartz_slab": "Siarkowa kwarcowa płyta", - "item.cinderscapes.sulfur_quartz_stairs": "Siarkowe kwarcowe schody", - "item.cinderscapes.tall_photofern": "Wysoka grzybopaproć", - "item.cinderscapes.twilight_fescues": "Kostrzewa zmierzchu", - "item.cinderscapes.twilight_tendrils": "Wić zmierzchu", - "item.cinderscapes.twilight_vine_block": "Blok pnącz zmierzchu", - "item.cinderscapes.umbral_button": "Umbralny przycisk", - "item.cinderscapes.umbral_door": "Umbralne drzwi", - "item.cinderscapes.umbral_fence": "Umbralny płot", - "item.cinderscapes.umbral_fence_gate": "Umbralna furtka", - "item.cinderscapes.umbral_flesh_block": "Blok umbralnego mięsa", - "item.cinderscapes.umbral_fungus": "Umbralny grzyb", - "item.cinderscapes.umbral_hyphae": "Umbralne strzępki", - "item.cinderscapes.umbral_nylium": "Umbralne nylium", - "item.cinderscapes.umbral_planks": "Umbralne deski", - "item.cinderscapes.umbral_pressure_plate": "Umbralna płyta naciskowa", - "item.cinderscapes.umbral_sign": "Umbralny znak", - "item.cinderscapes.umbral_slab": "Umbralna płyta", - "item.cinderscapes.umbral_stairs": "Umbralne schody", - "item.cinderscapes.umbral_stem": "Umbralny trzon", - "item.cinderscapes.umbral_trapdoor": "Umbralna klapa", - "item.cinderscapes.umbral_wart_block": "Blok umbralnej brodawki" + "item.cinderscapes.sulfur_quartz": "Siarkowy kwarc" } \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/lang/pt_br.json b/client/src/main/resources/assets/cinderscapes/lang/pt_br.json index e8687e6c..5923b11d 100644 --- a/client/src/main/resources/assets/cinderscapes/lang/pt_br.json +++ b/client/src/main/resources/assets/cinderscapes/lang/pt_br.json @@ -106,93 +106,6 @@ "item.cinderscapes.music_disc_luminous_plantation": "Disco de música", "item.cinderscapes.music_disc_luminous_plantation.desc": "LudoCrypt - Luminous Plantation", - "item.cinderscapes.ash": "Cinzas", - "item.cinderscapes.ash_block": "Bloco de cinzas", - "item.cinderscapes.chiseled_rose_quartz_block": "Bloco de quartzo róseo talhado", - "item.cinderscapes.chiseled_smoky_quartz_block": "Bloco de quartzo fumê talhado", - "item.cinderscapes.chiseled_sulfur_quartz_block": "Bloco de quartzo-enxofre talhado", - "item.cinderscapes.crystalline_quartz": "Quartzo cristalino", - "item.cinderscapes.crystalline_rose_quartz": "Quartzo róseo cristalino", - "item.cinderscapes.crystalline_smoky_quartz": "Quartzo fumê cristalino", - "item.cinderscapes.crystalline_sulfur_quartz": "Quartzo-enxofre cristalino", - "item.cinderscapes.crystinium": "Cristíneo", - "item.cinderscapes.ghastly_ectoplasm": "Ectoplasma medonho", - "item.cinderscapes.luminous_pod": "Vagem-luminosa", - "item.cinderscapes.photofern": "Photomambaia", - "item.cinderscapes.polypite_quartz": "Agregado de quartzo", - "item.cinderscapes.polypite_rose_quartz": "Agregado de quartzo róseo", - "item.cinderscapes.polypite_smoky_quartz": "Agregado de quartzo fumê", - "item.cinderscapes.polypite_sulfur_quartz": "Agregado de quartzo-enxofre", - "item.cinderscapes.pyracinth": "Piracinto", - "item.cinderscapes.rose_quartz_block": "Bloco de quartzo róseo", - "item.cinderscapes.rose_quartz_bricks": "Tijolos de quartzo róseo", - "item.cinderscapes.rose_quartz_ore": "Minério de quartzo róseo", - "item.cinderscapes.rose_quartz_pillar": "Pilar de quartzo róseo", - "item.cinderscapes.rose_quartz_slab": "Laje de quartzo róseo", - "item.cinderscapes.rose_quartz_stairs": "Escadas de quartzo róseo", - "item.cinderscapes.scorched_button": "Botão chamuscado", - "item.cinderscapes.scorched_door": "Porta chamuscada", - "item.cinderscapes.scorched_fence": "Cerca chamuscada", - "item.cinderscapes.scorched_fence_gate": "Portão chamuscado", - "item.cinderscapes.scorched_hyphae": "Hifas chamuscadas", - "item.cinderscapes.scorched_planks": "Tábuas chamuscadas", - "item.cinderscapes.scorched_pressure_plate": "Placa de pressão chamuscada", - "item.cinderscapes.scorched_shrub": "Arbusto chamuscado", - "item.cinderscapes.scorched_sign": "Placa chamuscada", - "item.cinderscapes.scorched_slab": "Laje chamuscada", - "item.cinderscapes.scorched_sprouts": "Brotos chamuscados", - "item.cinderscapes.scorched_stairs": "Escadas chamuscadas", - "item.cinderscapes.scorched_stem": "Caule chamuscado", - "item.cinderscapes.scorched_tendrils": "Gavinhas chamuscadas", - "item.cinderscapes.scorched_trapdoor": "Alçapão chamuscado", - "item.cinderscapes.smoky_quartz_block": "Bloco de quartzo fumê", - "item.cinderscapes.smoky_quartz_bricks": "Tijolos de quartzo fumê", - "item.cinderscapes.smoky_quartz_ore": "Minério de quartzo fumê", - "item.cinderscapes.smoky_quartz_pillar": "Pilar de quartzo fumê", - "item.cinderscapes.smoky_quartz_slab": "Laje de quartzo fumê", - "item.cinderscapes.smoky_quartz_stairs": "Escadas de quartzo fumê", - "item.cinderscapes.smooth_rose_quartz": "Bloco de quatzo róseo liso", - "item.cinderscapes.smooth_rose_quartz_slab": "Laje de quartzo róseo liso", - "item.cinderscapes.smooth_rose_quartz_stairs": "Escadas de quartzo róseo liso", - "item.cinderscapes.smooth_smoky_quartz": "Bloco de quartzo fumê liso", - "item.cinderscapes.smooth_smoky_quartz_slab": "Laje de quartzo fumê liso", - "item.cinderscapes.smooth_smoky_quartz_stairs": "Escadas de quartzo fumê liso", - "item.cinderscapes.smooth_sulfur_quartz": "Bloco de quartzo-enxofre liso", - "item.cinderscapes.smooth_sulfur_quartz_slab": "Laje de quartzo-enxofre liso", - "item.cinderscapes.smooth_sulfur_quartz_stairs": "Escadas de quartzo-enxofre liso", - "item.cinderscapes.stripped_scorched_hyphae": "Hifas chamuscadas descascadas", - "item.cinderscapes.stripped_scorched_stem": "Caule chamuscado descascado", - "item.cinderscapes.stripped_umbral_hyphae": "Hifas umbráticas descascadas", - "item.cinderscapes.stripped_umbral_stem": "Caule umbrático descascado", - "item.cinderscapes.sulfur_block": "Bloco de enxofre", - "item.cinderscapes.sulfur_ore": "Minério de enxofre", - "item.cinderscapes.sulfur_quartz_block": "Bloco de quartzo-enxofre", - "item.cinderscapes.sulfur_quartz_bricks": "Tijolos de quartzo-enxofre", - "item.cinderscapes.sulfur_quartz_ore": "Minério de quartzo-enxofre", - "item.cinderscapes.sulfur_quartz_pillar": "Pilar de quartzo-enxofre", - "item.cinderscapes.sulfur_quartz_slab": "Laje de quartzo-enxofre", - "item.cinderscapes.sulfur_quartz_stairs": "Escadas de quartzo-enxofre", - "item.cinderscapes.tall_photofern": "Photomambaia alta", - "item.cinderscapes.twilight_fescues": "Festucas crepusculares", - "item.cinderscapes.twilight_tendrils": "Gavinhas crepusculares", - "item.cinderscapes.twilight_vine_block": "Bloco de trepadeira crepuscular", - "item.cinderscapes.umbral_button": "Botão umbrático", - "item.cinderscapes.umbral_door": "Porta umbrática", - "item.cinderscapes.umbral_fence": "Cerca umbrática", - "item.cinderscapes.umbral_fence_gate": "Portão umbrático", - "item.cinderscapes.umbral_flesh_block": "Himênio de fungo umbrático", - "item.cinderscapes.umbral_fungus": "Fungo umbrático", - "item.cinderscapes.umbral_hyphae": "Hifas umbráticas", - "item.cinderscapes.umbral_nylium": "Nicélio umbrático", - "item.cinderscapes.umbral_planks": "Tábuas umbráticas", - "item.cinderscapes.umbral_pressure_plate": "Placa de pressão umbrática", - "item.cinderscapes.umbral_sign": "Placa umbrática", - "item.cinderscapes.umbral_slab": "Laje umbrática", - "item.cinderscapes.umbral_stairs": "Escadas umbráticas", - "item.cinderscapes.umbral_stem": "Caule umbrático", - "item.cinderscapes.umbral_trapdoor": "Alçapão umbrático", - "item.cinderscapes.umbral_wart_block": "Bloco de fungo umbrático", - "text.autoconfig.cinderscapes.title": "Config. do Cinderscapes", "text.autoconfig.cinderscapes.option.biomes": "Modificar a geração de biomas", "text.autoconfig.cinderscapes.option.biomes.enableAshyShoals": "Permitir o bioma \"Depósitos de cinzas\"", diff --git a/client/src/main/resources/assets/cinderscapes/lang/ru_ru.json b/client/src/main/resources/assets/cinderscapes/lang/ru_ru.json index ee5e0f43..80e2256b 100644 --- a/client/src/main/resources/assets/cinderscapes/lang/ru_ru.json +++ b/client/src/main/resources/assets/cinderscapes/lang/ru_ru.json @@ -111,96 +111,6 @@ "item.cinderscapes.music_disc_luminous_plantation": "Пластинка", "item.cinderscapes.music_disc_luminous_plantation.desc": "LudoCrypt - Luminous Plantation", - "item.cinderscapes.ash": "Пепел", - "item.cinderscapes.ash_block": "Блок пепла", - "item.cinderscapes.chiseled_rose_quartz_block": "Резной блок розового кварца", - "item.cinderscapes.chiseled_smoky_quartz_block": "Резной блок дымчатого кварца", - "item.cinderscapes.chiseled_sulfur_quartz_block": "Резной блок серного кварца", - "item.cinderscapes.crystalline_quartz": "Кристаллический кварц", - "item.cinderscapes.crystalline_rose_quartz": "Кристаллический розовый кварц", - "item.cinderscapes.crystalline_smoky_quartz": "Кристаллический дымчатый кварц", - "item.cinderscapes.crystalline_sulfur_quartz": "Кристаллический серный кварц", - "item.cinderscapes.crystinium": "Кристиниум", - "item.cinderscapes.ghastly_ectoplasm": "Призрачная эктоплазма", - "item.cinderscapes.luminous_pod": "Светящийся стручок", - "item.cinderscapes.photofern": "Фотопапоротник", - "item.cinderscapes.polypite_quartz": "Полипит кварца", - "item.cinderscapes.polypite_rose_quartz": "Полипит розового кварца", - "item.cinderscapes.polypite_smoky_quartz": "Полипит дымчатого кварца", - "item.cinderscapes.polypite_sulfur_quartz": "Полипит серного кварца", - "item.cinderscapes.pyracinth": "Пирацинт", - "item.cinderscapes.rose_quartz_block": "Блок розового кварца", - "item.cinderscapes.rose_quartz_bricks": "Кирпичи из розового кварца", - "item.cinderscapes.rose_quartz_ore": "Руда розового кварца", - "item.cinderscapes.rose_quartz_pillar": "Пилон из розового кварца", - "item.cinderscapes.rose_quartz_slab": "Плита из розового кварца", - "item.cinderscapes.rose_quartz_stairs": "Ступеньки из розового кварца", - "item.cinderscapes.scorched_button": "Выжженная кнопка", - "item.cinderscapes.scorched_door": "Выжженная дверь", - "item.cinderscapes.scorched_fence": "Выжженный забор", - "item.cinderscapes.scorched_fence_gate": "Выжженная калитка", - "item.cinderscapes.scorched_hanging_sign": "Выжженная подвесная табличка", - "item.cinderscapes.scorched_hyphae": "Выжженные гифы", - "item.cinderscapes.scorched_planks": "Выжженные доски", - "item.cinderscapes.scorched_pressure_plate": "Выжженная нажимная плита", - "item.cinderscapes.scorched_shrub": "Выжженный куст", - "item.cinderscapes.scorched_sign": "Выжженная табличка", - "item.cinderscapes.scorched_slab": "Выжженная плита", - "item.cinderscapes.scorched_sprouts": "Выжженные ростки", - "item.cinderscapes.scorched_stairs": "Выжженные ступеньки", - "item.cinderscapes.scorched_stem": "Выжженный стебель", - "item.cinderscapes.scorched_tendrils": "Выжженные завитки", - "item.cinderscapes.scorched_trapdoor": "Выжженный люк", - "item.cinderscapes.smoky_quartz_block": "Блок дымчатого кварца", - "item.cinderscapes.smoky_quartz_bricks": "Кирпичи из дымчатого кварца", - "item.cinderscapes.smoky_quartz_ore": "Руда дымчатого кварца", - "item.cinderscapes.smoky_quartz_pillar": "Пилон из дымчатого кварца", - "item.cinderscapes.smoky_quartz_slab": "Плита из дымчатого кварца", - "item.cinderscapes.smoky_quartz_stairs": "Ступеньки из дымчатого кварца", - "item.cinderscapes.smooth_rose_quartz": "Гладкий розовый кварц", - "item.cinderscapes.smooth_rose_quartz_slab": "Плита из гладкого розового кварца", - "item.cinderscapes.smooth_rose_quartz_stairs": "Ступеньки из гладкого розового кварца", - "item.cinderscapes.smooth_smoky_quartz": "Гладкий дымчатый кварц", - "item.cinderscapes.smooth_smoky_quartz_slab": "Плита из гладкого дымчатого кварца", - "item.cinderscapes.smooth_smoky_quartz_stairs": "Ступеньки из гладкого дымчатого кварца", - "item.cinderscapes.smooth_sulfur_quartz": "Гладкий серный кварц", - "item.cinderscapes.smooth_sulfur_quartz_slab": "Плита из гладкого серного кварца", - "item.cinderscapes.smooth_sulfur_quartz_stairs": "Ступеньки из гладкого серного кварца", - "item.cinderscapes.stripped_scorched_hyphae": "Очищенные выжженные гифы", - "item.cinderscapes.stripped_scorched_stem": "Очищенный выжженный стебель", - "item.cinderscapes.stripped_umbral_hyphae": "Очищенные мрачные гифы", - "item.cinderscapes.stripped_umbral_stem": "Очищенный мрачный стебель", - "item.cinderscapes.sulfur_block": "Блок серы", - "item.cinderscapes.sulfur_ore": "Серная руда", - "item.cinderscapes.sulfur_quartz_block": "Блок серного кварца", - "item.cinderscapes.sulfur_quartz_bricks": "Кирпичи из серного кварца", - "item.cinderscapes.sulfur_quartz_ore": "Руда серного кварца", - "item.cinderscapes.sulfur_quartz_pillar": "Пилон из серного кварца", - "item.cinderscapes.sulfur_quartz_slab": "Плита из серного кварца", - "item.cinderscapes.sulfur_quartz_stairs": "Ступеньки из серного кварца", - "item.cinderscapes.tall_photofern": "Высокий фотопапоротник", - "item.cinderscapes.twilight_fescues": "Сумеречные фески", - "item.cinderscapes.twilight_tendrils": "Сумеречные завитки", - "item.cinderscapes.twilight_vine_block": "Блок сумеречной лозы", - "item.cinderscapes.umbral_button": "Мрачная кнопка", - "item.cinderscapes.umbral_door": "Мрачная дверь", - "item.cinderscapes.umbral_fence": "Мрачный забор", - "item.cinderscapes.umbral_fence_gate": "Мрачная калитка", - "item.cinderscapes.umbral_flesh_block": "Блок мрачной плоти", - "item.cinderscapes.umbral_fungus": "Мрачный гриб", - "item.cinderscapes.umbral_hanging_sign": "Мрачная подвесная табличка", - "item.cinderscapes.umbral_hyphae": "Мрачные гифы", - "item.cinderscapes.umbral_nylium": "Мрачный нилий", - "item.cinderscapes.umbral_planks": "Мрачные доски", - "item.cinderscapes.umbral_pressure_plate": "Мрачная нажимная плита", - "item.cinderscapes.umbral_sign": "Мрачная табличка", - "item.cinderscapes.umbral_slab": "Мрачная плита", - "item.cinderscapes.umbral_stairs": "Мрачные ступеньки", - "item.cinderscapes.umbral_stem": "Мрачный стебель", - "item.cinderscapes.umbral_trapdoor": "Мрачный люк", - "item.cinderscapes.umbral_wart_block": "Блок мрачного нароста", - - "item.cinderscapes.nodzol": "Нодзол", "item.cinderscapes.nodzol.description": "Этот блок проклят...", "text.autoconfig.cinderscapes.title": "Конфигурация Cinderscapes", @@ -214,7 +124,7 @@ "text.autoconfig.cinderscapes.option.biomes.enableLuminousGrove": "Включить биом \"Светящаяся роща\"", "text.autoconfig.cinderscapes.option.biomes.enableQuartzCavern": "Включить биом \"Кварцевый каньон\"", - "trim_material.cinderscapes.rose_quartz": "Розовый кварцевый материал", - "trim_material.cinderscapes.smoky_quartz": "Дымчатый кварцевый материал", - "trim_material.cinderscapes.sulfur_quartz": "Серный кварцевый материал" + "trim_material.cinderscapes.cinderscapes_rose_quartz": "Розовый кварцевый материал", + "trim_material.cinderscapes.cinderscapes_smoky_quartz": "Дымчатый кварцевый материал", + "trim_material.cinderscapes.cinderscapes_sulfur_quartz": "Серный кварцевый материал" } diff --git a/client/src/main/resources/assets/cinderscapes/lang/uk_ua.json b/client/src/main/resources/assets/cinderscapes/lang/uk_ua.json index a3ad5a88..141829cd 100644 --- a/client/src/main/resources/assets/cinderscapes/lang/uk_ua.json +++ b/client/src/main/resources/assets/cinderscapes/lang/uk_ua.json @@ -111,96 +111,6 @@ "item.cinderscapes.music_disc_luminous_plantation": "Платівка", "item.cinderscapes.music_disc_luminous_plantation.desc": "LudoCrypt - Luminous Plantation", - "item.cinderscapes.ash": "Попіл", - "item.cinderscapes.ash_block": "Попільний блок", - "item.cinderscapes.chiseled_rose_quartz_block": "Різьблений рожево-кварцовий блок", - "item.cinderscapes.chiseled_smoky_quartz_block": "Різьблений димчасто-кварцовий блок", - "item.cinderscapes.chiseled_sulfur_quartz_block": "Різьблений сірчано-кварцовий блок", - "item.cinderscapes.crystalline_quartz": "Кристалічний кварц", - "item.cinderscapes.crystalline_rose_quartz": "Кристалічний рожевий кварц", - "item.cinderscapes.crystalline_smoky_quartz": "Кристалічний димчастий кварц", - "item.cinderscapes.crystalline_sulfur_quartz": "Кристалічний сірчаний кварц", - "item.cinderscapes.crystinium": "Кристаній", - "item.cinderscapes.ghastly_ectoplasm": "Жахлива ектоплазма", - "item.cinderscapes.luminous_pod": "Люмінесцентний стручок", - "item.cinderscapes.photofern": "Світло-папороть", - "item.cinderscapes.polypite_quartz": "Кінчастий кварц", - "item.cinderscapes.polypite_rose_quartz": "Кінчастий рожевий кварц", - "item.cinderscapes.polypite_smoky_quartz": "Кінчастий димчастий кварц", - "item.cinderscapes.polypite_sulfur_quartz": "Кінчастий сірчаний кварц", - "item.cinderscapes.pyracinth": "Вогнецвіт", - "item.cinderscapes.rose_quartz_block": "Рожево-кварцовий блок", - "item.cinderscapes.rose_quartz_bricks": "Рожево-кварцова цегла", - "item.cinderscapes.rose_quartz_ore": "Рожево-кварцова руда", - "item.cinderscapes.rose_quartz_pillar": "Рожево-кварцова колона", - "item.cinderscapes.rose_quartz_slab": "Рожево-кварцова плита", - "item.cinderscapes.rose_quartz_stairs": "Рожево-кварцові сходи", - "item.cinderscapes.scorched_button": "Обпалена кнопка", - "item.cinderscapes.scorched_door": "Обпалені двері", - "item.cinderscapes.scorched_fence": "Обпалений паркан", - "item.cinderscapes.scorched_fence_gate": "Обпалена хвіртка", - "item.cinderscapes.scorched_hanging_sign": "Обпалена вивіска", - "item.cinderscapes.scorched_hyphae": "Обпалені гіфи", - "item.cinderscapes.scorched_planks": "Обпалені дошки", - "item.cinderscapes.scorched_pressure_plate": "Обпалена натискна плита", - "item.cinderscapes.scorched_shrub": "Обпалений кущ", - "item.cinderscapes.scorched_sign": "Обпалена табличка", - "item.cinderscapes.scorched_slab": "Обпалена плита", - "item.cinderscapes.scorched_sprouts": "Обпалені паростки", - "item.cinderscapes.scorched_stairs": "Обпалені сходи", - "item.cinderscapes.scorched_stem": "Обпалене стебло", - "item.cinderscapes.scorched_tendrils": "Обпалені вусики", - "item.cinderscapes.scorched_trapdoor": "Обпалений люк", - "item.cinderscapes.smoky_quartz_block": "Димчасто-кварцовий блок", - "item.cinderscapes.smoky_quartz_bricks": "Димчасто-кварцова цегла", - "item.cinderscapes.smoky_quartz_ore": "Димчасто-кварцова руда", - "item.cinderscapes.smoky_quartz_pillar": "Димчасто-кварцова колона", - "item.cinderscapes.smoky_quartz_slab": "Димчасто-кварцова плита", - "item.cinderscapes.smoky_quartz_stairs": "Димчасто-кварцові сходи", - "item.cinderscapes.smooth_rose_quartz": "Гладкий рожево-кварцовий блок", - "item.cinderscapes.smooth_rose_quartz_slab": "Гладка рожево-кварцова плита", - "item.cinderscapes.smooth_rose_quartz_stairs": "Гладкі рожево-кварцові сходи", - "item.cinderscapes.smooth_smoky_quartz": "Гладкий димчасто-кварцовий блок", - "item.cinderscapes.smooth_smoky_quartz_slab": "Гладка димчасто-кварцова плита", - "item.cinderscapes.smooth_smoky_quartz_stairs": "Гладкі димчасто-кварцові сходи", - "item.cinderscapes.smooth_sulfur_quartz": "Гладкий сірчано-кварцовий блок", - "item.cinderscapes.smooth_sulfur_quartz_slab": "Гладка сірчано-кварцова плита", - "item.cinderscapes.smooth_sulfur_quartz_stairs": "Гладкі сірчано-кварцові сходи", - "item.cinderscapes.stripped_scorched_hyphae": "Обтесані обпалені гіфи", - "item.cinderscapes.stripped_scorched_stem": "Обтесане обпалене стебло", - "item.cinderscapes.stripped_umbral_hyphae": "Обтесані тіньові гіфи", - "item.cinderscapes.stripped_umbral_stem": "Обтесане тіньове стебло", - "item.cinderscapes.sulfur_block": "Сірчаний блок", - "item.cinderscapes.sulfur_ore": "Сірчана руда", - "item.cinderscapes.sulfur_quartz_block": "Сірчано-кварцовий блок", - "item.cinderscapes.sulfur_quartz_bricks": "Сірчано-кварцова цегла", - "item.cinderscapes.sulfur_quartz_ore": "Сірчано-кварцова руда", - "item.cinderscapes.sulfur_quartz_pillar": "Сірчано-кварцова колона", - "item.cinderscapes.sulfur_quartz_slab": "Сірчано-кварцова плита", - "item.cinderscapes.sulfur_quartz_stairs": "Сірчано-кварцові сходи", - "item.cinderscapes.tall_photofern": "Висока світло-папороть", - "item.cinderscapes.twilight_fescues": "Сутінкові фески", - "item.cinderscapes.twilight_tendrils": "Сутінкові вусики", - "item.cinderscapes.twilight_vine_block": "Блок сутінкової лози", - "item.cinderscapes.umbral_button": "Тіньова кнопка", - "item.cinderscapes.umbral_door": "Тіньові двері", - "item.cinderscapes.umbral_fence": "Тіньовий паркан", - "item.cinderscapes.umbral_fence_gate": "Тіньова хвіртка", - "item.cinderscapes.umbral_flesh_block": "Блок тіньової плоті", - "item.cinderscapes.umbral_fungus": "Тіньовий гриб", - "item.cinderscapes.umbral_hanging_sign": "Тіньова вивіска", - "item.cinderscapes.umbral_hyphae": "Тіньові гіфи", - "item.cinderscapes.umbral_nylium": "Тіньовий нілій", - "item.cinderscapes.umbral_planks": "Тіньові дошки", - "item.cinderscapes.umbral_pressure_plate": "Тіньова натискна плита", - "item.cinderscapes.umbral_sign": "Тіньова табличка", - "item.cinderscapes.umbral_slab": "Тіньова плита", - "item.cinderscapes.umbral_stairs": "Тіньові сходи", - "item.cinderscapes.umbral_stem": "Тіньове стебло", - "item.cinderscapes.umbral_trapdoor": "Тіньовий люк", - "item.cinderscapes.umbral_wart_block": "Блок тіньового наросту", - - "item.cinderscapes.nodzol": "Нідзол", "item.cinderscapes.nodzol.description": "Цей блок доглянуто...", "text.autoconfig.cinderscapes.title": "Конфігурація Cinderscapes", @@ -214,7 +124,7 @@ "text.autoconfig.cinderscapes.option.biomes.enableLuminousGrove": "Увімкнути біом люмінесцентного гаю", "text.autoconfig.cinderscapes.option.biomes.enableQuartzCavern": "Увімкнути біом кварцової печери", - "trim_material.cinderscapes.rose_quartz": "Рожево-кварцовий матеріал", - "trim_material.cinderscapes.smoky_quartz": "Димчасто-кварцовий матеріал", - "trim_material.cinderscapes.sulfur_quartz": "Сірчано-кварцовий матеріал" + "trim_material.cinderscapes.cinderscapes_rose_quartz": "Рожево-кварцовий матеріал", + "trim_material.cinderscapes.cinderscapes_smoky_quartz": "Димчасто-кварцовий матеріал", + "trim_material.cinderscapes.cinderscapes_sulfur_quartz": "Сірчано-кварцовий матеріал" } \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/lang/zh_cn.json b/client/src/main/resources/assets/cinderscapes/lang/zh_cn.json index 26ca4409..b35f4ee1 100644 --- a/client/src/main/resources/assets/cinderscapes/lang/zh_cn.json +++ b/client/src/main/resources/assets/cinderscapes/lang/zh_cn.json @@ -101,94 +101,5 @@ "item.cinderscapes.sulfur_quartz": "硫石英", "item.cinderscapes.rose_quartz": "玫瑰色石英", - "item.cinderscapes.smoky_quartz": "熏制石英", - - "item.cinderscapes.ash": "灰烬", - "item.cinderscapes.ash_block": "灰烬块", - "item.cinderscapes.chiseled_rose_quartz_block": "錾制玫瑰色石英块", - "item.cinderscapes.chiseled_smoky_quartz_block": "錾制熏制石英块", - "item.cinderscapes.chiseled_sulfur_quartz_block": "錾制硫石英块", - "item.cinderscapes.crystalline_quartz": "结晶石英", - "item.cinderscapes.crystalline_rose_quartz": "结晶玫瑰色石英", - "item.cinderscapes.crystalline_smoky_quartz": "结晶熏制石英", - "item.cinderscapes.crystalline_sulfur_quartz": "结晶硫石英", - "item.cinderscapes.crystinium": "晶体", - "item.cinderscapes.ghastly_ectoplasm": "恐怖灵质", - "item.cinderscapes.luminous_pod": "发光豆荚", - "item.cinderscapes.photofern": "光蕨", - "item.cinderscapes.polypite_quartz": "聚合石英", - "item.cinderscapes.polypite_rose_quartz": "聚合玫瑰色石英", - "item.cinderscapes.polypite_smoky_quartz": "聚合熏制石英", - "item.cinderscapes.polypite_sulfur_quartz": "聚合硫石英", - "item.cinderscapes.pyracinth": "风信子", - "item.cinderscapes.rose_quartz_block": "玫瑰色石英块", - "item.cinderscapes.rose_quartz_bricks": "玫瑰色石英砖", - "item.cinderscapes.rose_quartz_ore": "玫瑰色石英矿石", - "item.cinderscapes.rose_quartz_pillar": "玫瑰色石英柱", - "item.cinderscapes.rose_quartz_slab": "玫瑰色石英台阶", - "item.cinderscapes.rose_quartz_stairs": "玫瑰色石英楼梯", - "item.cinderscapes.scorched_button": "烧焦的按钮", - "item.cinderscapes.scorched_door": "烧焦的门", - "item.cinderscapes.scorched_fence": "烧焦的栅栏", - "item.cinderscapes.scorched_fence_gate": "烧焦的栅栏门", - "item.cinderscapes.scorched_hanging_sign" : "悬挂式烧焦的告示牌", - "item.cinderscapes.scorched_hyphae": "烧焦的菌丝", - "item.cinderscapes.scorched_planks": "烧焦的木板", - "item.cinderscapes.scorched_pressure_plate": "烧焦的压力板", - "item.cinderscapes.scorched_shrub": "烧焦的灌木", - "item.cinderscapes.scorched_sign": "烧焦的告示牌", - "item.cinderscapes.scorched_slab": "烧焦的台阶", - "item.cinderscapes.scorched_sprouts": "烧焦的幼苗", - "item.cinderscapes.scorched_stairs": "烧焦的楼梯", - "item.cinderscapes.scorched_stem": "烧焦的树干", - "item.cinderscapes.scorched_tendrils": "烧焦的卷须", - "item.cinderscapes.scorched_trapdoor": "烧焦的活板门", - "item.cinderscapes.smoky_quartz_block": "熏制石英块", - "item.cinderscapes.smoky_quartz_bricks": "熏制石英砖", - "item.cinderscapes.smoky_quartz_ore": "熏制石英矿石", - "item.cinderscapes.smoky_quartz_pillar": "熏制石英柱", - "item.cinderscapes.smoky_quartz_slab": "熏制石英台阶", - "item.cinderscapes.smoky_quartz_stairs": "熏制石英楼梯", - "item.cinderscapes.smooth_rose_quartz": "平滑玫瑰色石英", - "item.cinderscapes.smooth_rose_quartz_slab": "平滑玫瑰色石英台阶", - "item.cinderscapes.smooth_rose_quartz_stairs": "平滑玫瑰色石英楼梯", - "item.cinderscapes.smooth_smoky_quartz": "平滑熏制石英", - "item.cinderscapes.smooth_smoky_quartz_slab": "平滑熏制石英台阶", - "item.cinderscapes.smooth_smoky_quartz_stairs": "平滑熏制石英楼梯", - "item.cinderscapes.smooth_sulfur_quartz": "平滑硫石英", - "item.cinderscapes.smooth_sulfur_quartz_slab": "平滑硫石英台阶", - "item.cinderscapes.smooth_sulfur_quartz_stairs": "平滑硫石英楼梯", - "item.cinderscapes.stripped_scorched_hyphae": "烧焦的去皮菌丝", - "item.cinderscapes.stripped_scorched_stem": "烧焦的去皮树干", - "item.cinderscapes.stripped_umbral_hyphae": "去皮暗影菌丝", - "item.cinderscapes.stripped_umbral_stem": "去皮暗影树干", - "item.cinderscapes.sulfur_block": "硫块", - "item.cinderscapes.sulfur_ore": "硫矿石", - "item.cinderscapes.sulfur_quartz_block": "硫石英块", - "item.cinderscapes.sulfur_quartz_bricks": "硫石英砖", - "item.cinderscapes.sulfur_quartz_ore": "硫石英矿石", - "item.cinderscapes.sulfur_quartz_pillar": "硫石英柱", - "item.cinderscapes.sulfur_quartz_slab": "硫石英台阶", - "item.cinderscapes.sulfur_quartz_stairs": "硫石英楼梯", - "item.cinderscapes.tall_photofern": "高光蕨", - "item.cinderscapes.twilight_fescues": "暮色羊茅", - "item.cinderscapes.twilight_tendrils": "暮色卷须", - "item.cinderscapes.twilight_vine_block": "暮色藤蔓块", - "item.cinderscapes.umbral_button": "暗影按钮", - "item.cinderscapes.umbral_door": "暗影门", - "item.cinderscapes.umbral_fence": "暗影栅栏", - "item.cinderscapes.umbral_fence_gate": "暗影栅栏门", - "item.cinderscapes.umbral_flesh_block": "暗影肉块", - "item.cinderscapes.umbral_fungus": "暗影真菌", - "item.cinderscapes.umbral_hanging_sign" : "悬挂式暗影告示牌", - "item.cinderscapes.umbral_hyphae": "暗影菌丝", - "item.cinderscapes.umbral_nylium": "暗影菌岩", - "item.cinderscapes.umbral_planks": "暗影木板", - "item.cinderscapes.umbral_pressure_plate": "暗影压力板", - "item.cinderscapes.umbral_sign": "暗影告示牌", - "item.cinderscapes.umbral_slab": "暗影台阶", - "item.cinderscapes.umbral_stairs": "暗影楼梯", - "item.cinderscapes.umbral_stem": "暗影树干", - "item.cinderscapes.umbral_trapdoor": "暗影活板门", - "item.cinderscapes.umbral_wart_block": "暗影疣块" + "item.cinderscapes.smoky_quartz": "熏制石英" } \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/ash_block.json b/client/src/main/resources/assets/cinderscapes/models/block/ash_block.json deleted file mode 100644 index 7a9b62b0..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/ash_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/ash" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/ash_height10.json b/client/src/main/resources/assets/cinderscapes/models/block/ash_height10.json deleted file mode 100644 index fcb0e9ff..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/ash_height10.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "textures": { - "particle": "cinderscapes:block/ash", - "texture": "cinderscapes:block/ash" - }, - "elements": [ - { "from": [ 0, 0, 0 ], - "to": [ 16, 10, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "north": { "uv": [ 0, 6, 16, 16 ], "texture": "#texture", "cullface": "north" }, - "south": { "uv": [ 0, 6, 16, 16 ], "texture": "#texture", "cullface": "south" }, - "west": { "uv": [ 0, 6, 16, 16 ], "texture": "#texture", "cullface": "west" }, - "east": { "uv": [ 0, 6, 16, 16 ], "texture": "#texture", "cullface": "east" } - } - } - ] -} diff --git a/client/src/main/resources/assets/cinderscapes/models/block/ash_height12.json b/client/src/main/resources/assets/cinderscapes/models/block/ash_height12.json deleted file mode 100644 index a4231524..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/ash_height12.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "textures": { - "particle": "cinderscapes:block/ash", - "texture": "cinderscapes:block/ash" - }, - "elements": [ - { "from": [ 0, 0, 0 ], - "to": [ 16, 12, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "north": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture", "cullface": "north" }, - "south": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture", "cullface": "south" }, - "west": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture", "cullface": "west" }, - "east": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture", "cullface": "east" } - } - } - ] -} diff --git a/client/src/main/resources/assets/cinderscapes/models/block/ash_height14.json b/client/src/main/resources/assets/cinderscapes/models/block/ash_height14.json deleted file mode 100644 index 4832bbc7..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/ash_height14.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "textures": { - "particle": "cinderscapes:block/ash", - "texture": "cinderscapes:block/ash" - }, - "elements": [ - { "from": [ 0, 0, 0 ], - "to": [ 16, 14, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "north": { "uv": [ 0, 2, 16, 16 ], "texture": "#texture", "cullface": "north" }, - "south": { "uv": [ 0, 2, 16, 16 ], "texture": "#texture", "cullface": "south" }, - "west": { "uv": [ 0, 2, 16, 16 ], "texture": "#texture", "cullface": "west" }, - "east": { "uv": [ 0, 2, 16, 16 ], "texture": "#texture", "cullface": "east" } - } - } - ] -} diff --git a/client/src/main/resources/assets/cinderscapes/models/block/ash_height2.json b/client/src/main/resources/assets/cinderscapes/models/block/ash_height2.json deleted file mode 100644 index 8499187a..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/ash_height2.json +++ /dev/null @@ -1,19 +0,0 @@ -{ "parent": "block/thin_block", - "textures": { - "particle": "cinderscapes:block/ash", - "texture": "cinderscapes:block/ash" - }, - "elements": [ - { "from": [ 0, 0, 0 ], - "to": [ 16, 2, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture", "cullface": "north" }, - "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture", "cullface": "south" }, - "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture", "cullface": "west" }, - "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture", "cullface": "east" } - } - } - ] -} diff --git a/client/src/main/resources/assets/cinderscapes/models/block/ash_height4.json b/client/src/main/resources/assets/cinderscapes/models/block/ash_height4.json deleted file mode 100644 index a4828b65..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/ash_height4.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "textures": { - "particle": "cinderscapes:block/ash", - "texture": "cinderscapes:block/ash" - }, - "elements": [ - { "from": [ 0, 0, 0 ], - "to": [ 16, 4, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "north": { "uv": [ 0, 12, 16, 16 ], "texture": "#texture", "cullface": "north" }, - "south": { "uv": [ 0, 12, 16, 16 ], "texture": "#texture", "cullface": "south" }, - "west": { "uv": [ 0, 12, 16, 16 ], "texture": "#texture", "cullface": "west" }, - "east": { "uv": [ 0, 12, 16, 16 ], "texture": "#texture", "cullface": "east" } - } - } - ] -} diff --git a/client/src/main/resources/assets/cinderscapes/models/block/ash_height6.json b/client/src/main/resources/assets/cinderscapes/models/block/ash_height6.json deleted file mode 100644 index 224e5ffd..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/ash_height6.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "textures": { - "particle": "cinderscapes:block/ash", - "texture": "cinderscapes:block/ash" - }, - "elements": [ - { "from": [ 0, 0, 0 ], - "to": [ 16, 6, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "north": { "uv": [ 0, 10, 16, 16 ], "texture": "#texture", "cullface": "north" }, - "south": { "uv": [ 0, 10, 16, 16 ], "texture": "#texture", "cullface": "south" }, - "west": { "uv": [ 0, 10, 16, 16 ], "texture": "#texture", "cullface": "west" }, - "east": { "uv": [ 0, 10, 16, 16 ], "texture": "#texture", "cullface": "east" } - } - } - ] -} diff --git a/client/src/main/resources/assets/cinderscapes/models/block/ash_height8.json b/client/src/main/resources/assets/cinderscapes/models/block/ash_height8.json deleted file mode 100644 index f6cbf2e8..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/ash_height8.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "textures": { - "particle": "cinderscapes:block/ash", - "texture": "cinderscapes:block/ash" - }, - "elements": [ - { "from": [ 0, 0, 0 ], - "to": [ 16, 8, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "north": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture", "cullface": "north" }, - "south": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture", "cullface": "south" }, - "west": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture", "cullface": "west" }, - "east": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture", "cullface": "east" } - } - } - ] -} diff --git a/client/src/main/resources/assets/cinderscapes/models/block/bramble_berry_bush_stage0.json b/client/src/main/resources/assets/cinderscapes/models/block/bramble_berry_bush_stage0.json deleted file mode 100644 index 4e05ef27..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/bramble_berry_bush_stage0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "cinderscapes:block/bramble_berry_bush_stage0" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/bramble_berry_bush_stage1.json b/client/src/main/resources/assets/cinderscapes/models/block/bramble_berry_bush_stage1.json deleted file mode 100644 index 527343e9..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/bramble_berry_bush_stage1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "cinderscapes:block/bramble_berry_bush_stage1" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/bramble_berry_bush_stage2.json b/client/src/main/resources/assets/cinderscapes/models/block/bramble_berry_bush_stage2.json deleted file mode 100644 index 2929e47c..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/bramble_berry_bush_stage2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "cinderscapes:block/bramble_berry_bush_stage2" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/bramble_berry_bush_stage3.json b/client/src/main/resources/assets/cinderscapes/models/block/bramble_berry_bush_stage3.json deleted file mode 100644 index 12852902..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/bramble_berry_bush_stage3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "cinderscapes:block/bramble_berry_bush_stage3" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/charred_bone_block.json b/client/src/main/resources/assets/cinderscapes/models/block/charred_bone_block.json deleted file mode 100644 index adb00ac0..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/charred_bone_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "cinderscapes:block/charred_bone_block_top", - "side": "cinderscapes:block/charred_bone_block_side" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/chiseled_rose_quartz_block.json b/client/src/main/resources/assets/cinderscapes/models/block/chiseled_rose_quartz_block.json deleted file mode 100644 index b22d383e..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/chiseled_rose_quartz_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "cinderscapes:block/chiseled_rose_quartz_top", - "side": "cinderscapes:block/chiseled_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/chiseled_smoky_quartz_block.json b/client/src/main/resources/assets/cinderscapes/models/block/chiseled_smoky_quartz_block.json deleted file mode 100644 index a8d4f158..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/chiseled_smoky_quartz_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "cinderscapes:block/chiseled_smoky_quartz_top", - "side": "cinderscapes:block/chiseled_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/chiseled_sulfur_quartz_block.json b/client/src/main/resources/assets/cinderscapes/models/block/chiseled_sulfur_quartz_block.json deleted file mode 100644 index b1cdc2ae..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/chiseled_sulfur_quartz_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "cinderscapes:block/chiseled_sulfur_quartz_top", - "side": "cinderscapes:block/chiseled_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/crystalline_quartz.json b/client/src/main/resources/assets/cinderscapes/models/block/crystalline_quartz.json deleted file mode 100644 index 47a4943f..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/crystalline_quartz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/crystalline_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/crystalline_rose_quartz.json b/client/src/main/resources/assets/cinderscapes/models/block/crystalline_rose_quartz.json deleted file mode 100644 index aa5b7118..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/crystalline_rose_quartz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/crystalline_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/crystalline_smoky_quartz.json b/client/src/main/resources/assets/cinderscapes/models/block/crystalline_smoky_quartz.json deleted file mode 100644 index 748ae080..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/crystalline_smoky_quartz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/crystalline_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/crystalline_sulfur_quartz.json b/client/src/main/resources/assets/cinderscapes/models/block/crystalline_sulfur_quartz.json deleted file mode 100644 index bbdf35ae..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/crystalline_sulfur_quartz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/crystalline_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/crystinium.json b/client/src/main/resources/assets/cinderscapes/models/block/crystinium.json deleted file mode 100644 index 2fbce2ef..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/crystinium.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "cinderscapes:block/crystinium" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/ghastly_ectoplasm_bottom.json b/client/src/main/resources/assets/cinderscapes/models/block/ghastly_ectoplasm_bottom.json deleted file mode 100644 index 3b1e27a8..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/ghastly_ectoplasm_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "cinderscapes:block/ghastly_ectoplasm_bottom" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/ghastly_ectoplasm_middle.json b/client/src/main/resources/assets/cinderscapes/models/block/ghastly_ectoplasm_middle.json deleted file mode 100644 index 66ffbe53..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/ghastly_ectoplasm_middle.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "cinderscapes:block/ghastly_ectoplasm_middle" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/ghastly_ectoplasm_top.json b/client/src/main/resources/assets/cinderscapes/models/block/ghastly_ectoplasm_top.json deleted file mode 100644 index 8ca48d17..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/ghastly_ectoplasm_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "cinderscapes:block/ghastly_ectoplasm_top" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/luminous_pod_bottom.json b/client/src/main/resources/assets/cinderscapes/models/block/luminous_pod_bottom.json deleted file mode 100644 index 2642bd88..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/luminous_pod_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "cinderscapes:block/luminous_pod_bottom" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/luminous_pod_top.json b/client/src/main/resources/assets/cinderscapes/models/block/luminous_pod_top.json deleted file mode 100644 index dfd9f3e1..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/luminous_pod_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "cinderscapes:block/luminous_pod_top" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/nodzol.json b/client/src/main/resources/assets/cinderscapes/models/block/nodzol.json deleted file mode 100644 index f171c892..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/nodzol.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "cinderscapes:block/nodzol_top", - "bottom": "minecraft:block/netherrack", - "side": "cinderscapes:block/nodzol" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/photofern.json b/client/src/main/resources/assets/cinderscapes/models/block/photofern.json deleted file mode 100644 index 472d0b1d..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/photofern.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "cinderscapes:block/photofern" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/polypite_quartz_floor.json b/client/src/main/resources/assets/cinderscapes/models/block/polypite_quartz_floor.json deleted file mode 100644 index 0b72684f..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/polypite_quartz_floor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/coral_fan", - "textures": { - "fan": "cinderscapes:block/polypite_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/polypite_quartz_wall.json b/client/src/main/resources/assets/cinderscapes/models/block/polypite_quartz_wall.json deleted file mode 100644 index 955c4ff6..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/polypite_quartz_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/coral_wall_fan", - "textures": { - "fan": "cinderscapes:block/polypite_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/polypite_rose_quartz_floor.json b/client/src/main/resources/assets/cinderscapes/models/block/polypite_rose_quartz_floor.json deleted file mode 100644 index 28d8b0a5..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/polypite_rose_quartz_floor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/coral_fan", - "textures": { - "fan": "cinderscapes:block/polypite_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/polypite_rose_quartz_wall.json b/client/src/main/resources/assets/cinderscapes/models/block/polypite_rose_quartz_wall.json deleted file mode 100644 index bf1c0d9f..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/polypite_rose_quartz_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/coral_wall_fan", - "textures": { - "fan": "cinderscapes:block/polypite_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/polypite_smoky_quartz_floor.json b/client/src/main/resources/assets/cinderscapes/models/block/polypite_smoky_quartz_floor.json deleted file mode 100644 index fc4afdf4..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/polypite_smoky_quartz_floor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/coral_fan", - "textures": { - "fan": "cinderscapes:block/polypite_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/polypite_smoky_quartz_wall.json b/client/src/main/resources/assets/cinderscapes/models/block/polypite_smoky_quartz_wall.json deleted file mode 100644 index 855f054b..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/polypite_smoky_quartz_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/coral_wall_fan", - "textures": { - "fan": "cinderscapes:block/polypite_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/polypite_sulfur_quartz_floor.json b/client/src/main/resources/assets/cinderscapes/models/block/polypite_sulfur_quartz_floor.json deleted file mode 100644 index d7cd45da..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/polypite_sulfur_quartz_floor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/coral_fan", - "textures": { - "fan": "cinderscapes:block/polypite_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/polypite_sulfur_quartz_wall.json b/client/src/main/resources/assets/cinderscapes/models/block/polypite_sulfur_quartz_wall.json deleted file mode 100644 index 6e0b4668..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/polypite_sulfur_quartz_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/coral_wall_fan", - "textures": { - "fan": "cinderscapes:block/polypite_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/potted_crystinium.json b/client/src/main/resources/assets/cinderscapes/models/block/potted_crystinium.json deleted file mode 100644 index 8621f9a0..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/potted_crystinium.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "cinderscapes:block/crystinium" - } -} diff --git a/client/src/main/resources/assets/cinderscapes/models/block/potted_luminous_pod.json b/client/src/main/resources/assets/cinderscapes/models/block/potted_luminous_pod.json deleted file mode 100644 index 0d9d01d6..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/potted_luminous_pod.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "cinderscapes:block/potted_luminous_pod" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/potted_photofern.json b/client/src/main/resources/assets/cinderscapes/models/block/potted_photofern.json deleted file mode 100644 index 2d962649..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/potted_photofern.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "cinderscapes:block/photofern" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/potted_polypite_quartz.json b/client/src/main/resources/assets/cinderscapes/models/block/potted_polypite_quartz.json deleted file mode 100644 index 2ae66458..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/potted_polypite_quartz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "cinderscapes:block/polypite_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/potted_polypite_rose_quartz.json b/client/src/main/resources/assets/cinderscapes/models/block/potted_polypite_rose_quartz.json deleted file mode 100644 index 3bc74248..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/potted_polypite_rose_quartz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "cinderscapes:block/polypite_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/potted_polypite_smoky_quartz.json b/client/src/main/resources/assets/cinderscapes/models/block/potted_polypite_smoky_quartz.json deleted file mode 100644 index 09c6fd5c..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/potted_polypite_smoky_quartz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "cinderscapes:block/polypite_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/potted_polypite_sulfur_quartz.json b/client/src/main/resources/assets/cinderscapes/models/block/potted_polypite_sulfur_quartz.json deleted file mode 100644 index 621b97b2..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/potted_polypite_sulfur_quartz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "cinderscapes:block/polypite_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/potted_pyracinth.json b/client/src/main/resources/assets/cinderscapes/models/block/potted_pyracinth.json deleted file mode 100644 index adb6a809..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/potted_pyracinth.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "cinderscapes:block/pyracinth" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/potted_scorched_shrub.json b/client/src/main/resources/assets/cinderscapes/models/block/potted_scorched_shrub.json deleted file mode 100644 index edbaed04..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/potted_scorched_shrub.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "cinderscapes:block/scorched_shrub" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/potted_scorched_tendrils.json b/client/src/main/resources/assets/cinderscapes/models/block/potted_scorched_tendrils.json deleted file mode 100644 index 04194a96..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/potted_scorched_tendrils.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "cinderscapes:block/potted_scorched_tendrils" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/potted_twilight_tendrils.json b/client/src/main/resources/assets/cinderscapes/models/block/potted_twilight_tendrils.json deleted file mode 100644 index 60fc2afc..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/potted_twilight_tendrils.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "cinderscapes:block/potted_twilight_tendrils" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/potted_umbral_fungus.json b/client/src/main/resources/assets/cinderscapes/models/block/potted_umbral_fungus.json deleted file mode 100644 index 5d513161..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/potted_umbral_fungus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "cinderscapes:block/umbral_fungus" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/pyracinth.json b/client/src/main/resources/assets/cinderscapes/models/block/pyracinth.json deleted file mode 100644 index 1beee531..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/pyracinth.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "cinderscapes:block/pyracinth" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/quartz_sand.json b/client/src/main/resources/assets/cinderscapes/models/block/quartz_sand.json deleted file mode 100644 index ca212efa..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/quartz_sand.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/quartz_sand" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_block.json b/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_block.json deleted file mode 100644 index f8e293e1..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/rose_quartz_block" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_bricks.json b/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_bricks.json deleted file mode 100644 index 3ddfec55..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/rose_quartz_bricks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_ore.json b/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_ore.json deleted file mode 100644 index ca671df9..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/rose_quartz_ore" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_pillar.json b/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_pillar.json deleted file mode 100644 index 88eeeb05..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_pillar.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "cinderscapes:block/rose_quartz_pillar_top", - "side": "cinderscapes:block/rose_quartz_pillar" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_slab.json b/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_slab.json deleted file mode 100644 index a4fe5590..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "cinderscapes:block/rose_quartz_block", - "top": "cinderscapes:block/rose_quartz_block", - "side": "cinderscapes:block/rose_quartz_block" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_slab_top.json b/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_slab_top.json deleted file mode 100644 index 3f236092..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "cinderscapes:block/rose_quartz_block", - "top": "cinderscapes:block/rose_quartz_block", - "side": "cinderscapes:block/rose_quartz_block" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_stairs.json b/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_stairs.json deleted file mode 100644 index d6859cb4..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "cinderscapes:block/rose_quartz_block", - "top": "cinderscapes:block/rose_quartz_block", - "side": "cinderscapes:block/rose_quartz_block" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_stairs_inner.json b/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_stairs_inner.json deleted file mode 100644 index 2b906ae7..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "cinderscapes:block/rose_quartz_block", - "top": "cinderscapes:block/rose_quartz_block", - "side": "cinderscapes:block/rose_quartz_block" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_stairs_outer.json b/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_stairs_outer.json deleted file mode 100644 index 18b619cc..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/rose_quartz_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "cinderscapes:block/rose_quartz_block", - "top": "cinderscapes:block/rose_quartz_block", - "side": "cinderscapes:block/rose_quartz_block" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_button.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_button.json deleted file mode 100644 index dc34845c..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/button", - "textures": { - "texture": "cinderscapes:block/scorched_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_button_inventory.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_button_inventory.json deleted file mode 100644 index 64a7381e..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/button_inventory", - "textures": { - "texture": "cinderscapes:block/scorched_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_button_pressed.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_button_pressed.json deleted file mode 100644 index 35f5b34b..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/button_pressed", - "textures": { - "texture": "cinderscapes:block/scorched_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_door_bottom_left.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_door_bottom_left.json deleted file mode 100644 index 43611040..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_door_bottom_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left", - "textures": { - "top": "cinderscapes:block/scorched_door_top", - "bottom": "cinderscapes:block/scorched_door_bottom" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_door_bottom_left_open.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_door_bottom_left_open.json deleted file mode 100644 index f9f7f9cb..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_door_bottom_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left_open", - "textures": { - "top": "cinderscapes:block/scorched_door_top", - "bottom": "cinderscapes:block/scorched_door_bottom" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_door_bottom_right.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_door_bottom_right.json deleted file mode 100644 index ce2a3f3c..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_door_bottom_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right", - "textures": { - "top": "cinderscapes:block/scorched_door_top", - "bottom": "cinderscapes:block/scorched_door_bottom" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_door_bottom_right_open.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_door_bottom_right_open.json deleted file mode 100644 index 8a52899d..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_door_bottom_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right_open", - "textures": { - "top": "cinderscapes:block/scorched_door_top", - "bottom": "cinderscapes:block/scorched_door_bottom" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_door_top_left.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_door_top_left.json deleted file mode 100644 index 4ffabd0b..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_door_top_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left", - "textures": { - "top": "cinderscapes:block/scorched_door_top", - "bottom": "cinderscapes:block/scorched_door_bottom" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_door_top_left_open.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_door_top_left_open.json deleted file mode 100644 index 63c9e99a..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_door_top_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left_open", - "textures": { - "top": "cinderscapes:block/scorched_door_top", - "bottom": "cinderscapes:block/scorched_door_bottom" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_door_top_right.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_door_top_right.json deleted file mode 100644 index e5e41e2d..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_door_top_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right", - "textures": { - "top": "cinderscapes:block/scorched_door_top", - "bottom": "cinderscapes:block/scorched_door_bottom" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_door_top_right_open.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_door_top_right_open.json deleted file mode 100644 index 5bf50319..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_door_top_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right_open", - "textures": { - "top": "cinderscapes:block/scorched_door_top", - "bottom": "cinderscapes:block/scorched_door_bottom" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_fence_gate.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_fence_gate.json deleted file mode 100644 index 075bbde6..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate", - "textures": { - "texture": "cinderscapes:block/scorched_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_fence_gate_open.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_fence_gate_open.json deleted file mode 100644 index b9a339e3..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_open", - "textures": { - "texture": "cinderscapes:block/scorched_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_fence_gate_wall.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_fence_gate_wall.json deleted file mode 100644 index 7f668bca..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_wall", - "textures": { - "texture": "cinderscapes:block/scorched_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_fence_gate_wall_open.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_fence_gate_wall_open.json deleted file mode 100644 index d089b898..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_wall_open", - "textures": { - "texture": "cinderscapes:block/scorched_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_fence_inventory.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_fence_inventory.json deleted file mode 100644 index faa08ec0..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_fence_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_inventory", - "textures": { - "texture": "cinderscapes:block/scorched_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_fence_post.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_fence_post.json deleted file mode 100644 index 76fe2edb..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_fence_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_post", - "textures": { - "texture": "cinderscapes:block/scorched_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_fence_side.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_fence_side.json deleted file mode 100644 index 85c6c692..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_fence_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_side", - "textures": { - "texture": "cinderscapes:block/scorched_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_hanging_sign.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_hanging_sign.json deleted file mode 100644 index a946e3b6..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_hanging_sign.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "cinderscapes:block/scorched_planks" - } -} diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_hyphae.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_hyphae.json deleted file mode 100644 index 95d8af3e..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_hyphae.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "cinderscapes:block/scorched_stem", - "side": "cinderscapes:block/scorched_stem" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_planks.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_planks.json deleted file mode 100644 index 9e090b0a..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/scorched_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_pressure_plate.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_pressure_plate.json deleted file mode 100644 index 82b2ea76..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/pressure_plate_up", - "textures": { - "texture": "cinderscapes:block/scorched_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_pressure_plate_down.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_pressure_plate_down.json deleted file mode 100644 index ab452eda..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/pressure_plate_down", - "textures": { - "texture": "cinderscapes:block/scorched_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_shrub.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_shrub.json deleted file mode 100644 index 06722367..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_shrub.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "cinderscapes:block/scorched_shrub" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_sign.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_sign.json deleted file mode 100644 index a0a16882..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_sign.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "cinderscapes:block/scorched_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_slab.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_slab.json deleted file mode 100644 index 456a66d3..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "cinderscapes:block/scorched_planks", - "top": "cinderscapes:block/scorched_planks", - "side": "cinderscapes:block/scorched_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_slab_top.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_slab_top.json deleted file mode 100644 index 9333dede..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "cinderscapes:block/scorched_planks", - "top": "cinderscapes:block/scorched_planks", - "side": "cinderscapes:block/scorched_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_sprouts.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_sprouts.json deleted file mode 100644 index f694d51d..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_sprouts.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "cinderscapes:block/scorched_sprouts" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_stairs.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_stairs.json deleted file mode 100644 index 07e318d1..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "cinderscapes:block/scorched_planks", - "top": "cinderscapes:block/scorched_planks", - "side": "cinderscapes:block/scorched_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_stairs_inner.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_stairs_inner.json deleted file mode 100644 index 2c85acb1..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "cinderscapes:block/scorched_planks", - "top": "cinderscapes:block/scorched_planks", - "side": "cinderscapes:block/scorched_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_stairs_outer.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_stairs_outer.json deleted file mode 100644 index f87d603c..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "cinderscapes:block/scorched_planks", - "top": "cinderscapes:block/scorched_planks", - "side": "cinderscapes:block/scorched_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_stem.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_stem.json deleted file mode 100644 index 703b4689..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_stem.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "cinderscapes:block/scorched_stem_top", - "side": "cinderscapes:block/scorched_stem" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_tendrils.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_tendrils.json deleted file mode 100644 index e7321dc9..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_tendrils.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "cinderscapes:block/scorched_tendrils" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_trapdoor_bottom.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_trapdoor_bottom.json deleted file mode 100644 index 90c92525..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "cinderscapes:block/scorched_trapdoor" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_trapdoor_open.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_trapdoor_open.json deleted file mode 100644 index 12a4c39e..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_open", - "textures": { - "texture": "cinderscapes:block/scorched_trapdoor" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/scorched_trapdoor_top.json b/client/src/main/resources/assets/cinderscapes/models/block/scorched_trapdoor_top.json deleted file mode 100644 index 648c889f..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/scorched_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_top", - "textures": { - "texture": "cinderscapes:block/scorched_trapdoor" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_block.json b/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_block.json deleted file mode 100644 index 67730e26..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/smoky_quartz_block" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_bricks.json b/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_bricks.json deleted file mode 100644 index 3a0f31b1..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/smoky_quartz_bricks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_ore.json b/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_ore.json deleted file mode 100644 index 77afbab5..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/smoky_quartz_ore" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_pillar.json b/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_pillar.json deleted file mode 100644 index b49758a3..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_pillar.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "cinderscapes:block/smoky_quartz_pillar_top", - "side": "cinderscapes:block/smoky_quartz_pillar" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_slab.json b/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_slab.json deleted file mode 100644 index 6ca6533d..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "cinderscapes:block/smoky_quartz_block", - "top": "cinderscapes:block/smoky_quartz_block", - "side": "cinderscapes:block/smoky_quartz_block" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_slab_top.json b/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_slab_top.json deleted file mode 100644 index 3ec1f5b3..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "cinderscapes:block/smoky_quartz_block", - "top": "cinderscapes:block/smoky_quartz_block", - "side": "cinderscapes:block/smoky_quartz_block" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_stairs.json b/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_stairs.json deleted file mode 100644 index 1db9b450..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "cinderscapes:block/smoky_quartz_block", - "top": "cinderscapes:block/smoky_quartz_block", - "side": "cinderscapes:block/smoky_quartz_block" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_stairs_inner.json b/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_stairs_inner.json deleted file mode 100644 index df4ee296..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "cinderscapes:block/smoky_quartz_block", - "top": "cinderscapes:block/smoky_quartz_block", - "side": "cinderscapes:block/smoky_quartz_block" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_stairs_outer.json b/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_stairs_outer.json deleted file mode 100644 index 6bcebae6..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smoky_quartz_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "cinderscapes:block/smoky_quartz_block", - "top": "cinderscapes:block/smoky_quartz_block", - "side": "cinderscapes:block/smoky_quartz_block" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smooth_rose_quartz.json b/client/src/main/resources/assets/cinderscapes/models/block/smooth_rose_quartz.json deleted file mode 100644 index ac730965..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smooth_rose_quartz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/smooth_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smooth_rose_quartz_slab.json b/client/src/main/resources/assets/cinderscapes/models/block/smooth_rose_quartz_slab.json deleted file mode 100644 index f67cd7cb..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smooth_rose_quartz_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "cinderscapes:block/smooth_rose_quartz", - "top": "cinderscapes:block/smooth_rose_quartz", - "side": "cinderscapes:block/smooth_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smooth_rose_quartz_slab_top.json b/client/src/main/resources/assets/cinderscapes/models/block/smooth_rose_quartz_slab_top.json deleted file mode 100644 index ce436be3..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smooth_rose_quartz_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "cinderscapes:block/smooth_rose_quartz", - "top": "cinderscapes:block/smooth_rose_quartz", - "side": "cinderscapes:block/smooth_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smooth_rose_quartz_stairs.json b/client/src/main/resources/assets/cinderscapes/models/block/smooth_rose_quartz_stairs.json deleted file mode 100644 index 34fd6601..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smooth_rose_quartz_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "cinderscapes:block/smooth_rose_quartz", - "top": "cinderscapes:block/smooth_rose_quartz", - "side": "cinderscapes:block/smooth_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smooth_rose_quartz_stairs_inner.json b/client/src/main/resources/assets/cinderscapes/models/block/smooth_rose_quartz_stairs_inner.json deleted file mode 100644 index f67ee084..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smooth_rose_quartz_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "cinderscapes:block/smooth_rose_quartz", - "top": "cinderscapes:block/smooth_rose_quartz", - "side": "cinderscapes:block/smooth_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smooth_rose_quartz_stairs_outer.json b/client/src/main/resources/assets/cinderscapes/models/block/smooth_rose_quartz_stairs_outer.json deleted file mode 100644 index cefa849b..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smooth_rose_quartz_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "cinderscapes:block/smooth_rose_quartz", - "top": "cinderscapes:block/smooth_rose_quartz", - "side": "cinderscapes:block/smooth_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smooth_smoky_quartz.json b/client/src/main/resources/assets/cinderscapes/models/block/smooth_smoky_quartz.json deleted file mode 100644 index 22d96807..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smooth_smoky_quartz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/smooth_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smooth_smoky_quartz_slab.json b/client/src/main/resources/assets/cinderscapes/models/block/smooth_smoky_quartz_slab.json deleted file mode 100644 index 29d1a29e..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smooth_smoky_quartz_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "cinderscapes:block/smooth_smoky_quartz", - "top": "cinderscapes:block/smooth_smoky_quartz", - "side": "cinderscapes:block/smooth_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smooth_smoky_quartz_slab_top.json b/client/src/main/resources/assets/cinderscapes/models/block/smooth_smoky_quartz_slab_top.json deleted file mode 100644 index 1c96fcf6..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smooth_smoky_quartz_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "cinderscapes:block/smooth_smoky_quartz", - "top": "cinderscapes:block/smooth_smoky_quartz", - "side": "cinderscapes:block/smooth_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smooth_smoky_quartz_stairs.json b/client/src/main/resources/assets/cinderscapes/models/block/smooth_smoky_quartz_stairs.json deleted file mode 100644 index 55e6978c..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smooth_smoky_quartz_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "cinderscapes:block/smooth_smoky_quartz", - "top": "cinderscapes:block/smooth_smoky_quartz", - "side": "cinderscapes:block/smooth_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smooth_smoky_quartz_stairs_inner.json b/client/src/main/resources/assets/cinderscapes/models/block/smooth_smoky_quartz_stairs_inner.json deleted file mode 100644 index 728052d5..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smooth_smoky_quartz_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "cinderscapes:block/smooth_smoky_quartz", - "top": "cinderscapes:block/smooth_smoky_quartz", - "side": "cinderscapes:block/smooth_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smooth_smoky_quartz_stairs_outer.json b/client/src/main/resources/assets/cinderscapes/models/block/smooth_smoky_quartz_stairs_outer.json deleted file mode 100644 index 94ba5d70..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smooth_smoky_quartz_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "cinderscapes:block/smooth_smoky_quartz", - "top": "cinderscapes:block/smooth_smoky_quartz", - "side": "cinderscapes:block/smooth_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smooth_sulfur_quartz.json b/client/src/main/resources/assets/cinderscapes/models/block/smooth_sulfur_quartz.json deleted file mode 100644 index a8372454..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smooth_sulfur_quartz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/smooth_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smooth_sulfur_quartz_slab.json b/client/src/main/resources/assets/cinderscapes/models/block/smooth_sulfur_quartz_slab.json deleted file mode 100644 index 618c5ff8..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smooth_sulfur_quartz_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "cinderscapes:block/smooth_sulfur_quartz", - "top": "cinderscapes:block/smooth_sulfur_quartz", - "side": "cinderscapes:block/smooth_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smooth_sulfur_quartz_slab_top.json b/client/src/main/resources/assets/cinderscapes/models/block/smooth_sulfur_quartz_slab_top.json deleted file mode 100644 index dbe35cbc..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smooth_sulfur_quartz_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "cinderscapes:block/smooth_sulfur_quartz", - "top": "cinderscapes:block/smooth_sulfur_quartz", - "side": "cinderscapes:block/smooth_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smooth_sulfur_quartz_stairs.json b/client/src/main/resources/assets/cinderscapes/models/block/smooth_sulfur_quartz_stairs.json deleted file mode 100644 index c32b2fb2..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smooth_sulfur_quartz_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "cinderscapes:block/smooth_sulfur_quartz", - "top": "cinderscapes:block/smooth_sulfur_quartz", - "side": "cinderscapes:block/smooth_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smooth_sulfur_quartz_stairs_inner.json b/client/src/main/resources/assets/cinderscapes/models/block/smooth_sulfur_quartz_stairs_inner.json deleted file mode 100644 index 20ce5800..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smooth_sulfur_quartz_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "cinderscapes:block/smooth_sulfur_quartz", - "top": "cinderscapes:block/smooth_sulfur_quartz", - "side": "cinderscapes:block/smooth_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/smooth_sulfur_quartz_stairs_outer.json b/client/src/main/resources/assets/cinderscapes/models/block/smooth_sulfur_quartz_stairs_outer.json deleted file mode 100644 index 1cadf4a2..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/smooth_sulfur_quartz_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "cinderscapes:block/smooth_sulfur_quartz", - "top": "cinderscapes:block/smooth_sulfur_quartz", - "side": "cinderscapes:block/smooth_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/stripped_scorched_hyphae.json b/client/src/main/resources/assets/cinderscapes/models/block/stripped_scorched_hyphae.json deleted file mode 100644 index 575a11e0..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/stripped_scorched_hyphae.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "cinderscapes:block/stripped_scorched_stem", - "side": "cinderscapes:block/stripped_scorched_stem" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/stripped_scorched_stem.json b/client/src/main/resources/assets/cinderscapes/models/block/stripped_scorched_stem.json deleted file mode 100644 index 007b5475..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/stripped_scorched_stem.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "cinderscapes:block/stripped_scorched_stem_top", - "side": "cinderscapes:block/stripped_scorched_stem" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/stripped_umbral_hyphae.json b/client/src/main/resources/assets/cinderscapes/models/block/stripped_umbral_hyphae.json deleted file mode 100644 index 20a17ec0..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/stripped_umbral_hyphae.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "cinderscapes:block/stripped_umbral_stem", - "side": "cinderscapes:block/stripped_umbral_stem" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/stripped_umbral_stem.json b/client/src/main/resources/assets/cinderscapes/models/block/stripped_umbral_stem.json deleted file mode 100644 index 977f5211..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/stripped_umbral_stem.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "cinderscapes:block/stripped_umbral_stem_top", - "side": "cinderscapes:block/stripped_umbral_stem" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/sulfur_block.json b/client/src/main/resources/assets/cinderscapes/models/block/sulfur_block.json deleted file mode 100644 index 4e24d2b6..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/sulfur_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/sulfur_block" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/sulfur_ore.json b/client/src/main/resources/assets/cinderscapes/models/block/sulfur_ore.json deleted file mode 100644 index c45df856..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/sulfur_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/sulfur_ore" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_block.json b/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_block.json deleted file mode 100644 index c88363bd..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/sulfur_quartz_block" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_bricks.json b/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_bricks.json deleted file mode 100644 index 6f489bc7..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/sulfur_quartz_bricks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_ore.json b/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_ore.json deleted file mode 100644 index b8ad30e9..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/sulfur_quartz_ore" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_pillar.json b/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_pillar.json deleted file mode 100644 index 70b786c1..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_pillar.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "cinderscapes:block/sulfur_quartz_pillar_top", - "side": "cinderscapes:block/sulfur_quartz_pillar" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_slab.json b/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_slab.json deleted file mode 100644 index ae0c3716..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "cinderscapes:block/sulfur_quartz_block", - "top": "cinderscapes:block/sulfur_quartz_block", - "side": "cinderscapes:block/sulfur_quartz_block" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_slab_top.json b/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_slab_top.json deleted file mode 100644 index 868739bc..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "cinderscapes:block/sulfur_quartz_block", - "top": "cinderscapes:block/sulfur_quartz_block", - "side": "cinderscapes:block/sulfur_quartz_block" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_stairs.json b/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_stairs.json deleted file mode 100644 index 10240eb0..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "cinderscapes:block/sulfur_quartz_block", - "top": "cinderscapes:block/sulfur_quartz_block", - "side": "cinderscapes:block/sulfur_quartz_block" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_stairs_inner.json b/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_stairs_inner.json deleted file mode 100644 index 60b50108..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "cinderscapes:block/sulfur_quartz_block", - "top": "cinderscapes:block/sulfur_quartz_block", - "side": "cinderscapes:block/sulfur_quartz_block" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_stairs_outer.json b/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_stairs_outer.json deleted file mode 100644 index 0c89494e..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/sulfur_quartz_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "cinderscapes:block/sulfur_quartz_block", - "top": "cinderscapes:block/sulfur_quartz_block", - "side": "cinderscapes:block/sulfur_quartz_block" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/tall_photofern_bottom.json b/client/src/main/resources/assets/cinderscapes/models/block/tall_photofern_bottom.json deleted file mode 100644 index fcf376e0..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/tall_photofern_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "cinderscapes:block/tall_photofern_bottom" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/tall_photofern_top.json b/client/src/main/resources/assets/cinderscapes/models/block/tall_photofern_top.json deleted file mode 100644 index 6ac7f62e..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/tall_photofern_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "cinderscapes:block/tall_photofern_top" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/twilight_fescues.json b/client/src/main/resources/assets/cinderscapes/models/block/twilight_fescues.json deleted file mode 100644 index 0fa0bc9b..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/twilight_fescues.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "cinderscapes:block/twilight_fescues" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/twilight_tendrils.json b/client/src/main/resources/assets/cinderscapes/models/block/twilight_tendrils.json deleted file mode 100644 index 22cfa0d6..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/twilight_tendrils.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "cinderscapes:block/twilight_tendrils" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/twilight_vine_block.json b/client/src/main/resources/assets/cinderscapes/models/block/twilight_vine_block.json deleted file mode 100644 index a95ddc34..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/twilight_vine_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/twilight_vine_block" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_button.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_button.json deleted file mode 100644 index db05cbeb..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/button", - "textures": { - "texture": "cinderscapes:block/umbral_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_button_inventory.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_button_inventory.json deleted file mode 100644 index 6a55072f..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/button_inventory", - "textures": { - "texture": "cinderscapes:block/umbral_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_button_pressed.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_button_pressed.json deleted file mode 100644 index 266d3ffa..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/button_pressed", - "textures": { - "texture": "cinderscapes:block/umbral_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_door_bottom_left.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_door_bottom_left.json deleted file mode 100644 index 0410fdde..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_door_bottom_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left", - "textures": { - "top": "cinderscapes:block/umbral_door_top", - "bottom": "cinderscapes:block/umbral_door_bottom" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_door_bottom_left_open.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_door_bottom_left_open.json deleted file mode 100644 index 0b9d0c85..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_door_bottom_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left_open", - "textures": { - "top": "cinderscapes:block/umbral_door_top", - "bottom": "cinderscapes:block/umbral_door_bottom" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_door_bottom_right.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_door_bottom_right.json deleted file mode 100644 index edb4d625..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_door_bottom_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right", - "textures": { - "top": "cinderscapes:block/umbral_door_top", - "bottom": "cinderscapes:block/umbral_door_bottom" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_door_bottom_right_open.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_door_bottom_right_open.json deleted file mode 100644 index c024c760..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_door_bottom_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right_open", - "textures": { - "top": "cinderscapes:block/umbral_door_top", - "bottom": "cinderscapes:block/umbral_door_bottom" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_door_top_left.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_door_top_left.json deleted file mode 100644 index b3404865..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_door_top_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left", - "textures": { - "top": "cinderscapes:block/umbral_door_top", - "bottom": "cinderscapes:block/umbral_door_bottom" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_door_top_left_open.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_door_top_left_open.json deleted file mode 100644 index 86f60517..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_door_top_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left_open", - "textures": { - "top": "cinderscapes:block/umbral_door_top", - "bottom": "cinderscapes:block/umbral_door_bottom" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_door_top_right.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_door_top_right.json deleted file mode 100644 index 2285f6fc..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_door_top_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right", - "textures": { - "top": "cinderscapes:block/umbral_door_top", - "bottom": "cinderscapes:block/umbral_door_bottom" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_door_top_right_open.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_door_top_right_open.json deleted file mode 100644 index bd9855b2..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_door_top_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right_open", - "textures": { - "top": "cinderscapes:block/umbral_door_top", - "bottom": "cinderscapes:block/umbral_door_bottom" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_fence_gate.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_fence_gate.json deleted file mode 100644 index c1890fec..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate", - "textures": { - "texture": "cinderscapes:block/umbral_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_fence_gate_open.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_fence_gate_open.json deleted file mode 100644 index fdc06f4a..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_open", - "textures": { - "texture": "cinderscapes:block/umbral_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_fence_gate_wall.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_fence_gate_wall.json deleted file mode 100644 index 768da92e..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_wall", - "textures": { - "texture": "cinderscapes:block/umbral_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_fence_gate_wall_open.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_fence_gate_wall_open.json deleted file mode 100644 index e678cded..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_wall_open", - "textures": { - "texture": "cinderscapes:block/umbral_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_fence_inventory.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_fence_inventory.json deleted file mode 100644 index cb27a178..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_fence_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_inventory", - "textures": { - "texture": "cinderscapes:block/umbral_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_fence_post.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_fence_post.json deleted file mode 100644 index 5dfc3a80..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_fence_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_post", - "textures": { - "texture": "cinderscapes:block/umbral_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_fence_side.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_fence_side.json deleted file mode 100644 index 7997a0a5..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_fence_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_side", - "textures": { - "texture": "cinderscapes:block/umbral_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_flesh_block.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_flesh_block.json deleted file mode 100644 index c2fed1b4..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_flesh_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/umbral_flesh_block" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_fungus.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_fungus.json deleted file mode 100644 index b7cdc1ea..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_fungus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "cinderscapes:block/umbral_fungus" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_hanging_sign.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_hanging_sign.json deleted file mode 100644 index 4b4d1189..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_hanging_sign.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "cinderscapes:block/umbral_planks" - } -} diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_hyphae.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_hyphae.json deleted file mode 100644 index 781846ed..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_hyphae.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "cinderscapes:block/umbral_stem", - "side": "cinderscapes:block/umbral_stem" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_nylium.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_nylium.json deleted file mode 100644 index 0850db31..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_nylium.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "cinderscapes:block/umbral_nylium", - "bottom": "minecraft:block/netherrack", - "side": "cinderscapes:block/umbral_nylium_side" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_planks.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_planks.json deleted file mode 100644 index 6cb6e9e6..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/umbral_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_pressure_plate.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_pressure_plate.json deleted file mode 100644 index e6dba589..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/pressure_plate_up", - "textures": { - "texture": "cinderscapes:block/umbral_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_pressure_plate_down.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_pressure_plate_down.json deleted file mode 100644 index 0a035eb1..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/pressure_plate_down", - "textures": { - "texture": "cinderscapes:block/umbral_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_sign.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_sign.json deleted file mode 100644 index 09b8b466..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_sign.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "cinderscapes:block/umbral_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_slab.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_slab.json deleted file mode 100644 index 0bafa403..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "cinderscapes:block/umbral_planks", - "top": "cinderscapes:block/umbral_planks", - "side": "cinderscapes:block/umbral_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_slab_top.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_slab_top.json deleted file mode 100644 index 1d72f097..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "cinderscapes:block/umbral_planks", - "top": "cinderscapes:block/umbral_planks", - "side": "cinderscapes:block/umbral_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_stairs.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_stairs.json deleted file mode 100644 index 41a26e26..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "cinderscapes:block/umbral_planks", - "top": "cinderscapes:block/umbral_planks", - "side": "cinderscapes:block/umbral_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_stairs_inner.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_stairs_inner.json deleted file mode 100644 index d9ee16a8..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "cinderscapes:block/umbral_planks", - "top": "cinderscapes:block/umbral_planks", - "side": "cinderscapes:block/umbral_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_stairs_outer.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_stairs_outer.json deleted file mode 100644 index 8d5dc925..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "cinderscapes:block/umbral_planks", - "top": "cinderscapes:block/umbral_planks", - "side": "cinderscapes:block/umbral_planks" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_stem.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_stem.json deleted file mode 100644 index fa1ae807..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_stem.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "cinderscapes:block/umbral_stem_top", - "side": "cinderscapes:block/umbral_stem" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_trapdoor_bottom.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_trapdoor_bottom.json deleted file mode 100644 index d91e4de0..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "cinderscapes:block/umbral_trapdoor" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_trapdoor_open.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_trapdoor_open.json deleted file mode 100644 index c98b8777..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_open", - "textures": { - "texture": "cinderscapes:block/umbral_trapdoor" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_trapdoor_top.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_trapdoor_top.json deleted file mode 100644 index 526cd295..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_top", - "textures": { - "texture": "cinderscapes:block/umbral_trapdoor" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/umbral_wart_block.json b/client/src/main/resources/assets/cinderscapes/models/block/umbral_wart_block.json deleted file mode 100644 index 78638e12..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/umbral_wart_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/umbral_wart_block" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/ash.json b/client/src/main/resources/assets/cinderscapes/models/item/ash.json deleted file mode 100644 index ad59e242..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/ash.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/ash_height2" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/ash_block.json b/client/src/main/resources/assets/cinderscapes/models/item/ash_block.json deleted file mode 100644 index a9158d6c..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/ash_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/ash_block" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/ash_pile.json b/client/src/main/resources/assets/cinderscapes/models/item/ash_pile.json deleted file mode 100644 index 2ed39187..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/ash_pile.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:item/ash_pile" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/bramble_berries.json b/client/src/main/resources/assets/cinderscapes/models/item/bramble_berries.json deleted file mode 100644 index ab8b9bf7..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/bramble_berries.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:item/bramble_berries" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/chainmail_boots_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/chainmail_boots_rose_quartz_trim.json deleted file mode 100644 index 4f63b643..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/chainmail_boots_rose_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/chainmail_boots", - "layer1": "minecraft:trims/items/boots_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/chainmail_boots_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/chainmail_boots_smoky_quartz_trim.json deleted file mode 100644 index b5c16ee4..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/chainmail_boots_smoky_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/chainmail_boots", - "layer1": "minecraft:trims/items/boots_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/chainmail_boots_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/chainmail_boots_sulfur_quartz_trim.json deleted file mode 100644 index 8033c6ff..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/chainmail_boots_sulfur_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/chainmail_boots", - "layer1": "minecraft:trims/items/boots_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/chainmail_chestplate_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/chainmail_chestplate_rose_quartz_trim.json deleted file mode 100644 index ffa1c12a..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/chainmail_chestplate_rose_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/chainmail_chestplate", - "layer1": "minecraft:trims/items/chestplate_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/chainmail_chestplate_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/chainmail_chestplate_smoky_quartz_trim.json deleted file mode 100644 index 34db2095..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/chainmail_chestplate_smoky_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/chainmail_chestplate", - "layer1": "minecraft:trims/items/chestplate_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/chainmail_chestplate_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/chainmail_chestplate_sulfur_quartz_trim.json deleted file mode 100644 index e341b172..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/chainmail_chestplate_sulfur_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/chainmail_chestplate", - "layer1": "minecraft:trims/items/chestplate_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/chainmail_helmet_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/chainmail_helmet_rose_quartz_trim.json deleted file mode 100644 index c1c8d477..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/chainmail_helmet_rose_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/chainmail_helmet", - "layer1": "minecraft:trims/items/helmet_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/chainmail_helmet_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/chainmail_helmet_smoky_quartz_trim.json deleted file mode 100644 index 90beaaed..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/chainmail_helmet_smoky_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/chainmail_helmet", - "layer1": "minecraft:trims/items/helmet_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/chainmail_helmet_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/chainmail_helmet_sulfur_quartz_trim.json deleted file mode 100644 index e0dc6487..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/chainmail_helmet_sulfur_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/chainmail_helmet", - "layer1": "minecraft:trims/items/helmet_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/chainmail_leggings_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/chainmail_leggings_rose_quartz_trim.json deleted file mode 100644 index 083d5ea0..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/chainmail_leggings_rose_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/chainmail_leggings", - "layer1": "minecraft:trims/items/leggings_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/chainmail_leggings_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/chainmail_leggings_smoky_quartz_trim.json deleted file mode 100644 index 58674898..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/chainmail_leggings_smoky_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/chainmail_leggings", - "layer1": "minecraft:trims/items/leggings_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/chainmail_leggings_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/chainmail_leggings_sulfur_quartz_trim.json deleted file mode 100644 index 594d702f..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/chainmail_leggings_sulfur_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/chainmail_leggings", - "layer1": "minecraft:trims/items/leggings_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/chiseled_rose_quartz_block.json b/client/src/main/resources/assets/cinderscapes/models/item/chiseled_rose_quartz_block.json deleted file mode 100644 index 0ea43c00..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/chiseled_rose_quartz_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/chiseled_rose_quartz_block" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/chiseled_smoky_quartz_block.json b/client/src/main/resources/assets/cinderscapes/models/item/chiseled_smoky_quartz_block.json deleted file mode 100644 index 8931e01c..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/chiseled_smoky_quartz_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/chiseled_smoky_quartz_block" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/chiseled_sulfur_quartz_block.json b/client/src/main/resources/assets/cinderscapes/models/item/chiseled_sulfur_quartz_block.json deleted file mode 100644 index 9dd0f991..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/chiseled_sulfur_quartz_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/chiseled_sulfur_quartz_block" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/crystalline_quartz.json b/client/src/main/resources/assets/cinderscapes/models/item/crystalline_quartz.json deleted file mode 100644 index f8efc2bd..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/crystalline_quartz.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/crystalline_quartz" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/crystalline_rose_quartz.json b/client/src/main/resources/assets/cinderscapes/models/item/crystalline_rose_quartz.json deleted file mode 100644 index 4c560814..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/crystalline_rose_quartz.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/crystalline_rose_quartz" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/crystalline_smoky_quartz.json b/client/src/main/resources/assets/cinderscapes/models/item/crystalline_smoky_quartz.json deleted file mode 100644 index 442133fc..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/crystalline_smoky_quartz.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/crystalline_smoky_quartz" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/crystalline_sulfur_quartz.json b/client/src/main/resources/assets/cinderscapes/models/item/crystalline_sulfur_quartz.json deleted file mode 100644 index 18278ae3..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/crystalline_sulfur_quartz.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/crystalline_sulfur_quartz" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/crystinium.json b/client/src/main/resources/assets/cinderscapes/models/item/crystinium.json deleted file mode 100644 index 051fe452..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/crystinium.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:item/crystinium" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/diamond_boots_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/diamond_boots_rose_quartz_trim.json deleted file mode 100644 index 61f17b52..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/diamond_boots_rose_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/diamond_boots", - "layer1": "minecraft:trims/items/boots_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/diamond_boots_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/diamond_boots_smoky_quartz_trim.json deleted file mode 100644 index 3dfba54e..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/diamond_boots_smoky_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/diamond_boots", - "layer1": "minecraft:trims/items/boots_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/diamond_boots_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/diamond_boots_sulfur_quartz_trim.json deleted file mode 100644 index 5335e2b0..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/diamond_boots_sulfur_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/diamond_boots", - "layer1": "minecraft:trims/items/boots_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/diamond_chestplate_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/diamond_chestplate_rose_quartz_trim.json deleted file mode 100644 index 5781f9bd..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/diamond_chestplate_rose_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/diamond_chestplate", - "layer1": "minecraft:trims/items/chestplate_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/diamond_chestplate_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/diamond_chestplate_smoky_quartz_trim.json deleted file mode 100644 index f86a3b1a..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/diamond_chestplate_smoky_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/diamond_chestplate", - "layer1": "minecraft:trims/items/chestplate_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/diamond_chestplate_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/diamond_chestplate_sulfur_quartz_trim.json deleted file mode 100644 index f21c107d..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/diamond_chestplate_sulfur_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/diamond_chestplate", - "layer1": "minecraft:trims/items/chestplate_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/diamond_helmet_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/diamond_helmet_rose_quartz_trim.json deleted file mode 100644 index 4b127fdf..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/diamond_helmet_rose_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/diamond_helmet", - "layer1": "minecraft:trims/items/helmet_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/diamond_helmet_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/diamond_helmet_smoky_quartz_trim.json deleted file mode 100644 index a574be9a..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/diamond_helmet_smoky_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/diamond_helmet", - "layer1": "minecraft:trims/items/helmet_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/diamond_helmet_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/diamond_helmet_sulfur_quartz_trim.json deleted file mode 100644 index e6149232..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/diamond_helmet_sulfur_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/diamond_helmet", - "layer1": "minecraft:trims/items/helmet_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/diamond_leggings_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/diamond_leggings_rose_quartz_trim.json deleted file mode 100644 index b28b4893..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/diamond_leggings_rose_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/diamond_leggings", - "layer1": "minecraft:trims/items/leggings_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/diamond_leggings_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/diamond_leggings_smoky_quartz_trim.json deleted file mode 100644 index c1cf948a..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/diamond_leggings_smoky_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/diamond_leggings", - "layer1": "minecraft:trims/items/leggings_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/diamond_leggings_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/diamond_leggings_sulfur_quartz_trim.json deleted file mode 100644 index c88df485..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/diamond_leggings_sulfur_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/diamond_leggings", - "layer1": "minecraft:trims/items/leggings_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/ghastly_ectoplasm.json b/client/src/main/resources/assets/cinderscapes/models/item/ghastly_ectoplasm.json deleted file mode 100644 index 5759ea91..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/ghastly_ectoplasm.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:item/ghastly_ectoplasm" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/golden_boots_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/golden_boots_rose_quartz_trim.json deleted file mode 100644 index 4803c711..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/golden_boots_rose_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/golden_boots", - "layer1": "minecraft:trims/items/boots_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/golden_boots_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/golden_boots_smoky_quartz_trim.json deleted file mode 100644 index 682ef135..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/golden_boots_smoky_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/golden_boots", - "layer1": "minecraft:trims/items/boots_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/golden_boots_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/golden_boots_sulfur_quartz_trim.json deleted file mode 100644 index a6e1bb9b..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/golden_boots_sulfur_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/golden_boots", - "layer1": "minecraft:trims/items/boots_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/golden_chestplate_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/golden_chestplate_rose_quartz_trim.json deleted file mode 100644 index 60f12c29..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/golden_chestplate_rose_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/golden_chestplate", - "layer1": "minecraft:trims/items/chestplate_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/golden_chestplate_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/golden_chestplate_smoky_quartz_trim.json deleted file mode 100644 index 8e201011..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/golden_chestplate_smoky_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/golden_chestplate", - "layer1": "minecraft:trims/items/chestplate_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/golden_chestplate_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/golden_chestplate_sulfur_quartz_trim.json deleted file mode 100644 index 004085ff..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/golden_chestplate_sulfur_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/golden_chestplate", - "layer1": "minecraft:trims/items/chestplate_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/golden_helmet_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/golden_helmet_rose_quartz_trim.json deleted file mode 100644 index 7e80bf88..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/golden_helmet_rose_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/golden_helmet", - "layer1": "minecraft:trims/items/helmet_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/golden_helmet_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/golden_helmet_smoky_quartz_trim.json deleted file mode 100644 index 20f6b30a..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/golden_helmet_smoky_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/golden_helmet", - "layer1": "minecraft:trims/items/helmet_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/golden_helmet_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/golden_helmet_sulfur_quartz_trim.json deleted file mode 100644 index b90111eb..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/golden_helmet_sulfur_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/golden_helmet", - "layer1": "minecraft:trims/items/helmet_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/golden_leggings_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/golden_leggings_rose_quartz_trim.json deleted file mode 100644 index aae814b3..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/golden_leggings_rose_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/golden_leggings", - "layer1": "minecraft:trims/items/leggings_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/golden_leggings_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/golden_leggings_smoky_quartz_trim.json deleted file mode 100644 index 6b485bc4..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/golden_leggings_smoky_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/golden_leggings", - "layer1": "minecraft:trims/items/leggings_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/golden_leggings_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/golden_leggings_sulfur_quartz_trim.json deleted file mode 100644 index 99c23753..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/golden_leggings_sulfur_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/golden_leggings", - "layer1": "minecraft:trims/items/leggings_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/iron_boots_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/iron_boots_rose_quartz_trim.json deleted file mode 100644 index 7508e342..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/iron_boots_rose_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/iron_boots", - "layer1": "minecraft:trims/items/boots_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/iron_boots_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/iron_boots_smoky_quartz_trim.json deleted file mode 100644 index 3614a1f6..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/iron_boots_smoky_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/iron_boots", - "layer1": "minecraft:trims/items/boots_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/iron_boots_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/iron_boots_sulfur_quartz_trim.json deleted file mode 100644 index 2c1918fa..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/iron_boots_sulfur_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/iron_boots", - "layer1": "minecraft:trims/items/boots_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/iron_chestplate_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/iron_chestplate_rose_quartz_trim.json deleted file mode 100644 index cd3d640e..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/iron_chestplate_rose_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/iron_chestplate", - "layer1": "minecraft:trims/items/chestplate_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/iron_chestplate_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/iron_chestplate_smoky_quartz_trim.json deleted file mode 100644 index 58120705..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/iron_chestplate_smoky_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/iron_chestplate", - "layer1": "minecraft:trims/items/chestplate_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/iron_chestplate_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/iron_chestplate_sulfur_quartz_trim.json deleted file mode 100644 index 85696a51..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/iron_chestplate_sulfur_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/iron_chestplate", - "layer1": "minecraft:trims/items/chestplate_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/iron_helmet_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/iron_helmet_rose_quartz_trim.json deleted file mode 100644 index 0fbc88c0..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/iron_helmet_rose_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/iron_helmet", - "layer1": "minecraft:trims/items/helmet_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/iron_helmet_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/iron_helmet_smoky_quartz_trim.json deleted file mode 100644 index 56e3ff05..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/iron_helmet_smoky_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/iron_helmet", - "layer1": "minecraft:trims/items/helmet_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/iron_helmet_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/iron_helmet_sulfur_quartz_trim.json deleted file mode 100644 index fe2ecf2f..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/iron_helmet_sulfur_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/iron_helmet", - "layer1": "minecraft:trims/items/helmet_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/iron_leggings_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/iron_leggings_rose_quartz_trim.json deleted file mode 100644 index 4ce5e0bc..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/iron_leggings_rose_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/iron_leggings", - "layer1": "minecraft:trims/items/leggings_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/iron_leggings_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/iron_leggings_smoky_quartz_trim.json deleted file mode 100644 index 700dfc81..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/iron_leggings_smoky_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/iron_leggings", - "layer1": "minecraft:trims/items/leggings_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/iron_leggings_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/iron_leggings_sulfur_quartz_trim.json deleted file mode 100644 index 68efd702..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/iron_leggings_sulfur_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/iron_leggings", - "layer1": "minecraft:trims/items/leggings_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/leather_boots_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/leather_boots_rose_quartz_trim.json deleted file mode 100644 index 3ab0e466..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/leather_boots_rose_quartz_trim.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/leather_boots", - "layer1": "minecraft:item/leather_boots_overlay", - "layer2": "minecraft:trims/items/boots_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/leather_boots_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/leather_boots_smoky_quartz_trim.json deleted file mode 100644 index a72b2339..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/leather_boots_smoky_quartz_trim.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/leather_boots", - "layer1": "minecraft:item/leather_boots_overlay", - "layer2": "minecraft:trims/items/boots_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/leather_boots_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/leather_boots_sulfur_quartz_trim.json deleted file mode 100644 index 090f9f88..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/leather_boots_sulfur_quartz_trim.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/leather_boots", - "layer1": "minecraft:item/leather_boots_overlay", - "layer2": "minecraft:trims/items/boots_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/leather_chestplate_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/leather_chestplate_rose_quartz_trim.json deleted file mode 100644 index 08b1c350..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/leather_chestplate_rose_quartz_trim.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/leather_chestplate", - "layer1": "minecraft:item/leather_chestplate_overlay", - "layer2": "minecraft:trims/items/chestplate_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/leather_chestplate_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/leather_chestplate_smoky_quartz_trim.json deleted file mode 100644 index 3c15f4b2..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/leather_chestplate_smoky_quartz_trim.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/leather_chestplate", - "layer1": "minecraft:item/leather_chestplate_overlay", - "layer2": "minecraft:trims/items/chestplate_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/leather_chestplate_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/leather_chestplate_sulfur_quartz_trim.json deleted file mode 100644 index 4d6ea2c7..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/leather_chestplate_sulfur_quartz_trim.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/leather_chestplate", - "layer1": "minecraft:item/leather_chestplate_overlay", - "layer2": "minecraft:trims/items/chestplate_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/leather_helmet_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/leather_helmet_rose_quartz_trim.json deleted file mode 100644 index 7e258ddd..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/leather_helmet_rose_quartz_trim.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/leather_helmet", - "layer1": "minecraft:item/leather_helmet_overlay", - "layer2": "minecraft:trims/items/helmet_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/leather_helmet_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/leather_helmet_smoky_quartz_trim.json deleted file mode 100644 index 00dfb6bb..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/leather_helmet_smoky_quartz_trim.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/leather_helmet", - "layer1": "minecraft:item/leather_helmet_overlay", - "layer2": "minecraft:trims/items/helmet_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/leather_helmet_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/leather_helmet_sulfur_quartz_trim.json deleted file mode 100644 index 80c18ca3..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/leather_helmet_sulfur_quartz_trim.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/leather_helmet", - "layer1": "minecraft:item/leather_helmet_overlay", - "layer2": "minecraft:trims/items/helmet_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/leather_leggings_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/leather_leggings_rose_quartz_trim.json deleted file mode 100644 index 74d40816..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/leather_leggings_rose_quartz_trim.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/leather_leggings", - "layer1": "minecraft:item/leather_leggings_overlay", - "layer2": "minecraft:trims/items/leggings_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/leather_leggings_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/leather_leggings_smoky_quartz_trim.json deleted file mode 100644 index 0a4deaa4..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/leather_leggings_smoky_quartz_trim.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/leather_leggings", - "layer1": "minecraft:item/leather_leggings_overlay", - "layer2": "minecraft:trims/items/leggings_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/leather_leggings_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/leather_leggings_sulfur_quartz_trim.json deleted file mode 100644 index 25357d1f..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/leather_leggings_sulfur_quartz_trim.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/leather_leggings", - "layer1": "minecraft:item/leather_leggings_overlay", - "layer2": "minecraft:trims/items/leggings_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/luminous_pod.json b/client/src/main/resources/assets/cinderscapes/models/item/luminous_pod.json deleted file mode 100644 index 2d1639c4..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/luminous_pod.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:item/luminous_pod" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/music_disc_chilling_in_hell.json b/client/src/main/resources/assets/cinderscapes/models/item/music_disc_chilling_in_hell.json deleted file mode 100644 index f31bca95..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/music_disc_chilling_in_hell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:item/music_disc_chilling_in_hell" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/music_disc_luminous_plantation.json b/client/src/main/resources/assets/cinderscapes/models/item/music_disc_luminous_plantation.json deleted file mode 100644 index ccc4f1b3..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/music_disc_luminous_plantation.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:item/music_disc_luminous_plantation" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/netherite_boots_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/netherite_boots_rose_quartz_trim.json deleted file mode 100644 index 5e736108..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/netherite_boots_rose_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/netherite_boots", - "layer1": "minecraft:trims/items/boots_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/netherite_boots_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/netherite_boots_smoky_quartz_trim.json deleted file mode 100644 index e2e4e41d..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/netherite_boots_smoky_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/netherite_boots", - "layer1": "minecraft:trims/items/boots_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/netherite_boots_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/netherite_boots_sulfur_quartz_trim.json deleted file mode 100644 index a2e1f8e7..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/netherite_boots_sulfur_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/netherite_boots", - "layer1": "minecraft:trims/items/boots_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/netherite_chestplate_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/netherite_chestplate_rose_quartz_trim.json deleted file mode 100644 index 33d59a48..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/netherite_chestplate_rose_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/netherite_chestplate", - "layer1": "minecraft:trims/items/chestplate_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/netherite_chestplate_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/netherite_chestplate_smoky_quartz_trim.json deleted file mode 100644 index de2949a6..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/netherite_chestplate_smoky_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/netherite_chestplate", - "layer1": "minecraft:trims/items/chestplate_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/netherite_chestplate_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/netherite_chestplate_sulfur_quartz_trim.json deleted file mode 100644 index 3de6622b..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/netherite_chestplate_sulfur_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/netherite_chestplate", - "layer1": "minecraft:trims/items/chestplate_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/netherite_helmet_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/netherite_helmet_rose_quartz_trim.json deleted file mode 100644 index 7a48c609..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/netherite_helmet_rose_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/netherite_helmet", - "layer1": "minecraft:trims/items/helmet_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/netherite_helmet_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/netherite_helmet_smoky_quartz_trim.json deleted file mode 100644 index f634e1e6..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/netherite_helmet_smoky_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/netherite_helmet", - "layer1": "minecraft:trims/items/helmet_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/netherite_helmet_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/netherite_helmet_sulfur_quartz_trim.json deleted file mode 100644 index 37c21253..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/netherite_helmet_sulfur_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/netherite_helmet", - "layer1": "minecraft:trims/items/helmet_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/netherite_leggings_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/netherite_leggings_rose_quartz_trim.json deleted file mode 100644 index d15adc8d..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/netherite_leggings_rose_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/netherite_leggings", - "layer1": "minecraft:trims/items/leggings_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/netherite_leggings_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/netherite_leggings_smoky_quartz_trim.json deleted file mode 100644 index 549dcfff..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/netherite_leggings_smoky_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/netherite_leggings", - "layer1": "minecraft:trims/items/leggings_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/netherite_leggings_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/netherite_leggings_sulfur_quartz_trim.json deleted file mode 100644 index d8766cff..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/netherite_leggings_sulfur_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/netherite_leggings", - "layer1": "minecraft:trims/items/leggings_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/nodzol.json b/client/src/main/resources/assets/cinderscapes/models/item/nodzol.json deleted file mode 100644 index 733827c5..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/nodzol.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/nodzol" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/photofern.json b/client/src/main/resources/assets/cinderscapes/models/item/photofern.json deleted file mode 100644 index 6ba235b6..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/photofern.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:item/photofern" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/polypite_quartz.json b/client/src/main/resources/assets/cinderscapes/models/item/polypite_quartz.json deleted file mode 100644 index 72ad93d4..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/polypite_quartz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:block/polypite_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/polypite_rose_quartz.json b/client/src/main/resources/assets/cinderscapes/models/item/polypite_rose_quartz.json deleted file mode 100644 index ec67305d..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/polypite_rose_quartz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:block/polypite_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/polypite_smoky_quartz.json b/client/src/main/resources/assets/cinderscapes/models/item/polypite_smoky_quartz.json deleted file mode 100644 index a96b3b98..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/polypite_smoky_quartz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:block/polypite_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/polypite_sulfur_quartz.json b/client/src/main/resources/assets/cinderscapes/models/item/polypite_sulfur_quartz.json deleted file mode 100644 index 57a11830..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/polypite_sulfur_quartz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:block/polypite_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/pyracinth.json b/client/src/main/resources/assets/cinderscapes/models/item/pyracinth.json deleted file mode 100644 index cb03a523..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/pyracinth.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:item/pyracinth" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/quartz_sand.json b/client/src/main/resources/assets/cinderscapes/models/item/quartz_sand.json deleted file mode 100644 index 594a034d..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/quartz_sand.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/quartz_sand" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/rose_quartz.json b/client/src/main/resources/assets/cinderscapes/models/item/rose_quartz.json deleted file mode 100644 index 7cb2262a..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/rose_quartz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:item/rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/rose_quartz_block.json b/client/src/main/resources/assets/cinderscapes/models/item/rose_quartz_block.json deleted file mode 100644 index ac41f34a..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/rose_quartz_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/rose_quartz_block" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/rose_quartz_bricks.json b/client/src/main/resources/assets/cinderscapes/models/item/rose_quartz_bricks.json deleted file mode 100644 index b38d55cf..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/rose_quartz_bricks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/rose_quartz_bricks" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/rose_quartz_ore.json b/client/src/main/resources/assets/cinderscapes/models/item/rose_quartz_ore.json deleted file mode 100644 index 6faf0e89..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/rose_quartz_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/rose_quartz_ore" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/rose_quartz_pillar.json b/client/src/main/resources/assets/cinderscapes/models/item/rose_quartz_pillar.json deleted file mode 100644 index 01824182..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/rose_quartz_pillar.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/rose_quartz_pillar" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/rose_quartz_slab.json b/client/src/main/resources/assets/cinderscapes/models/item/rose_quartz_slab.json deleted file mode 100644 index 3ad8902e..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/rose_quartz_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/rose_quartz_slab" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/rose_quartz_stairs.json b/client/src/main/resources/assets/cinderscapes/models/item/rose_quartz_stairs.json deleted file mode 100644 index 130acdf5..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/rose_quartz_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/rose_quartz_stairs" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/scorched_button.json b/client/src/main/resources/assets/cinderscapes/models/item/scorched_button.json deleted file mode 100644 index 3695d18b..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/scorched_button.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/scorched_button_inventory" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/scorched_door.json b/client/src/main/resources/assets/cinderscapes/models/item/scorched_door.json deleted file mode 100644 index 8d417e61..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/scorched_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:item/scorched_door" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/scorched_fence.json b/client/src/main/resources/assets/cinderscapes/models/item/scorched_fence.json deleted file mode 100644 index 3079b9fc..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/scorched_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/scorched_fence_inventory" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/scorched_fence_gate.json b/client/src/main/resources/assets/cinderscapes/models/item/scorched_fence_gate.json deleted file mode 100644 index 558fce5e..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/scorched_fence_gate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/scorched_fence_gate" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/scorched_hanging_sign.json b/client/src/main/resources/assets/cinderscapes/models/item/scorched_hanging_sign.json deleted file mode 100644 index 6f405568..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/scorched_hanging_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "cinderscapes:item/scorched_hanging_sign" - } -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/scorched_hyphae.json b/client/src/main/resources/assets/cinderscapes/models/item/scorched_hyphae.json deleted file mode 100644 index 50b2c4b6..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/scorched_hyphae.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/scorched_hyphae" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/scorched_planks.json b/client/src/main/resources/assets/cinderscapes/models/item/scorched_planks.json deleted file mode 100644 index bc415730..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/scorched_planks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/scorched_planks" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/scorched_pressure_plate.json b/client/src/main/resources/assets/cinderscapes/models/item/scorched_pressure_plate.json deleted file mode 100644 index 6bb9448d..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/scorched_pressure_plate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/scorched_pressure_plate" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/scorched_shrub.json b/client/src/main/resources/assets/cinderscapes/models/item/scorched_shrub.json deleted file mode 100644 index af985605..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/scorched_shrub.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:block/scorched_shrub" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/scorched_sign.json b/client/src/main/resources/assets/cinderscapes/models/item/scorched_sign.json deleted file mode 100644 index 37a18a70..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/scorched_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:item/scorched_sign" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/scorched_slab.json b/client/src/main/resources/assets/cinderscapes/models/item/scorched_slab.json deleted file mode 100644 index 9ae779b1..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/scorched_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/scorched_slab" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/scorched_sprouts.json b/client/src/main/resources/assets/cinderscapes/models/item/scorched_sprouts.json deleted file mode 100644 index d90b682d..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/scorched_sprouts.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:item/scorched_sprouts" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/scorched_stairs.json b/client/src/main/resources/assets/cinderscapes/models/item/scorched_stairs.json deleted file mode 100644 index df5200c7..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/scorched_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/scorched_stairs" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/scorched_stem.json b/client/src/main/resources/assets/cinderscapes/models/item/scorched_stem.json deleted file mode 100644 index 4f4706f9..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/scorched_stem.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/scorched_stem" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/scorched_tendrils.json b/client/src/main/resources/assets/cinderscapes/models/item/scorched_tendrils.json deleted file mode 100644 index 99768901..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/scorched_tendrils.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:block/scorched_tendrils" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/scorched_trapdoor.json b/client/src/main/resources/assets/cinderscapes/models/item/scorched_trapdoor.json deleted file mode 100644 index 95bd2b6c..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/scorched_trapdoor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/scorched_trapdoor_bottom" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/smoky_quartz.json b/client/src/main/resources/assets/cinderscapes/models/item/smoky_quartz.json deleted file mode 100644 index 0b638068..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/smoky_quartz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:item/smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/smoky_quartz_block.json b/client/src/main/resources/assets/cinderscapes/models/item/smoky_quartz_block.json deleted file mode 100644 index 7cb52b09..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/smoky_quartz_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/smoky_quartz_block" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/smoky_quartz_bricks.json b/client/src/main/resources/assets/cinderscapes/models/item/smoky_quartz_bricks.json deleted file mode 100644 index a8049795..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/smoky_quartz_bricks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/smoky_quartz_bricks" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/smoky_quartz_ore.json b/client/src/main/resources/assets/cinderscapes/models/item/smoky_quartz_ore.json deleted file mode 100644 index 3b910ef9..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/smoky_quartz_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/smoky_quartz_ore" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/smoky_quartz_pillar.json b/client/src/main/resources/assets/cinderscapes/models/item/smoky_quartz_pillar.json deleted file mode 100644 index 70edf15e..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/smoky_quartz_pillar.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/smoky_quartz_pillar" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/smoky_quartz_slab.json b/client/src/main/resources/assets/cinderscapes/models/item/smoky_quartz_slab.json deleted file mode 100644 index ee316fe7..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/smoky_quartz_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/smoky_quartz_slab" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/smoky_quartz_stairs.json b/client/src/main/resources/assets/cinderscapes/models/item/smoky_quartz_stairs.json deleted file mode 100644 index 18ee75be..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/smoky_quartz_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/smoky_quartz_stairs" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/smooth_rose_quartz.json b/client/src/main/resources/assets/cinderscapes/models/item/smooth_rose_quartz.json deleted file mode 100644 index 59ce966b..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/smooth_rose_quartz.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/smooth_rose_quartz" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/smooth_rose_quartz_slab.json b/client/src/main/resources/assets/cinderscapes/models/item/smooth_rose_quartz_slab.json deleted file mode 100644 index 0ed23d61..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/smooth_rose_quartz_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/smooth_rose_quartz_slab" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/smooth_rose_quartz_stairs.json b/client/src/main/resources/assets/cinderscapes/models/item/smooth_rose_quartz_stairs.json deleted file mode 100644 index dad354a6..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/smooth_rose_quartz_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/smooth_rose_quartz_stairs" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/smooth_smoky_quartz.json b/client/src/main/resources/assets/cinderscapes/models/item/smooth_smoky_quartz.json deleted file mode 100644 index b20b0576..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/smooth_smoky_quartz.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/smooth_smoky_quartz" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/smooth_smoky_quartz_slab.json b/client/src/main/resources/assets/cinderscapes/models/item/smooth_smoky_quartz_slab.json deleted file mode 100644 index 00fbaadd..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/smooth_smoky_quartz_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/smooth_smoky_quartz_slab" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/smooth_smoky_quartz_stairs.json b/client/src/main/resources/assets/cinderscapes/models/item/smooth_smoky_quartz_stairs.json deleted file mode 100644 index bd03839f..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/smooth_smoky_quartz_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/smooth_smoky_quartz_stairs" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/smooth_sulfur_quartz.json b/client/src/main/resources/assets/cinderscapes/models/item/smooth_sulfur_quartz.json deleted file mode 100644 index 02ac58c4..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/smooth_sulfur_quartz.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/smooth_sulfur_quartz" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/smooth_sulfur_quartz_slab.json b/client/src/main/resources/assets/cinderscapes/models/item/smooth_sulfur_quartz_slab.json deleted file mode 100644 index 6fd107ef..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/smooth_sulfur_quartz_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/smooth_sulfur_quartz_slab" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/smooth_sulfur_quartz_stairs.json b/client/src/main/resources/assets/cinderscapes/models/item/smooth_sulfur_quartz_stairs.json deleted file mode 100644 index e82f1b14..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/smooth_sulfur_quartz_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/smooth_sulfur_quartz_stairs" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/stripped_scorched_hyphae.json b/client/src/main/resources/assets/cinderscapes/models/item/stripped_scorched_hyphae.json deleted file mode 100644 index 3123b539..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/stripped_scorched_hyphae.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/stripped_scorched_hyphae" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/stripped_scorched_stem.json b/client/src/main/resources/assets/cinderscapes/models/item/stripped_scorched_stem.json deleted file mode 100644 index ba182232..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/stripped_scorched_stem.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/stripped_scorched_stem" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/stripped_umbral_hyphae.json b/client/src/main/resources/assets/cinderscapes/models/item/stripped_umbral_hyphae.json deleted file mode 100644 index 25947226..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/stripped_umbral_hyphae.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/stripped_umbral_hyphae" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/stripped_umbral_stem.json b/client/src/main/resources/assets/cinderscapes/models/item/stripped_umbral_stem.json deleted file mode 100644 index 10d2191c..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/stripped_umbral_stem.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/stripped_umbral_stem" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/sulfur.json b/client/src/main/resources/assets/cinderscapes/models/item/sulfur.json deleted file mode 100644 index 852751fd..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/sulfur.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:item/sulfur" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/sulfur_block.json b/client/src/main/resources/assets/cinderscapes/models/item/sulfur_block.json deleted file mode 100644 index c399838a..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/sulfur_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/sulfur_block" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/sulfur_ore.json b/client/src/main/resources/assets/cinderscapes/models/item/sulfur_ore.json deleted file mode 100644 index c9173c20..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/sulfur_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/sulfur_ore" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/sulfur_quartz.json b/client/src/main/resources/assets/cinderscapes/models/item/sulfur_quartz.json deleted file mode 100644 index 7fcf9fa3..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/sulfur_quartz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:item/sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/sulfur_quartz_block.json b/client/src/main/resources/assets/cinderscapes/models/item/sulfur_quartz_block.json deleted file mode 100644 index 37c2bc49..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/sulfur_quartz_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/sulfur_quartz_block" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/sulfur_quartz_bricks.json b/client/src/main/resources/assets/cinderscapes/models/item/sulfur_quartz_bricks.json deleted file mode 100644 index f4229548..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/sulfur_quartz_bricks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/sulfur_quartz_bricks" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/sulfur_quartz_ore.json b/client/src/main/resources/assets/cinderscapes/models/item/sulfur_quartz_ore.json deleted file mode 100644 index 921c13aa..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/sulfur_quartz_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/sulfur_quartz_ore" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/sulfur_quartz_pillar.json b/client/src/main/resources/assets/cinderscapes/models/item/sulfur_quartz_pillar.json deleted file mode 100644 index b4a86f86..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/sulfur_quartz_pillar.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/sulfur_quartz_pillar" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/sulfur_quartz_slab.json b/client/src/main/resources/assets/cinderscapes/models/item/sulfur_quartz_slab.json deleted file mode 100644 index a6eaee07..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/sulfur_quartz_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/sulfur_quartz_slab" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/sulfur_quartz_stairs.json b/client/src/main/resources/assets/cinderscapes/models/item/sulfur_quartz_stairs.json deleted file mode 100644 index 3560d4ae..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/sulfur_quartz_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/sulfur_quartz_stairs" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/tall_photofern.json b/client/src/main/resources/assets/cinderscapes/models/item/tall_photofern.json deleted file mode 100644 index 850966e1..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/tall_photofern.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:item/tall_photofern" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/turtle_helmet_rose_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/turtle_helmet_rose_quartz_trim.json deleted file mode 100644 index 3967e200..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/turtle_helmet_rose_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/turtle_helmet", - "layer1": "minecraft:trims/items/helmet_trim_rose_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/turtle_helmet_smoky_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/turtle_helmet_smoky_quartz_trim.json deleted file mode 100644 index 5dd0d252..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/turtle_helmet_smoky_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/turtle_helmet", - "layer1": "minecraft:trims/items/helmet_trim_smoky_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/turtle_helmet_sulfur_quartz_trim.json b/client/src/main/resources/assets/cinderscapes/models/item/turtle_helmet_sulfur_quartz_trim.json deleted file mode 100644 index bfd491e6..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/turtle_helmet_sulfur_quartz_trim.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/turtle_helmet", - "layer1": "minecraft:trims/items/helmet_trim_sulfur_quartz" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/twilight_fescues.json b/client/src/main/resources/assets/cinderscapes/models/item/twilight_fescues.json deleted file mode 100644 index 289c39f7..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/twilight_fescues.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:block/twilight_fescues" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/twilight_tendrils.json b/client/src/main/resources/assets/cinderscapes/models/item/twilight_tendrils.json deleted file mode 100644 index ff49b4df..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/twilight_tendrils.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:block/twilight_tendrils" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/twilight_vine_block.json b/client/src/main/resources/assets/cinderscapes/models/item/twilight_vine_block.json deleted file mode 100644 index 96ab81f7..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/twilight_vine_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/twilight_vine_block" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/umbral_button.json b/client/src/main/resources/assets/cinderscapes/models/item/umbral_button.json deleted file mode 100644 index 22d4fcb9..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/umbral_button.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/umbral_button_inventory" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/umbral_door.json b/client/src/main/resources/assets/cinderscapes/models/item/umbral_door.json deleted file mode 100644 index 78cb5ae0..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/umbral_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:item/umbral_door" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/umbral_fence.json b/client/src/main/resources/assets/cinderscapes/models/item/umbral_fence.json deleted file mode 100644 index 809d7c2f..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/umbral_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/umbral_fence_inventory" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/umbral_fence_gate.json b/client/src/main/resources/assets/cinderscapes/models/item/umbral_fence_gate.json deleted file mode 100644 index 6bf8ac37..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/umbral_fence_gate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/umbral_fence_gate" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/umbral_flesh_block.json b/client/src/main/resources/assets/cinderscapes/models/item/umbral_flesh_block.json deleted file mode 100644 index 26f7d5ba..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/umbral_flesh_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/umbral_flesh_block" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/umbral_fungus.json b/client/src/main/resources/assets/cinderscapes/models/item/umbral_fungus.json deleted file mode 100644 index 0fb13d80..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/umbral_fungus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:block/umbral_fungus" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/umbral_hanging_sign.json b/client/src/main/resources/assets/cinderscapes/models/item/umbral_hanging_sign.json deleted file mode 100644 index e00feed2..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/umbral_hanging_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "cinderscapes:item/umbral_hanging_sign" - } -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/umbral_hyphae.json b/client/src/main/resources/assets/cinderscapes/models/item/umbral_hyphae.json deleted file mode 100644 index 11eb776b..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/umbral_hyphae.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/umbral_hyphae" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/umbral_nylium.json b/client/src/main/resources/assets/cinderscapes/models/item/umbral_nylium.json deleted file mode 100644 index 9c80e841..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/umbral_nylium.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/umbral_nylium" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/umbral_planks.json b/client/src/main/resources/assets/cinderscapes/models/item/umbral_planks.json deleted file mode 100644 index 2a3b66d6..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/umbral_planks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/umbral_planks" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/umbral_pressure_plate.json b/client/src/main/resources/assets/cinderscapes/models/item/umbral_pressure_plate.json deleted file mode 100644 index 30db1ba6..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/umbral_pressure_plate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/umbral_pressure_plate" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/umbral_sign.json b/client/src/main/resources/assets/cinderscapes/models/item/umbral_sign.json deleted file mode 100644 index 942c7093..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/umbral_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:item/umbral_sign" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/umbral_slab.json b/client/src/main/resources/assets/cinderscapes/models/item/umbral_slab.json deleted file mode 100644 index 5a13e4a6..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/umbral_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/umbral_slab" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/umbral_stairs.json b/client/src/main/resources/assets/cinderscapes/models/item/umbral_stairs.json deleted file mode 100644 index b0892198..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/umbral_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/umbral_stairs" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/umbral_stem.json b/client/src/main/resources/assets/cinderscapes/models/item/umbral_stem.json deleted file mode 100644 index 34f44813..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/umbral_stem.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/umbral_stem" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/umbral_trapdoor.json b/client/src/main/resources/assets/cinderscapes/models/item/umbral_trapdoor.json deleted file mode 100644 index 07d57976..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/umbral_trapdoor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/umbral_trapdoor_bottom" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/umbral_wart_block.json b/client/src/main/resources/assets/cinderscapes/models/item/umbral_wart_block.json deleted file mode 100644 index 9c9e64ed..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/umbral_wart_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/umbral_wart_block" -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/textures/block/chiseled_rose_quartz.png b/client/src/main/resources/assets/cinderscapes/textures/block/chiseled_rose_quartz_block.png similarity index 100% rename from client/src/main/resources/assets/cinderscapes/textures/block/chiseled_rose_quartz.png rename to client/src/main/resources/assets/cinderscapes/textures/block/chiseled_rose_quartz_block.png diff --git a/client/src/main/resources/assets/cinderscapes/textures/block/chiseled_rose_quartz_top.png b/client/src/main/resources/assets/cinderscapes/textures/block/chiseled_rose_quartz_block_top.png similarity index 100% rename from client/src/main/resources/assets/cinderscapes/textures/block/chiseled_rose_quartz_top.png rename to client/src/main/resources/assets/cinderscapes/textures/block/chiseled_rose_quartz_block_top.png diff --git a/client/src/main/resources/assets/cinderscapes/textures/block/chiseled_smoky_quartz.png b/client/src/main/resources/assets/cinderscapes/textures/block/chiseled_smoky_quartz_block.png similarity index 100% rename from client/src/main/resources/assets/cinderscapes/textures/block/chiseled_smoky_quartz.png rename to client/src/main/resources/assets/cinderscapes/textures/block/chiseled_smoky_quartz_block.png diff --git a/client/src/main/resources/assets/cinderscapes/textures/block/chiseled_smoky_quartz_top.png b/client/src/main/resources/assets/cinderscapes/textures/block/chiseled_smoky_quartz_block_top.png similarity index 100% rename from client/src/main/resources/assets/cinderscapes/textures/block/chiseled_smoky_quartz_top.png rename to client/src/main/resources/assets/cinderscapes/textures/block/chiseled_smoky_quartz_block_top.png diff --git a/client/src/main/resources/assets/cinderscapes/textures/block/chiseled_sulfur_quartz.png b/client/src/main/resources/assets/cinderscapes/textures/block/chiseled_sulfur_quartz_block.png similarity index 100% rename from client/src/main/resources/assets/cinderscapes/textures/block/chiseled_sulfur_quartz.png rename to client/src/main/resources/assets/cinderscapes/textures/block/chiseled_sulfur_quartz_block.png diff --git a/client/src/main/resources/assets/cinderscapes/textures/block/chiseled_sulfur_quartz_top.png b/client/src/main/resources/assets/cinderscapes/textures/block/chiseled_sulfur_quartz_block_top.png similarity index 100% rename from client/src/main/resources/assets/cinderscapes/textures/block/chiseled_sulfur_quartz_top.png rename to client/src/main/resources/assets/cinderscapes/textures/block/chiseled_sulfur_quartz_block_top.png diff --git a/client/src/main/resources/assets/cinderscapes/textures/block/nodzol.png b/client/src/main/resources/assets/cinderscapes/textures/block/nodzol.png index 21a76415..a3b78405 100644 Binary files a/client/src/main/resources/assets/cinderscapes/textures/block/nodzol.png and b/client/src/main/resources/assets/cinderscapes/textures/block/nodzol.png differ diff --git a/client/src/main/resources/assets/cinderscapes/textures/block/nodzol_side.png b/client/src/main/resources/assets/cinderscapes/textures/block/nodzol_side.png new file mode 100644 index 00000000..21a76415 Binary files /dev/null and b/client/src/main/resources/assets/cinderscapes/textures/block/nodzol_side.png differ diff --git a/client/src/main/resources/assets/cinderscapes/textures/block/nodzol_top.png b/client/src/main/resources/assets/cinderscapes/textures/block/nodzol_top.png deleted file mode 100644 index a3b78405..00000000 Binary files a/client/src/main/resources/assets/cinderscapes/textures/block/nodzol_top.png and /dev/null differ diff --git a/client/src/main/resources/assets/cinderscapes/textures/trims/color_palettes/rose_quartz.png b/client/src/main/resources/assets/cinderscapes/textures/trims/color_palettes/cinderscapes_rose_quartz.png similarity index 100% rename from client/src/main/resources/assets/cinderscapes/textures/trims/color_palettes/rose_quartz.png rename to client/src/main/resources/assets/cinderscapes/textures/trims/color_palettes/cinderscapes_rose_quartz.png diff --git a/client/src/main/resources/assets/cinderscapes/textures/trims/color_palettes/smoky_quartz.png b/client/src/main/resources/assets/cinderscapes/textures/trims/color_palettes/cinderscapes_smoky_quartz.png similarity index 100% rename from client/src/main/resources/assets/cinderscapes/textures/trims/color_palettes/smoky_quartz.png rename to client/src/main/resources/assets/cinderscapes/textures/trims/color_palettes/cinderscapes_smoky_quartz.png diff --git a/client/src/main/resources/assets/cinderscapes/textures/trims/color_palettes/sulfur_quartz.png b/client/src/main/resources/assets/cinderscapes/textures/trims/color_palettes/cinderscapes_sulfur_quartz.png similarity index 100% rename from client/src/main/resources/assets/cinderscapes/textures/trims/color_palettes/sulfur_quartz.png rename to client/src/main/resources/assets/cinderscapes/textures/trims/color_palettes/cinderscapes_sulfur_quartz.png diff --git a/client/src/main/resources/assets/minecraft/atlases/armor_trims.json b/client/src/main/resources/assets/minecraft/atlases/armor_trims.json deleted file mode 100644 index 66720a95..00000000 --- a/client/src/main/resources/assets/minecraft/atlases/armor_trims.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "sources": [ - { - "type": "paletted_permutations", - "textures": [ - "trims/entity/humanoid/bolt", - "trims/entity/humanoid_leggings/bolt", - "trims/entity/humanoid/flow", - "trims/entity/humanoid_leggings/flow", - "trims/entity/humanoid/coast", - "trims/entity/humanoid_leggings/coast", - "trims/entity/humanoid/sentry", - "trims/entity/humanoid_leggings/sentry", - "trims/entity/humanoid/dune", - "trims/entity/humanoid_leggings/dune", - "trims/entity/humanoid/wild", - "trims/entity/humanoid_leggings/wild", - "trims/entity/humanoid/ward", - "trims/entity/humanoid_leggings/ward", - "trims/entity/humanoid/eye", - "trims/entity/humanoid_leggings/eye", - "trims/entity/humanoid/vex", - "trims/entity/humanoid_leggings/vex", - "trims/entity/humanoid/tide", - "trims/entity/humanoid_leggings/tide", - "trims/entity/humanoid/snout", - "trims/entity/humanoid_leggings/snout", - "trims/entity/humanoid/rib", - "trims/entity/humanoid_leggings/rib", - "trims/entity/humanoid/spire", - "trims/entity/humanoid_leggings/spire", - "trims/entity/humanoid/silence", - "trims/entity/humanoid_leggings/silence", - "trims/entity/humanoid/wayfinder", - "trims/entity/humanoid_leggings/wayfinder", - "trims/entity/humanoid/raiser", - "trims/entity/humanoid_leggings/raiser", - "trims/entity/humanoid/shaper", - "trims/entity/humanoid_leggings/shaper", - "trims/entity/humanoid/host", - "trims/entity/humanoid_leggings/host" - ], - "palette_key": "trims/color_palettes/trim_palette", - "permutations": { - "rose_quartz": "cinderscapes:trims/color_palettes/rose_quartz", - "smoky_quartz": "cinderscapes:trims/color_palettes/smoky_quartz", - "sulfur_quartz": "cinderscapes:trims/color_palettes/sulfur_quartz" - } - } - ] -} diff --git a/client/src/main/resources/assets/minecraft/atlases/blocks.json b/client/src/main/resources/assets/minecraft/atlases/blocks.json deleted file mode 100644 index 6f1b7047..00000000 --- a/client/src/main/resources/assets/minecraft/atlases/blocks.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "sources": [ - { - "type": "paletted_permutations", - "textures": [ - "trims/items/leggings_trim", - "trims/items/chestplate_trim", - "trims/items/helmet_trim", - "trims/items/boots_trim" - ], - "palette_key": "trims/color_palettes/trim_palette", - "permutations": { - "rose_quartz": "cinderscapes:trims/color_palettes/rose_quartz", - "smoky_quartz": "cinderscapes:trims/color_palettes/smoky_quartz", - "sulfur_quartz": "cinderscapes:trims/color_palettes/sulfur_quartz" - } - } - ] -} diff --git a/client/src/main/resources/assets/minecraft/models/item/chainmail_boots.json b/client/src/main/resources/assets/minecraft/models/item/chainmail_boots.json deleted file mode 100644 index e3ebed63..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/chainmail_boots.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/chainmail_boots_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/chainmail_boots_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/chainmail_boots_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/chainmail_boots_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/chainmail_boots_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/chainmail_boots_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/chainmail_boots_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/chainmail_boots_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/chainmail_boots_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/chainmail_boots_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/chainmail_boots_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/chainmail_boots_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/chainmail_boots_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/chainmail_boots" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/minecraft/models/item/chainmail_chestplate.json b/client/src/main/resources/assets/minecraft/models/item/chainmail_chestplate.json deleted file mode 100644 index 9d3db2ef..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/chainmail_chestplate.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/chainmail_chestplate_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/chainmail_chestplate_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/chainmail_chestplate_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/chainmail_chestplate_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/chainmail_chestplate_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/chainmail_chestplate_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/chainmail_chestplate_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/chainmail_chestplate_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/chainmail_chestplate_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/chainmail_chestplate_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/chainmail_chestplate_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/chainmail_chestplate_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/chainmail_chestplate_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/chainmail_chestplate" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/minecraft/models/item/chainmail_helmet.json b/client/src/main/resources/assets/minecraft/models/item/chainmail_helmet.json deleted file mode 100644 index b99cd6ab..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/chainmail_helmet.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/chainmail_helmet_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/chainmail_helmet_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/chainmail_helmet_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/chainmail_helmet_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/chainmail_helmet_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/chainmail_helmet_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/chainmail_helmet_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/chainmail_helmet_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/chainmail_helmet_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/chainmail_helmet_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/chainmail_helmet_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/chainmail_helmet_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/chainmail_helmet_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/chainmail_helmet" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/minecraft/models/item/chainmail_leggings.json b/client/src/main/resources/assets/minecraft/models/item/chainmail_leggings.json deleted file mode 100644 index 9f754cd6..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/chainmail_leggings.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/chainmail_leggings_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/chainmail_leggings_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/chainmail_leggings_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/chainmail_leggings_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/chainmail_leggings_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/chainmail_leggings_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/chainmail_leggings_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/chainmail_leggings_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/chainmail_leggings_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/chainmail_leggings_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/chainmail_leggings_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/chainmail_leggings_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/chainmail_leggings_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/chainmail_leggings" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/minecraft/models/item/diamond_boots.json b/client/src/main/resources/assets/minecraft/models/item/diamond_boots.json deleted file mode 100644 index 2b9efdee..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/diamond_boots.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/diamond_boots_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/diamond_boots_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/diamond_boots_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/diamond_boots_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/diamond_boots_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/diamond_boots_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/diamond_boots_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/diamond_boots_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/diamond_boots_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/diamond_boots_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/diamond_boots_diamond_darker_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/diamond_boots_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/diamond_boots_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/diamond_boots" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/minecraft/models/item/diamond_chestplate.json b/client/src/main/resources/assets/minecraft/models/item/diamond_chestplate.json deleted file mode 100644 index 7564f94e..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/diamond_chestplate.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/diamond_chestplate_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/diamond_chestplate_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/diamond_chestplate_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/diamond_chestplate_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/diamond_chestplate_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/diamond_chestplate_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/diamond_chestplate_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/diamond_chestplate_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/diamond_chestplate_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/diamond_chestplate_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/diamond_chestplate_diamond_darker_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/diamond_chestplate_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/diamond_chestplate_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/diamond_chestplate" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/minecraft/models/item/diamond_helmet.json b/client/src/main/resources/assets/minecraft/models/item/diamond_helmet.json deleted file mode 100644 index adfd4444..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/diamond_helmet.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/diamond_helmet_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/diamond_helmet_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/diamond_helmet_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/diamond_helmet_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/diamond_helmet_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/diamond_helmet_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/diamond_helmet_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/diamond_helmet_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/diamond_helmet_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/diamond_helmet_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/diamond_helmet_diamond_darker_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/diamond_helmet_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/diamond_helmet_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/diamond_helmet" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/minecraft/models/item/diamond_leggings.json b/client/src/main/resources/assets/minecraft/models/item/diamond_leggings.json deleted file mode 100644 index 6b82168c..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/diamond_leggings.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/diamond_leggings_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/diamond_leggings_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/diamond_leggings_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/diamond_leggings_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/diamond_leggings_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/diamond_leggings_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/diamond_leggings_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/diamond_leggings_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/diamond_leggings_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/diamond_leggings_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/diamond_leggings_diamond_darker_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/diamond_leggings_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/diamond_leggings_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/diamond_leggings" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/minecraft/models/item/golden_boots.json b/client/src/main/resources/assets/minecraft/models/item/golden_boots.json deleted file mode 100644 index ce836ce0..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/golden_boots.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/golden_boots_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/golden_boots_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/golden_boots_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/golden_boots_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/golden_boots_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/golden_boots_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/golden_boots_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/golden_boots_gold_darker_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/golden_boots_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/golden_boots_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/golden_boots_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/golden_boots_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/golden_boots_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/golden_boots" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/minecraft/models/item/golden_chestplate.json b/client/src/main/resources/assets/minecraft/models/item/golden_chestplate.json deleted file mode 100644 index 46761b1b..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/golden_chestplate.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/golden_chestplate_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/golden_chestplate_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/golden_chestplate_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/golden_chestplate_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/golden_chestplate_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/golden_chestplate_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/golden_chestplate_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/golden_chestplate_gold_darker_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/golden_chestplate_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/golden_chestplate_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/golden_chestplate_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/golden_chestplate_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/golden_chestplate_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/golden_chestplate" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/minecraft/models/item/golden_helmet.json b/client/src/main/resources/assets/minecraft/models/item/golden_helmet.json deleted file mode 100644 index dcc71efa..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/golden_helmet.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/golden_helmet_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/golden_helmet_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/golden_helmet_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/golden_helmet_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/golden_helmet_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/golden_helmet_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/golden_helmet_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/golden_helmet_gold_darker_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/golden_helmet_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/golden_helmet_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/golden_helmet_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/golden_helmet_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/golden_helmet_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/golden_helmet" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/minecraft/models/item/golden_leggings.json b/client/src/main/resources/assets/minecraft/models/item/golden_leggings.json deleted file mode 100644 index 7f0eb3aa..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/golden_leggings.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/golden_leggings_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/golden_leggings_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/golden_leggings_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/golden_leggings_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/golden_leggings_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/golden_leggings_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/golden_leggings_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/golden_leggings_gold_darker_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/golden_leggings_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/golden_leggings_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/golden_leggings_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/golden_leggings_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/golden_leggings_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/golden_leggings" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/minecraft/models/item/iron_boots.json b/client/src/main/resources/assets/minecraft/models/item/iron_boots.json deleted file mode 100644 index 22bd0c64..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/iron_boots.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/iron_boots_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/iron_boots_iron_darker_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/iron_boots_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/iron_boots_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/iron_boots_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/iron_boots_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/iron_boots_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/iron_boots_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/iron_boots_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/iron_boots_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/iron_boots_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/iron_boots_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/iron_boots_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/iron_boots" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/minecraft/models/item/iron_chestplate.json b/client/src/main/resources/assets/minecraft/models/item/iron_chestplate.json deleted file mode 100644 index f0e3cc4d..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/iron_chestplate.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/iron_chestplate_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/iron_chestplate_iron_darker_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/iron_chestplate_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/iron_chestplate_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/iron_chestplate_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/iron_chestplate_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/iron_chestplate_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/iron_chestplate_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/iron_chestplate_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/iron_chestplate_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/iron_chestplate_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/iron_chestplate_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/iron_chestplate_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/iron_chestplate" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/minecraft/models/item/iron_helmet.json b/client/src/main/resources/assets/minecraft/models/item/iron_helmet.json deleted file mode 100644 index 5f272a6a..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/iron_helmet.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/iron_helmet_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/iron_helmet_iron_darker_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/iron_helmet_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/iron_helmet_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/iron_helmet_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/iron_helmet_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/iron_helmet_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/iron_helmet_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/iron_helmet_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/iron_helmet_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/iron_helmet_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/iron_helmet_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/iron_helmet_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/iron_helmet" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/minecraft/models/item/iron_leggings.json b/client/src/main/resources/assets/minecraft/models/item/iron_leggings.json deleted file mode 100644 index c39c51e1..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/iron_leggings.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/iron_leggings_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/iron_leggings_iron_darker_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/iron_leggings_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/iron_leggings_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/iron_leggings_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/iron_leggings_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/iron_leggings_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/iron_leggings_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/iron_leggings_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/iron_leggings_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/iron_leggings_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/iron_leggings_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/iron_leggings_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/iron_leggings" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/minecraft/models/item/leather_boots.json b/client/src/main/resources/assets/minecraft/models/item/leather_boots.json deleted file mode 100644 index 01bc6f70..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/leather_boots.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/leather_boots_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/leather_boots_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/leather_boots_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/leather_boots_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/leather_boots_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/leather_boots_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/leather_boots_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/leather_boots_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/leather_boots_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/leather_boots_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/leather_boots_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/leather_boots_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/leather_boots_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/leather_boots", - "layer1": "minecraft:item/leather_boots_overlay" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/minecraft/models/item/leather_chestplate.json b/client/src/main/resources/assets/minecraft/models/item/leather_chestplate.json deleted file mode 100644 index 263ed483..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/leather_chestplate.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/leather_chestplate_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/leather_chestplate_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/leather_chestplate_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/leather_chestplate_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/leather_chestplate_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/leather_chestplate_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/leather_chestplate_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/leather_chestplate_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/leather_chestplate_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/leather_chestplate_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/leather_chestplate_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/leather_chestplate_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/leather_chestplate_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/leather_chestplate", - "layer1": "minecraft:item/leather_chestplate_overlay" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/minecraft/models/item/leather_helmet.json b/client/src/main/resources/assets/minecraft/models/item/leather_helmet.json deleted file mode 100644 index fbf0dd5d..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/leather_helmet.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/leather_helmet_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/leather_helmet_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/leather_helmet_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/leather_helmet_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/leather_helmet_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/leather_helmet_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/leather_helmet_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/leather_helmet_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/leather_helmet_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/leather_helmet_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/leather_helmet_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/leather_helmet_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/leather_helmet_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/leather_helmet", - "layer1": "minecraft:item/leather_helmet_overlay" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/minecraft/models/item/leather_leggings.json b/client/src/main/resources/assets/minecraft/models/item/leather_leggings.json deleted file mode 100644 index da89a1be..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/leather_leggings.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/leather_leggings_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/leather_leggings_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/leather_leggings_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/leather_leggings_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/leather_leggings_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/leather_leggings_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/leather_leggings_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/leather_leggings_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/leather_leggings_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/leather_leggings_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/leather_leggings_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/leather_leggings_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/leather_leggings_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/leather_leggings", - "layer1": "minecraft:item/leather_leggings_overlay" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/minecraft/models/item/netherite_boots.json b/client/src/main/resources/assets/minecraft/models/item/netherite_boots.json deleted file mode 100644 index 72d1ad38..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/netherite_boots.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/netherite_boots_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/netherite_boots_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/netherite_boots_netherite_darker_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/netherite_boots_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/netherite_boots_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/netherite_boots_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/netherite_boots_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/netherite_boots_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/netherite_boots_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/netherite_boots_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/netherite_boots_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/netherite_boots_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/netherite_boots_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/netherite_boots" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/minecraft/models/item/netherite_chestplate.json b/client/src/main/resources/assets/minecraft/models/item/netherite_chestplate.json deleted file mode 100644 index 54555307..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/netherite_chestplate.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/netherite_chestplate_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/netherite_chestplate_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/netherite_chestplate_netherite_darker_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/netherite_chestplate_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/netherite_chestplate_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/netherite_chestplate_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/netherite_chestplate_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/netherite_chestplate_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/netherite_chestplate_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/netherite_chestplate_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/netherite_chestplate_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/netherite_chestplate_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/netherite_chestplate_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/netherite_chestplate" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/minecraft/models/item/netherite_helmet.json b/client/src/main/resources/assets/minecraft/models/item/netherite_helmet.json deleted file mode 100644 index 6434969c..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/netherite_helmet.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/netherite_helmet_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/netherite_helmet_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/netherite_helmet_netherite_darker_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/netherite_helmet_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/netherite_helmet_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/netherite_helmet_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/netherite_helmet_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/netherite_helmet_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/netherite_helmet_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/netherite_helmet_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/netherite_helmet_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/netherite_helmet_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/netherite_helmet_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/netherite_helmet" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/minecraft/models/item/netherite_leggings.json b/client/src/main/resources/assets/minecraft/models/item/netherite_leggings.json deleted file mode 100644 index 611d9c51..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/netherite_leggings.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/netherite_leggings_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/netherite_leggings_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/netherite_leggings_netherite_darker_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/netherite_leggings_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/netherite_leggings_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/netherite_leggings_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/netherite_leggings_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/netherite_leggings_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/netherite_leggings_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/netherite_leggings_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/netherite_leggings_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/netherite_leggings_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/netherite_leggings_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/netherite_leggings" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/minecraft/models/item/turtle_helmet.json b/client/src/main/resources/assets/minecraft/models/item/turtle_helmet.json deleted file mode 100644 index a40fc3ca..00000000 --- a/client/src/main/resources/assets/minecraft/models/item/turtle_helmet.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "minecraft:item/turtle_helmet_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "minecraft:item/turtle_helmet_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "minecraft:item/turtle_helmet_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "cinderscapes:item/turtle_helmet_smoky_quartz_trim", - "predicate": { - "trim_type": 0.30666 - } - }, - { - "model": "minecraft:item/turtle_helmet_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "cinderscapes:item/turtle_helmet_rose_quartz_trim", - "predicate": { - "trim_type": 0.40666 - } - }, - { - "model": "minecraft:item/turtle_helmet_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "minecraft:item/turtle_helmet_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "cinderscapes:item/turtle_helmet_sulfur_quartz_trim", - "predicate": { - "trim_type": 0.60666 - } - }, - { - "model": "minecraft:item/turtle_helmet_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "minecraft:item/turtle_helmet_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "minecraft:item/turtle_helmet_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "minecraft:item/turtle_helmet_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "minecraft:item/turtle_helmet" - } -} \ No newline at end of file diff --git a/common/build.gradle b/common/build.gradle index ba7ca6f8..2afd907f 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -2,26 +2,10 @@ archivesBaseName = "cinderscapes-common" loom { accessWidenerPath = file("src/main/resources/cinderscapes-common.accesswidener") - - runs { - datagen { - inherit server - - name = "Data Generation" - runDir = "build/datagen" - - vmArg "-Dfabric-api.datagen" - vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/generated")}" - } - } } -sourceSets { - main { - resources { - srcDirs += [ - "src/main/generated" - ] - } +fabricApi { + configureDataGeneration { + client = true } } diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/Cinderscapes.java b/common/src/main/java/com/terraformersmc/cinderscapes/Cinderscapes.java index a13a33fb..a185536d 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/Cinderscapes.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/Cinderscapes.java @@ -30,6 +30,7 @@ public void onInitialize() { CinderscapesSoundEvents.init(); CinderscapesTrades.init(); CinderscapesItemGroups.init(); + CinderscapesRegistryAliases.init(); if (!FabricLoader.getInstance().isModLoaded("cinderscapes-worldgen")) { Cinderscapes.LOGGER.info("No Cinderscapes worldgen module present; Cinderscapes biomes will not generate."); diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/block/BrambleBerryBushBlock.java b/common/src/main/java/com/terraformersmc/cinderscapes/block/BrambleBerryBushBlock.java index 00761d36..ebe679ad 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/block/BrambleBerryBushBlock.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/block/BrambleBerryBushBlock.java @@ -37,7 +37,7 @@ public BrambleBerryBushBlock(Settings settings) { @Override @Environment(EnvType.CLIENT) - public ItemStack getPickStack(WorldView world, BlockPos pos, BlockState state) { + public ItemStack getPickStack(WorldView world, BlockPos pos, BlockState state, boolean includeData) { return new ItemStack(CinderscapesItems.BRAMBLE_BERRIES); } diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBiomeTagProvider.java b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBiomeTagProvider.java index 37f5bbfd..7e99faf7 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBiomeTagProvider.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBiomeTagProvider.java @@ -58,4 +58,9 @@ public void configure(RegistryWrapper.WrapperLookup registries) { getOrCreateTagBuilder(BiomeTags.RUINED_PORTAL_NETHER_HAS_STRUCTURE) .addOptional(CinderscapesBiomes.ASHY_SHOALS); } + + @Override + public String getName() { + return "Cinderscapes Biome Tags"; + } } diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBlockLootTableProvider.java b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBlockLootTableProvider.java index 4c3508d0..84df2748 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBlockLootTableProvider.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBlockLootTableProvider.java @@ -186,4 +186,9 @@ public void generate() { )) )); } + + @Override + public String getName() { + return "Cinderscapes Block Loot Tables"; + } } diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBlockTagProvider.java b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBlockTagProvider.java index 583c1723..8b1d97c4 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBlockTagProvider.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBlockTagProvider.java @@ -258,4 +258,9 @@ public void configure(RegistryWrapper.WrapperLookup registries) { .add(CinderscapesBlocks.STRIPPED_UMBRAL_HYPHAE) .add(CinderscapesBlocks.STRIPPED_UMBRAL_STEM); } + + @Override + public String getName() { + return "Cinderscapes Block Tags"; + } } diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesDatagen.java b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesDatagen.java index cd71bcd7..67b1e077 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesDatagen.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesDatagen.java @@ -14,6 +14,7 @@ public void onInitializeDataGenerator(FabricDataGenerator dataGenerator) { pack.addProvider(CinderscapesBlockLootTableProvider::new); CinderscapesBlockTagProvider blockTagProvider = pack.addProvider(CinderscapesBlockTagProvider::new); pack.addProvider((output, registries) -> new CinderscapesItemTagProvider(output, registries, blockTagProvider)); + pack.addProvider(CinderscapesModelProvider::new); pack.addProvider(CinderscapesRecipeProvider::new); } diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesDynamicRegistryProvider.java b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesDynamicRegistryProvider.java index d4620495..c577f13c 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesDynamicRegistryProvider.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesDynamicRegistryProvider.java @@ -43,7 +43,7 @@ public void configure(RegistryWrapper.WrapperLookup registries, Entries entries) @Override public String getName() { - return "Cinderscapes"; + return "Cinderscapes Dynamic Registries"; } /** diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesItemTagProvider.java b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesItemTagProvider.java index 8ec4c9b5..1ddf5c91 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesItemTagProvider.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesItemTagProvider.java @@ -193,4 +193,9 @@ public void configure(RegistryWrapper.WrapperLookup registries) { getOrCreateTagBuilder(CinderscapesItemTags.SULFUR_ORES) .add(CinderscapesBlocks.SULFUR_ORE.asItem()); } + + @Override + public String getName() { + return "Cinderscapes Item Tags"; + } } diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesModelProvider.java b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesModelProvider.java new file mode 100644 index 00000000..77224e8a --- /dev/null +++ b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesModelProvider.java @@ -0,0 +1,359 @@ +package com.terraformersmc.cinderscapes.data; + +import com.terraformersmc.cinderscapes.Cinderscapes; +import com.terraformersmc.cinderscapes.block.GhastlyEctoplasmBlock; +import com.terraformersmc.cinderscapes.block.PolypiteQuartzBlock; +import com.terraformersmc.cinderscapes.init.CinderscapesArmorTrimMaterials; +import com.terraformersmc.cinderscapes.init.CinderscapesBlockFamilies; +import com.terraformersmc.cinderscapes.init.CinderscapesBlocks; +import com.terraformersmc.cinderscapes.init.CinderscapesItems; +import net.fabricmc.fabric.api.client.datagen.v1.provider.FabricModelProvider; +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.client.data.*; +import net.minecraft.item.Item; +import net.minecraft.item.Items; +import net.minecraft.item.equipment.EquipmentAsset; +import net.minecraft.item.equipment.EquipmentAssetKeys; +import net.minecraft.registry.RegistryKey; +import net.minecraft.state.property.Properties; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.Direction; + +import java.util.List; +import java.util.Map; +import java.util.Optional; + +public class CinderscapesModelProvider extends FabricModelProvider { + private static final List TRIM_MATERIALS = List.of( + new ItemModelGenerator.TrimMaterial("cinderscapes_rose_quartz", CinderscapesArmorTrimMaterials.ROSE_QUARTZ, Map.of()), + new ItemModelGenerator.TrimMaterial("cinderscapes_smoky_quartz", CinderscapesArmorTrimMaterials.SMOKY_QUARTZ, Map.of()), + new ItemModelGenerator.TrimMaterial("cinderscapes_sulfur_quartz", CinderscapesArmorTrimMaterials.SULFUR_QUARTZ, Map.of()) + ); + + public CinderscapesModelProvider(FabricDataOutput output) { + super(output); + } + + @Override + public void generateBlockStateModels(BlockStateModelGenerator generator) { + + ///////////////// + // Ashy Shoals // + ///////////////// + + // Scorched wood set + generator.registerCubeAllModelTexturePool(CinderscapesBlockFamilies.SCORCHED.getBaseBlock()).family(CinderscapesBlockFamilies.SCORCHED); + generator.registerLog(CinderscapesBlocks.SCORCHED_STEM).log(CinderscapesBlocks.SCORCHED_STEM).wood(CinderscapesBlocks.SCORCHED_HYPHAE); + generator.registerLog(CinderscapesBlocks.STRIPPED_SCORCHED_STEM).log(CinderscapesBlocks.STRIPPED_SCORCHED_STEM).wood(CinderscapesBlocks.STRIPPED_SCORCHED_HYPHAE); + generator.registerHangingSign(CinderscapesBlockFamilies.SCORCHED.getBaseBlock(), CinderscapesBlocks.SCORCHED_HANGING_SIGN, CinderscapesBlocks.SCORCHED_WALL_HANGING_SIGN); + // Item models missed by vanilla code + this.registerBlockItemModel(generator, CinderscapesBlocks.SCORCHED_FENCE_GATE); + this.registerBlockItemModel(generator, CinderscapesBlocks.SCORCHED_STEM); + this.registerBlockItemModel(generator, CinderscapesBlocks.SCORCHED_PLANKS); + this.registerBlockItemModel(generator, CinderscapesBlocks.SCORCHED_PRESSURE_PLATE); + this.registerBlockItemModel(generator, CinderscapesBlocks.SCORCHED_HYPHAE); + this.registerBlockItemModel(generator, CinderscapesBlocks.STRIPPED_SCORCHED_STEM); + this.registerBlockItemModel(generator, CinderscapesBlocks.STRIPPED_SCORCHED_HYPHAE); + + // Misc. vegetation + generator.registerFlowerPotPlantAndItem(CinderscapesBlocks.SCORCHED_SHRUB, CinderscapesBlocks.POTTED_SCORCHED_SHRUB, BlockStateModelGenerator.CrossType.NOT_TINTED); + generator.registerTintableCrossBlockState(CinderscapesBlocks.SCORCHED_SPROUTS, BlockStateModelGenerator.CrossType.NOT_TINTED); + generator.registerTintableCross(CinderscapesBlocks.SCORCHED_TENDRILS, BlockStateModelGenerator.CrossType.NOT_TINTED); + this.registerPottedPlantOnly(generator, CinderscapesBlocks.SCORCHED_TENDRILS, CinderscapesBlocks.POTTED_SCORCHED_TENDRILS, true); + generator.registerFlowerPotPlant(CinderscapesBlocks.PYRACINTH, CinderscapesBlocks.POTTED_PYRACINTH, BlockStateModelGenerator.CrossType.NOT_TINTED); + + // BlockStateModelGenerator.registerSnows() equivalent (Ash is a snow-like layered powder block) + // We have to make models inheriting from vanilla's hand-rolled snow models... + TextureMap ashTexture = TextureMap.all(CinderscapesBlocks.ASH); + Identifier ashModelId = Models.CUBE_ALL.upload(CinderscapesBlocks.ASH_BLOCK, ashTexture, generator.modelCollector); + generator.blockStateCollector.accept(VariantsBlockStateSupplier.create(CinderscapesBlocks.ASH).coordinate( + BlockStateVariantMap.create(Properties.LAYERS).register(height -> BlockStateVariant.create() + .put(VariantSettings.MODEL, + height < 8 ? + new Model(Optional.of(ModelIds.getBlockSubModelId(Blocks.SNOW, "_height" + height * 2)), + Optional.empty(), TextureKey.PARTICLE, TextureKey.TEXTURE) + .upload(ModelIds.getBlockSubModelId(CinderscapesBlocks.ASH, "_height" + height * 2), + ashTexture, generator.modelCollector) : + ashModelId)))); + generator.registerParentedItemModel(CinderscapesBlocks.ASH, ModelIds.getBlockSubModelId(CinderscapesBlocks.ASH, "_height2")); + generator.blockStateCollector.accept(BlockStateModelGenerator.createSingletonBlockState(CinderscapesBlocks.ASH_BLOCK, ashModelId)); + this.registerBlockItemModel(generator, CinderscapesBlocks.ASH_BLOCK); + + + //////////////////// + // Luminous Grove // + //////////////////// + + // Umbral wood set + generator.registerCubeAllModelTexturePool(CinderscapesBlockFamilies.UMBRAL.getBaseBlock()).family(CinderscapesBlockFamilies.UMBRAL); + generator.registerLog(CinderscapesBlocks.UMBRAL_STEM).log(CinderscapesBlocks.UMBRAL_STEM).wood(CinderscapesBlocks.UMBRAL_HYPHAE); + generator.registerLog(CinderscapesBlocks.STRIPPED_UMBRAL_STEM).log(CinderscapesBlocks.STRIPPED_UMBRAL_STEM).wood(CinderscapesBlocks.STRIPPED_UMBRAL_HYPHAE); + generator.registerHangingSign(CinderscapesBlockFamilies.UMBRAL.getBaseBlock(), CinderscapesBlocks.UMBRAL_HANGING_SIGN, CinderscapesBlocks.UMBRAL_WALL_HANGING_SIGN); + generator.registerFlowerPotPlantAndItem(CinderscapesBlocks.UMBRAL_FUNGUS, CinderscapesBlocks.POTTED_UMBRAL_FUNGUS, BlockStateModelGenerator.CrossType.NOT_TINTED); + // Item models missed by vanilla code + this.registerBlockItemModel(generator, CinderscapesBlocks.UMBRAL_FENCE_GATE); + this.registerBlockItemModel(generator, CinderscapesBlocks.UMBRAL_STEM); + this.registerBlockItemModel(generator, CinderscapesBlocks.UMBRAL_PLANKS); + this.registerBlockItemModel(generator, CinderscapesBlocks.UMBRAL_PRESSURE_PLATE); + this.registerBlockItemModel(generator, CinderscapesBlocks.UMBRAL_HYPHAE); + this.registerBlockItemModel(generator, CinderscapesBlocks.STRIPPED_UMBRAL_STEM); + this.registerBlockItemModel(generator, CinderscapesBlocks.STRIPPED_UMBRAL_HYPHAE); + + // Luminous Grove misc. + generator.registerNetherrackBottomCustomTop(CinderscapesBlocks.UMBRAL_NYLIUM); + this.registerBlockItemModel(generator, CinderscapesBlocks.UMBRAL_NYLIUM); + generator.registerSimpleCubeAll(CinderscapesBlocks.UMBRAL_FLESH_BLOCK); + this.registerBlockItemModel(generator, CinderscapesBlocks.UMBRAL_FLESH_BLOCK); + generator.registerSimpleCubeAll(CinderscapesBlocks.UMBRAL_WART_BLOCK); + this.registerBlockItemModel(generator, CinderscapesBlocks.UMBRAL_WART_BLOCK); + generator.registerSimpleCubeAll(CinderscapesBlocks.TWILIGHT_VINE_BLOCK); + this.registerBlockItemModel(generator, CinderscapesBlocks.TWILIGHT_VINE_BLOCK); + generator.registerTintableCross(CinderscapesBlocks.TWILIGHT_TENDRILS, BlockStateModelGenerator.CrossType.NOT_TINTED); + this.registerPottedPlantOnly(generator, CinderscapesBlocks.TWILIGHT_TENDRILS, CinderscapesBlocks.POTTED_TWILIGHT_TENDRILS, true); + generator.registerTintableCrossBlockState(CinderscapesBlocks.TWILIGHT_FESCUES, BlockStateModelGenerator.CrossType.NOT_TINTED); + generator.registerFlowerPotPlant(CinderscapesBlocks.PHOTOFERN, CinderscapesBlocks.POTTED_PHOTOFERN, BlockStateModelGenerator.CrossType.NOT_TINTED); + generator.registerDoubleBlock(CinderscapesBlocks.TALL_PHOTOFERN, BlockStateModelGenerator.CrossType.NOT_TINTED); + // Luminous Pod is two tall but potted + generator.registerDoubleBlock(CinderscapesBlocks.LUMINOUS_POD, BlockStateModelGenerator.CrossType.NOT_TINTED); + this.registerPottedPlantOnly(generator, CinderscapesBlocks.LUMINOUS_POD, CinderscapesBlocks.POTTED_LUMINOUS_POD, true); + + // Ghastly Ectoplasm is a multi-part variable length hanging cross block + generator.blockStateCollector.accept( + VariantsBlockStateSupplier.create(CinderscapesBlocks.GHASTLY_ECTOPLASM) + .coordinate( + BlockStateVariantMap.create(GhastlyEctoplasmBlock.TYPE) + .register(GhastlyEctoplasmBlock.Type.TOP, BlockStateVariant.create().put(VariantSettings.MODEL, + Models.TINTED_CROSS.upload(CinderscapesBlocks.GHASTLY_ECTOPLASM, "_top", + TextureMap.cross(TextureMap.getSubId(CinderscapesBlocks.GHASTLY_ECTOPLASM, "_top")), + generator.modelCollector))) + .register(GhastlyEctoplasmBlock.Type.MIDDLE, BlockStateVariant.create().put(VariantSettings.MODEL, + Models.TINTED_CROSS.upload(CinderscapesBlocks.GHASTLY_ECTOPLASM, "_middle", + TextureMap.cross(TextureMap.getSubId(CinderscapesBlocks.GHASTLY_ECTOPLASM, "_middle")), + generator.modelCollector))) + .register(GhastlyEctoplasmBlock.Type.BOTTOM, BlockStateVariant.create().put(VariantSettings.MODEL, + Models.TINTED_CROSS.upload(CinderscapesBlocks.GHASTLY_ECTOPLASM, "_bottom", + TextureMap.cross(TextureMap.getSubId(CinderscapesBlocks.GHASTLY_ECTOPLASM, "_bottom")), + generator.modelCollector))) + ) + ); + + + + /////////////////// + // Quartz Cavern // + /////////////////// + + // Rose Quartz set + generator.registerCubeAllModelTexturePool(CinderscapesBlockFamilies.ROSE_QUARTZ_BLOCK.getBaseBlock()).family(CinderscapesBlockFamilies.ROSE_QUARTZ_BLOCK); + this.registerBlockItemModel(generator, CinderscapesBlocks.ROSE_QUARTZ_BLOCK); + generator.registerCubeAllModelTexturePool(CinderscapesBlockFamilies.SMOOTH_ROSE_QUARTZ.getBaseBlock()).family(CinderscapesBlockFamilies.SMOOTH_ROSE_QUARTZ); + this.registerBlockItemModel(generator, CinderscapesBlocks.SMOOTH_ROSE_QUARTZ); + this.registerCubeColumn(generator, CinderscapesBlocks.CHISELED_ROSE_QUARTZ_BLOCK); + this.registerBlockItemModel(generator, CinderscapesBlocks.CHISELED_ROSE_QUARTZ_BLOCK); + generator.registerSimpleCubeAll(CinderscapesBlocks.ROSE_QUARTZ_ORE); + this.registerBlockItemModel(generator, CinderscapesBlocks.ROSE_QUARTZ_ORE); + generator.registerSimpleCubeAll(CinderscapesBlocks.ROSE_QUARTZ_BRICKS); + this.registerBlockItemModel(generator, CinderscapesBlocks.ROSE_QUARTZ_BRICKS); + generator.registerAxisRotated(CinderscapesBlocks.ROSE_QUARTZ_PILLAR, TexturedModel.END_FOR_TOP_CUBE_COLUMN, TexturedModel.END_FOR_TOP_CUBE_COLUMN_HORIZONTAL); + this.registerBlockItemModel(generator, CinderscapesBlocks.ROSE_QUARTZ_PILLAR); + generator.registerSimpleCubeAll(CinderscapesBlocks.CRYSTALLINE_ROSE_QUARTZ); + this.registerBlockItemModel(generator, CinderscapesBlocks.CRYSTALLINE_ROSE_QUARTZ); + this.registerPolyp(generator, CinderscapesBlocks.POLYPITE_ROSE_QUARTZ); + this.registerPottedPlantOnly(generator, CinderscapesBlocks.POLYPITE_ROSE_QUARTZ, CinderscapesBlocks.POTTED_POLYPITE_ROSE_QUARTZ); + + // Smoky Quartz set + generator.registerCubeAllModelTexturePool(CinderscapesBlockFamilies.SMOKY_QUARTZ_BLOCK.getBaseBlock()).family(CinderscapesBlockFamilies.SMOKY_QUARTZ_BLOCK); + this.registerBlockItemModel(generator, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK); + generator.registerCubeAllModelTexturePool(CinderscapesBlockFamilies.SMOOTH_SMOKY_QUARTZ.getBaseBlock()).family(CinderscapesBlockFamilies.SMOOTH_SMOKY_QUARTZ); + this.registerBlockItemModel(generator, CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ); + this.registerCubeColumn(generator, CinderscapesBlocks.CHISELED_SMOKY_QUARTZ_BLOCK); + this.registerBlockItemModel(generator, CinderscapesBlocks.CHISELED_SMOKY_QUARTZ_BLOCK); + generator.registerSimpleCubeAll(CinderscapesBlocks.SMOKY_QUARTZ_ORE); + this.registerBlockItemModel(generator, CinderscapesBlocks.SMOKY_QUARTZ_ORE); + generator.registerSimpleCubeAll(CinderscapesBlocks.SMOKY_QUARTZ_BRICKS); + this.registerBlockItemModel(generator, CinderscapesBlocks.SMOKY_QUARTZ_BRICKS); + generator.registerAxisRotated(CinderscapesBlocks.SMOKY_QUARTZ_PILLAR, TexturedModel.END_FOR_TOP_CUBE_COLUMN, TexturedModel.END_FOR_TOP_CUBE_COLUMN_HORIZONTAL); + this.registerBlockItemModel(generator, CinderscapesBlocks.SMOKY_QUARTZ_PILLAR); + generator.registerSimpleCubeAll(CinderscapesBlocks.CRYSTALLINE_SMOKY_QUARTZ); + this.registerBlockItemModel(generator, CinderscapesBlocks.CRYSTALLINE_SMOKY_QUARTZ); + this.registerPolyp(generator, CinderscapesBlocks.POLYPITE_SMOKY_QUARTZ); + this.registerPottedPlantOnly(generator, CinderscapesBlocks.POLYPITE_SMOKY_QUARTZ, CinderscapesBlocks.POTTED_POLYPITE_SMOKY_QUARTZ); + + // Sulfur Quartz set + generator.registerCubeAllModelTexturePool(CinderscapesBlockFamilies.SULFUR_QUARTZ_BLOCK.getBaseBlock()).family(CinderscapesBlockFamilies.SULFUR_QUARTZ_BLOCK); + this.registerBlockItemModel(generator, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK); + generator.registerCubeAllModelTexturePool(CinderscapesBlockFamilies.SMOOTH_SULFUR_QUARTZ.getBaseBlock()).family(CinderscapesBlockFamilies.SMOOTH_SULFUR_QUARTZ); + this.registerBlockItemModel(generator, CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ); + this.registerCubeColumn(generator, CinderscapesBlocks.CHISELED_SULFUR_QUARTZ_BLOCK); + this.registerBlockItemModel(generator, CinderscapesBlocks.CHISELED_SULFUR_QUARTZ_BLOCK); + generator.registerSimpleCubeAll(CinderscapesBlocks.SULFUR_QUARTZ_ORE); + this.registerBlockItemModel(generator, CinderscapesBlocks.SULFUR_QUARTZ_ORE); + generator.registerSimpleCubeAll(CinderscapesBlocks.SULFUR_QUARTZ_BRICKS); + this.registerBlockItemModel(generator, CinderscapesBlocks.SULFUR_QUARTZ_BRICKS); + generator.registerAxisRotated(CinderscapesBlocks.SULFUR_QUARTZ_PILLAR, TexturedModel.END_FOR_TOP_CUBE_COLUMN, TexturedModel.END_FOR_TOP_CUBE_COLUMN_HORIZONTAL); + this.registerBlockItemModel(generator, CinderscapesBlocks.SULFUR_QUARTZ_PILLAR); + generator.registerSimpleCubeAll(CinderscapesBlocks.CRYSTALLINE_SULFUR_QUARTZ); + this.registerBlockItemModel(generator, CinderscapesBlocks.CRYSTALLINE_SULFUR_QUARTZ); + this.registerPolyp(generator, CinderscapesBlocks.POLYPITE_SULFUR_QUARTZ); + this.registerPottedPlantOnly(generator, CinderscapesBlocks.POLYPITE_SULFUR_QUARTZ, CinderscapesBlocks.POTTED_POLYPITE_SULFUR_QUARTZ); + + // Nether Quartz additions + generator.registerSimpleCubeAll(CinderscapesBlocks.CRYSTALLINE_QUARTZ); + this.registerBlockItemModel(generator, CinderscapesBlocks.CRYSTALLINE_QUARTZ); + this.registerPolyp(generator, CinderscapesBlocks.POLYPITE_QUARTZ); + this.registerPottedPlantOnly(generator, CinderscapesBlocks.POLYPITE_QUARTZ, CinderscapesBlocks.POTTED_POLYPITE_QUARTZ); + + // Quartz Cavern misc. + generator.registerFlowerPotPlant(CinderscapesBlocks.CRYSTINIUM, CinderscapesBlocks.POTTED_CRYSTINIUM, BlockStateModelGenerator.CrossType.NOT_TINTED); + + + /////////// + // Other // + /////////// + + generator.registerNetherrackBottomCustomTop(CinderscapesBlocks.NODZOL); + this.registerBlockItemModel(generator, CinderscapesBlocks.NODZOL); + generator.registerSimpleCubeAll(CinderscapesBlocks.SULFUR_BLOCK); + this.registerBlockItemModel(generator, CinderscapesBlocks.SULFUR_BLOCK); + generator.registerSimpleCubeAll(CinderscapesBlocks.SULFUR_ORE); + this.registerBlockItemModel(generator, CinderscapesBlocks.SULFUR_ORE); + + // Adapted copy of BlockStateModelGenerator.registerSweetBerryBush for Bramble Berry Bush + generator.registerItemModel(CinderscapesItems.BRAMBLE_BERRIES); + generator.blockStateCollector.accept(VariantsBlockStateSupplier.create(CinderscapesBlocks.BRAMBLE_BERRY_BUSH) + .coordinate(BlockStateVariantMap.create(Properties.AGE_3).register(stage -> BlockStateVariant.create() + .put(VariantSettings.MODEL, generator.createSubModel(CinderscapesBlocks.BRAMBLE_BERRY_BUSH, + "_stage" + stage, Models.CROSS, TextureMap::cross))))); + } + + @Override + public void generateItemModels(ItemModelGenerator generator) { + generator.register(CinderscapesItems.ASH_PILE, Models.GENERATED); + generator.register(CinderscapesItems.SULFUR, Models.GENERATED); + + generator.register(CinderscapesItems.ROSE_QUARTZ, Models.GENERATED); + generator.register(CinderscapesItems.SMOKY_QUARTZ, Models.GENERATED); + generator.register(CinderscapesItems.SULFUR_QUARTZ, Models.GENERATED); + + // Block items with provided item textures + generator.register(CinderscapesItems.CRYSTINIUM, Models.GENERATED); + generator.register(CinderscapesItems.GHASTLY_ECTOPLASM, Models.GENERATED); + generator.register(CinderscapesItems.LUMINOUS_POD, Models.GENERATED); + generator.register(CinderscapesItems.PYRACINTH, Models.GENERATED); + generator.register(CinderscapesItems.PHOTOFERN, Models.GENERATED); + generator.register(CinderscapesItems.SCORCHED_SPROUTS, Models.GENERATED); + generator.register(CinderscapesItems.TALL_PHOTOFERN, Models.GENERATED); + generator.register(CinderscapesItems.TWILIGHT_FESCUES, Models.GENERATED); + + // Armor items with Cinderscapes trim materials + this.registerArmorTrims(generator, Items.TURTLE_HELMET, EquipmentAssetKeys.TURTLE_SCUTE, "helmet", false); + this.registerArmorTrims(generator, Items.LEATHER_HELMET, EquipmentAssetKeys.LEATHER, "helmet", true); + this.registerArmorTrims(generator, Items.LEATHER_CHESTPLATE, EquipmentAssetKeys.LEATHER, "chestplate", true); + this.registerArmorTrims(generator, Items.LEATHER_LEGGINGS, EquipmentAssetKeys.LEATHER, "leggings", true); + this.registerArmorTrims(generator, Items.LEATHER_BOOTS, EquipmentAssetKeys.LEATHER, "boots", true); + this.registerArmorTrims(generator, Items.CHAINMAIL_HELMET, EquipmentAssetKeys.CHAINMAIL, "helmet", false); + this.registerArmorTrims(generator, Items.CHAINMAIL_CHESTPLATE, EquipmentAssetKeys.CHAINMAIL, "chestplate", false); + this.registerArmorTrims(generator, Items.CHAINMAIL_LEGGINGS, EquipmentAssetKeys.CHAINMAIL, "leggings", false); + this.registerArmorTrims(generator, Items.CHAINMAIL_BOOTS, EquipmentAssetKeys.CHAINMAIL, "boots", false); + this.registerArmorTrims(generator, Items.IRON_HELMET, EquipmentAssetKeys.IRON, "helmet", false); + this.registerArmorTrims(generator, Items.IRON_CHESTPLATE, EquipmentAssetKeys.IRON, "chestplate", false); + this.registerArmorTrims(generator, Items.IRON_LEGGINGS, EquipmentAssetKeys.IRON, "leggings", false); + this.registerArmorTrims(generator, Items.IRON_BOOTS, EquipmentAssetKeys.IRON, "boots", false); + this.registerArmorTrims(generator, Items.DIAMOND_HELMET, EquipmentAssetKeys.DIAMOND, "helmet", false); + this.registerArmorTrims(generator, Items.DIAMOND_CHESTPLATE, EquipmentAssetKeys.DIAMOND, "chestplate", false); + this.registerArmorTrims(generator, Items.DIAMOND_LEGGINGS, EquipmentAssetKeys.DIAMOND, "leggings", false); + this.registerArmorTrims(generator, Items.DIAMOND_BOOTS, EquipmentAssetKeys.DIAMOND, "boots", false); + this.registerArmorTrims(generator, Items.GOLDEN_HELMET, EquipmentAssetKeys.GOLD, "helmet", false); + this.registerArmorTrims(generator, Items.GOLDEN_CHESTPLATE, EquipmentAssetKeys.GOLD, "chestplate", false); + this.registerArmorTrims(generator, Items.GOLDEN_LEGGINGS, EquipmentAssetKeys.GOLD, "leggings", false); + this.registerArmorTrims(generator, Items.GOLDEN_BOOTS, EquipmentAssetKeys.GOLD, "boots", false); + this.registerArmorTrims(generator, Items.NETHERITE_HELMET, EquipmentAssetKeys.NETHERITE, "helmet", false); + this.registerArmorTrims(generator, Items.NETHERITE_CHESTPLATE, EquipmentAssetKeys.NETHERITE, "chestplate", false); + this.registerArmorTrims(generator, Items.NETHERITE_LEGGINGS, EquipmentAssetKeys.NETHERITE, "leggings", false); + this.registerArmorTrims(generator, Items.NETHERITE_BOOTS, EquipmentAssetKeys.NETHERITE, "boots", false); + } + + + private void registerPottedPlantOnly(BlockStateModelGenerator generator, Block plant, Block pottedPlant) { + registerPottedPlantOnly(generator, plant, pottedPlant, false); + } + + private void registerPottedPlantOnly(BlockStateModelGenerator generator, Block plant, Block pottedPlant, boolean usePottedTexture) { + TextureMap pottedTextures = usePottedTexture ? + BlockStateModelGenerator.CrossType.NOT_TINTED.getFlowerPotTextureMap(pottedPlant) : + BlockStateModelGenerator.CrossType.NOT_TINTED.getFlowerPotTextureMap(plant); + Identifier pottedModelId = BlockStateModelGenerator.CrossType.NOT_TINTED.getFlowerPotCrossModel() + .upload(pottedPlant, pottedTextures, generator.modelCollector); + generator.blockStateCollector.accept(BlockStateModelGenerator + .createSingletonBlockState(pottedPlant, pottedModelId)); + } + + private void registerPolyp(BlockStateModelGenerator generator, Block polyp) { + // Cribbed somewhat from BlockStateModelGenerator.registerCoralFan(), but with only one Block + // involved and downward orientation added, the variants are more like a dispenser... + TexturedModel floorPolypModel = TexturedModel.CORAL_FAN.get(polyp); + Identifier floorPolypId = floorPolypModel.upload(polyp, "_floor", generator.modelCollector); +// generator.blockStateCollector.accept(BlockStateModelGenerator.createSingletonBlockState(polyp, floorPolypId)); + Identifier wallPolypId = Models.CORAL_WALL_FAN + .upload(polyp, "_wall", floorPolypModel.getTextures(), generator.modelCollector); + + generator.blockStateCollector + .accept( + VariantsBlockStateSupplier.create(polyp) + .coordinate( + BlockStateVariantMap.create(PolypiteQuartzBlock.DIRECTION) + .register(Direction.DOWN, BlockStateVariant.create().put(VariantSettings.MODEL, floorPolypId)) + .register(Direction.UP, BlockStateVariant.create().put(VariantSettings.MODEL, floorPolypId).put(VariantSettings.X, VariantSettings.Rotation.R180)) + .register(Direction.NORTH, BlockStateVariant.create().put(VariantSettings.MODEL, wallPolypId).put(VariantSettings.Y, VariantSettings.Rotation.R180)) + .register(Direction.EAST, BlockStateVariant.create().put(VariantSettings.MODEL, wallPolypId).put(VariantSettings.Y, VariantSettings.Rotation.R270)) + .register(Direction.SOUTH, BlockStateVariant.create().put(VariantSettings.MODEL, wallPolypId)) + .register(Direction.WEST, BlockStateVariant.create().put(VariantSettings.MODEL, wallPolypId).put(VariantSettings.Y, VariantSettings.Rotation.R90)) + ) + ); + + generator.registerItemModel(polyp); + } + + private void registerCubeColumn(BlockStateModelGenerator generator, Block cubeColumn) { + // Put together from the hard-coded mess in BlockTexturePool that can only handle vanilla blocks + TexturedModel columnModel = TexturedModel.CUBE_COLUMN.get(cubeColumn) + .textures(textures -> textures.put(TextureKey.SIDE, TextureMap.getId(cubeColumn))); + Identifier modelId = columnModel.upload(cubeColumn, generator.modelCollector); + generator.blockStateCollector.accept(BlockStateModelGenerator.createSingletonBlockState(cubeColumn, modelId)); + } + + + /* + * Shorthand for registering just the item model of a block item which uses its block's model. + */ + private void registerBlockItemModel(BlockStateModelGenerator generator, Block block) { + generator.registerParentedItemModel(block, ModelIds.getBlockModelId(block)); + } + + private void uploadArmor(ItemModelGenerator generator, Identifier id, Identifier layer0, Identifier layer1) { + Models.GENERATED_TWO_LAYERS.upload(id, TextureMap.layered(layer0, layer1), generator.modelCollector); + } + + private void uploadArmor(ItemModelGenerator generator, Identifier id, Identifier layer0, Identifier layer1, Identifier layer2) { + Models.GENERATED_THREE_LAYERS.upload(id, TextureMap.layered(layer0, layer1, layer2), generator.modelCollector); + } + + private void registerArmorTrims(ItemModelGenerator generator, Item armor, RegistryKey equipmentKey, String armorType, boolean dyeable) { + Identifier armorModelId = ModelIds.getItemModelId(armor); + Identifier armorTextures = TextureMap.getId(armor); + Identifier armorOverlayTextures = TextureMap.getSubId(armor, "_overlay"); + for (ItemModelGenerator.TrimMaterial trimMaterial : TRIM_MATERIALS) { + Identifier trimmedModelId = Identifier.of(Cinderscapes.MOD_ID, + armorModelId.getPath()).withSuffixedPath("_" + trimMaterial.name() + "_trim"); + Identifier trimTextureId = Identifier.ofVanilla( + "trims/items/" + armorType + "_trim_" + trimMaterial.texture(equipmentKey)); + if (dyeable) { + this.uploadArmor(generator, trimmedModelId, armorTextures, armorOverlayTextures, trimTextureId); + } else { + this.uploadArmor(generator, trimmedModelId, armorTextures, trimTextureId); + } + } + } +} diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesRecipeProvider.java b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesRecipeProvider.java index e5167fa7..941c95b9 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesRecipeProvider.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesRecipeProvider.java @@ -1,24 +1,22 @@ package com.terraformersmc.cinderscapes.data; import com.terraformersmc.cinderscapes.Cinderscapes; +import com.terraformersmc.cinderscapes.init.CinderscapesBlockFamilies; import com.terraformersmc.cinderscapes.init.CinderscapesBlocks; import com.terraformersmc.cinderscapes.init.CinderscapesItems; import com.terraformersmc.cinderscapes.tag.CinderscapesItemTags; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; import net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags; -import net.minecraft.advancement.criterion.InventoryChangedCriterion; -import net.minecraft.data.server.recipe.RecipeExporter; -import net.minecraft.data.server.recipe.RecipeGenerator; -import net.minecraft.item.Item; +import net.minecraft.data.recipe.RecipeExporter; +import net.minecraft.data.recipe.RecipeGenerator; import net.minecraft.item.Items; -import net.minecraft.predicate.item.ItemPredicate; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.book.RecipeCategory; -import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.tag.ItemTags; -import net.minecraft.registry.tag.TagKey; +import net.minecraft.resource.featuretoggle.FeatureFlags; +import net.minecraft.resource.featuretoggle.FeatureSet; import net.minecraft.util.Identifier; import java.util.List; @@ -34,6 +32,9 @@ public RecipeGenerator getRecipeGenerator(RegistryWrapper.WrapperLookup registry return new RecipeGenerator(registryLookup, exporter) { @Override public void generate() { + // We don't really use feature sets, so this is good enough... + FeatureSet enabledFeatures = FeatureSet.of(FeatureFlags.VANILLA); + // vanilla recipes createShaped(RecipeCategory.REDSTONE, Items.COMPARATOR, 1) .pattern(" T ") @@ -42,7 +43,7 @@ public void generate() { .input('T', Items.REDSTONE_TORCH) .input('Q', ConventionalItemTags.QUARTZ_GEMS) .input('S', Items.STONE) - .criterion("has_quartz", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(registryLookup, ConventionalItemTags.QUARTZ_GEMS))) + .criterion("has_quartz", this.conditionsFromTag(ConventionalItemTags.QUARTZ_GEMS)) .offerTo(exporter); createShaped(RecipeCategory.REDSTONE, Items.DAYLIGHT_DETECTOR, 1) @@ -52,7 +53,7 @@ public void generate() { .input('G', Items.GLASS) .input('Q', ConventionalItemTags.QUARTZ_GEMS) .input('W', ItemTags.WOODEN_SLABS) - .criterion("has_quartz", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(registryLookup, ConventionalItemTags.QUARTZ_GEMS))) + .criterion("has_quartz", this.conditionsFromTag(ConventionalItemTags.QUARTZ_GEMS)) .offerTo(exporter); createShaped(RecipeCategory.REDSTONE, Items.OBSERVER, 1) @@ -62,7 +63,7 @@ public void generate() { .input('C', Items.COBBLESTONE) .input('Q', ConventionalItemTags.QUARTZ_GEMS) .input('R', Items.REDSTONE) - .criterion("has_quartz", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(registryLookup, ConventionalItemTags.QUARTZ_GEMS))) + .criterion("has_quartz", this.conditionsFromTag(ConventionalItemTags.QUARTZ_GEMS)) .offerTo(exporter); @@ -70,21 +71,21 @@ public void generate() { createShaped(RecipeCategory.DECORATIONS, CinderscapesBlocks.ASH, 6) .pattern("AAA") .input('A', CinderscapesBlocks.ASH_BLOCK) - .criterion("has_ash_blocks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.ASH_BLOCK)) + .criterion("has_ash_blocks", this.conditionsFromItem(CinderscapesBlocks.ASH_BLOCK)) .offerTo(exporter); createShaped(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ASH_BLOCK, 1) .pattern("aa") .pattern("aa") .input('a', CinderscapesItems.ASH_PILE) - .criterion("has_ash_piles", InventoryChangedCriterion.Conditions.items(CinderscapesItems.ASH_PILE)) + .criterion("has_ash_piles", this.conditionsFromItem(CinderscapesItems.ASH_PILE)) .offerTo(exporter); createShapeless(RecipeCategory.MISC, Items.GUNPOWDER, 1) .input(CinderscapesItemTags.SULFURS) .input(ItemTags.COALS) .input(Items.BONE_MEAL) - .criterion("has_sulfurs", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(registryLookup, CinderscapesItemTags.SULFURS))) + .criterion("has_sulfurs", this.conditionsFromTag(CinderscapesItemTags.SULFURS)) .offerTo(exporter); offerReversibleCompactingRecipes(RecipeCategory.MISC, @@ -111,7 +112,7 @@ public void generate() { .pattern("qq") .pattern("qq") .input('q', CinderscapesItems.ROSE_QUARTZ) - .criterion("has_quartz", InventoryChangedCriterion.Conditions.items(CinderscapesItems.ROSE_QUARTZ)) + .criterion("has_quartz", this.conditionsFromItem(CinderscapesItems.ROSE_QUARTZ)) .offerTo(exporter); offerPolishedStoneRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ROSE_QUARTZ_BRICKS, CinderscapesBlocks.ROSE_QUARTZ_BLOCK); offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ROSE_QUARTZ_BRICKS, CinderscapesBlocks.ROSE_QUARTZ_BLOCK); @@ -120,22 +121,22 @@ public void generate() { .pattern("Q") .pattern("Q") .input('Q', CinderscapesBlocks.ROSE_QUARTZ_BLOCK) - .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.ROSE_QUARTZ_BLOCK)) + .criterion("has_quartz_blocks", this.conditionsFromItem(CinderscapesBlocks.ROSE_QUARTZ_BLOCK)) .offerTo(exporter); offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ROSE_QUARTZ_PILLAR, CinderscapesBlocks.ROSE_QUARTZ_BLOCK); createSlabRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ROSE_QUARTZ_SLAB, Ingredient.ofItems(CinderscapesBlocks.CHISELED_ROSE_QUARTZ_BLOCK, CinderscapesBlocks.ROSE_QUARTZ_BLOCK, CinderscapesBlocks.ROSE_QUARTZ_PILLAR)) - .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(registryLookup, CinderscapesItemTags.ROSE_QUARTZ_CONVERTIBLES))) + .criterion("has_quartz_blocks", this.conditionsFromTag(CinderscapesItemTags.ROSE_QUARTZ_CONVERTIBLES)) .offerTo(exporter); offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ROSE_QUARTZ_SLAB, CinderscapesBlocks.ROSE_QUARTZ_BLOCK, 2); createStairsRecipe(CinderscapesBlocks.ROSE_QUARTZ_STAIRS, Ingredient.ofItems(CinderscapesBlocks.CHISELED_ROSE_QUARTZ_BLOCK, CinderscapesBlocks.ROSE_QUARTZ_BLOCK, CinderscapesBlocks.ROSE_QUARTZ_PILLAR)) - .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(registryLookup, CinderscapesItemTags.ROSE_QUARTZ_CONVERTIBLES))) + .criterion("has_quartz_blocks", this.conditionsFromTag(CinderscapesItemTags.ROSE_QUARTZ_CONVERTIBLES)) .offerTo(exporter); offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ROSE_QUARTZ_STAIRS, CinderscapesBlocks.ROSE_QUARTZ_BLOCK); offerSmelting(List.of(CinderscapesBlocks.ROSE_QUARTZ_BLOCK), RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_ROSE_QUARTZ, 0.1f, 200, "building_blocks"); offerSlabRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_ROSE_QUARTZ_SLAB, CinderscapesBlocks.SMOOTH_ROSE_QUARTZ); offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_ROSE_QUARTZ_SLAB, CinderscapesBlocks.SMOOTH_ROSE_QUARTZ, 2); createStairsRecipe(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ_STAIRS, Ingredient.ofItems(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ)) - .criterion("has_smooth_quartz", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ)) + .criterion("has_smooth_quartz", this.conditionsFromItem(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ)) .offerTo(exporter); offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_ROSE_QUARTZ_STAIRS, CinderscapesBlocks.SMOOTH_ROSE_QUARTZ); @@ -146,7 +147,7 @@ public void generate() { .pattern("qq") .pattern("qq") .input('q', CinderscapesItems.SMOKY_QUARTZ) - .criterion("has_quartz", InventoryChangedCriterion.Conditions.items(CinderscapesItems.SMOKY_QUARTZ)) + .criterion("has_quartz", this.conditionsFromItem(CinderscapesItems.SMOKY_QUARTZ)) .offerTo(exporter); offerPolishedStoneRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOKY_QUARTZ_BRICKS, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK); offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOKY_QUARTZ_BRICKS, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK); @@ -155,22 +156,22 @@ public void generate() { .pattern("Q") .pattern("Q") .input('Q', CinderscapesBlocks.SMOKY_QUARTZ_BLOCK) - .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SMOKY_QUARTZ_BLOCK)) + .criterion("has_quartz_blocks", this.conditionsFromItem(CinderscapesBlocks.SMOKY_QUARTZ_BLOCK)) .offerTo(exporter); offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOKY_QUARTZ_PILLAR, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK); createSlabRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOKY_QUARTZ_SLAB, Ingredient.ofItems(CinderscapesBlocks.CHISELED_SMOKY_QUARTZ_BLOCK, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK, CinderscapesBlocks.SMOKY_QUARTZ_PILLAR)) - .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(registryLookup, CinderscapesItemTags.SMOKY_QUARTZ_CONVERTIBLES))) + .criterion("has_quartz_blocks", this.conditionsFromTag(CinderscapesItemTags.SMOKY_QUARTZ_CONVERTIBLES)) .offerTo(exporter); offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOKY_QUARTZ_SLAB, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK, 2); createStairsRecipe(CinderscapesBlocks.SMOKY_QUARTZ_STAIRS, Ingredient.ofItems(CinderscapesBlocks.CHISELED_SMOKY_QUARTZ_BLOCK, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK, CinderscapesBlocks.SMOKY_QUARTZ_PILLAR)) - .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(registryLookup, CinderscapesItemTags.SMOKY_QUARTZ_CONVERTIBLES))) + .criterion("has_quartz_blocks", this.conditionsFromTag(CinderscapesItemTags.SMOKY_QUARTZ_CONVERTIBLES)) .offerTo(exporter); offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOKY_QUARTZ_STAIRS, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK); offerSmelting(List.of(CinderscapesBlocks.SMOKY_QUARTZ_BLOCK), RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ, 0.1f, 200, "building_blocks"); offerSlabRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ_SLAB, CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ); offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ_SLAB, CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ, 2); createStairsRecipe(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ_STAIRS, Ingredient.ofItems(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ)) - .criterion("has_smooth_quartz", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ)) + .criterion("has_smooth_quartz", this.conditionsFromItem(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ)) .offerTo(exporter); offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ_STAIRS, CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ); @@ -181,7 +182,7 @@ public void generate() { .pattern("qq") .pattern("qq") .input('q', CinderscapesItems.SULFUR_QUARTZ) - .criterion("has_quartz", InventoryChangedCriterion.Conditions.items(CinderscapesItems.SULFUR_QUARTZ)) + .criterion("has_quartz", this.conditionsFromItem(CinderscapesItems.SULFUR_QUARTZ)) .offerTo(exporter); offerPolishedStoneRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SULFUR_QUARTZ_BRICKS, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK); offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SULFUR_QUARTZ_BRICKS, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK); @@ -190,111 +191,45 @@ public void generate() { .pattern("Q") .pattern("Q") .input('Q', CinderscapesBlocks.SULFUR_QUARTZ_BLOCK) - .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SULFUR_QUARTZ_BLOCK)) + .criterion("has_quartz_blocks", this.conditionsFromItem(CinderscapesBlocks.SULFUR_QUARTZ_BLOCK)) .offerTo(exporter); offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SULFUR_QUARTZ_PILLAR, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK); createSlabRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SULFUR_QUARTZ_SLAB, Ingredient.ofItems(CinderscapesBlocks.CHISELED_SULFUR_QUARTZ_BLOCK, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK, CinderscapesBlocks.SULFUR_QUARTZ_PILLAR)) - .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(registryLookup, CinderscapesItemTags.SULFUR_QUARTZ_CONVERTIBLES))) + .criterion("has_quartz_blocks", this.conditionsFromTag(CinderscapesItemTags.SULFUR_QUARTZ_CONVERTIBLES)) .offerTo(exporter); offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SULFUR_QUARTZ_SLAB, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK, 2); createStairsRecipe(CinderscapesBlocks.SULFUR_QUARTZ_STAIRS, Ingredient.ofItems(CinderscapesBlocks.CHISELED_SULFUR_QUARTZ_BLOCK, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK, CinderscapesBlocks.SULFUR_QUARTZ_PILLAR)) - .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(registryLookup, CinderscapesItemTags.SULFUR_QUARTZ_CONVERTIBLES))) + .criterion("has_quartz_blocks", this.conditionsFromTag(CinderscapesItemTags.SULFUR_QUARTZ_CONVERTIBLES)) .offerTo(exporter); offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SULFUR_QUARTZ_STAIRS, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK); offerSmelting(List.of(CinderscapesBlocks.SULFUR_QUARTZ_BLOCK), RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ, 0.1f, 200, "building_blocks"); offerSlabRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ_SLAB, CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ); offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ_SLAB, CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ, 2); createStairsRecipe(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ_STAIRS, Ingredient.ofItems(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ)) - .criterion("has_smooth_quartz", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ)) + .criterion("has_smooth_quartz", this.conditionsFromItem(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ)) .offerTo(exporter); offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ_STAIRS, CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ); // wood recipes - offerSingleOutputShapelessRecipe(CinderscapesBlocks.SCORCHED_BUTTON, CinderscapesBlocks.SCORCHED_PLANKS, "redstone"); - createDoorRecipe(CinderscapesBlocks.SCORCHED_DOOR, Ingredient.ofItems(CinderscapesBlocks.SCORCHED_PLANKS)) - .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SCORCHED_PLANKS)) - .offerTo(exporter); - createFenceRecipe(CinderscapesBlocks.SCORCHED_FENCE, Ingredient.ofItems(CinderscapesBlocks.SCORCHED_PLANKS)) - .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SCORCHED_PLANKS)) - .offerTo(exporter); - createFenceGateRecipe(CinderscapesBlocks.SCORCHED_FENCE_GATE, Ingredient.ofItems(CinderscapesBlocks.SCORCHED_PLANKS)) - .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SCORCHED_PLANKS)) - .offerTo(exporter); - offerHangingSignRecipe(CinderscapesItems.SCORCHED_HANGING_SIGN, CinderscapesBlocks.STRIPPED_SCORCHED_STEM); - createShaped(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SCORCHED_HYPHAE, 3) - .group("bark") - .pattern("LL") - .pattern("LL") - .input('L', CinderscapesBlocks.SCORCHED_STEM) - .criterion("has_logs", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SCORCHED_STEM)) - .offerTo(exporter); + generateFamily(CinderscapesBlockFamilies.SCORCHED, enabledFeatures); offerPlanksRecipe(CinderscapesBlocks.SCORCHED_PLANKS, CinderscapesItemTags.SCORCHED_STEMS, 4); - offerPressurePlateRecipe(CinderscapesBlocks.SCORCHED_PRESSURE_PLATE, CinderscapesBlocks.SCORCHED_PLANKS); - createSignRecipe(CinderscapesItems.SCORCHED_SIGN, Ingredient.ofItems(CinderscapesBlocks.SCORCHED_PLANKS)) - .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SCORCHED_PLANKS)) - .offerTo(exporter); - offerSlabRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SCORCHED_SLAB, CinderscapesBlocks.SCORCHED_PLANKS); - createStairsRecipe(CinderscapesBlocks.SCORCHED_STAIRS, Ingredient.ofItems(CinderscapesBlocks.SCORCHED_PLANKS)) - .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SCORCHED_PLANKS)) - .offerTo(exporter); - createTrapdoorRecipe(CinderscapesBlocks.SCORCHED_TRAPDOOR, Ingredient.ofItems(CinderscapesBlocks.SCORCHED_PLANKS)) - .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SCORCHED_PLANKS)) - .offerTo(exporter); - createShaped(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.STRIPPED_SCORCHED_HYPHAE, 3) - .group("bark") - .pattern("LL") - .pattern("LL") - .input('L', CinderscapesBlocks.STRIPPED_SCORCHED_STEM) - .criterion("has_logs", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.STRIPPED_SCORCHED_STEM)) - .offerTo(exporter); + offerBarkBlockRecipe(CinderscapesBlocks.SCORCHED_HYPHAE, CinderscapesBlocks.SCORCHED_STEM); + offerBarkBlockRecipe(CinderscapesBlocks.STRIPPED_SCORCHED_HYPHAE, CinderscapesBlocks.STRIPPED_SCORCHED_STEM); + // (no scorched boat at this time) + offerHangingSignRecipe(CinderscapesItems.SCORCHED_HANGING_SIGN, CinderscapesBlocks.STRIPPED_SCORCHED_STEM); - offerSingleOutputShapelessRecipe(CinderscapesBlocks.UMBRAL_BUTTON, CinderscapesBlocks.UMBRAL_PLANKS, "redstone"); - createDoorRecipe(CinderscapesBlocks.UMBRAL_DOOR, Ingredient.ofItems(CinderscapesBlocks.UMBRAL_PLANKS)) - .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.UMBRAL_PLANKS)) - .offerTo(exporter); - createFenceRecipe(CinderscapesBlocks.UMBRAL_FENCE, Ingredient.ofItems(CinderscapesBlocks.UMBRAL_PLANKS)) - .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.UMBRAL_PLANKS)) - .offerTo(exporter); - createFenceGateRecipe(CinderscapesBlocks.UMBRAL_FENCE_GATE, Ingredient.ofItems(CinderscapesBlocks.UMBRAL_PLANKS)) - .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.UMBRAL_PLANKS)) - .offerTo(exporter); - offerHangingSignRecipe(CinderscapesItems.UMBRAL_HANGING_SIGN, CinderscapesBlocks.STRIPPED_UMBRAL_STEM); - createShaped(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.UMBRAL_HYPHAE, 3) - .group("bark") - .pattern("LL") - .pattern("LL") - .input('L', CinderscapesBlocks.UMBRAL_STEM) - .criterion("has_logs", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.UMBRAL_STEM)) - .offerTo(exporter); + generateFamily(CinderscapesBlockFamilies.UMBRAL, enabledFeatures); offerPlanksRecipe(CinderscapesBlocks.UMBRAL_PLANKS, CinderscapesItemTags.UMBRAL_STEMS, 4); - offerPressurePlateRecipe(CinderscapesBlocks.UMBRAL_PRESSURE_PLATE, CinderscapesBlocks.UMBRAL_PLANKS); - createSignRecipe(CinderscapesItems.UMBRAL_SIGN, Ingredient.ofItems(CinderscapesBlocks.UMBRAL_PLANKS)) - .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.UMBRAL_PLANKS)) - .offerTo(exporter); - offerSlabRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.UMBRAL_SLAB, CinderscapesBlocks.UMBRAL_PLANKS); - createStairsRecipe(CinderscapesBlocks.UMBRAL_STAIRS, Ingredient.ofItems(CinderscapesBlocks.UMBRAL_PLANKS)) - .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.UMBRAL_PLANKS)) - .offerTo(exporter); - createTrapdoorRecipe(CinderscapesBlocks.UMBRAL_TRAPDOOR, Ingredient.ofItems(CinderscapesBlocks.UMBRAL_PLANKS)) - .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.UMBRAL_PLANKS)) - .offerTo(exporter); - createShaped(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.STRIPPED_UMBRAL_HYPHAE, 3) - .group("bark") - .pattern("LL") - .pattern("LL") - .input('L', CinderscapesBlocks.STRIPPED_UMBRAL_STEM) - .criterion("has_logs", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.STRIPPED_UMBRAL_STEM)) - .offerTo(exporter); - } - - // Returns an ItemPredicate matching any item in the provided ItemTag key. - private static ItemPredicate getItemTagPredicate(RegistryWrapper.WrapperLookup registryLookup, TagKey itemTagKey) { - return ItemPredicate.Builder.create().tag(registryLookup.getOrThrow(RegistryKeys.ITEM), itemTagKey).build(); + offerBarkBlockRecipe(CinderscapesBlocks.UMBRAL_HYPHAE, CinderscapesBlocks.UMBRAL_STEM); + offerBarkBlockRecipe(CinderscapesBlocks.STRIPPED_UMBRAL_HYPHAE, CinderscapesBlocks.STRIPPED_UMBRAL_STEM); + // (no umbral boat at this time) + offerHangingSignRecipe(CinderscapesItems.UMBRAL_HANGING_SIGN, CinderscapesBlocks.STRIPPED_UMBRAL_STEM); } }; } + @Override public String getName() { return "Cinderscapes Recipes"; diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesArmorTrimMaterials.java b/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesArmorTrimMaterials.java index ba55495f..95f2f750 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesArmorTrimMaterials.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesArmorTrimMaterials.java @@ -9,15 +9,19 @@ import net.minecraft.text.Style; import net.minecraft.util.Identifier; +import java.util.List; + public class CinderscapesArmorTrimMaterials { - public static final RegistryKey ROSE_QUARTZ = createRegistryKey("rose_quartz"); - public static final RegistryKey SMOKY_QUARTZ = createRegistryKey("smoky_quartz"); - public static final RegistryKey SULFUR_QUARTZ = createRegistryKey("sulfur_quartz"); + public static final List TRIM_MATERIALS = List.of("cinderscapes_rose_quartz", "cinderscapes_smoky_quartz", "cinderscapes_sulfur_quartz"); + + public static final RegistryKey ROSE_QUARTZ = createRegistryKey("cinderscapes_rose_quartz"); + public static final RegistryKey SMOKY_QUARTZ = createRegistryKey("cinderscapes_smoky_quartz"); + public static final RegistryKey SULFUR_QUARTZ = createRegistryKey("cinderscapes_sulfur_quartz"); public static void bootstrap(Registerable registerable) { - ArmorTrimMaterials.register(registerable, ROSE_QUARTZ, CinderscapesItems.ROSE_QUARTZ, Style.EMPTY.withColor(0xE77391), 0.40666f); - ArmorTrimMaterials.register(registerable, SMOKY_QUARTZ, CinderscapesItems.SMOKY_QUARTZ, Style.EMPTY.withColor(0x5a4b46), 0.30666f); - ArmorTrimMaterials.register(registerable, SULFUR_QUARTZ, CinderscapesItems.SULFUR_QUARTZ, Style.EMPTY.withColor(0xbaa938), 0.60666f); + ArmorTrimMaterials.register(registerable, ROSE_QUARTZ, CinderscapesItems.ROSE_QUARTZ, Style.EMPTY.withColor(0xE77391)); + ArmorTrimMaterials.register(registerable, SMOKY_QUARTZ, CinderscapesItems.SMOKY_QUARTZ, Style.EMPTY.withColor(0x5a4b46)); + ArmorTrimMaterials.register(registerable, SULFUR_QUARTZ, CinderscapesItems.SULFUR_QUARTZ, Style.EMPTY.withColor(0xbaa938)); } private static RegistryKey createRegistryKey(String id) { diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesBlockFamilies.java b/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesBlockFamilies.java new file mode 100644 index 00000000..65718c6c --- /dev/null +++ b/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesBlockFamilies.java @@ -0,0 +1,69 @@ +package com.terraformersmc.cinderscapes.init; + +import net.minecraft.data.family.BlockFamilies; +import net.minecraft.data.family.BlockFamily; + +public class CinderscapesBlockFamilies { + // Wood + public static final BlockFamily SCORCHED = BlockFamilies.register(CinderscapesBlocks.SCORCHED_PLANKS) + .button(CinderscapesBlocks.SCORCHED_BUTTON) + .fence(CinderscapesBlocks.SCORCHED_FENCE) + .fenceGate(CinderscapesBlocks.SCORCHED_FENCE_GATE) + .pressurePlate(CinderscapesBlocks.SCORCHED_PRESSURE_PLATE) + .sign(CinderscapesBlocks.SCORCHED_SIGN, CinderscapesBlocks.SCORCHED_WALL_SIGN) + .slab(CinderscapesBlocks.SCORCHED_SLAB) + .stairs(CinderscapesBlocks.SCORCHED_STAIRS) + .door(CinderscapesBlocks.SCORCHED_DOOR) + .trapdoor(CinderscapesBlocks.SCORCHED_TRAPDOOR) + .group("wooden") + .unlockCriterionName("has_planks") + .build(); + public static final BlockFamily UMBRAL = BlockFamilies.register(CinderscapesBlocks.UMBRAL_PLANKS) + .button(CinderscapesBlocks.UMBRAL_BUTTON) + .fence(CinderscapesBlocks.UMBRAL_FENCE) + .fenceGate(CinderscapesBlocks.UMBRAL_FENCE_GATE) + .pressurePlate(CinderscapesBlocks.UMBRAL_PRESSURE_PLATE) + .sign(CinderscapesBlocks.UMBRAL_SIGN, CinderscapesBlocks.UMBRAL_WALL_SIGN) + .slab(CinderscapesBlocks.UMBRAL_SLAB) + .stairs(CinderscapesBlocks.UMBRAL_STAIRS) + .door(CinderscapesBlocks.UMBRAL_DOOR) + .trapdoor(CinderscapesBlocks.UMBRAL_TRAPDOOR) + .group("wooden") + .unlockCriterionName("has_planks") + .build(); + + // Quartz + public static final BlockFamily ROSE_QUARTZ_BLOCK = BlockFamilies.register(CinderscapesBlocks.ROSE_QUARTZ_BLOCK) + .stairs(CinderscapesBlocks.ROSE_QUARTZ_STAIRS) + .slab(CinderscapesBlocks.ROSE_QUARTZ_SLAB) + // breaks model gen + //.chiseled(CinderscapesBlocks.CHISELED_ROSE_QUARTZ_BLOCK) + .noGenerateRecipes() + .build(); + public static final BlockFamily SMOOTH_ROSE_QUARTZ = BlockFamilies.register(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ) + .stairs(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ_STAIRS) + .slab(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ_SLAB) + .build(); + public static final BlockFamily SMOKY_QUARTZ_BLOCK = BlockFamilies.register(CinderscapesBlocks.SMOKY_QUARTZ_BLOCK) + .stairs(CinderscapesBlocks.SMOKY_QUARTZ_STAIRS) + .slab(CinderscapesBlocks.SMOKY_QUARTZ_SLAB) + // breaks model gen + //.chiseled(CinderscapesBlocks.CHISELED_SMOKY_QUARTZ_BLOCK) + .noGenerateRecipes() + .build(); + public static final BlockFamily SMOOTH_SMOKY_QUARTZ = BlockFamilies.register(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ) + .stairs(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ_STAIRS) + .slab(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ_SLAB) + .build(); + public static final BlockFamily SULFUR_QUARTZ_BLOCK = BlockFamilies.register(CinderscapesBlocks.SULFUR_QUARTZ_BLOCK) + .stairs(CinderscapesBlocks.SULFUR_QUARTZ_STAIRS) + .slab(CinderscapesBlocks.SULFUR_QUARTZ_SLAB) + // breaks model gen + //.chiseled(CinderscapesBlocks.CHISELED_SULFUR_QUARTZ_BLOCK) + .noGenerateRecipes() + .build(); + public static final BlockFamily SMOOTH_SULFUR_QUARTZ = BlockFamilies.register(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ) + .stairs(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ_STAIRS) + .slab(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ_SLAB) + .build(); +} diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesItems.java b/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesItems.java index 7b9effe0..563e0d16 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesItems.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesItems.java @@ -186,8 +186,8 @@ public static void init() { SCORCHED_BUTTON = CinderscapesRegistry.registerBlockItem("scorched_button", CinderscapesBlocks.SCORCHED_BUTTON); SCORCHED_DOOR = CinderscapesRegistry.registerBlockItem("scorched_door", CinderscapesBlocks.SCORCHED_DOOR); - SCORCHED_SIGN = CinderscapesRegistry.register("scorched_sign", settings -> new SignItem(CinderscapesBlocks.SCORCHED_SIGN, CinderscapesBlocks.SCORCHED_WALL_SIGN, settings), new Item.Settings().maxCount(16)); - SCORCHED_HANGING_SIGN = CinderscapesRegistry.register("scorched_hanging_sign", settings -> new HangingSignItem(CinderscapesBlocks.SCORCHED_HANGING_SIGN, CinderscapesBlocks.SCORCHED_WALL_HANGING_SIGN, settings), new Item.Settings().maxCount(16)); + SCORCHED_SIGN = CinderscapesRegistry.register("scorched_sign", settings -> new SignItem(CinderscapesBlocks.SCORCHED_SIGN, CinderscapesBlocks.SCORCHED_WALL_SIGN, settings), new Item.Settings().maxCount(16).useBlockPrefixedTranslationKey()); + SCORCHED_HANGING_SIGN = CinderscapesRegistry.register("scorched_hanging_sign", settings -> new HangingSignItem(CinderscapesBlocks.SCORCHED_HANGING_SIGN, CinderscapesBlocks.SCORCHED_WALL_HANGING_SIGN, settings), new Item.Settings().maxCount(16).useBlockPrefixedTranslationKey()); SCORCHED_SHRUB = CinderscapesRegistry.registerBlockItem("scorched_shrub", CinderscapesBlocks.SCORCHED_SHRUB); SCORCHED_SPROUTS = CinderscapesRegistry.registerBlockItem("scorched_sprouts", CinderscapesBlocks.SCORCHED_SPROUTS); @@ -227,8 +227,8 @@ public static void init() { UMBRAL_BUTTON = CinderscapesRegistry.registerBlockItem("umbral_button", CinderscapesBlocks.UMBRAL_BUTTON); UMBRAL_DOOR = CinderscapesRegistry.registerBlockItem("umbral_door", CinderscapesBlocks.UMBRAL_DOOR); - UMBRAL_SIGN = CinderscapesRegistry.register("umbral_sign", settings -> new SignItem(CinderscapesBlocks.UMBRAL_SIGN, CinderscapesBlocks.UMBRAL_WALL_SIGN, settings), new Item.Settings().maxCount(16)); - UMBRAL_HANGING_SIGN = CinderscapesRegistry.register("umbral_hanging_sign", settings -> new HangingSignItem(CinderscapesBlocks.UMBRAL_HANGING_SIGN, CinderscapesBlocks.UMBRAL_WALL_HANGING_SIGN, settings), new Item.Settings().maxCount(16)); + UMBRAL_SIGN = CinderscapesRegistry.register("umbral_sign", settings -> new SignItem(CinderscapesBlocks.UMBRAL_SIGN, CinderscapesBlocks.UMBRAL_WALL_SIGN, settings), new Item.Settings().maxCount(16).useBlockPrefixedTranslationKey()); + UMBRAL_HANGING_SIGN = CinderscapesRegistry.register("umbral_hanging_sign", settings -> new HangingSignItem(CinderscapesBlocks.UMBRAL_HANGING_SIGN, CinderscapesBlocks.UMBRAL_WALL_HANGING_SIGN, settings), new Item.Settings().maxCount(16).useBlockPrefixedTranslationKey()); // Other diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesRegistryAliases.java b/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesRegistryAliases.java new file mode 100644 index 00000000..a27a2566 --- /dev/null +++ b/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesRegistryAliases.java @@ -0,0 +1,43 @@ +package com.terraformersmc.cinderscapes.init; + +import com.terraformersmc.cinderscapes.Cinderscapes; +import net.fabricmc.fabric.api.event.registry.DynamicRegistrySetupCallback; +import net.minecraft.item.equipment.trim.ArmorTrimMaterial; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.Identifier; + +import java.util.Map; + +public final class CinderscapesRegistryAliases { + @SuppressWarnings("UnnecessaryReturnStatement") + private CinderscapesRegistryAliases() { + return; + } + + // Use Fabric registry aliases to repair identifier changes + public static void init() { + registerStatic(); + DynamicRegistrySetupCallback.EVENT.register(listener -> listener + .getOptional(RegistryKeys.TRIM_MATERIAL) + .ifPresent(CinderscapesRegistryAliases::registerTrimMaterials)); + } + + private static void registerStatic() { + } + + private static void registerTrimMaterials(Registry trimMaterialRegistry) { + // Armor Trims + Map TRIMS = Map.ofEntries( + entry("rose_quartz", "cinderscapes_rose_quartz"), + entry("smoky_quartz", "cinderscapes_smoky_quartz"), + entry("sulfur_quartz", "cinderscapes_sulfur_quartz") + ); + Cinderscapes.LOGGER.warn("Any alias warnings about trim_material which follow this message are harmless."); + TRIMS.forEach(trimMaterialRegistry::addAlias); + } + + private static Map.Entry entry(String oldName, String newName) { + return Map.entry(Identifier.of(Cinderscapes.MOD_ID, oldName), Identifier.of(Cinderscapes.MOD_ID, newName)); + } +} diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/init/helpers/CinderscapesRegistry.java b/common/src/main/java/com/terraformersmc/cinderscapes/init/helpers/CinderscapesRegistry.java index 96eb8ae7..42ce3c04 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/init/helpers/CinderscapesRegistry.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/init/helpers/CinderscapesRegistry.java @@ -26,17 +26,22 @@ private CinderscapesRegistry() { /** * Registers a block item and associates it with its block. * + * This method applies {@code settings.useBlockPrefixedTranslationKey()}. + * * @param name Name ({@link Identifier} path string) of the block item * @param block {@link Block} to associate to the block item * @return Newly created {@link BlockItem} */ public static BlockItem registerBlockItem(String name, Block block) { - return register(name, settings -> new BlockItem(block, settings), new Item.Settings()); + return register(name, settings -> new BlockItem(block, settings), new Item.Settings().useBlockPrefixedTranslationKey()); } /** * Registers an item. * + * When using this method directly, the caller should apply + * {@code settings.useBlockPrefixedTranslationKey()} if desired. + * * @param name Name ({@link Identifier} path string) of the item * @param factory Factory function to create {@link Item} from settings * @param settings {@link Item.Settings} of the item diff --git a/common/src/main/resources/cinderscapes-common.accesswidener b/common/src/main/resources/cinderscapes-common.accesswidener index 6c9e66c8..12e4dab6 100644 --- a/common/src/main/resources/cinderscapes-common.accesswidener +++ b/common/src/main/resources/cinderscapes-common.accesswidener @@ -1,8 +1,10 @@ accessWidener v1 named +accessible field net/minecraft/client/data/ItemModelGenerator$TrimMaterial materialKey Lnet/minecraft/registry/RegistryKey; +accessible method net/minecraft/client/data/ItemModelGenerator$TrimMaterial (Ljava/lang/String;Lnet/minecraft/registry/RegistryKey;Ljava/util/Map;)V accessible method net/minecraft/entity/SpawnRestriction register (Lnet/minecraft/entity/EntityType;Lnet/minecraft/entity/SpawnLocation;Lnet/minecraft/world/Heightmap$Type;Lnet/minecraft/entity/SpawnRestriction$SpawnPredicate;)V -accessible method net/minecraft/item/equipment/trim/ArmorTrimMaterials register (Lnet/minecraft/registry/Registerable;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/item/Item;Lnet/minecraft/text/Style;F)V -accessible method net/minecraft/item/equipment/trim/ArmorTrimMaterials register (Lnet/minecraft/registry/Registerable;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/item/Item;Lnet/minecraft/text/Style;FLjava/util/Map;)V +accessible method net/minecraft/item/equipment/trim/ArmorTrimMaterials register (Lnet/minecraft/registry/Registerable;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/item/Item;Lnet/minecraft/text/Style;)V +accessible method net/minecraft/item/equipment/trim/ArmorTrimMaterials register (Lnet/minecraft/registry/Registerable;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/item/Item;Lnet/minecraft/text/Style;Ljava/util/Map;)V accessible method net/minecraft/util/math/Vec3i setX (I)Lnet/minecraft/util/math/Vec3i; accessible method net/minecraft/util/math/Vec3i setY (I)Lnet/minecraft/util/math/Vec3i; accessible method net/minecraft/util/math/Vec3i setZ (I)Lnet/minecraft/util/math/Vec3i; diff --git a/gradle.properties b/gradle.properties index 216728dd..4af7de1b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,23 +3,24 @@ org.gradle.jvmargs=-Xmx1G maven_group=com.terraformersmc archive_name=cinderscapes -minecraft_version=1.21.2 -yarn_mappings=1.21.2+build.1 -loader_version=0.16.7 -fabric_version=0.106.1+1.21.2 +minecraft_version=1.21.4 +yarn_mappings=1.21.4+build.8 +loader_version=0.16.9 +fabric_version=0.114.1+1.21.4 # Terraform modules -terraform_biome_remapper_api_version=12.0.0-alpha.2 -terraform_shapes_api_version=12.0.0-alpha.2 -terraform_surfaces_api_version=12.0.0-alpha.2 -terraform_wood_api_version=12.0.0-alpha.2 +terraform_biome_remapper_api_version=13.0.0-alpha.2 +terraform_shapes_api_version=13.0.0-alpha.2 +terraform_surfaces_api_version=13.0.0-alpha.2 +terraform_wood_api_version=13.0.0-alpha.2 # Biolith for worldgen module and testing -biolith_version=3.1.0 +biolith_version=3.2.0 # Other Things -clothconfig_version=16.0.141 -modmenu_version=12.0.0-beta.1 +clothconfig_version=17.0.144 +mixson_version=v0.1.4-fabric +modmenu_version=13.0.0 vistas_version=2.8.0 # Project Metadata @@ -33,14 +34,14 @@ default_release_type=stable # CurseForge Metadata curseforge_slug=cinderscapes curseforge_id=391429 -curseforge_game_versions=1.21.2, 1.21.3, Fabric, Quilt +curseforge_game_versions=1.21.4, Fabric, Quilt curseforge_required_dependencies=fabric-api curseforge_optional_dependencies= # Modrinth Metadata modrinth_slug=cinderscapes modrinth_id=QC4wcUXZ -modrinth_game_versions=1.21.2, 1.21.3 +modrinth_game_versions=1.21.4 modrinth_mod_loaders=fabric, quilt #modrinth_embedded_dependencies=biolith diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f..e6441136 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0d184210..e2847c82 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c7873..b740cf13 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +214,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f9..7101f8e4 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 87babacc..a7340cb5 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -37,7 +37,7 @@ "depends": { "fabricloader": ">=0.15.3", "fabric-api": ">=0.77.0", - "minecraft": ">=1.21.2 <1.22", + "minecraft": ">=1.21.4 <1.22", "cloth-config": "*" } }