From 24e014f326789987034cf24a3c78ecc78abdb8d6 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Thu, 10 Aug 2023 10:54:27 -0400
Subject: [PATCH] Update testmod to 1.19.4

---
 .../org/embeddedt/modernfix/testmod/TestBlockItem.java   | 3 +--
 .../java/org/embeddedt/modernfix/testmod/TestMod.java    | 5 +++--
 .../modernfix/testmod/client/TestModBlockModel.java      | 9 +++------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/fabric/testmod/src/main/java/org/embeddedt/modernfix/testmod/TestBlockItem.java b/fabric/testmod/src/main/java/org/embeddedt/modernfix/testmod/TestBlockItem.java
index cfc09cfa..f5cbe047 100644
--- a/fabric/testmod/src/main/java/org/embeddedt/modernfix/testmod/TestBlockItem.java
+++ b/fabric/testmod/src/main/java/org/embeddedt/modernfix/testmod/TestBlockItem.java
@@ -1,11 +1,10 @@
 package org.embeddedt.modernfix.testmod;
 
 import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
 
 public class TestBlockItem extends BlockItem {
-    private static final Item.Properties PROPERTIES = new Item.Properties().tab(CreativeModeTab.TAB_BUILDING_BLOCKS);
+    private static final Item.Properties PROPERTIES = new Item.Properties();
 
     public TestBlockItem(TestBlock block) {
         super(block, PROPERTIES);
diff --git a/fabric/testmod/src/main/java/org/embeddedt/modernfix/testmod/TestMod.java b/fabric/testmod/src/main/java/org/embeddedt/modernfix/testmod/TestMod.java
index 5ad72e50..89f9d5eb 100644
--- a/fabric/testmod/src/main/java/org/embeddedt/modernfix/testmod/TestMod.java
+++ b/fabric/testmod/src/main/java/org/embeddedt/modernfix/testmod/TestMod.java
@@ -3,6 +3,7 @@ package org.embeddedt.modernfix.testmod;
 import com.google.common.base.Stopwatch;
 import net.fabricmc.api.ModInitializer;
 import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
@@ -32,9 +33,9 @@ public class TestMod implements ModInitializer {
             for(int g = 0; g < NUM_COLORS; g++) {
                 for(int b = 0; b < NUM_COLORS; b++) {
                     ResourceLocation name = new ResourceLocation(ID, "wool_" + r + "_" + g + "_" + b);
-                    TestBlock block = Registry.register(Registry.BLOCK, name, new TestBlock());
+                    TestBlock block = Registry.register(BuiltInRegistries.BLOCK, name, new TestBlock());
                     WOOL_STATES.add(block.defaultBlockState());
-                    Registry.register(Registry.ITEM, name, new TestBlockItem(block));
+                    Registry.register(BuiltInRegistries.ITEM, name, new TestBlockItem(block));
                     numRegistered++;
                     if((numRegistered % progressReport) == 0) {
                         LOGGER.info(String.format("Registering... %.02f%%", ((float)numRegistered)/totalToRegister * 100));
diff --git a/fabric/testmod/src/main/java/org/embeddedt/modernfix/testmod/client/TestModBlockModel.java b/fabric/testmod/src/main/java/org/embeddedt/modernfix/testmod/client/TestModBlockModel.java
index c2f8a5a7..43ccf4d6 100644
--- a/fabric/testmod/src/main/java/org/embeddedt/modernfix/testmod/client/TestModBlockModel.java
+++ b/fabric/testmod/src/main/java/org/embeddedt/modernfix/testmod/client/TestModBlockModel.java
@@ -1,7 +1,5 @@
 package org.embeddedt.modernfix.testmod.client;
 
-import com.google.common.collect.ImmutableList;
-import com.mojang.datafixers.util.Pair;
 import net.fabricmc.fabric.api.renderer.v1.Renderer;
 import net.fabricmc.fabric.api.renderer.v1.RendererAccess;
 import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh;
@@ -30,7 +28,6 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
@@ -109,8 +106,8 @@ public class TestModBlockModel implements UnbakedModel, BakedModel, FabricBakedM
     }
 
     @Override
-    public Collection<Material> getMaterials(Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors) {
-        return ImmutableList.of(BASE_WOOL);
+    public void resolveParents(Function<ResourceLocation, UnbakedModel> function) {
+
     }
 
     private static int scaleColor(int c) {
@@ -119,7 +116,7 @@ public class TestModBlockModel implements UnbakedModel, BakedModel, FabricBakedM
 
     @Nullable
     @Override
-    public BakedModel bake(ModelBakery modelBakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState transform, ResourceLocation location) {
+    public BakedModel bake(ModelBaker baker, Function<Material, TextureAtlasSprite> spriteGetter, ModelState state, ResourceLocation location) {
         // Build the mesh using the Renderer API
         Renderer renderer = RendererAccess.INSTANCE.getRenderer();
         MeshBuilder builder = renderer.meshBuilder();