diff --git a/.gitignore b/.gitignore index c476faf2..c639bafd 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ hs_err_*.log replay_*.log *.hprof *.jfr +/src/main/generated/.cache/ diff --git a/LICENSE.md b/LICENSE.md index b85f602e..efc145dc 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -17,6 +17,8 @@ 7. Configuration files, which refers to 1. Files ending in `.yml`, `.toml`, and `.mcmeta` 2. Files named `fabric.mod.json` or `mods.toml` or `quilt.mod.json` +8. Exceptions are: + 1. Files ending in `.nbt` ### 1. Code Per the definitions above, Code is licensed under the “MIT” License, found below diff --git a/README.md b/README.md index 2113171f..474ca872 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,16 @@ # Sculk Depths +#### We are looking for developers and artists (non paid we don't make money yet) +#### Interested? join our discord: https://discord.gg/dxANwW23Ub + # Important Notes - This mods depends on Geckolib - The 1.20 release no longer supports worlds created with older versions. The file "biome3.json" has been removed, causing biome3 to revert to plains. This change does not affect the 1.19 releases, where this biome will continue to be supported (for now). # ABOUT +[Wiki](https://github.com/warior456/Sculk-Depths/wiki) + This mod adds a new dimension called "Sculk Depths" to Minecraft. To access this dimension, follow these steps: @@ -23,12 +28,17 @@ When entering this dimension, it is recommended to bring a netherite pickaxe as - New dimension with custom world generation. - Four new biomes. -- A new structure (work in progress). +- 2 New Structures: + - A Laboratory + - An underground Lab - A new hostile mob: The Glomper. It attacks players using an elytra, so be careful while flying around! - Energy Essence drops when the warden kills a passive mob or when the warden is killed, this is used to craft an Energized Flint and Steel to open the portal. - Energized Flint and Steel: can light most blocks with Soul Fire and lights the portal - new blocks: - Cephlera Light + - Flumrock Cauldron + - Zygrin Light + - Zygrin Flow Block - Nine new block sets: - Umbrusk (stone type) - Umbrusk Bricks @@ -49,7 +59,8 @@ When entering this dimension, it is recommended to bring a netherite pickaxe as ![image](https://user-images.githubusercontent.com/66562258/226136978-d1683dd1-d642-4cae-a204-0a92fb0ad2ba.png) ![image](https://user-images.githubusercontent.com/66562258/226213541-25528269-7c6c-46cd-8c4e-f0bab01fd724.png) ![image](https://user-images.githubusercontent.com/66562258/227038354-7217dba3-a006-4754-badc-6ff53b1db8f1.png) - ![image](https://user-images.githubusercontent.com/66562258/229311855-a1c336c4-e892-4e58-99d7-cd6cbe91376b.png) + ![image](https://github.com/warior456/Sculk-Depths/assets/66562258/5c4b29a9-0670-4d8c-be8e-60e0255e51b8) + ![image](https://github.com/warior456/Sculk-Depths/assets/66562258/90f1eb2c-3cb5-423f-913c-5021326b142a) ![image](https://github.com/warior456/Sculk-Depths/assets/66562258/cd48ee13-0355-4928-86b3-0ba684f9d54d) diff --git a/build.gradle b/build.gradle index ed43e8ba..0e02ab98 100644 --- a/build.gradle +++ b/build.gradle @@ -91,3 +91,33 @@ publishing { // retrieving dependencies. } } + +loom { + runs { + // + // This adds a new gradle task that runs the datagen API: "gradlew runDatagenClient" + // + datagenClient { + inherit client + name "Data Generation" + vmArg "-Dfabric-api.datagen" + vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/generated")}" + vmArg "-Dfabric-api.datagen.modid=${archives_base_name}" + + runDir "build/datagen" + } + } +} + +// +// Adds the generated files into the jar you distribute to players. +// +sourceSets { + main { + resources { + srcDirs += [ + 'src/main/generated' + ] + } + } +} diff --git a/gradle.properties b/gradle.properties index 2e5b7f9a..08bfb250 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ org.gradle.parallel=true loader_version=0.14.21 # Mod Properties - mod_version = 0.0.7 + mod_version = 0.0.8 maven_group = com.example archives_base_name = sculk_depths diff --git a/src/main/generated/data/sculk_depths/loot_tables/blocks/dried_valtrox_pressure_plate.json b/src/main/generated/data/sculk_depths/loot_tables/blocks/dried_valtrox_pressure_plate.json new file mode 100644 index 00000000..22a8850a --- /dev/null +++ b/src/main/generated/data/sculk_depths/loot_tables/blocks/dried_valtrox_pressure_plate.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "sculk_depths:dried_valtrox_pressure_plate" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/sculk_depths/loot_tables/blocks/petrified_valtrox_pressure_plate.json b/src/main/generated/data/sculk_depths/loot_tables/blocks/petrified_valtrox_pressure_plate.json new file mode 100644 index 00000000..6b2e0873 --- /dev/null +++ b/src/main/generated/data/sculk_depths/loot_tables/blocks/petrified_valtrox_pressure_plate.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "sculk_depths:petrified_valtrox_pressure_plate" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/sculk_depths/loot_tables/blocks/valtrox_pressure_plate.json b/src/main/generated/data/sculk_depths/loot_tables/blocks/valtrox_pressure_plate.json new file mode 100644 index 00000000..f2850d23 --- /dev/null +++ b/src/main/generated/data/sculk_depths/loot_tables/blocks/valtrox_pressure_plate.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "sculk_depths:valtrox_pressure_plate" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/java/net/ugi/sculk_depths/SculkDepths.java b/src/main/java/net/ugi/sculk_depths/SculkDepths.java index 91f211a9..fac939f8 100644 --- a/src/main/java/net/ugi/sculk_depths/SculkDepths.java +++ b/src/main/java/net/ugi/sculk_depths/SculkDepths.java @@ -2,16 +2,17 @@ import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; -import net.minecraft.sound.SoundEvent; -import net.minecraft.util.Identifier; +import net.ugi.sculk_depths.block.ModBlockEntities; import net.ugi.sculk_depths.block.ModBlocks; +import net.ugi.sculk_depths.block.custom.ModCauldron.ModCauldronBehavior; +import net.ugi.sculk_depths.config.Config; +import net.ugi.sculk_depths.config.ConfigHandler; import net.ugi.sculk_depths.entity.ModEntities; import net.ugi.sculk_depths.entity.custom.GlomperEntity; import net.ugi.sculk_depths.item.ModItemGroup; import net.ugi.sculk_depths.item.ModItems; import net.ugi.sculk_depths.portal.Portals; +import net.ugi.sculk_depths.recipe.ModRecipes; import net.ugi.sculk_depths.sound.ModSounds; import net.ugi.sculk_depths.util.ModLootTableModifiers; import org.slf4j.Logger; @@ -19,6 +20,7 @@ public class SculkDepths implements ModInitializer { public static final String MOD_ID = "sculk_depths"; + public static ConfigHandler CONFIG; public static final Logger LOGGER = LoggerFactory.getLogger("sculk_depths"); @@ -27,14 +29,29 @@ public class SculkDepths implements ModInitializer { @Override public void onInitialize() { + SculkDepths.LOGGER.info("Loading Config for " + SculkDepths.MOD_ID); + Config.loadConfig(); + SculkDepths.LOGGER.info("Registering Itemgroups for " + SculkDepths.MOD_ID); ModItemGroup.registerItemgroups(); + SculkDepths.LOGGER.info("Registering items for " + SculkDepths.MOD_ID); ModItems.registerModItems(); + SculkDepths.LOGGER.info("Registering Blocks for " + SculkDepths.MOD_ID); ModBlocks.registerModBlocks(); + SculkDepths.LOGGER.info("Registering Portals for " + SculkDepths.MOD_ID); Portals.registerModPortals(); + SculkDepths.LOGGER.info("Registering Sounds for " + SculkDepths.MOD_ID); ModSounds.registerModSounds(); + SculkDepths.LOGGER.info("Registering LootTables for " + SculkDepths.MOD_ID); ModLootTableModifiers.modifyLootTables(); + SculkDepths.LOGGER.info("Registering ModCauldronBehavior for " + SculkDepths.MOD_ID); + ModCauldronBehavior.registerBehavior(); + //SculkDepths.LOGGER.info("Registering Recipes for " + SculkDepths.MOD_ID); + //ModRecipes.register(); + //SculkDepths.LOGGER.info("Registering BlockEntities for " + SculkDepths.MOD_ID); + //ModBlockEntities.registerBlockEntities(); + SculkDepths.LOGGER.info("Registering Entities for " + SculkDepths.MOD_ID); FabricDefaultAttributeRegistry.register(ModEntities.GLOMPER, GlomperEntity.setAttributes()); - LOGGER.info("sculk_depths has loaded"); + LOGGER.info(SculkDepths.MOD_ID + " has loaded"); } } diff --git a/src/main/java/net/ugi/sculk_depths/SculkDepthsClient.java b/src/main/java/net/ugi/sculk_depths/SculkDepthsClient.java index 39495a94..6d461a5e 100644 --- a/src/main/java/net/ugi/sculk_depths/SculkDepthsClient.java +++ b/src/main/java/net/ugi/sculk_depths/SculkDepthsClient.java @@ -31,6 +31,7 @@ public void onInitializeClient() { BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.CEPHLERA, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.CEPHLERA_LIGHT, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.SOUL_FIRE, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.WHITE_CRYSTAL, RenderLayer.getTranslucent()); } } \ No newline at end of file diff --git a/src/main/java/net/ugi/sculk_depths/SculkDepthsDataGenerator.java b/src/main/java/net/ugi/sculk_depths/SculkDepthsDataGenerator.java index b7571731..78c1dd8f 100644 --- a/src/main/java/net/ugi/sculk_depths/SculkDepthsDataGenerator.java +++ b/src/main/java/net/ugi/sculk_depths/SculkDepthsDataGenerator.java @@ -2,17 +2,18 @@ import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; - -import net.ugi.sculk_depths.datagen.ModModelProvider; +import net.ugi.sculk_depths.datagen.ModLootTableGenerator; +import net.ugi.sculk_depths.datagen.ModModelGenerator; public class SculkDepthsDataGenerator implements DataGeneratorEntrypoint { + @Override public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { FabricDataGenerator.Pack pack = fabricDataGenerator.createPack(); - //pack.addProvider(ModLootTableGenerator::new); + pack.addProvider(ModLootTableGenerator::new); //pack.addProvider(ModRecipeGenerator::new); - pack.addProvider(ModModelProvider::new); + pack.addProvider(ModModelGenerator::new); } } diff --git a/src/main/java/net/ugi/sculk_depths/block/ModBlockEntities.java b/src/main/java/net/ugi/sculk_depths/block/ModBlockEntities.java new file mode 100644 index 00000000..4eba824e --- /dev/null +++ b/src/main/java/net/ugi/sculk_depths/block/ModBlockEntities.java @@ -0,0 +1,25 @@ +package net.ugi.sculk_depths.block; + +import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; +import net.ugi.sculk_depths.SculkDepths; +import net.ugi.sculk_depths.block.entity.CauldronBlockEntity; + +import static net.ugi.sculk_depths.block.ModBlocks.FLUMROCK_CAULDRON; +import static net.ugi.sculk_depths.block.ModBlocks.KRYSLUM_FLUMROCK_CAULDRON; + +public class ModBlockEntities { + + public static BlockEntityType FLUMROCK_CAULDRON_BLOCK_ENTITY; + + public static void registerBlockEntities() { + FLUMROCK_CAULDRON_BLOCK_ENTITY = Registry.register( + Registries.BLOCK_ENTITY_TYPE, + new Identifier(SculkDepths.MOD_ID, "flumrock_cauldron_block_entity"), + FabricBlockEntityTypeBuilder.create(CauldronBlockEntity::new, FLUMROCK_CAULDRON , KRYSLUM_FLUMROCK_CAULDRON).build()); + } + +} diff --git a/src/main/java/net/ugi/sculk_depths/block/ModBlocks.java b/src/main/java/net/ugi/sculk_depths/block/ModBlocks.java index c1bf538e..9a9265a6 100644 --- a/src/main/java/net/ugi/sculk_depths/block/ModBlocks.java +++ b/src/main/java/net/ugi/sculk_depths/block/ModBlocks.java @@ -4,24 +4,29 @@ import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; +import net.minecraft.block.enums.Instrument; import net.minecraft.block.piston.PistonBehavior; -import net.minecraft.fluid.Fluid; +import net.minecraft.entity.EntityType; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; -import net.minecraft.registry.tag.FluidTags; -import net.minecraft.registry.tag.TagBuilder; import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.util.DyeColor; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockView; import net.ugi.sculk_depths.SculkDepths; import net.ugi.sculk_depths.block.custom.*; +import net.ugi.sculk_depths.block.custom.ModCauldron.FlumrockCauldronBlock; +import net.ugi.sculk_depths.block.custom.ModCauldron.KryslumFlumrockCauldronBlock; import net.ugi.sculk_depths.block.custom.SoulFireBlock; +import net.ugi.sculk_depths.block.custom.ModCauldron.ModCauldronBehavior; import net.ugi.sculk_depths.block.sapling.ValtroxSaplingGenerator; import net.ugi.sculk_depths.fluid.ModFluids; import net.ugi.sculk_depths.item.ModItemGroup; -import net.minecraft.item.BlockItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; -import net.minecraft.util.Identifier; public class ModBlocks { @@ -35,7 +40,7 @@ public class ModBlocks { public static final Block KRYSLUM_ENRICHED_SOIL = registerBlock("kryslum_enriched_soil", new KryslumEnrichedSoilBLock(FabricBlockSettings.copyOf(Blocks.FARMLAND).ticksRandomly().strength(0.8f).sounds(BlockSoundGroup.GRAVEL)), ModItemGroup.SCULK_DEPTHS); - + public static final Block SOUL_FIRE = registerBlockWithoutBlockItem("soul_fire", new SoulFireBlock(FabricBlockSettings.copyOf(Blocks.SOUL_FIRE)), ModItemGroup.SCULK_DEPTHS); //umbrusk blockset public static final Block UMBRUSK = registerBlock("umbrusk", @@ -69,60 +74,77 @@ public class ModBlocks { public static final Block VALTROX_LOG = registerBlock("valtrox_log", new PillarBlock(FabricBlockSettings.copyOf(Blocks.OAK_LOG).strength(2.0f)), ModItemGroup.SCULK_DEPTHS); - public static final Block VALTROX_PLANKS = registerBlock("valtrox_planks", - new Block(FabricBlockSettings.copyOf(Blocks.OAK_PLANKS).strength(2.0f)), ModItemGroup.SCULK_DEPTHS); - public static final Block VALTROX_WOOD = registerBlock("valtrox_wood", new PillarBlock(FabricBlockSettings.copyOf(Blocks.OAK_WOOD).strength(2.0f)), ModItemGroup.SCULK_DEPTHS); - public static final Block VALTROX_SLAB = registerBlock("valtrox_slab", - new SlabBlock(FabricBlockSettings.copyOf(Blocks.OAK_SLAB).strength(2.0f)), ModItemGroup.SCULK_DEPTHS); + public static final Block VALTROX_PLANKS = registerBlock("valtrox_planks", + new Block(FabricBlockSettings.copyOf(Blocks.OAK_PLANKS).strength(2.0f)), ModItemGroup.SCULK_DEPTHS); public static final Block VALTROX_STAIRS = registerBlock("valtrox_stairs", new StairsBlock(VALTROX_PLANKS.getDefaultState(), FabricBlockSettings.copyOf(Blocks.OAK_STAIRS).strength(5.0f)), ModItemGroup.SCULK_DEPTHS); + public static final Block VALTROX_SLAB = registerBlock("valtrox_slab", + new SlabBlock(FabricBlockSettings.copyOf(Blocks.OAK_SLAB).strength(2.0f)), ModItemGroup.SCULK_DEPTHS); + public static final Block VALTROX_FENCE = registerBlock("valtrox_fence", new FenceBlock(FabricBlockSettings.copyOf(Blocks.OAK_FENCE).strength(2.0f)), ModItemGroup.SCULK_DEPTHS); + public static final Block VALTROX_PRESSURE_PLATE = registerBlock("valtrox_pressure_plate", + new PressurePlateBlock(PressurePlateBlock.ActivationRule.EVERYTHING ,FabricBlockSettings.copyOf(Blocks.OAK_PRESSURE_PLATE) , BlockSetType.OAK), ModItemGroup.SCULK_DEPTHS); + + public static final Block VALTROX_BUTTON = registerBlock("valtrox_button", + new ButtonBlock(FabricBlockSettings.copyOf(Blocks.OAK_BUTTON), BlockSetType.OAK, 30, true), ModItemGroup.SCULK_DEPTHS); + //dried valtrox blockset public static final Block DRIED_VALTROX_LOG = registerBlock("dried_valtrox_log", new PillarBlock(FabricBlockSettings.copyOf(Blocks.STONE).strength(2.5f)), ModItemGroup.SCULK_DEPTHS); - public static final Block DRIED_VALTROX_PLANKS = registerBlock("dried_valtrox_planks", - new Block(FabricBlockSettings.copyOf(Blocks.STONE).strength(2.5f)), ModItemGroup.SCULK_DEPTHS); - public static final Block DRIED_VALTROX_WOOD = registerBlock("dried_valtrox_wood", new PillarBlock(FabricBlockSettings.copyOf(Blocks.STONE).strength(2.5f)), ModItemGroup.SCULK_DEPTHS); - public static final Block DRIED_VALTROX_SLAB = registerBlock("dried_valtrox_slab", - new SlabBlock(FabricBlockSettings.copyOf(Blocks.STONE).strength(2.5f)), ModItemGroup.SCULK_DEPTHS); + public static final Block DRIED_VALTROX_PLANKS = registerBlock("dried_valtrox_planks", + new Block(FabricBlockSettings.copyOf(Blocks.STONE).strength(2.5f)), ModItemGroup.SCULK_DEPTHS); public static final Block DRIED_VALTROX_STAIRS = registerBlock("dried_valtrox_stairs", new StairsBlock(DRIED_VALTROX_PLANKS.getDefaultState(), FabricBlockSettings.copyOf(Blocks.STONE).strength(2.5f)), ModItemGroup.SCULK_DEPTHS); + public static final Block DRIED_VALTROX_SLAB = registerBlock("dried_valtrox_slab", + new SlabBlock(FabricBlockSettings.copyOf(Blocks.STONE).strength(2.5f)), ModItemGroup.SCULK_DEPTHS); + public static final Block DRIED_VALTROX_FENCE = registerBlock("dried_valtrox_fence", new FenceBlock(FabricBlockSettings.copyOf(Blocks.STONE).strength(2.5f)), ModItemGroup.SCULK_DEPTHS); + public static final Block DRIED_VALTROX_PRESSURE_PLATE = registerBlock("dried_valtrox_pressure_plate", + new PressurePlateBlock(PressurePlateBlock.ActivationRule.EVERYTHING ,FabricBlockSettings.copyOf(Blocks.OAK_PRESSURE_PLATE), BlockSetType.OAK), ModItemGroup.SCULK_DEPTHS); + + public static final Block DRIED_VALTROX_BUTTON = registerBlock("dried_valtrox_button", + new ButtonBlock(FabricBlockSettings.copyOf(Blocks.OAK_BUTTON), BlockSetType.OAK, 30, true), ModItemGroup.SCULK_DEPTHS); //petrified valtrox blockset public static final Block PETRIFIED_VALTROX_LOG = registerBlock("petrified_valtrox_log", new PillarBlock(FabricBlockSettings.copyOf(Blocks.STONE).strength(3.0f).requiresTool()), ModItemGroup.SCULK_DEPTHS); - public static final Block PETRIFIED_VALTROX_SLATES = registerBlock("petrified_valtrox_slates", - new Block(FabricBlockSettings.copyOf(Blocks.STONE).strength(3.0f).requiresTool()), ModItemGroup.SCULK_DEPTHS); - public static final Block PETRIFIED_VALTROX_WOOD = registerBlock("petrified_valtrox_wood", new PillarBlock(FabricBlockSettings.copyOf(Blocks.STONE).strength(3.0f).requiresTool()), ModItemGroup.SCULK_DEPTHS); - public static final Block PETRIFIED_VALTROX_SLAB = registerBlock("petrified_valtrox_slab", - new SlabBlock(FabricBlockSettings.copyOf(Blocks.STONE).strength(3.0f).requiresTool()), ModItemGroup.SCULK_DEPTHS); + public static final Block PETRIFIED_VALTROX_SLATES = registerBlock("petrified_valtrox_slates", + new Block(FabricBlockSettings.copyOf(Blocks.STONE).strength(3.0f).requiresTool()), ModItemGroup.SCULK_DEPTHS); public static final Block PETRIFIED_VALTROX_STAIRS = registerBlock("petrified_valtrox_stairs", new StairsBlock(PETRIFIED_VALTROX_SLATES.getDefaultState(), FabricBlockSettings.copyOf(Blocks.STONE).strength(3.0f).requiresTool()), ModItemGroup.SCULK_DEPTHS); + public static final Block PETRIFIED_VALTROX_SLAB = registerBlock("petrified_valtrox_slab", + new SlabBlock(FabricBlockSettings.copyOf(Blocks.STONE).strength(3.0f).requiresTool()), ModItemGroup.SCULK_DEPTHS); + public static final Block PETRIFIED_VALTROX_WALL = registerBlock("petrified_valtrox_wall", new WallBlock(FabricBlockSettings.copyOf(Blocks.STONE).strength(3.0f).requiresTool()), ModItemGroup.SCULK_DEPTHS); + public static final Block PETRIFIED_VALTROX_PRESSURE_PLATE = registerBlock("petrified_valtrox_pressure_plate", + new PressurePlateBlock(PressurePlateBlock.ActivationRule.EVERYTHING ,FabricBlockSettings.copyOf(Blocks.STONE_PRESSURE_PLATE), BlockSetType.STONE), ModItemGroup.SCULK_DEPTHS); + + public static final Block PETRIFIED_VALTROX_BUTTON = registerBlock("petrified_valtrox_button", + new ButtonBlock(FabricBlockSettings.copyOf(Blocks.OAK_BUTTON), BlockSetType.STONE, 20, false), ModItemGroup.SCULK_DEPTHS); + //zygrin set public static final Block ZYGRIN = registerBlock("zygrin", new Block(FabricBlockSettings.copyOf(Blocks.STONE).strength(4.0f).requiresTool()), ModItemGroup.SCULK_DEPTHS); @@ -167,7 +189,10 @@ public class ModBlocks { new WallBlock(FabricBlockSettings.copyOf(Blocks.STONE).strength(4.0f).requiresTool()), ModItemGroup.SCULK_DEPTHS); public static final Block ZYGRIN_LIGHT = registerBlock("zygrin_light", - new nonConnectingBlock(FabricBlockSettings.copyOf(Blocks.STONE).strength(4.0f).requiresTool().luminance(blockState -> 15)), ModItemGroup.SCULK_DEPTHS); + new Block(FabricBlockSettings.copyOf(Blocks.STONE).strength(4.0f).requiresTool().luminance(blockState -> 15)), ModItemGroup.SCULK_DEPTHS); + + public static final Block ZYGRIN_FLOWBLOCK = registerBlock("zygrin_flowblock", + new FlowBlock(FabricBlockSettings.copyOf(Blocks.STONE).strength(4.0f)), ModItemGroup.SCULK_DEPTHS); //leaves public static final Block VALTROX_LEAVES = registerBlock("valtrox_leaves", @@ -186,12 +211,18 @@ public class ModBlocks { //ores public static final Block QUAZARITH_ORE = registerBlock("quazarith_ore", new Block(FabricBlockSettings.copyOf(Blocks.DEEPSLATE).hardness(6.0f).resistance(10f).requiresTool()), ModItemGroup.SCULK_DEPTHS); + //crystals + public static final Block WHITE_CRYSTAL = registerBlock("crystal", ModBlocks.createCrystalBlock(DyeColor.WHITE), ModItemGroup.SCULK_DEPTHS); //fluids public static final Block KRYSLUM = registerBlockWithoutBlockItem("kryslum", new FluidBlock(ModFluids.KRYSLUM_STILL, FabricBlockSettings.copyOf(Blocks.WATER).replaceable().noCollision().strength(100.0f).pistonBehavior(PistonBehavior.DESTROY).dropsNothing().liquid().solid().sounds(BlockSoundGroup.SCULK)), ModItemGroup.SCULK_DEPTHS); - public static final Block SOUL_FIRE = registerBlockWithoutBlockItem("soul_fire", new SoulFireBlock( FabricBlockSettings.copyOf(Blocks.SOUL_FIRE)), ModItemGroup.SCULK_DEPTHS); + public static final Block FLUMROCK_CAULDRON = registerBlock("flumrock_cauldron", new FlumrockCauldronBlock(FabricBlockSettings.copyOf(Blocks.CAULDRON)), ModItemGroup.SCULK_DEPTHS); + public static final Block KRYSLUM_FLUMROCK_CAULDRON = registerBlockWithoutBlockItem("kryslum_flumrock_cauldron", new KryslumFlumrockCauldronBlock(FabricBlockSettings.copyOf(Blocks.CAULDRON), ModCauldronBehavior.KRYSLUM_FLUMROCK_CAULDRON_BEHAVIOR), ModItemGroup.SCULK_DEPTHS); + private static CrystalBlock createCrystalBlock(DyeColor color) { + return new CrystalBlock(color, FabricBlockSettings.copyOf(Blocks.GLASS).luminance(10)); + } private static Block registerBlock(String name, Block block, RegistryKey group) { registerBlockItem(name, block, group); return Registry.register(Registries.BLOCK, new Identifier(SculkDepths.MOD_ID, name), block); @@ -204,13 +235,12 @@ private static Block registerBlockWithoutBlockItem(String name, Block block, Reg private static Item registerBlockItem(String name, Block block, RegistryKey group) { - Item item = Registry.register(Registries.ITEM, new Identifier(SculkDepths.MOD_ID, name), - new BlockItem(block, new FabricItemSettings())); - ItemGroupEvents.modifyEntriesEvent(group).register(entries -> entries.add(item)); - return item; + Item item = Registry.register(Registries.ITEM, new Identifier(SculkDepths.MOD_ID, name), + new BlockItem(block, new FabricItemSettings())); + ItemGroupEvents.modifyEntriesEvent(group).register(entries -> entries.add(item)); + return item; } public static void registerModBlocks() { - SculkDepths.LOGGER.info("Registering ModBlocks for " + SculkDepths.MOD_ID); } } \ No newline at end of file diff --git a/src/main/java/net/ugi/sculk_depths/block/custom/CephleraBlock.java b/src/main/java/net/ugi/sculk_depths/block/custom/CephleraBlock.java index 2dc6e778..09b7319d 100644 --- a/src/main/java/net/ugi/sculk_depths/block/custom/CephleraBlock.java +++ b/src/main/java/net/ugi/sculk_depths/block/custom/CephleraBlock.java @@ -1,8 +1,10 @@ package net.ugi.sculk_depths.block.custom; -import net.minecraft.block.*; +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.AbstractPlantBlock; +import net.minecraft.block.AbstractPlantStemBlock; +import net.minecraft.block.Block; import net.minecraft.util.math.Direction; -import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.ugi.sculk_depths.block.ModBlocks; diff --git a/src/main/java/net/ugi/sculk_depths/block/custom/CrystalBlock.java b/src/main/java/net/ugi/sculk_depths/block/custom/CrystalBlock.java new file mode 100644 index 00000000..6a602a86 --- /dev/null +++ b/src/main/java/net/ugi/sculk_depths/block/custom/CrystalBlock.java @@ -0,0 +1,24 @@ +package net.ugi.sculk_depths.block.custom; + +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.AbstractGlassBlock; +import net.minecraft.block.Stainable; +import net.minecraft.util.DyeColor; + +public class CrystalBlock + extends AbstractGlassBlock + implements Stainable { + private final DyeColor color; + + public CrystalBlock(DyeColor color, AbstractBlock.Settings settings) { + super(settings); + this.color = color; + } + + @Override + public DyeColor getColor() { + return this.color; + } +} + + diff --git a/src/main/java/net/ugi/sculk_depths/block/custom/FlowBlock.java b/src/main/java/net/ugi/sculk_depths/block/custom/FlowBlock.java new file mode 100644 index 00000000..5b8821cd --- /dev/null +++ b/src/main/java/net/ugi/sculk_depths/block/custom/FlowBlock.java @@ -0,0 +1,54 @@ +package net.ugi.sculk_depths.block.custom; + +import net.minecraft.block.*; +import net.minecraft.entity.ai.pathing.NavigationType; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.state.StateManager; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.world.BlockView; + +public class FlowBlock extends RodBlock { + protected static final float field_31233 = 6.0f; + protected static final float field_31234 = 10.0f; + protected static final VoxelShape Y_SHAPE = Block.createCuboidShape(0.0, 0.0, 0.0, 16.0, 16.0, 16.0); + protected static final VoxelShape Z_SHAPE = Block.createCuboidShape(0.0, 0.0, 0.0, 16.0, 16.0, 16.0); + protected static final VoxelShape X_SHAPE = Block.createCuboidShape(0.0, 0.0, 0.0, 16.0, 16.0, 16.0); + + public FlowBlock(AbstractBlock.Settings settings) { + + super(settings); + this.setDefaultState((BlockState)((BlockState)this.stateManager.getDefaultState()).with(FACING, Direction.UP)); + } + + @Override + public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + switch (state.get(FACING).getAxis()) { + default: { + return X_SHAPE; + } + case Z: { + return Z_SHAPE; + } + case Y: + } + return Y_SHAPE; + } + + + @Override + public boolean canPathfindThrough(BlockState state, BlockView world, BlockPos pos, NavigationType type) { + return false; + } + @Override + public BlockState getPlacementState(ItemPlacementContext ctx) { + Direction direction = ctx.getSide(); + BlockState blockState = ctx.getWorld().getBlockState(ctx.getBlockPos().offset(direction.getOpposite())); + return (BlockState)this.getDefaultState().with(FACING, direction); + } + @Override + protected void appendProperties(StateManager.Builder builder) { + builder.add(FACING); + } +} diff --git a/src/main/java/net/ugi/sculk_depths/block/custom/KryslumEnrichedSoilBLock.java b/src/main/java/net/ugi/sculk_depths/block/custom/KryslumEnrichedSoilBLock.java index bd0cab92..d434decc 100644 --- a/src/main/java/net/ugi/sculk_depths/block/custom/KryslumEnrichedSoilBLock.java +++ b/src/main/java/net/ugi/sculk_depths/block/custom/KryslumEnrichedSoilBLock.java @@ -1,6 +1,5 @@ package net.ugi.sculk_depths.block.custom; -import com.mojang.datafixers.types.templates.Tag; import net.minecraft.block.*; import net.minecraft.entity.Entity; import net.minecraft.item.ItemPlacementContext; @@ -12,7 +11,10 @@ import net.minecraft.util.math.Direction; import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; -import net.minecraft.world.*; +import net.minecraft.world.BlockView; +import net.minecraft.world.World; +import net.minecraft.world.WorldAccess; +import net.minecraft.world.WorldView; public class KryslumEnrichedSoilBLock extends FarmlandBlock { @@ -22,11 +24,15 @@ public class KryslumEnrichedSoilBLock extends FarmlandBlock { public KryslumEnrichedSoilBLock(AbstractBlock.Settings settings) { super(settings); - this.setDefaultState((BlockState)((BlockState)this.stateManager.getDefaultState()).with(MOISTURE, MAX_MOISTURE)); + this.setDefaultState((this.stateManager.getDefaultState()).with(MOISTURE, MAX_MOISTURE)); } + @Override + public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { + return true; + } @Override public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { if (direction == Direction.UP && !state.canPlaceAt(world, pos)) { @@ -38,10 +44,7 @@ public BlockState getStateForNeighborUpdate(BlockState state, Direction directio @Override public BlockState getPlacementState(ItemPlacementContext ctx) { - if (!this.getDefaultState().canPlaceAt(ctx.getWorld(), ctx.getBlockPos())) { - return Blocks.DIRT.getDefaultState(); - } - return super.getPlacementState(ctx); + return this.getDefaultState(); } @@ -68,5 +71,4 @@ public void onLandedUpon(World world, BlockState state, BlockPos pos, Entity ent protected void appendProperties(StateManager.Builder builder) { builder.add(MOISTURE); } - } diff --git a/src/main/java/net/ugi/sculk_depths/block/custom/ModCauldron/FlumrockCauldronBlock.java b/src/main/java/net/ugi/sculk_depths/block/custom/ModCauldron/FlumrockCauldronBlock.java new file mode 100644 index 00000000..3a177ce7 --- /dev/null +++ b/src/main/java/net/ugi/sculk_depths/block/custom/ModCauldron/FlumrockCauldronBlock.java @@ -0,0 +1,56 @@ +package net.ugi.sculk_depths.block.custom.ModCauldron; + +import net.minecraft.block.AbstractCauldronBlock; +import net.minecraft.block.BlockState; +import net.minecraft.block.ShapeContext; +import net.minecraft.util.function.BooleanBiFunction; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; +import net.minecraft.world.BlockView; + +public class FlumrockCauldronBlock extends AbstractCauldronBlock { + + private static final VoxelShape RAYCAST_SHAPE = AbstractCauldronBlock.createCuboidShape(1.5, 2.0, 1.5, 14.5, 16.0, 14.5); + protected static final VoxelShape OUTLINE_SHAPE = VoxelShapes.combineAndSimplify(VoxelShapes.fullCube(), + VoxelShapes.union( + AbstractCauldronBlock.createCuboidShape(0.0, 0.0, 0.0, 16.0, 1.0, 2.0), + AbstractCauldronBlock.createCuboidShape(0.0, 0.0, 14.0, 16.0, 1.0, 16.0), + AbstractCauldronBlock.createCuboidShape(0.0, 0.0, 0.0, 2.0, 1.0, 16.0), + AbstractCauldronBlock.createCuboidShape(14.0, 0.0, 0.0, 16.0, 1.0, 16.0), + AbstractCauldronBlock.createCuboidShape(4.0, 0.0, 2.0, 12.0, 1.0, 14.0), + AbstractCauldronBlock.createCuboidShape(2.0, 0.0, 4.0, 14.0, 1.0, 12.0), + AbstractCauldronBlock.createCuboidShape(0.0, 0.0, 0.0, 16.0, 2.0, 1.0), + AbstractCauldronBlock.createCuboidShape(0.0, 0.0, 15.0, 16.0, 2.0, 16.0), + AbstractCauldronBlock.createCuboidShape(0.0, 0.0, 0.0, 1.0, 2.0, 16.0), + AbstractCauldronBlock.createCuboidShape(15.0, 0.0, 0.0, 16.0, 2.0, 16.0), + AbstractCauldronBlock.createCuboidShape(1.0, 2.0, 1.0, 15.0, 13.0, 15.0), + AbstractCauldronBlock.createCuboidShape(0.0, 13.0, 0.0, 16.0, 15.0, 1.0), + AbstractCauldronBlock.createCuboidShape(0.0, 13.0, 15.0, 16.0, 15.0, 16.0), + AbstractCauldronBlock.createCuboidShape(0.0, 13.0, 0.0, 1.0, 15.0, 16.0), + AbstractCauldronBlock.createCuboidShape(15.0, 13.0, 0.0, 16.0, 15.0, 16.0), + AbstractCauldronBlock.createCuboidShape(1.0, 15.0, 1.0, 15.0, 16.0, 15.0), + RAYCAST_SHAPE), BooleanBiFunction.ONLY_FIRST); + + @Override + public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + return OUTLINE_SHAPE; + } + + @Override + public VoxelShape getRaycastShape(BlockState state, BlockView world, BlockPos pos) { + return RAYCAST_SHAPE; + } + + + public FlumrockCauldronBlock(Settings settings) { + super(settings, ModCauldronBehavior.EMPTY_FLUMROCK_CAULDRON_BEHAVIOR); + } + @Override + public boolean isFull(BlockState state) { + return false; + } + + +} + diff --git a/src/main/java/net/ugi/sculk_depths/block/custom/ModCauldron/KryslumFlumrockCauldronBlock.java b/src/main/java/net/ugi/sculk_depths/block/custom/ModCauldron/KryslumFlumrockCauldronBlock.java new file mode 100644 index 00000000..49522d64 --- /dev/null +++ b/src/main/java/net/ugi/sculk_depths/block/custom/ModCauldron/KryslumFlumrockCauldronBlock.java @@ -0,0 +1,319 @@ +package net.ugi.sculk_depths.block.custom.ModCauldron; + +import net.minecraft.block.*; +import net.minecraft.block.cauldron.CauldronBehavior; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.IntProperty; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.ItemScatterer; +import net.minecraft.util.collection.DefaultedList; +import net.minecraft.util.function.BooleanBiFunction; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; +import net.minecraft.world.BlockView; +import net.minecraft.world.World; +import net.minecraft.world.event.GameEvent; +import net.ugi.sculk_depths.SculkDepths; +import net.ugi.sculk_depths.block.ModBlocks; +import net.ugi.sculk_depths.block.entity.CauldronBlockEntity; +import net.ugi.sculk_depths.item.ModItems; +import net.ugi.sculk_depths.state.property.ModProperties; + +import java.util.Map; + +import static net.minecraft.block.LeveledCauldronBlock.LEVEL; +import static net.ugi.sculk_depths.state.property.ModProperties.DIAMOND_LEVEL; +import static net.ugi.sculk_depths.state.property.ModProperties.QUAZARITH_LEVEL; + + +public class KryslumFlumrockCauldronBlock extends AbstractCauldronBlock{ + + public static final IntProperty LEVEL = ModProperties.KRYSLUM_LEVEL; + + public static final IntProperty QUAZARITH = ModProperties.QUAZARITH_LEVEL; + public static final IntProperty DIAMOND = ModProperties.DIAMOND_LEVEL; + + + private final Map behaviorMap; + + public KryslumFlumrockCauldronBlock(AbstractBlock.Settings settings, Map behaviorMap) { + super(settings, ModCauldronBehavior.KRYSLUM_FLUMROCK_CAULDRON_BEHAVIOR); + this.behaviorMap = behaviorMap; + this.setDefaultState(this.stateManager.getDefaultState().with(LEVEL, 1)); + } + + private static final VoxelShape RAYCAST_SHAPE = AbstractCauldronBlock.createCuboidShape(1.5, 2.0, 1.5, 14.5, 16.0, 14.5); + protected static final VoxelShape OUTLINE_SHAPE = VoxelShapes.combineAndSimplify(VoxelShapes.fullCube(), + VoxelShapes.union( + AbstractCauldronBlock.createCuboidShape(0.0, 0.0, 0.0, 16.0, 1.0, 2.0), + AbstractCauldronBlock.createCuboidShape(0.0, 0.0, 14.0, 16.0, 1.0, 16.0), + AbstractCauldronBlock.createCuboidShape(0.0, 0.0, 0.0, 2.0, 1.0, 16.0), + AbstractCauldronBlock.createCuboidShape(14.0, 0.0, 0.0, 16.0, 1.0, 16.0), + AbstractCauldronBlock.createCuboidShape(4.0, 0.0, 2.0, 12.0, 1.0, 14.0), + AbstractCauldronBlock.createCuboidShape(2.0, 0.0, 4.0, 14.0, 1.0, 12.0), + AbstractCauldronBlock.createCuboidShape(0.0, 0.0, 0.0, 16.0, 2.0, 1.0), + AbstractCauldronBlock.createCuboidShape(0.0, 0.0, 15.0, 16.0, 2.0, 16.0), + AbstractCauldronBlock.createCuboidShape(0.0, 0.0, 0.0, 1.0, 2.0, 16.0), + AbstractCauldronBlock.createCuboidShape(15.0, 0.0, 0.0, 16.0, 2.0, 16.0), + AbstractCauldronBlock.createCuboidShape(1.0, 2.0, 1.0, 15.0, 13.0, 15.0), + AbstractCauldronBlock.createCuboidShape(0.0, 13.0, 0.0, 16.0, 15.0, 1.0), + AbstractCauldronBlock.createCuboidShape(0.0, 13.0, 15.0, 16.0, 15.0, 16.0), + AbstractCauldronBlock.createCuboidShape(0.0, 13.0, 0.0, 1.0, 15.0, 16.0), + AbstractCauldronBlock.createCuboidShape(15.0, 13.0, 0.0, 16.0, 15.0, 16.0), + AbstractCauldronBlock.createCuboidShape(1.0, 15.0, 1.0, 15.0, 16.0, 15.0), + RAYCAST_SHAPE), BooleanBiFunction.ONLY_FIRST); + + @Override + public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + return OUTLINE_SHAPE; + } + + @Override + public VoxelShape getRaycastShape(BlockState state, BlockView world, BlockPos pos) { + return RAYCAST_SHAPE; + } + + @Override + public boolean isFull(BlockState state) { + return state.get(LEVEL) == 12; + } + + @Override + protected double getFluidHeight(BlockState state) { + return (6.0 + (double)state.get(LEVEL).intValue() * 3.0) / 16.0; + } + + @Override + public void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) { + if (!world.isClient && entity.isOnFire() && this.isEntityTouchingFluid(state, pos, entity)) { + + } + } + + @Override + public int getComparatorOutput(BlockState state, World world, BlockPos pos) { + return state.get(LEVEL); + } + + @Override + protected void appendProperties(StateManager.Builder builder) { + builder.add(LEVEL).add(QUAZARITH).add(DIAMOND); + + } + + + @Override + public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { + ItemStack itemStack = player.getMainHandStack(); + CauldronBehavior cauldronBehavior = this.behaviorMap.get(itemStack.getItem()); + if(itemStack.getItem() == ModItems.KRYSLUM_BUCKET + || itemStack.getItem() == Items.BUCKET + || itemStack.getItem() == ModItems.QUAZARITH_PIECES + || itemStack.getItem() == Items.DIAMOND + || itemStack.getItem() == ModItems.QUAZARITH_INGOT + ) { + return cauldronBehavior.interact(state, world, pos, player, hand, itemStack); + } + + if((itemStack.getItem() == Items.NETHERITE_HELMET + && state.get(LEVEL) > SculkDepths.CONFIG.quazarith_helmet_kryslum_cost + && state.get(DIAMOND) >= SculkDepths.CONFIG.quazarith_helmet_diamond_cost + && state.get(QUAZARITH) >= SculkDepths.CONFIG.quazarith_helmet_quazarith_pieces_cost) + || (itemStack.getItem() == Items.NETHERITE_HELMET//======================================== + && state.get(LEVEL) == SculkDepths.CONFIG.quazarith_helmet_kryslum_cost + && state.get(DIAMOND) == SculkDepths.CONFIG.quazarith_helmet_diamond_cost + && state.get(QUAZARITH) == SculkDepths.CONFIG.quazarith_helmet_quazarith_pieces_cost)){ + ItemStack outputItem = new ItemStack(ModItems.QUAZARITH_HELMET); + RemoveUsedResources(state, world, pos, + SculkDepths.CONFIG.quazarith_helmet_quazarith_pieces_cost, + SculkDepths.CONFIG.quazarith_helmet_diamond_cost, + SculkDepths.CONFIG.quazarith_helmet_kryslum_cost); + return UpgradeItem(outputItem, player); + } + if((itemStack.getItem() == Items.NETHERITE_CHESTPLATE + && state.get(LEVEL) > SculkDepths.CONFIG.quazarith_chestplate_kryslum_cost + && state.get(DIAMOND) >= SculkDepths.CONFIG.quazarith_chestplate_diamond_cost + && state.get(QUAZARITH) >= SculkDepths.CONFIG.quazarith_chestplate_quazarith_pieces_cost) + || (itemStack.getItem() == Items.NETHERITE_CHESTPLATE//======================================== + && state.get(LEVEL) == SculkDepths.CONFIG.quazarith_chestplate_kryslum_cost + && state.get(DIAMOND) == SculkDepths.CONFIG.quazarith_chestplate_diamond_cost + && state.get(QUAZARITH) == SculkDepths.CONFIG.quazarith_chestplate_quazarith_pieces_cost)){ + ItemStack outputItem = new ItemStack(ModItems.QUAZARITH_CHESTPLATE); + RemoveUsedResources(state, world, pos, + SculkDepths.CONFIG.quazarith_chestplate_quazarith_pieces_cost, + SculkDepths.CONFIG.quazarith_chestplate_diamond_cost, + SculkDepths.CONFIG.quazarith_chestplate_kryslum_cost); + return UpgradeItem(outputItem, player); + } + if((itemStack.getItem() == Items.NETHERITE_LEGGINGS + && state.get(LEVEL) > SculkDepths.CONFIG.quazarith_leggings_kryslum_cost + && state.get(DIAMOND) >= SculkDepths.CONFIG.quazarith_leggings_diamond_cost + && state.get(QUAZARITH) >= SculkDepths.CONFIG.quazarith_leggings_quazarith_pieces_cost) + || (itemStack.getItem() == Items.NETHERITE_LEGGINGS//======================================== + && state.get(LEVEL) == SculkDepths.CONFIG.quazarith_leggings_kryslum_cost + && state.get(DIAMOND) == SculkDepths.CONFIG.quazarith_leggings_diamond_cost + && state.get(QUAZARITH) == SculkDepths.CONFIG.quazarith_leggings_quazarith_pieces_cost)){ + ItemStack outputItem = new ItemStack(ModItems.QUAZARITH_LEGGINGS); + RemoveUsedResources(state, world, pos, + SculkDepths.CONFIG.quazarith_leggings_quazarith_pieces_cost, + SculkDepths.CONFIG.quazarith_leggings_diamond_cost, + SculkDepths.CONFIG.quazarith_leggings_kryslum_cost); + return UpgradeItem(outputItem, player); + } + if((itemStack.getItem() == Items.NETHERITE_BOOTS + && state.get(LEVEL) > SculkDepths.CONFIG.quazarith_boots_kryslum_cost + && state.get(DIAMOND) >= SculkDepths.CONFIG.quazarith_boots_diamond_cost + && state.get(QUAZARITH) >= SculkDepths.CONFIG.quazarith_boots_quazarith_pieces_cost) + || (itemStack.getItem() == Items.NETHERITE_BOOTS//======================================== + && state.get(LEVEL) == SculkDepths.CONFIG.quazarith_boots_kryslum_cost + && state.get(DIAMOND) == SculkDepths.CONFIG.quazarith_boots_diamond_cost + && state.get(QUAZARITH) == SculkDepths.CONFIG.quazarith_boots_quazarith_pieces_cost)){ + ItemStack outputItem = new ItemStack(ModItems.QUAZARITH_BOOTS); + RemoveUsedResources(state, world, pos, + SculkDepths.CONFIG.quazarith_boots_quazarith_pieces_cost, + SculkDepths.CONFIG.quazarith_boots_diamond_cost, + SculkDepths.CONFIG.quazarith_boots_kryslum_cost); + return UpgradeItem(outputItem, player); + } + if((itemStack.getItem() == Items.NETHERITE_SHOVEL + && state.get(LEVEL) > SculkDepths.CONFIG.quazarith_shovel_kryslum_cost + && state.get(DIAMOND) >= SculkDepths.CONFIG.quazarith_shovel_diamond_cost + && state.get(QUAZARITH) >= SculkDepths.CONFIG.quazarith_shovel_quazarith_pieces_cost) + || (itemStack.getItem() == Items.NETHERITE_SHOVEL//======================================== + && state.get(LEVEL) == SculkDepths.CONFIG.quazarith_shovel_kryslum_cost + && state.get(DIAMOND) == SculkDepths.CONFIG.quazarith_shovel_diamond_cost + && state.get(QUAZARITH) == SculkDepths.CONFIG.quazarith_shovel_quazarith_pieces_cost)){ + ItemStack outputItem = new ItemStack(ModItems.QUAZARITH_SHOVEL); + RemoveUsedResources(state, world, pos, + SculkDepths.CONFIG.quazarith_shovel_quazarith_pieces_cost, + SculkDepths.CONFIG.quazarith_shovel_diamond_cost, + SculkDepths.CONFIG.quazarith_shovel_kryslum_cost); + return UpgradeItem(outputItem, player); + } + if((itemStack.getItem() == Items.NETHERITE_PICKAXE + && state.get(LEVEL) > SculkDepths.CONFIG.quazarith_pickaxe_kryslum_cost + && state.get(DIAMOND) >= SculkDepths.CONFIG.quazarith_pickaxe_diamond_cost + && state.get(QUAZARITH) >= SculkDepths.CONFIG.quazarith_pickaxe_quazarith_pieces_cost) + || (itemStack.getItem() == Items.NETHERITE_PICKAXE//======================================== + && state.get(LEVEL) == SculkDepths.CONFIG.quazarith_pickaxe_kryslum_cost + && state.get(DIAMOND) == SculkDepths.CONFIG.quazarith_pickaxe_diamond_cost + && state.get(QUAZARITH) == SculkDepths.CONFIG.quazarith_pickaxe_quazarith_pieces_cost)){ + ItemStack outputItem = new ItemStack(ModItems.QUAZARITH_PICKAXE); + RemoveUsedResources(state, world, pos, + SculkDepths.CONFIG.quazarith_pickaxe_quazarith_pieces_cost, + SculkDepths.CONFIG.quazarith_pickaxe_diamond_cost, + SculkDepths.CONFIG.quazarith_pickaxe_kryslum_cost); + return UpgradeItem(outputItem, player); + } + if((itemStack.getItem() == Items.NETHERITE_AXE + && state.get(LEVEL) > SculkDepths.CONFIG.quazarith_axe_kryslum_cost + && state.get(DIAMOND) >= SculkDepths.CONFIG.quazarith_axe_diamond_cost + && state.get(QUAZARITH) >= SculkDepths.CONFIG.quazarith_axe_quazarith_pieces_cost) + || (itemStack.getItem() == Items.NETHERITE_AXE//======================================== + && state.get(LEVEL) == SculkDepths.CONFIG.quazarith_axe_kryslum_cost + && state.get(DIAMOND) == SculkDepths.CONFIG.quazarith_axe_diamond_cost + && state.get(QUAZARITH) == SculkDepths.CONFIG.quazarith_axe_quazarith_pieces_cost)){ + ItemStack outputItem = new ItemStack(ModItems.QUAZARITH_AXE); + RemoveUsedResources(state, world, pos, + SculkDepths.CONFIG.quazarith_axe_quazarith_pieces_cost, + SculkDepths.CONFIG.quazarith_axe_diamond_cost, + SculkDepths.CONFIG.quazarith_axe_kryslum_cost); + return UpgradeItem(outputItem, player); + } + if((itemStack.getItem() == Items.NETHERITE_HOE + && state.get(LEVEL) > SculkDepths.CONFIG.quazarith_hoe_kryslum_cost + && state.get(DIAMOND) >= SculkDepths.CONFIG.quazarith_hoe_diamond_cost + && state.get(QUAZARITH) >= SculkDepths.CONFIG.quazarith_hoe_quazarith_pieces_cost) + || (itemStack.getItem() == Items.NETHERITE_HOE//======================================== + && state.get(LEVEL) == SculkDepths.CONFIG.quazarith_hoe_kryslum_cost + && state.get(DIAMOND) == SculkDepths.CONFIG.quazarith_hoe_diamond_cost + && state.get(QUAZARITH) == SculkDepths.CONFIG.quazarith_hoe_quazarith_pieces_cost)){ + ItemStack outputItem = new ItemStack(ModItems.QUAZARITH_HOE); + RemoveUsedResources(state, world, pos, + SculkDepths.CONFIG.quazarith_hoe_quazarith_pieces_cost, + SculkDepths.CONFIG.quazarith_hoe_diamond_cost, + SculkDepths.CONFIG.quazarith_hoe_kryslum_cost); + return UpgradeItem(outputItem, player); + } + if((itemStack.getItem() == Items.NETHERITE_SWORD + && state.get(LEVEL) > SculkDepths.CONFIG.quazarith_sword_kryslum_cost + && state.get(DIAMOND) >= SculkDepths.CONFIG.quazarith_sword_diamond_cost + && state.get(QUAZARITH) >= SculkDepths.CONFIG.quazarith_sword_quazarith_pieces_cost) + || (itemStack.getItem() == Items.NETHERITE_SWORD//======================================== + && state.get(LEVEL) == SculkDepths.CONFIG.quazarith_sword_kryslum_cost + && state.get(DIAMOND) == SculkDepths.CONFIG.quazarith_sword_diamond_cost + && state.get(QUAZARITH) == SculkDepths.CONFIG.quazarith_sword_quazarith_pieces_cost)){ + ItemStack outputItem = new ItemStack(ModItems.QUAZARITH_SWORD); + RemoveUsedResources(state, world, pos, + SculkDepths.CONFIG.quazarith_sword_quazarith_pieces_cost, + SculkDepths.CONFIG.quazarith_sword_diamond_cost, + SculkDepths.CONFIG.quazarith_sword_kryslum_cost); + return UpgradeItem(outputItem, player); + } + if((itemStack.getItem() == Items.AIR + && state.get(LEVEL) > SculkDepths.CONFIG.quazarith_ingot_kryslum_cost + && state.get(DIAMOND) >= SculkDepths.CONFIG.quazarith_ingot_diamond_cost + && state.get(QUAZARITH) >= SculkDepths.CONFIG.quazarith_ingot_quazarith_pieces_cost) + || (itemStack.getItem() == Items.AIR//======================================== + && state.get(LEVEL) == SculkDepths.CONFIG.quazarith_ingot_kryslum_cost + && state.get(DIAMOND) == SculkDepths.CONFIG.quazarith_ingot_diamond_cost + && state.get(QUAZARITH) == SculkDepths.CONFIG.quazarith_ingot_quazarith_pieces_cost)){ + ItemStack outputItem = new ItemStack(ModItems.QUAZARITH_INGOT); + RemoveUsedResources(state, world, pos, + SculkDepths.CONFIG.quazarith_ingot_quazarith_pieces_cost, + SculkDepths.CONFIG.quazarith_ingot_diamond_cost, + SculkDepths.CONFIG.quazarith_ingot_kryslum_cost); + return UpgradeItem(outputItem, player); + } + + return ActionResult.FAIL; + + } + + public ActionResult UpgradeItem(ItemStack outputItem, PlayerEntity player){ + NbtCompound nbtCompound = player.getMainHandStack().getNbt(); + if (nbtCompound != null) { + outputItem.setNbt(nbtCompound.copy()); + } + player.setStackInHand(Hand.MAIN_HAND, outputItem); + return ActionResult.SUCCESS; + } + + public void RemoveUsedResources(BlockState state, World world, BlockPos pos, int quazarith_pieces, int diamonds, int kryslum){ + int i = state.get(QUAZARITH_LEVEL) - quazarith_pieces; + int j = state.get(DIAMOND_LEVEL) - diamonds; + int k = state.get(LEVEL) - kryslum; + + BlockState blockState1 = state.with(QUAZARITH_LEVEL, i).with(DIAMOND_LEVEL, j).with(LEVEL, k); + world.setBlockState(pos, blockState1); + + if(k == 0) { + BlockState blockState2 = ModBlocks.FLUMROCK_CAULDRON.getDefaultState(); + world.setBlockState(pos, blockState2); + } + + } + + @Override + public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) { + if (state.getBlock() != newState.getBlock() && moved == false) { + DefaultedList stacks = DefaultedList.ofSize(2, ItemStack.EMPTY); + stacks.set( 0 , new ItemStack(ModItems.QUAZARITH_PIECES, state.get(QUAZARITH))); + stacks.set(1 , new ItemStack(Items.DIAMOND, state.get(DIAMOND))); + ItemScatterer.spawn(world, pos, stacks); + world.emitGameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Emitter.of(state)); + + } + super.onStateReplaced(state, world, pos, newState, moved); + } +} diff --git a/src/main/java/net/ugi/sculk_depths/block/custom/ModCauldron/ModCauldronBehavior.java b/src/main/java/net/ugi/sculk_depths/block/custom/ModCauldron/ModCauldronBehavior.java new file mode 100644 index 00000000..0a0c790c --- /dev/null +++ b/src/main/java/net/ugi/sculk_depths/block/custom/ModCauldron/ModCauldronBehavior.java @@ -0,0 +1,140 @@ +package net.ugi.sculk_depths.block.custom.ModCauldron; + +import net.minecraft.block.BlockState; +import net.minecraft.block.cauldron.CauldronBehavior; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUsage; +import net.minecraft.item.Items; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvents; +import net.minecraft.stat.Stats; +import net.minecraft.state.property.IntProperty; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.event.GameEvent; +import net.ugi.sculk_depths.SculkDepths; +import net.ugi.sculk_depths.block.ModBlocks; +import net.ugi.sculk_depths.item.ModItems; +import net.ugi.sculk_depths.state.property.ModProperties; + +import java.util.Map; + +import static net.ugi.sculk_depths.state.property.ModProperties.DIAMOND_LEVEL; +import static net.ugi.sculk_depths.state.property.ModProperties.QUAZARITH_LEVEL; + + +public interface ModCauldronBehavior { + + public static final IntProperty LEVEL = ModProperties.KRYSLUM_LEVEL; + + public static final Map EMPTY_FLUMROCK_CAULDRON_BEHAVIOR = CauldronBehavior.createMap(); + public static final Map KRYSLUM_FLUMROCK_CAULDRON_BEHAVIOR = CauldronBehavior.createMap(); + public static final CauldronBehavior FILL_WITH_KRYSLUM = (state, world, pos, player, hand, stack) -> CauldronBehavior.fillCauldron(world, pos, player, hand, stack, ModBlocks.KRYSLUM_FLUMROCK_CAULDRON.getDefaultState(), SoundEvents.ITEM_BUCKET_EMPTY); + + public static void registerBehavior() { + + registerBucketBehavior(EMPTY_FLUMROCK_CAULDRON_BEHAVIOR); + + KRYSLUM_FLUMROCK_CAULDRON_BEHAVIOR.put(Items.BUCKET, (state, world, pos, player, hand, stack) -> { + if (!world.isClient) { + Item item = stack.getItem(); + player.setStackInHand(hand, ItemUsage.exchangeStack(stack, player, new ItemStack(ModItems.KRYSLUM_BUCKET))); + player.incrementStat(Stats.USE_CAULDRON); + player.incrementStat(Stats.USED.getOrCreateStat(item)); + decrementFluidLevel(state, world, pos); + world.playSound(null, pos, SoundEvents.ITEM_BUCKET_FILL, SoundCategory.BLOCKS, 1.0f, 1.0f); + world.emitGameEvent(null, GameEvent.FLUID_PICKUP, pos); + } + return ActionResult.success(world.isClient); + }); + + KRYSLUM_FLUMROCK_CAULDRON_BEHAVIOR.put(ModItems.KRYSLUM_BUCKET, (state, world, pos, player, hand, stack) -> { + if (state.get(LEVEL) == 12) { + return ActionResult.PASS; + } + if (!world.isClient) { + player.setStackInHand(hand, ItemUsage.exchangeStack(stack, player, new ItemStack(Items.BUCKET))); + player.incrementStat(Stats.USE_CAULDRON); + player.incrementStat(Stats.USED.getOrCreateStat(stack.getItem())); + world.setBlockState(pos, state.cycle(LEVEL)); + world.playSound(null, pos, SoundEvents.ITEM_BUCKET_EMPTY, SoundCategory.BLOCKS, 1.0f, 1.0f); + world.emitGameEvent(null, GameEvent.FLUID_PLACE, pos); + } + return ActionResult.success(world.isClient); + }); + + KRYSLUM_FLUMROCK_CAULDRON_BEHAVIOR.put(ModItems.QUAZARITH_PIECES, (state, world, pos, player, hand, stack) -> { + if (state.get(QUAZARITH_LEVEL) == 12) { + return ActionResult.PASS; + } + if (!world.isClient) { + if (!player.isCreative()){ + ItemStack heldItem = player.getMainHandStack().getItem() == ModItems.QUAZARITH_PIECES ? + player.getMainHandStack() : player.getOffHandStack(); + heldItem.decrement(1);} + player.incrementStat(Stats.USE_CAULDRON); + player.incrementStat(Stats.USED.getOrCreateStat(stack.getItem())); + world.setBlockState(pos, state.cycle(QUAZARITH_LEVEL)); + world.playSound(null, pos, SoundEvents.ITEM_BUCKET_EMPTY, SoundCategory.BLOCKS, 1.0f, 1.0f); + world.emitGameEvent(null, GameEvent.FLUID_PLACE, pos); + } + return ActionResult.success(world.isClient); + }); + + KRYSLUM_FLUMROCK_CAULDRON_BEHAVIOR.put(Items.DIAMOND, (state, world, pos, player, hand, stack) -> { + if (state.get(DIAMOND_LEVEL) == 12) { + return ActionResult.PASS; + } + if (!world.isClient) { + if (!player.isCreative()){ + ItemStack heldItem = player.getMainHandStack().getItem() == Items.DIAMOND ? + player.getMainHandStack() : player.getOffHandStack(); + heldItem.decrement(1);} + player.incrementStat(Stats.USE_CAULDRON); + player.incrementStat(Stats.USED.getOrCreateStat(stack.getItem())); + world.setBlockState(pos, state.cycle(DIAMOND_LEVEL)); + world.playSound(null, pos, SoundEvents.ITEM_BUCKET_EMPTY, SoundCategory.BLOCKS, 1.0f, 1.0f); + world.emitGameEvent(null, GameEvent.FLUID_PLACE, pos); + } + return ActionResult.success(world.isClient); + }); + + KRYSLUM_FLUMROCK_CAULDRON_BEHAVIOR.put(ModItems.QUAZARITH_INGOT, (state, world, pos, player, hand, stack) -> { + if (state.get(QUAZARITH_LEVEL) > 8 || state.get(DIAMOND_LEVEL) > 8) { + return ActionResult.PASS; + } + if (!world.isClient) { + if (!player.isCreative()){ + ItemStack heldItem = player.getMainHandStack().getItem() == Items.DIAMOND ? + player.getMainHandStack() : player.getOffHandStack(); + heldItem.decrement(1);} + player.incrementStat(Stats.USE_CAULDRON); + player.incrementStat(Stats.USED.getOrCreateStat(stack.getItem())); + + int i = state.get(QUAZARITH_LEVEL) + SculkDepths.CONFIG.quazarith_ingot_quazarith_pieces_cost; + int j = state.get(DIAMOND_LEVEL) + SculkDepths.CONFIG.quazarith_ingot_diamond_cost; + BlockState blockState = state.with(QUAZARITH_LEVEL, i).with(DIAMOND_LEVEL, j); + world.setBlockState(pos, blockState); + + world.playSound(null, pos, SoundEvents.ITEM_BUCKET_EMPTY, SoundCategory.BLOCKS, 1.0f, 1.0f); + world.emitGameEvent(null, GameEvent.FLUID_PLACE, pos); + } + return ActionResult.success(world.isClient); + }); + + } + + public static void decrementFluidLevel(BlockState state, World world, BlockPos pos) { + int i = state.get(LEVEL) - 1; + BlockState blockState = i == 0 ? ModBlocks.FLUMROCK_CAULDRON.getDefaultState() : state.with(LEVEL, i); + world.setBlockState(pos, blockState); + world.emitGameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Emitter.of(blockState)); + } + + public static void registerBucketBehavior(Map behavior) { + behavior.put(ModItems.KRYSLUM_BUCKET, FILL_WITH_KRYSLUM); + + } +} \ No newline at end of file diff --git a/src/main/java/net/ugi/sculk_depths/block/custom/SoulFireBlock.java b/src/main/java/net/ugi/sculk_depths/block/custom/SoulFireBlock.java index ea926978..07782cbd 100644 --- a/src/main/java/net/ugi/sculk_depths/block/custom/SoulFireBlock.java +++ b/src/main/java/net/ugi/sculk_depths/block/custom/SoulFireBlock.java @@ -1,16 +1,15 @@ package net.ugi.sculk_depths.block.custom; -import net.kyrptonaught.customportalapi.portal.PortalPlacer; -import net.minecraft.block.*; +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.AbstractFireBlock; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import net.minecraft.world.World; import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; -import static net.ugi.sculk_depths.portal.Portals.SOUL_FIRE; - public class SoulFireBlock extends AbstractFireBlock { diff --git a/src/main/java/net/ugi/sculk_depths/block/custom/nonConnectingBlock.java b/src/main/java/net/ugi/sculk_depths/block/custom/nonConnectingBlock.java deleted file mode 100644 index 03885e83..00000000 --- a/src/main/java/net/ugi/sculk_depths/block/custom/nonConnectingBlock.java +++ /dev/null @@ -1,17 +0,0 @@ -package net.ugi.sculk_depths.block.custom; - -import net.minecraft.block.*; - - -public class nonConnectingBlock extends Block { - - - public nonConnectingBlock(Settings settings) { - super(settings); - } - - //@Override - public static boolean cannotConnect(BlockState state) { - return true; - } -} diff --git a/src/main/java/net/ugi/sculk_depths/block/entity/CauldronBlockEntity.java b/src/main/java/net/ugi/sculk_depths/block/entity/CauldronBlockEntity.java new file mode 100644 index 00000000..9a970f9a --- /dev/null +++ b/src/main/java/net/ugi/sculk_depths/block/entity/CauldronBlockEntity.java @@ -0,0 +1,113 @@ +package net.ugi.sculk_depths.block.entity; + +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.Inventories; +import net.minecraft.inventory.SidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.util.collection.DefaultedList; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.ugi.sculk_depths.block.ModBlockEntities; +import org.jetbrains.annotations.Nullable; + +public class CauldronBlockEntity extends BlockEntity implements SidedInventory { + + private DefaultedList inventory = DefaultedList.ofSize(3, ItemStack.EMPTY); + + + public CauldronBlockEntity(BlockPos pos, BlockState state) { + super(ModBlockEntities.FLUMROCK_CAULDRON_BLOCK_ENTITY , pos, state); + } + + @Override + public int[] getAvailableSlots(Direction side) { + int[] result = new int[this.inventory.size()]; + for (int i = 0; i < result.length; i++) { + result[i] = i; + } + + return result; + } + + @Override + public boolean canInsert(int slot, ItemStack stack, @Nullable Direction dir) { + return true; + } + + @Override + public boolean canExtract(int slot, ItemStack stack, Direction dir) { + return true; + } + + @Override + public int size() { + return this.inventory.size(); + } + + @Override + public boolean isEmpty() { + for (int i = 0; i < size(); i++) { + ItemStack stack = getStack(i); + if (!stack.isEmpty()) { + return false; + } + } + + return true; + } + + @Override + public ItemStack getStack(int slot) { + return this.inventory.get(slot); + } + + @Override + public ItemStack removeStack(int slot, int amount) { + ItemStack result = Inventories.splitStack(this.inventory , slot, amount); + if (!result.isEmpty()) { + markDirty(); + } + + return result; + } + + @Override + public ItemStack removeStack(int slot) { + return Inventories.removeStack(this.inventory, slot); + } + + @Override + public void setStack(int slot, ItemStack stack) { + this.inventory.set(slot, stack); + if (stack.getCount() > getMaxCountPerStack()) { + stack.setCount(getMaxCountPerStack()); + } + } + + @Override + public boolean canPlayerUse(PlayerEntity player) { + return true; + } + + @Override + public void readNbt(NbtCompound nbt) { + super.readNbt(nbt); + this.inventory = DefaultedList.ofSize(this.size(), ItemStack.EMPTY); + Inventories.readNbt(nbt, this.inventory); + } + + @Override + protected void writeNbt(NbtCompound nbt) { + super.writeNbt(nbt); + Inventories.writeNbt(nbt, this.inventory); + } + + @Override + public void clear() { + this.inventory.clear(); + } + +} diff --git a/src/main/java/net/ugi/sculk_depths/config/Config.java b/src/main/java/net/ugi/sculk_depths/config/Config.java new file mode 100644 index 00000000..f4808a5c --- /dev/null +++ b/src/main/java/net/ugi/sculk_depths/config/Config.java @@ -0,0 +1,48 @@ +package net.ugi.sculk_depths.config; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import net.fabricmc.loader.api.FabricLoader; +import net.ugi.sculk_depths.SculkDepths; + +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; + +import static net.ugi.sculk_depths.SculkDepths.CONFIG; + +public class Config { + public static void loadConfig() { + File configFile = new File(FabricLoader.getInstance().getConfigDir().toFile(), SculkDepths.MOD_ID + "_config.json"); + Gson gson = new GsonBuilder().setPrettyPrinting().create(); + if (configFile.exists()) { + try { + FileReader fileReader = new FileReader(configFile); + CONFIG = gson.fromJson(fileReader, ConfigHandler.class); + fileReader.close(); + saveConfig(); //update config + } catch (IOException e) { + SculkDepths.LOGGER.warn("the config was not loaded: " + e.getLocalizedMessage()); + } + } else { + CONFIG = new ConfigHandler(); + saveConfig(); + } + } + + public static void saveConfig() { + File configFile = new File(FabricLoader.getInstance().getConfigDir().toFile(), SculkDepths.MOD_ID + "_config.json"); + Gson gson = new GsonBuilder().setPrettyPrinting().create(); + if (!configFile.getParentFile().exists()) { + configFile.getParentFile().mkdir(); + } + try { + FileWriter fileWriter = new FileWriter(configFile); + fileWriter.write(gson.toJson(CONFIG)); + fileWriter.close(); + } catch (IOException e) { + SculkDepths.LOGGER.warn("the config was not saved: " + e.getLocalizedMessage()); + } + } +} diff --git a/src/main/java/net/ugi/sculk_depths/config/ConfigHandler.java b/src/main/java/net/ugi/sculk_depths/config/ConfigHandler.java new file mode 100644 index 00000000..362fec1c --- /dev/null +++ b/src/main/java/net/ugi/sculk_depths/config/ConfigHandler.java @@ -0,0 +1,62 @@ +package net.ugi.sculk_depths.config; + +public class ConfigHandler { + public int config_version = 1; + public double glomper_health = 20; + public float glomper_damage = 20; + + public int activate_portal_durability_usage = 15; + + //quazarith helmet + public int quazarith_helmet_kryslum_cost = 5; + public int quazarith_helmet_diamond_cost = 5; + public int quazarith_helmet_quazarith_pieces_cost = 5; + + //quazarith chestplate + public int quazarith_chestplate_kryslum_cost = 8; + public int quazarith_chestplate_diamond_cost = 8; + public int quazarith_chestplate_quazarith_pieces_cost = 8; + + //quazarith leggings + public int quazarith_leggings_kryslum_cost = 7; + public int quazarith_leggings_diamond_cost = 7; + public int quazarith_leggings_quazarith_pieces_cost = 7; + + //quazarith boots + public int quazarith_boots_kryslum_cost = 4; + + public int quazarith_boots_diamond_cost = 4; + public int quazarith_boots_quazarith_pieces_cost = 4; + + //quazarith shovel + public int quazarith_shovel_kryslum_cost = 1; + public int quazarith_shovel_diamond_cost = 1; + public int quazarith_shovel_quazarith_pieces_cost = 1; + + //quazarith pickaxe + public int quazarith_pickaxe_kryslum_cost = 3; + public int quazarith_pickaxe_diamond_cost = 3; + public int quazarith_pickaxe_quazarith_pieces_cost = 3; + + //quazarith axe + public int quazarith_axe_kryslum_cost = 3; + public int quazarith_axe_diamond_cost = 3; + public int quazarith_axe_quazarith_pieces_cost = 3; + + //quazarith hoe + public int quazarith_hoe_kryslum_cost = 2; + public int quazarith_hoe_diamond_cost = 2; + public int quazarith_hoe_quazarith_pieces_cost = 2; + + //quazarith sword + public int quazarith_sword_kryslum_cost = 2; + public int quazarith_sword_diamond_cost = 2; + public int quazarith_sword_quazarith_pieces_cost = 2; + + //quazarith ingot + public int quazarith_ingot_kryslum_cost = 4; + public int quazarith_ingot_diamond_cost = 4; + public int quazarith_ingot_quazarith_pieces_cost = 4; + + +} diff --git a/src/main/java/net/ugi/sculk_depths/datagen/ModLootTableGenerator.java b/src/main/java/net/ugi/sculk_depths/datagen/ModLootTableGenerator.java new file mode 100644 index 00000000..6ed0c792 --- /dev/null +++ b/src/main/java/net/ugi/sculk_depths/datagen/ModLootTableGenerator.java @@ -0,0 +1,20 @@ +package net.ugi.sculk_depths.datagen; + +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider; +import net.ugi.sculk_depths.block.ModBlocks; + +public class ModLootTableGenerator extends FabricBlockLootTableProvider { + + public ModLootTableGenerator(FabricDataOutput dataOutput) { + super(dataOutput); + } + + @Override + public void generate() { + addDrop(ModBlocks.VALTROX_PRESSURE_PLATE, drops(ModBlocks.VALTROX_PRESSURE_PLATE.asItem())); + addDrop(ModBlocks.DRIED_VALTROX_PRESSURE_PLATE, drops(ModBlocks.DRIED_VALTROX_PRESSURE_PLATE.asItem())); + addDrop(ModBlocks.PETRIFIED_VALTROX_PRESSURE_PLATE, drops(ModBlocks.PETRIFIED_VALTROX_PRESSURE_PLATE.asItem())); + } +} + diff --git a/src/main/java/net/ugi/sculk_depths/datagen/ModModelGenerator.java b/src/main/java/net/ugi/sculk_depths/datagen/ModModelGenerator.java new file mode 100644 index 00000000..138f0789 --- /dev/null +++ b/src/main/java/net/ugi/sculk_depths/datagen/ModModelGenerator.java @@ -0,0 +1,26 @@ +package net.ugi.sculk_depths.datagen; + + +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider; +import net.minecraft.data.client.BlockStateModelGenerator; +import net.minecraft.data.client.ItemModelGenerator; +import net.ugi.sculk_depths.block.ModBlocks; + +public class ModModelGenerator extends FabricModelProvider { + public ModModelGenerator(FabricDataOutput output) { + super(output); + } + + @Override + public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGenerator) { + //blockStateModelGenerator.registerPressurePlate(ModBlocks.VALTROX_PRESSURE_PLATE, ModBlocks.VALTROX_PLANKS); + //blockStateModelGenerator.registerPressurePlate(ModBlocks.DRIED_VALTROX_PRESSURE_PLATE, ModBlocks.DRIED_VALTROX_PLANKS); + //blockStateModelGenerator.registerPressurePlate(ModBlocks.PETRIFIED_VALTROX_PRESSURE_PLATE, ModBlocks.PETRIFIED_VALTROX_SLATES); + } + + @Override + public void generateItemModels(ItemModelGenerator itemModelGenerator) { + //itemModelGenerator.register(ModBlocks.VALTROX_PRESSURE_PLATE.asItem(), Models.); + } +} diff --git a/src/main/java/net/ugi/sculk_depths/datagen/ModModelProvider.java b/src/main/java/net/ugi/sculk_depths/datagen/ModModelProvider.java deleted file mode 100644 index 0a30e671..00000000 --- a/src/main/java/net/ugi/sculk_depths/datagen/ModModelProvider.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.ugi.sculk_depths.datagen; - -import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider; - -import net.minecraft.data.client.BlockStateModelGenerator; -import net.minecraft.data.client.ItemModelGenerator; -import net.minecraft.data.client.Models; -import net.ugi.sculk_depths.block.ModBlocks; -import net.ugi.sculk_depths.item.ModItems; - -public class ModModelProvider extends FabricModelProvider { - public ModModelProvider(FabricDataOutput output) { - super(output); - } - - @Override - public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGenerator) { - - } - - @Override - public void generateItemModels(ItemModelGenerator itemModelGenerator) { - - } -} diff --git a/src/main/java/net/ugi/sculk_depths/entity/client/GlomperModel.java b/src/main/java/net/ugi/sculk_depths/entity/client/GlomperModel.java index b2635474..eb534d39 100644 --- a/src/main/java/net/ugi/sculk_depths/entity/client/GlomperModel.java +++ b/src/main/java/net/ugi/sculk_depths/entity/client/GlomperModel.java @@ -5,7 +5,6 @@ import net.minecraft.util.math.MathHelper; import net.ugi.sculk_depths.SculkDepths; import net.ugi.sculk_depths.entity.custom.GlomperEntity; -import software.bernie.example.block.entity.FertilizerBlockEntity; import software.bernie.geckolib.constant.DataTickets; import software.bernie.geckolib.core.animatable.model.CoreGeoBone; import software.bernie.geckolib.core.animation.AnimationState; diff --git a/src/main/java/net/ugi/sculk_depths/entity/client/GlomperRenderer.java b/src/main/java/net/ugi/sculk_depths/entity/client/GlomperRenderer.java index fd2161db..507f7c45 100644 --- a/src/main/java/net/ugi/sculk_depths/entity/client/GlomperRenderer.java +++ b/src/main/java/net/ugi/sculk_depths/entity/client/GlomperRenderer.java @@ -1,6 +1,5 @@ package net.ugi.sculk_depths.entity.client; -import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.entity.EntityRendererFactory; import net.minecraft.client.util.math.MatrixStack; @@ -8,7 +7,6 @@ import net.minecraft.util.math.BlockPos; import net.ugi.sculk_depths.SculkDepths; import net.ugi.sculk_depths.entity.custom.GlomperEntity; -import org.jetbrains.annotations.Nullable; import software.bernie.geckolib.renderer.GeoEntityRenderer; public class GlomperRenderer extends GeoEntityRenderer { diff --git a/src/main/java/net/ugi/sculk_depths/entity/custom/GlomperEntity.java b/src/main/java/net/ugi/sculk_depths/entity/custom/GlomperEntity.java index d3cd542a..2453e250 100644 --- a/src/main/java/net/ugi/sculk_depths/entity/custom/GlomperEntity.java +++ b/src/main/java/net/ugi/sculk_depths/entity/custom/GlomperEntity.java @@ -16,6 +16,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.world.ServerWorld; import net.minecraft.world.World; +import net.ugi.sculk_depths.SculkDepths; import net.ugi.sculk_depths.entity.ModEntities; import org.jetbrains.annotations.Nullable; import software.bernie.geckolib.animatable.GeoEntity; @@ -41,8 +42,8 @@ public GlomperEntity(EntityType entityType, World wor public static DefaultAttributeContainer.Builder setAttributes() { return AnimalEntity.createMobAttributes() - .add(EntityAttributes.GENERIC_MAX_HEALTH, 20.0D) - .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 20.0f) + .add(EntityAttributes.GENERIC_MAX_HEALTH, SculkDepths.CONFIG.glomper_health) + .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, SculkDepths.CONFIG.glomper_damage) .add(EntityAttributes.GENERIC_FOLLOW_RANGE, 100) .add(EntityAttributes.GENERIC_ATTACK_SPEED, 0.5f) // doubt this does anything .add(EntityAttributes.GENERIC_FLYING_SPEED, 0.2f) // not needed but will corrupt glompers upon removal (REMOVE BEFORE 0.0.6) diff --git a/src/main/java/net/ugi/sculk_depths/fluid/KryslumFluid.java b/src/main/java/net/ugi/sculk_depths/fluid/KryslumFluid.java index 55a0a3da..401ab241 100644 --- a/src/main/java/net/ugi/sculk_depths/fluid/KryslumFluid.java +++ b/src/main/java/net/ugi/sculk_depths/fluid/KryslumFluid.java @@ -4,7 +4,9 @@ import net.minecraft.block.BlockState; import net.minecraft.block.FluidBlock; import net.minecraft.block.entity.BlockEntity; -import net.minecraft.fluid.*; +import net.minecraft.fluid.FlowableFluid; +import net.minecraft.fluid.Fluid; +import net.minecraft.fluid.FluidState; import net.minecraft.item.Item; import net.minecraft.particle.ParticleEffect; import net.minecraft.particle.ParticleTypes; @@ -18,7 +20,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.math.random.Random; -import net.minecraft.world.*; +import net.minecraft.world.BlockView; +import net.minecraft.world.World; +import net.minecraft.world.WorldAccess; +import net.minecraft.world.WorldView; import net.ugi.sculk_depths.block.ModBlocks; import net.ugi.sculk_depths.item.ModItems; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/net/ugi/sculk_depths/item/ModArmorMaterials.java b/src/main/java/net/ugi/sculk_depths/item/ModArmorMaterials.java index 87179a6c..fb210b05 100644 --- a/src/main/java/net/ugi/sculk_depths/item/ModArmorMaterials.java +++ b/src/main/java/net/ugi/sculk_depths/item/ModArmorMaterials.java @@ -1,15 +1,10 @@ package net.ugi.sculk_depths.item; -import net.minecraft.block.Blocks; -import net.minecraft.entity.EquipmentSlot; import net.minecraft.item.ArmorItem; import net.minecraft.item.ArmorMaterial; -import net.minecraft.item.ItemConvertible; -import net.minecraft.item.Items; import net.minecraft.recipe.Ingredient; import net.minecraft.sound.SoundEvent; import net.minecraft.sound.SoundEvents; -import net.minecraft.util.Lazy; import java.util.function.Supplier; diff --git a/src/main/java/net/ugi/sculk_depths/item/ModItems.java b/src/main/java/net/ugi/sculk_depths/item/ModItems.java index 9810429d..f112a6cc 100644 --- a/src/main/java/net/ugi/sculk_depths/item/ModItems.java +++ b/src/main/java/net/ugi/sculk_depths/item/ModItems.java @@ -101,7 +101,6 @@ private static void addToItemGroup(RegistryKey group, Item item) { } public static void registerModItems() { - SculkDepths.LOGGER.info("Registering Mod items for" + SculkDepths.MOD_ID); addItemsToItemGroup(); } } diff --git a/src/main/java/net/ugi/sculk_depths/item/ModToolMaterials.java b/src/main/java/net/ugi/sculk_depths/item/ModToolMaterials.java index 18374412..3c1a382e 100644 --- a/src/main/java/net/ugi/sculk_depths/item/ModToolMaterials.java +++ b/src/main/java/net/ugi/sculk_depths/item/ModToolMaterials.java @@ -1,11 +1,7 @@ package net.ugi.sculk_depths.item; -import net.fabricmc.yarn.constants.MiningLevels; -import net.minecraft.item.Items; import net.minecraft.item.ToolMaterial; import net.minecraft.recipe.Ingredient; -import net.minecraft.registry.tag.ItemTags; -import net.minecraft.util.Lazy; import java.util.function.Supplier; diff --git a/src/main/java/net/ugi/sculk_depths/item/custom/EnergizedFlintAndSteelItem.java b/src/main/java/net/ugi/sculk_depths/item/custom/EnergizedFlintAndSteelItem.java index 65d7175c..9dadc652 100644 --- a/src/main/java/net/ugi/sculk_depths/item/custom/EnergizedFlintAndSteelItem.java +++ b/src/main/java/net/ugi/sculk_depths/item/custom/EnergizedFlintAndSteelItem.java @@ -5,7 +5,6 @@ import net.minecraft.block.*; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.FlintAndSteelItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; @@ -17,6 +16,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.event.GameEvent; +import net.ugi.sculk_depths.SculkDepths; import net.ugi.sculk_depths.block.ModBlocks; import static net.ugi.sculk_depths.portal.Portals.SOUL_FIRE; @@ -35,11 +35,10 @@ public ActionResult useOnBlock(ItemUsageContext context) { //originally copied f BlockState blockState = world.getBlockState(blockPos = context.getBlockPos()); boolean portalLighted = PortalPlacer.attemptPortalLight(world, blockPos.offset(context.getSide()), SOUL_FIRE); - System.out.println(portalLighted); if(portalLighted){ ItemStack itemStack = context.getStack(); if (playerEntity instanceof ServerPlayerEntity) { - itemStack.damage(15, playerEntity, p -> p.sendToolBreakStatus(context.getHand())); //todo config damage amount + itemStack.damage(SculkDepths.CONFIG.activate_portal_durability_usage, playerEntity, p -> p.sendToolBreakStatus(context.getHand())); } return ActionResult.success(world.isClient()); } diff --git a/src/main/java/net/ugi/sculk_depths/mixin/AttachedStemBlockMixin.java b/src/main/java/net/ugi/sculk_depths/mixin/AttachedStemBlockMixin.java index 067989c1..a559efe0 100644 --- a/src/main/java/net/ugi/sculk_depths/mixin/AttachedStemBlockMixin.java +++ b/src/main/java/net/ugi/sculk_depths/mixin/AttachedStemBlockMixin.java @@ -4,7 +4,6 @@ import com.llamalad7.mixinextras.sugar.Local; import net.minecraft.block.AttachedStemBlock; import net.minecraft.block.BlockState; -import net.minecraft.block.StemBlock; import net.ugi.sculk_depths.block.custom.KryslumEnrichedSoilBLock; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/net/ugi/sculk_depths/mixin/BlockMixin.java b/src/main/java/net/ugi/sculk_depths/mixin/BlockMixin.java new file mode 100644 index 00000000..3f2ae9fa --- /dev/null +++ b/src/main/java/net/ugi/sculk_depths/mixin/BlockMixin.java @@ -0,0 +1,17 @@ +package net.ugi.sculk_depths.mixin; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.ugi.sculk_depths.block.ModBlocks; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(Block.class) +public class BlockMixin { + @Inject(method = "cannotConnect", at = @At("HEAD"), cancellable = true) + private static void addZygrinLightBlockToCannotConnect(BlockState state, CallbackInfoReturnable cir) { + if (state.isOf(ModBlocks.ZYGRIN_LIGHT)) cir.setReturnValue(true); + } +} diff --git a/src/main/java/net/ugi/sculk_depths/mixin/CropBlockMixin.java b/src/main/java/net/ugi/sculk_depths/mixin/CropBlockMixin.java index bb82b17a..be2e9eb0 100644 --- a/src/main/java/net/ugi/sculk_depths/mixin/CropBlockMixin.java +++ b/src/main/java/net/ugi/sculk_depths/mixin/CropBlockMixin.java @@ -2,8 +2,9 @@ import com.llamalad7.mixinextras.injector.ModifyReturnValue; import com.llamalad7.mixinextras.sugar.Local; -import net.minecraft.block.*; - +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.CropBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; import net.ugi.sculk_depths.block.ModBlocks; @@ -36,7 +37,6 @@ private static float changeMoistureOnKryslumEnrichedSoil(float originalValue, Bl BlockState blockState = world.getBlockState(pos.down()); if (blockState.isOf(ModBlocks.KRYSLUM_ENRICHED_SOIL)) { return 7.0f; - } return originalValue; } diff --git a/src/main/java/net/ugi/sculk_depths/mixin/ExampleMixin.java b/src/main/java/net/ugi/sculk_depths/mixin/ExampleMixin.java index ddfc5966..115b1572 100644 --- a/src/main/java/net/ugi/sculk_depths/mixin/ExampleMixin.java +++ b/src/main/java/net/ugi/sculk_depths/mixin/ExampleMixin.java @@ -1,7 +1,7 @@ package net.ugi.sculk_depths.mixin; -import net.ugi.sculk_depths.SculkDepths; import net.minecraft.client.gui.screen.TitleScreen; +import net.ugi.sculk_depths.SculkDepths; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/main/java/net/ugi/sculk_depths/mixin/NoiseChunkGeneratorMixin.java b/src/main/java/net/ugi/sculk_depths/mixin/NoiseChunkGeneratorMixin.java index 5f10c68c..e262636a 100644 --- a/src/main/java/net/ugi/sculk_depths/mixin/NoiseChunkGeneratorMixin.java +++ b/src/main/java/net/ugi/sculk_depths/mixin/NoiseChunkGeneratorMixin.java @@ -1,5 +1,7 @@ package net.ugi.sculk_depths.mixin; +import net.minecraft.block.Blocks; +import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.gen.chunk.AquiferSampler; import net.minecraft.world.gen.chunk.ChunkGeneratorSettings; import net.minecraft.world.gen.chunk.NoiseChunkGenerator; @@ -8,13 +10,23 @@ @Mixin({NoiseChunkGenerator.class}) -public class NoiseChunkGeneratorMixin { +public abstract class NoiseChunkGeneratorMixin { + /** - * @author Andrew6rant (Andrew Grant) - * @reason Remove the hardcoded -54 lava sea level + * @author Matteo_fey (@warior456) + * @reason Fix the hardcoded -54 lava sea level */ @Overwrite private static AquiferSampler.FluidLevelSampler createFluidLevelSampler(ChunkGeneratorSettings settings) { - return (x, y, z) -> new AquiferSampler.FluidLevel(settings.seaLevel(), settings.defaultFluid()); + AquiferSampler.FluidLevel fluidLevel = new AquiferSampler.FluidLevel(settings.seaLevel() - 117, Blocks.LAVA.getDefaultState()); + int i = settings.seaLevel(); + AquiferSampler.FluidLevel fluidLevel2 = new AquiferSampler.FluidLevel(i, settings.defaultFluid()); + AquiferSampler.FluidLevel fluidLevel3 = new AquiferSampler.FluidLevel(DimensionType.MIN_HEIGHT * 2, Blocks.AIR.getDefaultState()); + return (x, y, z) -> { + if (y < Math.min(settings.seaLevel() -117 , i)) { //todo configurable (in other mod) + return fluidLevel; + } + return fluidLevel2; + }; } } \ No newline at end of file diff --git a/src/main/java/net/ugi/sculk_depths/mixin/StemBlockMixin.java b/src/main/java/net/ugi/sculk_depths/mixin/StemBlockMixin.java index 9b5b1ab4..5eb5f5cb 100644 --- a/src/main/java/net/ugi/sculk_depths/mixin/StemBlockMixin.java +++ b/src/main/java/net/ugi/sculk_depths/mixin/StemBlockMixin.java @@ -2,8 +2,8 @@ import com.llamalad7.mixinextras.injector.ModifyReturnValue; import com.llamalad7.mixinextras.sugar.Local; -import net.minecraft.block.*; - +import net.minecraft.block.BlockState; +import net.minecraft.block.StemBlock; import net.ugi.sculk_depths.block.custom.KryslumEnrichedSoilBLock; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/net/ugi/sculk_depths/portal/Portals.java b/src/main/java/net/ugi/sculk_depths/portal/Portals.java index 446bf957..5650b15b 100644 --- a/src/main/java/net/ugi/sculk_depths/portal/Portals.java +++ b/src/main/java/net/ugi/sculk_depths/portal/Portals.java @@ -6,6 +6,7 @@ import net.minecraft.block.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; +import net.ugi.sculk_depths.SculkDepths; import net.ugi.sculk_depths.item.ModItems; public class Portals { @@ -19,16 +20,18 @@ public static void registerModPortals() { .customIgnitionSource(SOUL_FIRE) //.lightWithItem(ModItems.ENERGISED_FLINT_AND_STEEL) .setPortalSearchYRange(0, 120) + /* .registerIgniteEvent((player, world, portalPos, framePos, portalIgnitionSource) -> { if (portalIgnitionSource.sourceType == PortalIgnitionSource.SourceType.USEITEM && player != null) { if (player.isCreative()) return; ItemStack heldItem = player.getMainHandStack().getItem() == ModItems.ENERGISED_FLINT_AND_STEEL ? player.getMainHandStack() : player.getOffHandStack(); - heldItem.damage(10, player, p -> p.sendToolBreakStatus(player.getActiveHand())); //todo configurable damage + heldItem.damage(SculkDepths.CONFIG.activate_portal_durability_usage , player, p -> p.sendToolBreakStatus(player.getActiveHand())); //heldItem.setDamage(heldItem.getDamage() + 10); //if above breaks use this with a custom durability check } }) + */ .registerPortal(); } diff --git a/src/main/java/net/ugi/sculk_depths/recipe/ModRecipes.java b/src/main/java/net/ugi/sculk_depths/recipe/ModRecipes.java new file mode 100644 index 00000000..3b0fe526 --- /dev/null +++ b/src/main/java/net/ugi/sculk_depths/recipe/ModRecipes.java @@ -0,0 +1,18 @@ +package net.ugi.sculk_depths.recipe; + +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; +import net.ugi.sculk_depths.SculkDepths; + +public class ModRecipes { + public static void register() { + /* + Registry.register(Registries.RECIPE_SERIALIZER, new Identifier(SculkDepths.MOD_ID, FlumrockCauldronRecipeSerializer.ID), + FlumrockCauldronRecipeSerializer.INSTANCE); + Registry.register(Registries.RECIPE_TYPE, new Identifier(SculkDepths.MOD_ID, FlumRockCauldronRecipe.Type.ID), + FlumRockCauldronRecipe.Type.INSTANCE); + + */ + } +} diff --git a/src/main/java/net/ugi/sculk_depths/sound/ModSounds.java b/src/main/java/net/ugi/sculk_depths/sound/ModSounds.java index 761f962c..a063253b 100644 --- a/src/main/java/net/ugi/sculk_depths/sound/ModSounds.java +++ b/src/main/java/net/ugi/sculk_depths/sound/ModSounds.java @@ -4,7 +4,6 @@ import net.minecraft.registry.Registry; import net.minecraft.sound.SoundEvent; import net.minecraft.util.Identifier; -import net.ugi.sculk_depths.SculkDepths; public class ModSounds { diff --git a/src/main/java/net/ugi/sculk_depths/state/property/ModProperties.java b/src/main/java/net/ugi/sculk_depths/state/property/ModProperties.java new file mode 100644 index 00000000..bb6f23ed --- /dev/null +++ b/src/main/java/net/ugi/sculk_depths/state/property/ModProperties.java @@ -0,0 +1,10 @@ +package net.ugi.sculk_depths.state.property; + +import net.minecraft.state.property.IntProperty; + +public class ModProperties { + + public static final IntProperty KRYSLUM_LEVEL = IntProperty.of("kryslum", 0, 12); + public static final IntProperty QUAZARITH_LEVEL = IntProperty.of("quazarith", 0, 12); + public static final IntProperty DIAMOND_LEVEL = IntProperty.of("diamond", 0, 12); +} diff --git a/src/main/java/net/ugi/sculk_depths/util/ModLootTableModifiers.java b/src/main/java/net/ugi/sculk_depths/util/ModLootTableModifiers.java index 6e5f6691..00228ecd 100644 --- a/src/main/java/net/ugi/sculk_depths/util/ModLootTableModifiers.java +++ b/src/main/java/net/ugi/sculk_depths/util/ModLootTableModifiers.java @@ -2,11 +2,7 @@ package net.ugi.sculk_depths.util; -import net.fabricmc.fabric.api.loot.v2.LootTableEvents; -import net.minecraft.loot.LootPool; -import net.minecraft.loot.LootTable; import net.minecraft.util.Identifier; -import net.ugi.sculk_depths.SculkDepths; public class ModLootTableModifiers { diff --git a/src/main/java/net/ugi/sculk_depths/world/gen/feature/ModTreeConfiguredFeatures.java b/src/main/java/net/ugi/sculk_depths/world/gen/feature/ModTreeConfiguredFeatures.java index 3f20e9d2..5880e214 100644 --- a/src/main/java/net/ugi/sculk_depths/world/gen/feature/ModTreeConfiguredFeatures.java +++ b/src/main/java/net/ugi/sculk_depths/world/gen/feature/ModTreeConfiguredFeatures.java @@ -1,24 +1,9 @@ package net.ugi.sculk_depths.world.gen.feature; -import net.minecraft.block.*; -import net.minecraft.registry.Registerable; - import net.minecraft.registry.RegistryKey; - -import net.minecraft.registry.RegistryKeys; -import net.minecraft.util.Identifier; -import net.minecraft.util.math.intprovider.ConstantIntProvider; - -import net.minecraft.world.gen.feature.*; - -import net.minecraft.world.gen.feature.size.TwoLayersFeatureSize; -import net.minecraft.world.gen.foliage.*; - -import net.minecraft.world.gen.stateprovider.BlockStateProvider; - -import net.minecraft.world.gen.trunk.*; -import net.ugi.sculk_depths.block.ModBlocks; +import net.minecraft.world.gen.feature.ConfiguredFeature; +import net.minecraft.world.gen.feature.ConfiguredFeatures; public class ModTreeConfiguredFeatures { diff --git a/src/main/resources/Licenses/Andrew6rant/LICENSE_MC-237017-Fix b/src/main/resources/Licenses/Andrew6rant/LICENSE_MC-237017-Fix deleted file mode 100644 index e9e6e3c2..00000000 --- a/src/main/resources/Licenses/Andrew6rant/LICENSE_MC-237017-Fix +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2023 Andrew Grant - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/main/resources/assets/minecraft/optifine/emissive.properties b/src/main/resources/assets/minecraft/optifine/emissive.properties new file mode 100644 index 00000000..3ce7dca0 --- /dev/null +++ b/src/main/resources/assets/minecraft/optifine/emissive.properties @@ -0,0 +1 @@ +suffix.emissive=_e \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/shaders/core/rendertype_solid.fsh b/src/main/resources/assets/minecraft/shaders/core/rendertype_solid.fsh new file mode 100644 index 00000000..c3ac32f0 --- /dev/null +++ b/src/main/resources/assets/minecraft/shaders/core/rendertype_solid.fsh @@ -0,0 +1,35 @@ +#version 150 + +#moj_import +#moj_import + +uniform sampler2D Sampler0; + + +uniform vec4 ColorModulator; +uniform float FogStart; +uniform float FogEnd; +uniform vec4 FogColor; + +in float vertexDistance; +in float dimension; +in vec4 vertexColor; +in vec4 lightColor; +in vec4 maxLightColor; +in vec2 texCoord0; +in vec3 faceLightingNormal; +in vec4 normal; +in vec3 pos_pixel; + +out vec4 fragColor; + +void main() { + vec4 color = texture(Sampler0, texCoord0) * vertexColor * ColorModulator; + float alpha = textureLod(Sampler0, texCoord0, 0.0).a * 255.0; + if (alpha == 1 || (alpha_hub(alpha, dimension).y == 2 && alpha_hub(alpha, dimension).x != 0)){ + discard; + } + color = make_emissive(color, lightColor, maxLightColor, vertexDistance, alpha, pos_pixel, dimension) / face_lighting_check(faceLightingNormal, alpha, dimension); + color.a = 1; + fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); +} diff --git a/src/main/resources/assets/minecraft/shaders/core/rendertype_solid.vsh b/src/main/resources/assets/minecraft/shaders/core/rendertype_solid.vsh new file mode 100644 index 00000000..563450e9 --- /dev/null +++ b/src/main/resources/assets/minecraft/shaders/core/rendertype_solid.vsh @@ -0,0 +1,43 @@ +#version 150 + +#moj_import +#moj_import +#moj_import + +in vec3 Position; +in vec4 Color; +in vec2 UV0; +in ivec2 UV2; +in vec3 Normal; + +uniform sampler2D Sampler2; + +uniform mat4 ModelViewMat; +uniform mat4 ProjMat; +uniform int FogShape; +uniform vec3 ChunkOffset; + +out float vertexDistance; +out float dimension; +out vec4 vertexColor; +out vec4 lightColor; +out vec4 maxLightColor; +out vec2 texCoord0; +out vec3 faceLightingNormal; +out vec4 normal; +out vec3 pos_pixel; + +void main() { + vec3 pos = Position + ChunkOffset; + pos_pixel = Position; + gl_Position = ProjMat * ModelViewMat * vec4(pos, 1.0); + + vertexDistance = fog_distance(ModelViewMat, pos, FogShape); + dimension = get_dimension(minecraft_sample_lightmap(Sampler2, ivec2(0.0, 0.0))); + vertexColor = Color; + lightColor = minecraft_sample_lightmap(Sampler2, UV2); + maxLightColor = minecraft_sample_lightmap(Sampler2, ivec2(240.0, 240.0)); + texCoord0 = UV0; + faceLightingNormal = Normal; + normal = ProjMat * ModelViewMat * vec4(Normal, 0.0); +} diff --git a/src/main/resources/assets/minecraft/shaders/include/emissive_utils.glsl b/src/main/resources/assets/minecraft/shaders/include/emissive_utils.glsl new file mode 100644 index 00000000..148c44e1 --- /dev/null +++ b/src/main/resources/assets/minecraft/shaders/include/emissive_utils.glsl @@ -0,0 +1,154 @@ +#version 150 + +// Checking for the exact alpha value breaks things, so I use this function to cut down on space while also making it work better. +bool roughly_equal(float num1, float num2, float threshold) { + return abs(num1 - num2) <= threshold; +} + +float hash(float n) { return fract(sin(n) * 1e4); } +float hash(vec3 p) { return fract(1e4 * sin(17.0 * p.x + p.y * 0.1 + p.z) * (0.1 + abs(sin(p.y * 13.0 + p.x+ p.z)))); } + +float noise(vec3 x) { + vec3 i = floor(x); + vec3 f = fract(x); + + + + float a = hash(i); + float b = hash(i + vec3(2.0, 0.0, 0.0)); + float c = hash(i + vec3(0.0, 2.0, 2.0)); + float d = hash(i + vec3(2.0, 2.0, 2.0)); + vec3 u = f * f * (3.0 - 2.0 * f); + return (mix(a, b, u.x) + (c - a) * u.y * (1.0 - u.x) + (d - b) * u.x * u.y * u.z); + + + +} + + +float color_modulation_noise(vec3 pos_pixel, float vertexDistance){ + if(vertexDistance < 28){ + float noise_color = noise(pos_pixel); + float anti_parkingson = noise_color; + float mix_noise = anti_parkingson * (2.3); + return mix_noise; + }else{ + float noise_color = noise(pos_pixel); + float anti_parkingson = noise_color; + float mix_noise = anti_parkingson * 1.3; + + return mix_noise; + } + +} + + +bool check_alpha(float textureAlpha, float targetAlpha) { + + float targetLess = targetAlpha - 0.01; + float targetMore = targetAlpha + 0.01; + return (textureAlpha > targetLess && textureAlpha < targetMore); + +} + + +// For cases in which you want something to have a lower light level, but still be bright when in light. + +vec4 apply_partial_emissivity(vec4 inputColor, vec4 originalLightColor, vec3 minimumLightColor) { + + vec4 newLightColor = originalLightColor; + newLightColor.r = max(originalLightColor.r, minimumLightColor.r); + newLightColor.g = max(originalLightColor.g, minimumLightColor.g); + newLightColor.b = max(originalLightColor.b, minimumLightColor.b); + return inputColor * newLightColor; + +} + + +// The meat and bones of the pack, does all the work for making things emissive. + +vec4 make_emissive(vec4 inputColor, vec4 lightColor, vec4 maxLightColor, float vertexDistance, float inputAlpha, vec3 pos, float dim) { + + if (vertexDistance > 800) return inputColor; // Vertex Distance > 800 generally means an object is in the UI, which we don't want to affect. + + if (check_alpha(inputAlpha, 110.0)) return inputColor*1.3; // Checks for alpha 252 and just returns the input color if it is. Used in the example pack for redstone ore and the zombie's eyes. + else if (check_alpha(inputAlpha, 250.0)) return inputColor; // You can copy & this line and change the function to add a new emissive type. Used in the example pack for lime concrete. + else if (check_alpha(inputAlpha, 120.0)) return inputColor*1.37; // You can copy & this line and change the function to add a new emissive type. Used in the example pack for lime concrete. + else if (check_alpha(inputAlpha, 106.0)) return inputColor * color_modulation_noise(pos, vertexDistance); // You can copy & this line and change the function to add a new emissive type. Used in the example pack for lime concrete. + + + else return inputColor * lightColor; // If none of the pixels are supposed to be emissive, then it adds the light. + +} + + +// Gets the dimension that an object is in, -1 for The Nether, 0 for The Overworld, 1 for The End. + +float get_dimension(vec4 minLightColor) { + + if (minLightColor.r == minLightColor.g && minLightColor.g == minLightColor.b) return 0.0; // Shadows are grayscale in The Overworld + else if (minLightColor.r > minLightColor.g) return -1.0; // Shadows are more red in The Nether + else return 1.0; // Shadows are slightly green in The End + +} + + +// Gets the face lighting of a block. Credits to Venaxsys for the original function. + +vec4 get_face_lighting(vec3 normal, float dimension) { + + vec4 faceLighting = vec4(1.0, 1.0, 1.0, 1.0); + vec3 absNormal = abs(normal); + float top = 229.0 / 255.0; + float bottom = 127.0 / 255.0; + float east = 153.0 / 255.0; + float north = 204.0 / 255.0; + + // Top (only required in the Nether) + if (normal.y > normal.z && normal.y > normal.x && check_alpha(dimension, -1.0)) faceLighting = vec4(top, top, top, 1.0); // It's not really checking the alpha but I'm too stubborn to change the function name + + // Bottom + if (normal.y < normal.z && normal.y < normal.x && !check_alpha(dimension, -1.0)) faceLighting = vec4(bottom, bottom, bottom, 1.0); + else if (normal.y < normal.z && normal.y < normal.x && check_alpha(dimension, -1.0)) faceLighting = vec4(top, top, top, 1.0); + + // East-West + if (absNormal.x > absNormal.z && absNormal.x > absNormal.y) faceLighting = vec4(east, east, east, 1.0); + + // North-South + if (absNormal.z > absNormal.x && absNormal.z > absNormal.y) faceLighting = vec4(north, north, north, 1.0); + + return faceLighting; +} + + +// Checks the alpha and removes face lighting if required. + +vec4 face_lighting_check(vec3 normal, float inputAlpha, float dimension) { + + if (check_alpha(inputAlpha, 250.0)) return get_face_lighting(normal, dimension); // Checks for alpha 250, and runs it through the remove_face_lighting() function if it is. Used in the example pack for lime concrete. + else return vec4(1.0, 1.0, 1.0, 1.0); // If the block doesn't need to have its face lighting removed, returns 1.0 so nothing gets divided. + +} + + +// Makes sure transparent things don't become solid and vice versa. + +float remap_alpha(float inputAlpha) { + + if (check_alpha(inputAlpha, 252.0)) return 255.0; // Checks for alpha 252 and converts all pixels of that to alpha 255. Used in the example pack for redstone ore and the zombie's eyes. + else if (check_alpha(inputAlpha, 251.0)) return 190.0; // You can copy & paste this line and change the values to make any transparent block work with this pack. Used in the example pack for ice. + else if (check_alpha(inputAlpha, 250.0)) return 255.0; // Used in the example pack for lime concrete. + + else return inputAlpha; // If a pixel doesn't need to have its alpha changed then it simply does not change. + +} + +//alpha thing + +vec2 alpha_hub(float alpha, float dimension){ + if(alpha == 132 || alpha == 133 || alpha == 134){ + return vec2(dimension , alpha - 132); // return 0, 2 in overworld, 1,1 in nether, -1,0 in end + } + +} + diff --git a/src/main/resources/assets/sculk_depths/blockstates/crystal.json b/src/main/resources/assets/sculk_depths/blockstates/crystal.json new file mode 100644 index 00000000..fa64f439 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/blockstates/crystal.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "sculk_depths:block/crystal" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/blockstates/dried_valtrox_button.json b/src/main/resources/assets/sculk_depths/blockstates/dried_valtrox_button.json new file mode 100644 index 00000000..19a6a2c4 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/blockstates/dried_valtrox_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=ceiling,facing=east,powered=false": { + "model": "sculk_depths:block/dried_valtrox_button", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "sculk_depths:block/dried_valtrox_button_pressed", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=north,powered=false": { + "model": "sculk_depths:block/dried_valtrox_button", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=north,powered=true": { + "model": "sculk_depths:block/dried_valtrox_button_pressed", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=south,powered=false": { + "model": "sculk_depths:block/dried_valtrox_button", + "x": 180 + }, + "face=ceiling,facing=south,powered=true": { + "model": "sculk_depths:block/dried_valtrox_button_pressed", + "x": 180 + }, + "face=ceiling,facing=west,powered=false": { + "model": "sculk_depths:block/dried_valtrox_button", + "x": 180, + "y": 90 + }, + "face=ceiling,facing=west,powered=true": { + "model": "sculk_depths:block/dried_valtrox_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "sculk_depths:block/dried_valtrox_button", + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "sculk_depths:block/dried_valtrox_button_pressed", + "y": 90 + }, + "face=floor,facing=north,powered=false": { + "model": "sculk_depths:block/dried_valtrox_button" + }, + "face=floor,facing=north,powered=true": { + "model": "sculk_depths:block/dried_valtrox_button_pressed" + }, + "face=floor,facing=south,powered=false": { + "model": "sculk_depths:block/dried_valtrox_button", + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "sculk_depths:block/dried_valtrox_button_pressed", + "y": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "sculk_depths:block/dried_valtrox_button", + "y": 270 + }, + "face=floor,facing=west,powered=true": { + "model": "sculk_depths:block/dried_valtrox_button_pressed", + "y": 270 + }, + "face=wall,facing=east,powered=false": { + "model": "sculk_depths:block/dried_valtrox_button", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "sculk_depths:block/dried_valtrox_button_pressed", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=north,powered=false": { + "model": "sculk_depths:block/dried_valtrox_button", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { + "model": "sculk_depths:block/dried_valtrox_button_pressed", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=south,powered=false": { + "model": "sculk_depths:block/dried_valtrox_button", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "sculk_depths:block/dried_valtrox_button_pressed", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=west,powered=false": { + "model": "sculk_depths:block/dried_valtrox_button", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "sculk_depths:block/dried_valtrox_button_pressed", + "uvlock": true, + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/blockstates/dried_valtrox_pressure_plate.json b/src/main/resources/assets/sculk_depths/blockstates/dried_valtrox_pressure_plate.json new file mode 100644 index 00000000..379b04d1 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/blockstates/dried_valtrox_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "sculk_depths:block/dried_valtrox_pressure_plate" + }, + "powered=true": { + "model": "sculk_depths:block/dried_valtrox_pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/blockstates/flumrock_cauldron.json b/src/main/resources/assets/sculk_depths/blockstates/flumrock_cauldron.json new file mode 100644 index 00000000..3bc688dd --- /dev/null +++ b/src/main/resources/assets/sculk_depths/blockstates/flumrock_cauldron.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "sculk_depths:block/flumrock_cauldron" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/blockstates/kryslum_flumrock_cauldron.json b/src/main/resources/assets/sculk_depths/blockstates/kryslum_flumrock_cauldron.json new file mode 100644 index 00000000..0ffd5b4c --- /dev/null +++ b/src/main/resources/assets/sculk_depths/blockstates/kryslum_flumrock_cauldron.json @@ -0,0 +1,299 @@ +{ + "multipart": [ + { + "apply": { + "model": "sculk_depths:block/kryslum_flumrock_cauldron_level1" + }, + "when": { + "kryslum": "1" + } + }, + { + "apply": { + "model": "sculk_depths:block/kryslum_flumrock_cauldron_level2" + }, + "when": { + "kryslum": "2" + } + }, + { + "apply": { + "model": "sculk_depths:block/kryslum_flumrock_cauldron_level3" + }, + "when": { + "kryslum": "3" + } + }, + { + "apply": { + "model": "sculk_depths:block/kryslum_flumrock_cauldron_level4" + }, + "when": { + "kryslum": "4" + } + }, + { + "apply": { + "model": "sculk_depths:block/kryslum_flumrock_cauldron_level5" + }, + "when": { + "kryslum": "5" + } + }, + { + "apply": { + "model": "sculk_depths:block/kryslum_flumrock_cauldron_level6" + }, + "when": { + "kryslum": "6" + } + }, + { + "apply": { + "model": "sculk_depths:block/kryslum_flumrock_cauldron_level7" + }, + "when": { + "kryslum": "7" + } + }, + { + "apply": { + "model": "sculk_depths:block/kryslum_flumrock_cauldron_level8" + }, + "when": { + "kryslum": "8" + } + }, + { + "apply": { + "model": "sculk_depths:block/kryslum_flumrock_cauldron_level9" + }, + "when": { + "kryslum": "9" + } + }, + { + "apply": { + "model": "sculk_depths:block/kryslum_flumrock_cauldron_level10" + }, + "when": { + "kryslum": "10" + } + }, + { + "apply": { + "model": "sculk_depths:block/kryslum_flumrock_cauldron_level11" + }, + "when": { + "kryslum": "11" + } + }, + { + "apply": { + "model": "sculk_depths:block/kryslum_flumrock_cauldron_full" + }, + "when": { + "kryslum": "12" + } + }, + { + "apply": { + "model": "sculk_depths:block/cauldron_counters/quazarith_0" + }, + "when": { + "quazarith": "0" + } + }, + { + "apply": { + "model": "sculk_depths:block/cauldron_counters/quazarith_1" + }, + "when": { + "quazarith": "1" + } + }, + { + "apply": { + "model": "sculk_depths:block/cauldron_counters/quazarith_2" + }, + "when": { + "quazarith": "2" + } + }, + { + "apply": { + "model": "sculk_depths:block/cauldron_counters/quazarith_3" + }, + "when": { + "quazarith": "3" + } + }, + { + "apply": { + "model": "sculk_depths:block/cauldron_counters/quazarith_4" + }, + "when": { + "quazarith": "4" + } + },{ + "apply": { + "model": "sculk_depths:block/cauldron_counters/quazarith_5" + }, + "when": { + "quazarith": "5" + } + },{ + "apply": { + "model": "sculk_depths:block/cauldron_counters/quazarith_6" + }, + "when": { + "quazarith": "6" + } + }, + { + "apply": { + "model": "sculk_depths:block/cauldron_counters/quazarith_7" + }, + "when": { + "quazarith": "7" + } + },{ + "apply": { + "model": "sculk_depths:block/cauldron_counters/quazarith_8" + }, + "when": { + "quazarith": "8" + } + },{ + "apply": { + "model": "sculk_depths:block/cauldron_counters/quazarith_9" + }, + "when": { + "quazarith": "9" + } + },{ + "apply": { + "model": "sculk_depths:block/cauldron_counters/quazarith_10" + }, + "when": { + "quazarith": "10" + } + }, + { + "apply": { + "model": "sculk_depths:block/cauldron_counters/quazarith_11" + }, + "when": { + "quazarith": "11" + } + }, + { + "apply": { + "model": "sculk_depths:block/cauldron_counters/quazarith_12" + }, + "when": { + "quazarith": "12" + } + }, + { + "apply": { + "model": "sculk_depths:block/cauldron_counters/diamond_0" + }, + "when": { + "diamond": "0" + } + }, + { + "apply": { + "model": "sculk_depths:block/cauldron_counters/diamond_1" + }, + "when": { + "diamond": "1" + } + }, + { + "apply": { + "model": "sculk_depths:block/cauldron_counters/diamond_2" + }, + "when": { + "diamond": "2" + } + }, + { + "apply": { + "model": "sculk_depths:block/cauldron_counters/diamond_3" + }, + "when": { + "diamond": "3" + } + }, + { + "apply": { + "model": "sculk_depths:block/cauldron_counters/diamond_4" + }, + "when": { + "diamond": "4" + } + }, { + "apply": { + "model": "sculk_depths:block/cauldron_counters/diamond_5" + }, + "when": { + "diamond": "5" + } + }, { + "apply": { + "model": "sculk_depths:block/cauldron_counters/diamond_6" + }, + "when": { + "diamond": "6" + } + }, { + "apply": { + "model": "sculk_depths:block/cauldron_counters/diamond_7" + }, + "when": { + "diamond": "7" + } + }, { + "apply": { + "model": "sculk_depths:block/cauldron_counters/diamond_8" + }, + "when": { + "diamond": "8" + } + }, + { + "apply": { + "model": "sculk_depths:block/cauldron_counters/diamond_9" + }, + "when": { + "diamond": "9" + } + }, + { + "apply": { + "model": "sculk_depths:block/cauldron_counters/diamond_10" + }, + "when": { + "diamond": "10" + } + }, + { + "apply": { + "model": "sculk_depths:block/cauldron_counters/diamond_11" + }, + "when": { + "diamond": "11" + } + }, + { + "apply": { + "model": "sculk_depths:block/cauldron_counters/diamond_12" + }, + "when": { + "diamond": "12" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/blockstates/petrified_valtrox_button.json b/src/main/resources/assets/sculk_depths/blockstates/petrified_valtrox_button.json new file mode 100644 index 00000000..2f0cd892 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/blockstates/petrified_valtrox_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=ceiling,facing=east,powered=false": { + "model": "sculk_depths:block/petrified_valtrox_button", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "sculk_depths:block/petrified_valtrox_button_pressed", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=north,powered=false": { + "model": "sculk_depths:block/petrified_valtrox_button", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=north,powered=true": { + "model": "sculk_depths:block/petrified_valtrox_button_pressed", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=south,powered=false": { + "model": "sculk_depths:block/petrified_valtrox_button", + "x": 180 + }, + "face=ceiling,facing=south,powered=true": { + "model": "sculk_depths:block/petrified_valtrox_button_pressed", + "x": 180 + }, + "face=ceiling,facing=west,powered=false": { + "model": "sculk_depths:block/petrified_valtrox_button", + "x": 180, + "y": 90 + }, + "face=ceiling,facing=west,powered=true": { + "model": "sculk_depths:block/petrified_valtrox_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "sculk_depths:block/petrified_valtrox_button", + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "sculk_depths:block/petrified_valtrox_button_pressed", + "y": 90 + }, + "face=floor,facing=north,powered=false": { + "model": "sculk_depths:block/petrified_valtrox_button" + }, + "face=floor,facing=north,powered=true": { + "model": "sculk_depths:block/petrified_valtrox_button_pressed" + }, + "face=floor,facing=south,powered=false": { + "model": "sculk_depths:block/petrified_valtrox_button", + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "sculk_depths:block/petrified_valtrox_button_pressed", + "y": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "sculk_depths:block/petrified_valtrox_button", + "y": 270 + }, + "face=floor,facing=west,powered=true": { + "model": "sculk_depths:block/petrified_valtrox_button_pressed", + "y": 270 + }, + "face=wall,facing=east,powered=false": { + "model": "sculk_depths:block/petrified_valtrox_button", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "sculk_depths:block/petrified_valtrox_button_pressed", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=north,powered=false": { + "model": "sculk_depths:block/petrified_valtrox_button", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { + "model": "sculk_depths:block/petrified_valtrox_button_pressed", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=south,powered=false": { + "model": "sculk_depths:block/petrified_valtrox_button", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "sculk_depths:block/petrified_valtrox_button_pressed", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=west,powered=false": { + "model": "sculk_depths:block/petrified_valtrox_button", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "sculk_depths:block/petrified_valtrox_button_pressed", + "uvlock": true, + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/blockstates/petrified_valtrox_pressure_plate.json b/src/main/resources/assets/sculk_depths/blockstates/petrified_valtrox_pressure_plate.json new file mode 100644 index 00000000..f746066b --- /dev/null +++ b/src/main/resources/assets/sculk_depths/blockstates/petrified_valtrox_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "sculk_depths:block/petrified_valtrox_pressure_plate" + }, + "powered=true": { + "model": "sculk_depths:block/petrified_valtrox_pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/blockstates/valtrox_button.json b/src/main/resources/assets/sculk_depths/blockstates/valtrox_button.json new file mode 100644 index 00000000..f8a6f0d7 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/blockstates/valtrox_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=ceiling,facing=east,powered=false": { + "model": "sculk_depths:block/valtrox_button", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "sculk_depths:block/valtrox_button_pressed", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=north,powered=false": { + "model": "sculk_depths:block/valtrox_button", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=north,powered=true": { + "model": "sculk_depths:block/valtrox_button_pressed", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=south,powered=false": { + "model": "sculk_depths:block/valtrox_button", + "x": 180 + }, + "face=ceiling,facing=south,powered=true": { + "model": "sculk_depths:block/valtrox_button_pressed", + "x": 180 + }, + "face=ceiling,facing=west,powered=false": { + "model": "sculk_depths:block/valtrox_button", + "x": 180, + "y": 90 + }, + "face=ceiling,facing=west,powered=true": { + "model": "sculk_depths:block/valtrox_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "sculk_depths:block/valtrox_button", + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "sculk_depths:block/valtrox_button_pressed", + "y": 90 + }, + "face=floor,facing=north,powered=false": { + "model": "sculk_depths:block/valtrox_button" + }, + "face=floor,facing=north,powered=true": { + "model": "sculk_depths:block/valtrox_button_pressed" + }, + "face=floor,facing=south,powered=false": { + "model": "sculk_depths:block/valtrox_button", + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "sculk_depths:block/valtrox_button_pressed", + "y": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "sculk_depths:block/valtrox_button", + "y": 270 + }, + "face=floor,facing=west,powered=true": { + "model": "sculk_depths:block/valtrox_button_pressed", + "y": 270 + }, + "face=wall,facing=east,powered=false": { + "model": "sculk_depths:block/valtrox_button", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "sculk_depths:block/valtrox_button_pressed", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=north,powered=false": { + "model": "sculk_depths:block/valtrox_button", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { + "model": "sculk_depths:block/valtrox_button_pressed", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=south,powered=false": { + "model": "sculk_depths:block/valtrox_button", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "sculk_depths:block/valtrox_button_pressed", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=west,powered=false": { + "model": "sculk_depths:block/valtrox_button", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "sculk_depths:block/valtrox_button_pressed", + "uvlock": true, + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/blockstates/valtrox_pressure_plate.json b/src/main/resources/assets/sculk_depths/blockstates/valtrox_pressure_plate.json new file mode 100644 index 00000000..62b5139a --- /dev/null +++ b/src/main/resources/assets/sculk_depths/blockstates/valtrox_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "sculk_depths:block/valtrox_pressure_plate" + }, + "powered=true": { + "model": "sculk_depths:block/valtrox_pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/blockstates/zygrin_flowblock.json b/src/main/resources/assets/sculk_depths/blockstates/zygrin_flowblock.json new file mode 100644 index 00000000..0e934753 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/blockstates/zygrin_flowblock.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "sculk_depths:block/zygrin_flowblock", + "x": 180 + }, + "facing=east": { + "model": "sculk_depths:block/zygrin_flowblock", + "x": 90, + "y": 90 + }, + "facing=north": { + "model": "sculk_depths:block/zygrin_flowblock", + "x": 90 + }, + "facing=south": { + "model": "sculk_depths:block/zygrin_flowblock", + "x": 90, + "y": 180 + }, + "facing=up": { + "model": "sculk_depths:block/zygrin_flowblock" + }, + "facing=west": { + "model": "sculk_depths:block/zygrin_flowblock", + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/lang/en_us.json b/src/main/resources/assets/sculk_depths/lang/en_us.json index 7539cbbb..b24379a7 100644 --- a/src/main/resources/assets/sculk_depths/lang/en_us.json +++ b/src/main/resources/assets/sculk_depths/lang/en_us.json @@ -6,6 +6,9 @@ "item.sculk_depths.glomper_spawn_egg": "Glomper Spawn Egg", "block.sculk_depths.crumbling_dirt" : "Crumbling Dirt", + "block.sculk_depths.flumrock_cauldron": "Flumrock Cauldron", + "block.sculk_depths.kryslum_flumrock_cauldron": "Kryslum Flumrock Cauldron", + "block.sculk_depths.umbrusk": "Umbrusk", "block.sculk_depths.umbrusk_stairs": "Umbrusk Stairs", "block.sculk_depths.umbrusk_slab": "Umbrusk Slab", @@ -25,6 +28,8 @@ "block.sculk_depths.valtrox_slab": "Valtrox Slab", "block.sculk_depths.valtrox_stairs": "Valtrox Stairs", "block.sculk_depths.valtrox_fence": "Valtrox Fence", + "block.sculk_depths.valtrox_button": "Valtrox Button", + "block.sculk_depths.valtrox_pressure_plate": "Valtrox Pressure Plate", "block.sculk_depths.dried_valtrox_log": "Dried Valtrox Log", "block.sculk_depths.dried_valtrox_planks": "Dried Valtrox Planks", @@ -32,6 +37,8 @@ "block.sculk_depths.dried_valtrox_slab": "Dried Valtrox Slab", "block.sculk_depths.dried_valtrox_stairs": "Dried Valtrox Stairs", "block.sculk_depths.dried_valtrox_fence": "Dried Valtrox Fence", + "block.sculk_depths.dried_valtrox_button": "Dried Valtrox Button", + "block.sculk_depths.dried_valtrox_pressure_plate": "Dried Valtrox Pressure Plate", "block.sculk_depths.petrified_valtrox_log": "Petrified Valtrox Log", "block.sculk_depths.petrified_valtrox_slates": "Petrified Valtrox Slates", @@ -39,10 +46,18 @@ "block.sculk_depths.petrified_valtrox_slab": "Petrified Valtrox Slab", "block.sculk_depths.petrified_valtrox_stairs": "Petrified Valtrox Stairs", "block.sculk_depths.petrified_valtrox_wall": "Petrified Valtrox Wall", + "block.sculk_depths.petrified_valtrox_button": "Petrified Valtrox Button", + "block.sculk_depths.petrified_valtrox_pressure_plate": "Petrified Valtrox Pressure Plate", "block.sculk_depths.flumrock": "Flumrock", + "itemgroup.sculk_depths" : "Sculk Depths", + "block.sculk_depths.kryslum": "Kryslum", + "biome.sculk_depths.sculk_caves": "Sculk Caves", + "biome.sculk_depths.cephlera_caves": "Cephlera Caves", + "biome.sculk_depths.petrified_valtrox_forest": "Petrified Valtrox Forest", + "biome.sculk_depths.dried_valtrox_forest": "Dried Valtrox Forest", "block.sculk_depths.quazarith_ore": "Quazarith Ore", "item.sculk_depths.quazarith_pieces": "Quazarith Pieces", @@ -77,11 +92,18 @@ "block.sculk_depths.zygrin_pillar": "Zygrin Pillar", "block.sculk_depths.chiseled_zygrin": "Chiseled Zygrin", "block.sculk_depths.zygrin_light": "Zygrin Light", + "block.sculk_depths.zygrin_flowblock": "Zygrin Flowblock", "block.sculk_depths.cephlera": "Cephlera", "block.sculk_depths.cephlera_light": "Cephlera Light", "block.sculk_depths.kryslum_enriched_soil": "Kryslum Enriched Soil", - "entity.sculk_depths.glomper": "Glomper" + "entity.sculk_depths.glomper": "Glomper", + + "advancements.sculk_depths.root": "Exploring the Depths", + "advancements.sculk_depths.root.description": "Exploration and Ancient Civilisation", + + "advancements.sculk_depths.kill_a_warden": "Doing it the hard way!", + "advancements.sculk_depths.kill_a_warden.description": "Kill a warden instead of giving it a sacrifice" } \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_0.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_0.json new file mode 100644 index 00000000..53f13510 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_0.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "sculk_depths:block/flumrock_cauldron/diamond_0", + "particle": "sculk_depths:block/flumrock_cauldron/diamond_0" + }, + "elements": [ + { + "from": [3, 4, 16.01], + "to": [13, 8, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 4, -0.01], + "to": [13, 8, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 4, 3], + "to": [-0.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 4, 3], + "to": [16.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_1.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_1.json new file mode 100644 index 00000000..49e9728f --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_1.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "sculk_depths:block/flumrock_cauldron/diamond_1", + "particle": "sculk_depths:block/flumrock_cauldron/diamond_1" + }, + "elements": [ + { + "from": [3, 4, 16.01], + "to": [13, 8, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 4, -0.01], + "to": [13, 8, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 4, 3], + "to": [-0.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 4, 3], + "to": [16.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_10.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_10.json new file mode 100644 index 00000000..fdae7326 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_10.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "sculk_depths:block/flumrock_cauldron/diamond_10", + "particle": "sculk_depths:block/flumrock_cauldron/diamond_10" + }, + "elements": [ + { + "from": [3, 4, 16.01], + "to": [13, 8, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 4, -0.01], + "to": [13, 8, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 4, 3], + "to": [-0.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 4, 3], + "to": [16.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_11.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_11.json new file mode 100644 index 00000000..3e245f8d --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_11.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "sculk_depths:block/flumrock_cauldron/diamond_11", + "particle": "sculk_depths:block/flumrock_cauldron/diamond_11" + }, + "elements": [ + { + "from": [3, 4, 16.01], + "to": [13, 8, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 4, -0.01], + "to": [13, 8, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 4, 3], + "to": [-0.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 4, 3], + "to": [16.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_12.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_12.json new file mode 100644 index 00000000..37b5dadb --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_12.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "sculk_depths:block/flumrock_cauldron/diamond_12", + "particle": "sculk_depths:block/flumrock_cauldron/diamond_12" + }, + "elements": [ + { + "from": [3, 4, 16.01], + "to": [13, 8, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 4, -0.01], + "to": [13, 8, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 4, 3], + "to": [-0.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 4, 3], + "to": [16.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_2.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_2.json new file mode 100644 index 00000000..67022972 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_2.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "sculk_depths:block/flumrock_cauldron/diamond_2", + "particle": "sculk_depths:block/flumrock_cauldron/diamond_2" + }, + "elements": [ + { + "from": [3, 4, 16.01], + "to": [13, 8, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 4, -0.01], + "to": [13, 8, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 4, 3], + "to": [-0.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 4, 3], + "to": [16.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_3.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_3.json new file mode 100644 index 00000000..3972e073 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_3.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "sculk_depths:block/flumrock_cauldron/diamond_3", + "particle": "sculk_depths:block/flumrock_cauldron/diamond_3" + }, + "elements": [ + { + "from": [3, 4, 16.01], + "to": [13, 8, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 4, -0.01], + "to": [13, 8, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 4, 3], + "to": [-0.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 4, 3], + "to": [16.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_4.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_4.json new file mode 100644 index 00000000..80641f63 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_4.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "sculk_depths:block/flumrock_cauldron/diamond_4", + "particle": "sculk_depths:block/flumrock_cauldron/diamond_4" + }, + "elements": [ + { + "from": [3, 4, 16.01], + "to": [13, 8, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 4, -0.01], + "to": [13, 8, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 4, 3], + "to": [-0.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 4, 3], + "to": [16.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_5.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_5.json new file mode 100644 index 00000000..c6a14e09 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_5.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "sculk_depths:block/flumrock_cauldron/diamond_5", + "particle": "sculk_depths:block/flumrock_cauldron/diamond_5" + }, + "elements": [ + { + "from": [3, 4, 16.01], + "to": [13, 8, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 4, -0.01], + "to": [13, 8, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 4, 3], + "to": [-0.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 4, 3], + "to": [16.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_6.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_6.json new file mode 100644 index 00000000..f10096ba --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_6.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "sculk_depths:block/flumrock_cauldron/diamond_6", + "particle": "sculk_depths:block/flumrock_cauldron/diamond_6" + }, + "elements": [ + { + "from": [3, 4, 16.01], + "to": [13, 8, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 4, -0.01], + "to": [13, 8, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 4, 3], + "to": [-0.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 4, 3], + "to": [16.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_7.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_7.json new file mode 100644 index 00000000..da9029ca --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_7.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "sculk_depths:block/flumrock_cauldron/diamond_7", + "particle": "sculk_depths:block/flumrock_cauldron/diamond_7" + }, + "elements": [ + { + "from": [3, 4, 16.01], + "to": [13, 8, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 4, -0.01], + "to": [13, 8, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 4, 3], + "to": [-0.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 4, 3], + "to": [16.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_8.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_8.json new file mode 100644 index 00000000..48a086ea --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_8.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "sculk_depths:block/flumrock_cauldron/diamond_8", + "particle": "sculk_depths:block/flumrock_cauldron/diamond_8" + }, + "elements": [ + { + "from": [3, 4, 16.01], + "to": [13, 8, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 4, -0.01], + "to": [13, 8, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 4, 3], + "to": [-0.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 4, 3], + "to": [16.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_9.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_9.json new file mode 100644 index 00000000..880cd59a --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/diamond_9.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "sculk_depths:block/flumrock_cauldron/diamond_9", + "particle": "sculk_depths:block/flumrock_cauldron/diamond_9" + }, + "elements": [ + { + "from": [3, 4, 16.01], + "to": [13, 8, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 4, -0.01], + "to": [13, 8, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 4, 3], + "to": [-0.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 4, 3], + "to": [16.01, 8, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_0.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_0.json new file mode 100644 index 00000000..170c1a0f --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_0.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/quazarith_0", + "particle": "sculk_depths:block/flumrock_cauldron/quazarith_0" + }, + "elements": [ + { + "from": [3, 8, 16.01], + "to": [13, 12, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 8, -0.01], + "to": [13, 12, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 8, 3], + "to": [-0.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 8, 3], + "to": [16.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_1.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_1.json new file mode 100644 index 00000000..34843bf3 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_1.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/quazarith_1", + "particle": "sculk_depths:block/flumrock_cauldron/quazarith_1" + }, + "elements": [ + { + "from": [3, 8, 16.01], + "to": [13, 12, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 8, -0.01], + "to": [13, 12, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 8, 3], + "to": [-0.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 8, 3], + "to": [16.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_10.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_10.json new file mode 100644 index 00000000..855bb447 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_10.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/quazarith_10", + "particle": "sculk_depths:block/flumrock_cauldron/quazarith_10" + }, + "elements": [ + { + "from": [3, 8, 16.01], + "to": [13, 12, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 8, -0.01], + "to": [13, 12, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 8, 3], + "to": [-0.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 8, 3], + "to": [16.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_11.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_11.json new file mode 100644 index 00000000..e501a892 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_11.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/quazarith_11", + "particle": "sculk_depths:block/flumrock_cauldron/quazarith_11" + }, + "elements": [ + { + "from": [3, 8, 16.01], + "to": [13, 12, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 8, -0.01], + "to": [13, 12, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 8, 3], + "to": [-0.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 8, 3], + "to": [16.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_12.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_12.json new file mode 100644 index 00000000..d1beb10e --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_12.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/quazarith_12", + "particle": "sculk_depths:block/flumrock_cauldron/quazarith_12" + }, + "elements": [ + { + "from": [3, 8, 16.01], + "to": [13, 12, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 8, -0.01], + "to": [13, 12, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 8, 3], + "to": [-0.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 8, 3], + "to": [16.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_2.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_2.json new file mode 100644 index 00000000..38ffbb55 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_2.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/quazarith_2", + "particle": "sculk_depths:block/flumrock_cauldron/quazarith_2" + }, + "elements": [ + { + "from": [3, 8, 16.01], + "to": [13, 12, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 8, -0.01], + "to": [13, 12, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 8, 3], + "to": [-0.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 8, 3], + "to": [16.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_3.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_3.json new file mode 100644 index 00000000..836e9d80 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_3.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/quazarith_3", + "particle": "sculk_depths:block/flumrock_cauldron/quazarith_3" + }, + "elements": [ + { + "from": [3, 8, 16.01], + "to": [13, 12, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 8, -0.01], + "to": [13, 12, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 8, 3], + "to": [-0.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 8, 3], + "to": [16.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_4.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_4.json new file mode 100644 index 00000000..a7a05fde --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_4.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/quazarith_4", + "particle": "sculk_depths:block/flumrock_cauldron/quazarith_4" + }, + "elements": [ + { + "from": [3, 8, 16.01], + "to": [13, 12, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 8, -0.01], + "to": [13, 12, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 8, 3], + "to": [-0.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 8, 3], + "to": [16.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_5.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_5.json new file mode 100644 index 00000000..82e6f2dc --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_5.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/quazarith_5", + "particle": "sculk_depths:block/flumrock_cauldron/quazarith_5" + }, + "elements": [ + { + "from": [3, 8, 16.01], + "to": [13, 12, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 8, -0.01], + "to": [13, 12, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 8, 3], + "to": [-0.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 8, 3], + "to": [16.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_6.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_6.json new file mode 100644 index 00000000..610fbc3b --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_6.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/quazarith_6", + "particle": "sculk_depths:block/flumrock_cauldron/quazarith_6" + }, + "elements": [ + { + "from": [3, 8, 16.01], + "to": [13, 12, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 8, -0.01], + "to": [13, 12, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 8, 3], + "to": [-0.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 8, 3], + "to": [16.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_7.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_7.json new file mode 100644 index 00000000..abf29207 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_7.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/quazarith_7", + "particle": "sculk_depths:block/flumrock_cauldron/quazarith_7" + }, + "elements": [ + { + "from": [3, 8, 16.01], + "to": [13, 12, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 8, -0.01], + "to": [13, 12, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 8, 3], + "to": [-0.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 8, 3], + "to": [16.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_8.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_8.json new file mode 100644 index 00000000..7887369d --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_8.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/quazarith_8", + "particle": "sculk_depths:block/flumrock_cauldron/quazarith_8" + }, + "elements": [ + { + "from": [3, 8, 16.01], + "to": [13, 12, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 8, -0.01], + "to": [13, 12, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 8, 3], + "to": [-0.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 8, 3], + "to": [16.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_9.json b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_9.json new file mode 100644 index 00000000..4e68a285 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/cauldron_counters/quazarith_9.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/quazarith_9", + "particle": "sculk_depths:block/flumrock_cauldron/quazarith_9" + }, + "elements": [ + { + "from": [3, 8, 16.01], + "to": [13, 12, 16.01], + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [3, 8, -0.01], + "to": [13, 12, -0.01], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 10, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 10, 0], "texture": "#missing"} + } + }, + { + "from": [-0.01, 8, 3], + "to": [-0.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + }, + { + "from": [16.01, 8, 3], + "to": [16.01, 12, 13], + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 10], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 10], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/crystal.json b/src/main/resources/assets/sculk_depths/models/block/crystal.json new file mode 100644 index 00000000..c788cf98 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "sculk_depths:block/crystal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/dried_valtrox_button.json b/src/main/resources/assets/sculk_depths/models/block/dried_valtrox_button.json new file mode 100644 index 00000000..071d43f2 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/dried_valtrox_button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "sculk_depths:block/dried_valtrox_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/dried_valtrox_button_inventory.json b/src/main/resources/assets/sculk_depths/models/block/dried_valtrox_button_inventory.json new file mode 100644 index 00000000..7cc2b0dc --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/dried_valtrox_button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "sculk_depths:block/dried_valtrox_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/dried_valtrox_button_pressed.json b/src/main/resources/assets/sculk_depths/models/block/dried_valtrox_button_pressed.json new file mode 100644 index 00000000..954f9f5b --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/dried_valtrox_button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "sculk_depths:block/dried_valtrox_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/dried_valtrox_pressure_plate.json b/src/main/resources/assets/sculk_depths/models/block/dried_valtrox_pressure_plate.json new file mode 100644 index 00000000..43a51b1f --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/dried_valtrox_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "sculk_depths:block/dried_valtrox_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/dried_valtrox_pressure_plate_down.json b/src/main/resources/assets/sculk_depths/models/block/dried_valtrox_pressure_plate_down.json new file mode 100644 index 00000000..bc457433 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/dried_valtrox_pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "sculk_depths:block/dried_valtrox_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/flumrock_cauldron.json b/src/main/resources/assets/sculk_depths/models/block/flumrock_cauldron.json new file mode 100644 index 00000000..79e3f54b --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/flumrock_cauldron.json @@ -0,0 +1,249 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/side", + "2": "sculk_depths:block/flumrock_cauldron/bottom", + "3": "sculk_depths:block/flumrock_cauldron/feet", + "5": "sculk_depths:block/flumrock_cauldron/inside", + "6": "sculk_depths:block/flumrock_cauldron/top", + "7": "sculk_depths:block/flumrock_cauldron/top_border", + "8": "sculk_depths:block/flumrock_cauldron/bottom_border", + "particle": "sculk_depths:block/flumrock_cauldron/side" + }, + "elements": [ + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#6"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#2"} + } + }, + { + "from": [0, 2, 0], + "to": [1, 13, 15], + "faces": { + "north": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "east": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "south": {"uv": [0, 0, 2, 22], "texture": "#missing"}, + "west": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#7"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#2"} + } + }, + { + "from": [0, 15, 0], + "to": [1, 16, 15], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "east": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#missing"}, + "west": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#6"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#8"} + } + }, + { + "from": [15, 15, 1], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 2, 2], "texture": "#missing"}, + "east": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "west": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#6"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#8"} + } + }, + { + "from": [14.5, 13, 1.5], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#missing"}, + "east": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "south": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "west": {"uv": [1.5, 3, 15, 1], "texture": "#5"}, + "up": {"uv": [14.5, 1.5, 15, 15], "texture": "#7"}, + "down": {"uv": [14.5, 1, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 1], + "to": [1.5, 15, 14.5], + "faces": { + "north": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "east": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "south": {"uv": [6, 12, 7, 17], "texture": "#missing"}, + "west": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "up": {"uv": [1, 1, 1.5, 14.5], "texture": "#7"}, + "down": {"uv": [1.5, 1.5, 1, 15], "texture": "#8"} + } + }, + { + "from": [15, 2, 1], + "to": [16, 13, 16], + "faces": { + "north": {"uv": [4, 0, 4.25, 2.75], "texture": "#missing"}, + "east": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "south": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "west": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#7"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#2"} + } + }, + { + "from": [1, 2, 0], + "to": [16, 13, 1], + "faces": { + "north": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "east": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "south": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "west": {"uv": [0, 0, 2, 22], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#7"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#2"} + } + }, + { + "from": [1.5, 13, 1], + "to": [15, 15, 1.5], + "faces": { + "north": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "east": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "south": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#missing"}, + "up": {"uv": [1.5, 1, 15, 1.5], "texture": "#7"}, + "down": {"uv": [1.5, 14.5, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 14.5], + "to": [14.5, 15, 15], + "faces": { + "north": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#missing"}, + "south": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "west": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "up": {"uv": [1, 14.5, 14.5, 15], "texture": "#7"}, + "down": {"uv": [1, 1, 14.5, 1.5], "texture": "#8"} + } + }, + { + "from": [0, 2, 15], + "to": [15, 13, 16], + "faces": { + "north": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "east": {"uv": [0, 0, 2, 22], "texture": "#missing"}, + "south": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "west": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#7"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#2"} + } + }, + { + "from": [0, 15, 15], + "to": [15, 16, 16], + "faces": { + "north": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#missing"}, + "south": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#6"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#8"} + } + }, + { + "from": [1, 15, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "south": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#6"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#8"} + } + }, + { + "from": [12, 0, 2], + "to": [14, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [12, 0, 12], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 2], + "to": [4, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 12], + "to": [4, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_lefthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [22.5, 45, 0], + "translation": [-0.5, 0, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_full.json b/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_full.json new file mode 100644 index 00000000..21212687 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_full.json @@ -0,0 +1,261 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/side", + "2": "sculk_depths:block/flumrock_cauldron/bottom", + "3": "sculk_depths:block/flumrock_cauldron/feet", + "5": "sculk_depths:block/flumrock_cauldron/inside", + "6": "sculk_depths:block/flumrock_cauldron/top", + "7": "sculk_depths:block/flumrock_cauldron/top_border", + "8": "sculk_depths:block/flumrock_cauldron/bottom_border", + "9": "sculk_depths:block/kryslum_still", + "particle": "sculk_depths:block/flumrock_cauldron/side" + }, + "elements": [ + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#6"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#2"} + } + }, + { + "from": [0, 2, 0], + "to": [1, 13, 15], + "faces": { + "north": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "east": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "south": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "west": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#7"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#2"} + } + }, + { + "from": [0, 15, 0], + "to": [1, 16, 15], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "east": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "south": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#6"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#8"} + } + }, + { + "from": [15, 15, 1], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "west": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#6"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#8"} + } + }, + { + "from": [14.5, 13, 1.5], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "east": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "south": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "west": {"uv": [1.5, 3, 15, 1], "texture": "#5"}, + "up": {"uv": [14.5, 1.5, 15, 15], "texture": "#7"}, + "down": {"uv": [14.5, 1, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 1], + "to": [1.5, 15, 14.5], + "faces": { + "north": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "east": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "south": {"uv": [12, 24, 14, 34], "texture": "#missing"}, + "west": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "up": {"uv": [1, 1, 1.5, 14.5], "texture": "#7"}, + "down": {"uv": [1.5, 1.5, 1, 15], "texture": "#8"} + } + }, + { + "from": [15, 2, 1], + "to": [16, 13, 16], + "faces": { + "north": {"uv": [8, 0, 8.5, 5.5], "texture": "#missing"}, + "east": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "south": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "west": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#7"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#2"} + } + }, + { + "from": [1, 2, 0], + "to": [16, 13, 1], + "faces": { + "north": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "east": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "south": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "west": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#7"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#2"} + } + }, + { + "from": [1.5, 13, 1], + "to": [15, 15, 1.5], + "faces": { + "north": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "east": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "south": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "up": {"uv": [1.5, 1, 15, 1.5], "texture": "#7"}, + "down": {"uv": [1.5, 14.5, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 14.5], + "to": [14.5, 15, 15], + "faces": { + "north": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "south": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "west": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "up": {"uv": [1, 14.5, 14.5, 15], "texture": "#7"}, + "down": {"uv": [1, 1, 14.5, 1.5], "texture": "#8"} + } + }, + { + "from": [0, 2, 15], + "to": [15, 13, 16], + "faces": { + "north": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "east": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "south": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "west": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#7"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#2"} + } + }, + { + "from": [0, 15, 15], + "to": [15, 16, 16], + "faces": { + "north": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "east": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#6"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#8"} + } + }, + { + "from": [1, 15, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "south": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "west": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#6"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#8"} + } + }, + { + "from": [12, 0, 2], + "to": [14, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [12, 0, 12], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 2], + "to": [4, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 12], + "to": [4, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [1.5, 14, 1.5], + "to": [14.5, 14, 14.5], + "faces": { + "north": {"uv": [0, 0, 13, 0], "texture": "#missing"}, + "east": {"uv": [0, 0, 13, 0], "texture": "#missing"}, + "south": {"uv": [0, 0, 13, 0], "texture": "#missing"}, + "west": {"uv": [0, 0, 13, 0], "texture": "#missing"}, + "up": {"uv": [1.5, 1.5, 14.5, 14.5], "texture": "#9"}, + "down": {"uv": [0, 0, 13, 13], "texture": "#missing"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_lefthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [22.5, 45, 0], + "translation": [-0.5, 0, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level1.json b/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level1.json new file mode 100644 index 00000000..71b1c961 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level1.json @@ -0,0 +1,261 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/side", + "2": "sculk_depths:block/flumrock_cauldron/bottom", + "3": "sculk_depths:block/flumrock_cauldron/feet", + "5": "sculk_depths:block/flumrock_cauldron/inside", + "6": "sculk_depths:block/flumrock_cauldron/top", + "7": "sculk_depths:block/flumrock_cauldron/top_border", + "8": "sculk_depths:block/flumrock_cauldron/bottom_border", + "9": "sculk_depths:block/kryslum_still", + "particle": "sculk_depths:block/flumrock_cauldron/side" + }, + "elements": [ + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#6"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#2"} + } + }, + { + "from": [0, 2, 0], + "to": [1, 13, 15], + "faces": { + "north": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "east": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "south": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "west": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#7"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#2"} + } + }, + { + "from": [0, 15, 0], + "to": [1, 16, 15], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "east": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "south": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#6"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#8"} + } + }, + { + "from": [15, 15, 1], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "west": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#6"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#8"} + } + }, + { + "from": [14.5, 13, 1.5], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "east": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "south": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "west": {"uv": [1.5, 3, 15, 1], "texture": "#5"}, + "up": {"uv": [14.5, 1.5, 15, 15], "texture": "#7"}, + "down": {"uv": [14.5, 1, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 1], + "to": [1.5, 15, 14.5], + "faces": { + "north": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "east": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "south": {"uv": [12, 24, 14, 34], "texture": "#missing"}, + "west": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "up": {"uv": [1, 1, 1.5, 14.5], "texture": "#7"}, + "down": {"uv": [1.5, 1.5, 1, 15], "texture": "#8"} + } + }, + { + "from": [15, 2, 1], + "to": [16, 13, 16], + "faces": { + "north": {"uv": [8, 0, 8.5, 5.5], "texture": "#missing"}, + "east": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "south": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "west": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#7"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#2"} + } + }, + { + "from": [1, 2, 0], + "to": [16, 13, 1], + "faces": { + "north": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "east": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "south": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "west": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#7"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#2"} + } + }, + { + "from": [1.5, 13, 1], + "to": [15, 15, 1.5], + "faces": { + "north": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "east": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "south": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "up": {"uv": [1.5, 1, 15, 1.5], "texture": "#7"}, + "down": {"uv": [1.5, 14.5, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 14.5], + "to": [14.5, 15, 15], + "faces": { + "north": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "south": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "west": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "up": {"uv": [1, 14.5, 14.5, 15], "texture": "#7"}, + "down": {"uv": [1, 1, 14.5, 1.5], "texture": "#8"} + } + }, + { + "from": [0, 2, 15], + "to": [15, 13, 16], + "faces": { + "north": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "east": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "south": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "west": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#7"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#2"} + } + }, + { + "from": [0, 15, 15], + "to": [15, 16, 16], + "faces": { + "north": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "east": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#6"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#8"} + } + }, + { + "from": [1, 15, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "south": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "west": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#6"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#8"} + } + }, + { + "from": [12, 0, 2], + "to": [14, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [12, 0, 12], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 2], + "to": [4, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 12], + "to": [4, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [1, 3, 1], + "to": [15, 3, 15], + "faces": { + "north": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "east": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "south": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "west": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#9"}, + "down": {"uv": [0, 0, 14, 14], "texture": "#missing"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_lefthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [22.5, 45, 0], + "translation": [-0.5, 0, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level10.json b/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level10.json new file mode 100644 index 00000000..9d74232d --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level10.json @@ -0,0 +1,261 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/side", + "2": "sculk_depths:block/flumrock_cauldron/bottom", + "3": "sculk_depths:block/flumrock_cauldron/feet", + "5": "sculk_depths:block/flumrock_cauldron/inside", + "6": "sculk_depths:block/flumrock_cauldron/top", + "7": "sculk_depths:block/flumrock_cauldron/top_border", + "8": "sculk_depths:block/flumrock_cauldron/bottom_border", + "9": "sculk_depths:block/kryslum_still", + "particle": "sculk_depths:block/flumrock_cauldron/side" + }, + "elements": [ + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#6"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#2"} + } + }, + { + "from": [0, 2, 0], + "to": [1, 13, 15], + "faces": { + "north": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "east": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "south": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "west": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#7"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#2"} + } + }, + { + "from": [0, 15, 0], + "to": [1, 16, 15], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "east": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "south": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#6"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#8"} + } + }, + { + "from": [15, 15, 1], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "west": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#6"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#8"} + } + }, + { + "from": [14.5, 13, 1.5], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "east": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "south": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "west": {"uv": [1.5, 3, 15, 1], "texture": "#5"}, + "up": {"uv": [14.5, 1.5, 15, 15], "texture": "#7"}, + "down": {"uv": [14.5, 1, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 1], + "to": [1.5, 15, 14.5], + "faces": { + "north": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "east": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "south": {"uv": [12, 24, 14, 34], "texture": "#missing"}, + "west": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "up": {"uv": [1, 1, 1.5, 14.5], "texture": "#7"}, + "down": {"uv": [1.5, 1.5, 1, 15], "texture": "#8"} + } + }, + { + "from": [15, 2, 1], + "to": [16, 13, 16], + "faces": { + "north": {"uv": [8, 0, 8.5, 5.5], "texture": "#missing"}, + "east": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "south": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "west": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#7"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#2"} + } + }, + { + "from": [1, 2, 0], + "to": [16, 13, 1], + "faces": { + "north": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "east": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "south": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "west": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#7"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#2"} + } + }, + { + "from": [1.5, 13, 1], + "to": [15, 15, 1.5], + "faces": { + "north": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "east": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "south": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "up": {"uv": [1.5, 1, 15, 1.5], "texture": "#7"}, + "down": {"uv": [1.5, 14.5, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 14.5], + "to": [14.5, 15, 15], + "faces": { + "north": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "south": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "west": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "up": {"uv": [1, 14.5, 14.5, 15], "texture": "#7"}, + "down": {"uv": [1, 1, 14.5, 1.5], "texture": "#8"} + } + }, + { + "from": [0, 2, 15], + "to": [15, 13, 16], + "faces": { + "north": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "east": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "south": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "west": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#7"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#2"} + } + }, + { + "from": [0, 15, 15], + "to": [15, 16, 16], + "faces": { + "north": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "east": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#6"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#8"} + } + }, + { + "from": [1, 15, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "south": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "west": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#6"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#8"} + } + }, + { + "from": [12, 0, 2], + "to": [14, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [12, 0, 12], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 2], + "to": [4, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 12], + "to": [4, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [1, 12, 1], + "to": [15, 12, 15], + "faces": { + "north": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "east": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "south": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "west": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#9"}, + "down": {"uv": [0, 0, 14, 14], "texture": "#missing"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_lefthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [22.5, 45, 0], + "translation": [-0.5, 0, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level11.json b/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level11.json new file mode 100644 index 00000000..53d67f20 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level11.json @@ -0,0 +1,261 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/side", + "2": "sculk_depths:block/flumrock_cauldron/bottom", + "3": "sculk_depths:block/flumrock_cauldron/feet", + "5": "sculk_depths:block/flumrock_cauldron/inside", + "6": "sculk_depths:block/flumrock_cauldron/top", + "7": "sculk_depths:block/flumrock_cauldron/top_border", + "8": "sculk_depths:block/flumrock_cauldron/bottom_border", + "9": "sculk_depths:block/kryslum_still", + "particle": "sculk_depths:block/flumrock_cauldron/side" + }, + "elements": [ + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#6"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#2"} + } + }, + { + "from": [0, 2, 0], + "to": [1, 13, 15], + "faces": { + "north": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "east": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "south": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "west": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#7"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#2"} + } + }, + { + "from": [0, 15, 0], + "to": [1, 16, 15], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "east": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "south": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#6"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#8"} + } + }, + { + "from": [15, 15, 1], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "west": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#6"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#8"} + } + }, + { + "from": [14.5, 13, 1.5], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "east": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "south": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "west": {"uv": [1.5, 3, 15, 1], "texture": "#5"}, + "up": {"uv": [14.5, 1.5, 15, 15], "texture": "#7"}, + "down": {"uv": [14.5, 1, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 1], + "to": [1.5, 15, 14.5], + "faces": { + "north": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "east": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "south": {"uv": [12, 24, 14, 34], "texture": "#missing"}, + "west": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "up": {"uv": [1, 1, 1.5, 14.5], "texture": "#7"}, + "down": {"uv": [1.5, 1.5, 1, 15], "texture": "#8"} + } + }, + { + "from": [15, 2, 1], + "to": [16, 13, 16], + "faces": { + "north": {"uv": [8, 0, 8.5, 5.5], "texture": "#missing"}, + "east": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "south": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "west": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#7"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#2"} + } + }, + { + "from": [1, 2, 0], + "to": [16, 13, 1], + "faces": { + "north": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "east": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "south": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "west": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#7"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#2"} + } + }, + { + "from": [1.5, 13, 1], + "to": [15, 15, 1.5], + "faces": { + "north": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "east": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "south": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "up": {"uv": [1.5, 1, 15, 1.5], "texture": "#7"}, + "down": {"uv": [1.5, 14.5, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 14.5], + "to": [14.5, 15, 15], + "faces": { + "north": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "south": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "west": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "up": {"uv": [1, 14.5, 14.5, 15], "texture": "#7"}, + "down": {"uv": [1, 1, 14.5, 1.5], "texture": "#8"} + } + }, + { + "from": [0, 2, 15], + "to": [15, 13, 16], + "faces": { + "north": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "east": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "south": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "west": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#7"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#2"} + } + }, + { + "from": [0, 15, 15], + "to": [15, 16, 16], + "faces": { + "north": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "east": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#6"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#8"} + } + }, + { + "from": [1, 15, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "south": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "west": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#6"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#8"} + } + }, + { + "from": [12, 0, 2], + "to": [14, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [12, 0, 12], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 2], + "to": [4, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 12], + "to": [4, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [1, 13, 1], + "to": [15, 13, 15], + "faces": { + "north": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "east": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "south": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "west": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#9"}, + "down": {"uv": [0, 0, 14, 14], "texture": "#missing"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_lefthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [22.5, 45, 0], + "translation": [-0.5, 0, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level2.json b/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level2.json new file mode 100644 index 00000000..d8e7fc51 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level2.json @@ -0,0 +1,261 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/side", + "2": "sculk_depths:block/flumrock_cauldron/bottom", + "3": "sculk_depths:block/flumrock_cauldron/feet", + "5": "sculk_depths:block/flumrock_cauldron/inside", + "6": "sculk_depths:block/flumrock_cauldron/top", + "7": "sculk_depths:block/flumrock_cauldron/top_border", + "8": "sculk_depths:block/flumrock_cauldron/bottom_border", + "9": "sculk_depths:block/kryslum_still", + "particle": "sculk_depths:block/flumrock_cauldron/side" + }, + "elements": [ + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#6"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#2"} + } + }, + { + "from": [0, 2, 0], + "to": [1, 13, 15], + "faces": { + "north": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "east": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "south": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "west": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#7"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#2"} + } + }, + { + "from": [0, 15, 0], + "to": [1, 16, 15], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "east": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "south": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#6"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#8"} + } + }, + { + "from": [15, 15, 1], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "west": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#6"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#8"} + } + }, + { + "from": [14.5, 13, 1.5], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "east": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "south": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "west": {"uv": [1.5, 3, 15, 1], "texture": "#5"}, + "up": {"uv": [14.5, 1.5, 15, 15], "texture": "#7"}, + "down": {"uv": [14.5, 1, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 1], + "to": [1.5, 15, 14.5], + "faces": { + "north": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "east": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "south": {"uv": [12, 24, 14, 34], "texture": "#missing"}, + "west": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "up": {"uv": [1, 1, 1.5, 14.5], "texture": "#7"}, + "down": {"uv": [1.5, 1.5, 1, 15], "texture": "#8"} + } + }, + { + "from": [15, 2, 1], + "to": [16, 13, 16], + "faces": { + "north": {"uv": [8, 0, 8.5, 5.5], "texture": "#missing"}, + "east": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "south": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "west": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#7"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#2"} + } + }, + { + "from": [1, 2, 0], + "to": [16, 13, 1], + "faces": { + "north": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "east": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "south": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "west": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#7"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#2"} + } + }, + { + "from": [1.5, 13, 1], + "to": [15, 15, 1.5], + "faces": { + "north": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "east": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "south": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "up": {"uv": [1.5, 1, 15, 1.5], "texture": "#7"}, + "down": {"uv": [1.5, 14.5, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 14.5], + "to": [14.5, 15, 15], + "faces": { + "north": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "south": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "west": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "up": {"uv": [1, 14.5, 14.5, 15], "texture": "#7"}, + "down": {"uv": [1, 1, 14.5, 1.5], "texture": "#8"} + } + }, + { + "from": [0, 2, 15], + "to": [15, 13, 16], + "faces": { + "north": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "east": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "south": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "west": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#7"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#2"} + } + }, + { + "from": [0, 15, 15], + "to": [15, 16, 16], + "faces": { + "north": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "east": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#6"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#8"} + } + }, + { + "from": [1, 15, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "south": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "west": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#6"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#8"} + } + }, + { + "from": [12, 0, 2], + "to": [14, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [12, 0, 12], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 2], + "to": [4, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 12], + "to": [4, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [1, 4, 1], + "to": [15, 4, 15], + "faces": { + "north": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "east": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "south": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "west": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#9"}, + "down": {"uv": [0, 0, 14, 14], "texture": "#missing"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_lefthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [22.5, 45, 0], + "translation": [-0.5, 0, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level3.json b/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level3.json new file mode 100644 index 00000000..d0e10396 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level3.json @@ -0,0 +1,261 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/side", + "2": "sculk_depths:block/flumrock_cauldron/bottom", + "3": "sculk_depths:block/flumrock_cauldron/feet", + "5": "sculk_depths:block/flumrock_cauldron/inside", + "6": "sculk_depths:block/flumrock_cauldron/top", + "7": "sculk_depths:block/flumrock_cauldron/top_border", + "8": "sculk_depths:block/flumrock_cauldron/bottom_border", + "9": "sculk_depths:block/kryslum_still", + "particle": "sculk_depths:block/flumrock_cauldron/side" + }, + "elements": [ + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#6"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#2"} + } + }, + { + "from": [0, 2, 0], + "to": [1, 13, 15], + "faces": { + "north": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "east": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "south": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "west": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#7"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#2"} + } + }, + { + "from": [0, 15, 0], + "to": [1, 16, 15], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "east": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "south": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#6"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#8"} + } + }, + { + "from": [15, 15, 1], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "west": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#6"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#8"} + } + }, + { + "from": [14.5, 13, 1.5], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "east": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "south": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "west": {"uv": [1.5, 3, 15, 1], "texture": "#5"}, + "up": {"uv": [14.5, 1.5, 15, 15], "texture": "#7"}, + "down": {"uv": [14.5, 1, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 1], + "to": [1.5, 15, 14.5], + "faces": { + "north": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "east": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "south": {"uv": [12, 24, 14, 34], "texture": "#missing"}, + "west": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "up": {"uv": [1, 1, 1.5, 14.5], "texture": "#7"}, + "down": {"uv": [1.5, 1.5, 1, 15], "texture": "#8"} + } + }, + { + "from": [15, 2, 1], + "to": [16, 13, 16], + "faces": { + "north": {"uv": [8, 0, 8.5, 5.5], "texture": "#missing"}, + "east": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "south": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "west": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#7"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#2"} + } + }, + { + "from": [1, 2, 0], + "to": [16, 13, 1], + "faces": { + "north": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "east": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "south": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "west": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#7"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#2"} + } + }, + { + "from": [1.5, 13, 1], + "to": [15, 15, 1.5], + "faces": { + "north": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "east": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "south": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "up": {"uv": [1.5, 1, 15, 1.5], "texture": "#7"}, + "down": {"uv": [1.5, 14.5, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 14.5], + "to": [14.5, 15, 15], + "faces": { + "north": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "south": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "west": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "up": {"uv": [1, 14.5, 14.5, 15], "texture": "#7"}, + "down": {"uv": [1, 1, 14.5, 1.5], "texture": "#8"} + } + }, + { + "from": [0, 2, 15], + "to": [15, 13, 16], + "faces": { + "north": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "east": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "south": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "west": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#7"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#2"} + } + }, + { + "from": [0, 15, 15], + "to": [15, 16, 16], + "faces": { + "north": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "east": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#6"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#8"} + } + }, + { + "from": [1, 15, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "south": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "west": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#6"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#8"} + } + }, + { + "from": [12, 0, 2], + "to": [14, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [12, 0, 12], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 2], + "to": [4, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 12], + "to": [4, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [1, 5, 1], + "to": [15, 5, 15], + "faces": { + "north": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "east": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "south": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "west": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#9"}, + "down": {"uv": [0, 0, 14, 14], "texture": "#missing"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_lefthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [22.5, 45, 0], + "translation": [-0.5, 0, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level4.json b/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level4.json new file mode 100644 index 00000000..36685412 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level4.json @@ -0,0 +1,261 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/side", + "2": "sculk_depths:block/flumrock_cauldron/bottom", + "3": "sculk_depths:block/flumrock_cauldron/feet", + "5": "sculk_depths:block/flumrock_cauldron/inside", + "6": "sculk_depths:block/flumrock_cauldron/top", + "7": "sculk_depths:block/flumrock_cauldron/top_border", + "8": "sculk_depths:block/flumrock_cauldron/bottom_border", + "9": "sculk_depths:block/kryslum_still", + "particle": "sculk_depths:block/flumrock_cauldron/side" + }, + "elements": [ + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#6"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#2"} + } + }, + { + "from": [0, 2, 0], + "to": [1, 13, 15], + "faces": { + "north": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "east": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "south": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "west": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#7"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#2"} + } + }, + { + "from": [0, 15, 0], + "to": [1, 16, 15], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "east": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "south": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#6"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#8"} + } + }, + { + "from": [15, 15, 1], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "west": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#6"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#8"} + } + }, + { + "from": [14.5, 13, 1.5], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "east": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "south": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "west": {"uv": [1.5, 3, 15, 1], "texture": "#5"}, + "up": {"uv": [14.5, 1.5, 15, 15], "texture": "#7"}, + "down": {"uv": [14.5, 1, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 1], + "to": [1.5, 15, 14.5], + "faces": { + "north": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "east": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "south": {"uv": [12, 24, 14, 34], "texture": "#missing"}, + "west": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "up": {"uv": [1, 1, 1.5, 14.5], "texture": "#7"}, + "down": {"uv": [1.5, 1.5, 1, 15], "texture": "#8"} + } + }, + { + "from": [15, 2, 1], + "to": [16, 13, 16], + "faces": { + "north": {"uv": [8, 0, 8.5, 5.5], "texture": "#missing"}, + "east": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "south": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "west": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#7"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#2"} + } + }, + { + "from": [1, 2, 0], + "to": [16, 13, 1], + "faces": { + "north": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "east": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "south": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "west": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#7"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#2"} + } + }, + { + "from": [1.5, 13, 1], + "to": [15, 15, 1.5], + "faces": { + "north": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "east": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "south": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "up": {"uv": [1.5, 1, 15, 1.5], "texture": "#7"}, + "down": {"uv": [1.5, 14.5, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 14.5], + "to": [14.5, 15, 15], + "faces": { + "north": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "south": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "west": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "up": {"uv": [1, 14.5, 14.5, 15], "texture": "#7"}, + "down": {"uv": [1, 1, 14.5, 1.5], "texture": "#8"} + } + }, + { + "from": [0, 2, 15], + "to": [15, 13, 16], + "faces": { + "north": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "east": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "south": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "west": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#7"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#2"} + } + }, + { + "from": [0, 15, 15], + "to": [15, 16, 16], + "faces": { + "north": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "east": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#6"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#8"} + } + }, + { + "from": [1, 15, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "south": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "west": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#6"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#8"} + } + }, + { + "from": [12, 0, 2], + "to": [14, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [12, 0, 12], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 2], + "to": [4, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 12], + "to": [4, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [1, 6, 1], + "to": [15, 6, 15], + "faces": { + "north": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "east": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "south": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "west": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#9"}, + "down": {"uv": [0, 0, 14, 14], "texture": "#missing"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_lefthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [22.5, 45, 0], + "translation": [-0.5, 0, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level5.json b/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level5.json new file mode 100644 index 00000000..3d324c87 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level5.json @@ -0,0 +1,261 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/side", + "2": "sculk_depths:block/flumrock_cauldron/bottom", + "3": "sculk_depths:block/flumrock_cauldron/feet", + "5": "sculk_depths:block/flumrock_cauldron/inside", + "6": "sculk_depths:block/flumrock_cauldron/top", + "7": "sculk_depths:block/flumrock_cauldron/top_border", + "8": "sculk_depths:block/flumrock_cauldron/bottom_border", + "9": "sculk_depths:block/kryslum_still", + "particle": "sculk_depths:block/flumrock_cauldron/side" + }, + "elements": [ + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#6"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#2"} + } + }, + { + "from": [0, 2, 0], + "to": [1, 13, 15], + "faces": { + "north": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "east": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "south": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "west": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#7"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#2"} + } + }, + { + "from": [0, 15, 0], + "to": [1, 16, 15], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "east": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "south": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#6"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#8"} + } + }, + { + "from": [15, 15, 1], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "west": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#6"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#8"} + } + }, + { + "from": [14.5, 13, 1.5], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "east": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "south": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "west": {"uv": [1.5, 3, 15, 1], "texture": "#5"}, + "up": {"uv": [14.5, 1.5, 15, 15], "texture": "#7"}, + "down": {"uv": [14.5, 1, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 1], + "to": [1.5, 15, 14.5], + "faces": { + "north": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "east": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "south": {"uv": [12, 24, 14, 34], "texture": "#missing"}, + "west": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "up": {"uv": [1, 1, 1.5, 14.5], "texture": "#7"}, + "down": {"uv": [1.5, 1.5, 1, 15], "texture": "#8"} + } + }, + { + "from": [15, 2, 1], + "to": [16, 13, 16], + "faces": { + "north": {"uv": [8, 0, 8.5, 5.5], "texture": "#missing"}, + "east": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "south": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "west": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#7"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#2"} + } + }, + { + "from": [1, 2, 0], + "to": [16, 13, 1], + "faces": { + "north": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "east": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "south": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "west": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#7"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#2"} + } + }, + { + "from": [1.5, 13, 1], + "to": [15, 15, 1.5], + "faces": { + "north": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "east": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "south": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "up": {"uv": [1.5, 1, 15, 1.5], "texture": "#7"}, + "down": {"uv": [1.5, 14.5, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 14.5], + "to": [14.5, 15, 15], + "faces": { + "north": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "south": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "west": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "up": {"uv": [1, 14.5, 14.5, 15], "texture": "#7"}, + "down": {"uv": [1, 1, 14.5, 1.5], "texture": "#8"} + } + }, + { + "from": [0, 2, 15], + "to": [15, 13, 16], + "faces": { + "north": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "east": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "south": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "west": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#7"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#2"} + } + }, + { + "from": [0, 15, 15], + "to": [15, 16, 16], + "faces": { + "north": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "east": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#6"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#8"} + } + }, + { + "from": [1, 15, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "south": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "west": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#6"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#8"} + } + }, + { + "from": [12, 0, 2], + "to": [14, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [12, 0, 12], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 2], + "to": [4, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 12], + "to": [4, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [1, 7, 1], + "to": [15, 7, 15], + "faces": { + "north": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "east": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "south": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "west": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#9"}, + "down": {"uv": [0, 0, 14, 14], "texture": "#missing"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_lefthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [22.5, 45, 0], + "translation": [-0.5, 0, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level6.json b/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level6.json new file mode 100644 index 00000000..b5c31c45 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level6.json @@ -0,0 +1,261 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/side", + "2": "sculk_depths:block/flumrock_cauldron/bottom", + "3": "sculk_depths:block/flumrock_cauldron/feet", + "5": "sculk_depths:block/flumrock_cauldron/inside", + "6": "sculk_depths:block/flumrock_cauldron/top", + "7": "sculk_depths:block/flumrock_cauldron/top_border", + "8": "sculk_depths:block/flumrock_cauldron/bottom_border", + "9": "sculk_depths:block/kryslum_still", + "particle": "sculk_depths:block/flumrock_cauldron/side" + }, + "elements": [ + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#6"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#2"} + } + }, + { + "from": [0, 2, 0], + "to": [1, 13, 15], + "faces": { + "north": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "east": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "south": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "west": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#7"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#2"} + } + }, + { + "from": [0, 15, 0], + "to": [1, 16, 15], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "east": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "south": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#6"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#8"} + } + }, + { + "from": [15, 15, 1], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "west": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#6"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#8"} + } + }, + { + "from": [14.5, 13, 1.5], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "east": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "south": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "west": {"uv": [1.5, 3, 15, 1], "texture": "#5"}, + "up": {"uv": [14.5, 1.5, 15, 15], "texture": "#7"}, + "down": {"uv": [14.5, 1, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 1], + "to": [1.5, 15, 14.5], + "faces": { + "north": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "east": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "south": {"uv": [12, 24, 14, 34], "texture": "#missing"}, + "west": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "up": {"uv": [1, 1, 1.5, 14.5], "texture": "#7"}, + "down": {"uv": [1.5, 1.5, 1, 15], "texture": "#8"} + } + }, + { + "from": [15, 2, 1], + "to": [16, 13, 16], + "faces": { + "north": {"uv": [8, 0, 8.5, 5.5], "texture": "#missing"}, + "east": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "south": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "west": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#7"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#2"} + } + }, + { + "from": [1, 2, 0], + "to": [16, 13, 1], + "faces": { + "north": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "east": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "south": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "west": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#7"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#2"} + } + }, + { + "from": [1.5, 13, 1], + "to": [15, 15, 1.5], + "faces": { + "north": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "east": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "south": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "up": {"uv": [1.5, 1, 15, 1.5], "texture": "#7"}, + "down": {"uv": [1.5, 14.5, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 14.5], + "to": [14.5, 15, 15], + "faces": { + "north": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "south": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "west": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "up": {"uv": [1, 14.5, 14.5, 15], "texture": "#7"}, + "down": {"uv": [1, 1, 14.5, 1.5], "texture": "#8"} + } + }, + { + "from": [0, 2, 15], + "to": [15, 13, 16], + "faces": { + "north": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "east": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "south": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "west": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#7"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#2"} + } + }, + { + "from": [0, 15, 15], + "to": [15, 16, 16], + "faces": { + "north": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "east": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#6"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#8"} + } + }, + { + "from": [1, 15, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "south": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "west": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#6"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#8"} + } + }, + { + "from": [12, 0, 2], + "to": [14, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [12, 0, 12], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 2], + "to": [4, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 12], + "to": [4, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [1, 8, 1], + "to": [15, 8, 15], + "faces": { + "north": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "east": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "south": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "west": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#9"}, + "down": {"uv": [0, 0, 14, 14], "texture": "#missing"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_lefthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [22.5, 45, 0], + "translation": [-0.5, 0, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level7.json b/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level7.json new file mode 100644 index 00000000..1a8d810c --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level7.json @@ -0,0 +1,261 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/side", + "2": "sculk_depths:block/flumrock_cauldron/bottom", + "3": "sculk_depths:block/flumrock_cauldron/feet", + "5": "sculk_depths:block/flumrock_cauldron/inside", + "6": "sculk_depths:block/flumrock_cauldron/top", + "7": "sculk_depths:block/flumrock_cauldron/top_border", + "8": "sculk_depths:block/flumrock_cauldron/bottom_border", + "9": "sculk_depths:block/kryslum_still", + "particle": "sculk_depths:block/flumrock_cauldron/side" + }, + "elements": [ + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#6"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#2"} + } + }, + { + "from": [0, 2, 0], + "to": [1, 13, 15], + "faces": { + "north": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "east": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "south": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "west": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#7"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#2"} + } + }, + { + "from": [0, 15, 0], + "to": [1, 16, 15], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "east": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "south": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#6"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#8"} + } + }, + { + "from": [15, 15, 1], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "west": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#6"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#8"} + } + }, + { + "from": [14.5, 13, 1.5], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "east": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "south": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "west": {"uv": [1.5, 3, 15, 1], "texture": "#5"}, + "up": {"uv": [14.5, 1.5, 15, 15], "texture": "#7"}, + "down": {"uv": [14.5, 1, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 1], + "to": [1.5, 15, 14.5], + "faces": { + "north": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "east": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "south": {"uv": [12, 24, 14, 34], "texture": "#missing"}, + "west": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "up": {"uv": [1, 1, 1.5, 14.5], "texture": "#7"}, + "down": {"uv": [1.5, 1.5, 1, 15], "texture": "#8"} + } + }, + { + "from": [15, 2, 1], + "to": [16, 13, 16], + "faces": { + "north": {"uv": [8, 0, 8.5, 5.5], "texture": "#missing"}, + "east": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "south": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "west": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#7"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#2"} + } + }, + { + "from": [1, 2, 0], + "to": [16, 13, 1], + "faces": { + "north": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "east": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "south": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "west": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#7"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#2"} + } + }, + { + "from": [1.5, 13, 1], + "to": [15, 15, 1.5], + "faces": { + "north": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "east": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "south": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "up": {"uv": [1.5, 1, 15, 1.5], "texture": "#7"}, + "down": {"uv": [1.5, 14.5, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 14.5], + "to": [14.5, 15, 15], + "faces": { + "north": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "south": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "west": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "up": {"uv": [1, 14.5, 14.5, 15], "texture": "#7"}, + "down": {"uv": [1, 1, 14.5, 1.5], "texture": "#8"} + } + }, + { + "from": [0, 2, 15], + "to": [15, 13, 16], + "faces": { + "north": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "east": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "south": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "west": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#7"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#2"} + } + }, + { + "from": [0, 15, 15], + "to": [15, 16, 16], + "faces": { + "north": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "east": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#6"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#8"} + } + }, + { + "from": [1, 15, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "south": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "west": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#6"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#8"} + } + }, + { + "from": [12, 0, 2], + "to": [14, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [12, 0, 12], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 2], + "to": [4, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 12], + "to": [4, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [1, 9, 1], + "to": [15, 9, 15], + "faces": { + "north": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "east": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "south": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "west": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#9"}, + "down": {"uv": [0, 0, 14, 14], "texture": "#missing"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_lefthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [22.5, 45, 0], + "translation": [-0.5, 0, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level8.json b/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level8.json new file mode 100644 index 00000000..0474b19c --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level8.json @@ -0,0 +1,261 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/side", + "2": "sculk_depths:block/flumrock_cauldron/bottom", + "3": "sculk_depths:block/flumrock_cauldron/feet", + "5": "sculk_depths:block/flumrock_cauldron/inside", + "6": "sculk_depths:block/flumrock_cauldron/top", + "7": "sculk_depths:block/flumrock_cauldron/top_border", + "8": "sculk_depths:block/flumrock_cauldron/bottom_border", + "9": "sculk_depths:block/kryslum_still", + "particle": "sculk_depths:block/flumrock_cauldron/side" + }, + "elements": [ + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#6"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#2"} + } + }, + { + "from": [0, 2, 0], + "to": [1, 13, 15], + "faces": { + "north": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "east": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "south": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "west": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#7"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#2"} + } + }, + { + "from": [0, 15, 0], + "to": [1, 16, 15], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "east": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "south": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#6"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#8"} + } + }, + { + "from": [15, 15, 1], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "west": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#6"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#8"} + } + }, + { + "from": [14.5, 13, 1.5], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "east": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "south": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "west": {"uv": [1.5, 3, 15, 1], "texture": "#5"}, + "up": {"uv": [14.5, 1.5, 15, 15], "texture": "#7"}, + "down": {"uv": [14.5, 1, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 1], + "to": [1.5, 15, 14.5], + "faces": { + "north": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "east": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "south": {"uv": [12, 24, 14, 34], "texture": "#missing"}, + "west": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "up": {"uv": [1, 1, 1.5, 14.5], "texture": "#7"}, + "down": {"uv": [1.5, 1.5, 1, 15], "texture": "#8"} + } + }, + { + "from": [15, 2, 1], + "to": [16, 13, 16], + "faces": { + "north": {"uv": [8, 0, 8.5, 5.5], "texture": "#missing"}, + "east": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "south": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "west": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#7"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#2"} + } + }, + { + "from": [1, 2, 0], + "to": [16, 13, 1], + "faces": { + "north": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "east": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "south": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "west": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#7"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#2"} + } + }, + { + "from": [1.5, 13, 1], + "to": [15, 15, 1.5], + "faces": { + "north": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "east": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "south": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "up": {"uv": [1.5, 1, 15, 1.5], "texture": "#7"}, + "down": {"uv": [1.5, 14.5, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 14.5], + "to": [14.5, 15, 15], + "faces": { + "north": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "south": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "west": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "up": {"uv": [1, 14.5, 14.5, 15], "texture": "#7"}, + "down": {"uv": [1, 1, 14.5, 1.5], "texture": "#8"} + } + }, + { + "from": [0, 2, 15], + "to": [15, 13, 16], + "faces": { + "north": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "east": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "south": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "west": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#7"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#2"} + } + }, + { + "from": [0, 15, 15], + "to": [15, 16, 16], + "faces": { + "north": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "east": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#6"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#8"} + } + }, + { + "from": [1, 15, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "south": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "west": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#6"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#8"} + } + }, + { + "from": [12, 0, 2], + "to": [14, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [12, 0, 12], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 2], + "to": [4, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 12], + "to": [4, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [1, 10, 1], + "to": [15, 10, 15], + "faces": { + "north": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "east": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "south": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "west": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#9"}, + "down": {"uv": [0, 0, 14, 14], "texture": "#missing"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_lefthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [22.5, 45, 0], + "translation": [-0.5, 0, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level9.json b/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level9.json new file mode 100644 index 00000000..68c93fdb --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/kryslum_flumrock_cauldron_level9.json @@ -0,0 +1,261 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "sculk_depths:block/flumrock_cauldron/side", + "2": "sculk_depths:block/flumrock_cauldron/bottom", + "3": "sculk_depths:block/flumrock_cauldron/feet", + "5": "sculk_depths:block/flumrock_cauldron/inside", + "6": "sculk_depths:block/flumrock_cauldron/top", + "7": "sculk_depths:block/flumrock_cauldron/top_border", + "8": "sculk_depths:block/flumrock_cauldron/bottom_border", + "9": "sculk_depths:block/kryslum_still", + "particle": "sculk_depths:block/flumrock_cauldron/side" + }, + "elements": [ + { + "from": [1, 1, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#0"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#6"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#2"} + } + }, + { + "from": [0, 2, 0], + "to": [1, 13, 15], + "faces": { + "north": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "east": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "south": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "west": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#7"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#2"} + } + }, + { + "from": [0, 15, 0], + "to": [1, 16, 15], + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "east": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "south": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "west": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 15], "texture": "#6"}, + "down": {"uv": [0, 1, 1, 16], "texture": "#8"} + } + }, + { + "from": [15, 15, 1], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "east": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "west": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#6"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#8"} + } + }, + { + "from": [14.5, 13, 1.5], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "east": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "south": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "west": {"uv": [1.5, 3, 15, 1], "texture": "#5"}, + "up": {"uv": [14.5, 1.5, 15, 15], "texture": "#7"}, + "down": {"uv": [14.5, 1, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 1], + "to": [1.5, 15, 14.5], + "faces": { + "north": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "east": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "south": {"uv": [12, 24, 14, 34], "texture": "#missing"}, + "west": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "up": {"uv": [1, 1, 1.5, 14.5], "texture": "#7"}, + "down": {"uv": [1.5, 1.5, 1, 15], "texture": "#8"} + } + }, + { + "from": [15, 2, 1], + "to": [16, 13, 16], + "faces": { + "north": {"uv": [8, 0, 8.5, 5.5], "texture": "#missing"}, + "east": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "south": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "west": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#7"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#2"} + } + }, + { + "from": [1, 2, 0], + "to": [16, 13, 1], + "faces": { + "north": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "east": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "south": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "west": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#7"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#2"} + } + }, + { + "from": [1.5, 13, 1], + "to": [15, 15, 1.5], + "faces": { + "north": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "east": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "south": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "up": {"uv": [1.5, 1, 15, 1.5], "texture": "#7"}, + "down": {"uv": [1.5, 14.5, 15, 15], "texture": "#8"} + } + }, + { + "from": [1, 13, 14.5], + "to": [14.5, 15, 15], + "faces": { + "north": {"uv": [1.5, 1, 15, 3], "texture": "#5"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#missing"}, + "south": {"uv": [1, 1, 14.5, 3], "texture": "#0"}, + "west": {"uv": [14.5, 1, 15, 3], "texture": "#0"}, + "up": {"uv": [1, 14.5, 14.5, 15], "texture": "#7"}, + "down": {"uv": [1, 1, 14.5, 1.5], "texture": "#8"} + } + }, + { + "from": [0, 2, 15], + "to": [15, 13, 16], + "faces": { + "north": {"uv": [1, 3, 16, 14], "texture": "#5"}, + "east": {"uv": [0, 0, 4, 44], "texture": "#missing"}, + "south": {"uv": [0, 3, 15, 14], "texture": "#0"}, + "west": {"uv": [15, 3, 16, 14], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#7"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#2"} + } + }, + { + "from": [0, 15, 15], + "to": [15, 16, 16], + "faces": { + "north": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "east": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "south": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#6"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#8"} + } + }, + { + "from": [1, 15, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [0, 0, 15, 1], "texture": "#0"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "south": {"uv": [1, 0, 16, 1], "texture": "#5"}, + "west": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "up": {"uv": [1, 0, 16, 1], "texture": "#6"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#8"} + } + }, + { + "from": [12, 0, 2], + "to": [14, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [12, 0, 12], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 2], + "to": [4, 1, 4], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [2, 0, 12], + "to": [4, 1, 14], + "faces": { + "north": {"uv": [4, 8, 6, 9], "rotation": 180, "texture": "#3"}, + "east": {"uv": [6, 6, 7, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 5, 6, 6], "texture": "#3"}, + "west": {"uv": [3, 6, 4, 8], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "down": {"uv": [4, 6, 6, 8], "texture": "#3"} + } + }, + { + "from": [1, 11, 1], + "to": [15, 11, 15], + "faces": { + "north": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "east": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "south": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "west": {"uv": [0, 0, 14, 0], "texture": "#missing"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#9"}, + "down": {"uv": [0, 0, 14, 14], "texture": "#missing"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_lefthand": { + "rotation": [0, 45, 0], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [22.5, 45, 0], + "translation": [-0.5, 0, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/petrified_valtrox_button.json b/src/main/resources/assets/sculk_depths/models/block/petrified_valtrox_button.json new file mode 100644 index 00000000..ed572986 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/petrified_valtrox_button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "sculk_depths:block/petrified_valtrox_slates" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/petrified_valtrox_button_inventory.json b/src/main/resources/assets/sculk_depths/models/block/petrified_valtrox_button_inventory.json new file mode 100644 index 00000000..d5341160 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/petrified_valtrox_button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "sculk_depths:block/petrified_valtrox_slates" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/petrified_valtrox_button_pressed.json b/src/main/resources/assets/sculk_depths/models/block/petrified_valtrox_button_pressed.json new file mode 100644 index 00000000..e71c076a --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/petrified_valtrox_button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "sculk_depths:block/petrified_valtrox_slates" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/petrified_valtrox_pressure_plate.json b/src/main/resources/assets/sculk_depths/models/block/petrified_valtrox_pressure_plate.json new file mode 100644 index 00000000..8f0b27e8 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/petrified_valtrox_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "sculk_depths:block/petrified_valtrox_slates" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/petrified_valtrox_pressure_plate_down.json b/src/main/resources/assets/sculk_depths/models/block/petrified_valtrox_pressure_plate_down.json new file mode 100644 index 00000000..6452be25 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/petrified_valtrox_pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "sculk_depths:block/petrified_valtrox_slates" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/valtrox_button.json b/src/main/resources/assets/sculk_depths/models/block/valtrox_button.json new file mode 100644 index 00000000..b2e3243c --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/valtrox_button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "sculk_depths:block/valtrox_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/valtrox_button_inventory.json b/src/main/resources/assets/sculk_depths/models/block/valtrox_button_inventory.json new file mode 100644 index 00000000..19ca7c0d --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/valtrox_button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "sculk_depths:block/valtrox_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/valtrox_button_pressed.json b/src/main/resources/assets/sculk_depths/models/block/valtrox_button_pressed.json new file mode 100644 index 00000000..f49f739a --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/valtrox_button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "sculk_depths:block/valtrox_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/valtrox_pressure_plate.json b/src/main/resources/assets/sculk_depths/models/block/valtrox_pressure_plate.json new file mode 100644 index 00000000..a6eac18f --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/valtrox_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "sculk_depths:block/valtrox_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/valtrox_pressure_plate_down.json b/src/main/resources/assets/sculk_depths/models/block/valtrox_pressure_plate_down.json new file mode 100644 index 00000000..b8fe44c9 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/valtrox_pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "sculk_depths:block/valtrox_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/zygrin_flowblock.json b/src/main/resources/assets/sculk_depths/models/block/zygrin_flowblock.json new file mode 100644 index 00000000..880a5e34 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/zygrin_flowblock.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "sculk_depths:block/zygrin_flowblock", + "side": "sculk_depths:block/zygrin_flowblock" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/item/crystal.json b/src/main/resources/assets/sculk_depths/models/item/crystal.json new file mode 100644 index 00000000..18ef1e3d --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/item/crystal.json @@ -0,0 +1,3 @@ +{ + "parent": "sculk_depths:block/crystal" +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/item/dried_valtrox_button.json b/src/main/resources/assets/sculk_depths/models/item/dried_valtrox_button.json new file mode 100644 index 00000000..2b925dcb --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/item/dried_valtrox_button.json @@ -0,0 +1,3 @@ +{ + "parent": "sculk_depths:block/dried_valtrox_button_inventory" +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/item/dried_valtrox_pressure_plate.json b/src/main/resources/assets/sculk_depths/models/item/dried_valtrox_pressure_plate.json new file mode 100644 index 00000000..eea88e7c --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/item/dried_valtrox_pressure_plate.json @@ -0,0 +1,3 @@ +{ + "parent": "sculk_depths:block/dried_valtrox_pressure_plate" +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/item/dried_valtrox_wood.json b/src/main/resources/assets/sculk_depths/models/item/dried_valtrox_wood.json index cd3161a7..0a372660 100644 --- a/src/main/resources/assets/sculk_depths/models/item/dried_valtrox_wood.json +++ b/src/main/resources/assets/sculk_depths/models/item/dried_valtrox_wood.json @@ -1,3 +1,3 @@ { - "parent": "sculk_depths:block/valtrox_wood" + "parent": "sculk_depths:block/dried_valtrox_wood" } \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/item/energized_flint_and_steel.json b/src/main/resources/assets/sculk_depths/models/item/energized_flint_and_steel.json index 969a6ea5..0a7397cf 100644 --- a/src/main/resources/assets/sculk_depths/models/item/energized_flint_and_steel.json +++ b/src/main/resources/assets/sculk_depths/models/item/energized_flint_and_steel.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "sculk_depths:item/energized_flint_and_steel" } diff --git a/src/main/resources/assets/sculk_depths/models/item/energizedflint_and_steel.json b/src/main/resources/assets/sculk_depths/models/item/energizedflint_and_steel.json deleted file mode 100644 index 5885e1fe..00000000 --- a/src/main/resources/assets/sculk_depths/models/item/energizedflint_and_steel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/energized_flint_and_steel" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/item/flumrock_cauldron.json b/src/main/resources/assets/sculk_depths/models/item/flumrock_cauldron.json new file mode 100644 index 00000000..a934056c --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/item/flumrock_cauldron.json @@ -0,0 +1,3 @@ +{ + "parent": "sculk_depths:block/flumrock_cauldron" +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/item/petrified_valtrox_button.json b/src/main/resources/assets/sculk_depths/models/item/petrified_valtrox_button.json new file mode 100644 index 00000000..05bdbce1 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/item/petrified_valtrox_button.json @@ -0,0 +1,3 @@ +{ + "parent": "sculk_depths:block/petrified_valtrox_button_inventory" +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/item/petrified_valtrox_pressure_plate.json b/src/main/resources/assets/sculk_depths/models/item/petrified_valtrox_pressure_plate.json new file mode 100644 index 00000000..9e0c7dc6 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/item/petrified_valtrox_pressure_plate.json @@ -0,0 +1,3 @@ +{ + "parent": "sculk_depths:block/petrified_valtrox_pressure_plate" +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/item/valtrox_button.json b/src/main/resources/assets/sculk_depths/models/item/valtrox_button.json new file mode 100644 index 00000000..ac009f8b --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/item/valtrox_button.json @@ -0,0 +1,3 @@ +{ + "parent": "sculk_depths:block/valtrox_button_inventory" +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/item/valtrox_pressure_plate.json b/src/main/resources/assets/sculk_depths/models/item/valtrox_pressure_plate.json new file mode 100644 index 00000000..a5db8091 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/item/valtrox_pressure_plate.json @@ -0,0 +1,3 @@ +{ + "parent": "sculk_depths:block/valtrox_pressure_plate" +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/item/zygrin_flowblock.json b/src/main/resources/assets/sculk_depths/models/item/zygrin_flowblock.json new file mode 100644 index 00000000..a85adbd6 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/item/zygrin_flowblock.json @@ -0,0 +1,3 @@ +{ + "parent": "sculk_depths:block/zygrin_flowblock" +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/textures/block/crystal.png b/src/main/resources/assets/sculk_depths/textures/block/crystal.png new file mode 100644 index 00000000..80d2879f Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/crystal.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/crystal_e.png b/src/main/resources/assets/sculk_depths/textures/block/crystal_e.png new file mode 100644 index 00000000..80d2879f Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/crystal_e.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/dried_valtrox_log.png b/src/main/resources/assets/sculk_depths/textures/block/dried_valtrox_log.png index f7798388..1e8d13d2 100644 Binary files a/src/main/resources/assets/sculk_depths/textures/block/dried_valtrox_log.png and b/src/main/resources/assets/sculk_depths/textures/block/dried_valtrox_log.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/dried_valtrox_log_top.png b/src/main/resources/assets/sculk_depths/textures/block/dried_valtrox_log_top.png index 7b8d771a..e0aaf7fa 100644 Binary files a/src/main/resources/assets/sculk_depths/textures/block/dried_valtrox_log_top.png and b/src/main/resources/assets/sculk_depths/textures/block/dried_valtrox_log_top.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/dried_valtrox_planks.png b/src/main/resources/assets/sculk_depths/textures/block/dried_valtrox_planks.png index 6d7654fc..39ec8493 100644 Binary files a/src/main/resources/assets/sculk_depths/textures/block/dried_valtrox_planks.png and b/src/main/resources/assets/sculk_depths/textures/block/dried_valtrox_planks.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock.png index d6a3cc6d..e6c452e0 100644 Binary files a/src/main/resources/assets/sculk_depths/textures/block/flumrock.png and b/src/main/resources/assets/sculk_depths/textures/block/flumrock.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/bottom.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/bottom.png new file mode 100644 index 00000000..88ebc9d7 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/bottom.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/bottom_border.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/bottom_border.png new file mode 100644 index 00000000..7fdf3a53 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/bottom_border.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_0.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_0.png new file mode 100644 index 00000000..c1fe160f Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_0.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_1.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_1.png new file mode 100644 index 00000000..ddf5b4fc Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_1.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_10.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_10.png new file mode 100644 index 00000000..79f02170 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_10.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_11.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_11.png new file mode 100644 index 00000000..33b5b16b Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_11.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_12.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_12.png new file mode 100644 index 00000000..24d7fbf4 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_12.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_2.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_2.png new file mode 100644 index 00000000..32bdcceb Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_2.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_3.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_3.png new file mode 100644 index 00000000..2f94d1aa Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_3.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_4.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_4.png new file mode 100644 index 00000000..c2203a5f Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_4.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_5.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_5.png new file mode 100644 index 00000000..b342169b Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_5.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_6.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_6.png new file mode 100644 index 00000000..ce14eeb6 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_6.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_7.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_7.png new file mode 100644 index 00000000..5aff12c0 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_7.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_8.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_8.png new file mode 100644 index 00000000..81058300 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_8.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_9.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_9.png new file mode 100644 index 00000000..fc7ad4e1 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/diamond_9.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/feet.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/feet.png new file mode 100644 index 00000000..377b1cfb Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/feet.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/inside.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/inside.png new file mode 100644 index 00000000..a401cb3a Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/inside.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_0.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_0.png new file mode 100644 index 00000000..6d0a4001 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_0.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_1.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_1.png new file mode 100644 index 00000000..0eefa5e5 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_1.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_10.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_10.png new file mode 100644 index 00000000..68d459fe Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_10.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_11.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_11.png new file mode 100644 index 00000000..651025c9 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_11.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_12.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_12.png new file mode 100644 index 00000000..309e45b9 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_12.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_2.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_2.png new file mode 100644 index 00000000..f3f2109e Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_2.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_3.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_3.png new file mode 100644 index 00000000..18d5d16a Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_3.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_4.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_4.png new file mode 100644 index 00000000..823fb43e Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_4.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_5.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_5.png new file mode 100644 index 00000000..f4270b55 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_5.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_6.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_6.png new file mode 100644 index 00000000..08788d8f Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_6.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_7.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_7.png new file mode 100644 index 00000000..acb71c66 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_7.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_8.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_8.png new file mode 100644 index 00000000..cc574599 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_8.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_9.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_9.png new file mode 100644 index 00000000..b364e1ad Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/quazarith_9.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/side.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/side.png new file mode 100644 index 00000000..21d91d66 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/side.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/top.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/top.png new file mode 100644 index 00000000..d39430d9 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/top.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/top_border.png b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/top_border.png new file mode 100644 index 00000000..f92fd312 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/flumrock_cauldron/top_border.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/kryslum_enriched_soil.png.mcmeta b/src/main/resources/assets/sculk_depths/textures/block/kryslum_enriched_soil.png.mcmeta index 4fadce8a..bb4efbee 100644 --- a/src/main/resources/assets/sculk_depths/textures/block/kryslum_enriched_soil.png.mcmeta +++ b/src/main/resources/assets/sculk_depths/textures/block/kryslum_enriched_soil.png.mcmeta @@ -1,6 +1,7 @@ { "animation": { "frametime": 4, + "interpolate": true, "frames": [ 0, 1, diff --git a/src/main/resources/assets/sculk_depths/textures/block/kryslum_enriched_soil_side.png.mcmeta b/src/main/resources/assets/sculk_depths/textures/block/kryslum_enriched_soil_side.png.mcmeta index 4fadce8a..bb4efbee 100644 --- a/src/main/resources/assets/sculk_depths/textures/block/kryslum_enriched_soil_side.png.mcmeta +++ b/src/main/resources/assets/sculk_depths/textures/block/kryslum_enriched_soil_side.png.mcmeta @@ -1,6 +1,7 @@ { "animation": { "frametime": 4, + "interpolate": true, "frames": [ 0, 1, diff --git a/src/main/resources/assets/sculk_depths/textures/block/kryslum_flow.png.mcmeta b/src/main/resources/assets/sculk_depths/textures/block/kryslum_flow.png.mcmeta index b84e69f2..eb42938f 100644 --- a/src/main/resources/assets/sculk_depths/textures/block/kryslum_flow.png.mcmeta +++ b/src/main/resources/assets/sculk_depths/textures/block/kryslum_flow.png.mcmeta @@ -1,5 +1,6 @@ { "animation": { - "frametime": 4 + "frametime": 4, + "interpolate": true } } diff --git a/src/main/resources/assets/sculk_depths/textures/block/kryslum_still.png.mcmeta b/src/main/resources/assets/sculk_depths/textures/block/kryslum_still.png.mcmeta index 4fadce8a..bb4efbee 100644 --- a/src/main/resources/assets/sculk_depths/textures/block/kryslum_still.png.mcmeta +++ b/src/main/resources/assets/sculk_depths/textures/block/kryslum_still.png.mcmeta @@ -1,6 +1,7 @@ { "animation": { "frametime": 4, + "interpolate": true, "frames": [ 0, 1, diff --git a/src/main/resources/assets/sculk_depths/textures/block/petrified_valtrox_log.png b/src/main/resources/assets/sculk_depths/textures/block/petrified_valtrox_log.png index c1fdb082..b522ffaf 100644 Binary files a/src/main/resources/assets/sculk_depths/textures/block/petrified_valtrox_log.png and b/src/main/resources/assets/sculk_depths/textures/block/petrified_valtrox_log.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/petrified_valtrox_log_top.png b/src/main/resources/assets/sculk_depths/textures/block/petrified_valtrox_log_top.png index 0e5901a0..83c6b510 100644 Binary files a/src/main/resources/assets/sculk_depths/textures/block/petrified_valtrox_log_top.png and b/src/main/resources/assets/sculk_depths/textures/block/petrified_valtrox_log_top.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore1.png b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore1.png index 922d6d5e..b895c069 100644 Binary files a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore1.png and b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore1.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore1_e.png b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore1_e.png new file mode 100644 index 00000000..6c055097 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore1_e.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore1_mirrored.png b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore1_mirrored.png index 1113bce9..df7b3b03 100644 Binary files a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore1_mirrored.png and b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore1_mirrored.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore1_mirrored_e.png b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore1_mirrored_e.png new file mode 100644 index 00000000..eb5fccf6 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore1_mirrored_e.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore2.png b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore2.png index 502a388e..6a2ab57f 100644 Binary files a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore2.png and b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore2.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore2_e.png b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore2_e.png new file mode 100644 index 00000000..3cf64666 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore2_e.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore2_mirrored.png b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore2_mirrored.png index c3a883ec..b7450577 100644 Binary files a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore2_mirrored.png and b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore2_mirrored.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore2_mirrored_e.png b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore2_mirrored_e.png new file mode 100644 index 00000000..f4b18f25 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore2_mirrored_e.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore3.png b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore3.png index dc639c0f..dc033133 100644 Binary files a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore3.png and b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore3.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore3_e.png b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore3_e.png new file mode 100644 index 00000000..2cea6636 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore3_e.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore3_mirrored.png b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore3_mirrored.png index c508253b..e69987b3 100644 Binary files a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore3_mirrored.png and b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore3_mirrored.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore3_mirrored_e.png b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore3_mirrored_e.png new file mode 100644 index 00000000..42670a24 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore3_mirrored_e.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore4.png b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore4.png index 18060fce..61d8b502 100644 Binary files a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore4.png and b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore4.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore4_e.png b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore4_e.png new file mode 100644 index 00000000..1991d687 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore4_e.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore4_mirrored.png b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore4_mirrored.png index 9b973bfe..256ed5ff 100644 Binary files a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore4_mirrored.png and b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore4_mirrored.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore4_mirrored_e.png b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore4_mirrored_e.png new file mode 100644 index 00000000..b66c0dd5 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore4_mirrored_e.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore5.png b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore5.png index 862e5aa6..9b1d7dd6 100644 Binary files a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore5.png and b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore5.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore5_e.png b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore5_e.png new file mode 100644 index 00000000..ce8cd17d Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore5_e.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore5_mirrored.png b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore5_mirrored.png index 6be75620..f6ec89b0 100644 Binary files a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore5_mirrored.png and b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore5_mirrored.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore5_mirrored_e.png b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore5_mirrored_e.png new file mode 100644 index 00000000..c0eb7439 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/quazarith_ore5_mirrored_e.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/valtrox_log.png b/src/main/resources/assets/sculk_depths/textures/block/valtrox_log.png index 0f856c33..0bdad79c 100644 Binary files a/src/main/resources/assets/sculk_depths/textures/block/valtrox_log.png and b/src/main/resources/assets/sculk_depths/textures/block/valtrox_log.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/valtrox_log_top.png b/src/main/resources/assets/sculk_depths/textures/block/valtrox_log_top.png index c18b8367..a604e9c9 100644 Binary files a/src/main/resources/assets/sculk_depths/textures/block/valtrox_log_top.png and b/src/main/resources/assets/sculk_depths/textures/block/valtrox_log_top.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/valtrox_planks.png b/src/main/resources/assets/sculk_depths/textures/block/valtrox_planks.png index 13221f67..fb92e24d 100644 Binary files a/src/main/resources/assets/sculk_depths/textures/block/valtrox_planks.png and b/src/main/resources/assets/sculk_depths/textures/block/valtrox_planks.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/valtrox_sapling.png b/src/main/resources/assets/sculk_depths/textures/block/valtrox_sapling.png index 16d52939..4c8aeefc 100644 Binary files a/src/main/resources/assets/sculk_depths/textures/block/valtrox_sapling.png and b/src/main/resources/assets/sculk_depths/textures/block/valtrox_sapling.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/zygrin_flowblock.png b/src/main/resources/assets/sculk_depths/textures/block/zygrin_flowblock.png new file mode 100644 index 00000000..6389cef2 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/zygrin_flowblock.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/zygrin_flowblock.png.mcmeta b/src/main/resources/assets/sculk_depths/textures/block/zygrin_flowblock.png.mcmeta new file mode 100644 index 00000000..eb42938f --- /dev/null +++ b/src/main/resources/assets/sculk_depths/textures/block/zygrin_flowblock.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 4, + "interpolate": true + } +} diff --git a/src/main/resources/assets/sculk_depths/textures/item/kryslum_bucket.png b/src/main/resources/assets/sculk_depths/textures/item/kryslum_bucket.png index 1127a7b7..be3336db 100644 Binary files a/src/main/resources/assets/sculk_depths/textures/item/kryslum_bucket.png and b/src/main/resources/assets/sculk_depths/textures/item/kryslum_bucket.png differ diff --git a/src/main/resources/data/minecraft/tags/blocks/cauldrons.json b/src/main/resources/data/minecraft/tags/blocks/cauldrons.json new file mode 100644 index 00000000..95913fe6 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/cauldrons.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "sculk_depths:flumrock_cauldron", + "sculk_depths:kryslum_flumrock_cauldron" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json index 0a9846f4..59b7d37b 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -7,12 +7,14 @@ "sculk_depths:valtrox_slab", "sculk_depths:valtrox_stairs", "sculk_depths:valtrox_fence", + "sculk_depths:valtrox_button", "sculk_depths:dried_valtrox_log", "sculk_depths:dried_valtrox_planks", "sculk_depths:dried_valtrox_wood", "sculk_depths:dried_valtrox_slab", "sculk_depths:dried_valtrox_stairs", - "sculk_depths:dried_valtrox_fence" + "sculk_depths:dried_valtrox_fence", + "sculk_depths:dried_valtrox_button" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 5c3d6311..f5b40c82 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -12,6 +12,7 @@ "sculk_depths:umbrusk_brick_wall", "sculk_depths:flumrock", + "sculk_depths:flumrock_cauldron", "sculk_depths:quazarith_ore", @@ -21,11 +22,13 @@ "sculk_depths:petrified_valtrox_slab", "sculk_depths:petrified_valtrox_stairs", "sculk_depths:petrified_valtrox_wall", + "sculk_depths:petrified_valtrox_button", "sculk_depths:zygrin", "sculk_depths:zygrin_stairs", "sculk_depths:zygrin_slab", "sculk_depths:zygrin_wall", + "sculk_depths:zygrin_light", "sculk_depths:polished_zygrin", "sculk_depths:polished_zygrin_stairs", diff --git a/src/main/resources/data/minecraft/tags/items/trimmable_armor.json b/src/main/resources/data/minecraft/tags/items/trimmable_armor.json new file mode 100644 index 00000000..1962224d --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/trimmable_armor.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "sculk_depths:quazarith_helmet", + "sculk_depths:quazarith_chestplate", + "sculk_depths:quazarith_leggings", + "sculk_depths:quazarith_boots" + ] +} diff --git a/src/main/resources/data/sculk_depths/advancements/sculk_depths/kill_a_warden.json b/src/main/resources/data/sculk_depths/advancements/sculk_depths/kill_a_warden.json new file mode 100644 index 00000000..1c30bcb3 --- /dev/null +++ b/src/main/resources/data/sculk_depths/advancements/sculk_depths/kill_a_warden.json @@ -0,0 +1,40 @@ +{ + "display": { + "icon": { + "item": "sculk_depths:energy_essence" + }, + "title": { + "translate": "advancements.sculk_depths.kill_a_warden" + }, + "description": { + "translate": "advancements.sculk_depths.kill_a_warden.description" + }, + "frame": "challenge", + "show_toast": true, + "announce_to_chat": true, + "hidden": true + }, + "parent": "sculk_depths:sculk_depths/root", + "criteria": { + "minecraft:warden": { + "trigger": "minecraft:player_killed_entity", + "conditions": { + "entity": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "type": "minecraft:warden" + } + } + ] + } + } + }, + "requirements": [ + [ + "minecraft:warden" + ] + ], + "sends_telemetry_event": false +} diff --git a/src/main/resources/data/sculk_depths/advancements/sculk_depths/root.json b/src/main/resources/data/sculk_depths/advancements/sculk_depths/root.json new file mode 100644 index 00000000..33445159 --- /dev/null +++ b/src/main/resources/data/sculk_depths/advancements/sculk_depths/root.json @@ -0,0 +1,44 @@ +{ + "display": + { + "icon": + { + "item": "sculk_depths:quazarith_ore" + }, + "title": + { + "translate": "advancements.sculk_depths.root" + }, + "description": { + "translate": "advancements.sculk_depths.root.description" + }, + "frame": "task", + "show_toast": false, + "announce_to_chat": false, + "background": "sculk_depths:textures/block/kryslum_enriched_soil.png" + + + }, + "criteria": + { + "find_deep_dark": + { + "trigger": "minecraft:location", + "conditions": { + "player": { + "location": { + "biome": "minecraft:deep_dark" + } + } + } + } + }, + "rewards": + { + "recipes": + [ + "sculk_depths:energized_flint_and_steel" + ] + } + +} \ No newline at end of file diff --git a/src/main/resources/data/sculk_depths/loot_tables/blocks/dried_valtrox_button.json b/src/main/resources/data/sculk_depths/loot_tables/blocks/dried_valtrox_button.json new file mode 100644 index 00000000..5808b44f --- /dev/null +++ b/src/main/resources/data/sculk_depths/loot_tables/blocks/dried_valtrox_button.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "sculk_depths:dried_valtrox_button" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/data/sculk_depths/loot_tables/blocks/flumrock_cauldron.json b/src/main/resources/data/sculk_depths/loot_tables/blocks/flumrock_cauldron.json new file mode 100644 index 00000000..8b190d3f --- /dev/null +++ b/src/main/resources/data/sculk_depths/loot_tables/blocks/flumrock_cauldron.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "sculk_depths:flumrock_cauldron" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/sculk_depths/loot_tables/blocks/petrified_valtrox_button.json b/src/main/resources/data/sculk_depths/loot_tables/blocks/petrified_valtrox_button.json new file mode 100644 index 00000000..c6ac8051 --- /dev/null +++ b/src/main/resources/data/sculk_depths/loot_tables/blocks/petrified_valtrox_button.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "sculk_depths:petrified_valtrox_button" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/data/sculk_depths/loot_tables/blocks/valtrox_button.json b/src/main/resources/data/sculk_depths/loot_tables/blocks/valtrox_button.json new file mode 100644 index 00000000..0f4303e4 --- /dev/null +++ b/src/main/resources/data/sculk_depths/loot_tables/blocks/valtrox_button.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "sculk_depths:valtrox_button" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/data/sculk_depths/loot_tables/blocks/valtrox_leaves.json b/src/main/resources/data/sculk_depths/loot_tables/blocks/valtrox_leaves.json index 67624138..6af69132 100644 --- a/src/main/resources/data/sculk_depths/loot_tables/blocks/valtrox_leaves.json +++ b/src/main/resources/data/sculk_depths/loot_tables/blocks/valtrox_leaves.json @@ -2,13 +2,15 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, + "rolls": 1, + "bonus_rolls": 0, "entries": [ { "type": "minecraft:alternatives", "children": [ { "type": "minecraft:item", + "name": "sculk_depths:valtrox_leaves", "conditions": [ { "condition": "minecraft:any_of", @@ -36,35 +38,67 @@ } ] } - ], - "name": "sculk_depths:valtrox_leaves" + ] }, { "type": "minecraft:item", + "name": "sculk_depths:valtrox_sapling", "conditions": [ { "condition": "minecraft:survives_explosion" }, { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ], - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune" + ] } - ], - "name": "sculk_depths:valtrox_sapling" + ] } ] } - ], - "rolls": 1.0 + ] }, { - "bonus_rolls": 0.0, + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 1, + "max": 2 + }, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ] + } + ] + } + ], "conditions": [ { "condition": "minecraft:inverted", @@ -95,42 +129,8 @@ ] } } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ], - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune" - } - ], - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 - }, - "function": "minecraft:set_count" - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], - "rolls": 1.0 + ] } ], - "random_sequence": "sculk_depths:valtrox_leaves" + "random_sequence": "minecraft:blocks/birch_leaves" } diff --git a/src/main/resources/data/sculk_depths/recipes/dried_valtrox_button.json b/src/main/resources/data/sculk_depths/recipes/dried_valtrox_button.json new file mode 100644 index 00000000..80282a80 --- /dev/null +++ b/src/main/resources/data/sculk_depths/recipes/dried_valtrox_button.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_button", + "ingredients": [ + { + "item": "sculk_depths:dried_valtrox_planks" + } + ], + "result": { + "item": "sculk_depths:dried_valtrox_button" + } +} diff --git a/src/main/resources/data/sculk_depths/recipes/dried_valtrox_pressure_plate.json b/src/main/resources/data/sculk_depths/recipes/dried_valtrox_pressure_plate.json new file mode 100644 index 00000000..593b9305 --- /dev/null +++ b/src/main/resources/data/sculk_depths/recipes/dried_valtrox_pressure_plate.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_pressure_plate", + "pattern": [ + "##" + ], + "key": { + "#": { + "item": "sculk_depths:dried_valtrox_planks" + } + }, + "result": { + "item": "sculk_depths:dried_valtrox_pressure_plate" + } +} diff --git a/src/main/resources/data/sculk_depths/recipes/quazarith_chestplate.json b/src/main/resources/data/sculk_depths/recipes/flumrock_cauldron.json similarity index 56% rename from src/main/resources/data/sculk_depths/recipes/quazarith_chestplate.json rename to src/main/resources/data/sculk_depths/recipes/flumrock_cauldron.json index f350136d..267345eb 100644 --- a/src/main/resources/data/sculk_depths/recipes/quazarith_chestplate.json +++ b/src/main/resources/data/sculk_depths/recipes/flumrock_cauldron.json @@ -2,15 +2,15 @@ "type": "minecraft:crafting_shaped", "pattern": [ "X X", - "XXX", + "X X", "XXX" ], "key": { "X": { - "item": "sculk_depths:quazarith_ingot" + "item": "sculk_depths:flumrock" } }, "result": { - "item": "sculk_depths:quazarith_chestplate" + "item": "sculk_depths:flumrock_cauldron" } } diff --git a/src/main/resources/data/sculk_depths/recipes/petrified_valtrox_button.json b/src/main/resources/data/sculk_depths/recipes/petrified_valtrox_button.json new file mode 100644 index 00000000..a4b09036 --- /dev/null +++ b/src/main/resources/data/sculk_depths/recipes/petrified_valtrox_button.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "sculk_depths:petrified_valtrox_slates" + } + ], + "result": { + "item": "sculk_depths:petrified_valtrox_button" + } +} diff --git a/src/main/resources/data/sculk_depths/recipes/petrified_valtrox_pressure_plate.json b/src/main/resources/data/sculk_depths/recipes/petrified_valtrox_pressure_plate.json new file mode 100644 index 00000000..31421410 --- /dev/null +++ b/src/main/resources/data/sculk_depths/recipes/petrified_valtrox_pressure_plate.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "##" + ], + "key": { + "#": { + "item": "sculk_depths:petrified_valtrox_slates" + } + }, + "result": { + "item": "sculk_depths:petrified_valtrox_pressure_plate" + } +} diff --git a/src/main/resources/data/sculk_depths/recipes/petrified_valtrox_slates.json b/src/main/resources/data/sculk_depths/recipes/petrified_valtrox_slates.json index 2a90caac..4119832a 100644 --- a/src/main/resources/data/sculk_depths/recipes/petrified_valtrox_slates.json +++ b/src/main/resources/data/sculk_depths/recipes/petrified_valtrox_slates.json @@ -3,7 +3,7 @@ "group": "planks", "ingredients": [ { - "tag": "sculk_depths:petrified_valtrox_log" + "tag": "sculk_depths:petrified_valtrox_logs" } ], "result": { diff --git a/src/main/resources/data/sculk_depths/recipes/quazarith_axe.json b/src/main/resources/data/sculk_depths/recipes/quazarith_axe.json deleted file mode 100644 index 01425e24..00000000 --- a/src/main/resources/data/sculk_depths/recipes/quazarith_axe.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "X#", - " #" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "X": { - "item": "sculk_depths:quazarith_ingot" - } - }, - "result": { - "item": "sculk_depths:quazarith_axe" - } -} diff --git a/src/main/resources/data/sculk_depths/recipes/quazarith_boots.json b/src/main/resources/data/sculk_depths/recipes/quazarith_boots.json deleted file mode 100644 index a988c5df..00000000 --- a/src/main/resources/data/sculk_depths/recipes/quazarith_boots.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "item": "sculk_depths:quazarith_ingot" - } - }, - "result": { - "item": "sculk_depths:quazarith_boots" - } -} diff --git a/src/main/resources/data/sculk_depths/recipes/quazarith_helmet.json b/src/main/resources/data/sculk_depths/recipes/quazarith_helmet.json deleted file mode 100644 index 9dfb381a..00000000 --- a/src/main/resources/data/sculk_depths/recipes/quazarith_helmet.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "item": "sculk_depths:quazarith_ingot" - } - }, - "result": { - "item": "sculk_depths:quazarith_helmet" - } -} diff --git a/src/main/resources/data/sculk_depths/recipes/quazarith_hoe.json b/src/main/resources/data/sculk_depths/recipes/quazarith_hoe.json deleted file mode 100644 index b2c1f872..00000000 --- a/src/main/resources/data/sculk_depths/recipes/quazarith_hoe.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " #", - " #" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "X": { - "item": "sculk_depths:quazarith_ingot" - } - }, - "result": { - "item": "sculk_depths:quazarith_hoe" - } -} diff --git a/src/main/resources/data/sculk_depths/recipes/quazarith_ingot.json b/src/main/resources/data/sculk_depths/recipes/quazarith_ingot.json deleted file mode 100644 index fed2cff3..00000000 --- a/src/main/resources/data/sculk_depths/recipes/quazarith_ingot.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "netherite_ingot", - "ingredients": [ - { - "item": "sculk_depths:quazarith_pieces" - }, - { - "item": "sculk_depths:quazarith_pieces" - }, - { - "item": "sculk_depths:quazarith_pieces" - }, - { - "item": "sculk_depths:quazarith_pieces" - }, - { - "item": "minecraft:diamond" - }, - { - "item": "minecraft:diamond" - }, - { - "item": "minecraft:diamond" - }, - { - "item": "minecraft:diamond" - } - ], - "result": { - "item": "sculk_depths:quazarith_ingot" - } -} \ No newline at end of file diff --git a/src/main/resources/data/sculk_depths/recipes/quazarith_leggings.json b/src/main/resources/data/sculk_depths/recipes/quazarith_leggings.json deleted file mode 100644 index 0b558d0e..00000000 --- a/src/main/resources/data/sculk_depths/recipes/quazarith_leggings.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "item": "sculk_depths:quazarith_ingot" - } - }, - "result": { - "item": "sculk_depths:quazarith_leggings" - } -} diff --git a/src/main/resources/data/sculk_depths/recipes/quazarith_pickaxe.json b/src/main/resources/data/sculk_depths/recipes/quazarith_pickaxe.json deleted file mode 100644 index 4de3435c..00000000 --- a/src/main/resources/data/sculk_depths/recipes/quazarith_pickaxe.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " # ", - " # " - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "X": { - "item": "sculk_depths:quazarith_ingot" - } - }, - "result": { - "item": "sculk_depths:quazarith_pickaxe" - } -} diff --git a/src/main/resources/data/sculk_depths/recipes/valtrox_button.json b/src/main/resources/data/sculk_depths/recipes/valtrox_button.json new file mode 100644 index 00000000..dbe761c6 --- /dev/null +++ b/src/main/resources/data/sculk_depths/recipes/valtrox_button.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_button", + "ingredients": [ + { + "item": "sculk_depths:valtrox_planks" + } + ], + "result": { + "item": "sculk_depths:valtrox_button" + } +} diff --git a/src/main/resources/data/sculk_depths/recipes/valtrox_pressure_plate.json b/src/main/resources/data/sculk_depths/recipes/valtrox_pressure_plate.json new file mode 100644 index 00000000..7f733d8d --- /dev/null +++ b/src/main/resources/data/sculk_depths/recipes/valtrox_pressure_plate.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_pressure_plate", + "pattern": [ + "##" + ], + "key": { + "#": { + "item": "sculk_depths:valtrox_planks" + } + }, + "result": { + "item": "sculk_depths:valtrox_pressure_plate" + } +} diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/centers/center_01.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/centers/center_01.nbt index 6f537e3e..dc73a684 100644 Binary files a/src/main/resources/data/sculk_depths/structures/laboratory/centers/center_01.nbt and b/src/main/resources/data/sculk_depths/structures/laboratory/centers/center_01.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/centers/center_02.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/centers/center_02.nbt index fb5df38d..e5331e11 100644 Binary files a/src/main/resources/data/sculk_depths/structures/laboratory/centers/center_02.nbt and b/src/main/resources/data/sculk_depths/structures/laboratory/centers/center_02.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/centers/center_03.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/centers/center_03.nbt deleted file mode 100644 index 2646d6e1..00000000 Binary files a/src/main/resources/data/sculk_depths/structures/laboratory/centers/center_03.nbt and /dev/null differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/centers/center_04.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/centers/center_04.nbt deleted file mode 100644 index f35e8680..00000000 Binary files a/src/main/resources/data/sculk_depths/structures/laboratory/centers/center_04.nbt and /dev/null differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/corridors/3_segment_corridor_0jigsaw.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/3_segment_corridor_0jigsaw.nbt new file mode 100644 index 00000000..4fa46b62 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/3_segment_corridor_0jigsaw.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/corridors/3_segment_corridor_1jigsaw.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/3_segment_corridor_1jigsaw.nbt new file mode 100644 index 00000000..b023a9e7 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/3_segment_corridor_1jigsaw.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/corridors/3_segment_corridor_2jigsaw.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/3_segment_corridor_2jigsaw.nbt new file mode 100644 index 00000000..d2ffecbb Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/3_segment_corridor_2jigsaw.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/corridors/3_way_corridor.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/3_way_corridor.nbt new file mode 100644 index 00000000..4604f0a7 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/3_way_corridor.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/corridors/4_segment_corridor_1jigsaw_1.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/4_segment_corridor_1jigsaw_1.nbt new file mode 100644 index 00000000..972136ac Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/4_segment_corridor_1jigsaw_1.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/corridors/4_segment_corridor_1jigsaw_2.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/4_segment_corridor_1jigsaw_2.nbt new file mode 100644 index 00000000..b73a03a5 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/4_segment_corridor_1jigsaw_2.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/corridors/4_segment_corridor_2jigsaw.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/4_segment_corridor_2jigsaw.nbt new file mode 100644 index 00000000..1d4f2f11 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/4_segment_corridor_2jigsaw.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/corridors/4_way_corridor.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/4_way_corridor.nbt new file mode 100644 index 00000000..dcf53cec Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/4_way_corridor.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/corridors/5_segment_corridor_2jigsaw_1.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/5_segment_corridor_2jigsaw_1.nbt new file mode 100644 index 00000000..23fd55a0 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/5_segment_corridor_2jigsaw_1.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/corridors/5_segment_corridor_2jigsaw_2.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/5_segment_corridor_2jigsaw_2.nbt new file mode 100644 index 00000000..3259b39e Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/5_segment_corridor_2jigsaw_2.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/corridors/5_segment_corridor_4jigsaw.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/5_segment_corridor_4jigsaw.nbt new file mode 100644 index 00000000..8e4677b8 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/5_segment_corridor_4jigsaw.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/corridors/6_segment_corridor_2jigsaw_1.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/6_segment_corridor_2jigsaw_1.nbt new file mode 100644 index 00000000..260bed58 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/6_segment_corridor_2jigsaw_1.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/corridors/6_segment_corridor_2jigsaw_2.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/6_segment_corridor_2jigsaw_2.nbt new file mode 100644 index 00000000..d15cabe6 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/6_segment_corridor_2jigsaw_2.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/corridors/6_segment_corridor_4jigsaw.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/6_segment_corridor_4jigsaw.nbt new file mode 100644 index 00000000..6e0525f6 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/6_segment_corridor_4jigsaw.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/corridors/corridor_end.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/corridor_end.nbt new file mode 100644 index 00000000..1abfb6b0 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/corridor_end.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/corridors/corridor_flat_wall.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/corridor_flat_wall.nbt new file mode 100644 index 00000000..aed536e1 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/corridor_flat_wall.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/corridors/corridor_turn.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/corridor_turn.nbt new file mode 100644 index 00000000..89fc296b Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/corridor_turn.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/corridors/crossing_corridor.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/crossing_corridor.nbt deleted file mode 100644 index 2ed29215..00000000 Binary files a/src/main/resources/data/sculk_depths/structures/laboratory/corridors/crossing_corridor.nbt and /dev/null differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/corridors/long_corridor.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/long_corridor.nbt deleted file mode 100644 index f6088adc..00000000 Binary files a/src/main/resources/data/sculk_depths/structures/laboratory/corridors/long_corridor.nbt and /dev/null differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/corridors/short_corridor.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/corridors/short_corridor.nbt deleted file mode 100644 index b4db3376..00000000 Binary files a/src/main/resources/data/sculk_depths/structures/laboratory/corridors/short_corridor.nbt and /dev/null differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/experiments/cephlera_light_experiment.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/experiments/cephlera_light_experiment.nbt new file mode 100644 index 00000000..45f6e5f3 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/experiments/cephlera_light_experiment.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/experiments/cephlera_light_experiment_2.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/experiments/cephlera_light_experiment_2.nbt new file mode 100644 index 00000000..bca6ae7c Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/experiments/cephlera_light_experiment_2.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/experiments/glomper_experiment.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/experiments/glomper_experiment.nbt new file mode 100644 index 00000000..d9a0ede0 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/experiments/glomper_experiment.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/experiments/glomper_experiment_2.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/experiments/glomper_experiment_2.nbt new file mode 100644 index 00000000..e495fd9f Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/experiments/glomper_experiment_2.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/experiments/lab_table.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/experiments/lab_table.nbt new file mode 100644 index 00000000..45eb86d2 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/experiments/lab_table.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/experiments/valtrox_sapling_experiment.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/experiments/valtrox_sapling_experiment.nbt new file mode 100644 index 00000000..dddfb9c5 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/experiments/valtrox_sapling_experiment.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_1.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_1.nbt new file mode 100644 index 00000000..3c515d3d Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_1.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_10.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_10.nbt new file mode 100644 index 00000000..5affd1a1 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_10.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_11.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_11.nbt new file mode 100644 index 00000000..f5e1ce30 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_11.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_12.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_12.nbt new file mode 100644 index 00000000..cdcf6a10 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_12.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_2.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_2.nbt new file mode 100644 index 00000000..5837994d Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_2.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_3.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_3.nbt new file mode 100644 index 00000000..674d70f1 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_3.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_4.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_4.nbt new file mode 100644 index 00000000..92067e8d Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_4.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_5.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_5.nbt new file mode 100644 index 00000000..9cf28d2a Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_5.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_6.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_6.nbt new file mode 100644 index 00000000..ce1cf89a Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_6.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_7.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_7.nbt new file mode 100644 index 00000000..4aaad177 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_7.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_8.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_8.nbt new file mode 100644 index 00000000..04002523 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_8.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_9.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_9.nbt new file mode 100644 index 00000000..3ba88eb0 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/generators/kryslum_tank_9.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/inside_buildings/corridor_window.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/inside_buildings/corridor_window.nbt new file mode 100644 index 00000000..94966928 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/inside_buildings/corridor_window.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/inside_buildings/cube_room.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/inside_buildings/cube_room.nbt deleted file mode 100644 index a88d155e..00000000 Binary files a/src/main/resources/data/sculk_depths/structures/laboratory/inside_buildings/cube_room.nbt and /dev/null differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/inside_buildings/flat_window.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/inside_buildings/flat_window.nbt new file mode 100644 index 00000000..a9644b3c Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/inside_buildings/flat_window.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/inside_buildings/lab_old_storage.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/inside_buildings/lab_old_storage.nbt new file mode 100644 index 00000000..039b367c Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/inside_buildings/lab_old_storage.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/inside_buildings/library.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/inside_buildings/library.nbt new file mode 100644 index 00000000..d199b724 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/inside_buildings/library.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/inside_buildings/sphere_room.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/inside_buildings/sphere_room.nbt deleted file mode 100644 index a9a65387..00000000 Binary files a/src/main/resources/data/sculk_depths/structures/laboratory/inside_buildings/sphere_room.nbt and /dev/null differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/inside_buildings/watchtower.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/inside_buildings/watchtower.nbt new file mode 100644 index 00000000..4cbc2800 Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/inside_buildings/watchtower.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/outside_buildings/cube_building.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/outside_buildings/cube_building.nbt deleted file mode 100644 index 4ce31466..00000000 Binary files a/src/main/resources/data/sculk_depths/structures/laboratory/outside_buildings/cube_building.nbt and /dev/null differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/outside_buildings/ruine.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/outside_buildings/ruine.nbt deleted file mode 100644 index 1167f0ff..00000000 Binary files a/src/main/resources/data/sculk_depths/structures/laboratory/outside_buildings/ruine.nbt and /dev/null differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/outside_buildings/sphere_building.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/outside_buildings/sphere_building.nbt deleted file mode 100644 index bae48ccb..00000000 Binary files a/src/main/resources/data/sculk_depths/structures/laboratory/outside_buildings/sphere_building.nbt and /dev/null differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/streets/crossing_path.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/streets/crossing_path.nbt deleted file mode 100644 index 25c0576a..00000000 Binary files a/src/main/resources/data/sculk_depths/structures/laboratory/streets/crossing_path.nbt and /dev/null differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/streets/long_path.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/streets/long_path.nbt deleted file mode 100644 index e4e9324b..00000000 Binary files a/src/main/resources/data/sculk_depths/structures/laboratory/streets/long_path.nbt and /dev/null differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/streets/short_path.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/streets/short_path.nbt deleted file mode 100644 index 345aa9fe..00000000 Binary files a/src/main/resources/data/sculk_depths/structures/laboratory/streets/short_path.nbt and /dev/null differ diff --git a/src/main/resources/data/sculk_depths/structures/laboratory/trees/valtrox_tree_1.nbt b/src/main/resources/data/sculk_depths/structures/laboratory/trees/valtrox_tree_1.nbt new file mode 100644 index 00000000..f45442be Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/laboratory/trees/valtrox_tree_1.nbt differ diff --git a/src/main/resources/data/sculk_depths/structures/underground_lab/underground_lab.nbt b/src/main/resources/data/sculk_depths/structures/underground_lab/underground_lab.nbt new file mode 100644 index 00000000..3f9d775d Binary files /dev/null and b/src/main/resources/data/sculk_depths/structures/underground_lab/underground_lab.nbt differ diff --git a/src/main/resources/data/sculk_depths/tags/entity_types/drops_energy_essence.json b/src/main/resources/data/sculk_depths/tags/entity_types/drops_energy_essence.json index d70f743f..6ede83c5 100644 --- a/src/main/resources/data/sculk_depths/tags/entity_types/drops_energy_essence.json +++ b/src/main/resources/data/sculk_depths/tags/entity_types/drops_energy_essence.json @@ -1,13 +1,41 @@ { "values": [ + "minecraft:allay", + "minecraft:axolotl", + "minecraft:bee", + "minecraft:camel", + "minecraft:cat", + "minecraft:chicken", + "minecraft:cod", "minecraft:cow", - "minecraft:horse", + "minecraft:dolphin", + "minecraft:donkey", + "minecraft:fox", + "minecraft:frog", "minecraft:donkey", + "minecraft:horse", + "minecraft:glow_squid", + "minecraft:llama", + "minecraft:mooshroom", "minecraft:mule", - "minecraft:chicken", + "minecraft:ocelot", + "minecraft:panda", + "minecraft:parrot", "minecraft:pig", + "minecraft:polar_bear", + "minecraft:pufferfish", + "minecraft:rabbit", + "minecraft:salmon", "minecraft:sheep", - "minecraft:bat", - "minecraft:bee" + "minecraft:sniffer", + "minecraft:squid", + "minecraft:strider", + "minecraft:tadpole", + "minecraft:trader_llama", + "minecraft:tropical_fish", + "minecraft:turtle", + "minecraft:villager", + "minecraft:wandering_trader", + "minecraft:wolf" ] } \ No newline at end of file diff --git a/src/main/resources/data/sculk_depths/worldgen/biome/cephlera_caves.json b/src/main/resources/data/sculk_depths/worldgen/biome/cephlera_caves.json index 1af0896e..ee714aa3 100644 --- a/src/main/resources/data/sculk_depths/worldgen/biome/cephlera_caves.json +++ b/src/main/resources/data/sculk_depths/worldgen/biome/cephlera_caves.json @@ -7,8 +7,8 @@ "fog_color": 853299, "water_color": 928354, "water_fog_color": 328995, - "grass_color": 596558, - "foliage_color": 596558, + "grass_color": 6448752, + "foliage_color": 6448752, "mood_sound": { "sound": "minecraft:ambient.cave", "tick_delay": 6000, diff --git a/src/main/resources/data/sculk_depths/worldgen/biome/dried_valtrox_forest.json b/src/main/resources/data/sculk_depths/worldgen/biome/dried_valtrox_forest.json index dce4570b..528ba670 100644 --- a/src/main/resources/data/sculk_depths/worldgen/biome/dried_valtrox_forest.json +++ b/src/main/resources/data/sculk_depths/worldgen/biome/dried_valtrox_forest.json @@ -7,8 +7,8 @@ "fog_color": 853299, "water_color": 928354, "water_fog_color": 328995, - "grass_color": 596558, - "foliage_color": 596558, + "grass_color": 6448752, + "foliage_color": 6448752, "mood_sound": { "sound": "minecraft:ambient.cave", "tick_delay": 6000, @@ -38,6 +38,10 @@ ] }, "features": [ + [], + [], + [], + [], [ "sculk_depths:dried_valtrox" ] diff --git a/src/main/resources/data/sculk_depths/worldgen/biome/petrified_valtrox_forest.json b/src/main/resources/data/sculk_depths/worldgen/biome/petrified_valtrox_forest.json index 14f27f4a..91308c4f 100644 --- a/src/main/resources/data/sculk_depths/worldgen/biome/petrified_valtrox_forest.json +++ b/src/main/resources/data/sculk_depths/worldgen/biome/petrified_valtrox_forest.json @@ -7,8 +7,8 @@ "fog_color": 853299, "water_color": 928354, "water_fog_color": 328995, - "grass_color": 596558, - "foliage_color": 596558, + "grass_color": 6448752, + "foliage_color": 6448752, "mood_sound": { "sound": "minecraft:ambient.cave", "tick_delay": 6000, @@ -38,6 +38,10 @@ ] }, "features": [ + [], + [], + [], + [], [ "sculk_depths:petrified_valtrox" ] diff --git a/src/main/resources/data/sculk_depths/worldgen/biome/sculk_caves.json b/src/main/resources/data/sculk_depths/worldgen/biome/sculk_caves.json index ffb37955..e15d1ead 100644 --- a/src/main/resources/data/sculk_depths/worldgen/biome/sculk_caves.json +++ b/src/main/resources/data/sculk_depths/worldgen/biome/sculk_caves.json @@ -7,8 +7,8 @@ "fog_color": 853299, "water_color": 928354, "water_fog_color": 328995, - "grass_color": 596558, - "foliage_color": 596558, + "grass_color": 6448752, + "foliage_color": 6448752, "mood_sound": { "sound": "minecraft:ambient.cave", "tick_delay": 6000, diff --git a/src/main/resources/data/sculk_depths/worldgen/placed_feature/dried_valtrox.json b/src/main/resources/data/sculk_depths/worldgen/placed_feature/dried_valtrox.json index 433ca1f4..138b7f3d 100644 --- a/src/main/resources/data/sculk_depths/worldgen/placed_feature/dried_valtrox.json +++ b/src/main/resources/data/sculk_depths/worldgen/placed_feature/dried_valtrox.json @@ -3,7 +3,7 @@ "type": "minecraft:tree", "config": { "ignore_vines": true, - "force_dirt": false, + "force_dirt": true, "minimum_size": { "type": "minecraft:three_layers_feature_size", "min_clipped_height": 0, @@ -127,6 +127,21 @@ "type": "minecraft:heightmap", "heightmap": "OCEAN_FLOOR" }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ + 0, + -1, + 0 + ], + "blocks": [ + "sculk_depths:crumbling_dirt", + "minecraft:deepslate" + ] + } + }, { "type": "minecraft:biome" } diff --git a/src/main/resources/data/sculk_depths/worldgen/placed_feature/petrified_valtrox.json b/src/main/resources/data/sculk_depths/worldgen/placed_feature/petrified_valtrox.json index 9bbd2bea..12146168 100644 --- a/src/main/resources/data/sculk_depths/worldgen/placed_feature/petrified_valtrox.json +++ b/src/main/resources/data/sculk_depths/worldgen/placed_feature/petrified_valtrox.json @@ -3,7 +3,7 @@ "type": "minecraft:tree", "config": { "ignore_vines": true, - "force_dirt": false, + "force_dirt": true, "minimum_size": { "type": "minecraft:three_layers_feature_size", "min_clipped_height": 0, @@ -27,12 +27,6 @@ "data": { "Name": "sculk_depths:petrified_valtrox_log" } - }, - { - "weight": 2, - "data": { - "Name": "sculk_depths:petrified_valtrox_log" - } } ] }, @@ -55,18 +49,6 @@ }, { "weight": 1, - "data": { - "Name": "sculk_depths:petrified_valtrox_log" - } - }, - { - "weight": 2, - "data": { - "Name": "sculk_depths:petrified_valtrox_log" - } - }, - { - "weight": 4, "data": { "Name": "minecraft:air" } @@ -91,18 +73,6 @@ }, { "weight": 1, - "data": { - "Name": "sculk_depths:petrified_valtrox_log" - } - }, - { - "weight": 2, - "data": { - "Name": "sculk_depths:petrified_valtrox_log" - } - }, - { - "weight": 4, "data": { "Name": "minecraft:air" } @@ -146,6 +116,21 @@ "type": "minecraft:heightmap", "heightmap": "OCEAN_FLOOR" }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ + 0, + -1, + 0 + ], + "blocks": [ + "sculk_depths:crumbling_dirt", + "minecraft:deepslate" + ] + } + }, { "type": "minecraft:biome" } diff --git a/src/main/resources/data/sculk_depths/worldgen/processor_list/enriched_soil_in_lab_center.json b/src/main/resources/data/sculk_depths/worldgen/processor_list/enriched_soil_in_lab_center.json new file mode 100644 index 00000000..967f14c1 --- /dev/null +++ b/src/main/resources/data/sculk_depths/worldgen/processor_list/enriched_soil_in_lab_center.json @@ -0,0 +1,35 @@ +{ + "processors": [ + { + "processor_type": "minecraft:rule", + "rules": [ + { + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "input_predicate": { + "predicate_type": "minecraft:random_block_match", + "block": "minecraft:dark_oak_wood", + "probability": 0.5 + }, + "output_state": { + "Name": "sculk_depths:kryslum_enriched_soil" + } + }, + { + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "input_predicate": { + "predicate_type": "minecraft:random_block_match", + "block": "minecraft:dark_oak_wood", + "probability": 1 + }, + "output_state": { + "Name": "sculk_depths:crumbling_dirt" + } + } + ] + } + ] +} diff --git a/src/main/resources/data/sculk_depths/worldgen/structure/laboratory.json b/src/main/resources/data/sculk_depths/worldgen/structure/laboratory.json index 902c1352..f3779b81 100644 --- a/src/main/resources/data/sculk_depths/worldgen/structure/laboratory.json +++ b/src/main/resources/data/sculk_depths/worldgen/structure/laboratory.json @@ -4,9 +4,9 @@ "sculk_depths:petrified_valtrox_forest", "sculk_depths:dried_valtrox_forest" ], - "max_distance_from_center": 80, + "max_distance_from_center": 103, "project_start_to_heightmap": "WORLD_SURFACE_WG", - "size": 4, + "size": 5, "spawn_overrides": {}, "start_height": { "absolute": 0 @@ -14,5 +14,5 @@ "start_pool": "sculk_depths:laboratory/centers", "step": "surface_structures", "terrain_adaptation": "beard_box", - "use_expansion_hack": false -} \ No newline at end of file + "use_expansion_hack": true +} diff --git a/src/main/resources/data/sculk_depths/worldgen/structure/underground_lab.json b/src/main/resources/data/sculk_depths/worldgen/structure/underground_lab.json new file mode 100644 index 00000000..275a28a3 --- /dev/null +++ b/src/main/resources/data/sculk_depths/worldgen/structure/underground_lab.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:jigsaw", + "biomes": [ + "sculk_depths:sculk_caves", + "sculk_depths:cephlera_caves" + ], + "step": "underground_structures", + "spawn_overrides": {}, + "start_pool": "sculk_depths:underground_lab/center", + "size": 7, + "start_height": { + "type": "minecraft:biased_to_bottom", + "min_inclusive": { + "above_bottom": 64 + }, + "max_inclusive": { + "absolute": -128 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": true +} diff --git a/src/main/resources/data/sculk_depths/worldgen/structure_set/laboratory.json b/src/main/resources/data/sculk_depths/worldgen/structure_set/laboratory.json index 2f594144..e662ad98 100644 --- a/src/main/resources/data/sculk_depths/worldgen/structure_set/laboratory.json +++ b/src/main/resources/data/sculk_depths/worldgen/structure_set/laboratory.json @@ -1,9 +1,11 @@ { "placement": { "type": "minecraft:random_spread", - "salt": 10387312, - "separation": 16, - "spacing": 46 + "salt": 15654652, + "frequency_reduction_method": "legacy_type_3", + "frequency": 1, + "spacing": 36, + "separation": 23 }, "structures": [ { diff --git a/src/main/resources/data/sculk_depths/worldgen/structure_set/underground_lab.json b/src/main/resources/data/sculk_depths/worldgen/structure_set/underground_lab.json new file mode 100644 index 00000000..ca0c852c --- /dev/null +++ b/src/main/resources/data/sculk_depths/worldgen/structure_set/underground_lab.json @@ -0,0 +1,16 @@ +{ + "placement": { + "type": "minecraft:random_spread", + "salt": 915487804, + "frequency_reduction_method": "legacy_type_3", + "frequency": 0.5, + "spacing": 10, + "separation": 8 + }, + "structures": [ + { + "structure": "sculk_depths:underground_lab", + "weight": 1 + } + ] +} diff --git a/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/centers.json b/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/centers.json index 449e254e..8d337a5e 100644 --- a/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/centers.json +++ b/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/centers.json @@ -4,45 +4,19 @@ "element": { "element_type": "minecraft:legacy_single_pool_element", "location": "sculk_depths:laboratory/centers/center_01", - "processors": { - "processors": [] - }, + "processors": "sculk_depths:enriched_soil_in_lab_center", "projection": "rigid" }, - "weight": 1 + "weight": 10 }, { "element": { "element_type": "minecraft:legacy_single_pool_element", "location": "sculk_depths:laboratory/centers/center_02", - "processors": { - "processors": [] - }, + "processors": "sculk_depths:enriched_soil_in_lab_center", "projection": "rigid" }, - "weight": 1 - }, - { - "element": { - "element_type": "minecraft:legacy_single_pool_element", - "location": "sculk_depths:laboratory/centers/center_03", - "processors": { - "processors": [] - }, - "projection": "rigid" - }, - "weight": 1 - }, - { - "element": { - "element_type": "minecraft:legacy_single_pool_element", - "location": "sculk_depths:laboratory/centers/center_04", - "processors": { - "processors": [] - }, - "projection": "rigid" - }, - "weight": 1 + "weight": 10 } ], "fallback": "minecraft:empty" diff --git a/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/corridors.json b/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/corridors.json index 6f249746..51f236d2 100644 --- a/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/corridors.json +++ b/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/corridors.json @@ -3,36 +3,190 @@ { "element": { "element_type": "minecraft:legacy_single_pool_element", - "location": "sculk_depths:laboratory/corridors/long_corridor", + "location": "sculk_depths:laboratory/corridors/3_segment_corridor_2jigsaw", "processors": { "processors": [] }, "projection": "rigid" }, - "weight": 1 + "weight": 10 }, { "element": { "element_type": "minecraft:legacy_single_pool_element", - "location": "sculk_depths:laboratory/corridors/short_corridor", + "location": "sculk_depths:laboratory/corridors/3_segment_corridor_1jigsaw", "processors": { "processors": [] }, "projection": "rigid" }, - "weight": 1 + "weight": 10 }, { "element": { "element_type": "minecraft:legacy_single_pool_element", - "location": "sculk_depths:laboratory/corridors/crossing_corridor", + "location": "sculk_depths:laboratory/corridors/3_segment_corridor_0jigsaw", "processors": { "processors": [] }, "projection": "rigid" }, - "weight": 1 + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/corridors/4_segment_corridor_2jigsaw", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/corridors/4_segment_corridor_1jigsaw_1", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/corridors/4_segment_corridor_1jigsaw_2", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/corridors/5_segment_corridor_4jigsaw", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/corridors/5_segment_corridor_2jigsaw_1", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/corridors/5_segment_corridor_2jigsaw_2", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/corridors/6_segment_corridor_4jigsaw", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/corridors/6_segment_corridor_2jigsaw_1", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/corridors/6_segment_corridor_2jigsaw_2", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/corridors/3_way_corridor", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 8 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/corridors/4_way_corridor", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 8 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/corridors/corridor_turn", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/corridors/corridor_end", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 15 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/inside_buildings/library", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 20 } ], - "fallback": "minecraft:empty" + "fallback": "sculk_depths:laboratory/flat_end" } \ No newline at end of file diff --git a/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/experiments.json b/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/experiments.json new file mode 100644 index 00000000..e9d24267 --- /dev/null +++ b/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/experiments.json @@ -0,0 +1,71 @@ +{ + "elements": [ + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/experiments/cephlera_light_experiment", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/experiments/cephlera_light_experiment_2", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/experiments/glomper_experiment", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/experiments/glomper_experiment_2", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/experiments/lab_table", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/experiments/valtrox_sapling_experiment", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + } + ], + "fallback": "minecraft:empty" +} \ No newline at end of file diff --git a/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/outside_buildings.json b/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/fallback_inside_buildings.json similarity index 52% rename from src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/outside_buildings.json rename to src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/fallback_inside_buildings.json index 3136f046..317e1f8f 100644 --- a/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/outside_buildings.json +++ b/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/fallback_inside_buildings.json @@ -3,7 +3,7 @@ { "element": { "element_type": "minecraft:legacy_single_pool_element", - "location": "sculk_depths:laboratory/outside_buildings/sphere_building", + "location": "sculk_depths:laboratory/inside_buildings/flat_window", "processors": { "processors": [] }, @@ -14,18 +14,7 @@ { "element": { "element_type": "minecraft:legacy_single_pool_element", - "location": "sculk_depths:laboratory/outside_buildings/cube_building", - "processors": { - "processors": [] - }, - "projection": "rigid" - }, - "weight": 1 - }, - { - "element": { - "element_type": "minecraft:legacy_single_pool_element", - "location": "sculk_depths:laboratory/outside_buildings/ruine", + "location": "sculk_depths:laboratory/inside_buildings/corridor_window", "processors": { "processors": [] }, diff --git a/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/flat_end.json b/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/flat_end.json new file mode 100644 index 00000000..d07cb353 --- /dev/null +++ b/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/flat_end.json @@ -0,0 +1,16 @@ +{ + "elements": [ + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/corridors/corridor_flat_wall", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 1 + } + ], + "fallback": "minecraft:empty" +} \ No newline at end of file diff --git a/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/generators.json b/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/generators.json new file mode 100644 index 00000000..eaaadad1 --- /dev/null +++ b/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/generators.json @@ -0,0 +1,137 @@ +{ + "elements": [ + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/generators/kryslum_tank_1", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/generators/kryslum_tank_2", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/generators/kryslum_tank_3", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/generators/kryslum_tank_4", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/generators/kryslum_tank_5", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/generators/kryslum_tank_6", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/generators/kryslum_tank_7", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/generators/kryslum_tank_8", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/generators/kryslum_tank_9", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/generators/kryslum_tank_10", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/generators/kryslum_tank_11", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/generators/kryslum_tank_12", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + } + ], + "fallback": "minecraft:empty" +} \ No newline at end of file diff --git a/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/inside_buildings.json b/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/inside_buildings.json index 7eed0ca6..d605478e 100644 --- a/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/inside_buildings.json +++ b/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/inside_buildings.json @@ -3,25 +3,36 @@ { "element": { "element_type": "minecraft:legacy_single_pool_element", - "location": "sculk_depths:laboratory/inside_buildings/sphere_room", + "location": "sculk_depths:laboratory/inside_buildings/watchtower", "processors": { "processors": [] }, "projection": "rigid" }, - "weight": 1 + "weight": 4 }, { "element": { "element_type": "minecraft:legacy_single_pool_element", - "location": "sculk_depths:laboratory/inside_buildings/cube_room", + "location": "sculk_depths:laboratory/inside_buildings/lab_old_storage", "processors": { "processors": [] }, "projection": "rigid" }, - "weight": 1 + "weight": 4 + }, + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/inside_buildings/corridor_window", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 4 } ], - "fallback": "minecraft:empty" + "fallback": "sculk_depths:laboratory/fallback_inside_buildings" } \ No newline at end of file diff --git a/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/streets.json b/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/streets.json deleted file mode 100644 index 1338b26c..00000000 --- a/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/streets.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "elements": [ - { - "element": { - "element_type": "minecraft:legacy_single_pool_element", - "location": "sculk_depths:laboratory/streets/long_path", - "processors": { - "processors": [] - }, - "projection": "terrain_matching" - }, - "weight": 1 - }, - { - "element": { - "element_type": "minecraft:legacy_single_pool_element", - "location": "sculk_depths:laboratory/streets/short_path", - "processors": { - "processors": [] - }, - "projection": "terrain_matching" - }, - "weight": 1 - }, - { - "element": { - "element_type": "minecraft:legacy_single_pool_element", - "location": "sculk_depths:laboratory/streets/crossing_path", - "processors": { - "processors": [] - }, - "projection": "terrain_matching" - }, - "weight": 1 - } - ], - "fallback": "minecraft:empty" -} \ No newline at end of file diff --git a/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/trees.json b/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/trees.json new file mode 100644 index 00000000..fc974e5f --- /dev/null +++ b/src/main/resources/data/sculk_depths/worldgen/template_pool/laboratory/trees.json @@ -0,0 +1,16 @@ +{ + "elements": [ + { + "element": { + "element_type": "minecraft:legacy_single_pool_element", + "location": "sculk_depths:laboratory/trees/valtrox_tree_1", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 10 + } + ], + "fallback": "minecraft:empty" +} \ No newline at end of file diff --git a/src/main/resources/data/sculk_depths/worldgen/template_pool/underground_lab/center.json b/src/main/resources/data/sculk_depths/worldgen/template_pool/underground_lab/center.json new file mode 100644 index 00000000..4cecba13 --- /dev/null +++ b/src/main/resources/data/sculk_depths/worldgen/template_pool/underground_lab/center.json @@ -0,0 +1,16 @@ +{ + "elements": [ + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "sculk_depths:underground_lab/underground_lab", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 1 + } + ], + "fallback": "minecraft:empty" +} \ No newline at end of file diff --git a/src/main/resources/sculk_depths.mixins.json b/src/main/resources/sculk_depths.mixins.json index 418db342..cf7f7944 100644 --- a/src/main/resources/sculk_depths.mixins.json +++ b/src/main/resources/sculk_depths.mixins.json @@ -5,6 +5,7 @@ "compatibilityLevel": "JAVA_17", "mixins": [ "AttachedStemBlockMixin", + "BlockMixin", "CropBlockMixin", "FarmLandBlockMixin", "LivingEntityMixin", diff --git a/unused/FlumRockCauldronRecipe.java b/unused/FlumRockCauldronRecipe.java new file mode 100644 index 00000000..b4a50c4a --- /dev/null +++ b/unused/FlumRockCauldronRecipe.java @@ -0,0 +1,76 @@ +package net.ugi.sculk_depths.recipe; + +import net.minecraft.inventory.Inventory; +import net.minecraft.item.ItemStack; +import net.minecraft.recipe.*; +import net.minecraft.registry.DynamicRegistryManager; +import net.minecraft.util.Identifier; +import net.minecraft.util.collection.DefaultedList; +import net.minecraft.world.World; + +public class FlumRockCauldronRecipe implements Recipe { + + private final DefaultedList recipeItems; + private final ItemStack outputStack; + private final Identifier id; + + + public FlumRockCauldronRecipe(DefaultedList recipeItems, ItemStack outputStack, Identifier id) { + this.recipeItems = recipeItems; + this.outputStack = outputStack; + this.id = id; + } + + + + @Override + public boolean matches(Inventory inventory, World world) { + if(recipeItems.get(0).getItem() == inventory.getStack(0).getItem() && recipeItems.get(0).getCount() <= inventory.getStack(0).getCount()){ + inventory.removeStack(0,recipeItems.get(0).getCount()); + return true; + } + return false; + } + + @Override + public ItemStack craft(Inventory inventory, DynamicRegistryManager registryManager) { + return this.getOutput(DynamicRegistryManager.EMPTY).copy(); + } + + @Override + public boolean fits(int width, int height) { + return true; + } + + @Override + public ItemStack getOutput(DynamicRegistryManager registryManager) { + return outputStack; + } + + public DefaultedList getRecipeItems() { + return recipeItems; + } + + @Override + public Identifier getId() { + return id; + } + + @Override + public RecipeSerializer getSerializer() { + return FlumrockCauldronRecipeSerializer.INSTANCE; + } + + @Override + public RecipeType getType() { + return Type.INSTANCE; + } + + public static class Type implements RecipeType { + private Type() { } + public static final Type INSTANCE = new Type(); + public static final String ID = "flumrock_cauldron_recipe"; + } + + +} diff --git a/unused/FlumrockCauldronRecipeJsonFormat.java b/unused/FlumrockCauldronRecipeJsonFormat.java new file mode 100644 index 00000000..27f6add2 --- /dev/null +++ b/unused/FlumrockCauldronRecipeJsonFormat.java @@ -0,0 +1,15 @@ +package net.ugi.sculk_depths.recipe; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; + +class FlumrockCauldronRecipeJsonFormat { + String ingredient1; + String ingredient2; + String ingredient3; + + JsonArray ingredient_counts; + String outputItem; + int outputAmount; + +} diff --git a/unused/FlumrockCauldronRecipeSerializer.java b/unused/FlumrockCauldronRecipeSerializer.java new file mode 100644 index 00000000..8788d8f8 --- /dev/null +++ b/unused/FlumrockCauldronRecipeSerializer.java @@ -0,0 +1,85 @@ +package net.ugi.sculk_depths.recipe; + +import com.google.gson.Gson; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import com.google.gson.JsonSyntaxException; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.recipe.RecipeSerializer; +import net.minecraft.registry.DynamicRegistryManager; +import net.minecraft.registry.Registries; +import net.minecraft.registry.entry.RegistryEntry; +import net.minecraft.util.Identifier; +import net.minecraft.util.JsonHelper; +import net.minecraft.util.collection.DefaultedList; + + +public class FlumrockCauldronRecipeSerializer implements RecipeSerializer { + @Override + // Turns json into Recipe + public FlumRockCauldronRecipe read(Identifier recipeId, JsonObject json) { + FlumrockCauldronRecipeJsonFormat recipeJson = new Gson().fromJson(json, FlumrockCauldronRecipeJsonFormat.class); + if (recipeJson.ingredient1 == null || recipeJson.outputItem == null || recipeJson.ingredient_counts == null) { + throw new JsonSyntaxException("A required attribute is missing!"); + } + // We'll allow to not specify the output, and default it to 1. + if (recipeJson.outputAmount == 0) recipeJson.outputAmount = 1; + + JsonArray ingredient_counts = JsonHelper.getArray(json, "ingredient_counts"); + + DefaultedList inputs = DefaultedList.ofSize(3, ItemStack.EMPTY); + + + Item ingredient1Item = Registries.ITEM.getOrEmpty(new Identifier(recipeJson.ingredient1)) + .orElseThrow(() -> new JsonSyntaxException("No such item " + recipeJson.ingredient1)); + inputs.set(0, new ItemStack(ingredient1Item, ingredient_counts.get(0).getAsInt())); + + Item ingredient2Item = Registries.ITEM.getOrEmpty(new Identifier(recipeJson.ingredient2)) + .orElseThrow(() -> new JsonSyntaxException("No such item " + recipeJson.ingredient2)); + inputs.set(1, new ItemStack(ingredient2Item, ingredient_counts.get(1).getAsInt())); + + Item ingredient3Item = Registries.ITEM.getOrEmpty(new Identifier(recipeJson.ingredient3)) + .orElseThrow(() -> new JsonSyntaxException("No such item " + recipeJson.ingredient3)); + inputs.set(2, new ItemStack(ingredient3Item, ingredient_counts.get(2).getAsInt())); + + + Item outputItem = Registries.ITEM.getOrEmpty(new Identifier(recipeJson.outputItem)) + // Validate the inputted item actually exists + .orElseThrow(() -> new JsonSyntaxException("No such item " + recipeJson.outputItem)); + ItemStack output = new ItemStack(outputItem, recipeJson.outputAmount); + + return new FlumRockCauldronRecipe(inputs, output, recipeId); + } + @Override + public FlumRockCauldronRecipe read(Identifier id, PacketByteBuf buf) { + DefaultedList inputs = DefaultedList.ofSize(buf.readInt(), ItemStack.EMPTY); + + for (int i = 0; i < inputs.size(); i++) { + inputs.set(i, buf.readItemStack()); + } + + ItemStack output = buf.readItemStack(); + return new FlumRockCauldronRecipe(inputs, output, id); + } + + @Override + public void write(PacketByteBuf buf, FlumRockCauldronRecipe recipe) { + buf.writeInt(recipe.getRecipeItems().size()); + for (ItemStack ing : recipe.getRecipeItems()) { + buf.writeItemStack(ing); + } + buf.writeItemStack(recipe.getOutput(DynamicRegistryManager.EMPTY)); + } + + private FlumrockCauldronRecipeSerializer() { + } + + public static final FlumrockCauldronRecipeSerializer INSTANCE = new FlumrockCauldronRecipeSerializer(); + + // This will be the "type" field in the json + public static final String ID = "flumrock_cauldron_recipe"; + + +}