mirror of
https://github.com/GTNewHorizons/Gadomancy.git
synced 2026-11-22 21:09:59 +00:00
Added unfinished transformation stuff
This commit is contained in:
1 parent
ce6b7bddef
commit
46ff27b952
8 files changed
+562
-4
No files matched your search
@@ -0,0 +1,107 @@
|
||||
package makeo.gadomancy.client.renderers.entity;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.EntityRenderer;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
||||
/**
|
||||
* User: makeo
|
||||
* Date: 09.07.2015
|
||||
* Time: 02:34
|
||||
*/
|
||||
public class PlayerCameraRenderer extends EntityRenderer {
|
||||
private final Minecraft minecraft;
|
||||
|
||||
private boolean isMarkedForRemoval;
|
||||
private boolean isRemoved;
|
||||
private EntityRenderer prevRenderer;
|
||||
|
||||
public float xOffset = 0;
|
||||
public float yOffset = 0;
|
||||
public float zOffset = 0;
|
||||
|
||||
public PlayerCameraRenderer(Minecraft minecraft, EntityRenderer prevRenderer) {
|
||||
super(minecraft, minecraft.getResourceManager());
|
||||
this.minecraft = minecraft;
|
||||
|
||||
this.isMarkedForRemoval = false;
|
||||
this.isRemoved = false;
|
||||
this.prevRenderer = prevRenderer;
|
||||
}
|
||||
|
||||
public EntityRenderer getPrevRenderer() {
|
||||
return prevRenderer;
|
||||
}
|
||||
|
||||
public boolean isMarkedForRemoval() {
|
||||
return isMarkedForRemoval;
|
||||
}
|
||||
|
||||
public boolean isRemoved() {
|
||||
return isRemoved;
|
||||
}
|
||||
|
||||
public void markForRemoval() {
|
||||
this.isMarkedForRemoval = true;
|
||||
}
|
||||
|
||||
private boolean canChangeView() {
|
||||
return !isMarkedForRemoval && minecraft.thePlayer != null && !minecraft.thePlayer.isRiding() && !minecraft.thePlayer.isPlayerSleeping();
|
||||
}
|
||||
|
||||
private void removeIfMarked() {
|
||||
if(isMarkedForRemoval && this.equals(Minecraft.getMinecraft().entityRenderer)) {
|
||||
Minecraft.getMinecraft().entityRenderer = prevRenderer;
|
||||
isRemoved = true;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateCameraAndRender(float partialTicks) {
|
||||
removeIfMarked();
|
||||
|
||||
if(canChangeView()) {
|
||||
moveCam(-1);
|
||||
//float tempEyeHeight = minecraft.thePlayer.eyeHeight;
|
||||
//minecraft.thePlayer.eyeHeight = minecraft.thePlayer.getDefaultEyeHeight();
|
||||
super.updateCameraAndRender(partialTicks);
|
||||
//minecraft.thePlayer.eyeHeight = tempEyeHeight;
|
||||
moveCam(1);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
super.updateCameraAndRender(partialTicks);
|
||||
}
|
||||
|
||||
private void moveCam(int mod) {
|
||||
EntityPlayer player = minecraft.thePlayer;
|
||||
|
||||
player.posX += this.xOffset * mod;
|
||||
player.lastTickPosX += this.xOffset * mod;
|
||||
player.prevPosX += this.xOffset * mod;
|
||||
|
||||
player.posY += this.yOffset * mod;
|
||||
player.lastTickPosY += this.yOffset * mod;
|
||||
player.prevPosY += this.yOffset * mod;
|
||||
|
||||
player.posZ += this.zOffset * mod;
|
||||
player.lastTickPosZ += this.zOffset * mod;
|
||||
player.prevPosZ += this.zOffset * mod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getMouseOver(float partialTicks) {
|
||||
removeIfMarked();
|
||||
|
||||
if(canChangeView()) {
|
||||
moveCam(-1);
|
||||
super.getMouseOver(partialTicks);
|
||||
moveCam(1);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
super.getMouseOver(partialTicks);
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
package makeo.gadomancy.client.renderers.item;
|
||||
|
||||
import makeo.gadomancy.client.util.FakeWorld;
|
||||
import makeo.gadomancy.common.utils.FakeWorld;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package makeo.gadomancy.client.renderers.tile;
|
||||
|
||||
import makeo.gadomancy.client.models.ModelJarPot;
|
||||
import makeo.gadomancy.client.util.FakeWorld;
|
||||
import makeo.gadomancy.common.utils.FakeWorld;
|
||||
import makeo.gadomancy.common.blocks.BlockRemoteJar;
|
||||
import makeo.gadomancy.common.utils.SimpleResourceLocation;
|
||||
import net.minecraft.client.Minecraft;
|
||||
@@ -9,7 +9,6 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import thaumcraft.client.renderers.models.ModelJar;
|
||||
import thaumcraft.client.renderers.tile.TileJarRenderer;
|
||||
import thaumcraft.client.renderers.tile.TileMirrorRenderer;
|
||||
import thaumcraft.common.tiles.TileMirrorEssentia;
|
||||
|
||||
@@ -0,0 +1,172 @@
|
||||
package makeo.gadomancy.client.transformation;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import thaumcraft.common.entities.golems.EntityGolemBase;
|
||||
import thaumcraft.common.entities.golems.EnumGolemType;
|
||||
|
||||
/**
|
||||
* User: makeo
|
||||
* Date: 05.07.2015
|
||||
* Time: 15:47
|
||||
*/
|
||||
public class FakeEntityGolemBase extends EntityGolemBase {
|
||||
private EntityGolemBase golem;
|
||||
private EntityPlayer player;
|
||||
|
||||
public FakeEntityGolemBase(EntityGolemBase golem, EntityPlayer player) {
|
||||
super(player != null ? player.worldObj : null);
|
||||
|
||||
this.player = player;
|
||||
this.golem = golem;
|
||||
|
||||
this.inactive = false;
|
||||
this.bootup = 0;
|
||||
}
|
||||
|
||||
public void setPlayer(EntityPlayer player) {
|
||||
this.player = player;
|
||||
}
|
||||
|
||||
//Golem stuff
|
||||
@Override
|
||||
public String getGolemDecoration() {
|
||||
return golem.getGolemDecoration();
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumGolemType getGolemType() {
|
||||
return golem.getGolemType();
|
||||
}
|
||||
|
||||
@Override
|
||||
public byte getCore() {
|
||||
return golem.getCore();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getCarryLimit() {
|
||||
return golem.getCarryLimit();
|
||||
}
|
||||
|
||||
@Override
|
||||
public byte getUpgrade(int slot) {
|
||||
return golem.getUpgrade(slot);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getUpgradeAmount(int type) {
|
||||
return golem.getUpgradeAmount(type);
|
||||
}
|
||||
|
||||
//Player stuff
|
||||
@Override
|
||||
public float getEyeHeight() {
|
||||
return player.getEyeHeight();
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getCarriedForDisplay() {
|
||||
return player.getHeldItem();
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getHeldItem() {
|
||||
return player.getHeldItem();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isSneaking() {
|
||||
return player.isSneaking();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isEating() {
|
||||
return player.isEating();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isInvisible() {
|
||||
return player.isInvisible();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isSprinting() {
|
||||
return player.isSprinting();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onLivingUpdate() {
|
||||
super.onLivingUpdate();
|
||||
}
|
||||
|
||||
public void syncWithPlayer() {
|
||||
setWorld(player.worldObj);
|
||||
setPosition(player.posX, player.posY, player.posZ);
|
||||
|
||||
lastTickPosX = player.lastTickPosX;
|
||||
lastTickPosY = player.lastTickPosY;
|
||||
lastTickPosZ = player.lastTickPosZ;
|
||||
|
||||
motionX = player.motionX;
|
||||
motionY = player.motionY;
|
||||
motionZ = player.motionZ;
|
||||
|
||||
moveForward = player.moveForward;
|
||||
moveStrafing = player.moveStrafing;
|
||||
|
||||
onGround = player.onGround;
|
||||
|
||||
prevPosX = player.prevPosX;
|
||||
prevPosY = player.prevPosY;
|
||||
prevPosZ = player.prevPosZ;
|
||||
|
||||
rotationPitch = player.rotationPitch;
|
||||
rotationYaw = player.rotationYaw;
|
||||
rotationYawHead = player.rotationYawHead;
|
||||
|
||||
prevRotationPitch = player.prevRotationPitch;
|
||||
prevRotationYaw = player.prevRotationYaw;
|
||||
prevRotationYawHead = player.prevRotationYawHead;
|
||||
|
||||
limbSwing = player.limbSwing;
|
||||
|
||||
limbSwingAmount = player.limbSwingAmount;
|
||||
prevLimbSwingAmount = player.prevLimbSwingAmount;
|
||||
isSwingInProgress = player.isSwingInProgress;
|
||||
|
||||
swingProgress = player.swingProgress;
|
||||
prevSwingProgress = player.prevSwingProgress;
|
||||
|
||||
renderYawOffset = player.renderYawOffset;
|
||||
prevRenderYawOffset = player.prevRenderYawOffset;
|
||||
|
||||
ticksExisted = player.ticksExisted;
|
||||
isDead = false;
|
||||
isAirBorne = player.isAirBorne;
|
||||
|
||||
yOffset = 0;
|
||||
|
||||
swingProgress = player.swingProgress;
|
||||
prevSwingProgress = player.prevSwingProgress;
|
||||
|
||||
limbSwing = player.limbSwing;
|
||||
limbSwingAmount = player.limbSwingAmount;
|
||||
prevLimbSwingAmount = player.limbSwingAmount;
|
||||
|
||||
isSwingInProgress = player.isSwingInProgress;
|
||||
|
||||
itemCarried = player.getHeldItem();
|
||||
|
||||
if(player.isSwingInProgress) {
|
||||
if(player.getHeldItem() == null) {
|
||||
action = 6 - player.swingProgressInt;
|
||||
} else {
|
||||
rightArm = 5 - (int)(player.swingProgress * 5);
|
||||
}
|
||||
} else {
|
||||
action = 0;
|
||||
rightArm = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,145 @@
|
||||
package makeo.gadomancy.client.transformation;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import makeo.gadomancy.client.renderers.entity.PlayerCameraRenderer;
|
||||
import makeo.gadomancy.common.network.PacketHandler;
|
||||
import makeo.gadomancy.common.network.packets.PacketAbortTransform;
|
||||
import makeo.gadomancy.common.registration.RegisteredIntegrations;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.EntityRenderer;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import thaumcraft.common.entities.golems.EntityGolemBase;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* User: makeo
|
||||
* Date: 04.07.2015
|
||||
* Time: 02:38
|
||||
*/
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class TransformationHelper {
|
||||
private static final FakeEntityGolemBase DEFAULT_GOLEM;
|
||||
|
||||
static {
|
||||
EntityGolemBase golem = new EntityGolemBase(null) {
|
||||
@Override
|
||||
public byte getCore() {
|
||||
return (byte) 4;
|
||||
}
|
||||
};
|
||||
DEFAULT_GOLEM = new FakeEntityGolemBase(golem, null);
|
||||
}
|
||||
|
||||
private static PlayerCameraRenderer renderer = null;
|
||||
|
||||
private static Map<Integer, Integer> transformedPlayers = new HashMap<Integer, Integer>();
|
||||
|
||||
private static Map<Integer, FakeEntityGolemBase> entityCache = new HashMap<Integer, FakeEntityGolemBase>();
|
||||
|
||||
private TransformationHelper() {}
|
||||
|
||||
public static boolean isTransformable() {
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
return mc.thePlayer.equals(mc.renderViewEntity) && !RegisteredIntegrations.morph.isMorphed()
|
||||
&& mc.entityRenderer.getClass().equals(EntityRenderer.class)
|
||||
&& (renderer == null || renderer.isRemoved());
|
||||
}
|
||||
|
||||
public static boolean isForeignTransformed() {
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
return !mc.renderViewEntity.equals(mc.thePlayer)
|
||||
|| RegisteredIntegrations.morph.isMorphed()
|
||||
|| (!mc.entityRenderer.getClass().equals(EntityRenderer.class)
|
||||
&& !(mc.entityRenderer instanceof PlayerCameraRenderer));
|
||||
}
|
||||
|
||||
public static boolean isTransformed() {
|
||||
return renderer != null && !renderer.isMarkedForRemoval();
|
||||
}
|
||||
|
||||
public static boolean isTransformed(EntityPlayer player) {
|
||||
if(player.equals(Minecraft.getMinecraft().thePlayer))
|
||||
return isTransformed();
|
||||
return getTransformedEntityId(player) != -1;
|
||||
}
|
||||
|
||||
public static FakeEntityGolemBase getTransformedEntity(EntityPlayer player) {
|
||||
Integer entityId = transformedPlayers.get(player.getEntityId());
|
||||
if(entityId != null) {
|
||||
FakeEntityGolemBase golem = entityCache.get(entityId);
|
||||
if(golem == null) {
|
||||
EntityGolemBase rawGolem = findGolem(entityId);
|
||||
if(rawGolem != null) {
|
||||
golem = new FakeEntityGolemBase(rawGolem, player);
|
||||
entityCache.put(entityId, golem);
|
||||
}
|
||||
}
|
||||
|
||||
if(golem != null) {
|
||||
return golem;
|
||||
}
|
||||
}
|
||||
return DEFAULT_GOLEM;
|
||||
}
|
||||
|
||||
private static EntityGolemBase findGolem(int entityId) {
|
||||
List<Entity> loaded = Minecraft.getMinecraft().thePlayer.worldObj.getLoadedEntityList();
|
||||
for(int i = 0; i < loaded.size(); i++) {
|
||||
Entity entity = loaded.get(i);
|
||||
if(entity instanceof EntityGolemBase && entity.getEntityId() == entityId) {
|
||||
return (EntityGolemBase) entity;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static FakeEntityGolemBase getTransformedEntity() {
|
||||
return getTransformedEntity(Minecraft.getMinecraft().thePlayer);
|
||||
}
|
||||
|
||||
private static int getTransformedEntityId(EntityPlayer player) {
|
||||
Integer entityId = transformedPlayers.get(player.getEntityId());
|
||||
return entityId == null ? -1 : entityId;
|
||||
}
|
||||
|
||||
public static int getTransformedEntityId() {
|
||||
return getTransformedEntityId(Minecraft.getMinecraft().thePlayer);
|
||||
}
|
||||
|
||||
public static void cancelTransformation(PacketAbortTransform.AbortReason reason) {
|
||||
if(isTransformed()) {
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketAbortTransform(reason));
|
||||
onAbortTransformation(Minecraft.getMinecraft().thePlayer.getEntityId());
|
||||
}
|
||||
}
|
||||
|
||||
public static void onStartTransformation(int targetId, int appearanceId) {
|
||||
if(Minecraft.getMinecraft().thePlayer.getEntityId() == targetId) {
|
||||
if(isTransformable()) {
|
||||
transformedPlayers.put(targetId, appearanceId);
|
||||
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
renderer = new PlayerCameraRenderer(mc, mc.entityRenderer);
|
||||
mc.entityRenderer = renderer;
|
||||
} else {
|
||||
cancelTransformation(PacketAbortTransform.AbortReason.TRANSFORMATION_FAILED);
|
||||
}
|
||||
} else {
|
||||
transformedPlayers.put(targetId, appearanceId);
|
||||
}
|
||||
}
|
||||
|
||||
public static void onAbortTransformation(int targetId) {
|
||||
transformedPlayers.remove(targetId);
|
||||
entityCache.remove(targetId);
|
||||
|
||||
if(Minecraft.getMinecraft().thePlayer.getEntityId() == targetId && isTransformed()) {
|
||||
renderer.markForRemoval();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package makeo.gadomancy.common.network.packets;
|
||||
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
|
||||
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import makeo.gadomancy.client.transformation.TransformationHelper;
|
||||
|
||||
/**
|
||||
* User: makeo
|
||||
* Date: 03.07.2015
|
||||
* Time: 21:42
|
||||
*/
|
||||
public class PacketAbortTransform implements IMessage, IMessageHandler<PacketAbortTransform, IMessage> {
|
||||
private int entityId;
|
||||
private byte reason;
|
||||
|
||||
public PacketAbortTransform() {}
|
||||
public PacketAbortTransform(AbortReason reason) {
|
||||
this.reason = (byte) reason.ordinal();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fromBytes(ByteBuf buf) {
|
||||
reason = buf.readByte();
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void toBytes(ByteBuf buf) {
|
||||
buf.writeByte(reason);
|
||||
}
|
||||
|
||||
public static enum AbortReason {
|
||||
PLAYER_EXIT, NO_VIS, FOREIGN_TRANSFORMATION, TRANSFORMATION_FAILED, DAMAGE, MOVE
|
||||
}
|
||||
|
||||
@Override
|
||||
public IMessage onMessage(PacketAbortTransform message, MessageContext ctx) {
|
||||
if(ctx.side == Side.SERVER) {
|
||||
if(ctx.getServerHandler().playerEntity.getEntityId() == entityId) {
|
||||
|
||||
}
|
||||
} else {
|
||||
TransformationHelper.onAbortTransformation(entityId);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,85 @@
|
||||
package makeo.gadomancy.common.network.packets;
|
||||
|
||||
import cpw.mods.fml.common.network.ByteBufUtils;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
|
||||
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import makeo.gadomancy.common.utils.FakeWorld;
|
||||
import net.minecraft.entity.EntityList;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
import thaumcraft.common.entities.golems.EntityGolemBase;
|
||||
import thaumcraft.common.entities.golems.EnumGolemType;
|
||||
|
||||
/**
|
||||
* This class is part of the Gadomancy Mod
|
||||
* Gadomancy is Open Source and distributed under the
|
||||
* GNU LESSER GENERAL PUBLIC LICENSE
|
||||
* for more read the LICENSE file
|
||||
* <p/>
|
||||
* Created by makeo @ 25.10.2015 15:03
|
||||
*/
|
||||
public class PacketTransformationInfo implements IMessage, IMessageHandler<PacketTransformationInfo, IMessage> {
|
||||
private static final World WORLD = new FakeWorld();
|
||||
|
||||
private EntityGolemBase golem = null;
|
||||
|
||||
public PacketTransformationInfo(EntityGolemBase golem) {
|
||||
this.golem = golem;
|
||||
}
|
||||
|
||||
public PacketTransformationInfo() { }
|
||||
|
||||
@Override
|
||||
public void fromBytes(ByteBuf buf) {
|
||||
this.golem = (EntityGolemBase) EntityList.createEntityFromNBT(ByteBufUtils.readTag(buf), WORLD);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void toBytes(ByteBuf buf) {
|
||||
NBTTagCompound compound = new NBTTagCompound();
|
||||
golem.writeEntityToNBT(compound);
|
||||
ByteBufUtils.writeTag(buf, compound);
|
||||
}
|
||||
|
||||
public static class Request implements IMessage, IMessageHandler<Request, PacketTransformationInfo> {
|
||||
private int player;
|
||||
|
||||
public Request(EntityPlayer player) {
|
||||
this.player = player.getEntityId();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fromBytes(ByteBuf buf) {
|
||||
player = buf.readInt();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void toBytes(ByteBuf buf) {
|
||||
buf.writeInt(player);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PacketTransformationInfo onMessage(Request message, MessageContext ctx) {
|
||||
//TODO: send transformation info
|
||||
EntityPlayer sender = ctx.getServerHandler().playerEntity;
|
||||
EntityPlayer player = (EntityPlayer) sender.worldObj.getEntityByID(this.player);
|
||||
|
||||
//get from custom data
|
||||
/*if(player != null) {
|
||||
|
||||
}*/
|
||||
|
||||
return new PacketTransformationInfo(new EntityGolemBase(WORLD, EnumGolemType.CLAY, true));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public IMessage onMessage(PacketTransformationInfo message, MessageContext ctx) {
|
||||
//handle stuff
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package makeo.gadomancy.client.util;
|
||||
package makeo.gadomancy.common.utils;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.Entity;
|
||||
Reference in new issue
Block a user