mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 03:39:17 +00:00
Fix thorn chakram render, make it remember the stack used to thrown it (name will persist, etc.)
This commit is contained in:
1 parent
bc29d37446
commit
6e48bb9a44
4 files changed
+36
-15
No files matched your search
@@ -75,7 +75,6 @@ import vazkii.botania.client.render.entity.RenderPixie;
|
||||
import vazkii.botania.client.render.entity.RenderPoolMinecart;
|
||||
import vazkii.botania.client.render.entity.RenderSnowballStack;
|
||||
import vazkii.botania.client.render.entity.RenderSpark;
|
||||
import vazkii.botania.client.render.entity.RenderThornChakram;
|
||||
import vazkii.botania.client.render.tile.RenderTileAlfPortal;
|
||||
import vazkii.botania.client.render.tile.RenderTileAltar;
|
||||
import vazkii.botania.client.render.tile.RenderTileAvatar;
|
||||
@@ -91,7 +90,6 @@ import vazkii.botania.client.render.tile.RenderTileIncensePlate;
|
||||
import vazkii.botania.client.render.tile.RenderTileLightRelay;
|
||||
import vazkii.botania.client.render.tile.RenderTilePool;
|
||||
import vazkii.botania.client.render.tile.RenderTilePrism;
|
||||
import vazkii.botania.client.render.tile.RenderTilePump;
|
||||
import vazkii.botania.client.render.tile.RenderTilePylon;
|
||||
import vazkii.botania.client.render.tile.RenderTileRedString;
|
||||
import vazkii.botania.client.render.tile.RenderTileRuneAltar;
|
||||
@@ -258,15 +256,15 @@ public class ClientProxy extends CommonProxy {
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityPixie.class, RenderPixie::new);
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityDoppleganger.class, RenderDoppleganger::new);
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntitySpark.class, RenderSpark::new);
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, RenderThornChakram::new);
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityCorporeaSpark.class, RenderCorporeaSpark::new);
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityPoolMinecart.class, RenderPoolMinecart::new);
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityPinkWither.class, RenderPinkWither::new);
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityManaStorm.class, RenderManaStorm::new);
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityBabylonWeapon.class, RenderBabylonWeapon::new);
|
||||
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, renderManager -> new RenderSnowballStack<>(renderManager, ModItems.thornChakram, Minecraft.getMinecraft().getRenderItem(), entity -> new ItemStack(ModItems.thornChakram, 1, entity.isFire() ? 1 : 0)));
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, renderManager -> new RenderSnowball(renderManager, ModItems.vineBall, Minecraft.getMinecraft().getRenderItem()));
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, renderManager -> new RenderSnowballStack(renderManager, new ItemStack(ModItems.manaResource, 1, 15), Minecraft.getMinecraft().getRenderItem()));
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, renderManager -> new RenderSnowballStack<>(renderManager, ModItems.manaResource, Minecraft.getMinecraft().getRenderItem(), entity -> new ItemStack(ModItems.manaResource, 1, 15)));
|
||||
|
||||
ShaderHelper.initShaders();
|
||||
}
|
||||
|
||||
@@ -8,25 +8,27 @@
|
||||
*/
|
||||
package vazkii.botania.client.render.entity;
|
||||
|
||||
import com.google.common.base.Function;
|
||||
import net.minecraft.client.renderer.entity.RenderItem;
|
||||
import net.minecraft.client.renderer.entity.RenderManager;
|
||||
import net.minecraft.client.renderer.entity.RenderSnowball;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
// Same as RenderSnowball, but ItemStack sensitive
|
||||
public class RenderSnowballStack<T extends Entity> extends RenderSnowball<T> {
|
||||
|
||||
private final ItemStack stack;
|
||||
private final Function<T, ItemStack> stackGetter;
|
||||
|
||||
public RenderSnowballStack(RenderManager renderManagerIn, ItemStack stack, RenderItem render) {
|
||||
super(renderManagerIn, stack.getItem(), render);
|
||||
this.stack = stack;
|
||||
public RenderSnowballStack(RenderManager renderManagerIn, Item item, RenderItem render, Function<T, ItemStack> stackGetter) {
|
||||
super(renderManagerIn, item, render);
|
||||
this.stackGetter = stackGetter;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack func_177082_d(T entity) {
|
||||
return stack;
|
||||
return stackGetter.apply(entity);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -18,6 +18,7 @@ import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.projectile.EntityThrowable;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.util.DamageSource;
|
||||
@@ -33,13 +34,15 @@ public class EntityThornChakram extends EntityThrowable {
|
||||
|
||||
private static final int MAX_BOUNCES = 16;
|
||||
boolean bounced = false;
|
||||
private ItemStack stack;
|
||||
|
||||
public EntityThornChakram(World world) {
|
||||
super(world);
|
||||
}
|
||||
|
||||
public EntityThornChakram(World world, EntityLivingBase e) {
|
||||
public EntityThornChakram(World world, EntityLivingBase e, ItemStack stack) {
|
||||
super(world, e);
|
||||
this.stack = stack.copy();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -77,10 +80,10 @@ public class EntityThornChakram extends EntityThrowable {
|
||||
motionX = motion.x;
|
||||
motionY = motion.y;
|
||||
motionZ = motion.z;
|
||||
if(MathHelper.pointDistanceSpace(posX, posY, posZ, thrower.posX, thrower.posY, thrower.posZ) < 1)
|
||||
if(!worldObj.isRemote && MathHelper.pointDistanceSpace(posX, posY, posZ, thrower.posX, thrower.posY, thrower.posZ) < 1)
|
||||
if(!(thrower instanceof EntityPlayer && (((EntityPlayer) thrower).capabilities.isCreativeMode || ((EntityPlayer) thrower).inventory.addItemStackToInventory(getItemStack()))))
|
||||
dropAndKill();
|
||||
else if(!worldObj.isRemote)
|
||||
else
|
||||
setDead();
|
||||
}
|
||||
} else {
|
||||
@@ -103,7 +106,7 @@ public class EntityThornChakram extends EntityThrowable {
|
||||
}
|
||||
|
||||
private ItemStack getItemStack() {
|
||||
return new ItemStack(ModItems.thornChakram, 1, isFire() ? 1 : 0);
|
||||
return stack != null ? stack.copy() : new ItemStack(ModItems.thornChakram, 1, isFire() ? 1 : 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -120,7 +123,7 @@ public class EntityThornChakram extends EntityThrowable {
|
||||
|
||||
boolean fire = isFire();
|
||||
EntityLivingBase thrower = getThrower();
|
||||
if(pos.entityHit != null && pos.entityHit instanceof EntityLivingBase && pos.entityHit != thrower) {
|
||||
if(!worldObj.isRemote && pos.entityHit != null && pos.entityHit instanceof EntityLivingBase && pos.entityHit != thrower) {
|
||||
pos.entityHit.attackEntityFrom(thrower != null ? thrower instanceof EntityPlayer ? DamageSource.causePlayerDamage((EntityPlayer) thrower) : DamageSource.causeMobDamage(thrower) : DamageSource.generic, 12);
|
||||
if(fire)
|
||||
pos.entityHit.setFire(5);
|
||||
@@ -163,4 +166,20 @@ public class EntityThornChakram extends EntityThrowable {
|
||||
dataWatcher.updateObject(31, (byte) (fire ? 1 : 0));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeEntityToNBT(NBTTagCompound compound) {
|
||||
super.writeEntityToNBT(compound);
|
||||
if(stack != null) {
|
||||
compound.setTag("fly_stack", stack.writeToNBT(new NBTTagCompound()));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readEntityFromNBT(NBTTagCompound compound) {
|
||||
super.readEntityFromNBT(compound);
|
||||
if(compound.hasKey("fly_stack")) {
|
||||
stack = ItemStack.loadItemStackFromNBT(compound.getCompoundTag("fly_stack"));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -49,7 +49,9 @@ public class ItemThornChakram extends ItemMod implements ICraftAchievement {
|
||||
p_77659_2_.playSoundAtEntity(p_77659_3_, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
|
||||
|
||||
if(!p_77659_2_.isRemote) {
|
||||
EntityThornChakram c = new EntityThornChakram(p_77659_2_, p_77659_3_);
|
||||
ItemStack stack = p_77659_1_.copy();
|
||||
stack.stackSize = 1;
|
||||
EntityThornChakram c = new EntityThornChakram(p_77659_2_, p_77659_3_, stack);
|
||||
c.setFire(p_77659_1_.getItemDamage() != 0);
|
||||
p_77659_2_.spawnEntityInWorld(c);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user