From 978ec8d989a377b07e70653fe4f7ab436cef368d Mon Sep 17 00:00:00 2001 From: 24Chrome Date: Mon, 20 Feb 2023 20:44:46 -0600 Subject: [PATCH 1/9] surtrum tools, ore and refined block --- .../blocks/ParadiseLostBlocks.java | 23 +++----- .../blocks/natural/SurtrumOreBlock.java | 31 +++++++++++ .../rendering/ui/BloodstoneHUDRenderer.java | 2 +- .../paradiselost/items/ParadiseLostItems.java | 20 +++++-- .../tools/ParadiseLostToolMaterials.java | 2 + ...neItem.java => SurtrumBloodstoneItem.java} | 6 +-- .../blockstates/refined_surtrum_block.json | 7 +++ .../paradise_lost/blockstates/surtrum.json | 7 +++ .../assets/paradise_lost/lang/en_us.json | 13 ++++- .../models/block/refined_surtrum_block.json | 6 +++ .../paradise_lost/models/block/surtrum.json | 6 +++ .../models/item/glazed_gold_fishing_rod.json | 14 +++++ .../item/glazed_gold_fishing_rod_cast.json | 6 +++ .../models/item/raw_surtrum.json | 6 +++ .../models/item/refined_surtrum.json | 6 +++ .../models/item/refined_surtrum_block.json | 3 ++ .../paradise_lost/models/item/surtrum.json | 3 ++ .../models/item/surtrum_axe.json | 6 +++ .../models/item/surtrum_bloodstone.json | 6 +++ .../models/item/surtrum_hoe.json | 6 +++ .../models/item/surtrum_pickaxe.json | 6 +++ .../models/item/surtrum_shovel.json | 6 +++ .../models/item/surtrum_sword.json | 6 +++ .../paradise_lost/textures/block/surtrum.png | Bin 0 -> 722 bytes .../textures/block/surtrum.png.mcmeta | 6 +++ .../textures/item/glazed_gold_fishing_rod.png | Bin 0 -> 234 bytes .../item/glazed_gold_fishing_rod_cast.png | Bin 0 -> 226 bytes .../textures/item/raw_surtrum.png | Bin 0 -> 377 bytes .../textures/item/refined_surtrum.png | Bin 0 -> 386 bytes .../textures/item/surtrum_axe.png | Bin 0 -> 331 bytes .../textures/item/surtrum_bloodstone.png | Bin 0 -> 266 bytes .../textures/item/surtrum_hoe.png | Bin 0 -> 323 bytes .../textures/item/surtrum_pickaxe.png | Bin 0 -> 342 bytes .../textures/item/surtrum_shovel.png | Bin 0 -> 299 bytes .../textures/item/surtrum_sword.png | Bin 0 -> 416 bytes .../blocks/refined_surtrum_block.json | 20 +++++++ .../loot_tables/blocks/surtrum.json | 49 ++++++++++++++++++ .../tags/blocks/mineable_by_pickaxe.json | 1 - .../paradise_lost/tags/blocks/ore_blocks.json | 4 +- .../data/paradise_lost/tags/blocks/ores.json | 3 +- .../tags/blocks/requires_iron_tool.json | 1 + 41 files changed, 254 insertions(+), 27 deletions(-) create mode 100644 src/main/java/net/id/paradiselost/blocks/natural/SurtrumOreBlock.java rename src/main/java/net/id/paradiselost/items/tools/bloodstone/{GravititeBloodstoneItem.java => SurtrumBloodstoneItem.java} (67%) create mode 100644 src/main/resources/assets/paradise_lost/blockstates/refined_surtrum_block.json create mode 100644 src/main/resources/assets/paradise_lost/blockstates/surtrum.json create mode 100644 src/main/resources/assets/paradise_lost/models/block/refined_surtrum_block.json create mode 100644 src/main/resources/assets/paradise_lost/models/block/surtrum.json create mode 100644 src/main/resources/assets/paradise_lost/models/item/glazed_gold_fishing_rod.json create mode 100644 src/main/resources/assets/paradise_lost/models/item/glazed_gold_fishing_rod_cast.json create mode 100644 src/main/resources/assets/paradise_lost/models/item/raw_surtrum.json create mode 100644 src/main/resources/assets/paradise_lost/models/item/refined_surtrum.json create mode 100644 src/main/resources/assets/paradise_lost/models/item/refined_surtrum_block.json create mode 100644 src/main/resources/assets/paradise_lost/models/item/surtrum.json create mode 100644 src/main/resources/assets/paradise_lost/models/item/surtrum_axe.json create mode 100644 src/main/resources/assets/paradise_lost/models/item/surtrum_bloodstone.json create mode 100644 src/main/resources/assets/paradise_lost/models/item/surtrum_hoe.json create mode 100644 src/main/resources/assets/paradise_lost/models/item/surtrum_pickaxe.json create mode 100644 src/main/resources/assets/paradise_lost/models/item/surtrum_shovel.json create mode 100644 src/main/resources/assets/paradise_lost/models/item/surtrum_sword.json create mode 100644 src/main/resources/assets/paradise_lost/textures/block/surtrum.png create mode 100644 src/main/resources/assets/paradise_lost/textures/block/surtrum.png.mcmeta create mode 100644 src/main/resources/assets/paradise_lost/textures/item/glazed_gold_fishing_rod.png create mode 100644 src/main/resources/assets/paradise_lost/textures/item/glazed_gold_fishing_rod_cast.png create mode 100644 src/main/resources/assets/paradise_lost/textures/item/raw_surtrum.png create mode 100644 src/main/resources/assets/paradise_lost/textures/item/refined_surtrum.png create mode 100644 src/main/resources/assets/paradise_lost/textures/item/surtrum_axe.png create mode 100644 src/main/resources/assets/paradise_lost/textures/item/surtrum_bloodstone.png create mode 100644 src/main/resources/assets/paradise_lost/textures/item/surtrum_hoe.png create mode 100644 src/main/resources/assets/paradise_lost/textures/item/surtrum_pickaxe.png create mode 100644 src/main/resources/assets/paradise_lost/textures/item/surtrum_shovel.png create mode 100644 src/main/resources/assets/paradise_lost/textures/item/surtrum_sword.png create mode 100644 src/main/resources/data/paradise_lost/loot_tables/blocks/refined_surtrum_block.json create mode 100644 src/main/resources/data/paradise_lost/loot_tables/blocks/surtrum.json diff --git a/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java b/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java index ff6f27208..baef38926 100644 --- a/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java +++ b/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java @@ -5,21 +5,10 @@ import net.id.incubus_core.woodtypefactory.api.chest.ChestFactory; import net.id.paradiselost.ParadiseLost; 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.natural.ParadiseLostGrassBlock; -import net.id.paradiselost.blocks.natural.ParadiseLostSaplingBlock; -import net.id.paradiselost.blocks.natural.ParadiseLostSnowyBlock; -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; @@ -361,9 +350,11 @@ private static Settings flower() { // Ores public static final OreBlock CHERINE_ORE = add("cherine_ore", new OreBlock(of(Material.STONE).requiresTool().strength(3f), UniformIntProvider.create(0, 2))); - public static final OreBlock OLVITE_ORE = add("olvite_ore", new OreBlock(of(Material.STONE).requiresTool().strength(3f), UniformIntProvider.create(0, 2))); + public static final OreBlock OLVITE_ORE = add("olvite_ore", new OreBlock(of(Material.STONE).requiresTool().strength(3f), UniformIntProvider.create(1, 3))); + public static final OreBlock SURTRUM = add("surtrum", new SurtrumOreBlock(of(Material.STONE).sounds(BlockSoundGroup.NETHER_GOLD_ORE).requiresTool().strength(9f, 12f), UniformIntProvider.create(2, 5))); public static final Block CHERINE_BLOCK = add("cherine_block", new Block(of(Material.METAL).requiresTool().strength(3f, -1f).sounds(BlockSoundGroup.STONE))); public static final Block OLVITE_BLOCK = add("olvite_block", new Block(of(Material.METAL).requiresTool().strength(3f, -1f).sounds(BlockSoundGroup.METAL))); + public static final Block REFINED_SURTRUM_BLOCK = add("refined_surtrum_block", new Block(of(Material.METAL).requiresTool().strength(4f, -1f).sounds(BlockSoundGroup.METAL))); // Misc public static final FloatingBlock LEVITATOR = add("levitator", new FloatingBlock(true, of(Material.WOOD).strength(3f, 3f).sounds(BlockSoundGroup.WOOD))); public static final ChainBlock OLVITE_CHAIN = add("olvite_chain", new ChainBlock(copy(CHAIN)), cutoutMippedRenderLayer); diff --git a/src/main/java/net/id/paradiselost/blocks/natural/SurtrumOreBlock.java b/src/main/java/net/id/paradiselost/blocks/natural/SurtrumOreBlock.java new file mode 100644 index 000000000..26a6d1ebb --- /dev/null +++ b/src/main/java/net/id/paradiselost/blocks/natural/SurtrumOreBlock.java @@ -0,0 +1,31 @@ +package net.id.paradiselost.blocks.natural; + +import net.minecraft.block.BlockState; +import net.minecraft.block.OreBlock; +import net.minecraft.particle.ParticleTypes; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.intprovider.IntProvider; +import net.minecraft.util.math.random.Random; +import net.minecraft.world.World; + +public class SurtrumOreBlock extends OreBlock { + public SurtrumOreBlock(Settings settings, IntProvider experience) { + super(settings, experience); + } + + @Override + public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random random) { + if (random.nextInt(3) == 0) { + double d2 = (double)pos.getX() + random.nextDouble(); + double e2 = (double)pos.getY() + random.nextDouble() * 0.5 + 0.5; + double f2 = (double)pos.getZ() + random.nextDouble(); + world.addParticle(ParticleTypes.LARGE_SMOKE, d2, e2, f2, 0.0, 0.0, 0.0); + } + if (random.nextBoolean()) { + double d2 = (double)pos.getX() + random.nextDouble(); + double e2 = (double)pos.getY() + random.nextDouble() * 0.5 + 0.5; + double f2 = (double)pos.getZ() + random.nextDouble(); + world.addParticle(ParticleTypes.SMOKE, d2, e2, f2, 0.0, 0.0, 0.0); + } + } +} diff --git a/src/main/java/net/id/paradiselost/client/rendering/ui/BloodstoneHUDRenderer.java b/src/main/java/net/id/paradiselost/client/rendering/ui/BloodstoneHUDRenderer.java index ed56beccc..04e7952d2 100644 --- a/src/main/java/net/id/paradiselost/client/rendering/ui/BloodstoneHUDRenderer.java +++ b/src/main/java/net/id/paradiselost/client/rendering/ui/BloodstoneHUDRenderer.java @@ -44,7 +44,7 @@ public static void render(MatrixStack matrixStack, float delta) { renderCherine(matrixStack, client, capturedData); } else if (stack.getItem() instanceof OlviteBloodstoneItem) { renderOlvite(matrixStack, client, capturedData); - } else if (stack.getItem() instanceof GravititeBloodstoneItem) { + } else if (stack.getItem() instanceof SurtrumBloodstoneItem) { renderGravitite(matrixStack, client, capturedData); } else if (stack.getItem() instanceof AbstentineBloodstoneItem) { renderAbstentine(matrixStack, client, capturedData); diff --git a/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java b/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java index 0da92870e..038517378 100644 --- a/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java +++ b/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java @@ -15,8 +15,10 @@ import net.id.paradiselost.items.tools.ParadiseLostToolMaterials; import net.id.paradiselost.items.tools.AurelBucketItem; import net.id.paradiselost.items.tools.VialItem; +import net.id.paradiselost.items.tools.base_tools.*; import net.id.paradiselost.items.tools.bloodstone.AbstentineBloodstoneItem; import net.id.paradiselost.items.tools.bloodstone.CherineBloodstoneItem; +import net.id.paradiselost.items.tools.bloodstone.SurtrumBloodstoneItem; import net.id.paradiselost.items.tools.bloodstone.OlviteBloodstoneItem; import net.id.paradiselost.items.utils.ParadiseLostRarity; import net.id.paradiselost.registry.ParadiseLostRegistryQueues; @@ -61,6 +63,8 @@ private static FabricItemSettings resource() { public static final Item CHERINE = add("cherine", new Item(resource), fuel(500)); public static final Item OLVITE = add("olvite", new Item(resource)); public static final Item OLVITE_NUGGET = add("olvite_nugget", new Item(resource)); + public static final Item REFINED_SURTRUM = add("refined_surtrum", new Item(resource)); + public static final Item RAW_SURTRUM = add("raw_surtrum", new Item(resource)); public static final Item FLAX_THREAD = add("flax_thread", new Item(resource)); public static final Item FLAXWEAVE = add("flaxweave", new Item(resource)); public static final Item SWEDROOT_PULP = add("swedroot_pulp", new Item(resource), compostable30); @@ -75,25 +79,34 @@ private static Settings tool() { private static final Settings paradiseLostLootTool = tool().rarity(ParadiseLostRarity.PARADISE_LOST_LOOT); private static final Settings unstackableTool = tool().maxCount(1); private static final Settings unstackableRareTool = tool().maxCount(1).rarity(RARE); + // Olvite public static final ShovelItem OLVITE_SHOVEL = add("olvite_shovel", new ShovelItem(ParadiseLostToolMaterials.OLVITE, 1.5f, -3f, tool())); public static final PickaxeItem OLVITE_PICKAXE = add("olvite_pickaxe", new PickaxeItem(ParadiseLostToolMaterials.OLVITE, 1, -2.8f, tool())); public static final AxeItem OLVITE_AXE = add("olvite_axe", new AxeItem(ParadiseLostToolMaterials.OLVITE, 6f, -3.1f, tool())); public static final SwordItem OLVITE_SWORD = add("olvite_sword", new SwordItem(ParadiseLostToolMaterials.OLVITE, 3, -2.4f, tool())); - public static final HoeItem OLVITE_HOE = add("olvite_hoe", new ParadiseLostHoeItem(ParadiseLostToolMaterials.OLVITE, 1, 3f, tool())); + public static final HoeItem OLVITE_HOE = add("olvite_hoe", new ParadiseLostHoeItem(ParadiseLostToolMaterials.OLVITE, -2, -1f, tool())); + + // Surtrum + public static final GravityShovelItem SURTRUM_SHOVEL = add("surtrum_shovel", new GravityShovelItem(ParadiseLostToolMaterials.SURTRUM, 2.5f, -3f, tool())); + public static final GravityPickaxeItem SURTRUM_PICKAXE = add("surtrum_pickaxe", new GravityPickaxeItem(ParadiseLostToolMaterials.SURTRUM, 2, -2.8f, tool())); + public static final GravityAxeItem SURTRUM_AXE = add("surtrum_axe", new GravityAxeItem(ParadiseLostToolMaterials.SURTRUM, 6f, -3.1f, tool())); + public static final SwordItem SURTRUM_SWORD = add("surtrum_sword", new SwordItem(ParadiseLostToolMaterials.SURTRUM, 4, -2.4f, tool())); + public static final GravityHoeItem SURTRUM_HOE = add("surtrum_hoe", new GravityHoeItem(ParadiseLostToolMaterials.SURTRUM, -3, 0f, tool())); // Glazed Gold public static final ShovelItem GLAZED_GOLD_SHOVEL = add("glazed_gold_shovel", new ShovelItem(ParadiseLostToolMaterials.GLAZED_GOLD, 1.5f, -3f, tool())); public static final PickaxeItem GLAZED_GOLD_PICKAXE = add("glazed_gold_pickaxe", new PickaxeItem(ParadiseLostToolMaterials.GLAZED_GOLD, 1, -2.8f, tool())); public static final AxeItem GLAZED_GOLD_AXE = add("glazed_gold_axe", new AxeItem(ParadiseLostToolMaterials.GLAZED_GOLD, 6f, -3.0f, tool())); public static final SwordItem GLAZED_GOLD_SWORD = add("glazed_gold_sword", new SwordItem(ParadiseLostToolMaterials.GLAZED_GOLD, 3, -2.4f, tool())); - public static final HoeItem GLAZED_GOLD_HOE = add("glazed_gold_hoe", new ParadiseLostHoeItem(ParadiseLostToolMaterials.GLAZED_GOLD, 0, -3.0f, tool())); + public static final HoeItem GLAZED_GOLD_HOE = add("glazed_gold_hoe", new ParadiseLostHoeItem(ParadiseLostToolMaterials.GLAZED_GOLD, -2, -2.0f, tool())); public static final TrinketItem CLOUD_PARACHUTE = add("cold_parachute", new ParachuteTrinketItem(unstackableTool, "cloud_parachute")); public static final TrinketItem GOLDEN_CLOUD_PARACHUTE = add("golden_parachute", new ParachuteTrinketItem(tool().maxCount(1).maxDamage(20), "golden_parachute")); public static final CherineBloodstoneItem CHERINE_BLOODSTONE = add("cherine_bloodstone", new CherineBloodstoneItem(unstackableTool)); public static final OlviteBloodstoneItem OLVITE_BLOODSTONE = add("olvite_bloodstone", new OlviteBloodstoneItem(unstackableTool)); + public static final SurtrumBloodstoneItem SURTRUM_BLOODSTONE = add("surtrum_bloodstone", new SurtrumBloodstoneItem(unstackableTool)); public static final AbstentineBloodstoneItem ABSTENTINE_BLOODSTONE = add("abstentine_bloodstone", new AbstentineBloodstoneItem(unstackableTool)); public static final Item GLAZED_GOLD_UPGRADE = add("glazed_gold_upgrade_smithing_template", new Item(tool())); @@ -169,7 +182,6 @@ private static Settings misc() { */ public static final SpawnEggItem HELLENROSE_SPAWN_EGG = add("hellenrose_spawn_egg", new SpawnEggItem(ParadiseLostEntityTypes.HELLENROSE, 0x97DED4, 0x31897D, misc), spawnEggBehavior); - // public static final SpawnEggItem CHEST_MIMIC_SPAWN_EGG = null; public static final SpawnEggItem PARADISE_HARE_SPAWN_EGG = add("corsican_hare_spawn_egg", new SpawnEggItem(ParadiseLostEntityTypes.PARADISE_HARE, 0xC5D6ED, 0x82A6D9, misc), spawnEggBehavior); public static final SpawnEggItem MOA_SPAWN_EGG = add("moa_spawn_egg", new SpawnEggItem(ParadiseLostEntityTypes.MOA, 0xC55C2E4, 0xB3A8BB, misc), spawnEggBehavior); @@ -203,9 +215,11 @@ private static FabricItemSettings building_block() { // ores public static final BlockItem CHERINE_ORE = add("cherine_ore", ParadiseLostBlocks.CHERINE_ORE, building_block); public static final BlockItem OLVITE_ORE = add("olvite_ore", ParadiseLostBlocks.OLVITE_ORE, building_block); + public static final BlockItem SURTRUM = add("surtrum", ParadiseLostBlocks.SURTRUM, building_block); // ore blocks public static final BlockItem CHERINE_BLOCK = add("cherine_block", ParadiseLostBlocks.CHERINE_BLOCK, building_block, fuel(5000)); public static final BlockItem OLVITE_BLOCK = add("olvite_block", ParadiseLostBlocks.OLVITE_BLOCK, building_block); + public static final BlockItem REFINED_SURTRUM_BLOCK = add("refined_surtrum_block", ParadiseLostBlocks.REFINED_SURTRUM_BLOCK, building_block); // move this somewhere else public static final BlockItem LEVITATOR = add("levitator", ParadiseLostBlocks.LEVITATOR, building_block); // logs diff --git a/src/main/java/net/id/paradiselost/items/tools/ParadiseLostToolMaterials.java b/src/main/java/net/id/paradiselost/items/tools/ParadiseLostToolMaterials.java index 428767c4e..ab1e5439a 100644 --- a/src/main/java/net/id/paradiselost/items/tools/ParadiseLostToolMaterials.java +++ b/src/main/java/net/id/paradiselost/items/tools/ParadiseLostToolMaterials.java @@ -10,6 +10,8 @@ public class ParadiseLostToolMaterials { public static final ToolMaterial OLVITE = ToolMaterialsAccessor.callInit("PARADISE_LOST_OLVITE", -1, MiningLevels.IRON, 250, 4.5f, 2f, 14, IngredientUtil.itemIngredient(ParadiseLostItems.OLVITE)); + public static final ToolMaterial SURTRUM = ToolMaterialsAccessor.callInit("PARADISE_LOST_SURTRUM", -1, + MiningLevels.DIAMOND, 827, 7.0f, 3f, 16, IngredientUtil.itemIngredient(ParadiseLostItems.OLVITE)); public static final ToolMaterial GLAZED_GOLD = ToolMaterialsAccessor.callInit("PARADISE_LOST_GLAZED_GOLD", -1, MiningLevels.IRON, 131, 12f, 2f, 22, IngredientUtil.itemIngredient(ParadiseLostItems.GOLDEN_AMBER)); diff --git a/src/main/java/net/id/paradiselost/items/tools/bloodstone/GravititeBloodstoneItem.java b/src/main/java/net/id/paradiselost/items/tools/bloodstone/SurtrumBloodstoneItem.java similarity index 67% rename from src/main/java/net/id/paradiselost/items/tools/bloodstone/GravititeBloodstoneItem.java rename to src/main/java/net/id/paradiselost/items/tools/bloodstone/SurtrumBloodstoneItem.java index 42bdcbe5d..0af505805 100644 --- a/src/main/java/net/id/paradiselost/items/tools/bloodstone/GravititeBloodstoneItem.java +++ b/src/main/java/net/id/paradiselost/items/tools/bloodstone/SurtrumBloodstoneItem.java @@ -6,13 +6,13 @@ import java.util.List; -public class GravititeBloodstoneItem extends BloodstoneItem { - public GravititeBloodstoneItem(Settings settings) { +public class SurtrumBloodstoneItem extends BloodstoneItem { + public SurtrumBloodstoneItem(Settings settings) { super(settings); } @Override protected List getDefaultText() { - return ImmutableList.of(Text.translatable("info.paradise_lost.bloodstone.gravitite").formatted(Formatting.GOLD)); + return ImmutableList.of(Text.translatable("info.paradise_lost.bloodstone.surtrum").formatted(Formatting.GOLD)); } } diff --git a/src/main/resources/assets/paradise_lost/blockstates/refined_surtrum_block.json b/src/main/resources/assets/paradise_lost/blockstates/refined_surtrum_block.json new file mode 100644 index 000000000..103d97d32 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/blockstates/refined_surtrum_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "paradise_lost:block/refined_surtrum_block" + } + } +} diff --git a/src/main/resources/assets/paradise_lost/blockstates/surtrum.json b/src/main/resources/assets/paradise_lost/blockstates/surtrum.json new file mode 100644 index 000000000..4278905c7 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/blockstates/surtrum.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "paradise_lost:block/surtrum" + } + } +} 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 9d804ab4a..d991bf068 100644 --- a/src/main/resources/assets/paradise_lost/lang/en_us.json +++ b/src/main/resources/assets/paradise_lost/lang/en_us.json @@ -225,8 +225,10 @@ "block.paradise_lost.cherine_ore": "Cherine Ore", "block.paradise_lost.olvite_ore": "Olvite Ore", + "block.paradise_lost.surtrum": "Surtrum", "block.paradise_lost.cherine_block": "Block of Cherine", "block.paradise_lost.olvite_block": "Block of Olvite", + "block.paradise_lost.refined_surtrum_block": "Block of Refined Surtrum", "block.paradise_lost.levitator": "Cloud Levitator", "block.paradise_lost.olvite_chain": "Olvite Chain", @@ -269,6 +271,8 @@ "item.paradise_lost.cherine": "Cherine Shard", "item.paradise_lost.olvite": "Olvite", "item.paradise_lost.olvite_nugget": "Olvite Nugget", + "item.paradise_lost.refined_surtrum": "Refined Surtrum", + "item.paradise_lost.raw_surtrum": "Surtrum Fragment", "item.paradise_lost.flax_thread" : "Flax Thread", "item.paradise_lost.flaxweave" : "Flaxweave", "item.paradise_lost.swedroot_pulp": "Swedroot Pulp", @@ -279,6 +283,12 @@ "item.paradise_lost.olvite_sword": "Olvite Sword", "item.paradise_lost.olvite_hoe": "Olvite Hoe", + "item.paradise_lost.surtrum_shovel": "Surtrum Shovel", + "item.paradise_lost.surtrum_pickaxe": "Surtrum Pickaxe", + "item.paradise_lost.surtrum_axe": "Surtrum Axe", + "item.paradise_lost.surtrum_sword": "Surtrum Sword", + "item.paradise_lost.surtrum_hoe": "Surtrum Hoe", + "item.paradise_lost.glazed_gold_shovel": "Glazed Gold Shovel", "item.paradise_lost.glazed_gold_pickaxe": "Glazed Gold Pickaxe", "item.paradise_lost.glazed_gold_axe": "Glazed Gold Axe", @@ -290,6 +300,7 @@ "item.paradise_lost.cherine_bloodstone": "Cherine Bloodstone", "item.paradise_lost.olvite_bloodstone": "Olvite Bloodstone", + "item.paradise_lost.surtrum_bloodstone": "Surtrum Bloodstone", "item.paradise_lost.abstentine_bloodstone": "Abstentine Bloodstone", "item.paradise_lost.glazed_gold_upgrade_smithing_template": "Glazed Gold Upgrade", @@ -414,7 +425,7 @@ "info.paradise_lost.bloodstone.cherine": "Peer into the heart", "info.paradise_lost.bloodstone.olvite": "Peer into the mind", - "info.paradise_lost.bloodstone.unimplemented": "Peer into the will", + "info.paradise_lost.bloodstone.surtrum": "Peer into the will", "info.paradise_lost.bloodstone.abstentine": "Peer into the soul", diff --git a/src/main/resources/assets/paradise_lost/models/block/refined_surtrum_block.json b/src/main/resources/assets/paradise_lost/models/block/refined_surtrum_block.json new file mode 100644 index 000000000..ff30d22bd --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/block/refined_surtrum_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "paradise_lost:block/refined_surtrum_block" + } +} diff --git a/src/main/resources/assets/paradise_lost/models/block/surtrum.json b/src/main/resources/assets/paradise_lost/models/block/surtrum.json new file mode 100644 index 000000000..168564cfc --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/block/surtrum.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "paradise_lost:block/surtrum" + } +} diff --git a/src/main/resources/assets/paradise_lost/models/item/glazed_gold_fishing_rod.json b/src/main/resources/assets/paradise_lost/models/item/glazed_gold_fishing_rod.json new file mode 100644 index 000000000..5411ae381 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/item/glazed_gold_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "parent": "item/handheld_rod", + "textures": { + "layer0": "paradise_lost:item/glazed_gold_fishing_rod" + }, + "overrides": [ + { + "predicate": { + "cast": 1 + }, + "model": "paradise_lost:item/glazed_gold_fishing_rod_cast" + } + ] +} diff --git a/src/main/resources/assets/paradise_lost/models/item/glazed_gold_fishing_rod_cast.json b/src/main/resources/assets/paradise_lost/models/item/glazed_gold_fishing_rod_cast.json new file mode 100644 index 000000000..06ff70add --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/item/glazed_gold_fishing_rod_cast.json @@ -0,0 +1,6 @@ +{ + "parent": "item/fishing_rod", + "textures": { + "layer0": "paradise_lost:item/glazed_gold_fishing_rod_cast" + } +} diff --git a/src/main/resources/assets/paradise_lost/models/item/raw_surtrum.json b/src/main/resources/assets/paradise_lost/models/item/raw_surtrum.json new file mode 100644 index 000000000..1f5964b99 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/item/raw_surtrum.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "paradise_lost:item/raw_surtrum" + } +} diff --git a/src/main/resources/assets/paradise_lost/models/item/refined_surtrum.json b/src/main/resources/assets/paradise_lost/models/item/refined_surtrum.json new file mode 100644 index 000000000..b8a606422 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/item/refined_surtrum.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "paradise_lost:item/refined_surtrum" + } +} diff --git a/src/main/resources/assets/paradise_lost/models/item/refined_surtrum_block.json b/src/main/resources/assets/paradise_lost/models/item/refined_surtrum_block.json new file mode 100644 index 000000000..2493d777e --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/item/refined_surtrum_block.json @@ -0,0 +1,3 @@ +{ + "parent": "paradise_lost:block/refined_surtrum_block" +} diff --git a/src/main/resources/assets/paradise_lost/models/item/surtrum.json b/src/main/resources/assets/paradise_lost/models/item/surtrum.json new file mode 100644 index 000000000..9fae3ef7f --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/item/surtrum.json @@ -0,0 +1,3 @@ +{ + "parent": "paradise_lost:block/surtrum" +} diff --git a/src/main/resources/assets/paradise_lost/models/item/surtrum_axe.json b/src/main/resources/assets/paradise_lost/models/item/surtrum_axe.json new file mode 100644 index 000000000..b792caea5 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/item/surtrum_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "paradise_lost:item/surtrum_axe" + } +} diff --git a/src/main/resources/assets/paradise_lost/models/item/surtrum_bloodstone.json b/src/main/resources/assets/paradise_lost/models/item/surtrum_bloodstone.json new file mode 100644 index 000000000..7d9f279a3 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/item/surtrum_bloodstone.json @@ -0,0 +1,6 @@ +{ + "parent": "paradise_lost:item/handheld_small", + "textures": { + "layer0": "paradise_lost:item/surtrum_bloodstone" + } +} diff --git a/src/main/resources/assets/paradise_lost/models/item/surtrum_hoe.json b/src/main/resources/assets/paradise_lost/models/item/surtrum_hoe.json new file mode 100644 index 000000000..05c2d9485 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/item/surtrum_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "paradise_lost:item/surtrum_hoe" + } +} diff --git a/src/main/resources/assets/paradise_lost/models/item/surtrum_pickaxe.json b/src/main/resources/assets/paradise_lost/models/item/surtrum_pickaxe.json new file mode 100644 index 000000000..7a7bf9a69 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/item/surtrum_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "paradise_lost:item/surtrum_pickaxe" + } +} diff --git a/src/main/resources/assets/paradise_lost/models/item/surtrum_shovel.json b/src/main/resources/assets/paradise_lost/models/item/surtrum_shovel.json new file mode 100644 index 000000000..c16547663 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/item/surtrum_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "paradise_lost:item/surtrum_shovel" + } +} diff --git a/src/main/resources/assets/paradise_lost/models/item/surtrum_sword.json b/src/main/resources/assets/paradise_lost/models/item/surtrum_sword.json new file mode 100644 index 000000000..aec9b543f --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/item/surtrum_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "paradise_lost:item/surtrum_sword" + } +} diff --git a/src/main/resources/assets/paradise_lost/textures/block/surtrum.png b/src/main/resources/assets/paradise_lost/textures/block/surtrum.png new file mode 100644 index 0000000000000000000000000000000000000000..581a7459f04d4ce6210ae7ff5d5ed6feb6ad4309 GIT binary patch literal 722 zcmV;@0xkWCP)Px%j7da6R7i>CmcMS(P!z_04o0LTMXt(VA$#!PAwszs`UYLHeRGKBAu(y^yeznxeCn~ALr_yUy!9SjjcKRXUoq=6Q5#ufl4BJ#U)u9 z1E7)!Z?zHtxeCpMmhW-0Sbi#o%Srw73+%B+6CWfT2~j1H&eFK_v_rP|UeGJ9+)T;Rn0M6)xFEU_*}%Ddt2S#a*lj=$nt|!FH_Xyl;|{iW$Z1-@kdaL-Fkvfa~!sDv7whhus$y zzP=2QO$N3pu5<~ zLeug+8e4M!_VkSIv`#U+EGtpu+bgaZGy{&kD!t;Wl)psOKVQmPqBOj!Br*jgbh@a! zOjYdF?c5}EsRNrWJ55j2)YzIYi^BpiS0Q_PM*DPJN@LIr9wh%GKM)1lG9EO8$NNEd zvhD}%)1UZ((DXfD4Sh`lwS|ld*&@8+o}3wOi6IsJ1c% zL)0Pxb?YL6*jb!cnJY-UW5JZNZg56h9Eke%lWux5xT{FQCEP zOqRh1DrD5D@%q!l1eXn8Dz3lMdzQu&tATrZ#{St3x!Ok9l0UeK$gKq%P#ZiPkx6^Q z&Ig<82lBI#v72>1_&0uF*USc<51!-)w%7gD^MTFAcQD{GEll2JQ~&?~07*qoM6N<$ Ef;_ra(9zsrroyPR^-abiz|u^7^bA8`KS4B|0c~7zu=urZxWZc`i<7t=fbxCooV~JIC#T% g+u#U`mi1@Er)zB#*S))c9nifDp00i_>zopr0Bx695dZ)H literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/paradise_lost/textures/item/glazed_gold_fishing_rod_cast.png b/src/main/resources/assets/paradise_lost/textures/item/glazed_gold_fishing_rod_cast.png new file mode 100644 index 0000000000000000000000000000000000000000..1149a11254a471ba6a2eb52bcdd9c8693a218fb3 GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|=6Jd|hFJ6- zy|9t@kbwZ}1^FWk%aU5AluQvjt-u`FENaw{J-tIUNVc`v$jRw2%fAr8j;0f4O{?F( z{BQk0-g%Oe6T^(<56ZS5cv{u(FD6*E_{4*VsSoluUOjR6aOTv$y@8oKw2Xl~?{98L z6B#5XOUg*fto?T<;aeZSbn7zqTYts2e=aoIP;vCN>V+>3cNa?JuiyRrT*}uM?X}5r YZ2C1{KR6km2fCBN)78&qol`;+0L7zSR{#J2 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/paradise_lost/textures/item/raw_surtrum.png b/src/main/resources/assets/paradise_lost/textures/item/raw_surtrum.png new file mode 100644 index 0000000000000000000000000000000000000000..3f1f8ab037a06220a159ea85023d417f0bd64819 GIT binary patch literal 377 zcmV-<0fzpGP)Px$Gf6~2R5*>rk+DhxK@f(&lLS08g;o}~fh!g{gu8dJjSrB*wTO`3GCqJ77HVN* zVUuUD(86~}K!T(YjD>}0aYBka7z^2R??|GR{?*Rx%(pZD!hg%FCX7}B&>v4cH+FNb zmS#~SKO+tUapTj?w^D8{V32>++-8Ze zamTm5bek#L_iMBpx%I-E2XLn$sd>d}NzG%B3&Y3f-vI#PFeoLf&5HmfP(?rW{INa( X<~4ZRW-JPh00000NkvXXu0mjf4l$r8 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/paradise_lost/textures/item/refined_surtrum.png b/src/main/resources/assets/paradise_lost/textures/item/refined_surtrum.png new file mode 100644 index 0000000000000000000000000000000000000000..95b82d143a14e880ebe31dcfc8a5091dd23e7479 GIT binary patch literal 386 zcmV-|0e$|7P)Px$JV``BR5*>rlP_<=Kp4iKBW=@y%%kHBL10GJ8NJ-;W<`(6(C@5Q<^59t}twx8|b_%1qNv|w=|IuO0Kkgd1!yN7~ z$E$XPXPL6iia~N#v7SvECdPOIV?2>5A|d%(3-;3^Im+d@8XYPo>)8|`)8G1nv1i?`lB0=~( zDiwqJyOMWJ@zy_Ke(E=d=_m|-nn|`-yJvoyp_oM-EWxb_WRj&lKyp?Q2|~QtwK83Q gflB+%Kl7*c3x0igMBr3+bpQYW07*qoM6N<$f^!9=&j0`b literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/paradise_lost/textures/item/surtrum_axe.png b/src/main/resources/assets/paradise_lost/textures/item/surtrum_axe.png new file mode 100644 index 0000000000000000000000000000000000000000..ae84e37c9d78d04eebcb9817020a3e7958b7025d GIT binary patch literal 331 zcmV-R0kr;!P)Px$1xZ9fR5*=eV4x5%5>n8nC-EPdfBicv!{XbI3F?Du{(o=<1W!o*|Hg;=f2^wP zf5JMEH1E_E_}``{@jq5o_P?H@42EVVLI#~>ROX zAY605`a1?q&fj<)&%nUIz>uAi`Typn>;JP;GXFC$FfiyT%KYD{EAapSgyjF|(MwP> z%m6(_8NyMCO*7FTJ0&USG@P3A=bEXrQT#*fUG`L9Fh8jp4dsXaB3K{QqBHaPHsm!6Q2@FKka zxWXHug97HI;>`2+@-qX$;VYJxB_$;!BqBaYZus#n*^P~jt*yI0<)6FFty2PrKQ=$y zyjJ<}zr(*fiy5VUoIh~jz=Gu(hk?|Af|vhS)!QWNG*`f0DP&;KmvSaRl`yf(+r!#LR=RY`1(KkFD;*UsIi&b;jw7jOLm6qM{_JUthjs| P7!VAeu6{1-oD!MPx$5J^NqR5*=eU>In?h)u9fPvSo|@v2KN7-4ePzq2wdzWtby1((T{N!|<$hOP_@ z3=9l!yOSBtK4fKxRh9j3{Qon9vHWiar>lbaoffMq`(IB{=05`i!+!<_hX1juvj2DL z3jEhol=7(f|Me literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/paradise_lost/textures/item/surtrum_shovel.png b/src/main/resources/assets/paradise_lost/textures/item/surtrum_shovel.png new file mode 100644 index 0000000000000000000000000000000000000000..cf02965ba6a01a95a26a9df6b133f206c5472093 GIT binary patch literal 299 zcmV+`0o4A9P)Px#In?NUXv(J&FJ5VpW%3FtQMPx$T1iAfR5*>5lQByIVI0PP7Z+S;a5_17gu@XHcMd{ZgDovCK{RboV`(J-LjhN!{_Utl-g0Un#*=G z0>E=;+SwQIlv8UX?0#G}Rz_?$BbnG63KI}sN^ z>_l9={eR4qav_(O^j4a^gMI3j4nRZEXbqOmQrD6pKZw)hh6FZBJjqbLai< z2xU7a-AqVsFK?uf%TGpL=m>bPYn&wTPg?>w>4&MgDvoIc<@pBOB%eAMqEy-d0000< KMNUMnLSTX}X|>G& literal 0 HcmV?d00001 diff --git a/src/main/resources/data/paradise_lost/loot_tables/blocks/refined_surtrum_block.json b/src/main/resources/data/paradise_lost/loot_tables/blocks/refined_surtrum_block.json new file mode 100644 index 000000000..38c92184d --- /dev/null +++ b/src/main/resources/data/paradise_lost/loot_tables/blocks/refined_surtrum_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:refined_surtrum_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/data/paradise_lost/loot_tables/blocks/surtrum.json b/src/main/resources/data/paradise_lost/loot_tables/blocks/surtrum.json new file mode 100644 index 000000000..0b0b3f6a0 --- /dev/null +++ b/src/main/resources/data/paradise_lost/loot_tables/blocks/surtrum.json @@ -0,0 +1,49 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "paradise_lost:surtrum" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "paradise_lost:raw_surtrum" + } + ] + } + ] + } + ] +} diff --git a/src/main/resources/data/paradise_lost/tags/blocks/mineable_by_pickaxe.json b/src/main/resources/data/paradise_lost/tags/blocks/mineable_by_pickaxe.json index 4b9b708b2..88a2ee5d3 100644 --- a/src/main/resources/data/paradise_lost/tags/blocks/mineable_by_pickaxe.json +++ b/src/main/resources/data/paradise_lost/tags/blocks/mineable_by_pickaxe.json @@ -8,7 +8,6 @@ "paradise_lost:olvite_chain", "paradise_lost:levitator", "paradise_lost:vitroulite", - "paradise_lost:cherine_block", "paradise_lost:golden_amber_tile", "paradise_lost:golden_amber_tile_slab", "paradise_lost:golden_amber_tile_stairs" diff --git a/src/main/resources/data/paradise_lost/tags/blocks/ore_blocks.json b/src/main/resources/data/paradise_lost/tags/blocks/ore_blocks.json index d9afeda1a..461bd5f79 100644 --- a/src/main/resources/data/paradise_lost/tags/blocks/ore_blocks.json +++ b/src/main/resources/data/paradise_lost/tags/blocks/ore_blocks.json @@ -1,6 +1,8 @@ { "replace": false, "values": [ - "paradise_lost:olvite_block" + "paradise_lost:cherine_block", + "paradise_lost:olvite_block", + "paradise_lost:refined_surtrum_block" ] } diff --git a/src/main/resources/data/paradise_lost/tags/blocks/ores.json b/src/main/resources/data/paradise_lost/tags/blocks/ores.json index 6dbd51708..96a2d46a9 100644 --- a/src/main/resources/data/paradise_lost/tags/blocks/ores.json +++ b/src/main/resources/data/paradise_lost/tags/blocks/ores.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "paradise_lost:cherine_ore", - "paradise_lost:olvite_ore" + "paradise_lost:olvite_ore", + "paradise_lost:surtrum" ] } diff --git a/src/main/resources/data/paradise_lost/tags/blocks/requires_iron_tool.json b/src/main/resources/data/paradise_lost/tags/blocks/requires_iron_tool.json index d275da3f4..8a4da7c03 100644 --- a/src/main/resources/data/paradise_lost/tags/blocks/requires_iron_tool.json +++ b/src/main/resources/data/paradise_lost/tags/blocks/requires_iron_tool.json @@ -1,5 +1,6 @@ { "replace": false, "values": [ + "paradise_lost:surtrum" ] } From 39c3359d7d19e2d72775ac32ebcc05c55212081a Mon Sep 17 00:00:00 2001 From: Maxx <53229958+MBatt1@users.noreply.github.com> Date: Fri, 7 Apr 2023 13:27:56 -0500 Subject: [PATCH 2/9] lots surtrum recipes, loot tables, metamorphic stone, floating fixes, levitator recipe chiseled floestone --- .../blocks/ParadiseLostBlocks.java | 6 ++++-- .../paradiselost/items/ParadiseLostItems.java | 2 ++ .../blockstates/chiseled_floestone.json | 7 ++++++ .../blockstates/metamorphic_shell.json | 7 ++++++ .../assets/paradise_lost/lang/en_us.json | 4 +++- .../models/block/chiseled_floestone.json | 6 ++++++ ...urel_plank.json => metamorphic_shell.json} | 2 +- .../models/item/chiseled_floestone.json | 3 +++ .../models/item/metamorphic_shell.json | 3 +++ .../textures/block/chiseled_floestone.png | Bin 0 -> 482 bytes .../textures/block/levitator_side.png | Bin 506 -> 476 bytes .../textures/block/metamorphic_shell.png | Bin 0 -> 433 bytes .../textures/block/refined_surtrum_block.png | Bin 0 -> 360 bytes .../tags/blocks/needs_diamond_tool.json | 10 +++++++++ .../blocks/chiseled_floestone.json | 20 ++++++++++++++++++ .../loot_tables/blocks/metamorphic_shell.json | 20 ++++++++++++++++++ .../recipes/chiseled_floestone.json | 15 +++++++++++++ ...one_from_floestone_brick_stonecutting.json | 8 +++++++ ...floestone_from_floestone_stonecutting.json | 8 +++++++ .../data/paradise_lost/recipes/levitator.json | 7 ++---- .../recipes/refined_surtrum.json | 12 +++++++++++ .../recipes/refined_surtrum_block.json | 16 ++++++++++++++ .../recipes/refined_surtrum_from_raw.json | 15 +++++++++++++ .../data/paradise_lost/recipes/surtrum.json | 15 +++++++++++++ .../paradise_lost/recipes/surtrum_axe.json | 19 +++++++++++++++++ .../recipes/surtrum_bloodstone.json | 18 ++++++++++++++++ .../paradise_lost/recipes/surtrum_hoe.json | 19 +++++++++++++++++ .../recipes/surtrum_pickaxe.json | 19 +++++++++++++++++ .../paradise_lost/recipes/surtrum_shovel.json | 19 +++++++++++++++++ .../paradise_lost/recipes/surtrum_sword.json | 19 +++++++++++++++++ .../tags/blocks/mineable_by_pickaxe.json | 3 ++- .../tags/blocks/requires_diamond_tool.json | 5 +++++ .../tags/blocks/stone_blocks.json | 3 ++- 33 files changed, 299 insertions(+), 11 deletions(-) create mode 100644 src/main/resources/assets/paradise_lost/blockstates/chiseled_floestone.json create mode 100644 src/main/resources/assets/paradise_lost/blockstates/metamorphic_shell.json create mode 100644 src/main/resources/assets/paradise_lost/models/block/chiseled_floestone.json rename src/main/resources/assets/paradise_lost/models/block/{aurel_plank.json => metamorphic_shell.json} (51%) create mode 100644 src/main/resources/assets/paradise_lost/models/item/chiseled_floestone.json create mode 100644 src/main/resources/assets/paradise_lost/models/item/metamorphic_shell.json create mode 100644 src/main/resources/assets/paradise_lost/textures/block/chiseled_floestone.png create mode 100644 src/main/resources/assets/paradise_lost/textures/block/metamorphic_shell.png create mode 100644 src/main/resources/assets/paradise_lost/textures/block/refined_surtrum_block.png create mode 100644 src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json create mode 100644 src/main/resources/data/paradise_lost/loot_tables/blocks/chiseled_floestone.json create mode 100644 src/main/resources/data/paradise_lost/loot_tables/blocks/metamorphic_shell.json create mode 100644 src/main/resources/data/paradise_lost/recipes/chiseled_floestone.json create mode 100644 src/main/resources/data/paradise_lost/recipes/chiseled_floestone_from_floestone_brick_stonecutting.json create mode 100644 src/main/resources/data/paradise_lost/recipes/chiseled_floestone_from_floestone_stonecutting.json create mode 100644 src/main/resources/data/paradise_lost/recipes/refined_surtrum.json create mode 100644 src/main/resources/data/paradise_lost/recipes/refined_surtrum_block.json create mode 100644 src/main/resources/data/paradise_lost/recipes/refined_surtrum_from_raw.json create mode 100644 src/main/resources/data/paradise_lost/recipes/surtrum.json create mode 100644 src/main/resources/data/paradise_lost/recipes/surtrum_axe.json create mode 100644 src/main/resources/data/paradise_lost/recipes/surtrum_bloodstone.json create mode 100644 src/main/resources/data/paradise_lost/recipes/surtrum_hoe.json create mode 100644 src/main/resources/data/paradise_lost/recipes/surtrum_pickaxe.json create mode 100644 src/main/resources/data/paradise_lost/recipes/surtrum_shovel.json create mode 100644 src/main/resources/data/paradise_lost/recipes/surtrum_sword.json create mode 100644 src/main/resources/data/paradise_lost/tags/blocks/requires_diamond_tool.json diff --git a/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java b/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java index baef38926..2de311579 100644 --- a/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java +++ b/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java @@ -114,6 +114,7 @@ private static Settings floestoneBrick() { } public static final Block FLOESTONE_BRICK = add("floestone_brick", new Block(floestoneBrick())); + public static final Block CHISELED_FLOESTONE = add("chiseled_floestone", new Block(floestoneBrick())); public static final SlabBlock FLOESTONE_BRICK_SLAB = add("floestone_brick_slab", new SlabBlock(floestoneBrick())); public static final ParadiseLostStairsBlock FLOESTONE_BRICK_STAIRS = add("floestone_brick_stairs", new ParadiseLostStairsBlock(FLOESTONE_BRICK.getDefaultState(), floestoneBrick())); public static final WallBlock FLOESTONE_BRICK_WALL = add("floestone_brick_wall", new WallBlock(floestoneBrick())); @@ -351,10 +352,11 @@ private static Settings flower() { // Ores public static final OreBlock CHERINE_ORE = add("cherine_ore", new OreBlock(of(Material.STONE).requiresTool().strength(3f), UniformIntProvider.create(0, 2))); public static final OreBlock OLVITE_ORE = add("olvite_ore", new OreBlock(of(Material.STONE).requiresTool().strength(3f), UniformIntProvider.create(1, 3))); - public static final OreBlock SURTRUM = add("surtrum", new SurtrumOreBlock(of(Material.STONE).sounds(BlockSoundGroup.NETHER_GOLD_ORE).requiresTool().strength(9f, 12f), UniformIntProvider.create(2, 5))); + public static final OreBlock SURTRUM = add("surtrum", new SurtrumOreBlock(of(Material.STONE).sounds(BlockSoundGroup.NETHER_GOLD_ORE).requiresTool().strength(9f, 20f), UniformIntProvider.create(2, 5))); + public static final Block METAMORPHIC_SHELL = add("metamorphic_shell", new Block(of(Material.STONE).sounds(BlockSoundGroup.STONE).requiresTool().strength(40f, 15f))); public static final Block CHERINE_BLOCK = add("cherine_block", new Block(of(Material.METAL).requiresTool().strength(3f, -1f).sounds(BlockSoundGroup.STONE))); public static final Block OLVITE_BLOCK = add("olvite_block", new Block(of(Material.METAL).requiresTool().strength(3f, -1f).sounds(BlockSoundGroup.METAL))); - public static final Block REFINED_SURTRUM_BLOCK = add("refined_surtrum_block", new Block(of(Material.METAL).requiresTool().strength(4f, -1f).sounds(BlockSoundGroup.METAL))); + public static final FloatingBlock REFINED_SURTRUM_BLOCK = add("refined_surtrum_block", new FloatingBlock(false, of(Material.METAL).requiresTool().strength(4f, -1f).sounds(BlockSoundGroup.METAL))); // Misc public static final FloatingBlock LEVITATOR = add("levitator", new FloatingBlock(true, of(Material.WOOD).strength(3f, 3f).sounds(BlockSoundGroup.WOOD))); public static final ChainBlock OLVITE_CHAIN = add("olvite_chain", new ChainBlock(copy(CHAIN)), cutoutMippedRenderLayer); diff --git a/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java b/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java index 038517378..4c1b18e28 100644 --- a/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java +++ b/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java @@ -216,6 +216,7 @@ private static FabricItemSettings building_block() { public static final BlockItem CHERINE_ORE = add("cherine_ore", ParadiseLostBlocks.CHERINE_ORE, building_block); public static final BlockItem OLVITE_ORE = add("olvite_ore", ParadiseLostBlocks.OLVITE_ORE, building_block); public static final BlockItem SURTRUM = add("surtrum", ParadiseLostBlocks.SURTRUM, building_block); + public static final BlockItem METAMORPHIC_SHELL = add("metamorphic_shell", ParadiseLostBlocks.METAMORPHIC_SHELL, building_block); // ore blocks public static final BlockItem CHERINE_BLOCK = add("cherine_block", ParadiseLostBlocks.CHERINE_BLOCK, building_block, fuel(5000)); public static final BlockItem OLVITE_BLOCK = add("olvite_block", ParadiseLostBlocks.OLVITE_BLOCK, building_block); @@ -258,6 +259,7 @@ private static FabricItemSettings building_block() { // bricks 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 CARVED_STONE = add("carved_stone", ParadiseLostBlocks.CARVED_STONE, building_block); public static final BlockItem MOSSY_CARVED_STONE = add("mossy_carved_stone", ParadiseLostBlocks.MOSSY_CARVED_STONE, building_block); public static final BlockItem CRACKED_CARVED_STONE = add("cracked_carved_stone", ParadiseLostBlocks.CRACKED_CARVED_STONE, building_block); diff --git a/src/main/resources/assets/paradise_lost/blockstates/chiseled_floestone.json b/src/main/resources/assets/paradise_lost/blockstates/chiseled_floestone.json new file mode 100644 index 000000000..1ea272e4f --- /dev/null +++ b/src/main/resources/assets/paradise_lost/blockstates/chiseled_floestone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "paradise_lost:block/chiseled_floestone" + } + } +} diff --git a/src/main/resources/assets/paradise_lost/blockstates/metamorphic_shell.json b/src/main/resources/assets/paradise_lost/blockstates/metamorphic_shell.json new file mode 100644 index 000000000..a8bf18f8f --- /dev/null +++ b/src/main/resources/assets/paradise_lost/blockstates/metamorphic_shell.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "paradise_lost:block/metamorphic_shell" + } + } +} 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 d991bf068..5fb1abfc1 100644 --- a/src/main/resources/assets/paradise_lost/lang/en_us.json +++ b/src/main/resources/assets/paradise_lost/lang/en_us.json @@ -59,6 +59,7 @@ "block.paradise_lost.mossy_floestone_wall": "Mossy Cobbled Floestone Wall", "block.paradise_lost.floestone_brick": "Floestone Brick", + "block.paradise_lost.chiseled_floestone": "Chiseled Floestone Brick", "block.paradise_lost.floestone_brick_slab": "Floestone Brick Slab", "block.paradise_lost.floestone_brick_stairs": "Floestone Brick Stairs", "block.paradise_lost.floestone_brick_wall": "Floestone Brick Wall", @@ -226,11 +227,12 @@ "block.paradise_lost.cherine_ore": "Cherine Ore", "block.paradise_lost.olvite_ore": "Olvite Ore", "block.paradise_lost.surtrum": "Surtrum", + "block.paradise_lost.metamorphic_shell": "Metamorphic Shell", "block.paradise_lost.cherine_block": "Block of Cherine", "block.paradise_lost.olvite_block": "Block of Olvite", "block.paradise_lost.refined_surtrum_block": "Block of Refined Surtrum", - "block.paradise_lost.levitator": "Cloud Levitator", + "block.paradise_lost.levitator": "Surtrum Levitator", "block.paradise_lost.olvite_chain": "Olvite Chain", "block.paradise_lost.cherine_lantern": "Cherine Lantern", "block.paradise_lost.blue_portal": "Paradise Portal", diff --git a/src/main/resources/assets/paradise_lost/models/block/chiseled_floestone.json b/src/main/resources/assets/paradise_lost/models/block/chiseled_floestone.json new file mode 100644 index 000000000..2642a0f26 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/block/chiseled_floestone.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "paradise_lost:block/chiseled_floestone" + } +} diff --git a/src/main/resources/assets/paradise_lost/models/block/aurel_plank.json b/src/main/resources/assets/paradise_lost/models/block/metamorphic_shell.json similarity index 51% rename from src/main/resources/assets/paradise_lost/models/block/aurel_plank.json rename to src/main/resources/assets/paradise_lost/models/block/metamorphic_shell.json index c899b793e..1eee9623a 100644 --- a/src/main/resources/assets/paradise_lost/models/block/aurel_plank.json +++ b/src/main/resources/assets/paradise_lost/models/block/metamorphic_shell.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "paradise_lost:block/aurel_plank" + "all": "paradise_lost:block/metamorphic_shell" } } diff --git a/src/main/resources/assets/paradise_lost/models/item/chiseled_floestone.json b/src/main/resources/assets/paradise_lost/models/item/chiseled_floestone.json new file mode 100644 index 000000000..f58fedb8a --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/item/chiseled_floestone.json @@ -0,0 +1,3 @@ +{ + "parent": "paradise_lost:block/chiseled_floestone" +} diff --git a/src/main/resources/assets/paradise_lost/models/item/metamorphic_shell.json b/src/main/resources/assets/paradise_lost/models/item/metamorphic_shell.json new file mode 100644 index 000000000..8b6b27ff8 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/item/metamorphic_shell.json @@ -0,0 +1,3 @@ +{ + "parent": "paradise_lost:block/metamorphic_shell" +} diff --git a/src/main/resources/assets/paradise_lost/textures/block/chiseled_floestone.png b/src/main/resources/assets/paradise_lost/textures/block/chiseled_floestone.png new file mode 100644 index 0000000000000000000000000000000000000000..9701f304af2ae29739af76930b6711916625c45b GIT binary patch literal 482 zcmV<80UiE{P)Px$oJmAMR49>UQay{?KoET~D*Uk{!4b?#;tB_!+i>SHA(vm5Ds6s>NtzT1q`bTG zh-_@kVQDc(KszJZWr`7d3Ylhi=i|+rH~Z?#=TA1zXgoyExIOnh+@1lfA0LbDKC*eX zT7AQRMuq^eaJVn#GXRkyeY|}SU}8)FcE{)N?NF<}+^3+IFDKbVQ}A*(|3<#2reO(~Abekxs+4 zrzE~!-u(RWi_A#d7QYLYQ#!rqtMVeN5?C(Za_x0-W;{|Ex&mJVh#HY}dJ+B~jfZyn zI;G_ zxsn1vZHxPo+7=d~-RS~oH5y-?o|(@DxI#>>LHaY zEAI~+LbRLr2ijdNmz6eub!si zaKUv~N~qRca7w5?rGy&YeP{Xj0>Fg58s6T7y)OQej?3J;F+Mx!u{^7X0eG1a09Frs znUSinkmZe~5`O@^u?*?kf4ZkLyllpvB*p*2wMWL|!>vPz23)PyDj%O}N=oR??lxvi zFcgBZqM1y@xi1xbhY(gM9lqsU06-aNdRv%*atPsqhY$eQZnglpz_XCoUFibJL|h-K ztuYZGMWYc)XkNl4R?I|RBB9|#BU94qF;h(a!N&UP(k{*YH;}L`%r-LE)MTuvN1PHZ flr-$%1}M)Do^Ids^-~Bc00000NkvXXu0mjfx^>O! delta 467 zcmV;^0WAL91NsAyF@Lm4L_t(2k!6xkYt%p(#-FqUlg+%7bfpc;E-NTj*pmm3f_@Os zLT`QxPZlos0cwc^R@ag@# z!Dt9TMxknrj6(eP=8GkOSyB91T(bTB$Eq~|RBIZo8?6BdB7Xpl)-G_B;dp#@{(H;i zPO7R}5P7w#YOl_xQx~&)PV;gmlXx>sCw2dsYK?bt!6vOM87H%%05BYnT`_oj@CJa= z%DYOEK2};ulD;cRGErP`zWq@A^&-8v0$}Y8=i3he3N8^qH-WV`Kl7Z;TZ0x=xvCor zAQn7{dc?W5wtrgwQ`{^~oD=7xKD4y}s&-Yit0d};`a7fkhDLdHT{kuuCVOcj0K_5$ zP&dZ4@1={XSug$d%SS=v0q6Po*{=(?r6l?C)eGDmL8En+ov=Z=t6JmW3!?1!^!1PL z69B*zD4##`pahZ9YO4!wUd{kafN$CyF3kiOq`SW5u1tn?Ny#LZB##Ux6z(t_8KfRg z60b?SVLa)lPagF?e7*+KD8$`Gc1>B9o%j{kM2}BB?Cu3P%`F+R^8A~f$5j9T002ov JPDHLkV1oEb+noRa diff --git a/src/main/resources/assets/paradise_lost/textures/block/metamorphic_shell.png b/src/main/resources/assets/paradise_lost/textures/block/metamorphic_shell.png new file mode 100644 index 0000000000000000000000000000000000000000..828f9c8117cd92707a636a0991bf289879f7416e GIT binary patch literal 433 zcmV;i0Z#sjP)Px$Ye_^wR5*=wld+1zKoEw%*hmPR7&Zh8*}W#Pg-xowf=}!#SlL(vY*Z{n43R5D ztoDk_ESr@ZSh72r+4<-HXDJKi%0fB70nQrj_v?D)%0juuR^H#($~Cs~G0Bk3?cO0~ zjb@fkId;AG-R>P_p}5^UtkJZmGi9MjhMNFrYz4rv>&df>{`vIDk`%@syB-9NKr9R8 ztkI)y2svDhtz0rB0r0Kz5p3~o+XJy#qcQmx#3aUuLgHfIaOOjW@Eockv9h;DJL2H5 ziZ$A;>(%IgcoEw3lG^=8{1M*RyS8Dl}|buA0!B@;Pg)?=k6|Me!&5D>P2uYcS)ZpPx$B1uF+R5*>5&@pbpFc^m6*H$c{RG^9rbY`eB_y&>KdH}A{Yjn)qfvH2c3Wx+Dus$_mUL6$D zV;}QY3@}TNF2OYn1RP(XIw+*aQ=RwXODU>@`c2?p_7WJv;SF|XeRg^by5Anp(xbbA zsg=9`&xu30n;`MH*pAVs<|@{w22$4qK>imSISLp+d_3M;-z5GKSJ_&!L{PRCfW@R` zxlhOv;S!iy1?)G)V~hco`-H`$rEINB@Y;-fHxE^o2)+Td58iApC#-4!0000 Date: Sun, 9 Apr 2023 15:49:56 -0500 Subject: [PATCH 3/9] meteorites and cracking --- .../blocks/ParadiseLostBlocks.java | 3 +- .../blocks/natural/PoofBlock.java | 56 +++++++++++++++++++ .../world/dimension/ParadiseLostBiomes.java | 3 + .../world/feature/ParadiseLostFeatures.java | 2 + .../ParadiseLostMiscConfiguredFeatures.java | 1 + .../features/SurtrumMeteoriteFeature.java | 50 +++++++++++++++++ .../ParadiseLostMiscPlacedFeatures.java | 1 + 7 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 src/main/java/net/id/paradiselost/blocks/natural/PoofBlock.java create mode 100644 src/main/java/net/id/paradiselost/world/feature/features/SurtrumMeteoriteFeature.java diff --git a/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java b/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java index 2de311579..e81e11085 100644 --- a/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java +++ b/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java @@ -353,7 +353,8 @@ private static Settings flower() { public static final OreBlock CHERINE_ORE = add("cherine_ore", new OreBlock(of(Material.STONE).requiresTool().strength(3f), UniformIntProvider.create(0, 2))); public static final OreBlock OLVITE_ORE = add("olvite_ore", new OreBlock(of(Material.STONE).requiresTool().strength(3f), UniformIntProvider.create(1, 3))); public static final OreBlock SURTRUM = add("surtrum", new SurtrumOreBlock(of(Material.STONE).sounds(BlockSoundGroup.NETHER_GOLD_ORE).requiresTool().strength(9f, 20f), UniformIntProvider.create(2, 5))); - public static final Block METAMORPHIC_SHELL = add("metamorphic_shell", new Block(of(Material.STONE).sounds(BlockSoundGroup.STONE).requiresTool().strength(40f, 15f))); + public static final Block METAMORPHIC_SHELL = add("metamorphic_shell", new Block(of(Material.STONE).sounds(BlockSoundGroup.TUFF).requiresTool().strength(40f, 15f))); + public static final PoofBlock SURTRUM_AIR = add("surtrum_air", new PoofBlock(of(Material.FIRE).sounds(BlockSoundGroup.NETHER_GOLD_ORE))); public static final Block CHERINE_BLOCK = add("cherine_block", new Block(of(Material.METAL).requiresTool().strength(3f, -1f).sounds(BlockSoundGroup.STONE))); public static final Block OLVITE_BLOCK = add("olvite_block", new Block(of(Material.METAL).requiresTool().strength(3f, -1f).sounds(BlockSoundGroup.METAL))); public static final FloatingBlock REFINED_SURTRUM_BLOCK = add("refined_surtrum_block", new FloatingBlock(false, of(Material.METAL).requiresTool().strength(4f, -1f).sounds(BlockSoundGroup.METAL))); diff --git a/src/main/java/net/id/paradiselost/blocks/natural/PoofBlock.java b/src/main/java/net/id/paradiselost/blocks/natural/PoofBlock.java new file mode 100644 index 000000000..395d4f8cd --- /dev/null +++ b/src/main/java/net/id/paradiselost/blocks/natural/PoofBlock.java @@ -0,0 +1,56 @@ +package net.id.paradiselost.blocks.natural; + +import net.minecraft.block.AirBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockRenderType; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.FallingBlock; +import net.minecraft.block.ShapeContext; +import net.minecraft.particle.ParticleTypes; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvents; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; +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.WorldAccess; + +public class PoofBlock extends Block { + public PoofBlock(Settings settings) { + super(settings); + } + + @Override + public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + Random rand = world.getRandom(); + if (neighborState.isAir()) { + for (int i = 0; i < 4; i++) { + world.addParticle(ParticleTypes.CAMPFIRE_COSY_SMOKE, pos.getX(), pos.getY(), pos.getZ(), rand.nextFloat()*0.5, rand.nextFloat()*0.5, rand.nextFloat()*0.5); + } + if (rand.nextBoolean()) world.playSound(null, pos, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.1F + rand.nextFloat()*0.2F, rand.nextFloat() * 0.7F + 0.3F); + var player = world.getClosestPlayer(pos.getX(), pos.getY(), pos.getZ(), 4, false); + if (player != null) player.setFireTicks(40); + return Blocks.AIR.getDefaultState(); + } + return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos); + } + + public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random random) { + if (random.nextInt(48) == 0) { + world.playSound((double) pos.getX() + 0.5, (double) pos.getY() + 0.5, (double) pos.getZ() + 0.5, SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.BLOCKS, 1.0F + random.nextFloat(), random.nextFloat() * 0.7F + 0.3F, false); + } + } + + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.INVISIBLE; + } + + public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + return VoxelShapes.empty(); + } +} diff --git a/src/main/java/net/id/paradiselost/world/dimension/ParadiseLostBiomes.java b/src/main/java/net/id/paradiselost/world/dimension/ParadiseLostBiomes.java index 691b5cf81..9e539bc05 100644 --- a/src/main/java/net/id/paradiselost/world/dimension/ParadiseLostBiomes.java +++ b/src/main/java/net/id/paradiselost/world/dimension/ParadiseLostBiomes.java @@ -215,6 +215,9 @@ private static Map>> getStandardParadiseLostFeatures() { return Map.of( + GenerationStep.Feature.RAW_GENERATION, List.of( + SURTRUM_METEORITE + ), GenerationStep.Feature.UNDERGROUND_ORES, List.of( ORE_CHERINE, ORE_OLVITE diff --git a/src/main/java/net/id/paradiselost/world/feature/ParadiseLostFeatures.java b/src/main/java/net/id/paradiselost/world/feature/ParadiseLostFeatures.java index c71f6718d..a9c93e784 100644 --- a/src/main/java/net/id/paradiselost/world/feature/ParadiseLostFeatures.java +++ b/src/main/java/net/id/paradiselost/world/feature/ParadiseLostFeatures.java @@ -30,6 +30,8 @@ public class ParadiseLostFeatures { public static final PillarFeature PILLAR_FEATURE = register("pillar_feature", new PillarFeature(LongFeatureConfig.CODEC)); public static final FallenPillarFeature FALLEN_PILLAR_FEATURE = register("fallen_pillar_feature", new FallenPillarFeature(LongFeatureConfig.CODEC)); + public static final SurtrumMeteoriteFeature SURTRUM_METEORITE_FEATURE = register("surtrum_meteorite_feature", new SurtrumMeteoriteFeature(DefaultFeatureConfig.CODEC)); + private static > F register(String id, F feature) { return Registry.register(Registry.FEATURE, ParadiseLost.locate(id), feature); } diff --git a/src/main/java/net/id/paradiselost/world/feature/configured_features/ParadiseLostMiscConfiguredFeatures.java b/src/main/java/net/id/paradiselost/world/feature/configured_features/ParadiseLostMiscConfiguredFeatures.java index 4ee9fd389..8b650de91 100644 --- a/src/main/java/net/id/paradiselost/world/feature/configured_features/ParadiseLostMiscConfiguredFeatures.java +++ b/src/main/java/net/id/paradiselost/world/feature/configured_features/ParadiseLostMiscConfiguredFeatures.java @@ -41,6 +41,7 @@ public class ParadiseLostMiscConfiguredFeatures extends ParadiseLostConfiguredFe public static final RegistryEntry> ORE_CHERINE = register("ore_cherine", Feature.ORE, Configs.ore(CHERINE_ORE, 14)); public static final RegistryEntry> ORE_OLVITE = register("ore_olvite", Feature.ORE, Configs.ore(OLVITE_ORE, 9)); + public static final RegistryEntry> SURTRUM_METEORITE = register("surtrum_meteorite", ParadiseLostFeatures.SURTRUM_METEORITE_FEATURE, new DefaultFeatureConfig()); // Plato // Shield public static final RegistryEntry> SHIELD_ROCKS = register("shield_rocks", Feature.RANDOM_PATCH, Configs.SHIELD_ROCKS_CONFIG); diff --git a/src/main/java/net/id/paradiselost/world/feature/features/SurtrumMeteoriteFeature.java b/src/main/java/net/id/paradiselost/world/feature/features/SurtrumMeteoriteFeature.java new file mode 100644 index 000000000..eea58e0a6 --- /dev/null +++ b/src/main/java/net/id/paradiselost/world/feature/features/SurtrumMeteoriteFeature.java @@ -0,0 +1,50 @@ +package net.id.paradiselost.world.feature.features; + +import com.mojang.serialization.Codec; +import net.id.paradiselost.blocks.ParadiseLostBlocks; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.random.Random; +import net.minecraft.world.StructureWorldAccess; +import net.minecraft.world.gen.feature.DefaultFeatureConfig; +import net.minecraft.world.gen.feature.Feature; +import net.minecraft.world.gen.feature.util.FeatureContext; + +public class SurtrumMeteoriteFeature extends Feature { + + public SurtrumMeteoriteFeature(Codec configCodec) { + super(configCodec); + } + + @Override + public boolean generate(FeatureContext context) { + BlockPos center = context.getOrigin(); + StructureWorldAccess world = context.getWorld(); + + Random rand = context.getRandom(); + final float size = 4; + + for (BlockPos i : BlockPos.iterateOutwards(center, ((int) size)+3, ((int) size)+3, ((int) size)+3)) { + if (Math.sqrt(center.getSquaredDistance(i)) < size-2f-rand.nextFloat()*0.5) { + world.setBlockState(i, ParadiseLostBlocks.SURTRUM_AIR.getDefaultState(), Block.NOTIFY_LISTENERS); + } else if (Math.sqrt(center.getSquaredDistance(i)) < size-1.5f+rand.nextFloat()*0.5) { + world.setBlockState(i, ParadiseLostBlocks.SURTRUM.getDefaultState(), Block.NOTIFY_LISTENERS); + } else if (Math.sqrt(center.getSquaredDistance(i)) < size+rand.nextFloat()*0.5) { + world.setBlockState(i, ParadiseLostBlocks.METAMORPHIC_SHELL.getDefaultState(), Block.NOTIFY_LISTENERS); + } else if (Math.sqrt(center.getSquaredDistance(i)) < size+rand.nextFloat()*0.7) { + if (rand.nextBoolean()) { + for (BlockPos j : BlockPos.iterateOutwards(i, 1, 1, 1)) { + if (Math.sqrt(i.getSquaredDistance(j)) < 1+rand.nextFloat() && world.getBlockState(j).isAir()) world.setBlockState(j, ParadiseLostBlocks.FLOESTONE.getDefaultState(), Block.NOTIFY_LISTENERS); + } + } else { + world.setBlockState(i, ParadiseLostBlocks.FLOESTONE.getDefaultState(), Block.NOTIFY_LISTENERS); + } + + } + } + + return true; + } + +} diff --git a/src/main/java/net/id/paradiselost/world/feature/placed_features/ParadiseLostMiscPlacedFeatures.java b/src/main/java/net/id/paradiselost/world/feature/placed_features/ParadiseLostMiscPlacedFeatures.java index 83b3ec480..d7bf26997 100644 --- a/src/main/java/net/id/paradiselost/world/feature/placed_features/ParadiseLostMiscPlacedFeatures.java +++ b/src/main/java/net/id/paradiselost/world/feature/placed_features/ParadiseLostMiscPlacedFeatures.java @@ -24,6 +24,7 @@ public class ParadiseLostMiscPlacedFeatures extends ParadiseLostPlacedFeatures { public static final RegistryEntry ORE_CHERINE = register("ore_cherine", ParadiseLostMiscConfiguredFeatures.ORE_CHERINE, CountPlacementModifier.of(20), SquarePlacementModifier.of(), HeightRangePlacementModifier.trapezoid(YOffset.aboveBottom(0), YOffset.aboveBottom(320)), BiomePlacementModifier.of()); public static final RegistryEntry ORE_OLVITE = register("ore_olvite", ParadiseLostMiscConfiguredFeatures.ORE_OLVITE, CountPlacementModifier.of(16), SquarePlacementModifier.of(), HeightRangePlacementModifier.trapezoid(YOffset.aboveBottom(0), YOffset.aboveBottom(384)), BiomePlacementModifier.of()); + public static final RegistryEntry SURTRUM_METEORITE = register("surtrum_meteorite", ParadiseLostMiscConfiguredFeatures.SURTRUM_METEORITE, SquarePlacementModifier.of(), HeightRangePlacementModifier.uniform(YOffset.fixed(65), YOffset.fixed(85)), ChancePlacementModifier.of(150)); // Plato // Shield public static final RegistryEntry SHIELD_ROCKS = register("shield_rocks", ParadiseLostMiscConfiguredFeatures.SHIELD_ROCKS, PlacedFeatures.BOTTOM_TO_TOP_RANGE, CountMultilayerPlacementModifier.of(1), CountPlacementModifier.of(UniformIntProvider.create(0, 2))); From 26526ba97d36ed372038fd5c67de27fe1f3914f0 Mon Sep 17 00:00:00 2001 From: Maxx <53229958+MBatt1@users.noreply.github.com> Date: Sun, 9 Apr 2023 15:53:56 -0500 Subject: [PATCH 4/9] fire range --- src/main/java/net/id/paradiselost/blocks/natural/PoofBlock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/id/paradiselost/blocks/natural/PoofBlock.java b/src/main/java/net/id/paradiselost/blocks/natural/PoofBlock.java index 395d4f8cd..8ffd73513 100644 --- a/src/main/java/net/id/paradiselost/blocks/natural/PoofBlock.java +++ b/src/main/java/net/id/paradiselost/blocks/natural/PoofBlock.java @@ -33,7 +33,7 @@ public BlockState getStateForNeighborUpdate(BlockState state, Direction directio world.addParticle(ParticleTypes.CAMPFIRE_COSY_SMOKE, pos.getX(), pos.getY(), pos.getZ(), rand.nextFloat()*0.5, rand.nextFloat()*0.5, rand.nextFloat()*0.5); } if (rand.nextBoolean()) world.playSound(null, pos, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.1F + rand.nextFloat()*0.2F, rand.nextFloat() * 0.7F + 0.3F); - var player = world.getClosestPlayer(pos.getX(), pos.getY(), pos.getZ(), 4, false); + var player = world.getClosestPlayer(pos.getX(), pos.getY(), pos.getZ(), 5, false); if (player != null) player.setFireTicks(40); return Blocks.AIR.getDefaultState(); } From 7e7792714c6e317c3d14ea66dd2301d1354f2ee8 Mon Sep 17 00:00:00 2001 From: Maxx <53229958+MBatt1@users.noreply.github.com> Date: Sun, 9 Apr 2023 19:24:44 -0500 Subject: [PATCH 5/9] checkstyle --- .../id/paradiselost/blocks/natural/PoofBlock.java | 7 ++----- .../blocks/natural/SurtrumOreBlock.java | 12 ++++++------ .../feature/features/SurtrumMeteoriteFeature.java | 13 ++++++------- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/main/java/net/id/paradiselost/blocks/natural/PoofBlock.java b/src/main/java/net/id/paradiselost/blocks/natural/PoofBlock.java index 8ffd73513..c87f0585c 100644 --- a/src/main/java/net/id/paradiselost/blocks/natural/PoofBlock.java +++ b/src/main/java/net/id/paradiselost/blocks/natural/PoofBlock.java @@ -1,14 +1,11 @@ package net.id.paradiselost.blocks.natural; -import net.minecraft.block.AirBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; -import net.minecraft.block.FallingBlock; import net.minecraft.block.ShapeContext; import net.minecraft.particle.ParticleTypes; -import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.util.math.BlockPos; @@ -30,9 +27,9 @@ public BlockState getStateForNeighborUpdate(BlockState state, Direction directio Random rand = world.getRandom(); if (neighborState.isAir()) { for (int i = 0; i < 4; i++) { - world.addParticle(ParticleTypes.CAMPFIRE_COSY_SMOKE, pos.getX(), pos.getY(), pos.getZ(), rand.nextFloat()*0.5, rand.nextFloat()*0.5, rand.nextFloat()*0.5); + world.addParticle(ParticleTypes.CAMPFIRE_COSY_SMOKE, pos.getX(), pos.getY(), pos.getZ(), rand.nextFloat() * 0.5, rand.nextFloat() * 0.5, rand.nextFloat() * 0.5); } - if (rand.nextBoolean()) world.playSound(null, pos, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.1F + rand.nextFloat()*0.2F, rand.nextFloat() * 0.7F + 0.3F); + if (rand.nextBoolean()) world.playSound(null, pos, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.1F + rand.nextFloat() * 0.2F, rand.nextFloat() * 0.7F + 0.3F); var player = world.getClosestPlayer(pos.getX(), pos.getY(), pos.getZ(), 5, false); if (player != null) player.setFireTicks(40); return Blocks.AIR.getDefaultState(); diff --git a/src/main/java/net/id/paradiselost/blocks/natural/SurtrumOreBlock.java b/src/main/java/net/id/paradiselost/blocks/natural/SurtrumOreBlock.java index 26a6d1ebb..b83b48f12 100644 --- a/src/main/java/net/id/paradiselost/blocks/natural/SurtrumOreBlock.java +++ b/src/main/java/net/id/paradiselost/blocks/natural/SurtrumOreBlock.java @@ -16,15 +16,15 @@ public SurtrumOreBlock(Settings settings, IntProvider experience) { @Override public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random random) { if (random.nextInt(3) == 0) { - double d2 = (double)pos.getX() + random.nextDouble(); - double e2 = (double)pos.getY() + random.nextDouble() * 0.5 + 0.5; - double f2 = (double)pos.getZ() + random.nextDouble(); + double d2 = (double) pos.getX() + random.nextDouble(); + double e2 = (double) pos.getY() + random.nextDouble() * 0.5 + 0.5; + double f2 = (double) pos.getZ() + random.nextDouble(); world.addParticle(ParticleTypes.LARGE_SMOKE, d2, e2, f2, 0.0, 0.0, 0.0); } if (random.nextBoolean()) { - double d2 = (double)pos.getX() + random.nextDouble(); - double e2 = (double)pos.getY() + random.nextDouble() * 0.5 + 0.5; - double f2 = (double)pos.getZ() + random.nextDouble(); + double d2 = (double) pos.getX() + random.nextDouble(); + double e2 = (double) pos.getY() + random.nextDouble() * 0.5 + 0.5; + double f2 = (double) pos.getZ() + random.nextDouble(); world.addParticle(ParticleTypes.SMOKE, d2, e2, f2, 0.0, 0.0, 0.0); } } diff --git a/src/main/java/net/id/paradiselost/world/feature/features/SurtrumMeteoriteFeature.java b/src/main/java/net/id/paradiselost/world/feature/features/SurtrumMeteoriteFeature.java index eea58e0a6..f0b4a4456 100644 --- a/src/main/java/net/id/paradiselost/world/feature/features/SurtrumMeteoriteFeature.java +++ b/src/main/java/net/id/paradiselost/world/feature/features/SurtrumMeteoriteFeature.java @@ -3,7 +3,6 @@ import com.mojang.serialization.Codec; import net.id.paradiselost.blocks.ParadiseLostBlocks; import net.minecraft.block.Block; -import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.random.Random; import net.minecraft.world.StructureWorldAccess; @@ -25,17 +24,17 @@ public boolean generate(FeatureContext context) { Random rand = context.getRandom(); final float size = 4; - for (BlockPos i : BlockPos.iterateOutwards(center, ((int) size)+3, ((int) size)+3, ((int) size)+3)) { - if (Math.sqrt(center.getSquaredDistance(i)) < size-2f-rand.nextFloat()*0.5) { + for (BlockPos i : BlockPos.iterateOutwards(center, ((int) size) + 3, ((int) size) + 3, ((int) size) + 3)) { + if (Math.sqrt(center.getSquaredDistance(i)) < size - 2f - rand.nextFloat() * 0.5) { world.setBlockState(i, ParadiseLostBlocks.SURTRUM_AIR.getDefaultState(), Block.NOTIFY_LISTENERS); - } else if (Math.sqrt(center.getSquaredDistance(i)) < size-1.5f+rand.nextFloat()*0.5) { + } else if (Math.sqrt(center.getSquaredDistance(i)) < size - 1.5f + rand.nextFloat() * 0.5) { world.setBlockState(i, ParadiseLostBlocks.SURTRUM.getDefaultState(), Block.NOTIFY_LISTENERS); - } else if (Math.sqrt(center.getSquaredDistance(i)) < size+rand.nextFloat()*0.5) { + } else if (Math.sqrt(center.getSquaredDistance(i)) < size + rand.nextFloat() * 0.5) { world.setBlockState(i, ParadiseLostBlocks.METAMORPHIC_SHELL.getDefaultState(), Block.NOTIFY_LISTENERS); - } else if (Math.sqrt(center.getSquaredDistance(i)) < size+rand.nextFloat()*0.7) { + } else if (Math.sqrt(center.getSquaredDistance(i)) < size + rand.nextFloat() * 0.7) { if (rand.nextBoolean()) { for (BlockPos j : BlockPos.iterateOutwards(i, 1, 1, 1)) { - if (Math.sqrt(i.getSquaredDistance(j)) < 1+rand.nextFloat() && world.getBlockState(j).isAir()) world.setBlockState(j, ParadiseLostBlocks.FLOESTONE.getDefaultState(), Block.NOTIFY_LISTENERS); + if (Math.sqrt(i.getSquaredDistance(j)) < 1 + rand.nextFloat() && world.getBlockState(j).isAir()) world.setBlockState(j, ParadiseLostBlocks.FLOESTONE.getDefaultState(), Block.NOTIFY_LISTENERS); } } else { world.setBlockState(i, ParadiseLostBlocks.FLOESTONE.getDefaultState(), Block.NOTIFY_LISTENERS); From 267103453ed14bb0628d17de910ac0dbe42a1a4b Mon Sep 17 00:00:00 2001 From: Maxx <53229958+MBatt1@users.noreply.github.com> Date: Mon, 1 May 2023 11:48:44 -0500 Subject: [PATCH 6/9] surtrum armor --- .../paradiselost/items/ParadiseLostItems.java | 9 +++++++++ .../items/armor/ParadiseLostArmorMaterials.java | 4 ++++ .../util/ParadiseLostSoundEvents.java | 1 + .../armor/paradise_lost_surtrum_layer_1.png | Bin 0 -> 1231 bytes .../armor/paradise_lost_surtrum_layer_2.png | Bin 0 -> 655 bytes .../assets/paradise_lost/lang/en_us.json | 5 +++++ .../models/item/surtrum_boots.json | 6 ++++++ .../models/item/surtrum_chestplate.json | 6 ++++++ .../models/item/surtrum_helmet.json | 6 ++++++ .../models/item/surtrum_leggings.json | 6 ++++++ .../textures/item/surtrum_boots.png | Bin 0 -> 327 bytes .../textures/item/surtrum_chestplate.png | Bin 0 -> 381 bytes .../textures/item/surtrum_helmet.png | Bin 0 -> 282 bytes .../textures/item/surtrum_leggings.png | Bin 0 -> 376 bytes .../paradise_lost/recipes/surtrum_boots.json | 15 +++++++++++++++ .../recipes/surtrum_chestplate.json | 16 ++++++++++++++++ .../paradise_lost/recipes/surtrum_helmet.json | 15 +++++++++++++++ .../paradise_lost/recipes/surtrum_leggings.json | 16 ++++++++++++++++ 18 files changed, 105 insertions(+) create mode 100644 src/main/resources/assets/minecraft/textures/models/armor/paradise_lost_surtrum_layer_1.png create mode 100644 src/main/resources/assets/minecraft/textures/models/armor/paradise_lost_surtrum_layer_2.png create mode 100644 src/main/resources/assets/paradise_lost/models/item/surtrum_boots.json create mode 100644 src/main/resources/assets/paradise_lost/models/item/surtrum_chestplate.json create mode 100644 src/main/resources/assets/paradise_lost/models/item/surtrum_helmet.json create mode 100644 src/main/resources/assets/paradise_lost/models/item/surtrum_leggings.json create mode 100644 src/main/resources/assets/paradise_lost/textures/item/surtrum_boots.png create mode 100644 src/main/resources/assets/paradise_lost/textures/item/surtrum_chestplate.png create mode 100644 src/main/resources/assets/paradise_lost/textures/item/surtrum_helmet.png create mode 100644 src/main/resources/assets/paradise_lost/textures/item/surtrum_leggings.png create mode 100644 src/main/resources/data/paradise_lost/recipes/surtrum_boots.json create mode 100644 src/main/resources/data/paradise_lost/recipes/surtrum_chestplate.json create mode 100644 src/main/resources/data/paradise_lost/recipes/surtrum_helmet.json create mode 100644 src/main/resources/data/paradise_lost/recipes/surtrum_leggings.json diff --git a/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java b/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java index 4c1b18e28..90579e92b 100644 --- a/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java +++ b/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java @@ -118,17 +118,26 @@ private static Settings wearable() { private static final Settings WEARABLE = wearable(); private static final Settings RARE_WEARABLE = wearable().rarity(RARE); private static final Settings PARADISE_LOST_LOOT_WEARABLE = wearable().rarity(ParadiseLostRarity.PARADISE_LOST_LOOT); + // Olvite public static final ArmorItem OLVITE_HELMET = add("olvite_helmet", new ArmorItem(ParadiseLostArmorMaterials.OLVITE, HEAD, WEARABLE)); public static final ArmorItem OLVITE_CHESTPLATE = add("olvite_chestplate", new ArmorItem(ParadiseLostArmorMaterials.OLVITE, CHEST, WEARABLE)); public static final ArmorItem OLVITE_LEGGINGS = add("olvite_leggings", new ArmorItem(ParadiseLostArmorMaterials.OLVITE, LEGS, WEARABLE)); public static final ArmorItem OLVITE_BOOTS = add("olvite_boots", new ArmorItem(ParadiseLostArmorMaterials.OLVITE, FEET, WEARABLE)); + // Glazed Gold public static final ArmorItem GLAZED_GOLD_HELMET = add("glazed_gold_helmet", new ArmorItem(ParadiseLostArmorMaterials.GLAZED_GOLD, HEAD, WEARABLE)); public static final ArmorItem GLAZED_GOLD_CHESTPLATE = add("glazed_gold_chestplate", new ArmorItem(ParadiseLostArmorMaterials.GLAZED_GOLD, CHEST, WEARABLE)); public static final ArmorItem GLAZED_GOLD_LEGGINGS = add("glazed_gold_leggings", new ArmorItem(ParadiseLostArmorMaterials.GLAZED_GOLD, LEGS, WEARABLE)); public static final ArmorItem GLAZED_GOLD_BOOTS = add("glazed_gold_boots", new ArmorItem(ParadiseLostArmorMaterials.GLAZED_GOLD, FEET, WEARABLE)); + // Surtrum + public static final ArmorItem SURTRUM_HELMET = add("surtrum_helmet", new ArmorItem(ParadiseLostArmorMaterials.SURTRUM, HEAD, wearable())); + public static final ArmorItem SURTRUM_CHESTPLATE = add("surtrum_chestplate", new ArmorItem(ParadiseLostArmorMaterials.SURTRUM, CHEST, wearable())); + public static final ArmorItem SURTRUM_LEGGINGS = add("surtrum_leggings", new ArmorItem(ParadiseLostArmorMaterials.SURTRUM, LEGS, wearable())); + public static final ArmorItem SURTRUM_BOOTS = add("surtrum_boots", new ArmorItem(ParadiseLostArmorMaterials.SURTRUM, FEET, wearable())); + + private static Settings food() { return new Settings().group(ParadiseLostItemGroups.PARADISE_LOST_FOOD); } diff --git a/src/main/java/net/id/paradiselost/items/armor/ParadiseLostArmorMaterials.java b/src/main/java/net/id/paradiselost/items/armor/ParadiseLostArmorMaterials.java index 9b153ac75..5387bf9de 100644 --- a/src/main/java/net/id/paradiselost/items/armor/ParadiseLostArmorMaterials.java +++ b/src/main/java/net/id/paradiselost/items/armor/ParadiseLostArmorMaterials.java @@ -15,5 +15,9 @@ public class ParadiseLostArmorMaterials { public static final ArmorMaterial GLAZED_GOLD = ArmorMaterialsAccessor.callInit("PARADISE_LOST_GLAZED_GOLD", -1, "paradise_lost_glazed_gold", 14, new int[]{1, 3, 5, 2}, 25, ParadiseLostSoundEvents.ITEM_ARMOR_EQUIP_GLAZED_GOLD, 0f, 0f, IngredientUtil.itemIngredient(ParadiseLostItems.GOLDEN_AMBER)); + public static final ArmorMaterial SURTRUM = ArmorMaterialsAccessor.callInit("PARADISE_LOST_SURTRUM", -1, + "paradise_lost_surtrum", 15, new int[]{3, 6, 8, 3}, 15, ParadiseLostSoundEvents.ITEM_ARMOR_EQUIP_SURTRUM, + 0f, 0.1f, IngredientUtil.itemIngredient(ParadiseLostItems.REFINED_SURTRUM)); + } diff --git a/src/main/java/net/id/paradiselost/util/ParadiseLostSoundEvents.java b/src/main/java/net/id/paradiselost/util/ParadiseLostSoundEvents.java index dbd3942b8..4f9b60256 100644 --- a/src/main/java/net/id/paradiselost/util/ParadiseLostSoundEvents.java +++ b/src/main/java/net/id/paradiselost/util/ParadiseLostSoundEvents.java @@ -79,6 +79,7 @@ private ParadiseLostSoundEvents() { public static final SoundEvent ITEM_ARMOR_EQUIP_OLVITE = childEvent("item.armor.equip.olvite", SoundEvents.ITEM_ARMOR_EQUIP_IRON); public static final SoundEvent ITEM_ARMOR_EQUIP_GLAZED_GOLD = childEvent("item.armor.equip.glazed_gold", SoundEvents.ITEM_ARMOR_EQUIP_GOLD); + public static final SoundEvent ITEM_ARMOR_EQUIP_SURTRUM = childEvent("item.armor.equip.surtrum", SoundEvents.ITEM_ARMOR_EQUIP_NETHERITE); public static final SoundEvent ITEM_BLOODSTONE_PRICK = childEvent("item.bloodstone.prick", SoundEvents.ENTITY_BEE_STING); diff --git a/src/main/resources/assets/minecraft/textures/models/armor/paradise_lost_surtrum_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/paradise_lost_surtrum_layer_1.png new file mode 100644 index 0000000000000000000000000000000000000000..3caa69cd9b2da683028f4475edac10d2e12ca686 GIT binary patch literal 1231 zcmV;=1Tg!FP)Px(iAh93RA_){SvU_9XXL)c_1?KNj*c}|Tj>Wf z_s6+2_s2Qsp6@8Z1Dml3Ny(CHpK20ZeE#Cz`Gerjw1U|{7YU`$pQ{4dOCTjn$OgKo z5B%6#yWvj?A1>xR!Fj`T0~m5~9pUXgWB{~lB|rmOhHs8jTMRr+Affb;jv5GW?*Wf? z0080bJ*1tGNcGqXq!F`1-)V5+>le0jfy=_|P(Z zIBmN1%^&2CeIornI-Xpi!vcP-lxLNXZg)lE?ePI0fmbVKbTP zi|4ivr=!zP^6uGxBU<9tHVb6cB;2WOt=-^Nb6v1)`n>r3MY;e`1W0}0=i%>WEJ9S1 zK-Gi5r9EhZX8DMdPeEG{Y zZBN#}Oh}ut$jB^aB{**H0;pyrls;O9k3WI$gG?>#9+$Su~7vq1?Ux9=tMw-~7=z^@pmwSr${XZrwcjDF?AhJoDR~Al`^)vZ| zgAG;-6=e4JXxO(>)g;!5fu0ykqEZ^HjKmL4o2?K0 zK%oM5`qsDSf9>7@s23KaJg3*q#dU~YIUDHOyt;Eir`I7gGzGc1&NoNgK>MF7))cz!=XWb3w8&^E5! zOu#MBV4KRkf6MSqT+FyU!XhZMteOPbzzuS7ou7E|U>EILiP!T<9Su$4*Nc}1q-2T8 tUa}S%p^f_=ahbUR*No8D;73nv{13(UtFgEFR#E@}002ovPDHLkV1gWnRUH5T literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/textures/models/armor/paradise_lost_surtrum_layer_2.png b/src/main/resources/assets/minecraft/textures/models/armor/paradise_lost_surtrum_layer_2.png new file mode 100644 index 0000000000000000000000000000000000000000..0ba24babc75b7be5220c75f3303873201d2343b2 GIT binary patch literal 655 zcmV;A0&x9_P)Px%Nl8RORA_YZjVL+aWfE#$h@LGTYK;^bBe4oQ|2p>*odEu))- zQfNsL4od4F1UHwS{sn@BD`bcTi?r)?Nubd?xel*)@r*+yQ89f#+w((t-sipd`#d0# zNF)-8L?V$$Boc|_eb4tb*xs+x7(vwpb3Uv59F^iVbc*)&(Q0bj*IEIv_~hR9&2?~hAw?{GG+3BkRTT_QrFE@d!W=+P|83nFH?idx%79&p_ zxNAqz)FGyG75A84ojtr~lUWtqK#tYvQPcPr<1lnh8NAPG~lQg4`_&?*GVUBo}6w0P>x@W8zjg? p2G{ITrNQwZk^ih`2mWu7`~~RF4xAr_CMN&@002ovPDHLkV1krzF@FF6 literal 0 HcmV?d00001 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 5fb1abfc1..5adf4bb4f 100644 --- a/src/main/resources/assets/paradise_lost/lang/en_us.json +++ b/src/main/resources/assets/paradise_lost/lang/en_us.json @@ -316,6 +316,11 @@ "item.paradise_lost.glazed_gold_chestplate": "Glazed Gold Chestplate", "item.paradise_lost.glazed_gold_leggings": "Glazed Gold Leggings", "item.paradise_lost.glazed_gold_boots": "Glazed Gold Boots", + + "item.paradise_lost.surtrum_helmet": "Surtrum Helmet", + "item.paradise_lost.surtrum_chestplate": "Surtrum Chestplate", + "item.paradise_lost.surtrum_leggings": "Surtrum Leggings", + "item.paradise_lost.surtrum_boots": "Surtrum Boots", "item.paradise_lost.blackcurrant": "Blackcurrant", "item.paradise_lost.orange": "Orange", diff --git a/src/main/resources/assets/paradise_lost/models/item/surtrum_boots.json b/src/main/resources/assets/paradise_lost/models/item/surtrum_boots.json new file mode 100644 index 000000000..e06ffd1bc --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/item/surtrum_boots.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "paradise_lost:item/surtrum_boots" + } +} diff --git a/src/main/resources/assets/paradise_lost/models/item/surtrum_chestplate.json b/src/main/resources/assets/paradise_lost/models/item/surtrum_chestplate.json new file mode 100644 index 000000000..f5176de44 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/item/surtrum_chestplate.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "paradise_lost:item/surtrum_chestplate" + } +} diff --git a/src/main/resources/assets/paradise_lost/models/item/surtrum_helmet.json b/src/main/resources/assets/paradise_lost/models/item/surtrum_helmet.json new file mode 100644 index 000000000..7886904d4 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/item/surtrum_helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "paradise_lost:item/surtrum_helmet" + } +} diff --git a/src/main/resources/assets/paradise_lost/models/item/surtrum_leggings.json b/src/main/resources/assets/paradise_lost/models/item/surtrum_leggings.json new file mode 100644 index 000000000..5c7eaa5af --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/item/surtrum_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "paradise_lost:item/surtrum_leggings" + } +} diff --git a/src/main/resources/assets/paradise_lost/textures/item/surtrum_boots.png b/src/main/resources/assets/paradise_lost/textures/item/surtrum_boots.png new file mode 100644 index 0000000000000000000000000000000000000000..b929b77dd860c8bafc3325d8b575b4460e2743d4 GIT binary patch literal 327 zcmV-N0l5B&P)Px$0ZBwbR5*>*lC5q6Q4oc{B}+m=N%*lK5CjFh#D*Fi22n7`n(`co4FU%S42B2T zl0od=%?@nRAUSI0o|%(5a|fOtmI?Z`irkXR{lWT=v*VA8**FNc z8(I@jHMsQ?C8r0VI3>V#1AsqY122ji?TWap!mN<&r&%q_v6Gc!Co9crIU2iPtBBXg zi`U2tpzPSUBA?&sJK?X3z&RIYzlu`=E!(0!>;mxmF;|6d{RF^ruf=UMBIqS1q2%-s z2L@AL0Px$H%UZ6R5*>TlfO#CP!xy1lolM4p}3}$4#h!GByUjEXK-kzjLvzA4C3z8Waujt zi*HaQfle7hN!RFLhCmB(Xl`=zhbrQk?mhS1-}!#$a^b&YHXdZN@gVzczAFwz;_2dp z$)?{bK0W&asn!W1r7Je`7aM@sHbtt^%{ydFf%)S-0N2mUk^q4BR{+j$A7Ha=B`}72 z;?*MG^{WEq0lZzp1RX!z0dO_avDJk2w$~6X1lHRg#&CZmxVggqU$g2>ebUj$4U(HO{LBv@ZJG4{mrf7I#vF6Dzn#{GR~AVKtk(K%-}cy; z83+y^ttn>%g0}6|VF#Y>uH0uZMeEd`{U!f7@1&@e2=_j%H#V4azc*2MlVinRg*QTs z;W{x^(;vRMvsI%l{?;d!{fs<7pcK8&$N&ib=(m2jt6!f00u{>Vdl!lw=GHj(&hMCd z?_E}d=dU$S8Cb-oHf*Yt(7RiIsNkETcA|Jfu#3=z;3+@PA2`r3F=0W{jU(pUXO@geCw`^Kj4r literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/paradise_lost/textures/item/surtrum_leggings.png b/src/main/resources/assets/paradise_lost/textures/item/surtrum_leggings.png new file mode 100644 index 0000000000000000000000000000000000000000..57bd40c39a7e606f4a1f0a5037400a1401f2dcfa GIT binary patch literal 376 zcmV-;0f+vHP)Px$GD$>1R5*>zk}*reP!xr~N(G?`YS&1~;Ao2EA4s)JH{N#? z-CUX$|ACaWbdU}~+A#$|3qk_dp-JlNqjl5+5AM6~oWncZ3xAEwYUBF&NRrx%7G*KJ zq&3GAO{0jV?ugVK2`V`O1dz_jz66z=1eKgvrXfEyS5U8 z(Z()>4E#APrz9_L+dO{l0rSlf>_Vsqjd8W}q4m-qSf(M~Z8@C+PgR9@;ama`^je&a z4rJg@Gg<@y`rUYRDw1fcP`1i44XN#Z0#F{lr|*_&NV1L1@kG-p2E^MJp9Jgr{{Y{^ W5^NCJy+(Wh0000 Date: Sun, 13 Aug 2023 11:45:50 -0500 Subject: [PATCH 7/9] requested changes: sounds and entities --- build.gradle.kts | 2 +- .../id/paradiselost/blocks/natural/PoofBlock.java | 13 ++++++++++--- .../paradiselost/util/ParadiseLostSoundEvents.java | 1 + .../resources/assets/paradise_lost/lang/en_us.json | 3 +++ 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6056f156d..1b0321b36 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -48,7 +48,7 @@ repositories { maven { name = "Ladysnake" - url = uri("https://ladysnake.jfrog.io/artifactory/mods") + url = uri("https://maven.ladysnake.org/releases") } maven { diff --git a/src/main/java/net/id/paradiselost/blocks/natural/PoofBlock.java b/src/main/java/net/id/paradiselost/blocks/natural/PoofBlock.java index c87f0585c..adcf2b428 100644 --- a/src/main/java/net/id/paradiselost/blocks/natural/PoofBlock.java +++ b/src/main/java/net/id/paradiselost/blocks/natural/PoofBlock.java @@ -1,14 +1,17 @@ package net.id.paradiselost.blocks.natural; +import net.id.paradiselost.util.ParadiseLostSoundEvents; import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.ShapeContext; +import net.minecraft.entity.Entity; import net.minecraft.particle.ParticleTypes; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Box; import net.minecraft.util.math.Direction; import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; @@ -17,6 +20,8 @@ import net.minecraft.world.World; import net.minecraft.world.WorldAccess; +import java.util.List; + public class PoofBlock extends Block { public PoofBlock(Settings settings) { super(settings); @@ -29,9 +34,11 @@ public BlockState getStateForNeighborUpdate(BlockState state, Direction directio for (int i = 0; i < 4; i++) { world.addParticle(ParticleTypes.CAMPFIRE_COSY_SMOKE, pos.getX(), pos.getY(), pos.getZ(), rand.nextFloat() * 0.5, rand.nextFloat() * 0.5, rand.nextFloat() * 0.5); } - if (rand.nextBoolean()) world.playSound(null, pos, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.1F + rand.nextFloat() * 0.2F, rand.nextFloat() * 0.7F + 0.3F); - var player = world.getClosestPlayer(pos.getX(), pos.getY(), pos.getZ(), 5, false); - if (player != null) player.setFireTicks(40); + if (rand.nextBoolean()) world.playSound(null, pos, ParadiseLostSoundEvents.BLOCK_SURTRUM_RUSH, SoundCategory.BLOCKS, 0.1F + rand.nextFloat() * 0.2F, rand.nextFloat() * 0.7F + 0.3F); + List entities = world.getNonSpectatingEntities(Entity.class, new Box(pos.getX() - 5, pos.getY() - 5, pos.getZ() - 5, pos.getX() + 5, pos.getY() + 5, pos.getZ() + 5)); + for (Entity p : entities) { + if (p != null && p.isAlive() && p.getBlockPos().isWithinDistance(pos, 5)) p.setFireTicks(60); + } return Blocks.AIR.getDefaultState(); } return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos); diff --git a/src/main/java/net/id/paradiselost/util/ParadiseLostSoundEvents.java b/src/main/java/net/id/paradiselost/util/ParadiseLostSoundEvents.java index 4f9b60256..605bfb034 100644 --- a/src/main/java/net/id/paradiselost/util/ParadiseLostSoundEvents.java +++ b/src/main/java/net/id/paradiselost/util/ParadiseLostSoundEvents.java @@ -37,6 +37,7 @@ private ParadiseLostSoundEvents() { public static final SoundEvent BLOCK_PORTAL_AMBIENT = event("block.portal.ambient"); public static final SoundEvent BLOCK_PORTAL_TRAVEL = event("block.portal.travel"); public static final SoundEvent BLOCK_PORTAL_TRIGGER = event("block.portal.trigger"); + public static final SoundEvent BLOCK_SURTRUM_RUSH = childEvent("block.surtrum_air.rush", SoundEvents.BLOCK_FIRE_EXTINGUISH); public static final SoundEvent BLOCK_ORANGE_LEAVES_BREAK = childEvent("block.orange_leaves.break", SoundEvents.BLOCK_MOSS_BREAK); public static final SoundEvent BLOCK_ORANGE_LEAVES_DROP_FRUIT = childEvent("block.orange_leaves.drop_fruit", SoundEvents.BLOCK_CANDLE_BREAK); 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 5adf4bb4f..71986f3dd 100644 --- a/src/main/resources/assets/paradise_lost/lang/en_us.json +++ b/src/main/resources/assets/paradise_lost/lang/en_us.json @@ -446,6 +446,8 @@ "subtitles.paradise_lost.block.portal.ambient": "Paradise portal whooshes", "subtitles.paradise_lost.block.portal.travel": "Paradise portal noise fades", "subtitles.paradise_lost.block.portal.trigger": "Paradise portal noise intensifies", + + "subtitles.paradise_lost.block.surtrum_air.rush": "Hot air rushes out", "subtitles.paradise_lost.block.orange_leaves.break": "Orange leaves break", "subtitles.paradise_lost.block.orange_leaves.drop_fruit": "Orange leaves drop fruit", @@ -482,6 +484,7 @@ "subtitles.paradise_lost.item.armor.equip.olvite": "Olvite armor clanks", "subtitles.paradise_lost.item.armor.equip.glazed_gold": "Glazed Gold armor clinks", + "subtitles.paradise_lost.item.armor.equip.surtrum": "Surtrum armor clunks", "subtitles.paradise_lost.item.bloodstone.prick": "Bloodstone pricks", From df28584c25aeab0b8091c58b0558d9f51c30a7de Mon Sep 17 00:00:00 2001 From: Maxx <53229958+MBatt1@users.noreply.github.com> Date: Sun, 13 Aug 2023 12:10:33 -0500 Subject: [PATCH 8/9] curse you checkstyle the platypus!! --- src/main/java/net/id/paradiselost/ParadiseLost.java | 1 - .../net/id/paradiselost/blocks/ParadiseLostPortalBlock.java | 1 - src/main/java/net/id/paradiselost/config/ModMenuConfig.java | 2 +- .../java/net/id/paradiselost/config/ParadiseLostConfig.java | 4 ---- .../java/net/id/paradiselost/items/food/MysteryMilkItem.java | 1 - .../id/paradiselost/items/misc/ParadiseLostPortalItem.java | 1 - .../paradiselost/world/dimension/ParadiseLostDimension.java | 1 - 7 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/main/java/net/id/paradiselost/ParadiseLost.java b/src/main/java/net/id/paradiselost/ParadiseLost.java index 1885374c9..3d0fb406d 100644 --- a/src/main/java/net/id/paradiselost/ParadiseLost.java +++ b/src/main/java/net/id/paradiselost/ParadiseLost.java @@ -34,7 +34,6 @@ import net.id.paradiselost.world.dimension.ParadiseLostDimension; import net.id.paradiselost.world.feature.ParadiseLostFeatures; import net.id.paradiselost.world.gen.carver.ParadiseLostCarvers; -import net.minecraft.server.MinecraftServer; import net.minecraft.util.Identifier; import org.slf4j.Logger; diff --git a/src/main/java/net/id/paradiselost/blocks/ParadiseLostPortalBlock.java b/src/main/java/net/id/paradiselost/blocks/ParadiseLostPortalBlock.java index 09ec16bb9..0d6bf79eb 100644 --- a/src/main/java/net/id/paradiselost/blocks/ParadiseLostPortalBlock.java +++ b/src/main/java/net/id/paradiselost/blocks/ParadiseLostPortalBlock.java @@ -8,7 +8,6 @@ import net.kyrptonaught.customportalapi.interfaces.EntityInCustomPortal; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.client.MinecraftClient; import net.minecraft.particle.ParticleTypes; import net.minecraft.sound.SoundCategory; diff --git a/src/main/java/net/id/paradiselost/config/ModMenuConfig.java b/src/main/java/net/id/paradiselost/config/ModMenuConfig.java index 4a0496556..ae28da1d1 100644 --- a/src/main/java/net/id/paradiselost/config/ModMenuConfig.java +++ b/src/main/java/net/id/paradiselost/config/ModMenuConfig.java @@ -14,4 +14,4 @@ public ConfigScreenFactory getModConfigScreenFactory() { return parent -> AutoConfig.getConfigScreen(ParadiseLostConfig.class, parent).get(); } -} \ No newline at end of file +} diff --git a/src/main/java/net/id/paradiselost/config/ParadiseLostConfig.java b/src/main/java/net/id/paradiselost/config/ParadiseLostConfig.java index 14d3ff8c1..afba66c9e 100644 --- a/src/main/java/net/id/paradiselost/config/ParadiseLostConfig.java +++ b/src/main/java/net/id/paradiselost/config/ParadiseLostConfig.java @@ -3,14 +3,10 @@ import me.shedaniel.autoconfig.*; import me.shedaniel.autoconfig.annotation.*; import me.shedaniel.autoconfig.serializer.JanksonConfigSerializer; -import me.shedaniel.cloth.clothconfig.shadowed.blue.endless.jankson.*; import net.minecraft.block.Block; -import net.minecraft.block.Blocks; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import java.util.*; - @Config(name = "Paradise_Lost") public class ParadiseLostConfig implements ConfigData { diff --git a/src/main/java/net/id/paradiselost/items/food/MysteryMilkItem.java b/src/main/java/net/id/paradiselost/items/food/MysteryMilkItem.java index 19f1dea51..ee5c701a9 100644 --- a/src/main/java/net/id/paradiselost/items/food/MysteryMilkItem.java +++ b/src/main/java/net/id/paradiselost/items/food/MysteryMilkItem.java @@ -2,7 +2,6 @@ import net.id.paradiselost.items.ParadiseLostItems; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.UseAction; diff --git a/src/main/java/net/id/paradiselost/items/misc/ParadiseLostPortalItem.java b/src/main/java/net/id/paradiselost/items/misc/ParadiseLostPortalItem.java index 0ce8fb16d..8486ce038 100644 --- a/src/main/java/net/id/paradiselost/items/misc/ParadiseLostPortalItem.java +++ b/src/main/java/net/id/paradiselost/items/misc/ParadiseLostPortalItem.java @@ -3,7 +3,6 @@ import net.id.paradiselost.config.ParadiseLostConfig; import net.kyrptonaught.customportalapi.portal.PortalIgnitionSource; import net.kyrptonaught.customportalapi.portal.PortalPlacer; -import net.minecraft.block.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemUsageContext; import net.minecraft.util.ActionResult; diff --git a/src/main/java/net/id/paradiselost/world/dimension/ParadiseLostDimension.java b/src/main/java/net/id/paradiselost/world/dimension/ParadiseLostDimension.java index f8a8b350e..d2fcfab14 100644 --- a/src/main/java/net/id/paradiselost/world/dimension/ParadiseLostDimension.java +++ b/src/main/java/net/id/paradiselost/world/dimension/ParadiseLostDimension.java @@ -10,7 +10,6 @@ import net.id.paradiselost.util.MiscUtil; import net.kyrptonaught.customportalapi.api.CustomPortalBuilder; import net.kyrptonaught.customportalapi.event.CPASoundEventData; -import net.minecraft.block.Blocks; import net.minecraft.util.dynamic.RegistryOps; import net.minecraft.util.registry.*; import net.minecraft.world.World; From d3564d11520ddeeea8e701468c4849b2e943aed6 Mon Sep 17 00:00:00 2001 From: Maxx <53229958+MBatt1@users.noreply.github.com> Date: Sun, 13 Aug 2023 21:16:41 -0500 Subject: [PATCH 9/9] oopsie --- .../java/net/id/paradiselost/blocks/natural/PoofBlock.java | 3 +-- .../java/net/id/paradiselost/util/ParadiseLostSoundEvents.java | 1 + src/main/resources/assets/paradise_lost/lang/en_us.json | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/id/paradiselost/blocks/natural/PoofBlock.java b/src/main/java/net/id/paradiselost/blocks/natural/PoofBlock.java index adcf2b428..2ab983a9c 100644 --- a/src/main/java/net/id/paradiselost/blocks/natural/PoofBlock.java +++ b/src/main/java/net/id/paradiselost/blocks/natural/PoofBlock.java @@ -9,7 +9,6 @@ import net.minecraft.entity.Entity; import net.minecraft.particle.ParticleTypes; import net.minecraft.sound.SoundCategory; -import net.minecraft.sound.SoundEvents; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; import net.minecraft.util.math.Direction; @@ -46,7 +45,7 @@ public BlockState getStateForNeighborUpdate(BlockState state, Direction directio public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random random) { if (random.nextInt(48) == 0) { - world.playSound((double) pos.getX() + 0.5, (double) pos.getY() + 0.5, (double) pos.getZ() + 0.5, SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.BLOCKS, 1.0F + random.nextFloat(), random.nextFloat() * 0.7F + 0.3F, false); + world.playSound((double) pos.getX() + 0.5, (double) pos.getY() + 0.5, (double) pos.getZ() + 0.5, ParadiseLostSoundEvents.BLOCK_SURTRUM_CRACKLE, SoundCategory.BLOCKS, 1.0F + random.nextFloat(), random.nextFloat() * 0.7F + 0.3F, false); } } diff --git a/src/main/java/net/id/paradiselost/util/ParadiseLostSoundEvents.java b/src/main/java/net/id/paradiselost/util/ParadiseLostSoundEvents.java index 605bfb034..39eac86c1 100644 --- a/src/main/java/net/id/paradiselost/util/ParadiseLostSoundEvents.java +++ b/src/main/java/net/id/paradiselost/util/ParadiseLostSoundEvents.java @@ -38,6 +38,7 @@ private ParadiseLostSoundEvents() { public static final SoundEvent BLOCK_PORTAL_TRAVEL = event("block.portal.travel"); public static final SoundEvent BLOCK_PORTAL_TRIGGER = event("block.portal.trigger"); public static final SoundEvent BLOCK_SURTRUM_RUSH = childEvent("block.surtrum_air.rush", SoundEvents.BLOCK_FIRE_EXTINGUISH); + public static final SoundEvent BLOCK_SURTRUM_CRACKLE = childEvent("block.surtrum_air.crackle", SoundEvents.BLOCK_FIRE_AMBIENT); public static final SoundEvent BLOCK_ORANGE_LEAVES_BREAK = childEvent("block.orange_leaves.break", SoundEvents.BLOCK_MOSS_BREAK); public static final SoundEvent BLOCK_ORANGE_LEAVES_DROP_FRUIT = childEvent("block.orange_leaves.drop_fruit", SoundEvents.BLOCK_CANDLE_BREAK); 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 d9455eacc..96c9a75ba 100644 --- a/src/main/resources/assets/paradise_lost/lang/en_us.json +++ b/src/main/resources/assets/paradise_lost/lang/en_us.json @@ -450,6 +450,7 @@ "subtitles.paradise_lost.block.portal.trigger": "Paradise portal noise intensifies", "subtitles.paradise_lost.block.surtrum_air.rush": "Hot air rushes out", + "subtitles.paradise_lost.block.surtrum_air.crackle": "Meteorite Crackles", "subtitles.paradise_lost.block.orange_leaves.break": "Orange leaves break", "subtitles.paradise_lost.block.orange_leaves.drop_fruit": "Orange leaves drop fruit",