Make sure test mods load, fix BlockstateRetextureTest
This commit is contained in:
parent
5fb948fb35
commit
8c3e511538
|
@ -40,8 +40,8 @@ import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
|
||||||
import net.minecraftforge.registries.ObjectHolder;
|
import net.minecraftforge.registries.ObjectHolder;
|
||||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||||
|
|
||||||
@Mod(MaterialFogColorTest.MODID)
|
//@Mod(MaterialFogColorTest.MODID)
|
||||||
@Mod.EventBusSubscriber
|
//@Mod.EventBusSubscriber
|
||||||
public class MaterialFogColorTest
|
public class MaterialFogColorTest
|
||||||
{
|
{
|
||||||
static final String MODID = "fog_color_in_material_test";
|
static final String MODID = "fog_color_in_material_test";
|
||||||
|
|
|
@ -42,7 +42,7 @@ public class PathNodeTypeTest
|
||||||
|
|
||||||
|
|
||||||
@ObjectHolder(BLOCK_ID)
|
@ObjectHolder(BLOCK_ID)
|
||||||
private static final Block TEST_BLOCK = null;
|
private static Block TEST_BLOCK = null;
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public static void register(RegistryEvent.Register<Block> event)
|
public static void register(RegistryEvent.Register<Block> event)
|
||||||
|
|
|
@ -32,7 +32,7 @@ import java.util.Arrays;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@Mod("client_command_test")
|
//@Mod("client_command_test")
|
||||||
public class ClientCommandTest
|
public class ClientCommandTest
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -25,35 +25,37 @@ import com.google.common.collect.ImmutableMap;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.renderer.model.IBakedModel;
|
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.model.ModelResourceLocation;
|
||||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||||
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraftforge.api.distmarker.Dist;
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
import net.minecraftforge.client.event.ModelBakeEvent;
|
import net.minecraftforge.client.event.ModelBakeEvent;
|
||||||
|
import net.minecraftforge.client.model.BasicState;
|
||||||
import net.minecraftforge.client.model.IModel;
|
import net.minecraftforge.client.model.IModel;
|
||||||
import net.minecraftforge.client.model.ModelLoaderRegistry;
|
import net.minecraftforge.client.model.ModelLoaderRegistry;
|
||||||
|
import net.minecraftforge.common.model.TRSRTransformation;
|
||||||
import net.minecraftforge.fml.common.Mod;
|
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 class BlockstateRetextureTest
|
||||||
{
|
{
|
||||||
public static final String MODID = "forge_blockstate_retexture_test";
|
public static final String MODID = "forge_blockstate_retexture_test";
|
||||||
public static final String VERSION = "1.0";
|
static final boolean ENABLED = true;
|
||||||
static final boolean ENABLED = false;
|
|
||||||
|
|
||||||
private static ResourceLocation fenceName = new ResourceLocation("minecraft", "fence");
|
private static ResourceLocation fenceName = new ResourceLocation("minecraft", "oak_fence");
|
||||||
private static ModelResourceLocation fenceLocation = new ModelResourceLocation(fenceName, "east=true,north=false,south=false,west=true");
|
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 ResourceLocation stoneName = new ResourceLocation("minecraft", "stone");
|
||||||
private static ModelResourceLocation stoneLocation = new ModelResourceLocation(stoneName, "normal");
|
private static ModelResourceLocation stoneLocation = new ModelResourceLocation(stoneName, "");
|
||||||
|
|
||||||
private static Function<ResourceLocation, TextureAtlasSprite> textureGetter = location ->
|
private static Function<ResourceLocation, TextureAtlasSprite> textureGetter = location ->
|
||||||
{
|
{
|
||||||
assert location != null;
|
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
|
public static class ClientEvents
|
||||||
{
|
{
|
||||||
@net.minecraftforge.eventbus.api.SubscribeEvent
|
@net.minecraftforge.eventbus.api.SubscribeEvent
|
||||||
|
@ -64,16 +66,16 @@ public class BlockstateRetextureTest
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
IModel fence = ModelLoaderRegistry.getModelOrLogError(fenceLocation, "Error loading fence model");
|
IModel<?> fence = ModelLoaderRegistry.getModelOrLogError(fenceLocation, "Error loading fence model");
|
||||||
IModel stone = ModelLoaderRegistry.getModelOrLogError(stoneLocation, "Error loading planks model");
|
IModel<?> stone = ModelLoaderRegistry.getModelOrLogError(stoneLocation, "Error loading stone model");
|
||||||
IModel retexturedFence = fence.retexture(ImmutableMap.of("texture", "blocks/log_oak"));
|
IModel<?> retexturedFence = fence.retexture(ImmutableMap.of("texture", "blocks/log_oak"));
|
||||||
IModel retexturedStone = stone.retexture(ImmutableMap.of("all", "blocks/diamond_block"));
|
IModel<?> retexturedStone = stone.retexture(ImmutableMap.of("all", "blocks/diamond_block"));
|
||||||
|
|
||||||
IBakedModel fenceResult = retexturedFence.bake(fence.getDefaultState(), DefaultVertexFormats.BLOCK, textureGetter);
|
IBakedModel fenceResult = retexturedFence.bake(event.getModelLoader(), textureGetter, new BasicState(fence.getDefaultState(), true), DefaultVertexFormats.ITEM);
|
||||||
IBakedModel stoneResult = retexturedStone.bake(stone.getDefaultState(), DefaultVertexFormats.BLOCK, textureGetter);
|
IBakedModel stoneResult = retexturedStone.bake(event.getModelLoader(), textureGetter, new BasicState(stone.getDefaultState(), true), DefaultVertexFormats.ITEM);
|
||||||
|
|
||||||
event.getModelRegistry().putObject(fenceLocation, fenceResult);
|
event.getModelRegistry().put(fenceLocation, fenceResult);
|
||||||
event.getModelRegistry().putObject(stoneLocation, stoneResult);
|
event.getModelRegistry().put(stoneLocation, ModelLoaderRegistry.getMissingModel().bake(event.getModelLoader(), textureGetter, new BasicState(TRSRTransformation.identity(), false), DefaultVertexFormats.ITEM));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,6 +5,8 @@ loaderVersion="[2.0,)"
|
||||||
modId="forgedebugmodeldata"
|
modId="forgedebugmodeldata"
|
||||||
#[[mods]]
|
#[[mods]]
|
||||||
# modId="forgedebugmodelloaderregistry"
|
# modId="forgedebugmodelloaderregistry"
|
||||||
|
[[mods]]
|
||||||
|
modId="forge_blockstate_retexture_test"
|
||||||
[[mods]]
|
[[mods]]
|
||||||
modId="containertypetest"
|
modId="containertypetest"
|
||||||
[[mods]]
|
[[mods]]
|
||||||
|
|
Loading…
Reference in New Issue