R3944Realms/CarryOn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tile entity render in hand

Browse Source
This commit is contained in:
SteveKunG 2017-09-22 23:02:56 +07:00
parent 9fdaf26e99
commit a49d01f170
1 changed files with 441 additions and 435 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

876
src/main/java/tschipp/carryon/client/event/RenderEvents.java
View File

@ -12,6 +12,7 @@ import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.model.ModelPlayer; import net.minecraft.client.model.ModelPlayer;
import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.model.ModelRenderer;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.client.renderer.entity.RenderPlayer;
@ -27,6 +28,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHand;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.client.event.GuiOpenEvent; import net.minecraftforge.client.event.GuiOpenEvent;
import net.minecraftforge.client.event.MouseEvent; import net.minecraftforge.client.event.MouseEvent;
@ -43,12 +45,8 @@ import tschipp.carryon.client.keybinds.CarryOnKeybinds;
import tschipp.carryon.common.config.CarryOnConfig; import tschipp.carryon.common.config.CarryOnConfig;
import tschipp.carryon.common.handler.ModelOverridesHandler; import tschipp.carryon.common.handler.ModelOverridesHandler;
import tschipp.carryon.common.handler.RegistrationHandler; import tschipp.carryon.common.handler.RegistrationHandler;
import tschipp.carryon.common.helper.ScriptParseHelper;
import tschipp.carryon.common.helper.StringParser;
import tschipp.carryon.common.item.ItemEntity; import tschipp.carryon.common.item.ItemEntity;
import tschipp.carryon.common.item.ItemTile; import tschipp.carryon.common.item.ItemTile;
import tschipp.carryon.common.scripting.CarryOnOverride;
import tschipp.carryon.common.scripting.ScriptChecker;
import tschipp.carryon.network.server.SyncKeybindPacket; import tschipp.carryon.network.server.SyncKeybindPacket;
public class RenderEvents public class RenderEvents
@ -59,495 +57,503 @@ public class RenderEvents
private ModelRenderer fakeLeftArmwear; private ModelRenderer fakeLeftArmwear;
private ModelRenderer fakeRightArmwear; private ModelRenderer fakeRightArmwear;
/* /*
* Prevents the Player from scrolling * Prevents the Player from scrolling
*/ */
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@SubscribeEvent @SubscribeEvent
public void onScroll(MouseEvent event) public void onScroll(MouseEvent event)
{ {
if (event.getDwheel() > 0 || event.getDwheel() < 0) if (event.getDwheel() > 0 || event.getDwheel() < 0 || Minecraft.getMinecraft().gameSettings.keyBindPickBlock.isPressed())
{ {
ItemStack stack = Minecraft.getMinecraft().player.getHeldItemMainhand(); ItemStack stack = Minecraft.getMinecraft().player.getHeldItemMainhand();
if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile)
{
if (ItemTile.hasTileData(stack))
event.setCanceled(true);
}
}
} if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile)
{
if (ItemTile.hasTileData(stack))
{
event.setCanceled(true);
}
}
}
}
@SubscribeEvent @SubscribeEvent
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void onPlayerTick(PlayerTickEvent event) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException public void onPlayerTick(PlayerTickEvent event) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException
{ {
EntityPlayer player = event.player; EntityPlayer player = event.player;
if (player != null && event.side == Side.CLIENT)
{
boolean keyPressed = CarryOnKeybinds.carryKey.isKeyDown(); if (player != null && event.side == Side.CLIENT)
boolean playerKeyPressed = CarryOnKeybinds.isKeyPressed(player); {
boolean keyPressed = CarryOnKeybinds.carryKey.isKeyDown();
boolean playerKeyPressed = CarryOnKeybinds.isKeyPressed(player);
if (keyPressed && !playerKeyPressed) if (keyPressed && !playerKeyPressed)
{ {
CarryOnKeybinds.setKeyPressed(player, true); CarryOnKeybinds.setKeyPressed(player, true);
CarryOn.network.sendToServer(new SyncKeybindPacket(true)); CarryOn.network.sendToServer(new SyncKeybindPacket(true));
} }
else if (!keyPressed && playerKeyPressed) else if (!keyPressed && playerKeyPressed)
{ {
CarryOnKeybinds.setKeyPressed(player, false); CarryOnKeybinds.setKeyPressed(player, false);
CarryOn.network.sendToServer(new SyncKeybindPacket(false)); CarryOn.network.sendToServer(new SyncKeybindPacket(false));
} }
}
}
} /*
} * Prevents the Player from opening Guis
*/
@SideOnly(Side.CLIENT)
@SubscribeEvent
public void onGuiOpen(GuiOpenEvent event)
{
if (event.getGui() != null)
{
boolean inventory = event.getGui() instanceof GuiContainer;
EntityPlayer player = Minecraft.getMinecraft().player;
/* if (player != null)
* Prevents the Player from opening Guis {
*/ ItemStack stack = player.getHeldItem(EnumHand.MAIN_HAND);
@SideOnly(Side.CLIENT)
@SubscribeEvent
public void onGuiOpen(GuiOpenEvent event)
{
if (event.getGui() != null)
{
boolean inventory = event.getGui() instanceof GuiContainer;
EntityPlayer player = Minecraft.getMinecraft().player;
if (player != null)
{
ItemStack stack = player.getHeldItem(EnumHand.MAIN_HAND);
if (inventory && !stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile && ItemTile.hasTileData(stack))
{
event.setCanceled(true);
Minecraft.getMinecraft().currentScreen = null;
}
}
}
}
/* if (inventory && !stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile && ItemTile.hasTileData(stack))
* Prevents the Player from switching Slots {
*/ event.setCanceled(true);
@SideOnly(Side.CLIENT) Minecraft.getMinecraft().currentScreen = null;
@SubscribeEvent }
public void inputEvent(InputEvent event) throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException }
{ }
GameSettings settings = Minecraft.getMinecraft().gameSettings; }
Field field = KeyBinding.class.getDeclaredFields()[7];
field.setAccessible(true);
ItemStack stack = Minecraft.getMinecraft().player.getHeldItemMainhand();
EntityPlayer player = Minecraft.getMinecraft().player;
if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile && ItemTile.hasTileData(stack))
{
if (settings.keyBindDrop.isPressed())
{
field.set(settings.keyBindDrop, false);
}
if (settings.keyBindSwapHands.isPressed())
{
field.set(settings.keyBindSwapHands, false);
}
for (KeyBinding keyBind : settings.keyBindsHotbar)
{
if (keyBind.isPressed())
{
field.set(keyBind, false);
}
}
} /*
* Prevents the Player from switching Slots
*/
@SideOnly(Side.CLIENT)
@SubscribeEvent
public void inputEvent(InputEvent event) throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException
{
GameSettings settings = Minecraft.getMinecraft().gameSettings;
Field field = KeyBinding.class.getDeclaredFields()[7];
field.setAccessible(true);
ItemStack stack = Minecraft.getMinecraft().player.getHeldItemMainhand();
EntityPlayer player = Minecraft.getMinecraft().player;
int current = player.inventory.currentItem; if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile && ItemTile.hasTileData(stack))
{
if (settings.keyBindDrop.isPressed())
{
field.set(settings.keyBindDrop, false);
}
if (settings.keyBindSwapHands.isPressed())
{
field.set(settings.keyBindSwapHands, false);
}
for (KeyBinding keyBind : settings.keyBindsHotbar)
{
if (keyBind.isPressed())
{
field.set(keyBind, false);
}
}
}
if (player.getEntityData().hasKey("carrySlot") ? player.getEntityData().getInteger("carrySlot") != current : false) int current = player.inventory.currentItem;
player.inventory.currentItem = player.getEntityData().getInteger("carrySlot");
} if (player.getEntityData().hasKey("carrySlot") ? player.getEntityData().getInteger("carrySlot") != current : false)
{
player.inventory.currentItem = player.getEntityData().getInteger("carrySlot");
}
}
/* /*
* Renders the Block in First Person * Renders the Block in First Person
*/ */
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@SubscribeEvent @SubscribeEvent
public void renderHand(RenderHandEvent event) public void renderHand(RenderHandEvent event)
{ {
World world = Minecraft.getMinecraft().world; World world = Minecraft.getMinecraft().world;
EntityPlayer player = Minecraft.getMinecraft().player; EntityPlayer player = Minecraft.getMinecraft().player;
AbstractClientPlayer aplayer = (AbstractClientPlayer) player; AbstractClientPlayer aplayer = (AbstractClientPlayer) player;
ItemStack stack = player.getHeldItemMainhand(); ItemStack stack = player.getHeldItemMainhand();
int perspective = Minecraft.getMinecraft().gameSettings.thirdPersonView; int perspective = Minecraft.getMinecraft().gameSettings.thirdPersonView;
if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile && ItemTile.hasTileData(stack)) if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile && ItemTile.hasTileData(stack))
{ {
Block block = ItemTile.getBlock(stack); Block block = ItemTile.getBlock(stack);
BlockPos pos = player.getPosition(); NBTTagCompound tag = ItemTile.getTileData(stack);
NBTTagCompound tag = ItemTile.getTileData(stack); IBlockState state = ItemTile.getBlockState(stack);
IBlockState state = ItemTile.getBlockState(stack); ItemStack tileStack = ItemTile.getItemStack(stack);
ItemStack tileStack = ItemTile.getItemStack(stack);
GlStateManager.pushMatrix(); GlStateManager.pushMatrix();
GlStateManager.scale(2.5, 2.5, 2.5); GlStateManager.scale(2.5, 2.5, 2.5);
GlStateManager.translate(0, -0.6, -1); GlStateManager.translate(0, -0.6, -1);
if (CarryOnConfig.settings.facePlayer ? !isChest(block) : isChest(block)) if (CarryOnConfig.settings.facePlayer ? !isChest(block) : isChest(block))
{ {
GlStateManager.rotate(180, 0, 1f, 0); GlStateManager.rotate(180, 0, 1f, 0);
GlStateManager.rotate(-8, 1f, 0, 0); GlStateManager.rotate(-8, 1f, 0, 0);
} }
else else
GlStateManager.rotate(8, 1f, 0, 0); {
GlStateManager.rotate(8, 1f, 0, 0);
}
if (perspective == 0) if (perspective == 0)
{ {
IBakedModel model = ModelOverridesHandler.hasCustomOverrideModel(state, tag) ? ModelOverridesHandler.getCustomOverrideModel(state, tag, world, player) : Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(tileStack, world, player); IBakedModel model = ModelOverridesHandler.hasCustomOverrideModel(state, tag) ? ModelOverridesHandler.getCustomOverrideModel(state, tag, world, player) : Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(tileStack, world, player);
CarryOnOverride carryOverride = ScriptChecker.inspectBlock(state, world, pos, tag); if (ModelOverridesHandler.hasCustomOverrideModel(state, tag))
if (carryOverride != null) {
{ Object override = ModelOverridesHandler.getOverrideObject(state, tag);
double[] translation = ScriptParseHelper.getXYZArray(carryOverride.getRenderTranslation());
double[] rotation = ScriptParseHelper.getXYZArray(carryOverride.getRenderRotation());
double[] scale = ScriptParseHelper.getScale(carryOverride.getRenderScale());
Block b = StringParser.getBlock(carryOverride.getRenderNameBlock());
if (b != null)
{
ItemStack s = new ItemStack(b, 1, carryOverride.getRenderMeta());
s.setTagCompound(carryOverride.getRenderNBT());
model = Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(s, world, player);
}
GlStateManager.translate(translation[0], translation[1], translation[2]); if (override instanceof ItemStack)
GlStateManager.rotate((float) rotation[0], 1, 0, 0); {
GlStateManager.rotate((float) rotation[1], 0, 1, 0); Minecraft.getMinecraft().getRenderItem().renderItem((ItemStack) override, model);
GlStateManager.rotate((float) rotation[2], 0, 0, 1); }
GlStateManager.scale(scale[0], scale[1], scale[2]); else
{
Minecraft.getMinecraft().getRenderItem().renderItem(tileStack.isEmpty() ? stack : tileStack, model);
}
}
else
{
int i = this.getBrightnessForRender(Minecraft.getMinecraft().player);
int j = i % 65536;
int k = i / 65536;
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, j, k);
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
this.setLightmapDisabled(false);
Minecraft.getMinecraft().getRenderItem().renderItem(tileStack.isEmpty() ? stack : tileStack, model);
this.setLightmapDisabled(true);
}
}
} GlStateManager.scale(1, 1, 1);
GlStateManager.popMatrix();
if (ModelOverridesHandler.hasCustomOverrideModel(state, tag)) if (perspective == 0)
{ {
Object override = ModelOverridesHandler.getOverrideObject(state, tag); event.setCanceled(true);
if (override instanceof ItemStack) }
{ }
Minecraft.getMinecraft().getRenderItem().renderItem((ItemStack) override, model); else
} {
else if (stack.isEmpty() ? true : stack.getItem() != RegistrationHandler.itemEntity)
Minecraft.getMinecraft().getRenderItem().renderItem(tileStack.isEmpty() ? stack : tileStack, model); {
} event.setCanceled(false);
else Minecraft mc = Minecraft.getMinecraft();
Minecraft.getMinecraft().getRenderItem().renderItem(tileStack.isEmpty() ? stack : tileStack, model); RenderManager manager = mc.getRenderManager();
} RenderPlayer renderPlayer = manager.getSkinMap().get(aplayer.getSkinType());
GlStateManager.scale(1, 1, 1); ModelPlayer modelPlayer = renderPlayer.getMainModel();
GlStateManager.popMatrix(); modelPlayer.bipedLeftArm.isHidden = false;
modelPlayer.bipedRightArm.isHidden = false;
modelPlayer.bipedLeftArmwear.isHidden = false;
modelPlayer.bipedRightArmwear.isHidden = false;
}
}
}
if (perspective == 0) @SideOnly(Side.CLIENT)
event.setCanceled(true); private int getBrightnessForRender(EntityPlayer player)
} {
else BlockPos.MutableBlockPos blockpos$mutableblockpos = new BlockPos.MutableBlockPos(MathHelper.floor(player.posX), 0, MathHelper.floor(player.posZ));
{
if (stack.isEmpty() ? true : stack.getItem() != RegistrationHandler.itemEntity)
{
event.setCanceled(false);
Minecraft mc = Minecraft.getMinecraft();
RenderManager manager = mc.getRenderManager();
RenderPlayer renderPlayer = manager.getSkinMap().get(aplayer.getSkinType());
ModelPlayer modelPlayer = renderPlayer.getMainModel();
modelPlayer.bipedLeftArm.isHidden = false;
modelPlayer.bipedRightArm.isHidden = false;
modelPlayer.bipedLeftArmwear.isHidden = false;
modelPlayer.bipedRightArmwear.isHidden = false;
}
}
}
/* if (player.world.isBlockLoaded(blockpos$mutableblockpos))
* Renders the Block in Third Person {
*/ blockpos$mutableblockpos.setY(MathHelper.floor(player.posY + player.getEyeHeight()));
@SideOnly(Side.CLIENT) return player.world.getCombinedLight(blockpos$mutableblockpos, 0);
@SubscribeEvent }
public void onPlayerRenderPost(RenderPlayerEvent.Post event) else
{ {
World world = Minecraft.getMinecraft().world; return 0;
EntityPlayer player = event.getEntityPlayer(); }
ModelPlayer modelPlayer = event.getRenderer().getMainModel(); }
EntityPlayerSP clientPlayer = Minecraft.getMinecraft().player;
ItemStack stack = player.getHeldItemMainhand();
float partialticks = event.getPartialRenderTick();
if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile && ItemTile.hasTileData(stack))
{
Block block = ItemTile.getBlock(stack);
IBlockState state = ItemTile.getBlockState(stack);
NBTTagCompound tag = ItemTile.getTileData(stack);
ItemStack tileItem = ItemTile.getItemStack(stack); @SideOnly(Side.CLIENT)
private void setLightmapDisabled(boolean disabled)
{
GlStateManager.setActiveTexture(OpenGlHelper.lightmapTexUnit);
float rotation = -(player.prevRenderYawOffset + (player.renderYawOffset - player.prevRenderYawOffset) * partialticks); if (disabled)
int perspective = Minecraft.getMinecraft().gameSettings.thirdPersonView; {
GlStateManager.disableTexture2D();
}
else
{
GlStateManager.enableTexture2D();
}
double d0 = player.lastTickPosX + (player.posX - player.lastTickPosX) * (double) partialticks; GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit);
double d1 = player.lastTickPosY + (player.posY - player.lastTickPosY) * (double) partialticks; }
double d2 = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * (double) partialticks;
double c0 = clientPlayer.lastTickPosX + (clientPlayer.posX - clientPlayer.lastTickPosX) * (double) partialticks; /*
double c1 = clientPlayer.lastTickPosY + (clientPlayer.posY - clientPlayer.lastTickPosY) * (double) partialticks; * Renders the Block in Third Person
double c2 = clientPlayer.lastTickPosZ + (clientPlayer.posZ - clientPlayer.lastTickPosZ) * (double) partialticks; */
@SideOnly(Side.CLIENT)
@SubscribeEvent
public void onPlayerRenderPost(RenderPlayerEvent.Post event)
{
World world = Minecraft.getMinecraft().world;
EntityPlayer player = event.getEntityPlayer();
EntityPlayerSP clientPlayer = Minecraft.getMinecraft().player;
ItemStack stack = player.getHeldItemMainhand();
float partialticks = event.getPartialRenderTick();
double xOffset = d0 - c0; if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile && ItemTile.hasTileData(stack))
double yOffset = d1 - c1; {
double zOffset = d2 - c2; Block block = ItemTile.getBlock(stack);
IBlockState state = ItemTile.getBlockState(stack);
NBTTagCompound tag = ItemTile.getTileData(stack);
ItemStack tileItem = ItemTile.getItemStack(stack);
GlStateManager.pushMatrix(); float rotation = -(player.prevRenderYawOffset + (player.renderYawOffset - player.prevRenderYawOffset) * partialticks);
GlStateManager.translate(xOffset, yOffset, zOffset);
GlStateManager.scale(0.6, 0.6, 0.6);
if (CarryOnConfig.settings.facePlayer ? !isChest(block) : isChest(block)) double d0 = player.lastTickPosX + (player.posX - player.lastTickPosX) * partialticks;
{ double d1 = player.lastTickPosY + (player.posY - player.lastTickPosY) * partialticks;
GlStateManager.rotate(rotation, 0, 1.0f, 0); double d2 = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * partialticks;
GlStateManager.translate(0, 1.6, 0.65);
}
else
{
GlStateManager.rotate(rotation + 180, 0, 1.0f, 0);
GlStateManager.translate(0, 1.6, -0.65);
}
if (player.isSneaking()) double c0 = clientPlayer.lastTickPosX + (clientPlayer.posX - clientPlayer.lastTickPosX) * partialticks;
GlStateManager.translate(0, -0.3, 0); double c1 = clientPlayer.lastTickPosY + (clientPlayer.posY - clientPlayer.lastTickPosY) * partialticks;
double c2 = clientPlayer.lastTickPosZ + (clientPlayer.posZ - clientPlayer.lastTickPosZ) * partialticks;
IBakedModel model = ModelOverridesHandler.hasCustomOverrideModel(state, tag) ? ModelOverridesHandler.getCustomOverrideModel(state, tag, world, player) : Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(tileItem, world, player); double xOffset = d0 - c0;
double yOffset = d1 - c1;
double zOffset = d2 - c2;
CarryOnOverride carryOverride = ScriptChecker.inspectBlock(state, world, player.getPosition(), tag); GlStateManager.pushMatrix();
if (carryOverride != null) GlStateManager.translate(xOffset, yOffset, zOffset);
{ GlStateManager.scale(0.6, 0.6, 0.6);
double[] translation = ScriptParseHelper.getXYZArray(carryOverride.getRenderTranslation());
double[] rot = ScriptParseHelper.getXYZArray(carryOverride.getRenderRotation());
double[] scale = ScriptParseHelper.getScale(carryOverride.getRenderScale());
Block b = StringParser.getBlock(carryOverride.getRenderNameBlock());
if (b != null)
{
ItemStack s = new ItemStack(b, 1, carryOverride.getRenderMeta());
s.setTagCompound(carryOverride.getRenderNBT());
model = Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(s, world, player);
}
if (CarryOnConfig.settings.facePlayer ? !isChest(block) : isChest(block))
{
GlStateManager.rotate(rotation, 0, 1.0f, 0);
GlStateManager.translate(0, 1.6, 0.65);
}
else
{
GlStateManager.rotate(rotation + 180, 0, 1.0f, 0);
GlStateManager.translate(0, 1.6, -0.65);
}
GlStateManager.translate(translation[0], translation[1], translation[2]); if (player.isSneaking())
GlStateManager.rotate((float) rot[0], 1, 0, 0); {
GlStateManager.rotate((float) rot[1], 0, 1, 0); GlStateManager.translate(0, -0.3, 0);
GlStateManager.rotate((float) rot[2], 0, 0, 1); }
GlStateManager.scale(scale[0], scale[1], scale[2]);
} IBakedModel model = ModelOverridesHandler.hasCustomOverrideModel(state, tag) ? ModelOverridesHandler.getCustomOverrideModel(state, tag, world, player) : Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(tileItem, world, player);
if (ModelOverridesHandler.hasCustomOverrideModel(state, tag)) if (ModelOverridesHandler.hasCustomOverrideModel(state, tag))
{ {
Object override = ModelOverridesHandler.getOverrideObject(state, tag); Object override = ModelOverridesHandler.getOverrideObject(state, tag);
if (override instanceof ItemStack)
{
Minecraft.getMinecraft().getRenderItem().renderItem((ItemStack) override, model);
}
else
Minecraft.getMinecraft().getRenderItem().renderItem(tileItem.isEmpty() ? stack : tileItem, model);
}
else
Minecraft.getMinecraft().getRenderItem().renderItem(tileItem.isEmpty() ? stack : tileItem, model);
GlStateManager.scale(1, 1, 1);
GlStateManager.popMatrix(); if (override instanceof ItemStack)
} {
Minecraft.getMinecraft().getRenderItem().renderItem((ItemStack) override, model);
}
else
{
Minecraft.getMinecraft().getRenderItem().renderItem(tileItem.isEmpty() ? stack : tileItem, model);
}
}
else
{
Minecraft.getMinecraft().getRenderItem().renderItem(tileItem.isEmpty() ? stack : tileItem, model);
}
} GlStateManager.scale(1, 1, 1);
GlStateManager.popMatrix();
}
}
/* /*
* Renders correct arm rotation * Renders correct arm rotation
*/ */
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@SubscribeEvent @SubscribeEvent
public void onPlayerRenderPre(RenderPlayerEvent.Pre event) public void onPlayerRenderPre(RenderPlayerEvent.Pre event)
{ {
if (!Loader.isModLoaded("mobends") && CarryOnConfig.settings.renderArms) if (!Loader.isModLoaded("mobends") && CarryOnConfig.settings.renderArms)
{ {
EntityPlayer player = event.getEntityPlayer(); EntityPlayer player = event.getEntityPlayer();
AbstractClientPlayer aplayer = (AbstractClientPlayer) player; AbstractClientPlayer aplayer = (AbstractClientPlayer) player;
ItemStack stack = player.getHeldItemMainhand(); ItemStack stack = player.getHeldItemMainhand();
ModelPlayer model = event.getRenderer().getMainModel(); ModelPlayer model = event.getRenderer().getMainModel();
ResourceLocation skinLoc = DefaultPlayerSkin.getDefaultSkin(player.getPersistentID()); ResourceLocation skinLoc = DefaultPlayerSkin.getDefaultSkin(player.getPersistentID());
if (!initModels) if (!initModels)
{ {
fakeLeftArm = new ModelRenderer(model, 32, 48); this.fakeLeftArm = new ModelRenderer(model, 32, 48);
fakeRightArm = new ModelRenderer(model, 40, 16); this.fakeRightArm = new ModelRenderer(model, 40, 16);
fakeLeftArmwear = new ModelRenderer(model, 48, 48); this.fakeLeftArmwear = new ModelRenderer(model, 48, 48);
fakeRightArmwear = new ModelRenderer(model, 40, 32); this.fakeRightArmwear = new ModelRenderer(model, 40, 32);
initModels = true; initModels = true;
} }
player.setArrowCountInEntity(0); // TODO Temporary Fix player.setArrowCountInEntity(0); // TODO Temporary Fix
if (!stack.isEmpty() && (stack.getItem() == RegistrationHandler.itemTile && ItemTile.hasTileData(stack)) || (stack.getItem() == RegistrationHandler.itemEntity && ItemEntity.hasEntityData(stack))) if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile && ItemTile.hasTileData(stack) || stack.getItem() == RegistrationHandler.itemEntity && ItemEntity.hasEntityData(stack))
{ {
if (model.bipedBody.childModels != null && !model.bipedBody.childModels.isEmpty()) if (model.bipedBody.childModels != null && !model.bipedBody.childModels.isEmpty())
{ {
for (int k = 0; k < model.bipedBody.childModels.size(); k++)
{
float chkRot = model.bipedBody.childModels.get(k).rotateAngleX;
for (int k = 0; k < model.bipedBody.childModels.size(); k++) if (chkRot == -0.9001F || chkRot == -1.2001F || chkRot == -1.4001F || chkRot == -1.7001F)
{ {
float chkRot = model.bipedBody.childModels.get(k).rotateAngleX; model.bipedBody.childModels.remove(k);
if (chkRot == -0.9001F || chkRot == -1.2001F || chkRot == -1.4001F || chkRot == -1.7001F) k = k - 1;
{ }
model.bipedBody.childModels.remove(k); }
k = k - 1; }
}
}
} Item item = stack.getItem();
Item item = stack.getItem(); model.bipedLeftArm.isHidden = true;
model.bipedRightArm.isHidden = true;
model.bipedLeftArmwear.isHidden = true;
model.bipedRightArmwear.isHidden = true;
model.bipedLeftArm.isHidden = true; Minecraft.getMinecraft().getTextureManager().bindTexture(skinLoc);
model.bipedRightArm.isHidden = true;
model.bipedLeftArmwear.isHidden = true;
model.bipedRightArmwear.isHidden = true;
Minecraft.getMinecraft().getTextureManager().bindTexture(skinLoc); if (aplayer.getSkinType().equals("default"))
float rotation = -player.renderYawOffset; {
this.fakeLeftArm.addBox(model.bipedLeftArm.offsetX + 4.2F, model.bipedLeftArm.offsetY, model.bipedLeftArm.offsetZ, 4, 12, 4, .08F);
this.fakeLeftArmwear.addBox(model.bipedLeftArm.offsetX + 4.2F, model.bipedLeftArm.offsetY, model.bipedLeftArm.offsetZ, 4, 12, 4, .08F + 0.25F);
}
else
{
this.fakeLeftArm.addBox(model.bipedLeftArm.offsetX + 4.2F, model.bipedLeftArm.offsetY, model.bipedLeftArm.offsetZ, 3, 12, 4, .08F);
this.fakeLeftArmwear.addBox(model.bipedLeftArm.offsetX + 4.2F, model.bipedLeftArm.offsetY, model.bipedLeftArm.offsetZ, 3, 12, 4, .08F + 0.25F);
}
if (aplayer.getSkinType().equals("default")) if (aplayer.getSkinType().equals("default"))
{ {
fakeLeftArm.addBox(model.bipedLeftArm.offsetX + 4.2F, model.bipedLeftArm.offsetY, model.bipedLeftArm.offsetZ, 4, 12, 4, .08F); this.fakeRightArm.addBox(model.bipedRightArm.offsetX - 7.9F, model.bipedRightArm.offsetY, model.bipedRightArm.offsetZ, 4, 12, 4, .08F);
fakeLeftArmwear.addBox(model.bipedLeftArm.offsetX + 4.2F, model.bipedLeftArm.offsetY, model.bipedLeftArm.offsetZ, 4, 12, 4, .08F + 0.25F); this.fakeRightArmwear.addBox(model.bipedRightArm.offsetX - 7.9F, model.bipedRightArm.offsetY, model.bipedRightArm.offsetZ, 4, 12, 4, .08F + 0.25F);
} }
else else
{ {
fakeLeftArm.addBox(model.bipedLeftArm.offsetX + 4.2F, model.bipedLeftArm.offsetY, model.bipedLeftArm.offsetZ, 3, 12, 4, .08F); this.fakeRightArm.addBox(model.bipedRightArm.offsetX - 7.2F, model.bipedRightArm.offsetY, model.bipedRightArm.offsetZ, 3, 12, 4, .08F);
fakeLeftArmwear.addBox(model.bipedLeftArm.offsetX + 4.2F, model.bipedLeftArm.offsetY, model.bipedLeftArm.offsetZ, 3, 12, 4, .08F + 0.25F); this.fakeRightArmwear.addBox(model.bipedRightArm.offsetX - 7.2F, model.bipedRightArm.offsetY, model.bipedRightArm.offsetZ, 3, 12, 4, .08F + 0.25F);
} }
if (aplayer.getSkinType().equals("default")) if (item == RegistrationHandler.itemTile)
{ {
fakeRightArm.addBox(model.bipedRightArm.offsetX - 7.9F, model.bipedRightArm.offsetY, model.bipedRightArm.offsetZ, 4, 12, 4, .08F); if (!player.isSneaking())
fakeRightArmwear.addBox(model.bipedRightArm.offsetX - 7.9F, model.bipedRightArm.offsetY, model.bipedRightArm.offsetZ, 4, 12, 4, .08F + 0.25F); {
} this.fakeRightArm.rotateAngleX = -.9001F;
else this.fakeLeftArm.rotateAngleX = -.9001F;
{ this.fakeLeftArmwear.rotateAngleX = -.9001F;
fakeRightArm.addBox(model.bipedRightArm.offsetX - 7.2F, model.bipedRightArm.offsetY, model.bipedRightArm.offsetZ, 3, 12, 4, .08F); this.fakeRightArmwear.rotateAngleX = -.9001F;
fakeRightArmwear.addBox(model.bipedRightArm.offsetX - 7.2F, model.bipedRightArm.offsetY, model.bipedRightArm.offsetZ, 3, 12, 4, .08F + 0.25F); }
} else
{
this.fakeRightArm.rotateAngleX = -1.4001F;
this.fakeLeftArm.rotateAngleX = -1.4001F;
this.fakeLeftArmwear.rotateAngleX = -1.4001F;
this.fakeRightArmwear.rotateAngleX = -1.4001F;
}
}
else
{
if (!player.isSneaking())
{
this.fakeRightArm.rotateAngleX = -1.2001F;
this.fakeLeftArm.rotateAngleX = -1.2001F;
this.fakeLeftArmwear.rotateAngleX = -1.2001F;
this.fakeRightArmwear.rotateAngleX = -1.2001F;
}
else
{
this.fakeRightArm.rotateAngleX = -1.7001F;
this.fakeLeftArm.rotateAngleX = -1.7001F;
this.fakeLeftArmwear.rotateAngleX = -1.7001F;
this.fakeRightArmwear.rotateAngleX = -1.7001F;
}
if (item == RegistrationHandler.itemTile) this.fakeRightArm.rotateAngleY = -0.15f;
{ this.fakeLeftArm.rotateAngleY = 0.15f;
if (!player.isSneaking()) this.fakeLeftArmwear.rotateAngleY = 0.15f;
{ this.fakeRightArmwear.rotateAngleY = -0.15f;
fakeRightArm.rotateAngleX = -.9001F; }
fakeLeftArm.rotateAngleX = -.9001F;
fakeLeftArmwear.rotateAngleX = -.9001F;
fakeRightArmwear.rotateAngleX = -.9001F;
}
else
{
fakeRightArm.rotateAngleX = -1.4001F;
fakeLeftArm.rotateAngleX = -1.4001F;
fakeLeftArmwear.rotateAngleX = -1.4001F;
fakeRightArmwear.rotateAngleX = -1.4001F;
}
}
else
{
if (!player.isSneaking())
{
fakeRightArm.rotateAngleX = -1.2001F;
fakeLeftArm.rotateAngleX = -1.2001F;
fakeLeftArmwear.rotateAngleX = -1.2001F;
fakeRightArmwear.rotateAngleX = -1.2001F;
}
else
{
fakeRightArm.rotateAngleX = -1.7001F;
fakeLeftArm.rotateAngleX = -1.7001F;
fakeLeftArmwear.rotateAngleX = -1.7001F;
fakeRightArmwear.rotateAngleX = -1.7001F;
}
fakeRightArm.rotateAngleY = -0.15f; model.bipedBody.addChild(this.fakeLeftArm);
fakeLeftArm.rotateAngleY = 0.15f; model.bipedBody.addChild(this.fakeRightArm);
fakeLeftArmwear.rotateAngleY = 0.15f;
fakeRightArmwear.rotateAngleY = -0.15f;
} if (player.isWearing(EnumPlayerModelParts.LEFT_SLEEVE))
model.bipedBody.addChild(fakeLeftArm); {
model.bipedBody.addChild(fakeRightArm); model.bipedBody.addChild(this.fakeLeftArmwear);
}
if (player.isWearing(EnumPlayerModelParts.RIGHT_SLEEVE))
{
model.bipedBody.addChild(this.fakeRightArmwear);
}
}
else
{
model.bipedLeftArm.isHidden = false;
model.bipedRightArm.isHidden = false;
model.bipedLeftArmwear.isHidden = false;
model.bipedRightArmwear.isHidden = false;
if (player.isWearing(EnumPlayerModelParts.LEFT_SLEEVE)) if (model.bipedBody.childModels != null && !model.bipedBody.childModels.isEmpty())
{ {
model.bipedBody.addChild(fakeLeftArmwear); for (int k = 0; k < model.bipedBody.childModels.size(); k++)
} {
if (player.isWearing(EnumPlayerModelParts.RIGHT_SLEEVE)) float chkRot = model.bipedBody.childModels.get(k).rotateAngleX;
{
model.bipedBody.addChild(fakeRightArmwear);
}
} if (chkRot == -0.9001F || chkRot == -1.2001F || chkRot == -1.4001F || chkRot == -1.7001F)
else {
{ model.bipedBody.childModels.remove(k);
model.bipedLeftArm.isHidden = false; k = k - 1;
model.bipedRightArm.isHidden = false; }
model.bipedLeftArmwear.isHidden = false; }
model.bipedRightArmwear.isHidden = false; }
}
if (model.bipedBody.childModels != null && !model.bipedBody.childModels.isEmpty()) if (stack.isEmpty() || stack.getItem() != RegistrationHandler.itemTile && stack.getItem() != RegistrationHandler.itemEntity)
{ {
for (int k = 0; k < model.bipedBody.childModels.size(); k++) model.bipedLeftArm.isHidden = false;
{ model.bipedRightArm.isHidden = false;
float chkRot = model.bipedBody.childModels.get(k).rotateAngleX; model.bipedLeftArmwear.isHidden = false;
if (chkRot == -0.9001F || chkRot == -1.2001F || chkRot == -1.4001F || chkRot == -1.7001F) model.bipedRightArmwear.isHidden = false;
{ }
model.bipedBody.childModels.remove(k); }
k = k - 1; }
}
}
}
}
if (stack.isEmpty() || (stack.getItem() != RegistrationHandler.itemTile && stack.getItem() != RegistrationHandler.itemEntity)) public static boolean isChest(Block block)
{ {
model.bipedLeftArm.isHidden = false; return block == Blocks.CHEST || block == Blocks.ENDER_CHEST || block == Blocks.TRAPPED_CHEST;
model.bipedRightArm.isHidden = false; }
model.bipedLeftArmwear.isHidden = false;
model.bipedRightArmwear.isHidden = false;
}
}
} @SideOnly(Side.CLIENT)
private static RenderPlayer getRenderPlayer(AbstractClientPlayer player)
{
Minecraft mc = Minecraft.getMinecraft();
RenderManager manager = mc.getRenderManager();
return manager.getSkinMap().get(player.getSkinType());
}
public static boolean isChest(Block block) @SideOnly(Side.CLIENT)
{ private static ModelPlayer getPlayerModel(AbstractClientPlayer player)
return block == Blocks.CHEST || block == Blocks.ENDER_CHEST || block == Blocks.TRAPPED_CHEST; {
} return getRenderPlayer(player).getMainModel();
}
@SideOnly(Side.CLIENT) @SubscribeEvent
private static RenderPlayer getRenderPlayer(AbstractClientPlayer player) @SideOnly(Side.CLIENT)
{ public void hideItems(RenderPlayerEvent.Specials.Pre event)
Minecraft mc = Minecraft.getMinecraft(); {
RenderManager manager = mc.getRenderManager(); EntityPlayer player = event.getEntityPlayer();
return manager.getSkinMap().get(player.getSkinType()); ItemStack stack = player.getHeldItemMainhand();
}
@SideOnly(Side.CLIENT)
private static ModelPlayer getPlayerModel(AbstractClientPlayer player)
{
return getRenderPlayer(player).getMainModel();
}
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void hideItems(RenderPlayerEvent.Specials.Pre event)
{
EntityPlayer player = event.getEntityPlayer();
ItemStack stack = player.getHeldItemMainhand();
if (stack != null && (stack.getItem() == RegistrationHandler.itemTile || stack.getItem() == RegistrationHandler.itemEntity))
{
event.setRenderItem(false);
}
}
if (stack != null && (stack.getItem() == RegistrationHandler.itemTile || stack.getItem() == RegistrationHandler.itemEntity))
{
event.setRenderItem(false);
}
}
} }