From 64a8dfbcfed42f407cd6df296b124b6684818620 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 23 Dec 2015 20:26:33 -0600 Subject: [PATCH] Drums, runic altar, mana pool kinda, distributor, force relay, starfield --- .../client/core/handler/ModelHandler.java | 18 +++++++++++- .../client/render/tile/RenderTilePool.java | 2 +- .../render/tile/RenderTileStarfield.java | 11 +++++-- .../common/block/decor/BlockStarfield.java | 11 +++++++ .../common/block/mana/BlockDistributor.java | 5 ++++ .../botania/common/block/mana/BlockPool.java | 2 +- .../common/block/mana/BlockRuneAltar.java | 5 ++++ .../botania/common/item/material/ItemDye.java | 1 - .../lexicon/page/PageCraftingRecipe.java | 2 +- .../botania/blockstates/distributor.json | 17 +++++++++++ .../botania/blockstates/forestDrum.json | 7 +++++ .../botania/blockstates/pistonRelay.json | 15 ++++++++++ .../assets/botania/blockstates/runeAltar.json | 17 +++++++++++ .../assets/botania/blockstates/starfield.json | 29 +++++++++++++++++++ .../botania/models/block/biggerthanslab.json | 19 ++++++++++++ .../assets/botania/models/block/drum.json | 18 ++++++++++++ .../botania/models/block/drum_canopy.json | 7 +++++ .../botania/models/block/drum_gathering.json | 7 +++++ .../botania/models/block/drum_wild.json | 7 +++++ .../botania/models/block/thinnerthanslab.json | 19 ++++++++++++ .../botania/models/item/drum_canopy.json | 10 +++++++ .../botania/models/item/drum_gathering.json | 10 +++++++ .../assets/botania/models/item/drum_wild.json | 10 +++++++ 23 files changed, 242 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/distributor.json create mode 100644 src/main/resources/assets/botania/blockstates/forestDrum.json create mode 100644 src/main/resources/assets/botania/blockstates/pistonRelay.json create mode 100644 src/main/resources/assets/botania/blockstates/runeAltar.json create mode 100644 src/main/resources/assets/botania/blockstates/starfield.json create mode 100644 src/main/resources/assets/botania/models/block/biggerthanslab.json create mode 100644 src/main/resources/assets/botania/models/block/drum.json create mode 100644 src/main/resources/assets/botania/models/block/drum_canopy.json create mode 100644 src/main/resources/assets/botania/models/block/drum_gathering.json create mode 100644 src/main/resources/assets/botania/models/block/drum_wild.json create mode 100644 src/main/resources/assets/botania/models/block/thinnerthanslab.json create mode 100644 src/main/resources/assets/botania/models/item/drum_canopy.json create mode 100644 src/main/resources/assets/botania/models/item/drum_gathering.json create mode 100644 src/main/resources/assets/botania/models/item/drum_wild.json 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 7705159ed..f2ca9e230 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -54,6 +54,7 @@ public final class ModelHandler { registerPanes(); registerPylons(); registerUnstableBeaconPetal(); + registerDrums(); /** Normal Items **/ registerStandardItems(); @@ -65,7 +66,10 @@ public final class ModelHandler { private static void registerStandardBlocks() { registerItemModel(ModBlocks.manaGlass); registerItemModel(ModBlocks.elfGlass); - + registerItemModel(ModBlocks.runeAltar); + registerItemModel(ModBlocks.pistonRelay); + registerItemModel(ModBlocks.distributor); + registerItemModel(ModBlocks.starfield); } private static void registerStandardItems() { @@ -122,6 +126,9 @@ public final class ModelHandler { } private static void registerStateMappers() { + // Ignore redstone power state in some blocks + ModelLoader.setCustomStateMapper(ModBlocks.starfield, (new StateMap.Builder()).ignore(BotaniaStateProps.POWERED).build()); + // 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()); @@ -326,6 +333,15 @@ public final class ModelHandler { } } + private static void registerDrums() { + Item item = Item.getItemFromBlock(ModBlocks.forestDrum); + for (LivingRockVariant variant : LivingRockVariant.values()) { + String name = "botania:drum_" + variant.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); + } + } + private static void registerItemModel(Block b) { registerItemModel(Item.getItemFromBlock(b)); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 30c32c351..217bbfecd 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -73,7 +73,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { time += new Random(tileentity.getPos().hashCode()).nextInt(100000); Color color = Color.getHSBColor(time * 0.005F, 0.6F, 1F); - GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue(), (byte) 255); + GL11.glColor4ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue(), (byte) 255); } else { int hex = pool.color.getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index 580be7a9b..f55132eaf 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -44,7 +44,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer { float f2 = (float)this.rendererDispatcher.entityZ; GlStateManager.disableLighting(); field_147527_e.setSeed(31100L); - float f3 = 0.75F; + float f3 = 0.24F; for (int i = 0; i < 16; ++i) { @@ -97,7 +97,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer { GlStateManager.matrixMode(5890); GlStateManager.pushMatrix(); GlStateManager.loadIdentity(); - GlStateManager.translate(0.0F, (float)(Minecraft.getSystemTime() % 700000L) / 700000.0F, 0.0F); + GlStateManager.translate(0.0F, (float)(Minecraft.getSystemTime() % 20000) / 20000.0F, 0.0F); GlStateManager.scale(f5, f5, f5); GlStateManager.translate(0.5F, 0.5F, 0.0F); GlStateManager.rotate((float)(i * i * 4321 + i * 9) * 2.0F, 0.0F, 0.0F, 1.0F); @@ -117,6 +117,13 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer { f11 = f12 = f13 = 1.0F * f6; } + Color color = Color.getHSBColor(Minecraft.getSystemTime() / 20F % 360 / 360F, 1F, 1F); + f11 = color.getRed() / 255F; + f12 = color.getGreen() / 255F; + f13 = color.getBlue() / 255F; + + f11 *= f6; f12 *= f6; f13 *= f6; + worldrenderer.pos(x, y + (double)f3, z).color(f11, f12, f13, 1.0F).endVertex(); worldrenderer.pos(x, y + (double)f3, z + 1.0D).color(f11, f12, f13, 1.0F).endVertex(); worldrenderer.pos(x + 1.0D, y + (double)f3, z + 1.0D).color(f11, f12, f13, 1.0F).endVertex(); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java index 45b856dcf..3ec634b7a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -17,6 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -39,6 +40,16 @@ public class BlockStarfield extends BlockModContainer implements ILexiconable { setBlockBounds(0F, 0F, 0F, 1F, 0.25F, 1F); } + @Override + public int getRenderType() { + return 3; + } + + @Override + public EnumWorldBlockLayer getBlockLayer() { + return EnumWorldBlockLayer.CUTOUT_MIPPED; + } + @Override public BlockState createBlockState() { return new BlockState(this, BotaniaStateProps.POWERED); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java index 7b8a74365..cf1bb11ad 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -35,6 +35,11 @@ public class BlockDistributor extends BlockModContainer implements ILexiconable setUnlocalizedName(LibBlockNames.DISTRIBUTOR); } + @Override + public int getRenderType() { + return 3; + } + @Override public TileEntity createNewTileEntity(World world, int meta) { return new TileDistributor(); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index e0637af30..e4b5ae2f2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -192,7 +192,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, @Override public int getRenderType() { - return LibRenderIDs.idPool; + return 2; } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index 3dac4408f..e9b02430b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -52,6 +52,11 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, ILex random = new Random(); } + @Override + public int getRenderType() { + return 3; + } + @Override public boolean isOpaqueCube() { return false; diff --git a/src/main/java/vazkii/botania/common/item/material/ItemDye.java b/src/main/java/vazkii/botania/common/item/material/ItemDye.java index 7697d2d28..f0f01db83 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -51,7 +51,6 @@ public class ItemDye extends Item16Colors { TileEntity tile = par3World.getTileEntity(pos); if(tile instanceof IDyablePool) { IDyablePool dyable = (IDyablePool) tile; - int itemMeta = par1ItemStack.getItemDamage(); if(color != dyable.getColor()) { dyable.setColor(color); par1ItemStack.stackSize--; 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 2f75e7f33..231e00020 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -138,7 +138,7 @@ public class PageCraftingRecipe extends PageRecipe { for(int x = 0; x < width; x++) { Object input = shaped.getInput()[y * width + x]; 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); } oreDictRecipe = true; diff --git a/src/main/resources/assets/botania/blockstates/distributor.json b/src/main/resources/assets/botania/blockstates/distributor.json new file mode 100644 index 000000000..3a39b6b79 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/distributor.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "top": "botania:blocks/distributor0", + "side": "botania:blocks/distributor1", + "bottom": "botania:blocks/livingrock0" + } + }, + "variants": { + "normal": [{}], + "inventory": [{ + "transform": "forge:default-block" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/forestDrum.json b/src/main/resources/assets/botania/blockstates/forestDrum.json new file mode 100644 index 000000000..a7f73aba4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/forestDrum.json @@ -0,0 +1,7 @@ +{ + "variants": { + "variant=wild": { "model": "botania:drum_wild" }, + "variant=gathering": { "model": "botania:drum_gathering" }, + "variant=canopy": { "model": "botania:drum_canopy" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pistonRelay.json b/src/main/resources/assets/botania/blockstates/pistonRelay.json new file mode 100644 index 000000000..fb1ccb55e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pistonRelay.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/pistonRelay" + } + }, + "variants": { + "normal": [{}], + "inventory": [{ + "transform": "forge:default-block" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/runeAltar.json b/src/main/resources/assets/botania/blockstates/runeAltar.json new file mode 100644 index 000000000..fcff3d2dc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/runeAltar.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:biggerthanslab", + "textures": { + "top": "botania:blocks/runeAltar1", + "side": "botania:blocks/runeAltar2", + "bottom": "botania:blocks/runeAltar0" + } + }, + "variants": { + "normal": [{}], + "inventory": [{ + "transform": "forge:default-block" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/starfield.json b/src/main/resources/assets/botania/blockstates/starfield.json new file mode 100644 index 000000000..e37b30a21 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/starfield.json @@ -0,0 +1,29 @@ +{ + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block" + }, + "variants": { + "normal": [{ + "model": "botania:thinnerthanslab", + "textures": { + "bottom": "botania:blocks/starfield0", + "top": "botania:blocks/starfield1", + "side": "botania:blocks/starfield2" + } + }], + "inventory": [{ + "model": "botania:thinnerthanslab", + "textures": { + "bottom": "botania:blocks/starfield0", + "top": "botania:blocks/starfield0", + "side": "botania:blocks/starfield2" + }, + "transform": { + "firstperson": { + "translation": [ 0, 0.125, 0 ] + } + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/biggerthanslab.json b/src/main/resources/assets/botania/models/block/biggerthanslab.json new file mode 100644 index 000000000..7c944c1fd --- /dev/null +++ b/src/main/resources/assets/botania/models/block/biggerthanslab.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 12, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "west" }, + "east": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/botania/models/block/drum.json b/src/main/resources/assets/botania/models/block/drum.json new file mode 100644 index 000000000..f7c0d0dae --- /dev/null +++ b/src/main/resources/assets/botania/models/block/drum.json @@ -0,0 +1,18 @@ +{ + "textures": { + "particle": "#side" + }, + "elements": [{ + "name": "Drum", + "from": [ 3.0, 0.0, 3.0 ], + "to": [ 13.0, 14.0, 13.0 ], + "faces": { + "north": { "texture": "#side", "uv": [ 3, 2, 13, 16 ] }, + "south": { "texture": "#side", "uv": [ 3, 2, 13, 16 ] }, + "west": { "texture": "#side", "uv": [ 3, 2, 13, 16 ] }, + "east": { "texture": "#side", "uv": [ 3, 2, 13, 16 ] }, + "up": { "texture": "#top", "uv": [ 3, 3, 12, 12 ] }, + "down": { "texture": "#top", "uv": [ 3, 3, 12, 12 ], "cullface": "down" } + } + }] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_canopy.json b/src/main/resources/assets/botania/models/block/drum_canopy.json new file mode 100644 index 000000000..915c02d27 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/drum_canopy.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/drum", + "textures": { + "top": "botania:blocks/forestDrum4", + "side": "botania:blocks/forestDrum5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_gathering.json b/src/main/resources/assets/botania/models/block/drum_gathering.json new file mode 100644 index 000000000..b92f432f5 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/drum_gathering.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/drum", + "textures": { + "top": "botania:blocks/forestDrum2", + "side": "botania:blocks/forestDrum3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_wild.json b/src/main/resources/assets/botania/models/block/drum_wild.json new file mode 100644 index 000000000..86bd38747 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/drum_wild.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/drum", + "textures": { + "top": "botania:blocks/forestDrum0", + "side": "botania:blocks/forestDrum1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/thinnerthanslab.json b/src/main/resources/assets/botania/models/block/thinnerthanslab.json new file mode 100644 index 000000000..3e9cc996a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/thinnerthanslab.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 4, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 12, 16, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 0, 12, 16, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 0, 12, 16, 16 ], "texture": "#side", "cullface": "west" }, + "east": { "uv": [ 0, 12, 16, 16 ], "texture": "#side", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/botania/models/item/drum_canopy.json b/src/main/resources/assets/botania/models/item/drum_canopy.json new file mode 100644 index 000000000..0146560c5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/drum_canopy.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/drum_canopy", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/drum_gathering.json b/src/main/resources/assets/botania/models/item/drum_gathering.json new file mode 100644 index 000000000..d23ff797b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/drum_gathering.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/drum_gathering", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/drum_wild.json b/src/main/resources/assets/botania/models/item/drum_wild.json new file mode 100644 index 000000000..9d0bf43ab --- /dev/null +++ b/src/main/resources/assets/botania/models/item/drum_wild.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/drum_wild", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file