keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix issues preventing test mods loading

Browse source
This commit is contained in:
tterrag 2019-06-09 00:19:29 -04:00
parent 892fea3df9
commit 35cd89c00c
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/test/java/net/minecraftforge/debug/client/model/ModelDataTest.java
View file

@ -67,9 +67,9 @@ public class ModelDataTest
private static final String BLOCK_NAME = "block"; private static final String BLOCK_NAME = "block";
@ObjectHolder(MODID + ":" + BLOCK_NAME) @ObjectHolder(MODID + ":" + BLOCK_NAME)
private static final Block MY_BLOCK = null; public static final Block MY_BLOCK = null;
@ObjectHolder(MODID + ":" + BLOCK_NAME) @ObjectHolder(MODID + ":" + BLOCK_NAME)
private static final TileEntityType<Tile> TILE_TYPE = null; public static final TileEntityType<Tile> TILE_TYPE = null;
public ModelDataTest() public ModelDataTest()
{ {
@ -151,7 +151,7 @@ public class ModelDataTest
if (world.isRemote && counter++ == 100) if (world.isRemote && counter++ == 100)
{ {
ModelDataManager.requestModelDataRefresh(this); ModelDataManager.requestModelDataRefresh(this);
world.func_217396_m(getPos()); world.markForRerender(getPos());
} }
} }

22
src/test/java/net/minecraftforge/debug/client/model/ModelLoaderRegistryTest.java
View file

@ -76,7 +76,7 @@ import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.ObjectHolder; import net.minecraftforge.registries.ObjectHolder;
@Mod(ModelLoaderRegistryTest.MODID) //@Mod(ModelLoaderRegistryTest.MODID)
public class ModelLoaderRegistryTest public class ModelLoaderRegistryTest
{ {
public static final boolean ENABLED = true; public static final boolean ENABLED = true;
@ -84,26 +84,26 @@ public class ModelLoaderRegistryTest
public static final String VERSION = "1.0"; public static final String VERSION = "1.0";
private static Logger logger; private static Logger logger;
@ObjectHolder(CustomModelBlock.name) //@ObjectHolder(CustomModelBlock.name)
public static final Block CUSTOM_MODEL_BLOCK = null; public static final Block CUSTOM_MODEL_BLOCK = null;
@ObjectHolder(OBJTesseractBlock.name) //@ObjectHolder(OBJTesseractBlock.name)
public static final Block TESSERACT_BLOCK = null; public static final Block TESSERACT_BLOCK = null;
@ObjectHolder(OBJVertexColoring1.name) //@ObjectHolder(OBJVertexColoring1.name)
public static final Block VERTEX_COLOR_1 = null; public static final Block VERTEX_COLOR_1 = null;
@ObjectHolder(OBJVertexColoring2.name) //@ObjectHolder(OBJVertexColoring2.name)
public static final Block VERTEX_COLOR_2 = null; public static final Block VERTEX_COLOR_2 = null;
@ObjectHolder(OBJDirectionBlock.name) //@ObjectHolder(OBJDirectionBlock.name)
public static final Block DIRECTION = null; public static final Block DIRECTION = null;
@ObjectHolder(OBJDirectionEye.name) //@ObjectHolder(OBJDirectionEye.name)
public static final Block DIRECTION_EYE = null; public static final Block DIRECTION_EYE = null;
@ObjectHolder(OBJDynamicEye.name) //@ObjectHolder(OBJDynamicEye.name)
public static final Block DYNAMIC_EYE = null; public static final Block DYNAMIC_EYE = null;
@ObjectHolder(OBJCustomDataBlock.name) //@ObjectHolder(OBJCustomDataBlock.name)
public static final Block CUSTOM_DATA = null; public static final Block CUSTOM_DATA = null;
@ObjectHolder(OBJTesseractBlock.name) //@ObjectHolder(OBJTesseractBlock.name)
public static final TileEntityType<OBJTesseractTileEntity> TESSERACT_TILE = null; 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 static final TileEntityType<OBJVertexColoring2TileEntity> VERTEX_COLOR_2_TILE = null;
public ModelLoaderRegistryTest() public ModelLoaderRegistryTest()