Fix JABBA-related issues with crafting station slots (#54)

* Fix shift-merging tools voiding items

fixes <https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11392>

* Change 0-sized ItemStacks into null stacks in crafting station attached slots

Fixes <https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/10425>

* Update buildscript

* spotlessApply
This commit is contained in:
Raven Szewczyk authored and GitHub committed 2022-09-22 20:51:23 +02:00
1 parent 18bfeaff32
commit 39be06c23b
571 files changed
+25959 -28223

No files matched your search

@@ -1,57 +1,50 @@
package tconstruct.weaponry.client;
import tconstruct.library.weaponry.ProjectileWeapon;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Gui;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
import tconstruct.library.weaponry.ProjectileWeapon;
public class AmmoSlotHandler {
@SubscribeEvent
public void onRenderOverlay(RenderGameOverlayEvent.Pre event)
{
if(event.type != RenderGameOverlayEvent.ElementType.HOTBAR)
return;
public void onRenderOverlay(RenderGameOverlayEvent.Pre event) {
if (event.type != RenderGameOverlayEvent.ElementType.HOTBAR) return;
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
ItemStack equipped = player.getCurrentEquippedItem();
if(equipped == null || equipped.getItem() == null)
return;
if(!(equipped.getItem() instanceof ProjectileWeapon))
return;
if (equipped == null || equipped.getItem() == null) return;
if (!(equipped.getItem() instanceof ProjectileWeapon)) return;
// find ammo
// todo: cache this somehow?
ItemStack ammo = ((ProjectileWeapon) equipped.getItem()).searchForAmmo(player, equipped);
if(ammo == null)
return;
if (ammo == null) return;
// check if it's in the inventory
int slot = -1;
for(int i = 0; i < 9; i++)
if(player.inventory.mainInventory[i] == ammo)
{
for (int i = 0; i < 9; i++)
if (player.inventory.mainInventory[i] == ammo) {
slot = i;
break;
}
// not in the hotbar
if(slot == -1)
return;
if (slot == -1) return;
int x = event.resolution.getScaledWidth() / 2 - 90 + slot * 20 + 2;
int z = event.resolution.getScaledHeight() - 16 - 3;
int col = 0;
col |= 120 << 16; // red
col |= 150 << 8; // green
col |= 200 << 0; // blue
col |= 150 << 8; // green
col |= 200 << 0; // blue
col |= 200 << 24; // alpha
// render a cool underlay thing
Gui.drawRect(x,z, x+16, z+16, col);
Gui.drawRect(x, z, x + 16, z + 16, col);
}
}
@@ -1,36 +1,36 @@
package tconstruct.weaponry.client;
import net.minecraft.client.gui.Gui;
import tconstruct.util.Reference;
import tconstruct.library.weaponry.IWindup;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Gui;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
import org.lwjgl.opengl.GL11;
import tconstruct.library.weaponry.IWindup;
import tconstruct.util.Reference;
public class CrosshairHandler {
private static Minecraft mc = Minecraft.getMinecraft();
private static ResourceLocation crossHairSquare = new ResourceLocation(Reference.RESOURCE, "textures/gui/Crosshair.png");
private static ResourceLocation crossHairTip = new ResourceLocation(Reference.RESOURCE, "textures/gui/Crosshair2.png");
private static ResourceLocation crossHairWeird = new ResourceLocation(Reference.RESOURCE, "textures/gui/Crosshair3.png");
private static ResourceLocation crossHairSpike = new ResourceLocation(Reference.RESOURCE, "textures/gui/Crosshair4.png");
private static ResourceLocation crossHairSquare =
new ResourceLocation(Reference.RESOURCE, "textures/gui/Crosshair.png");
private static ResourceLocation crossHairTip =
new ResourceLocation(Reference.RESOURCE, "textures/gui/Crosshair2.png");
private static ResourceLocation crossHairWeird =
new ResourceLocation(Reference.RESOURCE, "textures/gui/Crosshair3.png");
private static ResourceLocation crossHairSpike =
new ResourceLocation(Reference.RESOURCE, "textures/gui/Crosshair4.png");
@SubscribeEvent
public void onRenderOverlay(RenderGameOverlayEvent.Pre event)
{
if(event.type != RenderGameOverlayEvent.ElementType.CROSSHAIRS)
return;
public void onRenderOverlay(RenderGameOverlayEvent.Pre event) {
if (event.type != RenderGameOverlayEvent.ElementType.CROSSHAIRS) return;
ItemStack equipped = mc.thePlayer.getCurrentEquippedItem();
if(equipped == null || equipped.getItem() == null)
return;
if(!(equipped.getItem() instanceof IWindup))
return;
if (equipped == null || equipped.getItem() == null) return;
if (!(equipped.getItem() instanceof IWindup)) return;
IWindup weapon = (IWindup) equipped.getItem();
@@ -39,13 +39,24 @@ public class CrosshairHandler {
int type = 0;
ResourceLocation tex;
switch (weapon.getCrosshairType())
{
case SQUARE: tex = crossHairSquare; break;
case TIP: tex = crossHairTip; break;
case WEIRD: tex = crossHairWeird; type = 1; break;
case SPIKE: tex = crossHairSpike; type = 1; break;
default: tex = crossHairSquare; type = 0;
switch (weapon.getCrosshairType()) {
case SQUARE:
tex = crossHairSquare;
break;
case TIP:
tex = crossHairTip;
break;
case WEIRD:
tex = crossHairWeird;
type = 1;
break;
case SPIKE:
tex = crossHairSpike;
type = 1;
break;
default:
tex = crossHairSquare;
type = 0;
}
mc.getTextureManager().bindTexture(tex);
@@ -55,7 +66,7 @@ public class CrosshairHandler {
float spread = ((1.0f - weapon.getWindupProgress(equipped, mc.thePlayer)) * 25f);
// 4 square crosshair
if(type == 0) {
if (type == 0) {
drawCrosshairPart(width / 2f - spread, height / 2f - spread, 0);
drawCrosshairPart(width / 2f + spread, height / 2f - spread, 1);
drawCrosshairPart(width / 2f - spread, height / 2f + spread, 2);
@@ -63,10 +74,10 @@ public class CrosshairHandler {
}
// 4 triangle crosshair
else {
drawAlternateCrosshairPart(width/2f, height/2f - spread, 0);
drawAlternateCrosshairPart(width/2f - spread, height/2f, 1);
drawAlternateCrosshairPart(width/2f + spread, height/2f, 2);
drawAlternateCrosshairPart(width/2f, height/2f + spread, 3);
drawAlternateCrosshairPart(width / 2f, height / 2f - spread, 0);
drawAlternateCrosshairPart(width / 2f - spread, height / 2f, 1);
drawAlternateCrosshairPart(width / 2f + spread, height / 2f, 2);
drawAlternateCrosshairPart(width / 2f, height / 2f + spread, 3);
}
OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
@@ -78,10 +89,9 @@ public class CrosshairHandler {
mc.getTextureManager().bindTexture(Gui.icons);
}
private void drawCrosshairPart(float width, float height, int part)
{
double w = (double)width;
double h = (double)height;
private void drawCrosshairPart(float width, float height, int part) {
double w = (double) width;
double h = (double) height;
double s = 4;
double z = -90;
@@ -89,9 +99,8 @@ public class CrosshairHandler {
double u1 = 0;
double v1 = 0;
switch(part)
{
// top left
switch (part) {
// top left
case 0:
w -= s;
h -= s;
@@ -119,17 +128,16 @@ public class CrosshairHandler {
Tessellator tessellator = Tessellator.instance;
tessellator.startDrawingQuads();
tessellator.addVertexWithUV(w - s, h - s, z, u1, v1);
tessellator.addVertexWithUV(w - s, h + s, z, u1, v2);
tessellator.addVertexWithUV(w + s, h + s, z, u2, v2);
tessellator.addVertexWithUV(w + s, h - s, z, u2, v1);
tessellator.addVertexWithUV(w - s, h - s, z, u1, v1);
tessellator.addVertexWithUV(w - s, h + s, z, u1, v2);
tessellator.addVertexWithUV(w + s, h + s, z, u2, v2);
tessellator.addVertexWithUV(w + s, h - s, z, u2, v1);
tessellator.draw();
}
private void drawAlternateCrosshairPart(float width, float height, int part)
{
double w = (double)width;
double h = (double)height;
private void drawAlternateCrosshairPart(float width, float height, int part) {
double w = (double) width;
double h = (double) height;
final double s = 8d;
final double z = -90;
@@ -137,25 +145,25 @@ public class CrosshairHandler {
Tessellator tessellator = Tessellator.instance;
tessellator.startDrawing(GL11.GL_TRIANGLES); // 4
// top part
if(part == 0) {
if (part == 0) {
tessellator.addVertexWithUV(w - s, h - s, z, 0, 0);
tessellator.addVertexWithUV(w, h, z, 0.5, 0.5);
tessellator.addVertexWithUV(w + s, h - s, z, 1, 0);
}
// left part
else if(part == 1) {
else if (part == 1) {
tessellator.addVertexWithUV(w - s, h - s, z, 0, 0);
tessellator.addVertexWithUV(w - s, h + s, z, 0, 1);
tessellator.addVertexWithUV(w, h, z, 0.5, 0.5);
}
// right part
else if(part == 2) {
else if (part == 2) {
tessellator.addVertexWithUV(w, h, z, 0.5, 0.5);
tessellator.addVertexWithUV(w + s, h + s, z, 1, 1);
tessellator.addVertexWithUV(w + s, h - s, z, 1, 0);
}
// bottom part
else if(part == 3) {
else if (part == 3) {
tessellator.addVertexWithUV(w, h, z, 0.5, 0.5);
tessellator.addVertexWithUV(w - s, h + s, z, 0, 1);
tessellator.addVertexWithUV(w + s, h + s, z, 1, 1);
@@ -1,41 +1,36 @@
package tconstruct.weaponry.client;
import tconstruct.weaponry.TinkerWeaponry;
import tconstruct.library.weaponry.BowBaseAmmo;
import tconstruct.library.weaponry.IWindup;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.event.FOVUpdateEvent;
import net.minecraftforge.client.event.RenderPlayerEvent;
import tconstruct.library.weaponry.BowBaseAmmo;
import tconstruct.library.weaponry.IWindup;
import tconstruct.weaponry.TinkerWeaponry;
public class RenderEventHandler {
@SubscribeEvent
public void onAimZoom(FOVUpdateEvent event)
{
if(!event.entity.isUsingItem())
return;
public void onAimZoom(FOVUpdateEvent event) {
if (!event.entity.isUsingItem()) return;
if(!(event.entity.getItemInUse().getItem() instanceof IWindup))
return;
if (!(event.entity.getItemInUse().getItem() instanceof IWindup)) return;
ItemStack weapon = event.entity.getItemInUse();
IWindup item = (IWindup) weapon.getItem();
if(item.zoomOnWindup(weapon))
event.newfov = event.fov / (event.fov + (item.getZoom(weapon)-1.0f) * item.getWindupProgress(weapon, event.entity));
if (item.zoomOnWindup(weapon))
event.newfov = event.fov
/ (event.fov + (item.getZoom(weapon) - 1.0f) * item.getWindupProgress(weapon, event.entity));
}
@SubscribeEvent
public void onRenderPlayer(RenderPlayerEvent.Pre event)
{
if(event.entityPlayer.getCurrentEquippedItem() != null && event.entityPlayer.getCurrentEquippedItem().getItem() == TinkerWeaponry.javelin) {
public void onRenderPlayer(RenderPlayerEvent.Pre event) {
if (event.entityPlayer.getCurrentEquippedItem() != null
&& event.entityPlayer.getCurrentEquippedItem().getItem() == TinkerWeaponry.javelin) {}
}
if (event.entityPlayer.getItemInUse() == null) return;
if(event.entityPlayer.getItemInUse() == null)
return;
if(event.entityPlayer.getItemInUse().getItem() instanceof BowBaseAmmo) {
if (event.entityPlayer.getItemInUse().getItem() instanceof BowBaseAmmo) {
event.renderer.modelBipedMain.aimedBow = true;
event.renderer.modelArmor.aimedBow = true;
event.renderer.modelArmorChestplate.aimedBow = true;
@@ -1,7 +1,7 @@
package tconstruct.weaponry.client.entity;
import tconstruct.weaponry.entity.ArrowEntity;
import org.lwjgl.opengl.GL11;
import tconstruct.weaponry.entity.ArrowEntity;
public class ArrowEntityRenderer extends ProjectileBaseRenderer<ArrowEntity> {
private int count = 0;
@@ -34,8 +34,7 @@ public class ArrowEntityRenderer extends ProjectileBaseRenderer<ArrowEntity> {
GL11.glRotatef(-entity.rotationPitch, 1f, 0f, 0f);
// rotate it so it's "upright"
if(count == 0)
GL11.glRotatef(90, 0f, 0f, 1f);
if (count == 0) GL11.glRotatef(90, 0f, 0f, 1f);
GL11.glRotatef(45, 0f, 0f, 1f);
@@ -46,6 +45,6 @@ public class ArrowEntityRenderer extends ProjectileBaseRenderer<ArrowEntity> {
GL11.glRotatef(-45, 0f, 0f, 1f);
// thinner arrows
toolCoreRenderer.setDepth(1/64f);
toolCoreRenderer.setDepth(1 / 64f);
}
}
@@ -1,11 +1,12 @@
package tconstruct.weaponry.client.entity;
import tconstruct.weaponry.entity.JavelinEntity;
import org.lwjgl.opengl.GL11;
import tconstruct.weaponry.entity.JavelinEntity;
public class JavelinEntityRenderer extends ProjectileBaseRenderer<JavelinEntity> {
@Override
public void customRendering(JavelinEntity entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) {
public void customRendering(
JavelinEntity entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) {
// rotate it into the direction we threw it
GL11.glRotatef(entity.rotationYaw, 0f, 1f, 0f);
@@ -24,6 +25,6 @@ public class JavelinEntityRenderer extends ProjectileBaseRenderer<JavelinEntity>
// rotate the projectile it so it faces upwards (because the graphic itself is rotated by 45°)
GL11.glRotatef(45, 0f, 0f, 1f);
toolCoreRenderer.setDepth(1/16f);
toolCoreRenderer.setDepth(1 / 16f);
}
}
@@ -1,7 +1,5 @@
package tconstruct.weaponry.client.entity;
import tconstruct.client.FlexibleToolRenderer;
import tconstruct.library.entity.ProjectileBase;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.Entity;
@@ -10,14 +8,22 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import tconstruct.client.FlexibleToolRenderer;
import tconstruct.library.entity.ProjectileBase;
public class ProjectileBaseRenderer<T extends ProjectileBase> extends Render {
protected static FlexibleToolRenderer toolCoreRenderer = new FlexibleToolRenderer();
@SuppressWarnings("unchecked")
@Override
public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) {
doRender((T)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
public void doRender(
Entity p_76986_1_,
double p_76986_2_,
double p_76986_4_,
double p_76986_6_,
float p_76986_8_,
float p_76986_9_) {
doRender((T) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
}
public void doRender(T entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) {
@@ -27,7 +33,7 @@ public class ProjectileBaseRenderer<T extends ProjectileBase> extends Render {
// So remember to read this from the rendering call up to this line
// can be overwritten in customRendering
toolCoreRenderer.setDepth(1/32f);
toolCoreRenderer.setDepth(1 / 32f);
GL11.glPushMatrix();
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
@@ -40,15 +46,13 @@ public class ProjectileBaseRenderer<T extends ProjectileBase> extends Render {
customRendering(entity, x, y, z, p_76986_8_, p_76986_9_);
// arrow shake
float f11 = (float)entity.arrowShake - p_76986_9_;
if (f11 > 0.0F)
{
float f11 = (float) entity.arrowShake - p_76986_9_;
if (f11 > 0.0F) {
float f12 = -MathHelper.sin(f11 * 3.0F) * f11;
GL11.glRotatef(f12, 0.0F, 0.0F, 1.0F);
}
if(renderManager == null || renderManager.renderEngine == null)
return;
if (renderManager == null || renderManager.renderEngine == null) return;
// draw correct texture. not some weird block fragments.
renderManager.renderEngine.bindTexture(TextureMap.locationItemsTexture);
@@ -61,8 +65,7 @@ public class ProjectileBaseRenderer<T extends ProjectileBase> extends Render {
GL11.glPopMatrix();
}
public void customRendering(T entity, double x, double y, double z, float p_76986_8_, float p_76986_9_)
{
public void customRendering(T entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) {
// flip it, flop it, pop it, pull it, push it, rotate it, translate it, TECHNOLOGY
// rotate it into the direction we threw it
@@ -80,13 +83,12 @@ public class ProjectileBaseRenderer<T extends ProjectileBase> extends Render {
}
@Override
protected ResourceLocation getEntityTexture (Entity par1Entity)
{
protected ResourceLocation getEntityTexture(Entity par1Entity) {
return this.func_110796_a((ProjectileBase) par1Entity);
}
protected ResourceLocation func_110796_a (ProjectileBase par1ArrowEntity)
{
return this.renderManager.renderEngine.getResourceLocation(par1ArrowEntity.getEntityItem().getItemSpriteNumber());
protected ResourceLocation func_110796_a(ProjectileBase par1ArrowEntity) {
return this.renderManager.renderEngine.getResourceLocation(
par1ArrowEntity.getEntityItem().getItemSpriteNumber());
}
}
@@ -1,12 +1,13 @@
package tconstruct.weaponry.client.entity;
import tconstruct.weaponry.entity.ShurikenEntity;
import org.lwjgl.opengl.GL11;
import tconstruct.weaponry.entity.ShurikenEntity;
public class ShurikenEntityRenderer extends ProjectileBaseRenderer<ShurikenEntity> {
@Override
public void customRendering(ShurikenEntity entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) {
public void customRendering(
ShurikenEntity entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) {
// make it smaller
GL11.glScalef(0.6F, 0.6F, 0.6F);
@@ -23,8 +24,7 @@ public class ShurikenEntityRenderer extends ProjectileBaseRenderer<ShurikenEntit
// shurikens spin around their center a lot. *spin*
GL11.glRotatef(entity.spin, 0f, 0f, 1f);
// also make it a bit thicker
toolCoreRenderer.setDepth(1/20f);
toolCoreRenderer.setDepth(1 / 20f);
}
}
@@ -1,11 +1,5 @@
package tconstruct.weaponry.client.item;
import tconstruct.client.FlexibleToolRenderer;
import tconstruct.weaponry.TinkerWeaponry;
import tconstruct.weaponry.ammo.ArrowAmmo;
import tconstruct.weaponry.entity.ArrowEntity;
import tconstruct.library.weaponry.ProjectileWeapon;
import tconstruct.library.weaponry.IWindup;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.entity.RenderManager;
@@ -13,7 +7,12 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import org.lwjgl.opengl.GL11;
import tconstruct.weaponry.entity.BoltEntity;
import tconstruct.client.FlexibleToolRenderer;
import tconstruct.library.weaponry.IWindup;
import tconstruct.library.weaponry.ProjectileWeapon;
import tconstruct.weaponry.TinkerWeaponry;
import tconstruct.weaponry.ammo.ArrowAmmo;
import tconstruct.weaponry.entity.ArrowEntity;
public class BowRenderer extends FlexibleToolRenderer {
private static final ArrowEntity dummy = new ArrowEntity(null);
@@ -25,41 +24,35 @@ public class BowRenderer extends FlexibleToolRenderer {
GL11.glTranslatef(0.5f, 0.5f, 0);
GL11.glScalef(0.5f, 0.5f, 0.5f);
if(type == ItemRenderType.EQUIPPED)
{
//GL11.glTranslatef(0.0F, 0.125F, 0.3125F);
if (type == ItemRenderType.EQUIPPED) {
// GL11.glTranslatef(0.0F, 0.125F, 0.3125F);
GL11.glTranslatef(0.2F, -0.4F, 0.2f);
GL11.glRotatef(-20.0F, 0.0F, 1.0F, 0.0F);
//GL11.glScalef(f1, -f1, f1);
//GL11.glRotatef(-100.0F, 1.0F, 0.0F, 0.0F);
// GL11.glScalef(f1, -f1, f1);
// GL11.glRotatef(-100.0F, 1.0F, 0.0F, 0.0F);
GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F);
}
// windup animation
if(type == ItemRenderType.EQUIPPED_FIRST_PERSON && player.isUsingItem())
{
if (type == ItemRenderType.EQUIPPED_FIRST_PERSON && player.isUsingItem()) {
float progress = ((IWindup) item.getItem()).getWindupProgress(item, player);
//GL11.glScalef(1.2f, 1.2f, 1.2f);
//float progress = ((IWindup) item.getItem()).getWindupProgress(item, Minecraft.getMinecraft().thePlayer);;
// GL11.glScalef(1.2f, 1.2f, 1.2f);
// float progress = ((IWindup) item.getItem()).getWindupProgress(item, Minecraft.getMinecraft().thePlayer);;
GL11.glRotatef(-18.0F, 0.0F, 0.0F, 1.0F); // tilts the bow forward a bit
GL11.glRotatef(-6.0F, 0.0F, 1.0F, 0.0F); // rotates the bow so it faces more forward
GL11.glRotatef(8.0F, 1.0F, 0.0F, 0.0F); // rotates the bow forward
GL11.glTranslatef(-0.9F, 0.2F, -1.0F);
// this does the "zoom closer to the bow" thing
GL11.glTranslatef(progress * -0.1f, progress * -0.125f, 0.0F);
// we're crazy, so.. render the arrow =D
ItemStack ammo = ((ProjectileWeapon) item.getItem()).searchForAmmo(player, item); // we know it's a projectile weapon, it's a bow!
if(ammo != null) {
if(ammo.getItem() == Items.arrow)
dummy.returnStack = ArrowAmmo.vanillaArrow;
else
dummy.returnStack = ammo;
ItemStack ammo = ((ProjectileWeapon) item.getItem())
.searchForAmmo(player, item); // we know it's a projectile weapon, it's a bow!
if (ammo != null) {
if (ammo.getItem() == Items.arrow) dummy.returnStack = ArrowAmmo.vanillaArrow;
else dummy.returnStack = ammo;
Render renderer = RenderManager.instance.getEntityClassRenderObject(ArrowEntity.class);
GL11.glPushMatrix();
@@ -79,16 +72,14 @@ public class BowRenderer extends FlexibleToolRenderer {
renderer.doRender(dummy, 0, 0, 0, 0, 0);
GL11.glPopMatrix();
}
}
else if(type == ItemRenderType.EQUIPPED && player.isUsingItem())
{
} else if (type == ItemRenderType.EQUIPPED && player.isUsingItem()) {
// we're crazy, so.. render the arrow =D
ItemStack ammo = ((ProjectileWeapon) item.getItem()).searchForAmmo(player, item); // we know it's a projectile weapon, it's a bow!
if(ammo != null) {
if(ammo.getItem() == Items.arrow || !(ammo.getItem() instanceof ArrowAmmo))
ItemStack ammo = ((ProjectileWeapon) item.getItem())
.searchForAmmo(player, item); // we know it's a projectile weapon, it's a bow!
if (ammo != null) {
if (ammo.getItem() == Items.arrow || !(ammo.getItem() instanceof ArrowAmmo))
dummy.returnStack = ArrowAmmo.vanillaArrow;
else
dummy.returnStack = ammo;
else dummy.returnStack = ammo;
Render renderer = RenderManager.instance.getEntityClassRenderObject(ArrowEntity.class);
GL11.glPushMatrix();
@@ -110,11 +101,8 @@ public class BowRenderer extends FlexibleToolRenderer {
}
}
if(item.getItem() == TinkerWeaponry.longbow)
GL11.glScalef(2.3f, 2.3f, 1.0f);
else if(item.getItem() == TinkerWeaponry.shortbow)
GL11.glScalef(1.7f, 1.7f, 1.0f);
if (item.getItem() == TinkerWeaponry.longbow) GL11.glScalef(2.3f, 2.3f, 1.0f);
else if (item.getItem() == TinkerWeaponry.shortbow) GL11.glScalef(1.7f, 1.7f, 1.0f);
GL11.glTranslatef(-0.5f, -0.5f, 0f);
}
@@ -1,17 +1,16 @@
package tconstruct.weaponry.client.item;
import tconstruct.client.FlexibleToolRenderer;
import tconstruct.weaponry.TinkerWeaponry;
import tconstruct.weaponry.ammo.BoltAmmo;
import tconstruct.weaponry.entity.ArrowEntity;
import tconstruct.weaponry.entity.BoltEntity;
import tconstruct.weaponry.weapons.Crossbow;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import org.lwjgl.opengl.GL11;
import tconstruct.client.FlexibleToolRenderer;
import tconstruct.weaponry.TinkerWeaponry;
import tconstruct.weaponry.ammo.BoltAmmo;
import tconstruct.weaponry.entity.BoltEntity;
import tconstruct.weaponry.weapons.Crossbow;
public class CrossbowRenderer extends FlexibleToolRenderer {
private static final BoltEntity dummy = new BoltEntity(null);
@@ -19,44 +18,41 @@ public class CrossbowRenderer extends FlexibleToolRenderer {
@Override
protected void specialAnimation(ItemRenderType type, ItemStack item) {
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
Crossbow crossbow = (Crossbow)item.getItem();
Crossbow crossbow = (Crossbow) item.getItem();
GL11.glTranslatef(0.5f, 0.5f, 0);
GL11.glScalef(0.5f, 0.5f, 0.5f);
GL11.glScalef(1.5f, 1.5f, 1.5f);
if(type == ItemRenderType.EQUIPPED_FIRST_PERSON) {
if (type == ItemRenderType.EQUIPPED_FIRST_PERSON) {
// we're crazy, so.. render the arrow =D
ItemStack ammo = crossbow.getLoadedAmmo(item);
if(crossbow.isLoaded(item))
{
if (crossbow.isLoaded(item)) {
GL11.glTranslatef(0.0f, 0.0f, -0.3f);
GL11.glRotatef(80f, 1f, 0f, 0f);
GL11.glRotatef(15f, 0f, 1f, 0f);
GL11.glRotatef(-20, 0, 0, 1);
}
else {
} else {
GL11.glScalef(1.1f, 1.1f, 1.1f);
GL11.glTranslatef(0.1f, 0f, 0f);
GL11.glRotatef(50f, 1f, 0f, 0f);
}
if(ammo != null && ammo.hasTagCompound()) {
//float progress = crossbow.getWindupProgress(item, player);
if (ammo != null && ammo.hasTagCompound()) {
// float progress = crossbow.getWindupProgress(item, player);
float progress = 1f;
dummy.returnStack = ammo;
if(!(ammo.getItem() instanceof BoltAmmo))
dummy.returnStack = TinkerWeaponry.creativeBolt;
if (!(ammo.getItem() instanceof BoltAmmo)) dummy.returnStack = TinkerWeaponry.creativeBolt;
Render renderer = RenderManager.instance.getEntityClassRenderObject(BoltEntity.class);
GL11.glPushMatrix();
// adjust position
//GL11.glScalef(2, 2, 2); // bigger
// GL11.glScalef(2, 2, 2); // bigger
GL11.glRotatef(95, 0, 1, 0); // rotate it into the same direction as the bow
//GL11.glRotatef(15, 0, 1, 0); // rotate it a bit more so it's not directly inside the bow
// GL11.glRotatef(15, 0, 1, 0); // rotate it a bit more so it's not directly inside the bow
GL11.glRotatef(-45, 1, 0, 0); // sprite is rotated by 45° in the graphics, correct that
GL11.glTranslatef(0.05f, 0, 0); // same as the not-inside-bow-rotation
@@ -71,9 +67,7 @@ public class CrossbowRenderer extends FlexibleToolRenderer {
}
}
if(type == ItemRenderType.EQUIPPED)
{
if (type == ItemRenderType.EQUIPPED) {
GL11.glTranslatef(0.25f, 0, 0);
GL11.glRotatef(45.0F, 0.0F, 0.0F, 1.0F);
}
@@ -1,10 +1,10 @@
package tconstruct.weaponry.client.item;
import tconstruct.client.AmmoItemRenderer;
import tconstruct.library.weaponry.IWindup;
import net.minecraft.client.Minecraft;
import net.minecraft.item.ItemStack;
import org.lwjgl.opengl.GL11;
import tconstruct.client.AmmoItemRenderer;
import tconstruct.library.weaponry.IWindup;
public class JavelinRenderer extends AmmoItemRenderer {
@@ -13,16 +13,15 @@ public class JavelinRenderer extends AmmoItemRenderer {
GL11.glTranslatef(0.5f, 0.5f, 0);
GL11.glScalef(0.5f, 0.5f, 0.5f);
float progress = ((IWindup)item.getItem()).getWindupProgress(item, Minecraft.getMinecraft().thePlayer); // 0.5 while not winding
float progress = ((IWindup) item.getItem())
.getWindupProgress(item, Minecraft.getMinecraft().thePlayer); // 0.5 while not winding
if(type == ItemRenderType.EQUIPPED)
GL11.glRotatef(90, 0, 0, 1);
if (type == ItemRenderType.EQUIPPED) GL11.glRotatef(90, 0, 0, 1);
GL11.glRotatef(-45, 0, 0, 1);
GL11.glScalef(1.5F, 2F, 1.5F);
if(type == ItemRenderType.EQUIPPED_FIRST_PERSON)
GL11.glTranslatef(0, progress * 0.4f, 0);
if (type == ItemRenderType.EQUIPPED_FIRST_PERSON) GL11.glTranslatef(0, progress * 0.4f, 0);
GL11.glRotatef(45, 0, 0, 1);
GL11.glTranslatef(-0.5f, -0.5f, 0f);
@@ -1,7 +1,5 @@
package tconstruct.weaponry.client.item;
import tconstruct.client.AmmoItemRenderer;
import tconstruct.library.weaponry.IWindup;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.entity.RenderPlayer;
@@ -9,6 +7,8 @@ import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.item.ItemStack;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import tconstruct.client.AmmoItemRenderer;
import tconstruct.library.weaponry.IWindup;
public class ThrowingKnifeRenderer extends AmmoItemRenderer {
private static Minecraft mc = Minecraft.getMinecraft();
@@ -18,15 +18,15 @@ public class ThrowingKnifeRenderer extends AmmoItemRenderer {
GL11.glTranslatef(0.5f, 0.5f, 0);
GL11.glScalef(0.5f, 0.5f, 0.5f);
float progress = ((IWindup)item.getItem()).getWindupProgress(item, mc.thePlayer);
float progress = ((IWindup) item.getItem()).getWindupProgress(item, mc.thePlayer);
if(type == ItemRenderType.EQUIPPED_FIRST_PERSON) {
if (type == ItemRenderType.EQUIPPED_FIRST_PERSON) {
GL11.glPushMatrix();
GL11.glScalef(2.5f, 2.5f, 2.5f);
// rotate it, otherwise it's drawn over our item :(
GL11.glTranslatef(0.5f, -0.6f, 0f);
//GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F);
//GL11.glRotatef(-85.0F, 0.0F, 0.0F, 1.0F);
// GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F);
// GL11.glRotatef(-85.0F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(-25.0F, 0.0F, 0.0F, 1.0F);
@@ -41,22 +41,21 @@ public class ThrowingKnifeRenderer extends AmmoItemRenderer {
mc.getTextureManager().bindTexture(TextureMap.locationItemsTexture);
// rotate it aroooound
//GL11.glRotatef(-180, 0, 0, 1);
//GL11.glTranslatef(0.5f, -0.6f, 0f);
//GL11.glRotatef(-25.0F, 0.0F, 0.0F, 1.0F);
// GL11.glRotatef(-180, 0, 0, 1);
// GL11.glTranslatef(0.5f, -0.6f, 0f);
// GL11.glRotatef(-25.0F, 0.0F, 0.0F, 1.0F);
GL11.glTranslatef(1.3f, 0.4f, -0.2f);
//GL11.glTranslatef(-0.5f, 0.6f, 0f);
//GL11.glTranslatef(0.f, 1f, 0f);
//GL11.glTranslatef(progress * -1.5f, 0.0f, 0f);
// GL11.glTranslatef(-0.5f, 0.6f, 0f);
// GL11.glTranslatef(0.f, 1f, 0f);
// GL11.glTranslatef(progress * -1.5f, 0.0f, 0f);
GL11.glTranslatef(0.0f, -1.85f, 0f);
GL11.glRotatef(progress * 35.0F, 0.0F, 0.0F, 1.0F);
GL11.glTranslatef(0.0f, 1.85f, 0f);
GL11.glRotatef(progress * -15.0F, 0.0F, 0.0F, 1.0F);
//GL11.glTranslatef(-0.f, -1f, 0f);
//GL11.glTranslatef(0.5f, -0.6f, 0f);
// GL11.glTranslatef(-0.f, -1f, 0f);
// GL11.glTranslatef(0.5f, -0.6f, 0f);
GL11.glScalef(1.5f, 1.5f, 1.5f);
@@ -65,9 +64,7 @@ public class ThrowingKnifeRenderer extends AmmoItemRenderer {
GL11.glRotatef(-25.0F, 0.0F, 0.0F, 1.0F);
}
if(type == ItemRenderType.EQUIPPED)
GL11.glRotatef(-180, 0, 0, 1);
if (type == ItemRenderType.EQUIPPED) GL11.glRotatef(-180, 0, 0, 1);
GL11.glTranslatef(-0.5f, -0.5f, 0f);
}