diff --git a/src/main/java/net/mcreator/customoregen/block/ConcentrateddiamondoreBlock.java b/src/main/java/net/mcreator/customoregen/block/DeepslatediamondoreBlock.java similarity index 89% rename from src/main/java/net/mcreator/customoregen/block/ConcentrateddiamondoreBlock.java rename to src/main/java/net/mcreator/customoregen/block/DeepslatediamondoreBlock.java index 59cf3c900..d60a31af8 100644 --- a/src/main/java/net/mcreator/customoregen/block/ConcentrateddiamondoreBlock.java +++ b/src/main/java/net/mcreator/customoregen/block/DeepslatediamondoreBlock.java @@ -16,8 +16,8 @@ import net.minecraft.core.BlockPos; import net.mcreator.customoregen.procedures.OreexperienceProcedure; import net.mcreator.customoregen.init.CustomOreGenModBlocks; -public class ConcentrateddiamondoreBlock extends Block { - public ConcentrateddiamondoreBlock() { +public class DeepslatediamondoreBlock extends Block { + public DeepslatediamondoreBlock() { super(BlockBehaviour.Properties.of().sound(SoundType.STONE).strength(3f, 11f).requiresCorrectToolForDrops()); } @@ -28,7 +28,7 @@ public class ConcentrateddiamondoreBlock extends Block { @Override public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter world, BlockPos pos, Player player) { - return new ItemStack(CustomOreGenModBlocks.CONCENTRATEDDIAMONDORE.get()); + return new ItemStack(CustomOreGenModBlocks.DEEPSLATEDIAMONDORE.get()); } @Override diff --git a/src/main/java/net/mcreator/customoregen/init/CustomOreGenModBlocks.java b/src/main/java/net/mcreator/customoregen/init/CustomOreGenModBlocks.java index ce3de1d59..ebac1c6a0 100644 --- a/src/main/java/net/mcreator/customoregen/init/CustomOreGenModBlocks.java +++ b/src/main/java/net/mcreator/customoregen/init/CustomOreGenModBlocks.java @@ -24,7 +24,7 @@ import net.mcreator.customoregen.block.DeepslatelapisoreBlock; import net.mcreator.customoregen.block.DeepslateironoreBlock; import net.mcreator.customoregen.block.CopperloweroreBlock; import net.mcreator.customoregen.block.CopperhighoreBlock; -import net.mcreator.customoregen.block.ConcentrateddiamondoreBlock; +import net.mcreator.customoregen.block.DeepslatediamondoreBlock; import net.mcreator.customoregen.block.ConcentratedcoaloreBlock; import net.mcreator.customoregen.CustomOreGenMod; @@ -35,7 +35,7 @@ public class CustomOreGenModBlocks { public static final RegistryObject DEEPSLATEPUREGOLDENORE = REGISTRY.register("deepslatepuregoldenore", () -> new DeepslatepuregoldenoreBlock()); public static final RegistryObject CONCENTRATEDCOALORE = REGISTRY.register("concentratedcoalore", () -> new ConcentratedcoaloreBlock()); public static final RegistryObject DEEPSLATESHARDDIAMONDORE = REGISTRY.register("deepslatesharddiamondore", () -> new DeepslatesharddiamondoreBlock()); - public static final RegistryObject CONCENTRATEDDIAMONDORE = REGISTRY.register("concentrateddiamondore", () -> new ConcentrateddiamondoreBlock()); + public static final RegistryObject DEEPSLATEDIAMONDORE = REGISTRY.register("deepslatediamondore", () -> new DeepslatediamondoreBlock()); public static final RegistryObject LAPISORE = REGISTRY.register("lapisore", () -> new LapisoreBlock()); public static final RegistryObject DEEPSLATELAPISORE = REGISTRY.register("deepslatelapisore", () -> new DeepslatelapisoreBlock()); public static final RegistryObject REDSTONEORE = REGISTRY.register("redstoneore", () -> new RedstoneoreBlock()); diff --git a/src/main/java/net/mcreator/customoregen/init/CustomOreGenModItems.java b/src/main/java/net/mcreator/customoregen/init/CustomOreGenModItems.java index 8d8940048..6a516a924 100644 --- a/src/main/java/net/mcreator/customoregen/init/CustomOreGenModItems.java +++ b/src/main/java/net/mcreator/customoregen/init/CustomOreGenModItems.java @@ -32,7 +32,7 @@ public class CustomOreGenModItems { public static final RegistryObject DEEPSLATEPUREGOLDENORE = block(CustomOreGenModBlocks.DEEPSLATEPUREGOLDENORE); public static final RegistryObject CONCENTRATEDCOALORE = block(CustomOreGenModBlocks.CONCENTRATEDCOALORE); public static final RegistryObject DEEPSLATESHARDDIAMONDORE = block(CustomOreGenModBlocks.DEEPSLATESHARDDIAMONDORE); - public static final RegistryObject CONCENTRATEDDIAMONDORE = block(CustomOreGenModBlocks.CONCENTRATEDDIAMONDORE); + public static final RegistryObject DEEPSLATEDIAMONDORE = block(CustomOreGenModBlocks.DEEPSLATEDIAMONDORE); public static final RegistryObject LAPISORE = block(CustomOreGenModBlocks.LAPISORE); public static final RegistryObject DEEPSLATELAPISORE = block(CustomOreGenModBlocks.DEEPSLATELAPISORE); public static final RegistryObject REDSTONEORE = block(CustomOreGenModBlocks.REDSTONEORE); diff --git a/src/main/java/net/mcreator/customoregen/init/CustomOreGenModTabs.java b/src/main/java/net/mcreator/customoregen/init/CustomOreGenModTabs.java index 20ddbb219..1ef8ece25 100644 --- a/src/main/java/net/mcreator/customoregen/init/CustomOreGenModTabs.java +++ b/src/main/java/net/mcreator/customoregen/init/CustomOreGenModTabs.java @@ -30,7 +30,7 @@ public class CustomOreGenModTabs { .displayItems((parameters, output) -> { // Minerais output.accept(CustomOreGenModBlocks.DEEPSLATESHARDDIAMONDORE.get().asItem()); - output.accept(CustomOreGenModBlocks.CONCENTRATEDDIAMONDORE.get().asItem()); + output.accept(CustomOreGenModBlocks.DEEPSLATEDIAMONDORE.get().asItem()); output.accept(CustomOreGenModBlocks.PUREGOLDENORE.get().asItem()); output.accept(CustomOreGenModBlocks.DEEPSLATEPUREGOLDENORE.get().asItem()); output.accept(CustomOreGenModBlocks.CONCENTRATEDCOALORE.get().asItem()); diff --git a/src/main/resources/assets/custom_ore_gen/blockstates/concentrateddiamondore.json b/src/main/resources/assets/custom_ore_gen/blockstates/concentrateddiamondore.json deleted file mode 100644 index 7abf70c64..000000000 --- a/src/main/resources/assets/custom_ore_gen/blockstates/concentrateddiamondore.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "custom_ore_gen:block/concentrateddiamondore" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/custom_ore_gen/blockstates/deepslatediamondore.json b/src/main/resources/assets/custom_ore_gen/blockstates/deepslatediamondore.json new file mode 100644 index 000000000..e82a22f46 --- /dev/null +++ b/src/main/resources/assets/custom_ore_gen/blockstates/deepslatediamondore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "custom_ore_gen:block/deepslatediamondore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/custom_ore_gen/lang/en_us.json b/src/main/resources/assets/custom_ore_gen/lang/en_us.json index 2b6e8b87c..0080d7172 100644 --- a/src/main/resources/assets/custom_ore_gen/lang/en_us.json +++ b/src/main/resources/assets/custom_ore_gen/lang/en_us.json @@ -14,7 +14,7 @@ "block.custom_ore_gen.deepslateironore": "Deepslate iron ore", "item.custom_ore_gen.sharddiamondaxe": "Sharddiamondaxe", "block.custom_ore_gen.deepslatesharddiamondore": "Deepslate shard diamond ore", - "block.custom_ore_gen.concentrateddiamondore": "Concentrated diamond ore", + "block.custom_ore_gen.deepslatediamondore": "Deepslate diamond ore", "item.custom_ore_gen.shardironore": "Shard iron ore", "item.custom_ore_gen.diamondshard": "Diamond shard", "block.custom_ore_gen.deepslatepuregoldenore": "Deepslate pure golden ore", diff --git a/src/main/resources/assets/custom_ore_gen/models/block/concentrateddiamondore.json b/src/main/resources/assets/custom_ore_gen/models/block/deepslatediamondore.json similarity index 100% rename from src/main/resources/assets/custom_ore_gen/models/block/concentrateddiamondore.json rename to src/main/resources/assets/custom_ore_gen/models/block/deepslatediamondore.json diff --git a/src/main/resources/assets/custom_ore_gen/models/item/concentrateddiamondore.json b/src/main/resources/assets/custom_ore_gen/models/item/deepslatediamondore.json similarity index 81% rename from src/main/resources/assets/custom_ore_gen/models/item/concentrateddiamondore.json rename to src/main/resources/assets/custom_ore_gen/models/item/deepslatediamondore.json index 5c80ce544..30abc276d 100644 --- a/src/main/resources/assets/custom_ore_gen/models/item/concentrateddiamondore.json +++ b/src/main/resources/assets/custom_ore_gen/models/item/deepslatediamondore.json @@ -1,5 +1,5 @@ { - "parent": "custom_ore_gen:block/concentrateddiamondore", + "parent": "custom_ore_gen:block/deepslatediamondore", "display": { "thirdperson": { "rotation": [ diff --git a/src/main/resources/data/custom_ore_gen/forge/biome_modifier/concentrateddiamondore_biome_modifier.json b/src/main/resources/data/custom_ore_gen/forge/biome_modifier/deepslatediamondore_biome_modifier.json similarity index 66% rename from src/main/resources/data/custom_ore_gen/forge/biome_modifier/concentrateddiamondore_biome_modifier.json rename to src/main/resources/data/custom_ore_gen/forge/biome_modifier/deepslatediamondore_biome_modifier.json index 574501f4b..8a85ae245 100644 --- a/src/main/resources/data/custom_ore_gen/forge/biome_modifier/concentrateddiamondore_biome_modifier.json +++ b/src/main/resources/data/custom_ore_gen/forge/biome_modifier/deepslatediamondore_biome_modifier.json @@ -1,6 +1,6 @@ { "type": "forge:add_features", "biomes": "#custom_ore_gen:cold_biomes", - "features": "custom_ore_gen:concentrateddiamondore", + "features": "custom_ore_gen:deepslatediamondore", "step": "underground_ores" } \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/concentrateddiamondore.json b/src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslatediamondore.json similarity index 96% rename from src/main/resources/data/custom_ore_gen/loot_tables/blocks/concentrateddiamondore.json rename to src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslatediamondore.json index 082e60f53..371687508 100644 --- a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/concentrateddiamondore.json +++ b/src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslatediamondore.json @@ -78,5 +78,5 @@ ] } ], - "random_sequence": "custom_ore_gen:blocks/concentrateddiamondore" + "random_sequence": "custom_ore_gen:blocks/deepslatediamondore" } \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/worldgen/configured_feature/concentrateddiamondore.json b/src/main/resources/data/custom_ore_gen/worldgen/configured_feature/deepslatediamondore.json similarity index 82% rename from src/main/resources/data/custom_ore_gen/worldgen/configured_feature/concentrateddiamondore.json rename to src/main/resources/data/custom_ore_gen/worldgen/configured_feature/deepslatediamondore.json index 91c45c120..7ff81bc3a 100644 --- a/src/main/resources/data/custom_ore_gen/worldgen/configured_feature/concentrateddiamondore.json +++ b/src/main/resources/data/custom_ore_gen/worldgen/configured_feature/deepslatediamondore.json @@ -10,7 +10,7 @@ "tag": "forge:stone" }, "state": { - "Name": "custom_ore_gen:concentrateddiamondore" + "Name": "custom_ore_gen:deepslatediamondore" } } ] diff --git a/src/main/resources/data/custom_ore_gen/worldgen/placed_feature/concentrateddiamondore.json b/src/main/resources/data/custom_ore_gen/worldgen/placed_feature/deepslatediamondore.json similarity index 88% rename from src/main/resources/data/custom_ore_gen/worldgen/placed_feature/concentrateddiamondore.json rename to src/main/resources/data/custom_ore_gen/worldgen/placed_feature/deepslatediamondore.json index 50611b8c5..cb3bcae6f 100644 --- a/src/main/resources/data/custom_ore_gen/worldgen/placed_feature/concentrateddiamondore.json +++ b/src/main/resources/data/custom_ore_gen/worldgen/placed_feature/deepslatediamondore.json @@ -1,5 +1,5 @@ { - "feature": "custom_ore_gen:concentrateddiamondore", + "feature": "custom_ore_gen:deepslatediamondore", "placement": [ { "type": "minecraft:count", diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index deba1de26..e28246c78 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -11,7 +11,7 @@ "custom_ore_gen:redstoneore", "custom_ore_gen:deepslatelapisore", "custom_ore_gen:lapisore", - "custom_ore_gen:concentrateddiamondore", + "custom_ore_gen:deepslatediamondore", "custom_ore_gen:deepslatesharddiamondore", "custom_ore_gen:concentratedcoalore", "custom_ore_gen:deepslatepuregoldenore", diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json index c9d74b86b..fd8eddf06 100644 --- a/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json +++ b/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json @@ -6,7 +6,7 @@ "custom_ore_gen:copperhighore", "custom_ore_gen:deepslateredstoneore", "custom_ore_gen:redstoneore", - "custom_ore_gen:concentrateddiamondore", + "custom_ore_gen:deepslatediamondore", "custom_ore_gen:deepslatesharddiamondore", "custom_ore_gen:deepslatepuregoldenore", "custom_ore_gen:sharddiamondblockore"