Merge pull request #2760 from Ayutac/1.18-Ayutac-38

Added XP for ores, fixes #2759
This commit is contained in:
modmuss50 2022-01-20 19:56:23 +00:00 committed by GitHub
commit e3e5414cee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 7 deletions

View file

@ -32,6 +32,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemConvertible;
import net.minecraft.item.ItemStack;
import net.minecraft.sound.BlockSoundGroup;
import net.minecraft.util.math.intprovider.UniformIntProvider;
import org.jetbrains.annotations.Nullable;
import reborncore.api.blockentity.IUpgrade;
import reborncore.common.fluid.FluidValue;
@ -428,20 +429,25 @@ public class TRContent {
public final Block block;
public final OreDistribution distribution;
Ores(OreDistribution distribution) {
Ores(OreDistribution distribution, UniformIntProvider experienceDroppedFallback) {
name = this.toString().toLowerCase(Locale.ROOT);
block = new OreBlock(FabricBlockSettings.of(Material.STONE)
.requiresTool()
.sounds(name.startsWith("deepslate") ? BlockSoundGroup.DEEPSLATE : BlockSoundGroup.STONE)
.strength(2f, 2f)
.strength(2f, 2f),
distribution != null ? distribution.experienceDropped : experienceDroppedFallback
);
InitUtils.setup(block, name + "_ore");
this.distribution = distribution;
}
Ores(OreDistribution distribution) {
this(distribution, null);
}
Ores(TRContent.Ores stoneOre) {
this((OreDistribution) null);
this(null, stoneOre.distribution != null ? stoneOre.distribution.experienceDropped : null);
deepslateMap.put(stoneOre, this);
unDeepslateMap.put(this, stoneOre);
}