From 01a067449016bbc2ff0cc47b30ca1e49ed72bc59 Mon Sep 17 00:00:00 2001 From: tterrag Date: Sat, 13 Apr 2019 21:30:42 -0400 Subject: [PATCH] Finish model loader debug mod --- .../client/model/ModelLoaderRegistryTest.java | 48 +++++++++++++++++- .../blockstates/obj_direction_block.json | 7 +-- .../blockstates/obj_direction_eye.json | 3 +- .../blockstates/obj_dynamic_eye.json | 3 +- .../blockstates/obj_tesseract_block.json | 3 +- .../blockstates/obj_vertex_coloring1.json | 3 +- .../blockstates/obj_vertex_coloring2.json | 3 +- .../models/block/fancy_fence.mtl | 3 +- .../models/block/tesseract.mtl | 2 +- .../models/block/vertex_coloring.mtl | 10 +++- .../textures/white.png | Bin 0 -> 164 bytes 11 files changed, 66 insertions(+), 19 deletions(-) create mode 100644 src/test/resources/assets/forgedebugmodelloaderregistry/textures/white.png 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 a165e9d09..166ed4bee 100644 --- a/src/test/java/net/minecraftforge/debug/client/model/ModelLoaderRegistryTest.java +++ b/src/test/java/net/minecraftforge/debug/client/model/ModelLoaderRegistryTest.java @@ -55,6 +55,8 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.ITickable; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.util.text.TextComponentString; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorld; @@ -186,6 +188,8 @@ public class ModelLoaderRegistryTest }; } } + + static final VoxelShape SHAPE = VoxelShapes.create(1/16D, 1/16D, 1/16D, 15/16D, 15/16D, 15/16D); // We don't really care, just not solid public static class CustomModelBlock extends Block { @@ -199,6 +203,12 @@ public class ModelLoaderRegistryTest this.setDefaultState(this.getStateContainer().getBaseState().with(FACING, EnumFacing.NORTH)); setRegistryName(new ResourceLocation(MODID, name)); } + + @Override + public VoxelShape getRenderShape(IBlockState state, IBlockReader worldIn, BlockPos pos) + { + return SHAPE; + } @Override public boolean isFullCube(IBlockState state) @@ -285,6 +295,12 @@ public class ModelLoaderRegistryTest { return new OBJTesseractTileEntity(); } + + @Override + public VoxelShape getRenderShape(IBlockState state, IBlockReader worldIn, BlockPos pos) + { + return SHAPE; + } @Override public boolean isFullCube(IBlockState state) @@ -430,6 +446,12 @@ public class ModelLoaderRegistryTest super(Properties.create(Material.IRON)); setRegistryName(new ResourceLocation(MODID, name)); } + + @Override + public VoxelShape getRenderShape(IBlockState state, IBlockReader worldIn, BlockPos pos) + { + return SHAPE; + } @Override public boolean isFullCube(IBlockState state) @@ -475,7 +497,13 @@ public class ModelLoaderRegistryTest { builder.add(FACING); } - + + @Override + public VoxelShape getRenderShape(IBlockState state, IBlockReader worldIn, BlockPos pos) + { + return SHAPE; + } + @Override public boolean isFullCube(IBlockState state) { @@ -614,6 +642,12 @@ public class ModelLoaderRegistryTest this.setDefaultState(this.getStateContainer().getBaseState().with(FACING, EnumFacing.NORTH)); setRegistryName(new ResourceLocation(MODID, name)); } + + @Override + public VoxelShape getRenderShape(IBlockState state, IBlockReader worldIn, BlockPos pos) + { + return SHAPE; + } @Override public boolean isFullCube(IBlockState state) @@ -660,6 +694,12 @@ public class ModelLoaderRegistryTest this.setDefaultState(this.getStateContainer().getBaseState().with(NORTH, false).with(SOUTH, false).with(WEST, false).with(EAST, false)); setRegistryName(new ResourceLocation(MODID, name)); } + + @Override + public VoxelShape getRenderShape(IBlockState state, IBlockReader worldIn, BlockPos pos) + { + return SHAPE; + } @Override public boolean isFullCube(IBlockState state) @@ -707,6 +747,12 @@ public class ModelLoaderRegistryTest { return new OBJDynamicEyeTileEntity(); } + + @Override + public VoxelShape getRenderShape(IBlockState state, IBlockReader worldIn, BlockPos pos) + { + return SHAPE; + } @Override public boolean isFullCube(IBlockState state) diff --git a/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_direction_block.json b/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_direction_block.json index 70647a4b1..922509b9e 100644 --- a/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_direction_block.json +++ b/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_direction_block.json @@ -2,13 +2,10 @@ "forge_marker": 1, "defaults": { "textures": {}, - "model": "forgedebugmodelloaderregistry:direction_test.obj" + "model": "forgedebugmodelloaderregistry:direction_test.obj", + "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{ - "transform": "forge:default-block" - }], "facing": { "down": {"model": "forgedebugmodelloaderregistry:direction_test.obj", "x": 90}, "up": {"model": "forgedebugmodelloaderregistry:direction_test.obj", "x": 270}, diff --git a/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_direction_eye.json b/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_direction_eye.json index 8b5a23d75..93206f971 100644 --- a/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_direction_eye.json +++ b/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_direction_eye.json @@ -5,8 +5,7 @@ "model": "forgedebugmodelloaderregistry:eye.obj" }, "variants": { - "normal": [{}], - "inventory": [{ + "": [{ "transform": { "thirdperson": { "translation": [0, 0.09375, -0.171875], diff --git a/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_dynamic_eye.json b/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_dynamic_eye.json index f47646ca0..c22db3c2f 100644 --- a/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_dynamic_eye.json +++ b/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_dynamic_eye.json @@ -5,8 +5,7 @@ "model": "forgedebugmodelloaderregistry:eye.obj" }, "variants": { - "normal": [{}], - "inventory": [{ + "": [{ "transform": { "thirdperson": { "translation": [0, 0.09375, -0.171875], diff --git a/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_tesseract_block.json b/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_tesseract_block.json index 7d0b98534..8b0446b98 100644 --- a/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_tesseract_block.json +++ b/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_tesseract_block.json @@ -7,8 +7,7 @@ "model": "forgedebugmodelloaderregistry:tesseract.obj" }, "variants": { - "normal": [{}], - "inventory": [{ + "": [{ "transform": "forge:default-block" }] } diff --git a/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_vertex_coloring1.json b/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_vertex_coloring1.json index 432eaaaed..74a522858 100644 --- a/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_vertex_coloring1.json +++ b/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_vertex_coloring1.json @@ -5,8 +5,7 @@ "model": "forgedebugmodelloaderregistry:vertex_coloring.obj" }, "variants": { - "normal": [{}], - "inventory": [{ + "": [{ "transform": "forge:default-block" }] } diff --git a/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_vertex_coloring2.json b/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_vertex_coloring2.json index 432eaaaed..74a522858 100644 --- a/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_vertex_coloring2.json +++ b/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_vertex_coloring2.json @@ -5,8 +5,7 @@ "model": "forgedebugmodelloaderregistry:vertex_coloring.obj" }, "variants": { - "normal": [{}], - "inventory": [{ + "": [{ "transform": "forge:default-block" }] } diff --git a/src/test/resources/assets/forgedebugmodelloaderregistry/models/block/fancy_fence.mtl b/src/test/resources/assets/forgedebugmodelloaderregistry/models/block/fancy_fence.mtl index dd1e50db9..299e6fee0 100644 --- a/src/test/resources/assets/forgedebugmodelloaderregistry/models/block/fancy_fence.mtl +++ b/src/test/resources/assets/forgedebugmodelloaderregistry/models/block/fancy_fence.mtl @@ -1,2 +1,3 @@ newmtl fancy_fence:Default -Kd 1.00 1.00 1.00 \ No newline at end of file +Kd 1.00 1.00 1.00 +map_Kd forgedebugmodelloaderregistry:white diff --git a/src/test/resources/assets/forgedebugmodelloaderregistry/models/block/tesseract.mtl b/src/test/resources/assets/forgedebugmodelloaderregistry/models/block/tesseract.mtl index b3c3450e9..72b5cc625 100644 --- a/src/test/resources/assets/forgedebugmodelloaderregistry/models/block/tesseract.mtl +++ b/src/test/resources/assets/forgedebugmodelloaderregistry/models/block/tesseract.mtl @@ -1,4 +1,4 @@ newmtl lambert7SG Kd 1.00 1.00 1.00 Ka 1.00 1.00 1.00 -map_Kd minecraft:blocks/redstone_block \ No newline at end of file +map_Kd minecraft:block/redstone_block \ No newline at end of file diff --git a/src/test/resources/assets/forgedebugmodelloaderregistry/models/block/vertex_coloring.mtl b/src/test/resources/assets/forgedebugmodelloaderregistry/models/block/vertex_coloring.mtl index 0615709ce..299ff5fde 100644 --- a/src/test/resources/assets/forgedebugmodelloaderregistry/models/block/vertex_coloring.mtl +++ b/src/test/resources/assets/forgedebugmodelloaderregistry/models/block/vertex_coloring.mtl @@ -1,23 +1,31 @@ newmtl red Kd 1 0 0 +map_Kd forgedebugmodelloaderregistry:white newmtl orange Kd 1 0.5 0 +map_Kd forgedebugmodelloaderregistry:white newmtl yellow Kd 1 1 0 +map_Kd forgedebugmodelloaderregistry:white newmtl yellow-green Kd 0.5 1 0 +map_Kd forgedebugmodelloaderregistry:white newmtl green Kd 0 1 0 +map_Kd forgedebugmodelloaderregistry:white newmtl green-blue Kd 0 1 1 +map_Kd forgedebugmodelloaderregistry:white newmtl blue Kd 0 0 1 +map_Kd forgedebugmodelloaderregistry:white newmtl purple -Kd 1 0 1 \ No newline at end of file +Kd 1 0 1 +map_Kd forgedebugmodelloaderregistry:white diff --git a/src/test/resources/assets/forgedebugmodelloaderregistry/textures/white.png b/src/test/resources/assets/forgedebugmodelloaderregistry/textures/white.png new file mode 100644 index 0000000000000000000000000000000000000000..c2faf9e190490025e97d5f9edaaf2c9b0abc771f GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#F$*6fKYL*6M-`xuY-UJAiF1B#Zfaf$kjuc}T$GwvlA5AWo>`Ki;O^-gkfN8$ z4iuO2ba4#PIG_CI|9^XC&4$iK7lT!aA%`zqWMBx*WtN?