From 8c3e51153853083280c1abd5459c3815b12bdb0b Mon Sep 17 00:00:00 2001 From: tterrag Date: Fri, 21 Jun 2019 19:35:32 -0400 Subject: [PATCH] Make sure test mods load, fix BlockstateRetextureTest --- .../debug/block/MaterialFogColorTest.java | 4 +-- .../debug/block/PathNodeTypeTest.java | 2 +- .../debug/chat/ClientCommandTest.java | 2 +- .../client/model/BlockstateRetextureTest.java | 34 ++++++++++--------- src/test/resources/META-INF/mods.toml | 2 ++ 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/test/java/net/minecraftforge/debug/block/MaterialFogColorTest.java b/src/test/java/net/minecraftforge/debug/block/MaterialFogColorTest.java index 9585768a0c..ae2f092d73 100644 --- a/src/test/java/net/minecraftforge/debug/block/MaterialFogColorTest.java +++ b/src/test/java/net/minecraftforge/debug/block/MaterialFogColorTest.java @@ -40,8 +40,8 @@ import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.registries.ObjectHolder; import net.minecraftforge.eventbus.api.SubscribeEvent; -@Mod(MaterialFogColorTest.MODID) -@Mod.EventBusSubscriber +//@Mod(MaterialFogColorTest.MODID) +//@Mod.EventBusSubscriber public class MaterialFogColorTest { static final String MODID = "fog_color_in_material_test"; diff --git a/src/test/java/net/minecraftforge/debug/block/PathNodeTypeTest.java b/src/test/java/net/minecraftforge/debug/block/PathNodeTypeTest.java index 1d5a53f9f3..2f62ccd07e 100644 --- a/src/test/java/net/minecraftforge/debug/block/PathNodeTypeTest.java +++ b/src/test/java/net/minecraftforge/debug/block/PathNodeTypeTest.java @@ -42,7 +42,7 @@ public class PathNodeTypeTest @ObjectHolder(BLOCK_ID) - private static final Block TEST_BLOCK = null; + private static Block TEST_BLOCK = null; @SubscribeEvent public static void register(RegistryEvent.Register event) diff --git a/src/test/java/net/minecraftforge/debug/chat/ClientCommandTest.java b/src/test/java/net/minecraftforge/debug/chat/ClientCommandTest.java index 5f8b7584e1..786d47ca4b 100644 --- a/src/test/java/net/minecraftforge/debug/chat/ClientCommandTest.java +++ b/src/test/java/net/minecraftforge/debug/chat/ClientCommandTest.java @@ -32,7 +32,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -@Mod("client_command_test") +//@Mod("client_command_test") public class ClientCommandTest { /* diff --git a/src/test/java/net/minecraftforge/debug/client/model/BlockstateRetextureTest.java b/src/test/java/net/minecraftforge/debug/client/model/BlockstateRetextureTest.java index 27a27ddf9c..8ed23d8ce6 100644 --- a/src/test/java/net/minecraftforge/debug/client/model/BlockstateRetextureTest.java +++ b/src/test/java/net/minecraftforge/debug/client/model/BlockstateRetextureTest.java @@ -25,35 +25,37 @@ import com.google.common.collect.ImmutableMap; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.renderer.model.ModelBakery; import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.client.model.BasicState; import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.ModelLoaderRegistry; +import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.fml.common.Mod; -//@Mod(modid = BlockstateRetextureTest.MODID, name = "BlockstateRetextureTest", version = BlockstateRetextureTest.VERSION, acceptableRemoteVersions = "*", clientSideOnly = true) +@Mod(BlockstateRetextureTest.MODID) public class BlockstateRetextureTest { public static final String MODID = "forge_blockstate_retexture_test"; - public static final String VERSION = "1.0"; - static final boolean ENABLED = false; + static final boolean ENABLED = true; - private static ResourceLocation fenceName = new ResourceLocation("minecraft", "fence"); - private static ModelResourceLocation fenceLocation = new ModelResourceLocation(fenceName, "east=true,north=false,south=false,west=true"); + private static ResourceLocation fenceName = new ResourceLocation("minecraft", "oak_fence"); + private static ModelResourceLocation fenceLocation = new ModelResourceLocation(fenceName, "east=true,north=false,south=false,waterlogged=false,west=true"); private static ResourceLocation stoneName = new ResourceLocation("minecraft", "stone"); - private static ModelResourceLocation stoneLocation = new ModelResourceLocation(stoneName, "normal"); + private static ModelResourceLocation stoneLocation = new ModelResourceLocation(stoneName, ""); private static Function textureGetter = location -> { assert location != null; - return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(location.toString()); + return Minecraft.getInstance().getTextureMap().getAtlasSprite(location.toString()); }; - //@Mod.EventBusSubscriber(modid = MODID, value = Side.CLIENT) + @Mod.EventBusSubscriber(modid = MODID, value = Dist.CLIENT) public static class ClientEvents { @net.minecraftforge.eventbus.api.SubscribeEvent @@ -64,16 +66,16 @@ public class BlockstateRetextureTest return; } - IModel fence = ModelLoaderRegistry.getModelOrLogError(fenceLocation, "Error loading fence model"); - IModel stone = ModelLoaderRegistry.getModelOrLogError(stoneLocation, "Error loading planks model"); - IModel retexturedFence = fence.retexture(ImmutableMap.of("texture", "blocks/log_oak")); - IModel retexturedStone = stone.retexture(ImmutableMap.of("all", "blocks/diamond_block")); + IModel fence = ModelLoaderRegistry.getModelOrLogError(fenceLocation, "Error loading fence model"); + IModel stone = ModelLoaderRegistry.getModelOrLogError(stoneLocation, "Error loading stone model"); + IModel retexturedFence = fence.retexture(ImmutableMap.of("texture", "blocks/log_oak")); + IModel retexturedStone = stone.retexture(ImmutableMap.of("all", "blocks/diamond_block")); - IBakedModel fenceResult = retexturedFence.bake(fence.getDefaultState(), DefaultVertexFormats.BLOCK, textureGetter); - IBakedModel stoneResult = retexturedStone.bake(stone.getDefaultState(), DefaultVertexFormats.BLOCK, textureGetter); + IBakedModel fenceResult = retexturedFence.bake(event.getModelLoader(), textureGetter, new BasicState(fence.getDefaultState(), true), DefaultVertexFormats.ITEM); + IBakedModel stoneResult = retexturedStone.bake(event.getModelLoader(), textureGetter, new BasicState(stone.getDefaultState(), true), DefaultVertexFormats.ITEM); - event.getModelRegistry().putObject(fenceLocation, fenceResult); - event.getModelRegistry().putObject(stoneLocation, stoneResult); + event.getModelRegistry().put(fenceLocation, fenceResult); + event.getModelRegistry().put(stoneLocation, ModelLoaderRegistry.getMissingModel().bake(event.getModelLoader(), textureGetter, new BasicState(TRSRTransformation.identity(), false), DefaultVertexFormats.ITEM)); } } } diff --git a/src/test/resources/META-INF/mods.toml b/src/test/resources/META-INF/mods.toml index 625fc3b05d..d0ba0e7efd 100644 --- a/src/test/resources/META-INF/mods.toml +++ b/src/test/resources/META-INF/mods.toml @@ -5,6 +5,8 @@ loaderVersion="[2.0,)" modId="forgedebugmodeldata" #[[mods]] # modId="forgedebugmodelloaderregistry" +[[mods]] + modId="forge_blockstate_retexture_test" [[mods]] modId="containertypetest" [[mods]]