From 35cd89c00c2f3213eafdeee759eeb1d1b8b57132 Mon Sep 17 00:00:00 2001
From: tterrag <tterrag1098@gmail.com>
Date: Sun, 9 Jun 2019 00:19:29 -0400
Subject: [PATCH] Fix issues preventing test mods loading

---
 .../debug/client/model/ModelDataTest.java     |  6 ++---
 .../client/model/ModelLoaderRegistryTest.java | 22 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/test/java/net/minecraftforge/debug/client/model/ModelDataTest.java b/src/test/java/net/minecraftforge/debug/client/model/ModelDataTest.java
index f5d68097f..28f11b66f 100644
--- a/src/test/java/net/minecraftforge/debug/client/model/ModelDataTest.java
+++ b/src/test/java/net/minecraftforge/debug/client/model/ModelDataTest.java
@@ -67,9 +67,9 @@ public class ModelDataTest
     private static final String BLOCK_NAME = "block";
 
     @ObjectHolder(MODID + ":" + BLOCK_NAME)
-    private static final Block MY_BLOCK = null;
+    public static final Block MY_BLOCK = null;
     @ObjectHolder(MODID + ":" + BLOCK_NAME)
-    private static final TileEntityType<Tile> TILE_TYPE = null;
+    public static final TileEntityType<Tile> TILE_TYPE = null;
 
     public ModelDataTest()
     {
@@ -151,7 +151,7 @@ public class ModelDataTest
             if (world.isRemote && counter++ == 100)
             {
                 ModelDataManager.requestModelDataRefresh(this);
-                world.func_217396_m(getPos());
+                world.markForRerender(getPos());
             }
         }
 
diff --git a/src/test/java/net/minecraftforge/debug/client/model/ModelLoaderRegistryTest.java b/src/test/java/net/minecraftforge/debug/client/model/ModelLoaderRegistryTest.java
index 166ed4bee..0ed46cfd4 100644
--- a/src/test/java/net/minecraftforge/debug/client/model/ModelLoaderRegistryTest.java
+++ b/src/test/java/net/minecraftforge/debug/client/model/ModelLoaderRegistryTest.java
@@ -76,7 +76,7 @@ import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.registries.ObjectHolder;
 
-@Mod(ModelLoaderRegistryTest.MODID)
+//@Mod(ModelLoaderRegistryTest.MODID)
 public class ModelLoaderRegistryTest
 {
     public static final boolean ENABLED = true;
@@ -84,26 +84,26 @@ public class ModelLoaderRegistryTest
     public static final String VERSION = "1.0";
     private static Logger logger;
 
-    @ObjectHolder(CustomModelBlock.name)
+    //@ObjectHolder(CustomModelBlock.name)
     public static final Block CUSTOM_MODEL_BLOCK = null;
-    @ObjectHolder(OBJTesseractBlock.name)
+    //@ObjectHolder(OBJTesseractBlock.name)
     public static final Block TESSERACT_BLOCK = null;
-    @ObjectHolder(OBJVertexColoring1.name)
+    //@ObjectHolder(OBJVertexColoring1.name)
     public static final Block VERTEX_COLOR_1 = null;
-    @ObjectHolder(OBJVertexColoring2.name)
+    //@ObjectHolder(OBJVertexColoring2.name)
     public static final Block VERTEX_COLOR_2 = null;
-    @ObjectHolder(OBJDirectionBlock.name)
+    //@ObjectHolder(OBJDirectionBlock.name)
     public static final Block DIRECTION = null;
-    @ObjectHolder(OBJDirectionEye.name)
+    //@ObjectHolder(OBJDirectionEye.name)
     public static final Block DIRECTION_EYE = null;
-    @ObjectHolder(OBJDynamicEye.name)
+    //@ObjectHolder(OBJDynamicEye.name)
     public static final Block DYNAMIC_EYE = null;
-    @ObjectHolder(OBJCustomDataBlock.name)
+    //@ObjectHolder(OBJCustomDataBlock.name)
     public static final Block CUSTOM_DATA = null;
     
-    @ObjectHolder(OBJTesseractBlock.name)
+    //@ObjectHolder(OBJTesseractBlock.name)
     public static final TileEntityType<OBJTesseractTileEntity> TESSERACT_TILE = null;
-    @ObjectHolder(OBJVertexColoring2.name)
+    //@ObjectHolder(OBJVertexColoring2.name)
     public static final TileEntityType<OBJVertexColoring2TileEntity> VERTEX_COLOR_2_TILE = null;
     
     public ModelLoaderRegistryTest()