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 b58e4d828..cfa72a1a9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -118,6 +118,7 @@ public final class ModelHandler { registerDyesPetals(); registerRunes(); registerBows(); + registerLens(); registerItemModelMetas(cosmetic, LibItemNames.COSMETIC, 32); registerItemModelMetas(craftPattern, LibItemNames.CRAFT_PATTERN, 9); @@ -332,6 +333,14 @@ public final class ModelHandler { registerItemModel(crystalBow); } + 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 registerStateMappers() { // Ignore vanilla facing, variant in double flower ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower1, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index 6eba216f2..13211e78f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -16,6 +16,7 @@ import java.util.Random; import net.minecraft.block.Block; 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.init.Blocks; @@ -88,9 +89,9 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); ILens lens = (ILens) stack.getItem(); GlStateManager.pushMatrix(); - GlStateManager.translate(-0.4F, -1.4F, -0.4375F); + GlStateManager.translate(-0.0F, -1F, -0.4375F); GlStateManager.scale(0.8F, 0.8F, 0.8F); - // todo 1.8 RenderLens.render(stack, lens.getLensColor(stack)); + Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.FIXED); GlStateManager.popMatrix(); } diff --git a/src/main/resources/assets/botania/models/item/lensBounce.json b/src/main/resources/assets/botania/models/item/lensBounce.json new file mode 100644 index 000000000..ed9ae6661 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensBounce.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensBounce" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensDamage.json b/src/main/resources/assets/botania/models/item/lensDamage.json new file mode 100644 index 000000000..9c80b203c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensDamage.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensDamage" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensEfficiency.json b/src/main/resources/assets/botania/models/item/lensEfficiency.json new file mode 100644 index 000000000..05a0e9289 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensEfficiency.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensEfficiency" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensExplosive.json b/src/main/resources/assets/botania/models/item/lensExplosive.json new file mode 100644 index 000000000..c3f3f92fe --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensExplosive.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensExplosive" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensFire.json b/src/main/resources/assets/botania/models/item/lensFire.json new file mode 100644 index 000000000..9ceb71a00 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensFire.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensFire" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensFirework.json b/src/main/resources/assets/botania/models/item/lensFirework.json new file mode 100644 index 000000000..27e65fcfc --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensFirework.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensFirework" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensFlare.json b/src/main/resources/assets/botania/models/item/lensFlare.json new file mode 100644 index 000000000..ede00f6d5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensFlare.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensFlare" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensGravity.json b/src/main/resources/assets/botania/models/item/lensGravity.json new file mode 100644 index 000000000..b9992069b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensGravity.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensGravity" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensInfluence.json b/src/main/resources/assets/botania/models/item/lensInfluence.json new file mode 100644 index 000000000..ce2d0179b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensInfluence.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensInfluence" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensLight.json b/src/main/resources/assets/botania/models/item/lensLight.json new file mode 100644 index 000000000..a562f7de0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensLight.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensLight" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensMagnet.json b/src/main/resources/assets/botania/models/item/lensMagnet.json new file mode 100644 index 000000000..8ac4bf04e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensMagnet.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensMagnet" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensMine.json b/src/main/resources/assets/botania/models/item/lensMine.json new file mode 100644 index 000000000..de6d48b65 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensMine.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensMine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensNormal.json b/src/main/resources/assets/botania/models/item/lensNormal.json new file mode 100644 index 000000000..b7268d5a2 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensNormal.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensNormal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensPaint.json b/src/main/resources/assets/botania/models/item/lensPaint.json new file mode 100644 index 000000000..bae6b2002 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensPaint.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensPaint" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensPhantom.json b/src/main/resources/assets/botania/models/item/lensPhantom.json new file mode 100644 index 000000000..370f8095e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensPhantom.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensPhantom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensPiston.json b/src/main/resources/assets/botania/models/item/lensPiston.json new file mode 100644 index 000000000..2a0995932 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensPiston.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensPiston" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensPower.json b/src/main/resources/assets/botania/models/item/lensPower.json new file mode 100644 index 000000000..885049b94 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensPower.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensPower" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensRedirect.json b/src/main/resources/assets/botania/models/item/lensRedirect.json new file mode 100644 index 000000000..2680ada51 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensRedirect.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensRedirect" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensSpeed.json b/src/main/resources/assets/botania/models/item/lensSpeed.json new file mode 100644 index 000000000..311ec4308 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensSpeed.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensSpeed" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensTime.json b/src/main/resources/assets/botania/models/item/lensTime.json new file mode 100644 index 000000000..63d78ca3b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensTime.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensTime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensWarp.json b/src/main/resources/assets/botania/models/item/lensWarp.json new file mode 100644 index 000000000..4f3806e50 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensWarp.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensWarp" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensWeight.json b/src/main/resources/assets/botania/models/item/lensWeight.json new file mode 100644 index 000000000..1889ddcde --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensWeight.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensWeight" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaCookie.json b/src/main/resources/assets/botania/models/item/manaCookie.json new file mode 100644 index 000000000..aa65e47b5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaCookie.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/manaCookie" + } +} \ No newline at end of file