diff --git a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java index fc1321474..ab920d928 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -136,7 +136,7 @@ public final class BaubleRenderHandler { // ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); // // Color color = new Color(item.getColorFromItemStack(stack, 1)); -// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); +// GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); // } GlStateManager.popMatrix(); diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index 2f14b0c0c..3c6b43fc6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -114,7 +114,7 @@ public final class BoundTileRenderer { GlStateManager.pushMatrix(); GlStateManager.translate(pos.getX() - getRenderPosX(), pos.getY() - getRenderPosY(), pos.getZ() - getRenderPosZ() + 1); Color colorRGB = new Color(color); - GlStateManager.color((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 255); + GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 255); World world = Minecraft.getMinecraft().theWorld; Block block = world.getBlockState(pos).getBlock(); diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 2ce1d396d..fc7305c31 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -259,7 +259,7 @@ public final class HUDHandler { } Color color = new Color(Color.HSBtoRGB(0.55F, (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 200D) * 0.5 + 1F), 1F)); - GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue(), (byte) (255 - color.getRed())); + GL11.glColor4ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue(), (byte) (255 - color.getRed())); mc.renderEngine.bindTexture(manaBar); GlStateManager.enableBlend(); @@ -484,7 +484,7 @@ public final class HUDHandler { RenderHelper.drawTexturedModalRect(x + 1, y + 1, 0, 0, 5, 100, 3); Color color_ = new Color(color); - GlStateManager.color((byte) color_.getRed(), (byte) color_.getGreen(),(byte) color_.getBlue(), (byte) (255F * alpha)); + GL11.glColor4ub((byte) color_.getRed(), (byte) color_.getGreen(),(byte) color_.getBlue(), (byte) (255F * alpha)); RenderHelper.drawTexturedModalRect(x + 1, y + 1, 0, 0, 5, Math.min(100, manaPercentage), 3); } } 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 1261e1225..ff5ce6e81 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -123,6 +123,7 @@ public final class ModelHandler { registerBows(); registerLens(); + registerItemModelAllMeta(laputaShard, 20); registerItemModelAllMeta(signalFlare, EnumDyeColor.values().length); registerItemModelAllMeta(dye, EnumDyeColor.values().length); registerItemModelAllMeta(petal, EnumDyeColor.values().length); @@ -217,6 +218,9 @@ public final class ModelHandler { registerItemModel(ModBlocks.forestEye); registerItemModel(ModBlocks.seaLamp); registerItemModel(ModBlocks.cellBlock); + registerItemModel(ModBlocks.enchantedSoil); + registerItemModel(ModBlocks.enchanter); + registerItemModel(ModBlocks.prism); // Item models which all use the same base model and recolored by render layer registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.unstableBlock), EnumDyeColor.values().length); @@ -299,6 +303,10 @@ public final class ModelHandler { registerItemModel(tornadoRod); ModelLoader.registerItemVariants(tornadoRod, new ModelResourceLocation("botania:tornadoRod_flying", "inventory")); + + registerItemModel(openBucket); + registerItemModel(bloodPendant); + } private static void registerManaResources() { diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java index d8a881d58..50aee0fab 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -102,7 +102,7 @@ public final class SubTileRadiusRenderHandler { int color = Color.HSBtoRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F); Color colorRGB = new Color(color); - GlStateManager.color((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 32); + GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 32); double f = 1F / 16F; double x = aabb.maxX - aabb.minX - f; @@ -119,7 +119,7 @@ public final class SubTileRadiusRenderHandler { x += f; z += f; double f1 = f + f / 4F; - GlStateManager.color((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); + GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION); tessellator.getWorldRenderer().pos(x, f1, 0).endVertex(); tessellator.getWorldRenderer().pos(0, f1, 0).endVertex(); @@ -139,7 +139,7 @@ public final class SubTileRadiusRenderHandler { int color = Color.HSBtoRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F); Color colorRGB = new Color(color); - GlStateManager.color((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 32); + GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 32); double f = 1F / 16F; @@ -162,7 +162,7 @@ public final class SubTileRadiusRenderHandler { radius += f; double f1 = f + f / 4F; - GlStateManager.color((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); + GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); tessellator.getWorldRenderer().begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION); tessellator.getWorldRenderer().pos(0, f1, 0).endVertex(); for(int i = 0; i < totalAngles + 1; i += step) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java index 155ff4d7f..9ffc403f5 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -87,7 +87,7 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { // IIcon icon = stack.getItem().getIcon(stack, renderPass); // if(icon != null) { // Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); -// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); +// GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); // float f = icon.getMinU(); // float f1 = icon.getMaxU(); // float f2 = icon.getMinV(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index 7e701257a..0b5d1e74b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -73,7 +73,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer { // IIcon icon = stack.getItem().getIcon(stack, renderPass); // if(icon != null) { // Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); -// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); +// GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); // float f = icon.getMinU(); // float f1 = icon.getMaxU(); // float f2 = icon.getMinV(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java index 5baca290e..8002c1b0d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -12,6 +12,7 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; @@ -41,8 +42,8 @@ public class RenderTilePrism extends TileEntitySpecialRenderer { ILens lens = (ILens) stack.getItem(); GlStateManager.pushMatrix(); GlStateManager.rotate(90F, 1F, 0F, 0F); - GlStateManager.translate(0F, 0F, pos); - // todo 1.8 RenderLens.render(stack, lens.getLensColor(stack)); + GlStateManager.translate(0.5F, 0.5F, pos); + Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.NONE); GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java index 338540d6e..16511c14e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java @@ -48,7 +48,7 @@ public class RenderTileSparkChanger extends TileEntitySpecialRenderer { // IIcon icon = stack.getItem().getIcon(stack, renderPass); // if(icon != null) { // Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); -// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); +// GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); // float f = icon.getMinU(); // float f1 = icon.getMaxU(); // float f2 = icon.getMinV(); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index c913900e6..310b05a28 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -78,7 +78,7 @@ public class BlockEnchanter extends BlockModContainer implements IWandable, ILex @Override public int getMetaFromState(IBlockState state) { - switch (((EnumFacing.Axis) state.getValue(BotaniaStateProps.ENCHANTER_DIRECTION))) { + switch (state.getValue(BotaniaStateProps.ENCHANTER_DIRECTION)) { case Z: return 1; case X: default: return 0; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index 18c6fb4ae..deef965ba 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -80,7 +80,7 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi @Override @SideOnly(Side.CLIENT) public EnumWorldBlockLayer getBlockLayer() { - return EnumWorldBlockLayer.CUTOUT_MIPPED; // todo 1.8 + return EnumWorldBlockLayer.TRANSLUCENT; } @Override @@ -123,7 +123,6 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi prism.setInventorySlotContents(0, null); prism.markDirty(); par1World.setBlockState(pos, state.withProperty(BotaniaStateProps.HAS_LENS, false), 1 | 2); -// par1World.setBlockMetadataWithNotify(par2, par3, par4, meta & 14, 1 | 2); } return true; diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index d4f2b3f70..0a79ea6ce 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -457,7 +457,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { IIcon icon = slotStack.getItem().getIcon(slotStack, renderPass); if(icon != null) { Color color = new Color(slotStack.getItem().getColorFromItemStack(slotStack, renderPass)); - GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); + GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); diff --git a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index ff0189ec5..0ee5f41d2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -45,7 +45,7 @@ public class ItemOpenBucket extends ItemMod { return par1ItemStack; Material material = par2World.getBlockState(pos).getBlock().getMaterial(); - int l = par2World.getBlockState(pos).getValue(BlockLiquid.LEVEL); + int l = par2World.getBlockState(pos).getBlock().getMetaFromState(par2World.getBlockState(pos)); // hack to get meta so we don't have to know the level prop if((material == Material.lava || material == Material.water) && l == 0) { par2World.setBlockToAir(pos); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java index a9918af7b..247c44c64 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java @@ -181,7 +181,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F);*/ Color color = new Color(getColorFromItemStack(stack, 1)); - GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); + GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); int light = 15728880; int lightmapX = light % 65536; int lightmapY = light / 65536; diff --git a/src/main/resources/assets/botania/blockstates/enchantedSoil.json b/src/main/resources/assets/botania/blockstates/enchantedSoil.json new file mode 100644 index 000000000..9daa1928c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/enchantedSoil.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "minecraft:blocks/dirt", + "top": "botania:blocks/enchantedSoil0", + "side": "botania:blocks/enchantedSoil1" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/enchanter.json b/src/main/resources/assets/botania/blockstates/enchanter.json new file mode 100644 index 000000000..fb206fdd8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/enchanter.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/enchanter" + }, + "transform": "forge:default-block" + }, + "variants": { + "facing=x": [{}], + "facing=z": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prism.json b/src/main/resources/assets/botania/blockstates/prism.json new file mode 100644 index 000000000..594c03ccd --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prism.json @@ -0,0 +1,23 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:prism", + "textures": { + "bottom": "botania:blocks/prism0", + "top": "botania:blocks/prism0", + "side": "botania:blocks/prism1" + }, + "transform": "forge:default-block" + }, + "variants": { + "inventory": [{}], + "powered": { + "true": {}, + "false": {} + }, + "has_lens": { + "true": {}, + "false": {} + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/prism.json b/src/main/resources/assets/botania/models/block/prism.json new file mode 100644 index 000000000..021d96f40 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/prism.json @@ -0,0 +1,20 @@ +{ + "textures": { + "particle": "#side" + }, + "elements": [ + { + "name": "Cube", + "from": [ 4, 0, 4 ], + "to": [ 12, 16, 12 ], + "faces": { + "down": { "texture": "#bottom", "uv": [ 4, 4, 12, 12 ], "cullface": "down" }, + "up": { "texture": "#top", "uv": [ 4, 4, 12, 12 ], "cullface": "up" }, + "north": { "texture": "#side", "uv": [ 4, 0, 12, 16 ] }, + "south": { "texture": "#side", "uv": [ 4, 0, 12, 16 ] }, + "west": { "texture": "#side", "uv": [ 4, 0, 12, 16 ] }, + "east": { "texture": "#side", "uv": [ 4, 0, 12, 16 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/bloodPendant.json b/src/main/resources/assets/botania/models/item/bloodPendant.json new file mode 100644 index 000000000..5a9531414 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/bloodPendant.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/bloodPendant0", + "layer1": "botania:items/bloodPendant1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/laputaShard.json b/src/main/resources/assets/botania/models/item/laputaShard.json new file mode 100644 index 000000000..d71b4eaf7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/laputaShard.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/laputaShard" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/openBucket.json b/src/main/resources/assets/botania/models/item/openBucket.json new file mode 100644 index 000000000..ccc57c213 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/openBucket.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/openBucket" + } +} \ No newline at end of file