TR ores fixes (#2654). Thanks to josilo
* Remove deprecated breakByTool() function. Closes #2609 * Removed leftover unused imports * Set correct BlockSoundGroup for deepslate ores * Fix tin tool tag
This commit is contained in:
parent
8d2c181b17
commit
a0d827fa3b
3 changed files with 39 additions and 37 deletions
|
@ -26,7 +26,6 @@ package techreborn.init;
|
||||||
|
|
||||||
import com.google.common.base.Preconditions;
|
import com.google.common.base.Preconditions;
|
||||||
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
|
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
|
||||||
import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
|
|
||||||
import net.minecraft.block.*;
|
import net.minecraft.block.*;
|
||||||
import net.minecraft.entity.EntityType;
|
import net.minecraft.entity.EntityType;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
|
@ -80,7 +79,6 @@ import techreborn.entities.EntityNukePrimed;
|
||||||
import techreborn.items.DynamicCellItem;
|
import techreborn.items.DynamicCellItem;
|
||||||
import techreborn.items.UpgradeItem;
|
import techreborn.items.UpgradeItem;
|
||||||
import techreborn.items.armor.QuantumSuitItem;
|
import techreborn.items.armor.QuantumSuitItem;
|
||||||
import techreborn.items.tool.MiningLevel;
|
|
||||||
import techreborn.utils.InitUtils;
|
import techreborn.utils.InitUtils;
|
||||||
import techreborn.world.OreDistribution;
|
import techreborn.world.OreDistribution;
|
||||||
|
|
||||||
|
@ -376,45 +374,44 @@ public class TRContent {
|
||||||
private final static Map<Ores, Ores> deepslateMap = new HashMap<>();
|
private final static Map<Ores, Ores> deepslateMap = new HashMap<>();
|
||||||
|
|
||||||
public enum Ores implements ItemConvertible {
|
public enum Ores implements ItemConvertible {
|
||||||
BAUXITE(MiningLevel.IRON, OreDistribution.BAUXITE),
|
BAUXITE(OreDistribution.BAUXITE),
|
||||||
CINNABAR(MiningLevel.IRON, OreDistribution.CINNABAR),
|
CINNABAR(OreDistribution.CINNABAR),
|
||||||
GALENA(MiningLevel.IRON, OreDistribution.GALENA),
|
GALENA(OreDistribution.GALENA),
|
||||||
IRIDIUM(MiningLevel.DIAMOND, OreDistribution.IRIDIUM),
|
IRIDIUM(OreDistribution.IRIDIUM),
|
||||||
LEAD(MiningLevel.IRON, OreDistribution.LEAD),
|
LEAD(OreDistribution.LEAD),
|
||||||
PERIDOT(MiningLevel.DIAMOND, OreDistribution.PERIDOT),
|
PERIDOT(OreDistribution.PERIDOT),
|
||||||
PYRITE(MiningLevel.DIAMOND, OreDistribution.PYRITE),
|
PYRITE(OreDistribution.PYRITE),
|
||||||
RUBY(MiningLevel.IRON, OreDistribution.RUBY),
|
RUBY(OreDistribution.RUBY),
|
||||||
SAPPHIRE(MiningLevel.IRON, OreDistribution.SAPPHIRE),
|
SAPPHIRE(OreDistribution.SAPPHIRE),
|
||||||
SHELDONITE(MiningLevel.DIAMOND, OreDistribution.SHELDONITE),
|
SHELDONITE(OreDistribution.SHELDONITE),
|
||||||
SILVER(MiningLevel.IRON, OreDistribution.SILVER),
|
SILVER(OreDistribution.SILVER),
|
||||||
SODALITE(MiningLevel.DIAMOND, OreDistribution.SODALITE),
|
SODALITE(OreDistribution.SODALITE),
|
||||||
SPHALERITE(MiningLevel.IRON, OreDistribution.SPHALERITE),
|
SPHALERITE(OreDistribution.SPHALERITE),
|
||||||
TIN(MiningLevel.STONE, OreDistribution.TIN),
|
TIN(OreDistribution.TIN),
|
||||||
TUNGSTEN(MiningLevel.DIAMOND, OreDistribution.TUNGSTEN),
|
TUNGSTEN(OreDistribution.TUNGSTEN),
|
||||||
|
|
||||||
DEEPSLATE_BAUXITE(BAUXITE, MiningLevel.IRON),
|
DEEPSLATE_BAUXITE(BAUXITE),
|
||||||
DEEPSLATE_GALENA(GALENA, MiningLevel.IRON),
|
DEEPSLATE_GALENA(GALENA),
|
||||||
DEEPSLATE_IRIDIUM(IRIDIUM, MiningLevel.DIAMOND),
|
DEEPSLATE_IRIDIUM(IRIDIUM),
|
||||||
DEEPSLATE_LEAD(LEAD, MiningLevel.IRON),
|
DEEPSLATE_LEAD(LEAD),
|
||||||
DEEPSLATE_PERIDOT(PERIDOT, MiningLevel.DIAMOND),
|
DEEPSLATE_PERIDOT(PERIDOT),
|
||||||
DEEPSLATE_RUBY(RUBY, MiningLevel.IRON),
|
DEEPSLATE_RUBY(RUBY),
|
||||||
DEEPSLATE_SAPPHIRE(SAPPHIRE, MiningLevel.IRON),
|
DEEPSLATE_SAPPHIRE(SAPPHIRE),
|
||||||
DEEPSLATE_SHELDONITE(SHELDONITE, MiningLevel.DIAMOND),
|
DEEPSLATE_SHELDONITE(SHELDONITE),
|
||||||
DEEPSLATE_SILVER(SILVER, MiningLevel.IRON),
|
DEEPSLATE_SILVER(SILVER),
|
||||||
DEEPSLATE_SODALITE(SODALITE, MiningLevel.DIAMOND),
|
DEEPSLATE_SODALITE(SODALITE),
|
||||||
DEEPSLATE_TIN(TIN, MiningLevel.STONE),
|
DEEPSLATE_TIN(TIN),
|
||||||
DEEPSLATE_TUNGSTEN(TUNGSTEN, MiningLevel.DIAMOND);
|
DEEPSLATE_TUNGSTEN(TUNGSTEN);
|
||||||
|
|
||||||
public final String name;
|
public final String name;
|
||||||
public final Block block;
|
public final Block block;
|
||||||
public final OreDistribution distribution;
|
public final OreDistribution distribution;
|
||||||
|
|
||||||
Ores(MiningLevel miningLevel, OreDistribution distribution) {
|
Ores(OreDistribution distribution) {
|
||||||
name = this.toString().toLowerCase(Locale.ROOT);
|
name = this.toString().toLowerCase(Locale.ROOT);
|
||||||
block = new OreBlock(FabricBlockSettings.of(Material.STONE)
|
block = new OreBlock(FabricBlockSettings.of(Material.STONE)
|
||||||
.breakByTool(FabricToolTags.PICKAXES, miningLevel.intLevel)
|
|
||||||
.requiresTool()
|
.requiresTool()
|
||||||
.sounds(BlockSoundGroup.STONE)
|
.sounds(name.startsWith("deepslate") ? BlockSoundGroup.DEEPSLATE : BlockSoundGroup.STONE)
|
||||||
.strength(2f, 2f)
|
.strength(2f, 2f)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -422,8 +419,8 @@ public class TRContent {
|
||||||
this.distribution = distribution;
|
this.distribution = distribution;
|
||||||
}
|
}
|
||||||
|
|
||||||
Ores(TRContent.Ores stoneOre, MiningLevel miningLevel) {
|
Ores(TRContent.Ores stoneOre) {
|
||||||
this(miningLevel, null);
|
this((OreDistribution) null);
|
||||||
deepslateMap.put(stoneOre, this);
|
deepslateMap.put(stoneOre, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -17,8 +17,6 @@
|
||||||
"techreborn:deepslate_sapphire_ore",
|
"techreborn:deepslate_sapphire_ore",
|
||||||
"techreborn:silver_ore",
|
"techreborn:silver_ore",
|
||||||
"techreborn:deepslate_silver_ore",
|
"techreborn:deepslate_silver_ore",
|
||||||
"techreborn:sphalerite_ore",
|
"techreborn:sphalerite_ore"
|
||||||
"techreborn:tin_ore",
|
|
||||||
"techreborn:deepslate_tin_ore"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
|
@ -0,0 +1,7 @@
|
||||||
|
{
|
||||||
|
"replace": false,
|
||||||
|
"values": [
|
||||||
|
"techreborn:tin_ore",
|
||||||
|
"techreborn:deepslate_tin_ore"
|
||||||
|
]
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue