From b84aa324e89e2df66fa1d4b2e33d912dc7f1054b Mon Sep 17 00:00:00 2001 From: Maxx <53229958+MBatt1@users.noreply.github.com> Date: Sun, 28 Apr 2024 15:22:58 -0500 Subject: [PATCH] bloomed calcite + worldgen + levita brick --- .../blocks/BlockRegistration.java | 17 ++ .../blocks/ParadiseLostBlocks.java | 32 +-- .../blocks/natural/crop/CropGrowthBlock.java | 25 +++ .../config/ParadiseLostConfig.java | 2 +- .../paradiselost/items/ParadiseLostItems.java | 7 +- .../mixin/item/PotionItemMixin.java | 66 ++++++ .../features/VitrouliteSpireFeature.java | 4 +- src/main/resources/asset_helper.py | 5 +- .../blockstates/bloomed_calcite.json | 7 + .../blockstates/levita_brick.json | 7 + .../blockstates/levita_brick_slab.json | 13 ++ .../blockstates/levita_brick_stairs.json | 209 ++++++++++++++++++ .../paradise_lost/blockstates/vitroulite.json | 7 - .../assets/paradise_lost/lang/en_us.json | 37 +--- .../models/block/bloomed_calcite.json | 6 + .../models/block/levita_brick.json | 6 + .../models/block/levita_brick_slab.json | 8 + .../models/block/levita_brick_slab_top.json | 8 + .../models/block/levita_brick_stairs.json | 8 + .../block/levita_brick_stairs_inner.json | 8 + .../block/levita_brick_stairs_outer.json | 8 + .../models/block/vitroulite.json | 6 - .../models/item/bloomed_calcite.json | 3 + .../models/item/levita_brick.json | 3 + .../models/item/levita_brick_slab.json | 3 + .../models/item/levita_brick_stairs.json | 3 + .../paradise_lost/models/item/portal.json | 4 +- .../paradise_lost/models/item/vitroulite.json | 3 - .../textures/block/bloomed_calcite.png | Bin 0 -> 460 bytes .../textures/block/levita_brick.png | Bin 0 -> 527 bytes .../textures/block/vitroulite.png | Bin 208 -> 0 bytes .../advancements/enter_paradise_lost.json | 2 +- .../loot_tables/blocks/bloomed_calcite.json | 20 ++ .../{vitroulite.json => levita_brick.json} | 2 +- .../loot_tables/blocks/levita_brick_slab.json | 33 +++ .../blocks/levita_brick_stairs.json | 20 ++ .../paradise_lost/recipes/levita_brick.json | 16 ++ .../recipes/levita_brick_slab.json | 15 ++ .../recipes/levita_brick_stairs.json | 17 ++ .../tags/blocks/mineable_by_pickaxe.json | 2 +- .../tags/blocks/mineable_by_shovel.json | 3 + .../tags/blocks/requires_stone_tool.json | 3 +- .../data/paradise_lost/tags/blocks/slabs.json | 1 + .../paradise_lost/tags/blocks/stairs.json | 1 + .../data/paradise_lost/tags/items/slabs.json | 1 + .../data/paradise_lost/tags/items/stairs.json | 1 + .../worldgen/density_function/bulk.json | 8 +- .../worldgen/density_function/hills.json | 8 +- .../worldgen/density_function/ridges.json | 2 +- .../worldgen/density_function/spackle.json | 2 +- .../worldgen/noise_settings/noise.json | 8 +- src/main/resources/paradise_lost.mixins.json | 1 + 52 files changed, 584 insertions(+), 97 deletions(-) create mode 100644 src/main/java/net/id/paradiselost/blocks/natural/crop/CropGrowthBlock.java create mode 100644 src/main/java/net/id/paradiselost/mixin/item/PotionItemMixin.java create mode 100644 src/main/resources/assets/paradise_lost/blockstates/bloomed_calcite.json create mode 100644 src/main/resources/assets/paradise_lost/blockstates/levita_brick.json create mode 100644 src/main/resources/assets/paradise_lost/blockstates/levita_brick_slab.json create mode 100644 src/main/resources/assets/paradise_lost/blockstates/levita_brick_stairs.json delete mode 100644 src/main/resources/assets/paradise_lost/blockstates/vitroulite.json create mode 100644 src/main/resources/assets/paradise_lost/models/block/bloomed_calcite.json create mode 100644 src/main/resources/assets/paradise_lost/models/block/levita_brick.json create mode 100644 src/main/resources/assets/paradise_lost/models/block/levita_brick_slab.json create mode 100644 src/main/resources/assets/paradise_lost/models/block/levita_brick_slab_top.json create mode 100644 src/main/resources/assets/paradise_lost/models/block/levita_brick_stairs.json create mode 100644 src/main/resources/assets/paradise_lost/models/block/levita_brick_stairs_inner.json create mode 100644 src/main/resources/assets/paradise_lost/models/block/levita_brick_stairs_outer.json delete mode 100644 src/main/resources/assets/paradise_lost/models/block/vitroulite.json create mode 100644 src/main/resources/assets/paradise_lost/models/item/bloomed_calcite.json create mode 100644 src/main/resources/assets/paradise_lost/models/item/levita_brick.json create mode 100644 src/main/resources/assets/paradise_lost/models/item/levita_brick_slab.json create mode 100644 src/main/resources/assets/paradise_lost/models/item/levita_brick_stairs.json delete mode 100644 src/main/resources/assets/paradise_lost/models/item/vitroulite.json create mode 100644 src/main/resources/assets/paradise_lost/textures/block/bloomed_calcite.png create mode 100644 src/main/resources/assets/paradise_lost/textures/block/levita_brick.png delete mode 100644 src/main/resources/assets/paradise_lost/textures/block/vitroulite.png create mode 100644 src/main/resources/data/paradise_lost/loot_tables/blocks/bloomed_calcite.json rename src/main/resources/data/paradise_lost/loot_tables/blocks/{vitroulite.json => levita_brick.json} (86%) create mode 100644 src/main/resources/data/paradise_lost/loot_tables/blocks/levita_brick_slab.json create mode 100644 src/main/resources/data/paradise_lost/loot_tables/blocks/levita_brick_stairs.json create mode 100644 src/main/resources/data/paradise_lost/recipes/levita_brick.json create mode 100644 src/main/resources/data/paradise_lost/recipes/levita_brick_slab.json create mode 100644 src/main/resources/data/paradise_lost/recipes/levita_brick_stairs.json diff --git a/src/main/java/net/id/paradiselost/blocks/BlockRegistration.java b/src/main/java/net/id/paradiselost/blocks/BlockRegistration.java index 6d1aa52b3..2e0c70a35 100644 --- a/src/main/java/net/id/paradiselost/blocks/BlockRegistration.java +++ b/src/main/java/net/id/paradiselost/blocks/BlockRegistration.java @@ -243,6 +243,23 @@ public record WoodBlockSet( } } + public static SimpleBlockSet registerSimpleBlockSet(String blockId, AbstractBlock.Settings settings) { + Block block = add(blockId, new Block(settings)); + ParadiseLostStairsBlock stairs = add(blockId + "_stairs", new ParadiseLostStairsBlock(block.getDefaultState(), settings)); + SlabBlock slab = add(blockId + "_slab", new SlabBlock(settings)); + return new SimpleBlockSet(block, stairs, slab); + } + + public record SimpleBlockSet( + Block block, StairsBlock stairs, SlabBlock slab + ) implements Iterable { + public @NotNull Iterator iterator() { + return Arrays.stream(new Block[]{ + block, stairs, slab + }).iterator(); + } + } + // SIGN SET public static SignSet registerSignSet(String woodId) { diff --git a/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java b/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java index 03d15131c..c87ac8def 100644 --- a/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java +++ b/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java @@ -3,25 +3,10 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.id.paradiselost.blocks.decorative.*; -import net.id.paradiselost.blocks.mechanical.CherineCampfireBlock; -import net.id.paradiselost.blocks.mechanical.FoodBowlBlock; -import net.id.paradiselost.blocks.mechanical.FourBiteCakeBlock; -import net.id.paradiselost.blocks.mechanical.IncubatorBlock; -import net.id.paradiselost.blocks.mechanical.NitraBlock; -import net.id.paradiselost.blocks.mechanical.TreeTapBlock; -import net.id.paradiselost.blocks.natural.ParadiseLostGrassBlock; -import net.id.paradiselost.blocks.natural.ParadiseLostSaplingBlock; -import net.id.paradiselost.blocks.natural.ParadiseLostSnowyBlock; -import net.id.paradiselost.blocks.natural.PoofBlock; -import net.id.paradiselost.blocks.natural.SurtrumOreBlock; -import net.id.paradiselost.blocks.natural.cloud.ParadiseLostCloudBlock; -import net.id.paradiselost.blocks.natural.cloud.BlueParadiseLostCloudBlock; -import net.id.paradiselost.blocks.natural.cloud.GoldenParadiseLostCloudBlock; -import net.id.paradiselost.blocks.natural.cloud.PinkParadiseLostCloudBlock; -import net.id.paradiselost.blocks.natural.crop.AmadrysCropBlock; -import net.id.paradiselost.blocks.natural.crop.BlackcurrantBushBlock; -import net.id.paradiselost.blocks.natural.crop.FlaxCropBlock; -import net.id.paradiselost.blocks.natural.crop.SwedrootCropBlock; +import net.id.paradiselost.blocks.mechanical.*; +import net.id.paradiselost.blocks.natural.*; +import net.id.paradiselost.blocks.natural.cloud.*; +import net.id.paradiselost.blocks.natural.crop.*; import net.id.paradiselost.blocks.natural.plant.*; import net.id.paradiselost.blocks.natural.tree.*; import net.id.paradiselost.fluids.ParadiseLostFluids; @@ -82,12 +67,10 @@ private static Settings cloud() { // Fluids public static final FluidBlock DENSE_CLOUD = add("dense_cloud", new FluidBlock(ParadiseLostFluids.DENSE_CLOUD, of(Material.WATER).noCollision().strength(100f).dropsNothing())); public static final FluidBlock SPRING_WATER = add("spring_water", new FluidBlock(ParadiseLostFluids.SPRING_WATER, of(Material.WATER).noCollision().strength(100f).dropsNothing())); - // Organic Extra - public static final Block VITROULITE = add("vitroulite", new Block(of(Material.DENSE_ICE).requiresTool().hardness(0.5f).sounds(BlockSoundGroup.GLASS))); // Smooth Floestone private static Settings floestone() { - return of(Material.STONE, MapColor.WHITE_GRAY).requiresTool().strength(0.5f, 1f).sounds(BlockSoundGroup.STONE); + return of(Material.STONE, MapColor.WHITE_GRAY).requiresTool().strength(0.5f, 5f).sounds(BlockSoundGroup.STONE); } public static final Block FLOESTONE = add("floestone", new Block(floestone())); @@ -136,6 +119,9 @@ private static Settings floestoneBrick() { public static final ParadiseLostStairsBlock SMOOTH_HELIOLITH_STAIRS = add("smooth_heliolith_stairs", new ParadiseLostStairsBlock(FLOESTONE_BRICK.getDefaultState(), floestone())); public static final WallBlock HELIOLITH_WALL = add("heliolith_wall", new WallBlock(floestone())); + // LEVITA BRICK + public static final SimpleBlockSet LEVITA_BRICK_SET = registerSimpleBlockSet("levita_brick", of(Material.AGGREGATE, MapColor.LIGHT_BLUE_GRAY).requiresTool().strength(0.3f, 3f).sounds(BlockSoundGroup.CALCITE)); + private static Settings amberTiles() { return of(Material.STONE, MapColor.GOLD).requiresTool().sounds(BlockSoundGroup.CALCITE).strength(2, 6); } @@ -144,6 +130,8 @@ private static Settings amberTiles() { public static final SlabBlock GOLDEN_AMBER_TILE_SLAB = add("golden_amber_tile_slab", new SlabBlock(amberTiles())); public static final ParadiseLostStairsBlock GOLDEN_AMBER_TILE_STAIRS = add("golden_amber_tile_stairs", new ParadiseLostStairsBlock(GOLDEN_AMBER_TILE.getDefaultState(), amberTiles())); + public static final Block BLOOMED_CALCITE = add("bloomed_calcite", new CropGrowthBlock(copy(CALCITE).ticksRandomly(), 2)); + protected static Settings flowerPot() { return copy(POTTED_OAK_SAPLING); } diff --git a/src/main/java/net/id/paradiselost/blocks/natural/crop/CropGrowthBlock.java b/src/main/java/net/id/paradiselost/blocks/natural/crop/CropGrowthBlock.java new file mode 100644 index 000000000..0f39844d9 --- /dev/null +++ b/src/main/java/net/id/paradiselost/blocks/natural/crop/CropGrowthBlock.java @@ -0,0 +1,25 @@ +package net.id.paradiselost.blocks.natural.crop; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.CropBlock; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.random.Random; + +public class CropGrowthBlock extends Block { + + final int boostChance; + + public CropGrowthBlock(Settings settings, int boostChance) { + super(settings); + this.boostChance = boostChance; + } + + public void randomTick(BlockState state, ServerWorld world, BlockPos pos, Random random) { + BlockState upBlock = world.getBlockState(pos.up(2)); + if (upBlock.getBlock() instanceof CropBlock && random.nextInt(this.boostChance) == 0) { + upBlock.randomTick(world, pos.up(2), random); + } + } +} diff --git a/src/main/java/net/id/paradiselost/config/ParadiseLostConfig.java b/src/main/java/net/id/paradiselost/config/ParadiseLostConfig.java index afba66c9e..f9cd63ee0 100644 --- a/src/main/java/net/id/paradiselost/config/ParadiseLostConfig.java +++ b/src/main/java/net/id/paradiselost/config/ParadiseLostConfig.java @@ -12,7 +12,7 @@ public class ParadiseLostConfig implements ConfigData { public static ParadiseLostConfig CONFIG; - protected String ParadiseLostPortalBaseBlock = "minecraft:glowstone"; + protected String ParadiseLostPortalBaseBlock = "paradise_lost:bloomed_calcite"; public static void init() { diff --git a/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java b/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java index fd498b19b..cc3f136ba 100644 --- a/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java +++ b/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java @@ -198,11 +198,13 @@ private static FabricItemSettings building_block() { return new FabricItemSettings().group(ParadiseLostItemGroups.PARADISE_LOST_BUILDING_BLOCKS); } + public static final BlockItem BLOOMED_CALCITE = add("bloomed_calcite", ParadiseLostBlocks.BLOOMED_CALCITE, building_block()); + // stone public static final BlockItem FLOESTONE = add("floestone", ParadiseLostBlocks.FLOESTONE, building_block()); public static final BlockItem COBBLED_FLOESTONE = add("cobbled_floestone", ParadiseLostBlocks.COBBLED_FLOESTONE, building_block()); public static final BlockItem HELIOLITH = add("heliolith", ParadiseLostBlocks.HELIOLITH, building_block()); - public static final BlockItem VITROULITE = add("vitroulite", ParadiseLostBlocks.VITROULITE, building_block()); + // nature public static final BlockItem HIGHLANDS_GRASS = add("highlands_grass", ParadiseLostBlocks.HIGHLANDS_GRASS, building_block()); @@ -272,6 +274,7 @@ private static FabricItemSettings building_block() { public static final BlockItem FLOESTONE_BRICK = add("floestone_brick", ParadiseLostBlocks.FLOESTONE_BRICK, building_block()); public static final BlockItem CHISELED_FLOESTONE = add("chiseled_floestone", ParadiseLostBlocks.CHISELED_FLOESTONE, building_block()); public static final BlockItem SMOOTH_HELIOLITH = add("smooth_heliolith", ParadiseLostBlocks.SMOOTH_HELIOLITH, building_block()); + public static final BlockItem LEVITA_BRICK = add("levita_brick", ParadiseLostBlocks.LEVITA_BRICK_SET.block(), building_block()); public static final BlockItem GOLDEN_AMBER_TILE = add("golden_amber_tile", ParadiseLostBlocks.GOLDEN_AMBER_TILE, building_block()); // stairs @@ -286,6 +289,7 @@ private static FabricItemSettings building_block() { public static final BlockItem HELIOLITH_STAIRS = add("heliolith_stairs", ParadiseLostBlocks.HELIOLITH_STAIRS, building_block()); public static final BlockItem FLOESTONE_BRICK_STAIRS = add("floestone_brick_stairs", ParadiseLostBlocks.FLOESTONE_BRICK_STAIRS, building_block()); public static final BlockItem SMOOTH_HELIOLITH_STAIRS = add("smooth_heliolith_stairs", ParadiseLostBlocks.SMOOTH_HELIOLITH_STAIRS, building_block()); + public static final BlockItem LEVITA_BRICK_STAIRS = add("levita_brick_stairs", ParadiseLostBlocks.LEVITA_BRICK_SET.stairs(), building_block()); public static final BlockItem GOLDEN_AMBER_TILE_STAIRS = add("golden_amber_tile_stairs", ParadiseLostBlocks.GOLDEN_AMBER_TILE_STAIRS, building_block()); public static final BlockItem FLOESTONE_SLAB = add("floestone_slab", ParadiseLostBlocks.FLOESTONE_SLAB, building_block()); @@ -294,6 +298,7 @@ private static FabricItemSettings building_block() { public static final BlockItem HELIOLITH_SLAB = add("heliolith_slab", ParadiseLostBlocks.HELIOLITH_SLAB, building_block()); public static final BlockItem FLOESTONE_BRICK_SLAB = add("floestone_brick_slab", ParadiseLostBlocks.FLOESTONE_BRICK_SLAB, building_block()); public static final BlockItem SMOOTH_HELIOLITH_SLAB = add("smooth_heliolith_slab", ParadiseLostBlocks.SMOOTH_HELIOLITH_SLAB, building_block()); + public static final BlockItem LEVITA_BRICK_SLAB = add("levita_brick_slab", ParadiseLostBlocks.LEVITA_BRICK_SET.slab(), building_block()); public static final BlockItem GOLDEN_AMBER_TILE_SLAB = add("golden_amber_tile_slab", ParadiseLostBlocks.GOLDEN_AMBER_TILE_SLAB, building_block()); // colorfuls diff --git a/src/main/java/net/id/paradiselost/mixin/item/PotionItemMixin.java b/src/main/java/net/id/paradiselost/mixin/item/PotionItemMixin.java new file mode 100644 index 000000000..3d9605340 --- /dev/null +++ b/src/main/java/net/id/paradiselost/mixin/item/PotionItemMixin.java @@ -0,0 +1,66 @@ +package net.id.paradiselost.mixin.item; + +import net.id.paradiselost.blocks.ParadiseLostBlocks; +import net.id.paradiselost.tag.ParadiseLostBlockTags; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.CauldronBlock; +import net.minecraft.block.CryingObsidianBlock; +import net.minecraft.block.RedstoneOreBlock; +import net.minecraft.client.particle.FireworksSparkParticle; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.projectile.FireworkRocketEntity; +import net.minecraft.entity.projectile.thrown.PotionEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUsage; +import net.minecraft.item.ItemUsageContext; +import net.minecraft.item.Items; +import net.minecraft.item.PotionItem; +import net.minecraft.particle.ParticleTypes; +import net.minecraft.potion.PotionUtil; +import net.minecraft.potion.Potions; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvents; +import net.minecraft.stat.Stats; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.random.Random; +import net.minecraft.world.World; +import net.minecraft.world.event.GameEvent; +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(PotionItem.class) +public class PotionItemMixin { + + @Inject(method = "useOnBlock", at = @At("RETURN"), cancellable = true) + public void useOnBlock(ItemUsageContext context, CallbackInfoReturnable cir) { + World world = context.getWorld(); + BlockPos blockPos = context.getBlockPos(); + PlayerEntity playerEntity = context.getPlayer(); + ItemStack itemStack = context.getStack(); + BlockState blockState = world.getBlockState(blockPos); + Random random = world.random; + if (blockState.isOf(Blocks.CALCITE) && (PotionUtil.getPotion(itemStack) == Potions.HEALING || PotionUtil.getPotion(itemStack) == Potions.STRONG_HEALING)) { + playerEntity.setStackInHand(context.getHand(), ItemUsage.exchangeStack(itemStack, playerEntity, new ItemStack(Items.GLASS_BOTTLE))); + world.setBlockState(blockPos, ParadiseLostBlocks.BLOOMED_CALCITE.getDefaultState()); + // particles + for (int i = 0; i < 16; i++) { + double xOffset = random.nextDouble(); + double yOffset = random.nextDouble(); + double zOffset = random.nextDouble(); + world.addParticle(ParticleTypes.ENTITY_EFFECT, blockPos.getX()+xOffset, blockPos.getY()+yOffset, blockPos.getZ()+zOffset, 0.97, 0.15, 0.14); + } + if (!world.isClient) { + // sound + world.playSound(null, blockPos, SoundEvents.ITEM_BOTTLE_EMPTY, SoundCategory.BLOCKS, 1.0F, 1.0F); + } + cir.setReturnValue(ActionResult.success(world.isClient)); + cir.cancel(); + } + } +} diff --git a/src/main/java/net/id/paradiselost/world/feature/features/VitrouliteSpireFeature.java b/src/main/java/net/id/paradiselost/world/feature/features/VitrouliteSpireFeature.java index 2723c6b28..7714b3f6d 100644 --- a/src/main/java/net/id/paradiselost/world/feature/features/VitrouliteSpireFeature.java +++ b/src/main/java/net/id/paradiselost/world/feature/features/VitrouliteSpireFeature.java @@ -37,7 +37,7 @@ public boolean generate(FeatureContext context) { var height = random.nextInt(3) + 1; for (int i = 0; i <= height; i++) { - world.setBlockState(origin.up(i), ParadiseLostBlocks.VITROULITE.getDefaultState(), Block.NOTIFY_LISTENERS); + world.setBlockState(origin.up(i), Blocks.PACKED_ICE.getDefaultState(), Block.NOTIFY_LISTENERS); } for (Direction dir : Direction.values()) { @@ -95,7 +95,7 @@ public boolean generate(FeatureContext context) { } static { - secStates.add(ParadiseLostBlocks.VITROULITE.getDefaultState()); + secStates.add(Blocks.PACKED_ICE.getDefaultState()); secStates.add(ParadiseLostBlocks.COBBLED_FLOESTONE.getDefaultState()); secStates.add(ParadiseLostBlocks.FLOESTONE.getDefaultState()); } diff --git a/src/main/resources/asset_helper.py b/src/main/resources/asset_helper.py index 514c50117..f59cdf860 100644 --- a/src/main/resources/asset_helper.py +++ b/src/main/resources/asset_helper.py @@ -80,7 +80,10 @@ def generate_slab_block(block_id, base_block_id, texture): -generate_standard_item("nitra_bulb") +generate_standard_block("bloomed_calcite") +generate_standard_block("levita_brick") +generate_stairs_block("levita_brick_stairs", "levita_brick") +generate_slab_block("levita_brick_slab", "levita_brick", "levita_brick") diff --git a/src/main/resources/assets/paradise_lost/blockstates/bloomed_calcite.json b/src/main/resources/assets/paradise_lost/blockstates/bloomed_calcite.json new file mode 100644 index 000000000..f62d6169b --- /dev/null +++ b/src/main/resources/assets/paradise_lost/blockstates/bloomed_calcite.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "paradise_lost:block/bloomed_calcite" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/paradise_lost/blockstates/levita_brick.json b/src/main/resources/assets/paradise_lost/blockstates/levita_brick.json new file mode 100644 index 000000000..7a8923434 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/blockstates/levita_brick.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "paradise_lost:block/levita_brick" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/paradise_lost/blockstates/levita_brick_slab.json b/src/main/resources/assets/paradise_lost/blockstates/levita_brick_slab.json new file mode 100644 index 000000000..66764abe0 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/blockstates/levita_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "paradise_lost:block/levita_brick_slab" + }, + "type=double": { + "model": "paradise_lost:block/levita_brick" + }, + "type=top": { + "model": "paradise_lost:block/levita_brick_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/paradise_lost/blockstates/levita_brick_stairs.json b/src/main/resources/assets/paradise_lost/blockstates/levita_brick_stairs.json new file mode 100644 index 000000000..92a4c1c6e --- /dev/null +++ b/src/main/resources/assets/paradise_lost/blockstates/levita_brick_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "paradise_lost:block/levita_brick_stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "paradise_lost:block/levita_brick_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "paradise_lost:block/levita_brick_stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "paradise_lost:block/levita_brick_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "paradise_lost:block/levita_brick_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "paradise_lost:block/levita_brick_stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "paradise_lost:block/levita_brick_stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "paradise_lost:block/levita_brick_stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "paradise_lost:block/levita_brick_stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "paradise_lost:block/levita_brick_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "paradise_lost:block/levita_brick_stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "paradise_lost:block/levita_brick_stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "paradise_lost:block/levita_brick_stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "paradise_lost:block/levita_brick_stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "paradise_lost:block/levita_brick_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_left": { + "model": "paradise_lost:block/levita_brick_stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "paradise_lost:block/levita_brick_stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=top,shape=outer_left": { + "model": "paradise_lost:block/levita_brick_stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "paradise_lost:block/levita_brick_stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=top,shape=straight": { + "model": "paradise_lost:block/levita_brick_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "paradise_lost:block/levita_brick_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "paradise_lost:block/levita_brick_stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "paradise_lost:block/levita_brick_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "paradise_lost:block/levita_brick_stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "paradise_lost:block/levita_brick_stairs", + "y": 90, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "paradise_lost:block/levita_brick_stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "paradise_lost:block/levita_brick_stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "paradise_lost:block/levita_brick_stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "paradise_lost:block/levita_brick_stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "paradise_lost:block/levita_brick_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "paradise_lost:block/levita_brick_stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "paradise_lost:block/levita_brick_stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "paradise_lost:block/levita_brick_stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "paradise_lost:block/levita_brick_stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "paradise_lost:block/levita_brick_stairs", + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "paradise_lost:block/levita_brick_stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "paradise_lost:block/levita_brick_stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "paradise_lost:block/levita_brick_stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "paradise_lost:block/levita_brick_stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "paradise_lost:block/levita_brick_stairs", + "x": 180, + "y": 180, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/paradise_lost/blockstates/vitroulite.json b/src/main/resources/assets/paradise_lost/blockstates/vitroulite.json deleted file mode 100644 index ea9cccaa0..000000000 --- a/src/main/resources/assets/paradise_lost/blockstates/vitroulite.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "paradise_lost:block/vitroulite" - } - } -} diff --git a/src/main/resources/assets/paradise_lost/lang/en_us.json b/src/main/resources/assets/paradise_lost/lang/en_us.json index a1720de90..a2b63c81c 100644 --- a/src/main/resources/assets/paradise_lost/lang/en_us.json +++ b/src/main/resources/assets/paradise_lost/lang/en_us.json @@ -43,7 +43,7 @@ "block.paradise_lost.dense_cloud": "Dense Cloud", "block.paradise_lost.spring_water": "Spring Water", - "block.paradise_lost.vitroulite": "Vitroulite", + "block.paradise_lost.bloomed_calcite": "Bloomed Calcite", "block.paradise_lost.floestone": "Floestone", "block.paradise_lost.floestone_slab": "Floestone Slab", @@ -76,22 +76,9 @@ "block.paradise_lost.smooth_heliolith_slab": "Smooth Heliolith Slab", "block.paradise_lost.smooth_heliolith_stairs": "Smooth Heliolith Stairs", - "block.paradise_lost.carved_stone": "Carved Stone", - "block.paradise_lost.carved_stone_slab": "Carved Stone Slab", - "block.paradise_lost.carved_stone_stairs": "Carved Stone Stairs", - "block.paradise_lost.carved_stone_wall": "Carved Stone Wall", - - "block.paradise_lost.mossy_carved_stone": "Mossy Carved Stone", - "block.paradise_lost.mossy_carved_stone_slab": "Mossy Carved Stone Slab", - "block.paradise_lost.mossy_carved_stone_stairs": "Mossy Carved Stone Stairs", - "block.paradise_lost.mossy_carved_stone_wall": "Mossy Carved Stone Wall", - - "block.paradise_lost.cracked_carved_stone": "Cracked Carved Stone", - "block.paradise_lost.glyphed_carved_stone": "Glyphed Carved Stone", - "block.paradise_lost.carved_stone_panel": "Carved Stone Panel", - "block.paradise_lost.carved_stone_panel_lit": "Lit Carved Stone Panel", - "block.paradise_lost.carved_stone_eye": "Carved Stone Eye", - "block.paradise_lost.carved_stone_eye_lit": "Lit Carved Stone Eye", + "block.paradise_lost.levita_brick": "Levita Brick", + "block.paradise_lost.levita_brick_slab": "Levita Brick Slab", + "block.paradise_lost.levita_brick_stairs": "Levita Brick Stairs", "block.paradise_lost.golden_amber_tile": "Golden Amber Tile", "block.paradise_lost.golden_amber_tile_slab": "Golden Amber Tile Slab", @@ -201,19 +188,9 @@ "block.paradise_lost.shamrock": "Shamrock", "block.paradise_lost.malt_sprig": "Malt Sprig", "block.paradise_lost.honey_nettle": "Honey Nettle", - "block.paradise_lost.halophia": "Halophia", - "block.paradise_lost.giant_lily": "Giant's Lily", - "block.paradise_lost.weeping_cloudburst": "Weeping Cloudburst", - "block.paradise_lost.moss_star": "Moss Star", - "block.paradise_lost.moss_ball": "Moss Ball", "block.paradise_lost.liverwort": "Liverwort", "block.paradise_lost.liverwort_carpet": "Liverwort Carpet", - "block.paradise_lost.lichen": "Lichen", - "block.paradise_lost.lichen_pile": "Lichen Pile", - "block.paradise_lost.lucatiel_lichen": "Lucatiel Lichen", - "block.paradise_lost.lucatiel_lichen_pile": "Lucatiel Lichen Pile", - "block.paradise_lost.swedroot_spread": "Swedroot Spread", "block.paradise_lost.rootcap": "Rootcap", @@ -256,12 +233,6 @@ "block.paradise_lost.food_bowl": "Feeding Trough", "block.paradise_lost.tree_tap": "Tree Tap", "block.paradise_lost.nitra_bunch": "Nitra Bunch", - - "block.paradise_lost.crystal_chest": "Crystal Chest", - "block.paradise_lost.golden_oak_chest": "Mother Aurel Chest", - "block.paradise_lost.orange_chest": "Orange Chest", - "block.paradise_lost.skyroot_chest": "Aurel Chest", - "block.paradise_lost.wisteria_chest": "Wisteria Chest", "book.edition": "%dst Edition", diff --git a/src/main/resources/assets/paradise_lost/models/block/bloomed_calcite.json b/src/main/resources/assets/paradise_lost/models/block/bloomed_calcite.json new file mode 100644 index 000000000..9a57ad478 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/block/bloomed_calcite.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "paradise_lost:block/bloomed_calcite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/paradise_lost/models/block/levita_brick.json b/src/main/resources/assets/paradise_lost/models/block/levita_brick.json new file mode 100644 index 000000000..5b726850d --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/block/levita_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "paradise_lost:block/levita_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/paradise_lost/models/block/levita_brick_slab.json b/src/main/resources/assets/paradise_lost/models/block/levita_brick_slab.json new file mode 100644 index 000000000..d70743a6b --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/block/levita_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "paradise_lost:block/levita_brick", + "top": "paradise_lost:block/levita_brick", + "side": "paradise_lost:block/levita_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/paradise_lost/models/block/levita_brick_slab_top.json b/src/main/resources/assets/paradise_lost/models/block/levita_brick_slab_top.json new file mode 100644 index 000000000..9ca272b66 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/block/levita_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "paradise_lost:block/levita_brick", + "top": "paradise_lost:block/levita_brick", + "side": "paradise_lost:block/levita_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/paradise_lost/models/block/levita_brick_stairs.json b/src/main/resources/assets/paradise_lost/models/block/levita_brick_stairs.json new file mode 100644 index 000000000..d2811d164 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/block/levita_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "paradise_lost:block/levita_brick", + "top": "paradise_lost:block/levita_brick", + "side": "paradise_lost:block/levita_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/paradise_lost/models/block/levita_brick_stairs_inner.json b/src/main/resources/assets/paradise_lost/models/block/levita_brick_stairs_inner.json new file mode 100644 index 000000000..bdaf2b1d3 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/block/levita_brick_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "paradise_lost:block/levita_brick", + "top": "paradise_lost:block/levita_brick", + "side": "paradise_lost:block/levita_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/paradise_lost/models/block/levita_brick_stairs_outer.json b/src/main/resources/assets/paradise_lost/models/block/levita_brick_stairs_outer.json new file mode 100644 index 000000000..8802fd611 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/block/levita_brick_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "paradise_lost:block/levita_brick", + "top": "paradise_lost:block/levita_brick", + "side": "paradise_lost:block/levita_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/paradise_lost/models/block/vitroulite.json b/src/main/resources/assets/paradise_lost/models/block/vitroulite.json deleted file mode 100644 index f1f6e785f..000000000 --- a/src/main/resources/assets/paradise_lost/models/block/vitroulite.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "paradise_lost:block/vitroulite" - } -} diff --git a/src/main/resources/assets/paradise_lost/models/item/bloomed_calcite.json b/src/main/resources/assets/paradise_lost/models/item/bloomed_calcite.json new file mode 100644 index 000000000..54b5e6b41 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/item/bloomed_calcite.json @@ -0,0 +1,3 @@ +{ + "parent": "paradise_lost:block/bloomed_calcite" +} \ No newline at end of file diff --git a/src/main/resources/assets/paradise_lost/models/item/levita_brick.json b/src/main/resources/assets/paradise_lost/models/item/levita_brick.json new file mode 100644 index 000000000..5340b17d5 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/item/levita_brick.json @@ -0,0 +1,3 @@ +{ + "parent": "paradise_lost:block/levita_brick" +} \ No newline at end of file diff --git a/src/main/resources/assets/paradise_lost/models/item/levita_brick_slab.json b/src/main/resources/assets/paradise_lost/models/item/levita_brick_slab.json new file mode 100644 index 000000000..2626f4071 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/item/levita_brick_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "paradise_lost:block/levita_brick_slab" +} \ No newline at end of file diff --git a/src/main/resources/assets/paradise_lost/models/item/levita_brick_stairs.json b/src/main/resources/assets/paradise_lost/models/item/levita_brick_stairs.json new file mode 100644 index 000000000..fe00972e0 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/item/levita_brick_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "paradise_lost:block/levita_brick_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/paradise_lost/models/item/portal.json b/src/main/resources/assets/paradise_lost/models/item/portal.json index 2b4ad07f6..036db987c 100644 --- a/src/main/resources/assets/paradise_lost/models/item/portal.json +++ b/src/main/resources/assets/paradise_lost/models/item/portal.json @@ -2,9 +2,9 @@ "parent": "block/cube_all", "ambientocclusion": false, "textures": { - "0": "block/glowstone", + "0": "paradise_lost:block/bloomed_calcite", "1": "paradise_lost:block/blue_portal", - "particle": "block/glowstone" + "particle": "paradise_lost:block/bloomed_calcite" }, "elements": [ { diff --git a/src/main/resources/assets/paradise_lost/models/item/vitroulite.json b/src/main/resources/assets/paradise_lost/models/item/vitroulite.json deleted file mode 100644 index ef1ff99ee..000000000 --- a/src/main/resources/assets/paradise_lost/models/item/vitroulite.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "paradise_lost:block/vitroulite" -} diff --git a/src/main/resources/assets/paradise_lost/textures/block/bloomed_calcite.png b/src/main/resources/assets/paradise_lost/textures/block/bloomed_calcite.png new file mode 100644 index 0000000000000000000000000000000000000000..cee78c8a6a13136fd16627f188038cf518f416b2 GIT binary patch literal 460 zcmV;-0WPx$hDk(0R5*=old)>!KoEvMFDh(=5yr6uvhTQ7g{zPzRf=ow0n+7RQw77}>fltK zA+|t!$pv8~xsp=EGaiN8M$7K}Gyi`vN=A7PMIp)6z(*yt~VnDxsv(-Jo*ZT*?vpLN!r>p!R)?rqA*mHa?bq{cLa}B`h z?N#HX`XGT7PrqCOtk^{{E{gTME=mI1r-+4th-7t@$3?NSnJiZXvhkbkK&%Xkl4-Wq z-n+`H+v9V|sPFq8pxNaEaFSS@$du}$929fSF4rC<*tTSei*@UCRR8(iOTgmxPN8*` z*EccE){JL!{ysfwAz>4UI7}0oU5<<5kC~r)RyW!DzeNRQ_m(~LN^TPx$$w@>(R5*=wk}+%BKp2Lfl*3RPWV@lX5F9Ty859s03WiP|3K;_J)Gnp;2L$>L z@^icu637rp!BbL$fTYyl9?DwvAWfcv`%0Iha|)01;Vlm=9tG61noh;>5MDf4Hsv}O;BC9zIy zlUOG_ES3O>`@4xX$Q!Mf5ym<}DQ)ixrF22OeqJ{LP)ge-qE>TIN~4sfRpyh(l{ zr8Lv&gy|Gq*F}7A4{bo#zO+U!2?0KTIj|v%C=CFpmpndw^oY`c)01-mc6J&71!1?- z1K{>%MU)0vh}rwH)axaWpI<$Ed4`k{$VUDC?MFdqwj<12$KjlDIH$Rr8MWFCq?8>0 zIw}aw`b-IP$OjnfgjPEnKb%$mE8H;1vycY`;Q5)GoV>dF>u-Q#*f1gHjm=%9G*U{0 z>$-)ojM!9^2IOHIhjY6XfGvM;_4sbV literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/paradise_lost/textures/block/vitroulite.png b/src/main/resources/assets/paradise_lost/textures/block/vitroulite.png deleted file mode 100644 index 6076574b966810be400a80f2c00c056001dbd57d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Xn;?M>)xYRXRq2=RMXrsd1iWH z#f`f!0unN;D)MT83d%fP978H@srH}bWN;K{S+n{xe`Vw|?G6u{l$S|t?%Ex})e{zP zGrOa`qOqefP_35#=XX4EVUuatNe=Tc<2Qo%^!^w#VP@11U%S{^;s@Q&Rs zbVj(zmVFN!boNXXiB