lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Use separate texture for activated sac dagger instead of enchant overlay

Browse source
This commit is contained in:
Nick 2016-04-17 14:03:26 -07:00
parent a4f55d88b6
commit 6449da0733
3 changed files with 142 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java
View file

@ -4,6 +4,9 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import WayofTime.bloodmagic.client.IMeshProvider;
import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
@ -34,7 +37,9 @@ import WayofTime.bloodmagic.client.IVariantProvider;
import WayofTime.bloodmagic.tile.TileAltar;
import WayofTime.bloodmagic.util.helper.TextHelper;
public class ItemSacrificialDagger extends Item implements IVariantProvider
import javax.annotation.Nullable;
public class ItemSacrificialDagger extends Item implements IMeshProvider
{
public static String[] names = { "normal", "creative" };
@ -153,15 +158,6 @@ public class ItemSacrificialDagger extends Item implements IVariantProvider
return super.onItemRightClick(stack, world, player, hand);
}
@Override
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "type=normal"));
ret.add(new ImmutablePair<Integer, String>(1, "type=creative"));
return ret;
}
@Override
public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5)
{
@ -188,8 +184,34 @@ public class ItemSacrificialDagger extends Item implements IVariantProvider
@Override
@SideOnly(Side.CLIENT)
public boolean hasEffect(ItemStack stack)
{
return this.canUseForSacrifice(stack) || super.hasEffect(stack);
public ItemMeshDefinition getMeshDefinition() {
return new ItemMeshDefinition() {
@Override
public ModelResourceLocation getModelLocation(ItemStack stack) {
String variant = "type=normal";
if (stack.getItemDamage() != 0)
variant = "type=creative";
if (canUseForSacrifice(stack))
variant = "type=ceremonial";
return new ModelResourceLocation(new ResourceLocation(Constants.Mod.MODID, "item/ItemSacrificialDagger"), variant);
}
};
}
@Override
public List<String> getVariants() {
List<String> variants = new ArrayList<String>();
variants.add("type=normal");
variants.add("type=creative");
variants.add("type=ceremonial");
return variants;
}
@Nullable
@Override
public ResourceLocation getCustomLocation() {
return null;
}
}

93
src/main/java/WayofTime/bloodmagic/util/handler/ClientEventHandler.java
View file

@ -2,11 +2,14 @@ package WayofTime.bloodmagic.util.handler;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.registry.RitualRegistry;
import WayofTime.bloodmagic.api.ritual.AreaDescriptor;
import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
import WayofTime.bloodmagic.api.ritual.Ritual;
import WayofTime.bloodmagic.api.ritual.RitualComponent;
import WayofTime.bloodmagic.client.render.RenderFakeBlocks;
import WayofTime.bloodmagic.item.ItemRitualDiviner;
import WayofTime.bloodmagic.item.ItemRitualReader;
import WayofTime.bloodmagic.tile.TileMasterRitualStone;
import WayofTime.bloodmagic.util.GhostItemHelper;
import WayofTime.bloodmagic.util.helper.TextHelper;
import net.minecraft.client.Minecraft;
@ -26,12 +29,22 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.lwjgl.opengl.GL11;
import java.util.List;
public class ClientEventHandler
{
public static int currentLP = 0;
public static int capacity = 0;
public TextureAtlasSprite ritualStoneBlankIcon, ritualStoneWaterIcon, ritualStoneFireIcon, ritualStoneEarthIcon, ritualStoneAirIcon, ritualStoneDawnIcon, ritualStoneDuskIcon;
public TextureAtlasSprite ritualStoneBlank;
public TextureAtlasSprite ritualStoneWater;
public TextureAtlasSprite ritualStoneFire;
public TextureAtlasSprite ritualStoneEarth;
public TextureAtlasSprite ritualStoneAir;
public TextureAtlasSprite ritualStoneDawn;
public TextureAtlasSprite ritualStoneDusk;
private static Minecraft minecraft = Minecraft.getMinecraft();
@SubscribeEvent
public void onTooltipEvent(ItemTooltipEvent event)
@ -60,50 +73,71 @@ public class ClientEventHandler
{
final String BLOCKS = "blocks";
ritualStoneBlankIcon = forName(event.getMap(), "RitualStone", BLOCKS);
ritualStoneWaterIcon = forName(event.getMap(), "WaterRitualStone", BLOCKS);
ritualStoneFireIcon = forName(event.getMap(), "FireRitualStone", BLOCKS);
ritualStoneEarthIcon = forName(event.getMap(), "EarthRitualStone", BLOCKS);
ritualStoneAirIcon = forName(event.getMap(), "AirRitualStone", BLOCKS);
ritualStoneDawnIcon = forName(event.getMap(), "LightRitualStone", BLOCKS);
ritualStoneDuskIcon = forName(event.getMap(), "DuskRitualStone", BLOCKS);
ritualStoneBlank = forName(event.getMap(), "RitualStone", BLOCKS);
ritualStoneWater = forName(event.getMap(), "WaterRitualStone", BLOCKS);
ritualStoneFire = forName(event.getMap(), "FireRitualStone", BLOCKS);
ritualStoneEarth = forName(event.getMap(), "EarthRitualStone", BLOCKS);
ritualStoneAir = forName(event.getMap(), "AirRitualStone", BLOCKS);
ritualStoneDawn = forName(event.getMap(), "LightRitualStone", BLOCKS);
ritualStoneDusk = forName(event.getMap(), "DuskRitualStone", BLOCKS);
}
@SubscribeEvent
public void render(RenderWorldLastEvent event)
{
Minecraft minecraft = Minecraft.getMinecraft();
EntityPlayerSP player = minecraft.thePlayer;
World world = player.worldObj;
if (minecraft.objectMouseOver == null || minecraft.objectMouseOver.typeOfHit != RayTraceResult.Type.BLOCK)
{
return;
}
TileEntity tileEntity = world.getTileEntity(minecraft.objectMouseOver.getBlockPos());
if (tileEntity instanceof IMasterRitualStone)
{
if (player.inventory.getCurrentItem() != null && player.inventory.getCurrentItem().getItem() instanceof ItemRitualDiviner)
if (tileEntity instanceof IMasterRitualStone && player.getHeldItemMainhand() != null && player.getHeldItemMainhand().getItem() instanceof ItemRitualDiviner)
renderRitualStones(player, event.getPartialTicks());
if (tileEntity instanceof TileMasterRitualStone && player.getHeldItemMainhand() != null && player.getHeldItemMainhand().getItem() instanceof ItemRitualReader)
renderRitualInformation(player, event.getPartialTicks());
}
private static TextureAtlasSprite forName(TextureMap textureMap, String name, String dir)
{
return textureMap.registerSprite(new ResourceLocation(Constants.Mod.DOMAIN + dir + "/" + name));
}
private void renderRitualInformation(EntityPlayerSP player, float partialTicks) {
World world = player.worldObj;
TileMasterRitualStone mrs = (TileMasterRitualStone) world.getTileEntity(minecraft.objectMouseOver.getBlockPos());
Ritual ritual = mrs.getCurrentRitual();
if (ritual != null) {
List<String> ranges = ritual.getListOfRanges();
for (String range : ranges) {
AreaDescriptor areaDescriptor = ritual.getBlockRange(range);
for (BlockPos pos : areaDescriptor.getContainedPositions(minecraft.objectMouseOver.getBlockPos()))
RenderFakeBlocks.drawFakeBlock(ritualStoneBlank, pos.getX(), pos.getY(), pos.getZ(), world);
}
}
}
private void renderRitualStones(EntityPlayerSP player, float partialTicks) {
World world = player.worldObj;
ItemRitualDiviner ritualDiviner = (ItemRitualDiviner) player.inventory.getCurrentItem().getItem();
EnumFacing direction = ritualDiviner.getDirection(player.inventory.getCurrentItem());
Ritual ritual = RitualRegistry.getRitualForId(ritualDiviner.getCurrentRitual(player.inventory.getCurrentItem()));
if (ritual == null)
{
return;
}
GlStateManager.pushMatrix();
GlStateManager.enableBlend();
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
BlockPos vec3 = new BlockPos(minecraft.objectMouseOver.getBlockPos().getX(), minecraft.objectMouseOver.getBlockPos().getY(), minecraft.objectMouseOver.getBlockPos().getZ());
double posX = player.lastTickPosX + (player.posX - player.lastTickPosX) * event.getPartialTicks();
double posY = player.lastTickPosY + (player.posY - player.lastTickPosY) * event.getPartialTicks();
double posZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * event.getPartialTicks();
double posX = player.lastTickPosX + (player.posX - player.lastTickPosX) * partialTicks;
double posY = player.lastTickPosY + (player.posY - player.lastTickPosY) * partialTicks;
double posZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * partialTicks;
for (RitualComponent ritualComponent : ritual.getComponents())
{
@ -119,25 +153,25 @@ public class ClientEventHandler
switch (ritualComponent.getRuneType())
{
case BLANK:
texture = ritualStoneBlankIcon;
texture = ritualStoneBlank;
break;
case WATER:
texture = ritualStoneWaterIcon;
texture = ritualStoneWater;
break;
case FIRE:
texture = ritualStoneFireIcon;
texture = ritualStoneFire;
break;
case EARTH:
texture = ritualStoneEarthIcon;
texture = ritualStoneEarth;
break;
case AIR:
texture = ritualStoneAirIcon;
texture = ritualStoneAir;
break;
case DAWN:
texture = ritualStoneDawnIcon;
texture = ritualStoneDawn;
break;
case DUSK:
texture = ritualStoneDuskIcon;
texture = ritualStoneDusk;
break;
}
@ -147,11 +181,4 @@ public class ClientEventHandler
GlStateManager.popMatrix();
}
}
}
private static TextureAtlasSprite forName(TextureMap textureMap, String name, String dir)
{
return textureMap.registerSprite(new ResourceLocation(Constants.Mod.DOMAIN + dir + "/" + name));
}
}

5
src/main/resources/assets/bloodmagic/blockstates/item/ItemSacrificialDagger.json
View file

@ -15,6 +15,11 @@
"textures": {
"layer0": "bloodmagic:items/SacrificialDagger"
}
},
"ceremonial": {
"textures": {
"layer0": "bloodmagic:items/CeremonialDagger"
}
}
}
}