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 b62d05d50..21f20fdb4 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -435,12 +435,15 @@ public final class ModelHandler { registerItemModel(manaRingGreater); registerItemModel(auraRing); registerItemModel(auraRingGreater); + registerItemModel(spark); registerItemModelAllMeta(laputaShard, 20); registerItemModelAllMeta(signalFlare, EnumDyeColor.values().length); registerItemModelAllMeta(dye, EnumDyeColor.values().length); registerItemModelAllMeta(petal, EnumDyeColor.values().length); + registerItemModelMetas(sparkUpgrade, LibItemNames.SPARK_UPGRADE, 4); + registerItemModelMetas(corporeaSpark, LibItemNames.CORPOREA_SPARK, 2); registerItemModelMetas(manaBottle, LibItemNames.MANA_BOTTLE, 6); registerItemModelMetas(ancientWill, LibItemNames.ANCIENT_WILL, 6); registerItemModelMetas(temperanceStone, LibItemNames.TEMPERANCE_STONE, 2); diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java index aa88e0ec4..ab9bc9c88 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -18,6 +18,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.*; import net.minecraft.world.IBlockAccess; @@ -48,6 +49,22 @@ public final class MultiblockRenderHandler { public static EnumFacing angle; public static int dimension; + static { + //todo 1.8 remove when fixed by forge + IMultiblockRenderHook.renderHooks.put(ModBlocks.pylon, new IMultiblockRenderHook() { + @Override + public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp, float alpha) { + IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(state); + Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightness(model, state, 1.0F, false); + } + + @Override + public boolean needsTranslate(IBlockState state) { + return true; + } + }); + } + public static void setMultiblock(MultiblockSet set) { currentMultiblock = set; anchor = null; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java index 20323dfa6..aa83257c9 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -38,7 +38,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { @Override public TextureAtlasSprite getBaseIcon(EntityCorporeaSpark entity) { - return null;//entity.isMaster() ? ItemCorporeaSpark.worldIconMaster : ItemCorporeaSpark.worldIcon; + return entity.isMaster() ? ItemCorporeaSpark.worldIconMaster : ItemCorporeaSpark.worldIcon; } @Override @@ -53,7 +53,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { @Override public TextureAtlasSprite getSpinningIcon(EntityCorporeaSpark entity) { - return null;//ItemCorporeaSpark.iconColorStar; + return ItemCorporeaSpark.iconColorStar; } @Override diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java index 7da7e3c52..44febf9c5 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java @@ -23,9 +23,8 @@ public class RenderSpark extends RenderSparkBase { @Override public TextureAtlasSprite getSpinningIcon(EntitySpark entity) { - return null; - /*int upgrade = entity.getUpgrade() - 1; - return upgrade >= 0 && upgrade < ItemSparkUpgrade.worldIcons.length ? ItemSparkUpgrade.worldIcons[upgrade] : null;*/ + int upgrade = entity.getUpgrade() - 1; + return upgrade >= 0 && upgrade < ItemSparkUpgrade.worldIcons.length ? ItemSparkUpgrade.worldIcons[upgrade] : null; } } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java index 8872392c2..2163e5b9a 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -81,7 +81,7 @@ public class RenderSparkBase extends RenderEntity { } public TextureAtlasSprite getBaseIcon(T entity) { - return null;//ItemSpark.worldIcon; + return ItemSpark.worldIcon; } public void colorSpinningIcon(T entity, float a) { diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 4fb732bc5..876d7dbb3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item; import java.util.List; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -21,6 +22,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.entity.EntityCorporeaSpark; @@ -28,9 +34,12 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemCorporeaSpark extends ItemMod { + public static TextureAtlasSprite worldIcon, worldIconMaster, iconColorStar; + public ItemCorporeaSpark() { setUnlocalizedName(LibItemNames.CORPOREA_SPARK); setHasSubtypes(true); + MinecraftForge.EVENT_BUS.register(this); } @Override @@ -57,14 +66,13 @@ public class ItemCorporeaSpark extends ItemMod { return false; } -// @Override todo 1.8 -// public void registerIcons(IIconRegister par1IconRegister) { -// invIcon = IconHelper.forItem(par1IconRegister, this, 0); -// worldIcon = IconHelper.forItem(par1IconRegister, this, 1); -// invIconMaster = IconHelper.forItem(par1IconRegister, this, 2); -// worldIconMaster = IconHelper.forItem(par1IconRegister, this, 3); -// iconColorStar = IconHelper.forItem(par1IconRegister, this, "Star"); -// } + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onTextureStitch(TextureStitchEvent.Pre evt) { + worldIcon = IconHelper.forName(evt.map, "corporeaSpark1", "items"); + worldIconMaster = IconHelper.forName(evt.map, "corporeaSpark3", "items"); + iconColorStar = IconHelper.forName(evt.map, "corporeaSparkStar", "items"); + } @Override public String getUnlocalizedName(ItemStack par1ItemStack) { diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index a5cfa1a6d..3ddfeb2a6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -18,6 +19,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaGivingItem; import vazkii.botania.api.mana.spark.ISparkAttachable; @@ -29,8 +35,17 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemSpark extends ItemMod implements ICraftAchievement, IManaGivingItem { + public static TextureAtlasSprite worldIcon; + public ItemSpark() { setUnlocalizedName(LibItemNames.SPARK); + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onTextureStitch(TextureStitchEvent.Pre evt) { + worldIcon = IconHelper.forName(evt.map, "items/spark1"); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index d9f776643..e84d6513e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -12,9 +12,15 @@ package vazkii.botania.common.item; import java.util.List; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; @@ -22,9 +28,21 @@ public class ItemSparkUpgrade extends ItemMod { private static final int VARIANTS = 4; + public static TextureAtlasSprite[] worldIcons; + public ItemSparkUpgrade() { setUnlocalizedName(LibItemNames.SPARK_UPGRADE); setHasSubtypes(true); + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onTextureStitch(TextureStitchEvent.Pre evt) { + worldIcons = new TextureAtlasSprite[VARIANTS]; + for(int i = 0; i < VARIANTS; i++) { + worldIcons[i] = IconHelper.forName(evt.map, "sparkUpgradeL" + i, "items"); + } } @Override diff --git a/src/main/resources/assets/botania/models/item/corporeaSpark0.json b/src/main/resources/assets/botania/models/item/corporeaSpark0.json new file mode 100644 index 000000000..6c73c74a6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/corporeaSpark0.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/corporeaSpark0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/corporeaSpark1.json b/src/main/resources/assets/botania/models/item/corporeaSpark1.json new file mode 100644 index 000000000..df14fff6c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/corporeaSpark1.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/corporeaSpark2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/spark.json b/src/main/resources/assets/botania/models/item/spark.json new file mode 100644 index 000000000..dda2c13a6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/spark.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/spark0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sparkUpgrade0.json b/src/main/resources/assets/botania/models/item/sparkUpgrade0.json new file mode 100644 index 000000000..ff348f4e6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/sparkUpgrade0.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/sparkUpgrade0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sparkUpgrade1.json b/src/main/resources/assets/botania/models/item/sparkUpgrade1.json new file mode 100644 index 000000000..2ab5c2453 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/sparkUpgrade1.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/sparkUpgrade1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sparkUpgrade2.json b/src/main/resources/assets/botania/models/item/sparkUpgrade2.json new file mode 100644 index 000000000..a03ecf536 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/sparkUpgrade2.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/sparkUpgrade2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sparkUpgrade3.json b/src/main/resources/assets/botania/models/item/sparkUpgrade3.json new file mode 100644 index 000000000..4e675445d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/sparkUpgrade3.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/sparkUpgrade3" + } +} \ No newline at end of file