From efd4d1073760311729893b1a0e15857020e1014e Mon Sep 17 00:00:00 2001 From: AlasDiablo <25723276+AlasDiablo@users.noreply.github.com> Date: Sat, 6 Feb 2021 12:20:01 +0100 Subject: [PATCH] Fix requirement tools --- changelog.md | 8 ++++++++ src/main/java/fr/alasdiablo/janoeo/block/BasaltOre.java | 3 ++- .../fr/alasdiablo/janoeo/block/BasaltRedstoneOre.java | 2 +- src/main/java/fr/alasdiablo/janoeo/block/BasicOre.java | 1 + src/main/java/fr/alasdiablo/janoeo/block/EndOre.java | 1 + src/main/java/fr/alasdiablo/janoeo/block/GravelOre.java | 1 + src/main/java/fr/alasdiablo/janoeo/block/NetherOre.java | 3 ++- .../fr/alasdiablo/janoeo/block/NetherRedstoneOre.java | 2 +- 8 files changed, 17 insertions(+), 4 deletions(-) diff --git a/changelog.md b/changelog.md index 68a8deb..546f814 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,11 @@ +### 5.6.0.68 ++ Fix + + Missing requirement tools ++ Change + + SoundType of: + + Basalt Ore + + Nether Ore + ### 5.6.0.67 + Fix + Missing ore generation ([#10](https://github.com/AlasDiablo/JANOEO/issues/10)) diff --git a/src/main/java/fr/alasdiablo/janoeo/block/BasaltOre.java b/src/main/java/fr/alasdiablo/janoeo/block/BasaltOre.java index 7491bc1..b131aae 100644 --- a/src/main/java/fr/alasdiablo/janoeo/block/BasaltOre.java +++ b/src/main/java/fr/alasdiablo/janoeo/block/BasaltOre.java @@ -3,6 +3,7 @@ import fr.alasdiablo.diolib.generic.ExperienceRarity; import fr.alasdiablo.diolib.generic.IDropExperience; import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; import net.minecraft.block.RotatedPillarBlock; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -30,7 +31,7 @@ public BasaltOre(String registryName, ExperienceRarity experienceRarity) { super(Properties.create(Material.ROCK) .setRequiresTool() .hardnessAndResistance(2f, 4f) - .sound(SoundType.BASALT) + .sound(SoundType.NETHER_GOLD) .harvestLevel(2) .harvestTool(ToolType.PICKAXE) ); diff --git a/src/main/java/fr/alasdiablo/janoeo/block/BasaltRedstoneOre.java b/src/main/java/fr/alasdiablo/janoeo/block/BasaltRedstoneOre.java index 4269b06..98aeaff 100644 --- a/src/main/java/fr/alasdiablo/janoeo/block/BasaltRedstoneOre.java +++ b/src/main/java/fr/alasdiablo/janoeo/block/BasaltRedstoneOre.java @@ -31,7 +31,7 @@ public BasaltRedstoneOre(String registryName) { super(Properties.create(Material.ROCK) .setRequiresTool() .hardnessAndResistance(2f, 4f) - .sound(SoundType.BASALT) + .sound(SoundType.NETHER_GOLD) .harvestLevel(2) .harvestTool(ToolType.PICKAXE) .tickRandomly() diff --git a/src/main/java/fr/alasdiablo/janoeo/block/BasicOre.java b/src/main/java/fr/alasdiablo/janoeo/block/BasicOre.java index e2fe80f..c0c66f6 100644 --- a/src/main/java/fr/alasdiablo/janoeo/block/BasicOre.java +++ b/src/main/java/fr/alasdiablo/janoeo/block/BasicOre.java @@ -31,6 +31,7 @@ public BasicOre(String registryName, int harvestLevel, ExperienceRarity experien .hardnessAndResistance(3f) .harvestLevel(harvestLevel) .harvestTool(ToolType.PICKAXE) + .setRequiresTool() ); this.setRegistryName(registryName); this.experienceRarity = experienceRarity; diff --git a/src/main/java/fr/alasdiablo/janoeo/block/EndOre.java b/src/main/java/fr/alasdiablo/janoeo/block/EndOre.java index 2dbee27..9eeeb45 100644 --- a/src/main/java/fr/alasdiablo/janoeo/block/EndOre.java +++ b/src/main/java/fr/alasdiablo/janoeo/block/EndOre.java @@ -36,6 +36,7 @@ public EndOre(String registryName, ExperienceRarity experienceRarity) { .hardnessAndResistance(4.0f, 8.0f) .harvestLevel(3) .harvestTool(ToolType.PICKAXE) + .setRequiresTool() ); this.setRegistryName(registryName); this.experienceRarity = experienceRarity; diff --git a/src/main/java/fr/alasdiablo/janoeo/block/GravelOre.java b/src/main/java/fr/alasdiablo/janoeo/block/GravelOre.java index 169a4ce..c9465ad 100644 --- a/src/main/java/fr/alasdiablo/janoeo/block/GravelOre.java +++ b/src/main/java/fr/alasdiablo/janoeo/block/GravelOre.java @@ -30,6 +30,7 @@ public GravelOre(String registryName, ExperienceRarity experienceRarity) { .hardnessAndResistance(1f) .harvestLevel(2) .harvestTool(ToolType.SHOVEL) + .setRequiresTool() ); this.setRegistryName(registryName); this.experienceRarity = experienceRarity; diff --git a/src/main/java/fr/alasdiablo/janoeo/block/NetherOre.java b/src/main/java/fr/alasdiablo/janoeo/block/NetherOre.java index 84c4613..d5d4b63 100644 --- a/src/main/java/fr/alasdiablo/janoeo/block/NetherOre.java +++ b/src/main/java/fr/alasdiablo/janoeo/block/NetherOre.java @@ -32,10 +32,11 @@ public class NetherOre extends OreBlock implements INetherOre, IDropExperience { */ public NetherOre(String registryName, ExperienceRarity experienceRarity) { super(Properties.create(Material.ROCK) - .sound(SoundType.NETHERRACK) + .sound(SoundType.NETHER_ORE) .hardnessAndResistance(1f) .harvestLevel(2) .harvestTool(ToolType.PICKAXE) + .setRequiresTool() ); this.setRegistryName(registryName); this.experienceRarity = experienceRarity; diff --git a/src/main/java/fr/alasdiablo/janoeo/block/NetherRedstoneOre.java b/src/main/java/fr/alasdiablo/janoeo/block/NetherRedstoneOre.java index 3083838..8fc1375 100644 --- a/src/main/java/fr/alasdiablo/janoeo/block/NetherRedstoneOre.java +++ b/src/main/java/fr/alasdiablo/janoeo/block/NetherRedstoneOre.java @@ -23,7 +23,7 @@ public class NetherRedstoneOre extends RedstoneOreBlock implements INetherOre { */ public NetherRedstoneOre(String registryName) { super(Properties.create(Material.ROCK) - .sound(SoundType.NETHERRACK) + .sound(SoundType.NETHER_ORE) .tickRandomly() .hardnessAndResistance(1f) .harvestLevel(2)