From f4c0cf9e8eaf44ae8c96343e465e345a99cccaa1 Mon Sep 17 00:00:00 2001
From: Ayutac <skoch02@students.uni-mainz.de>
Date: Thu, 20 Jan 2022 16:30:18 +0100
Subject: [PATCH] Fixed bug introduced in previous commit.

Deepslate was a problem because they don't save their distribution. Added a workaround.
---
 src/main/java/techreborn/init/TRContent.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java
index ad96d9640..8888da7b0 100644
--- a/src/main/java/techreborn/init/TRContent.java
+++ b/src/main/java/techreborn/init/TRContent.java
@@ -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;
@@ -427,21 +428,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),
-					distribution.experienceDropped
+					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);
 		}