From 4f8376a14801a5a928dfec64c350bec7e67457df Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 18 Feb 2016 09:26:16 -0600 Subject: [PATCH] Fix dark quartz disabled crashing client (Renari), other cleanups in modelhandler. Closes #119. --- .../client/core/handler/ModelHandler.java | 58 +++++++------------ 1 file changed, 20 insertions(+), 38 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index 9add37859..13359ebcf 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -8,7 +8,9 @@ */ package vazkii.botania.client.core.handler; +import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; @@ -109,6 +111,7 @@ import vazkii.botania.common.block.tile.TileTeruTeruBozu; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.block.tile.mana.TileBellows; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemManaGun; import vazkii.botania.common.item.ItemSpawnerMover; import vazkii.botania.common.item.ItemTwigWand; @@ -641,7 +644,6 @@ public final class ModelHandler { Item item = manaResource; for (int i = 0; i < LibItemNames.MANA_RESOURCE_NAMES.length; i++) { String name = "botania:" + LibItemNames.MANA_RESOURCE_NAMES[i]; - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory")); ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, "inventory")); } } @@ -649,7 +651,6 @@ public final class ModelHandler { private static void registerRunes() { List variantNames = ImmutableList.of("water", "fire", "earth", "air", "spring", "summer", "autumn", "winter", "mana", "lust", "gluttony", "greed", "sloth", "wrath", "envy", "pride"); for (int i = 0; i < variantNames.size(); i++) { - ModelLoader.registerItemVariants(rune, new ModelResourceLocation("botania:rune_" + variantNames.get(i), "inventory")); ModelLoader.setCustomModelResourceLocation(rune, i, new ModelResourceLocation("botania:rune_" + variantNames.get(i), "inventory")); } } @@ -673,13 +674,11 @@ public final class ModelHandler { private static void registerLens() { int counter = 0; for (String s : LibItemNames.LENS_NAMES) { - ModelLoader.registerItemVariants(lens, new ModelResourceLocation("botania:" + s, "inventory")); ModelLoader.setCustomModelResourceLocation(lens, counter++, new ModelResourceLocation("botania:" + s, "inventory")); } } private static void registerBrews() { - ModelLoader.registerItemVariants(vial, new ModelResourceLocation("botania:vial", "inventory"), new ModelResourceLocation("botania:flask", "inventory")); ModelLoader.setCustomModelResourceLocation(vial, 0, new ModelResourceLocation("botania:vial", "inventory")); ModelLoader.setCustomModelResourceLocation(vial, 1, new ModelResourceLocation("botania:flask", "inventory")); @@ -745,16 +744,16 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); } - List otherSlabs = ImmutableList.copyOf(new Block[] { - ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingwoodPlankSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, + List otherSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingwoodPlankSlab, 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.tileSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab, ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab, ModFluffBlocks.dirtPathSlab, - ModFluffBlocks.shimmerrockSlab, ModFluffBlocks.shimmerwoodPlankSlab, ModFluffBlocks.endStoneSlab, ModFluffBlocks.enderBrickSlab - }); + ModFluffBlocks.shimmerrockSlab, ModFluffBlocks.shimmerwoodPlankSlab, ModFluffBlocks.endStoneSlab, ModFluffBlocks.enderBrickSlab); for (Block b : otherSlabs) { + if (b == null) // Dark quartz disabled + continue; ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); } @@ -771,16 +770,16 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); } - List otherFullSlabs = ImmutableList.copyOf(new Block[] { - ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingwoodPlankSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull, + List otherFullSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingwoodPlankSlabFull, 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, ModFluffBlocks.dirtPathSlabFull, - ModFluffBlocks.shimmerrockSlabFull, ModFluffBlocks.shimmerwoodPlankSlabFull, ModFluffBlocks.endStoneSlabFull, ModFluffBlocks.enderBrickSlabFull - }); + ModFluffBlocks.shimmerrockSlabFull, ModFluffBlocks.shimmerwoodPlankSlabFull, ModFluffBlocks.endStoneSlabFull, ModFluffBlocks.enderBrickSlabFull); for (Block b : otherFullSlabs) { + if (b == null) // Dark quartz disabled + continue; ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); } @@ -796,7 +795,6 @@ public final class ModelHandler { Item item = Item.getItemFromBlock(ModBlocks.mushroom); for (EnumDyeColor color : EnumDyeColor.values()) { String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.mushroom).toString(); - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory_" + color.getName())); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName())); } } @@ -805,14 +803,12 @@ public final class ModelHandler { Item item = Item.getItemFromBlock(ModBlocks.flower); for (EnumDyeColor color : EnumDyeColor.values()) { String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.flower).toString(); - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory_" + color.getName())); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName())); } item = Item.getItemFromBlock(ModBlocks.shinyFlower); for (EnumDyeColor color : EnumDyeColor.values()) { String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.shinyFlower).toString(); - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory_" + color.getName())); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName())); } @@ -820,7 +816,6 @@ public final class ModelHandler { for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1.getAllowedValues()) { String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.doubleFlower1).toString(); String variant = "inventory_" + color.getName(); - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, variant)); } @@ -828,7 +823,6 @@ public final class ModelHandler { for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_2.getAllowedValues()) { String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.doubleFlower2).toString(); String variant = "inventory_" + color.getName(); - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata() - 8, new ModelResourceLocation(name, variant)); } } @@ -839,35 +833,29 @@ public final class ModelHandler { for (EnumDyeColor e : BotaniaStateProps.PAVEMENT_COLOR.getAllowedValues()) { String variant = "color=" + e.getName(); - switch (e) { + switch (e) { // Explicit switch needed because saved meta does not match EnumDyeColor case BLACK: { - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); ModelLoader.setCustomModelResourceLocation(item, 1, new ModelResourceLocation(name, variant)); break; } case BLUE: { - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); ModelLoader.setCustomModelResourceLocation(item, 2, new ModelResourceLocation(name, variant)); break; } case RED: { - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); ModelLoader.setCustomModelResourceLocation(item, 3, new ModelResourceLocation(name, variant)); break; } case YELLOW: { - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); ModelLoader.setCustomModelResourceLocation(item, 4, new ModelResourceLocation(name, variant)); break; } case GREEN: { - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); ModelLoader.setCustomModelResourceLocation(item, 5, new ModelResourceLocation(name, variant)); break; } case WHITE: default: { - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(name, variant)); break; } @@ -890,7 +878,8 @@ public final class ModelHandler { registerItemModel(ModFluffBlocks.blazeQuartzStairs); registerItemModel(ModFluffBlocks.darkPrismarineStairs); - registerItemModel(ModFluffBlocks.darkQuartzStairs); + if (ConfigHandler.darkQuartzEnabled) + registerItemModel(ModFluffBlocks.darkQuartzStairs); registerItemModel(ModFluffBlocks.dreamwoodStairs); registerItemModel(ModFluffBlocks.dreamwoodPlankStairs); registerItemModel(ModFluffBlocks.elfQuartzStairs); @@ -935,7 +924,8 @@ public final class ModelHandler { registerItemModel(ModFluffBlocks.livingrockBrickSlab); registerItemModel(ModFluffBlocks.blazeQuartzSlab); - registerItemModel(ModFluffBlocks.darkQuartzSlab); + if (ConfigHandler.darkQuartzEnabled) + registerItemModel(ModFluffBlocks.darkQuartzSlab); registerItemModel(ModFluffBlocks.elfQuartzSlab); registerItemModel(ModFluffBlocks.lavenderQuartzSlab); registerItemModel(ModFluffBlocks.manaQuartzSlab); @@ -965,14 +955,12 @@ public final class ModelHandler { Item item = Item.getItemFromBlock(ModFluffBlocks.biomeStoneWall); for (BiomeStoneVariant variant : BotaniaStateProps.BIOMESTONEWALL_VARIANT.getAllowedValues()) { String variantName = "inventory_" + variant.getName(); - ModelLoader.registerItemVariants(item, new ModelResourceLocation("botania:biomeStoneA0Wall", variantName)); ModelLoader.setCustomModelResourceLocation(item, variant.ordinal() - 8, new ModelResourceLocation("botania:biomeStoneA0Wall", variantName)); } item = Item.getItemFromBlock(ModFluffBlocks.stoneWall); for (FutureStoneVariant variant : BotaniaStateProps.FUTURESTONEWALL_VARIANT.getAllowedValues()) { String variantName = "inventory_" + variant.getName(); - ModelLoader.registerItemVariants(item, new ModelResourceLocation("botania:stone0Wall", variantName)); ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation("botania:stone0Wall", variantName)); } @@ -994,18 +982,16 @@ public final class ModelHandler { String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.altar).toString(); for (int i = 0; i < AltarVariant.values().length - 1; i++) { // Off by one on purpose to exclude MOSSY String variantName = "variant=" + AltarVariant.values()[i].getName(); - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variantName)); ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, variantName)); } } private static void registerQuartzBlocks() { - for (Block b : ImmutableList.of(ModFluffBlocks.blazeQuartz, ModFluffBlocks.darkQuartz, ModFluffBlocks.elfQuartz, ModFluffBlocks.lavenderQuartz, ModFluffBlocks.manaQuartz, ModFluffBlocks.redQuartz, ModFluffBlocks.sunnyQuartz)) { + for (Block b : Lists.newArrayList(ModFluffBlocks.blazeQuartz, ModFluffBlocks.darkQuartz, ModFluffBlocks.elfQuartz, ModFluffBlocks.lavenderQuartz, ModFluffBlocks.manaQuartz, ModFluffBlocks.redQuartz, ModFluffBlocks.sunnyQuartz)) { + if (b == null) // Dark quartz disabled + continue; Item item = Item.getItemFromBlock(b); String name = GameData.getBlockRegistry().getNameForObject(b).toString(); - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "variant=normal")); - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "variant=chiseled")); - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "variant=pillar_y")); ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(name, "variant=normal")); ModelLoader.setCustomModelResourceLocation(item, 1, new ModelResourceLocation(name, "variant=chiseled")); ModelLoader.setCustomModelResourceLocation(item, 2, new ModelResourceLocation(name, "variant=pillar_y")); @@ -1016,7 +1002,6 @@ public final class ModelHandler { Item item = Item.getItemFromBlock(ModBlocks.lightRelay); String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.lightRelay).toString(); for (LuminizerVariant v : LuminizerVariant.values()) { - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "powered=false,variant=" + v.getName())); ModelLoader.setCustomModelResourceLocation(item, v.ordinal(), new ModelResourceLocation(name, "powered=false,variant=" + v.getName())); } } @@ -1027,10 +1012,8 @@ public final class ModelHandler { for (PoolVariant v : PoolVariant.values()) { if (v == PoolVariant.CREATIVE) { // Special case to have mana water layer - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory_creative")); ModelLoader.setCustomModelResourceLocation(item, v.ordinal(), new ModelResourceLocation(name, "inventory_creative")); } else { - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "variant=" + v.getName())); ModelLoader.setCustomModelResourceLocation(item, v.ordinal(), new ModelResourceLocation(name, "variant=" + v.getName())); } } @@ -1041,7 +1024,6 @@ public final class ModelHandler { for (T e : enumclazz.getEnumConstants()) { String baseName = GameData.getBlockRegistry().getNameForObject(b).toString(); String variantName = variantHeader + "=" + e.getName(); - ModelLoader.registerItemVariants(item, new ModelResourceLocation(baseName, variantName)); ModelLoader.setCustomModelResourceLocation(item, e.ordinal(), new ModelResourceLocation(baseName, variantName)); } }