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

Merge remote-tracking branch 'origin/1.14.x' into 1.14.x

This commit is contained in:
cpw 2019-06-22 12:33:46 -04:00
parent 256bd01e0c ef7b035f02
commit 1e0437208b
No known key found for this signature in database
GPG Key ID: 8EB3DF749553B1B7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/test/java/net/minecraftforge/debug/client/model/ModelDataTest.java
View File

@ -65,10 +65,11 @@ public class ModelDataTest
private static final ModelProperty<Boolean> MAGIC_PROP = new ModelProperty<Boolean>();
private static final String BLOCK_NAME = "block";
private static final String BLOCK_REGNAME = MODID + ":" + BLOCK_NAME;
@ObjectHolder(MODID + ":" + BLOCK_NAME)
@ObjectHolder(BLOCK_REGNAME)
public static final Block MY_BLOCK = null;
@ObjectHolder(MODID + ":" + BLOCK_NAME)
@ObjectHolder(BLOCK_REGNAME)
public static final TileEntityType<Tile> TILE_TYPE = null;
public ModelDataTest()
@ -83,7 +84,7 @@ public class ModelDataTest
{
final IBakedModel stone = event.getModelRegistry().get(new ModelResourceLocation("minecraft:stone"));
final IBakedModel dirt = event.getModelRegistry().get(new ModelResourceLocation("minecraft:dirt"));
event.getModelRegistry().put(new ModelResourceLocation(MODID, BLOCK_NAME), new IDynamicBakedModel()
event.getModelRegistry().put(new ModelResourceLocation(BLOCK_REGNAME, ""), new IDynamicBakedModel()
{
@Override
public boolean isGui3d()