mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-20 04:09:40 +00:00
Corporea item icons (world render broken still). Temp fix for pylon multiblock rendering.
This commit is contained in:
1 parent
9f5455aa9f
commit
b4300a9e3b
15 files changed
+116
-14
No files matched your search
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -38,7 +38,7 @@ public class RenderCorporeaSpark extends RenderSparkBase<EntityCorporeaSpark> {
|
||||
|
||||
@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<EntityCorporeaSpark> {
|
||||
|
||||
@Override
|
||||
public TextureAtlasSprite getSpinningIcon(EntityCorporeaSpark entity) {
|
||||
return null;//ItemCorporeaSpark.iconColorStar;
|
||||
return ItemCorporeaSpark.iconColorStar;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -23,9 +23,8 @@ public class RenderSpark extends RenderSparkBase<EntitySpark> {
|
||||
|
||||
@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;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -81,7 +81,7 @@ public class RenderSparkBase<T extends Entity> extends RenderEntity {
|
||||
}
|
||||
|
||||
public TextureAtlasSprite getBaseIcon(T entity) {
|
||||
return null;//ItemSpark.worldIcon;
|
||||
return ItemSpark.worldIcon;
|
||||
}
|
||||
|
||||
public void colorSpinningIcon(T entity, float a) {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user