First block models

This commit is contained in:
Vincent Lee committed 2015-12-22 16:16:04 -06:00
1 parent 56228446b8
commit cff6120aaf
71 files changed
+793 -12

No files matched your search

@@ -0,0 +1,148 @@
package vazkii.botania.client.core.handler;
import com.google.common.collect.ImmutableList;
import net.minecraft.block.Block;
import net.minecraft.block.BlockFlower;
import net.minecraft.block.BlockSlab;
import net.minecraft.block.BlockWall;
import net.minecraft.client.renderer.block.statemap.StateMap;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.init.Blocks;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.Item;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.fml.common.registry.GameData;
import vazkii.botania.api.state.enums.StorageVariant;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.block.decor.slabs.BlockModSlab;
import java.util.List;
public final class ModelHandler {
// Very hardocode-y right now. Will be refactored after things work.
// In addition, many of the jsons currently use the vanilla format (simple and verified bug-free).
// Once things settle down, we'll move to forge jsons, which will drastically cut down on the number of json files
public static void registerModels() {
/** Custom statemappers **/
registerStateMappers();
/** ItemBlocks **/
registerStorageItemBlocks();
registerMushroomItemBlocks();
registerFlowerItemBlocks();
/** Normal Items **/
/** Special Item Meshers **/
}
private static void registerStateMappers() {
// Ignore vanilla variant in flowers
ModelLoader.setCustomStateMapper(ModBlocks.flower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.flower).getTypeProperty()).build());
ModelLoader.setCustomStateMapper(ModBlocks.shinyFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.shinyFlower).getTypeProperty()).build());
ModelLoader.setCustomStateMapper(ModBlocks.buriedPetals, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.buriedPetals).getTypeProperty()).build());
ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build());
// Ignore vanilla variant in walls
ModelLoader.setCustomStateMapper(ModFluffBlocks.biomeStoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build());
ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build());
ModelLoader.setCustomStateMapper(ModFluffBlocks.livingrockWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build());
ModelLoader.setCustomStateMapper(ModFluffBlocks.livingwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build());
ModelLoader.setCustomStateMapper(ModFluffBlocks.prismarineWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build());
ModelLoader.setCustomStateMapper(ModFluffBlocks.reedWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build());
ModelLoader.setCustomStateMapper(ModFluffBlocks.stoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build());
// Ignore dummy variant in slabs
for (Block b : ModFluffBlocks.biomeStoneSlabs) {
ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build());
}
for (Block b : ModFluffBlocks.pavementSlabs) {
ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build());
}
for (Block b : ModFluffBlocks.stoneSlabs) {
ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build());
}
List<Block> otherSlabs = ImmutableList.copyOf(new Block[] {
ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab,
ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.prismarineSlab, ModFluffBlocks.prismarineBrickSlab, ModFluffBlocks.darkPrismarineSlab,
ModFluffBlocks.reedSlab, ModFluffBlocks.thatchSlab, ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab,
ModFluffBlocks.tileSlab, ModFluffBlocks.darkQuartzSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab,
ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab
});
for (Block b : otherSlabs) {
ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build());
}
// Ignore both dummy variant and half prop in full slabs
for (Block b : ModFluffBlocks.biomeStoneFullSlabs) {
ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build());
}
for (Block b : ModFluffBlocks.pavementFullSlabs) {
ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build());
}
for (Block b : ModFluffBlocks.stoneFullSlabs) {
ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build());
}
List<Block> otherFullSlabs = ImmutableList.copyOf(new Block[] {
ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull,
ModFluffBlocks.dreamwoodPlankSlabFull, ModFluffBlocks.prismarineSlabFull, ModFluffBlocks.prismarineBrickSlabFull, ModFluffBlocks.darkPrismarineSlabFull,
ModFluffBlocks.reedSlabFull, ModFluffBlocks.thatchSlabFull, ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull,
ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, ModFluffBlocks.blazeQuartzSlabFull,
ModFluffBlocks.lavenderQuartzSlabFull, ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, ModFluffBlocks.sunnyQuartzSlabFull
});
for (Block b : otherFullSlabs) {
ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build());
}
}
private static void registerStorageItemBlocks() {
Item item = Item.getItemFromBlock(ModBlocks.storage);
for (StorageVariant variant : StorageVariant.values()) {
String name = "botania:" + variant.getName() + "_block";
ModelLoader.addVariantName(item, name);
ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory"));
}
}
private static void registerMushroomItemBlocks() {
Item item = Item.getItemFromBlock(ModBlocks.mushroom);
for (EnumDyeColor color : EnumDyeColor.values()) {
String name = "botania:" + color.getName() + "_mushroom";
ModelLoader.addVariantName(item, name);
ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory"));
}
}
private static void registerFlowerItemBlocks() {
Item item = Item.getItemFromBlock(ModBlocks.flower);
for (EnumDyeColor color : EnumDyeColor.values()) {
String name = "botania:" + color.getName() + "_flower";
ModelLoader.addVariantName(item, name);
ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory"));
}
item = Item.getItemFromBlock(ModBlocks.shinyFlower);
for (EnumDyeColor color : EnumDyeColor.values()) {
String name = "botania:" + color.getName() + "_shinyFlower";
ModelLoader.addVariantName(item, name);
ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory"));
}
}
private static void registerItemModel(Item i) {
ResourceLocation loc = GameData.getItemRegistry().getNameForObject(i);
ModelLoader.setCustomModelResourceLocation(i, 0, new ModelResourceLocation(loc, "inventory"));
}
private ModelHandler() {}
}
@@ -51,6 +51,7 @@ import vazkii.botania.client.core.handler.CorporeaAutoCompleteHandler;
import vazkii.botania.client.core.handler.DebugHandler;
import vazkii.botania.client.core.handler.HUDHandler;
import vazkii.botania.client.core.handler.LightningHandler;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.client.core.handler.MultiblockRenderHandler;
import vazkii.botania.client.core.handler.PersistentVariableHelper;
import vazkii.botania.client.core.handler.SubTileRadiusRenderHandler;
@@ -178,6 +179,8 @@ public class ClientProxy extends CommonProxy {
}
super.preInit(event);
ModelHandler.registerModels();
}
@Override
@@ -12,7 +12,7 @@ package vazkii.botania.client.lib;
public final class LibResources {
public static final String PREFIX_MOD = "botania:"; // todo 1.8 take out the colon?
public static final String PREFIX_MOD = "botania:";
public static final String PREFIX_LANG = "/assets/botania/lang/";
public static final String PREFIX_SHADER = "/assets/botania/shader/";
@@ -108,11 +108,6 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup
return super.setLightLevel(p_149715_1_);
}
@Override
public int getRenderType() {
return LibRenderIDs.idSpecialFlower;
}
@Override
public int damageDropped(IBlockState state) {
return getMetaFromState(state);
@@ -28,7 +28,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable {
String name;
protected final boolean doubleSlab;
public static final PropertyEnum DUMMY = PropertyEnum.create("dummy", DummyEnum.class); // todo 1.8.8 statemapper ignore this prop for everything
public static final PropertyEnum DUMMY = PropertyEnum.create("dummy", DummyEnum.class);
public BlockModSlab(boolean full, Material mat, String name) {
super(mat);
@@ -39,22 +39,30 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable {
setCreativeTab(BotaniaCreativeTab.INSTANCE);
useNeighborBrightness = true;
}
setDefaultState(blockState.getBaseState().withProperty(DUMMY, DummyEnum.SINGLETON));
setDefaultState(blockState.getBaseState().withProperty(HALF, EnumBlockHalf.BOTTOM).withProperty(DUMMY, DummyEnum.SINGLETON));
}
@Override
public BlockState createBlockState() {
return new BlockState(this, getVariantProperty());
return new BlockState(this, HALF, getVariantProperty());
}
@Override
public IBlockState getStateFromMeta(int meta) {
return getDefaultState();
if (doubleSlab) {
return getDefaultState();
} else {
return getDefaultState().withProperty(HALF, meta == 8 ? EnumBlockHalf.TOP : EnumBlockHalf.BOTTOM);
}
}
@Override
public int getMetaFromState(IBlockState state) {
return 0;
if (doubleSlab) {
return 0;
} else {
return state.getValue(HALF) == EnumBlockHalf.TOP ? 8 : 0;
}
}
public abstract BlockSlab getFullBlock();
@@ -25,6 +25,7 @@ public class ItemBlockWithMetadataAndName extends ItemBlock implements IPickupAc
public ItemBlockWithMetadataAndName(Block par2Block) {
super(par2Block);
setHasSubtypes(true);
}
@Override
@@ -47,4 +48,10 @@ public class ItemBlockWithMetadataAndName extends ItemBlock implements IPickupAc
return block instanceof IPickupAchievement ? ((IPickupAchievement) block).getAchievementOnPickup(stack, player, item) : null;
}
@Override
public int getMetadata(int damage)
{
return damage;
}
}