diff --git a/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java b/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java index 08189e62f..c14c8a64c 100644 --- a/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java +++ b/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java @@ -244,10 +244,11 @@ private static Settings flower() { // Tall Flowers public static final ParadiseLostTallBrushBlock WILD_FLAX = add("wild_flax", new ParadiseLostTallBrushBlock(flower()), flammablePlant, cutoutMippedRenderLayer); - + // Ores - public static final ExperienceDroppingBlock CHERINE_ORE = add("cherine_ore", new ExperienceDroppingBlock(UniformIntProvider.create(0, 2), create().requiresTool().strength(3f))); - public static final ExperienceDroppingBlock OLVITE_ORE = add("olvite_ore", new ExperienceDroppingBlock(UniformIntProvider.create(1, 3), create().requiresTool().strength(3f))); + public static final ExperienceDroppingBlock CHERINE_ORE = add("cherine_ore", new ExperienceDroppingBlock(UniformIntProvider.create(0, 2), create().requiresTool().strength(1f, 3f))); + public static final ExperienceDroppingBlock OLVITE_ORE = add("olvite_ore", new ExperienceDroppingBlock(UniformIntProvider.create(1, 3), create().requiresTool().strength(1.5f, 3f))); + public static final RedstoneOreBlock FLOESTONE_REDSTONE_ORE = add("floestone_redstone_ore", new RedstoneOreBlock(copy(REDSTONE_ORE).strength(1.5f, 3f))); public static final ExperienceDroppingBlock SURTRUM = add("surtrum", new SurtrumOreBlock(UniformIntProvider.create(2, 5), create().sounds(BlockSoundGroup.NETHER_GOLD_ORE).requiresTool().strength(9f, 20f))); public static final Block METAMORPHIC_SHELL = add("metamorphic_shell", new Block(create().sounds(BlockSoundGroup.TUFF).requiresTool().strength(40f, 6f))); public static final PoofBlock SURTRUM_AIR = add("surtrum_air", new PoofBlock(create().replaceable().sounds(BlockSoundGroup.NETHER_GOLD_ORE))); diff --git a/src/main/java/net/id/paradiselost/datagen/LootTableGen.java b/src/main/java/net/id/paradiselost/datagen/LootTableGen.java index be2f747fe..d601b50c6 100644 --- a/src/main/java/net/id/paradiselost/datagen/LootTableGen.java +++ b/src/main/java/net/id/paradiselost/datagen/LootTableGen.java @@ -10,6 +10,8 @@ import net.minecraft.block.TallPlantBlock; import net.minecraft.block.enums.DoubleBlockHalf; import net.minecraft.data.server.loottable.BlockLootTableGenerator; +import net.minecraft.data.server.loottable.vanilla.VanillaBlockLootTableGenerator; +import net.minecraft.data.server.loottable.vanilla.VanillaLootTableProviders; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.Enchantments; import net.minecraft.item.Item; @@ -217,6 +219,7 @@ public void generate() { // Ores addOreDrops(CHERINE_ORE, ParadiseLostItems.CHERINE); addOreDrops(OLVITE_ORE, ParadiseLostItems.OLVITE); + addDrop(FLOESTONE_REDSTONE_ORE, this::redstoneOreDrops); addOreDrops(SURTRUM, ParadiseLostItems.RAW_SURTRUM); addDrop(METAMORPHIC_SHELL); addOreDrops(LEVITA_ORE, ParadiseLostItems.LEVITA_GEM); diff --git a/src/main/java/net/id/paradiselost/items/ParadiseLostItemGroups.java b/src/main/java/net/id/paradiselost/items/ParadiseLostItemGroups.java index 7f89f3024..83ea43075 100644 --- a/src/main/java/net/id/paradiselost/items/ParadiseLostItemGroups.java +++ b/src/main/java/net/id/paradiselost/items/ParadiseLostItemGroups.java @@ -115,6 +115,7 @@ public class ParadiseLostItemGroups { // ores entries.add(CHERINE_ORE); entries.add(OLVITE_ORE); + entries.add(FLOESTONE_REDSTONE_ORE); entries.add(SURTRUM); entries.add(METAMORPHIC_SHELL); entries.add(LEVITA_ORE); diff --git a/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java b/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java index 52e4cb988..f2938319e 100644 --- a/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java +++ b/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java @@ -230,6 +230,7 @@ private static Settings food(FoodComponent foodComponent) { // ores public static final BlockItem CHERINE_ORE = add(ParadiseLostBlocks.CHERINE_ORE); public static final BlockItem OLVITE_ORE = add(ParadiseLostBlocks.OLVITE_ORE); + public static final BlockItem FLOESTONE_REDSTONE_ORE = add(ParadiseLostBlocks.FLOESTONE_REDSTONE_ORE); public static final BlockItem SURTRUM = add(ParadiseLostBlocks.SURTRUM, new Settings().fireproof()); public static final BlockItem METAMORPHIC_SHELL = add(ParadiseLostBlocks.METAMORPHIC_SHELL); public static final BlockItem LEVITA_ORE = add(ParadiseLostBlocks.LEVITA_ORE); diff --git a/src/main/resources/asset_helper.py b/src/main/resources/asset_helper.py index 03c8a2f42..bb5eb832d 100644 --- a/src/main/resources/asset_helper.py +++ b/src/main/resources/asset_helper.py @@ -80,10 +80,7 @@ def generate_slab_block(block_id, base_block_id, texture): -generate_standard_item("aurel_hanging_sign") -generate_standard_item("mother_aurel_hanging_sign") -generate_standard_item("orange_hanging_sign") -generate_standard_item("wisteria_hanging_sign") +generate_standard_block("floestone_redstone_ore") diff --git a/src/main/resources/assets/paradise_lost/blockstates/floestone_redstone_ore.json b/src/main/resources/assets/paradise_lost/blockstates/floestone_redstone_ore.json new file mode 100644 index 000000000..9418b51f8 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/blockstates/floestone_redstone_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "paradise_lost:block/floestone_redstone_ore" + } + } +} \ No newline at end of file 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 638f5ef68..6a18ce707 100644 --- a/src/main/resources/assets/paradise_lost/lang/en_us.json +++ b/src/main/resources/assets/paradise_lost/lang/en_us.json @@ -53,7 +53,7 @@ "block.paradise_lost.cobbled_floestone_wall": "Cobbled Floestone Wall", "block.paradise_lost.mossy_floestone": "Mossy Cobbled Floestone", - "block.paradise_lost.golden_mossy_floestone": "Golden Mossy Floestone", + "block.paradise_lost.golden_mossy_floestone": "Golden Mossy Cobbled Floestone", "block.paradise_lost.mossy_floestone_slab": "Mossy Cobbled Floestone Slab", "block.paradise_lost.mossy_floestone_stairs": "Mossy Cobbled Floestone Stairs", "block.paradise_lost.mossy_floestone_wall": "Mossy Cobbled Floestone Wall", @@ -210,6 +210,7 @@ "block.paradise_lost.cherine_ore": "Cherine Ore", "block.paradise_lost.olvite_ore": "Olvite Ore", + "block.paradise_lost.floestone_redstone_ore": "Floestone Redstone Ore", "block.paradise_lost.surtrum": "Surtrum", "block.paradise_lost.metamorphic_shell": "Metamorphic Shell", "block.paradise_lost.levita_ore": "Levita Ore", diff --git a/src/main/resources/assets/paradise_lost/models/block/floestone_redstone_ore.json b/src/main/resources/assets/paradise_lost/models/block/floestone_redstone_ore.json new file mode 100644 index 000000000..4d390a2f2 --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/block/floestone_redstone_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "paradise_lost:block/floestone_redstone_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/paradise_lost/models/item/floestone_redstone_ore.json b/src/main/resources/assets/paradise_lost/models/item/floestone_redstone_ore.json new file mode 100644 index 000000000..4385f1ffa --- /dev/null +++ b/src/main/resources/assets/paradise_lost/models/item/floestone_redstone_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "paradise_lost:block/floestone_redstone_ore" +} \ No newline at end of file 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 index 9701f304a..ff208853f 100644 Binary files a/src/main/resources/assets/paradise_lost/textures/block/chiseled_floestone.png and b/src/main/resources/assets/paradise_lost/textures/block/chiseled_floestone.png differ diff --git a/src/main/resources/assets/paradise_lost/textures/block/cobbled_floestone.png b/src/main/resources/assets/paradise_lost/textures/block/cobbled_floestone.png index 22c2e584f..769f684a5 100644 Binary files a/src/main/resources/assets/paradise_lost/textures/block/cobbled_floestone.png and b/src/main/resources/assets/paradise_lost/textures/block/cobbled_floestone.png differ diff --git a/src/main/resources/assets/paradise_lost/textures/block/floestone_redstone_ore.png b/src/main/resources/assets/paradise_lost/textures/block/floestone_redstone_ore.png new file mode 100644 index 000000000..b3f308017 Binary files /dev/null and b/src/main/resources/assets/paradise_lost/textures/block/floestone_redstone_ore.png differ diff --git a/src/main/resources/assets/paradise_lost/textures/block/golden_mossy_floestone.png b/src/main/resources/assets/paradise_lost/textures/block/golden_mossy_floestone.png index f42e2a4f8..c26915f73 100644 Binary files a/src/main/resources/assets/paradise_lost/textures/block/golden_mossy_floestone.png and b/src/main/resources/assets/paradise_lost/textures/block/golden_mossy_floestone.png differ diff --git a/src/main/resources/assets/paradise_lost/textures/block/mossy_floestone.png b/src/main/resources/assets/paradise_lost/textures/block/mossy_floestone.png index f4bc4630c..9aff50ed3 100644 Binary files a/src/main/resources/assets/paradise_lost/textures/block/mossy_floestone.png and b/src/main/resources/assets/paradise_lost/textures/block/mossy_floestone.png differ diff --git a/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json index eba38f924..63acfeb54 100644 --- a/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -2,6 +2,7 @@ "values": [ "paradise_lost:cherine_ore", "paradise_lost:olvite_ore", + "paradise_lost:floestone_redstone_ore", "paradise_lost:surtrum", "paradise_lost:metamorphic_shell", "paradise_lost:levita_ore", diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/cherine_ore.json b/src/main/resources/data/paradise_lost/loot_table/blocks/cherine_ore.json index fddf57dbd..0dfd26a43 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/cherine_ore.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/cherine_ore.json @@ -31,10 +31,22 @@ { "type": "minecraft:item", "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, { "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops", - "function": "minecraft:apply_bonus" + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 1 + } }, { "function": "minecraft:explosion_decay" diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_redstone_ore.json b/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_redstone_ore.json new file mode 100644 index 000000000..e47fc4ba0 --- /dev/null +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_redstone_ore.json @@ -0,0 +1,63 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "paradise_lost:floestone_redstone_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 5.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + }, + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 1 + } + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:redstone" + } + ] + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/worldgen/biome/autumnal_tundra.json b/src/main/resources/data/paradise_lost/worldgen/biome/autumnal_tundra.json index 361d9a3e5..f1346a5bf 100644 --- a/src/main/resources/data/paradise_lost/worldgen/biome/autumnal_tundra.json +++ b/src/main/resources/data/paradise_lost/worldgen/biome/autumnal_tundra.json @@ -47,7 +47,8 @@ "paradise_lost:levita_blob", "paradise_lost:ore_cherine", "paradise_lost:ore_levita", - "paradise_lost:ore_olvite" + "paradise_lost:ore_olvite", + "paradise_lost:ore_floestone_redstone" ], [], [ diff --git a/src/main/resources/data/paradise_lost/worldgen/biome/continental_plateau.json b/src/main/resources/data/paradise_lost/worldgen/biome/continental_plateau.json index 8ce229454..5166c94dd 100644 --- a/src/main/resources/data/paradise_lost/worldgen/biome/continental_plateau.json +++ b/src/main/resources/data/paradise_lost/worldgen/biome/continental_plateau.json @@ -44,7 +44,8 @@ "paradise_lost:levita_blob", "paradise_lost:ore_cherine", "paradise_lost:ore_levita", - "paradise_lost:ore_olvite" + "paradise_lost:ore_olvite", + "paradise_lost:ore_floestone_redstone" ], [], [ diff --git a/src/main/resources/data/paradise_lost/worldgen/biome/highlands.json b/src/main/resources/data/paradise_lost/worldgen/biome/highlands.json index 309980df6..938862bad 100644 --- a/src/main/resources/data/paradise_lost/worldgen/biome/highlands.json +++ b/src/main/resources/data/paradise_lost/worldgen/biome/highlands.json @@ -44,7 +44,8 @@ "paradise_lost:levita_blob", "paradise_lost:ore_cherine", "paradise_lost:ore_levita", - "paradise_lost:ore_olvite" + "paradise_lost:ore_olvite", + "paradise_lost:ore_floestone_redstone" ], [], [ diff --git a/src/main/resources/data/paradise_lost/worldgen/biome/highlands_forest.json b/src/main/resources/data/paradise_lost/worldgen/biome/highlands_forest.json index d499fccf9..e32174d14 100644 --- a/src/main/resources/data/paradise_lost/worldgen/biome/highlands_forest.json +++ b/src/main/resources/data/paradise_lost/worldgen/biome/highlands_forest.json @@ -42,7 +42,8 @@ "paradise_lost:levita_blob", "paradise_lost:ore_cherine", "paradise_lost:ore_levita", - "paradise_lost:ore_olvite" + "paradise_lost:ore_olvite", + "paradise_lost:ore_floestone_redstone" ], [], [ diff --git a/src/main/resources/data/paradise_lost/worldgen/biome/highlands_grand_glade.json b/src/main/resources/data/paradise_lost/worldgen/biome/highlands_grand_glade.json index f65c82e8b..1989dad43 100644 --- a/src/main/resources/data/paradise_lost/worldgen/biome/highlands_grand_glade.json +++ b/src/main/resources/data/paradise_lost/worldgen/biome/highlands_grand_glade.json @@ -44,7 +44,8 @@ "paradise_lost:levita_blob", "paradise_lost:ore_cherine", "paradise_lost:ore_levita", - "paradise_lost:ore_olvite" + "paradise_lost:ore_olvite", + "paradise_lost:ore_floestone_redstone" ], [], [ diff --git a/src/main/resources/data/paradise_lost/worldgen/biome/highlands_shield.json b/src/main/resources/data/paradise_lost/worldgen/biome/highlands_shield.json index 9ae2173b8..727a76fe6 100644 --- a/src/main/resources/data/paradise_lost/worldgen/biome/highlands_shield.json +++ b/src/main/resources/data/paradise_lost/worldgen/biome/highlands_shield.json @@ -46,7 +46,8 @@ "paradise_lost:levita_blob", "paradise_lost:ore_cherine", "paradise_lost:ore_levita", - "paradise_lost:ore_olvite" + "paradise_lost:ore_olvite", + "paradise_lost:ore_floestone_redstone" ], [], [ diff --git a/src/main/resources/data/paradise_lost/worldgen/biome/highlands_thicket.json b/src/main/resources/data/paradise_lost/worldgen/biome/highlands_thicket.json index 5e90e3c36..c0be97ca8 100644 --- a/src/main/resources/data/paradise_lost/worldgen/biome/highlands_thicket.json +++ b/src/main/resources/data/paradise_lost/worldgen/biome/highlands_thicket.json @@ -45,7 +45,8 @@ "paradise_lost:levita_blob", "paradise_lost:ore_cherine", "paradise_lost:ore_levita", - "paradise_lost:ore_olvite" + "paradise_lost:ore_olvite", + "paradise_lost:ore_floestone_redstone" ], [], [ diff --git a/src/main/resources/data/paradise_lost/worldgen/biome/tradewinds.json b/src/main/resources/data/paradise_lost/worldgen/biome/tradewinds.json index 14ab1691f..978923c28 100644 --- a/src/main/resources/data/paradise_lost/worldgen/biome/tradewinds.json +++ b/src/main/resources/data/paradise_lost/worldgen/biome/tradewinds.json @@ -42,7 +42,8 @@ "paradise_lost:levita_blob", "paradise_lost:ore_cherine", "paradise_lost:ore_levita", - "paradise_lost:ore_olvite" + "paradise_lost:ore_olvite", + "paradise_lost:ore_floestone_redstone" ], [], [ diff --git a/src/main/resources/data/paradise_lost/worldgen/biome/wisteria_woods.json b/src/main/resources/data/paradise_lost/worldgen/biome/wisteria_woods.json index 8b4ab4817..aefbde7fe 100644 --- a/src/main/resources/data/paradise_lost/worldgen/biome/wisteria_woods.json +++ b/src/main/resources/data/paradise_lost/worldgen/biome/wisteria_woods.json @@ -42,7 +42,8 @@ "paradise_lost:levita_blob", "paradise_lost:ore_cherine", "paradise_lost:ore_levita", - "paradise_lost:ore_olvite" + "paradise_lost:ore_olvite", + "paradise_lost:ore_floestone_redstone" ], [], [ diff --git a/src/main/resources/data/paradise_lost/worldgen/configured_feature/ore_floestone_redstone.json b/src/main/resources/data/paradise_lost/worldgen/configured_feature/ore_floestone_redstone.json new file mode 100644 index 000000000..2c5313c10 --- /dev/null +++ b/src/main/resources/data/paradise_lost/worldgen/configured_feature/ore_floestone_redstone.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 11, + "targets": [ + { + "state": { + "Name": "paradise_lost:floestone_redstone_ore" + }, + "target": { + "predicate_type": "minecraft:block_match", + "block": "paradise_lost:floestone" + } + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/worldgen/placed_feature/ore_floestone_redstone.json b/src/main/resources/data/paradise_lost/worldgen/placed_feature/ore_floestone_redstone.json new file mode 100644 index 000000000..9fcb031b4 --- /dev/null +++ b/src/main/resources/data/paradise_lost/worldgen/placed_feature/ore_floestone_redstone.json @@ -0,0 +1,27 @@ +{ + "feature": "paradise_lost:ore_floestone_redstone", + "placement": [ + { + "type": "minecraft:count", + "count": 6 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 100 + }, + "min_inclusive": { + "absolute": 20 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file