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 0e5979e28..7705159ed 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -13,6 +13,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.fml.common.registry.GameData; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.api.state.enums.LivingWoodVariant; @@ -52,6 +53,7 @@ public final class ModelHandler { registerFullSlabs(); registerPanes(); registerPylons(); + registerUnstableBeaconPetal(); /** Normal Items **/ registerStandardItems(); @@ -59,10 +61,13 @@ public final class ModelHandler { /** Special Item Meshers **/ } + private static void registerStandardBlocks() { - registerItemModel(ModBlocks.manaGlass); - registerItemModel(ModBlocks.elfGlass); + registerItemModel(ModBlocks.manaGlass); + registerItemModel(ModBlocks.elfGlass); + } + private static void registerStandardItems() { registerItemModel(pestleAndMortar); registerItemModel(blackLotus); @@ -106,6 +111,7 @@ public final class ModelHandler { registerItemModel(thunderSword); registerItemModel(glassPick); } + private static void registerManaResources() { Item item = manaResource; for (int i = 0; i < LibItemNames.MANA_RESOURCE_NAMES.length; i++) { @@ -116,6 +122,11 @@ public final class ModelHandler { } private static void registerStateMappers() { + // Ignore color in unstable cube, mana beacon, and petals (handled by color multiplier) + ModelLoader.setCustomStateMapper(ModBlocks.unstableBlock, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + ModelLoader.setCustomStateMapper(ModBlocks.manaBeacon, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + ModelLoader.setCustomStateMapper(ModBlocks.petalBlock, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + // 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()); @@ -303,6 +314,18 @@ public final class ModelHandler { ModelLoader.setCustomModelResourceLocation(item, 2, new ModelResourceLocation("botania:pylon", "variant=gaia")); } + private static void registerUnstableBeaconPetal() { + // The blocks that are dynamically colored, not through their states + for (EnumDyeColor color : EnumDyeColor.values()) { + Item unstable = Item.getItemFromBlock(ModBlocks.unstableBlock); + Item beacon = Item.getItemFromBlock(ModBlocks.manaBeacon); + Item petal = Item.getItemFromBlock(ModBlocks.petalBlock); + ModelLoader.setCustomModelResourceLocation(unstable, color.getMetadata(), new ModelResourceLocation("botania:unstableBlock", "inventory")); + ModelLoader.setCustomModelResourceLocation(beacon, color.getMetadata(), new ModelResourceLocation("botania:manaBeacon", "inventory")); + ModelLoader.setCustomModelResourceLocation(petal, color.getMetadata(), new ModelResourceLocation("botania:petalBlock", "inventory")); + } + } + private static void registerItemModel(Block b) { registerItemModel(Item.getItemFromBlock(b)); } diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index 31fd4f4a6..6b7424553 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -176,13 +176,11 @@ public final class RenderHelper { int r = (color & 0xFF0000) >> 16; int g = (color & 0xFF00) >> 8; int b = (color & 0xFF); - tessellator.getWorldRenderer().putColorMultiplier(r, g, b, (int) (255F * (1F - f2))); - tessellator.getWorldRenderer().pos(0, 0, 0).endVertex(); - tessellator.getWorldRenderer().putColorMultiplier(0F, 0F, 0F, 0); - tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).endVertex(); - tessellator.getWorldRenderer().pos(0.866D * f4, f3, -0.5F * f4).endVertex(); - tessellator.getWorldRenderer().pos(0, f3, 1F * f4).endVertex(); - tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).endVertex(); + tessellator.getWorldRenderer().pos(0, 0, 0).color(r, g, b, 255F * (1F - f2)).endVertex(); + tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(); + tessellator.getWorldRenderer().pos(0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(); + tessellator.getWorldRenderer().pos(0, f3, 1F * f4).color(0, 0, 0, 0).endVertex(); + tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(); tessellator.draw(); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java index 571b2390d..770d17284 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -33,6 +33,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileManaBeacon; +import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -51,6 +52,11 @@ public class BlockManaBeacon extends BlockModContainer implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } + @Override + public int getRenderType() { + return 3; + } + @Override public BlockState createBlockState() { return new BlockState(this, BotaniaStateProps.COLOR); @@ -77,7 +83,7 @@ public class BlockManaBeacon extends BlockModContainer implements ILexiconable { @Override public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + GameRegistry.registerBlock(this, ItemBlockWithMetaNameAndColor.class, par1Str); return super.setUnlocalizedName(par1Str); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java index 9b7d398c8..9db19fef0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -30,6 +30,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockMod; +import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -76,7 +77,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { @Override public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + GameRegistry.registerBlock(this, ItemBlockWithMetaNameAndColor.class, par1Str); return super.setUnlocalizedName(par1Str); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java index a37883145..076ccc26b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -33,6 +33,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.core.helper.Vector3; +import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -76,7 +77,7 @@ public class BlockUnstable extends BlockMod implements ILexiconable { @Override public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + GameRegistry.registerBlock(this, ItemBlockWithMetaNameAndColor.class, par1Str); return super.setUnlocalizedName(par1Str); } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index 3f261bc5d..3c411fd95 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -90,7 +90,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { } public void register() { - GameRegistry.registerBlock(this, ItemBlockModSlab.class, name); + GameRegistry.registerBlock(this, isDouble() ? null : ItemBlockModSlab.class, name); } @Override diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetaNameAndColor.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetaNameAndColor.java new file mode 100644 index 000000000..093dc909e --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetaNameAndColor.java @@ -0,0 +1,19 @@ +package vazkii.botania.common.item.block; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public class ItemBlockWithMetaNameAndColor extends ItemBlockWithMetadataAndName { + public ItemBlockWithMetaNameAndColor(Block block) { + super(block); + } + + @Override + @SideOnly(Side.CLIENT) + public int getColorFromItemStack(ItemStack stack, int renderPass) + { + return this.block.getRenderColor(this.block.getStateFromMeta(stack.getMetadata())); + } +} diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java index 630c88b1b..fac476911 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java @@ -20,7 +20,7 @@ import net.minecraft.stats.Achievement; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.IPickupAchievement; -// todo 1.8 revalidate this (used to extend ItemBlockWithMetadata which got removed) + public class ItemBlockWithMetadataAndName extends ItemBlock implements IPickupAchievement, ICraftAchievement { public ItemBlockWithMetadataAndName(Block par2Block) { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index f047b6203..2f75e7f33 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -171,7 +171,7 @@ public class PageCraftingRecipe extends PageRecipe { Object input = shapeless.getInput().get(index); if(input != null) - renderItemAtGridPos(gui, 1 + x, 1 + y, input instanceof ItemStack ? (ItemStack) input : ((ArrayList) input).get(0), true); + renderItemAtGridPos(gui, 1 + x, 1 + y, input instanceof ItemStack ? (ItemStack) input : ((List) input).get(0), true); } } diff --git a/src/main/resources/assets/botania/blockstates/manaBeacon.json b/src/main/resources/assets/botania/blockstates/manaBeacon.json new file mode 100644 index 000000000..08230c4fc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/manaBeacon.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:miniblock_top", + "textures": { + "all": "botania:blocks/manaBeacon0", + "top": "botania:blocks/manaBeacon1" + } + }, + "variants": { + "normal": [{}], + "inventory": [{ + "transform": "forge:default-block" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/petalBlock.json b/src/main/resources/assets/botania/blockstates/petalBlock.json new file mode 100644 index 000000000..4e6278648 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/petalBlock.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:cube_all_tinted", + "textures": { + "all": "botania:blocks/petalBlock" + } + }, + "variants": { + "normal": [{}], + "inventory": [{ + "transform": "forge:default-block" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/unstableBlock.json b/src/main/resources/assets/botania/blockstates/unstableBlock.json new file mode 100644 index 000000000..47a7be21f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/unstableBlock.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:microblock_all", + "textures": { + "all": "botania:blocks/unstableBlock" + } + }, + "variants": { + "normal": [{}], + "inventory": [{ + "transform": "forge:default-block" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/cube_all_tinted.json b/src/main/resources/assets/botania/models/block/cube_all_tinted.json new file mode 100644 index 000000000..bde99787b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/cube_all_tinted.json @@ -0,0 +1,18 @@ +{ + "textures": { + "particle": "#all" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "texture": "#all", "cullface": "down", "tintindex": 0 }, + "up": { "texture": "#all", "cullface": "up", "tintindex": 0 }, + "north": { "texture": "#all", "cullface": "north", "tintindex": 0 }, + "south": { "texture": "#all", "cullface": "south", "tintindex": 0 }, + "west": { "texture": "#all", "cullface": "west", "tintindex": 0 }, + "east": { "texture": "#all", "cullface": "east", "tintindex": 0 } + } + } + ] +} diff --git a/src/main/resources/assets/botania/models/block/microblock_all.json b/src/main/resources/assets/botania/models/block/microblock_all.json new file mode 100644 index 000000000..9cd2d3fc0 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/microblock_all.json @@ -0,0 +1,20 @@ +{ + "textures": { + "particle": "#all" + }, + "elements": [ + { + "name": "Cube", + "from": [ 4, 4, 4 ], + "to": [ 12, 12, 12 ], + "faces": { + "down": { "texture": "#all", "uv": [ 4, 4, 12, 12 ], "tintindex": 0 }, + "up": { "texture": "#all", "uv": [ 4, 4, 12, 12 ], "tintindex": 0 }, + "north": { "texture": "#all", "uv": [ 4, 4, 12, 12 ], "tintindex": 0 }, + "south": { "texture": "#all", "uv": [ 4, 4, 12, 12 ], "tintindex": 0 }, + "west": { "texture": "#all", "uv": [ 4, 4, 12, 12 ], "tintindex": 0 }, + "east": { "texture": "#all", "uv": [ 4, 4, 12, 12 ], "tintindex": 0 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/miniblock_top.json b/src/main/resources/assets/botania/models/block/miniblock_top.json new file mode 100644 index 000000000..9022ed180 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/miniblock_top.json @@ -0,0 +1,20 @@ +{ + "textures": { + "particle": "#all" + }, + "elements": [ + { + "name": "Cube", + "from": [ 3, 3, 3 ], + "to": [ 13, 13, 13 ], + "faces": { + "down": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "up": { "texture": "#top", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "north": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "south": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "west": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "east": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 } + } + } + ] +} \ No newline at end of file