change instances of Block to use ResourceLocation

Author: fmbellomy

src/client/java/aztech/modern_industrialization/textures/PartTextureGenerator.java

@@ -36,9 +36,7 @@
 import com.mojang.blaze3d.platform.NativeImage;
 import java.io.IOException;
 import java.util.Objects;
-import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.block.Block;
 
 /**
  * All the per-part texture processing logic.
@@ -156,9 +154,9 @@ private void processHotIngot() {
                 material.get(SET).name, itemPath, false, new HotIngotColoramp(coloramp, 0.1, 0.5));
     }
 
-    private void processOre(Block stoneType, MaterialOreSet oreSet) throws IOException {
+    private void processOre(ResourceLocation stoneType, MaterialOreSet oreSet) throws IOException {
         String template = String.format("modern_industrialization:textures/materialsets/ores/%s.png", oreSet.name);
-        String stoneId = BuiltInRegistries.BLOCK.getKey(stoneType).getPath();
+        String stoneId = stoneType.getPath();
         String prefix = "";
 
         String from = switch (oreSet) {

src/main/java/aztech/modern_industrialization/compat/kubejs/material/MaterialBuilderJSWrapper.java

@@ -37,9 +37,7 @@
 import aztech.modern_industrialization.nuclear.IsotopeFuelParams;
 import aztech.modern_industrialization.nuclear.NuclearConstant;
 import com.google.gson.JsonObject;
-import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.block.Block;
 
 public class MaterialBuilderJSWrapper {
 
@@ -146,14 +144,14 @@ public MaterialBuilderJSWrapper specialCasing(String englishName, String path, f
         return this;
     }
 
-    public MaterialBuilderJSWrapper ore(JsonObject json, Block stoneType) {
+    public MaterialBuilderJSWrapper ore(JsonObject json, ResourceLocation stoneType) {
         materialBuilder.addParts(creator.orePart(json, stoneType));
         return this;
     }
 
     public MaterialBuilderJSWrapper ore(JsonObject json) {
-        Block stone = BuiltInRegistries.BLOCK.get(ResourceLocation.fromNamespaceAndPath("minecraft", "stone"));
-        Block deepslate = BuiltInRegistries.BLOCK.get(ResourceLocation.fromNamespaceAndPath("minecraft", "deepslate"));
+        ResourceLocation stone = ResourceLocation.fromNamespaceAndPath("minecraft", "stone");
+        ResourceLocation deepslate = ResourceLocation.fromNamespaceAndPath("minecraft", "deepslate");
         materialBuilder.addParts(creator.orePart(json, deepslate));
         materialBuilder.addParts(creator.orePart(json, stone));
         return this;

src/main/java/aztech/modern_industrialization/compat/kubejs/material/PartJsonCreator.java

@@ -33,9 +33,8 @@
 import aztech.modern_industrialization.materials.set.MaterialRawSet;
 import aztech.modern_industrialization.nuclear.NuclearConstant;
 import com.google.gson.JsonObject;
-import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.valueproviders.UniformInt;
-import net.minecraft.world.level.block.Block;
 
 public class PartJsonCreator {
 
@@ -112,8 +111,8 @@ public PartTemplate specialCasing(String englishName, String path, float resista
         return MIParts.MACHINE_CASING_SPECIAL.of(englishName, path, resistance);
     }
 
-    public PartTemplate orePart(JsonObject json, Block stoneType) {
-        String stoneId = BuiltInRegistries.BLOCK.getKey(stoneType).getPath();
+    public PartTemplate orePart(JsonObject json, ResourceLocation stoneType) {
+        String stoneId = stoneType.getPath();
         OrePart act;
         // I'm not positive that these first two branches actually need to exist. I am in need of guidance.
         if (stoneId.equals("stone")) {

src/main/java/aztech/modern_industrialization/materials/part/MIParts.java

@@ -31,11 +31,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
-import net.minecraft.world.level.block.Block;
 import net.neoforged.neoforge.common.Tags;
 
 public class MIParts {
@@ -77,8 +75,8 @@ public class MIParts {
     public static final CasingPart MACHINE_CASING_SPECIAL = new CasingPart("Special Casing", "machine_casing_special");
     public static final PartTemplate NUGGET = new PartTemplate("Nugget", "nugget");
 
-    private static final Block STONE = BuiltInRegistries.BLOCK.get(ResourceLocation.fromNamespaceAndPath("minecraft", "stone"));
-    private static final Block DEEPSLATE = BuiltInRegistries.BLOCK.get(ResourceLocation.fromNamespaceAndPath("minecraft", "deepslate"));
+    private static final ResourceLocation STONE = ResourceLocation.fromNamespaceAndPath("minecraft", "stone");
+    private static final ResourceLocation DEEPSLATE = ResourceLocation.fromNamespaceAndPath("minecraft", "deepslate");
     public static final OrePart ORE = new OrePart(STONE);
     public static final OrePart ORE_DEEPSLATE = new OrePart(DEEPSLATE);
 

src/main/java/aztech/modern_industrialization/materials/part/OrePart.java

@@ -46,7 +46,6 @@
 import net.minecraft.tags.BiomeTags;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.util.valueproviders.UniformInt;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.levelgen.GenerationStep;
 import net.minecraft.world.level.levelgen.VerticalAnchor;
 import net.minecraft.world.level.levelgen.feature.Feature;
@@ -58,7 +57,7 @@
 import net.neoforged.neoforge.registries.NeoForgeRegistries;
 
 public class OrePart implements PartKeyProvider {
-    public final Block stoneType;
+    public final ResourceLocation stoneType;
     public final String stoneId;
     public final String stoneName;
     public final PartKey key;
@@ -84,10 +83,10 @@ public PartTemplate of(MaterialOreSet set) {
         return of(new OrePartParams(UniformInt.of(0, 0), set));
     }
 
-    public OrePart(Block stoneType) {
+    public OrePart(ResourceLocation stoneType) {
         this.stoneType = stoneType;
-        stoneId = BuiltInRegistries.BLOCK.getKey(stoneType).getPath();
-        stoneName = stoneType.getName().getString();
+        stoneId = stoneType.getPath();
+        stoneName = BuiltInRegistries.BLOCK.get(stoneType).getName().getString();
         if (stoneId.equals("stone")) {
             key = new PartKey("ore");
         } else {
@@ -115,13 +114,13 @@ public PartTemplate of(OrePartParams oreParams) {
                     oreBlockBlockDefinition = MIBlock.block(
                             englishName,
                             itemPath,
-                            MIBlock.BlockDefinitionParams.of(stoneType.properties())
+                            MIBlock.BlockDefinitionParams.of(BuiltInRegistries.BLOCK.get(stoneType).properties())
                                     .withBlockConstructor(s -> new OreBlock(s, oreParams, partContext.getMaterialName()))
                                     .withLoot(new MIBlockLoot.Ore(loot))
                                     .sortOrder(SortOrder.ORES.and(partContext.getMaterialName()))
                                     // even if an ore is made of something weak,
                                     // like netherrack, it should still take at least as long to mine as a stone block.
-                                    .destroyTime(Math.max(stoneType.defaultDestroyTime(), 2.25f)));
+                                    .destroyTime(Math.max(BuiltInRegistries.BLOCK.get(stoneType).defaultDestroyTime(), 2.25f)));
 
                     // Sanity check: Ensure that ores don't drop xp, iff the main part is an ingot
                     // (i.e. the drop is raw ore).

src/main/java/aztech/modern_industrialization/materials/part/TextureGenParams.java

@@ -26,6 +26,7 @@
 import aztech.modern_industrialization.materials.set.MaterialBlockSet;
 import aztech.modern_industrialization.materials.set.MaterialOreSet;
 import aztech.modern_industrialization.materials.set.MaterialRawSet;
+import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.Nullable;
 
 public sealed interface TextureGenParams {
@@ -53,9 +54,7 @@ record Gem() implements TextureGenParams {
     record HotIngot() implements TextureGenParams {
     }
 
-    // not thrilled about this fully qualified type,
-    // but I don't actually see a way around it without renaming `TextureGenParams.Block`
-    record Ore(net.minecraft.world.level.block.Block stoneType, MaterialOreSet oreSet) implements TextureGenParams {
+    record Ore(ResourceLocation stoneType, MaterialOreSet oreSet) implements TextureGenParams {
     }
 
     record RawMetal(boolean isBlock, MaterialRawSet rawSet) implements TextureGenParams {