summaryrefslogtreecommitdiff
path: root/src/main/java/darkknight/jewelrycraft/events
diff options
context:
space:
mode:
authorbculkin2442 <bjculkin@mix.wvu.edu>2018-05-24 16:03:42 -0400
committerbculkin2442 <bjculkin@mix.wvu.edu>2018-05-24 16:03:42 -0400
commit9a4d1e95ea7784f0f98ea2913701a3a3c28aefaa (patch)
treeb4307f58fe2197d2215707bb3f44cf8952229c6d /src/main/java/darkknight/jewelrycraft/events
parent4f7ad220df0438b6f3382110577b53f29da46453 (diff)
Formatting pass
Diffstat (limited to 'src/main/java/darkknight/jewelrycraft/events')
-rwxr-xr-xsrc/main/java/darkknight/jewelrycraft/events/BlockEventHandler.java54
-rwxr-xr-xsrc/main/java/darkknight/jewelrycraft/events/BucketHandler.java25
-rwxr-xr-xsrc/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java730
-rwxr-xr-xsrc/main/java/darkknight/jewelrycraft/events/EventList.java8
-rwxr-xr-xsrc/main/java/darkknight/jewelrycraft/events/KeyBindings.java18
-rwxr-xr-xsrc/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java794
-rwxr-xr-xsrc/main/java/darkknight/jewelrycraft/events/ScreenHandler.java105
-rwxr-xr-xsrc/main/java/darkknight/jewelrycraft/events/TextureEvent.java6
8 files changed, 1129 insertions, 611 deletions
diff --git a/src/main/java/darkknight/jewelrycraft/events/BlockEventHandler.java b/src/main/java/darkknight/jewelrycraft/events/BlockEventHandler.java
index fc4cacc..964ebd2 100755
--- a/src/main/java/darkknight/jewelrycraft/events/BlockEventHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/events/BlockEventHandler.java
@@ -24,27 +24,40 @@ public class BlockEventHandler {
@SubscribeEvent
public void onBlockDestroyed(BlockEvent.BreakEvent event) {
if (event.getPlayer() != null) {
- ItemStack item = event.getPlayer().inventory.getCurrentItem();
- if (event.block instanceof BlockMidasTouch && item != null
- && item.getItem().getHarvestLevel(item,
- "pickaxe") >= event.block.getHarvestLevel(
- event.blockMetadata)) {
- TileEntityMidasTouch te =
- (TileEntityMidasTouch) event.world
- .getTileEntity(event.x, event.y, event.z);
+ ItemStack item = event.getPlayer().inventory
+ .getCurrentItem();
+ if (event.block instanceof BlockMidasTouch
+ && item != null
+ && item.getItem().getHarvestLevel(
+ item,
+ "pickaxe") >= event.block
+ .getHarvestLevel(
+ event.blockMetadata)) {
+ TileEntityMidasTouch te = (TileEntityMidasTouch) event.world
+ .getTileEntity(event.x,
+ event.y,
+ event.z);
if (te.target != null)
- dropItem(te.getWorldObj(), te.xCoord, te.yCoord,
+ dropItem(te.getWorldObj(),
+ te.xCoord,
+ te.yCoord,
te.zCoord,
new ItemStack(Items.gold_nugget,
(int) (te.target.width
- * te.target.height * 100),
+ * te.target.height
+ * 100),
0));
}
- NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(
- event.getPlayer(), Variables.MODID);
+ NBTTagCompound playerInfo = PlayerUtils
+ .getModPlayerPersistTag(
+ event.getPlayer(),
+ Variables.MODID);
for (Curse curse : Curse.getCurseList())
- if (playerInfo.getInteger(curse.getName()) > 0)
- curse.onBlockDestroyed(event.getPlayer(), event);
+ if (playerInfo.getInteger(
+ curse.getName()) > 0)
+ curse.onBlockDestroyed(
+ event.getPlayer(),
+ event);
}
}
@@ -53,17 +66,20 @@ public class BlockEventHandler {
EntityPlayer player = event.harvester;
if (player != null) {
NBTTagCompound playerInfo = PlayerUtils
- .getModPlayerPersistTag(player, Variables.MODID);
+ .getModPlayerPersistTag(player,
+ Variables.MODID);
for (Curse curse : Curse.getCurseList())
- if (playerInfo.getInteger(curse.getName()) > 0)
- curse.onBlockItemsDrop(player, event);
+ if (playerInfo.getInteger(
+ curse.getName()) > 0)
+ curse.onBlockItemsDrop(player,
+ event);
}
}
public void dropItem(World world, double x, double y, double z,
ItemStack stack) {
- EntityItem entityitem =
- new EntityItem(world, x + 0.5D, y + 0.5D, z + 0.5D, stack);
+ EntityItem entityitem = new EntityItem(world, x + 0.5D,
+ y + 0.5D, z + 0.5D, stack);
entityitem.motionX = 0;
entityitem.motionZ = 0;
entityitem.motionY = 0.11000000298023224D;
diff --git a/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java b/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java
index 1b79a0b..13948af 100755
--- a/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java
@@ -31,7 +31,8 @@ public class BucketHandler {
@SubscribeEvent
public void onBucketFill(FillBucketEvent event) {
- ItemStack result = fillCustomBucket(event.world, event.target);
+ ItemStack result = fillCustomBucket(event.world,
+ event.target);
if (result == null)
return;
event.result = result;
@@ -40,7 +41,8 @@ public class BucketHandler {
private ItemStack fillCustomBucket(World world,
MovingObjectPosition pos) {
- Block block = world.getBlock(pos.blockX, pos.blockY, pos.blockZ);
+ Block block = world.getBlock(pos.blockX, pos.blockY,
+ pos.blockZ);
Item bucket = buckets.get(block);
if (bucket != null
&& world.getBlock(pos.blockX, pos.blockY,
@@ -48,14 +50,17 @@ public class BucketHandler {
&& world.getBlock(pos.blockX, pos.blockY,
pos.blockZ) instanceof BlockMoltenMetal) {
ItemStack item = new ItemStack(bucket);
- if (BlockMoltenMetal.getTileEntity(world, pos.blockX,
- pos.blockY, pos.blockZ) != null)
- JewelryNBT.addMetal(item,
- BlockMoltenMetal
- .getTileEntity(world, pos.blockX,
- pos.blockY, pos.blockZ)
- .getMetal());
- world.setBlockToAir(pos.blockX, pos.blockY, pos.blockZ);
+ if (BlockMoltenMetal.getTileEntity(world,
+ pos.blockX, pos.blockY,
+ pos.blockZ) != null)
+ JewelryNBT.addMetal(item, BlockMoltenMetal
+ .getTileEntity(world,
+ pos.blockX,
+ pos.blockY,
+ pos.blockZ)
+ .getMetal());
+ world.setBlockToAir(pos.blockX, pos.blockY,
+ pos.blockZ);
return item;
} else
return null;
diff --git a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java
index 6806f65..e9809d0 100755
--- a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java
@@ -51,64 +51,83 @@ import net.minecraftforge.event.entity.player.PlayerEvent;
import net.minecraftforge.event.entity.player.PlayerSleepInBedEvent;
public class EntityEventHandler {
- int updateTime = 0,
- totalUnavailableCurses = 0, luck = 0;
+ int updateTime = 0, totalUnavailableCurses = 0, luck = 0;
- boolean addedCurses = false;
+ boolean addedCurses = false;
- public static Random rand = new Random();
+ public static Random rand = new Random();
- public static ArrayList<String> types = new ArrayList<String>();
+ public static ArrayList<String> types = new ArrayList<String>();
@SubscribeEvent
public void onEntityJoinWorld(EntityJoinWorldEvent event) {
if (event.entity instanceof EntityPlayer
&& !(event.entity instanceof EntityPlayerMP)) {
- JewelrycraftMod.netWrapper
- .sendToServer(new PacketRequestPlayerInfo());
+ JewelrycraftMod.netWrapper.sendToServer(
+ new PacketRequestPlayerInfo());
}
final Entity entity = event.entity;
- if (!event.world.isRemote && entity instanceof EntityPlayer) {
+ if (!event.world.isRemote
+ && entity instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) entity;
NBTTagCompound persistTag = PlayerUtils
- .getModPlayerPersistTag(player, Variables.MODID);
+ .getModPlayerPersistTag(player,
+ Variables.MODID);
boolean shouldGiveManual = ItemList.guide != null
- && !persistTag.getBoolean("givenGuide");
+ && !persistTag.getBoolean(
+ "givenGuide");
if (shouldGiveManual) {
- ItemStack manual = new ItemStack(ItemList.guide);
-
- if (!player.inventory.addItemStackToInventory(manual)) {
- BlockUtils.dropItemStackInWorld(player.worldObj,
- player.posX, player.posY, player.posZ, manual);
+ ItemStack manual = new ItemStack(
+ ItemList.guide);
+
+ if (!player.inventory
+ .addItemStackToInventory(
+ manual)) {
+ BlockUtils.dropItemStackInWorld(
+ player.worldObj,
+ player.posX,
+ player.posY,
+ player.posZ,
+ manual);
}
persistTag.setBoolean("givenGuide", true);
}
- boolean render = persistTag.getBoolean("fancyRender");
+ boolean render = persistTag
+ .getBoolean("fancyRender");
JewelrycraftMod.fancyRender = render;
if (ConfigHandler.CURSES_ENABLED) {
for (Curse curse : Curse.getCurseList()) {
- if (curse.canCurseBeActivated(event.world)
- && !persistTag.hasKey(curse.getName())) {
- persistTag.setInteger(curse.getName(), 0);
+ if (curse.canCurseBeActivated(
+ event.world)
+ && !persistTag.hasKey(
+ curse.getName())) {
+ persistTag.setInteger(curse
+ .getName(),
+ 0);
}
}
}
for (Curse curse : Curse.getCurseList()) {
- if (!curse.canCurseBeActivated(event.world)) {
- Curse.availableCurses.remove(curse);
- persistTag.setInteger(curse.getName(), 0);
+ if (!curse.canCurseBeActivated(
+ event.world)) {
+ Curse.availableCurses
+ .remove(curse);
+ persistTag.setInteger(
+ curse.getName(),
+ 0);
totalUnavailableCurses++;
- } else if (!Curse.availableCurses.contains(curse))
+ } else if (!Curse.availableCurses
+ .contains(curse))
Curse.availableCurses.add(curse);
}
@@ -151,7 +170,8 @@ public class EntityEventHandler {
EntityPlayer player = (EntityPlayer) entity;
NBTTagCompound playerInfo = PlayerUtils
- .getModPlayerPersistTag(player, Variables.MODID);
+ .getModPlayerPersistTag(player,
+ Variables.MODID);
playerInfo.setBoolean("fancyRender",
JewelrycraftMod.fancyRender);
@@ -161,20 +181,25 @@ public class EntityEventHandler {
}
for (int i = 0; i < 18; i++) {
- if (getJewelryItems(playerInfo, i) != null) {
+ if (getJewelryItems(playerInfo,
+ i) != null) {
if (getJewelryItems(playerInfo, i)
.getItem() instanceof ItemBaseJewelry) {
- ((ItemBaseJewelry) getJewelryItems(playerInfo, i)
- .getItem()).action(
- getJewelryItems(playerInfo, i),
+ ((ItemBaseJewelry) getJewelryItems(
+ playerInfo,
+ i).getItem()).action(
+ getJewelryItems(playerInfo,
+ i),
player);
}
if (getJewelryItems(playerInfo, i)
.getItem() instanceof IJewelryItem) {
- ((IJewelryItem) getJewelryItems(playerInfo, i)
- .getItem()).onWearAction(
- getJewelryItems(playerInfo, i),
+ ((IJewelryItem) getJewelryItems(
+ playerInfo,
+ i).getItem()).onWearAction(
+ getJewelryItems(playerInfo,
+ i),
player);
}
}
@@ -191,11 +216,14 @@ public class EntityEventHandler {
}
if (ConfigHandler.CURSES_ENABLED) {
- for (Curse curse : Curse.getCurseList()) {
- if (curse.canCurseBeActivated(player.worldObj)
- && playerInfo
- .getInteger(curse.getName()) > 0) {
- curse.action(player.worldObj, player);
+ for (Curse curse : Curse
+ .getCurseList()) {
+ if (curse.canCurseBeActivated(
+ player.worldObj)
+ && playerInfo.getInteger(
+ curse.getName()) > 0) {
+ curse.action(player.worldObj,
+ player);
}
}
}
@@ -206,66 +234,84 @@ public class EntityEventHandler {
public void updateCurses(NBTTagCompound playerInfo,
EntityPlayer player) {
if (playerInfo.hasKey("playerCursePointsChanged")
- && playerInfo.getBoolean("playerCursePointsChanged")) {
+ && playerInfo.getBoolean(
+ "playerCursePointsChanged")) {
int points = playerInfo.getInteger("cursePoints");
- int maxCurses = playerInfo.getInteger("cursePoints")
- / Variables.CURSE_POINTS_PER_LEVEL + 1;
-
- if (points > 0
- && playerInfo.getInteger("activeCurses") < maxCurses) {
- while (playerInfo.getInteger("activeCurses") < maxCurses
- && Curse.availableCurses.size() > 0
- && playerInfo.getInteger("activeCurses") < Curse
- .getCurseList().size()) {
+ int maxCurses = playerInfo
+ .getInteger("cursePoints")
+ / Variables.CURSE_POINTS_PER_LEVEL
+ + 1;
+
+ if (points > 0 && playerInfo.getInteger(
+ "activeCurses") < maxCurses) {
+ while (playerInfo.getInteger(
+ "activeCurses") < maxCurses
+ && Curse.availableCurses
+ .size() > 0
+ && playerInfo.getInteger(
+ "activeCurses") < Curse
+ .getCurseList()
+ .size()) {
addCurse(player, playerInfo);
}
}
if (!playerInfo.hasKey("curseTime")
- || !playerInfo.hasKey("reselectCurses")
- || playerInfo.getBoolean("reselectCurses")) {
+ || !playerInfo.hasKey(
+ "reselectCurses")
+ || playerInfo.getBoolean(
+ "reselectCurses")) {
playerInfo.setInteger("curseTime", 23000);
- playerInfo.setBoolean("reselectCurses", false);
+ playerInfo.setBoolean("reselectCurses",
+ false);
}
JewelrycraftMod.netWrapper.sendTo(
- new PacketSendClientPlayerInfo(playerInfo),
+ new PacketSendClientPlayerInfo(
+ playerInfo),
(EntityPlayerMP) player);
if (addedCurses) {
- JewelrycraftMod.netWrapper
- .sendToAll(new PacketSendServerPlayersInfo());
- player.addChatMessage(new ChatComponentText(
- StatCollector.translateToLocal("curse."
- + Variables.MODID + ".activated")));
+ JewelrycraftMod.netWrapper.sendToAll(
+ new PacketSendServerPlayersInfo());
+ player.addChatMessage(
+ new ChatComponentText(
+ StatCollector.translateToLocal(
+ "curse." + Variables.MODID
+ + ".activated")));
addedCurses = false;
}
}
if (playerInfo.getBoolean("playerCursePointsChanged")) {
- playerInfo.setBoolean("playerCursePointsChanged", false);
+ playerInfo.setBoolean("playerCursePointsChanged",
+ false);
}
luck = calculateLuck(player);
}
public void timeUntilYouCanResetCurses(NBTTagCompound playerInfo) {
- if (playerInfo.hasKey("reselectCurses")
- && !playerInfo.getBoolean("reselectCurses")) {
+ if (playerInfo.hasKey("reselectCurses") && !playerInfo
+ .getBoolean("reselectCurses")) {
playerInfo.setInteger("curseTime",
- playerInfo.getInteger("curseTime") - 10000);
+ playerInfo.getInteger("curseTime")
+ - 10000);
if (playerInfo.getInteger("curseTime") <= 0)
- playerInfo.setBoolean("reselectCurses", true);
+ playerInfo.setBoolean("reselectCurses",
+ true);
}
}
- public ItemStack getJewelryItems(NBTTagCompound playerInfo, int i) {
+ public ItemStack getJewelryItems(NBTTagCompound playerInfo,
+ int i) {
if (playerInfo.hasKey("ext" + i)) {
NBTTagCompound nbt = (NBTTagCompound) playerInfo
.getTag("ext" + i);
- ItemStack item = ItemStack.loadItemStackFromNBT(nbt);
+ ItemStack item = ItemStack
+ .loadItemStackFromNBT(nbt);
if (item != null) {
return item;
@@ -277,16 +323,22 @@ public class EntityEventHandler {
@SubscribeEvent
public void onEntityLivingDropItems(LivingDropsEvent event) {
- if (event.source.getEntity() != null
- && event.source.getEntity() instanceof EntityPlayer) {
- EntityPlayer player = (EntityPlayer) event.source.getEntity();
+ if (event.source.getEntity() != null && event.source
+ .getEntity() instanceof EntityPlayer) {
+ EntityPlayer player = (EntityPlayer) event.source
+ .getEntity();
NBTTagCompound playerInfo = PlayerUtils
- .getModPlayerPersistTag(player, Variables.MODID);
+ .getModPlayerPersistTag(player,
+ Variables.MODID);
if (ConfigHandler.CURSES_ENABLED)
for (Curse curse : Curse.getCurseList())
- if (curse.canCurseBeActivated(player.worldObj)
- && playerInfo.getInteger(curse.getName()) > 0)
- curse.entityDropItems(player, event.entityLiving,
+ if (curse.canCurseBeActivated(
+ player.worldObj)
+ && playerInfo.getInteger(
+ curse.getName()) > 0)
+ curse.entityDropItems(
+ player,
+ event.entityLiving,
event.drops);
}
}
@@ -295,130 +347,167 @@ public class EntityEventHandler {
public void onEntityAttacked(LivingAttackEvent event) {
EntityLivingBase entity = event.entityLiving;
- if (event.source.getEntity() != null
- && event.source.getEntity() instanceof EntityLivingBase
- && ((EntityLivingBase) event.source.getEntity())
- .isPotionActive(PotionList.stun))
+ if (event.source.getEntity() != null && event.source
+ .getEntity() instanceof EntityLivingBase
+ && ((EntityLivingBase) event.source
+ .getEntity()).isPotionActive(
+ PotionList.stun))
event.setCanceled(true);
if (entity instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) entity;
NBTTagCompound playerInfo = PlayerUtils
- .getModPlayerPersistTag(player, Variables.MODID);
+ .getModPlayerPersistTag(player,
+ Variables.MODID);
- if (!(event.source.getEntity() instanceof EntityPlayer)
+ if (!(event.source
+ .getEntity() instanceof EntityPlayer)
&& !player.capabilities.isCreativeMode) {
if (!player.worldObj.isRemote)
for (int i = 0; i < 18; i++)
- if (getJewelryItems(playerInfo, i) != null) {
- if (getJewelryItems(playerInfo, i)
- .getItem() instanceof ItemBaseJewelry) {
+ if (getJewelryItems(
+ playerInfo,
+ i) != null) {
+ if (getJewelryItems(
+ playerInfo,
+ i).getItem() instanceof ItemBaseJewelry) {
((ItemBaseJewelry) getJewelryItems(
- playerInfo, i).getItem())
- .onPlayerAttacked(
- getJewelryItems(
- playerInfo,
- i),
- player,
- event.source,
- event.ammount);
+ playerInfo,
+ i).getItem()).onPlayerAttacked(
+ getJewelryItems(playerInfo,
+ i),
+ player,
+ event.source,
+ event.ammount);
if (((ItemBaseJewelry) getJewelryItems(
- playerInfo, i).getItem())
- .onPlayerAttackedCacellable(
- getJewelryItems(
- playerInfo,
- i),
- player,
- event.source,
- event.ammount)) {
- event.setCanceled(true);
+ playerInfo,
+ i).getItem()).onPlayerAttackedCacellable(
+ getJewelryItems(playerInfo,
+ i),
+ player,
+ event.source,
+ event.ammount)) {
+ event.setCanceled(
+ true);
}
}
- if (getJewelryItems(playerInfo, i)
- .getItem() instanceof IJewelryItem) {
- ((IJewelryItem) getJewelryItems(playerInfo,
- i).getItem())
- .onPlayerAttackedAction(
- getJewelryItems(
- playerInfo,
- i),
- player,
- event.source,
- event.ammount);
+ if (getJewelryItems(
+ playerInfo,
+ i).getItem() instanceof IJewelryItem) {
+ ((IJewelryItem) getJewelryItems(
+ playerInfo,
+ i).getItem()).onPlayerAttackedAction(
+ getJewelryItems(playerInfo,
+ i),
+ player,
+ event.source,
+ event.ammount);
}
}
if (ConfigHandler.CURSES_ENABLED) {
- for (Curse curse : Curse.getCurseList()) {
- if (curse.canCurseBeActivated(player.worldObj)
- && playerInfo
- .getInteger(curse.getName()) > 0) {
- curse.attackedAction(player.worldObj, player,
- event, event.source.getEntity());
+ for (Curse curse : Curse
+ .getCurseList()) {
+ if (curse.canCurseBeActivated(
+ player.worldObj)
+ && playerInfo.getInteger(
+ curse.getName()) > 0) {
+ curse.attackedAction(
+ player.worldObj,
+ player,
+ event,
+ event.source.getEntity());
}
}
}
}
removeHearts(event, player, playerInfo);
- JewelrycraftMod.netWrapper
- .sendToAll(new PacketSendServerPlayersInfo());
+ JewelrycraftMod.netWrapper.sendToAll(
+ new PacketSendServerPlayersInfo());
JewelrycraftMod.netWrapper.sendTo(
- new PacketSendClientPlayerInfo(playerInfo),
+ new PacketSendClientPlayerInfo(
+ playerInfo),
(EntityPlayerMP) player);
}
if (event.source.getEntity() instanceof EntityPlayer) {
- EntityPlayer player = (EntityPlayer) event.source.getEntity();
+ EntityPlayer player = (EntityPlayer) event.source
+ .getEntity();
NBTTagCompound playerInfo = PlayerUtils
- .getModPlayerPersistTag(player, Variables.MODID);
+ .getModPlayerPersistTag(player,
+ Variables.MODID);
for (int i = 0; i < 18; i++)
- if (getJewelryItems(playerInfo, i) != null) {
+ if (getJewelryItems(playerInfo,
+ i) != null) {
if (getJewelryItems(playerInfo, i)
.getItem() instanceof ItemBaseJewelry) {
- ((ItemBaseJewelry) getJewelryItems(playerInfo, i)
- .getItem()).onEntityAttacked(
- getJewelryItems(playerInfo, i),
- player, entity, event.ammount);
- if (((ItemBaseJewelry) getJewelryItems(playerInfo,
+ ((ItemBaseJewelry) getJewelryItems(
+ playerInfo,
+ i).getItem()).onEntityAttacked(
+ getJewelryItems(playerInfo,
+ i),
+ player,
+ entity,
+ event.ammount);
+ if (((ItemBaseJewelry) getJewelryItems(
+ playerInfo,
i).getItem()).onEntityAttackedCacellable(
- getJewelryItems(playerInfo, i),
- player, entity, event.ammount))
- event.setCanceled(true);
+ getJewelryItems(playerInfo,
+ i),
+ player,
+ entity,
+ event.ammount))
+ event.setCanceled(
+ true);
}
if (getJewelryItems(playerInfo, i)
.getItem() instanceof IJewelryItem)
- ((IJewelryItem) getJewelryItems(playerInfo, i)
- .getItem()).onEntityAttackedByPlayer(
- getJewelryItems(playerInfo, i),
- player, entity, event.ammount);
+ ((IJewelryItem) getJewelryItems(
+ playerInfo,
+ i).getItem()).onEntityAttackedByPlayer(
+ getJewelryItems(playerInfo,
+ i),
+ player,
+ entity,
+ event.ammount);
}
if (ConfigHandler.CURSES_ENABLED)
for (Curse curse : Curse.getCurseList())
- if (curse.canCurseBeActivated(player.worldObj)
- && playerInfo
- .getInteger(curse.getName()) > 0) {
- curse.attackedByPlayerAction(event,
- entity.worldObj, player, entity);
- if (curse.attackedByPlayerActionCancelable(event,
- player.worldObj, player, entity))
- event.setCanceled(true);
+ if (curse.canCurseBeActivated(
+ player.worldObj)
+ && playerInfo.getInteger(
+ curse.getName()) > 0) {
+ curse.attackedByPlayerAction(
+ event,
+ entity.worldObj,
+ player,
+ entity);
+ if (curse.attackedByPlayerActionCancelable(
+ event,
+ player.worldObj,
+ player,
+ entity))
+ event.setCanceled(
+ true);
}
- if (entity instanceof EntityHeart && entity.getAge() < 30)
+ if (entity instanceof EntityHeart
+ && entity.getAge() < 30)
event.setCanceled(true);
if (event.source.getEntity() instanceof EntityPlayerMP) {
- JewelrycraftMod.netWrapper
- .sendToAll(new PacketSendServerPlayersInfo());
+ JewelrycraftMod.netWrapper.sendToAll(
+ new PacketSendServerPlayersInfo());
JewelrycraftMod.netWrapper.sendTo(
- new PacketSendClientPlayerInfo(playerInfo),
+ new PacketSendClientPlayerInfo(
+ playerInfo),
(EntityPlayerMP) player);
}
}
}
- public void removeHearts(LivingAttackEvent event, EntityPlayer player,
- NBTTagCompound playerInfo) {
+ public void removeHearts(LivingAttackEvent event,
+ EntityPlayer player, NBTTagCompound playerInfo) {
if (!player.worldObj.isRemote
&& !player.capabilities.isCreativeMode
&& (float) player.hurtResistantTime <= (float) player.maxHurtResistantTime
@@ -428,17 +517,21 @@ public class EntityEventHandler {
}
if (playerInfo.getFloat("BlueHeart") > 0) {
- float damage = playerInfo.getFloat("BlueHeart")
+ float damage = playerInfo
+ .getFloat("BlueHeart")
- event.ammount;
if (damage >= 0) {
- playerInfo.setFloat("BlueHeart", damage);
+ playerInfo.setFloat("BlueHeart",
+ damage);
} else {
- playerInfo.setFloat("BlueHeart", 0f);
+ playerInfo.setFloat("BlueHeart",
+ 0f);
}
if (damage < 0) {
System.out.println(damage);
- player.attackEntityFrom(event.source,
+ player.attackEntityFrom(
+ event.source,
Math.abs(damage));
}
@@ -446,42 +539,56 @@ public class EntityEventHandler {
player.hurtTime = player.maxHurtTime = 10;
player.worldObj.playSoundAtEntity(player,
"game.player.hurt", 1.0F,
- (EntityEventHandler.rand.nextFloat()
- - EntityEventHandler.rand.nextFloat())
- * 0.2F + 1.0F);
+ (EntityEventHandler.rand
+ .nextFloat()
+ - EntityEventHandler.rand
+ .nextFloat())
+ * 0.2F
+ + 1.0F);
event.setCanceled(true);
} else if (playerInfo.getFloat("BlackHeart") > 0) {
AxisAlignedBB axisalignedbb = player.boundingBox
.expand(6.0D, 6.0D, 6.0D);
List<?> enemies = player.worldObj
- .getEntitiesWithinAABBExcludingEntity(player,
+ .getEntitiesWithinAABBExcludingEntity(
+ player,
axisalignedbb,
EntitySelector.selectMonsters);
if (enemies != null && !enemies.isEmpty()
&& event.source != DamageSourceList.blackHeart) {
- Iterator<?> iterator = enemies.iterator();
+ Iterator<?> iterator = enemies
+ .iterator();
while (iterator.hasNext()) {
- Entity enemy = (Entity) iterator.next();
- enemy.attackEntityFrom(DamageSourceList.blackHeart,
+ Entity enemy = (Entity) iterator
+ .next();
+ enemy.attackEntityFrom(
+ DamageSourceList.blackHeart,
6f);
}
}
- float damage = playerInfo.getFloat("BlackHeart")
+ float damage = playerInfo
+ .getFloat("BlackHeart")
- event.ammount;
if (damage >= 0)
- playerInfo.setFloat("BlackHeart", damage);
+ playerInfo.setFloat("BlackHeart",
+ damage);
else
- playerInfo.setFloat("BlackHeart", 0f);
+ playerInfo.setFloat("BlackHeart",
+ 0f);
if (damage < 0)
- player.attackEntityFrom(event.source,
+ player.attackEntityFrom(
+ event.source,
Math.abs(damage));
player.hurtResistantTime = player.maxHurtResistantTime;
player.hurtTime = player.maxHurtTime = 10;
player.worldObj.playSoundAtEntity(player,
"game.player.hurt", 1.0F,
- (EntityEventHandler.rand.nextFloat()
- - EntityEventHandler.rand.nextFloat())
- * 0.2F + 1.0F);
+ (EntityEventHandler.rand
+ .nextFloat()
+ - EntityEventHandler.rand
+ .nextFloat())
+ * 0.2F
+ + 1.0F);
event.setCanceled(true);
}
}
@@ -492,25 +599,36 @@ public class EntityEventHandler {
EntityPlayer player = event.entityPlayer;
if (!player.worldObj.isRemote) {
NBTTagCompound playerInfo = PlayerUtils
- .getModPlayerPersistTag(player, Variables.MODID);
+ .getModPlayerPersistTag(player,
+ Variables.MODID);
if (playerInfo.hasKey("cursePoints")) {
- int points = playerInfo.getInteger("cursePoints");
- int maxCurses = playerInfo.getInteger("cursePoints")
- / Variables.CURSE_POINTS_PER_LEVEL + 1;
- if (points > 0 && playerInfo
- .getInteger("activeCurses") < maxCurses)
- while (playerInfo
- .getInteger("activeCurses") < maxCurses
- && Curse.availableCurses.size() > 0
- && playerInfo
- .getInteger("activeCurses") < Curse
- .getCurseList().size())
+ int points = playerInfo
+ .getInteger("cursePoints");
+ int maxCurses = playerInfo
+ .getInteger("cursePoints")
+ / Variables.CURSE_POINTS_PER_LEVEL
+ + 1;
+ if (points > 0 && playerInfo.getInteger(
+ "activeCurses") < maxCurses)
+ while (playerInfo.getInteger(
+ "activeCurses") < maxCurses
+ && Curse.availableCurses
+ .size() > 0
+ && playerInfo.getInteger(
+ "activeCurses") < Curse
+ .getCurseList()
+ .size())
addCurse(player, playerInfo);
if (!playerInfo.hasKey("curseTime")
- || !playerInfo.hasKey("reselectCurses")
- || playerInfo.getBoolean("reselectCurses")) {
- playerInfo.setInteger("curseTime", 23000);
- playerInfo.setBoolean("reselectCurses", false);
+ || !playerInfo.hasKey(
+ "reselectCurses")
+ || playerInfo.getBoolean(
+ "reselectCurses")) {
+ playerInfo.setInteger("curseTime",
+ 23000);
+ playerInfo.setBoolean(
+ "reselectCurses",
+ false);
}
}
playerInfo.setFloat("BlueHeart", 0f);
@@ -518,42 +636,56 @@ public class EntityEventHandler {
playerInfo.setFloat("WhiteHeart", 0f);
if (ConfigHandler.CURSES_ENABLED)
for (Curse curse : Curse.getCurseList())
- if (curse.canCurseBeActivated(player.worldObj)
- && playerInfo.getInteger(curse.getName()) > 0)
- curse.respawnAction(player.worldObj, player);
+ if (curse.canCurseBeActivated(
+ player.worldObj)
+ && playerInfo.getInteger(
+ curse.getName()) > 0)
+ curse.respawnAction(
+ player.worldObj,
+ player);
for (int i = 0; i < 18; i++)
- if (getJewelryItems(playerInfo, i) != null) {
+ if (getJewelryItems(playerInfo,
+ i) != null) {
if (getJewelryItems(playerInfo, i)
.getItem() instanceof ItemBaseJewelry)
- ((ItemBaseJewelry) getJewelryItems(playerInfo, i)
- .getItem()).onPlayerRespawn(
- getJewelryItems(playerInfo, i),
+ ((ItemBaseJewelry) getJewelryItems(
+ playerInfo,
+ i).getItem()).onPlayerRespawn(
+ getJewelryItems(playerInfo,
+ i),
event);
if (getJewelryItems(playerInfo, i)
.getItem() instanceof IJewelryItem)
- ((IJewelryItem) getJewelryItems(playerInfo, i)
- .getItem()).onPlayerRespawnAction(
- getJewelryItems(playerInfo, i),
+ ((IJewelryItem) getJewelryItems(
+ playerInfo,
+ i).getItem()).onPlayerRespawnAction(
+ getJewelryItems(playerInfo,
+ i),
event);
}
JewelrycraftMod.netWrapper.sendTo(
- new PacketSendClientPlayerInfo(playerInfo),
+ new PacketSendClientPlayerInfo(
+ playerInfo),
(EntityPlayerMP) player);
if (addedCurses) {
- JewelrycraftMod.netWrapper
- .sendToAll(new PacketSendServerPlayersInfo());
+ JewelrycraftMod.netWrapper.sendToAll(
+ new PacketSendServerPlayersInfo());
addedCurses = false;
}
}
}
- public void addCurse(EntityPlayer player, NBTTagCompound playerInfo) {
+ public void addCurse(EntityPlayer player,
+ NBTTagCompound playerInfo) {
if (ConfigHandler.CURSES_ENABLED
&& Curse.availableCurses.size() > 0) {
Curse cur = ((WeightedRandomCurse) WeightedRandom
- .getRandomItem(rand, JewelrycraftUtil
- .getCurses(player.worldObj, player, rand)))
- .getCurse(rand);
+ .getRandomItem(rand,
+ JewelrycraftUtil.getCurses(
+ player.worldObj,
+ player,
+ rand))).getCurse(
+ rand);
playerInfo.setInteger(cur.getName(), 1);
Curse.availableCurses.remove(cur);
addedCurses = true;
@@ -561,11 +693,14 @@ public class EntityEventHandler {
playerInfo.setInteger("activeCurses", 1);
else
playerInfo.setInteger("activeCurses",
- playerInfo.getInteger("activeCurses") + 1);
- JewelrycraftMod.netWrapper
- .sendToAll(new PacketSendServerPlayersInfo());
+ playerInfo.getInteger(
+ "activeCurses")
+ + 1);
+ JewelrycraftMod.netWrapper.sendToAll(
+ new PacketSendServerPlayersInfo());
JewelrycraftMod.netWrapper.sendTo(
- new PacketSendClientPlayerInfo(playerInfo),
+ new PacketSendClientPlayerInfo(
+ playerInfo),
(EntityPlayerMP) player);
}
}
@@ -573,30 +708,38 @@ public class EntityEventHandler {
@SubscribeEvent
public void itemToss(ItemTossEvent event) {
NBTTagCompound playerInfo = PlayerUtils
- .getModPlayerPersistTag(event.player, Variables.MODID);
+ .getModPlayerPersistTag(event.player,
+ Variables.MODID);
if (ConfigHandler.CURSES_ENABLED)
for (Curse curse : Curse.getCurseList())
- if (event.player != null
- && curse.canCurseBeActivated(event.player.worldObj)
- && playerInfo.getInteger(curse.getName()) > 0
+ if (event.player != null && curse
+ .canCurseBeActivated(
+ event.player.worldObj)
+ && playerInfo.getInteger(
+ curse.getName()) > 0
&& curse.itemToss()) {
EntityItem entityitem = new EntityItem(
event.player.worldObj,
- event.player.posX + 0.5D,
- event.player.posY + 0.5D,
- event.player.posZ + 0.5D,
+ event.player.posX
+ + 0.5D,
+ event.player.posY
+ + 0.5D,
+ event.player.posZ
+ + 0.5D,
event.entityItem.getEntityItem());
if (entityitem != null) {
entityitem.motionX = 0;
entityitem.motionZ = 0;
entityitem.motionY = 0.11000000298023224D;
event.player.worldObj
- .spawnEntityInWorld(entityitem);
+ .spawnEntityInWorld(
+ entityitem);
MinecraftServer.getServer()
.getConfigurationManager()
- .sendChatMsg(new ChatComponentText("<"
- + event.player.getDisplayName()
- + "> I shouldn't drop this. I might need it later."));
+ .sendChatMsg(new ChatComponentText(
+ "<" + event.player
+ .getDisplayName()
+ + "> I shouldn't drop this. I might need it later."));
event.setCanceled(true);
}
}
@@ -606,18 +749,21 @@ public class EntityEventHandler {
public void playerFileSave(PlayerEvent.SaveToFile event) {
if (event.entity instanceof EntityPlayer
&& !(event.entity instanceof EntityPlayerMP))
- JewelrycraftMod.netWrapper
- .sendToServer(new PacketRequestPlayerInfo());
+ JewelrycraftMod.netWrapper.sendToServer(
+ new PacketRequestPlayerInfo());
}
public int calculateLuck(EntityPlayer player) {
int luck = 0;
NBTTagCompound playerInfo = PlayerUtils
- .getModPlayerPersistTag(player, Variables.MODID);
+ .getModPlayerPersistTag(player,
+ Variables.MODID);
if (ConfigHandler.CURSES_ENABLED)
for (Curse curse : Curse.getCurseList())
- if (curse.canCurseBeActivated(player.worldObj)
- && playerInfo.getInteger(curse.getName()) > 0)
+ if (curse.canCurseBeActivated(
+ player.worldObj)
+ && playerInfo.getInteger(
+ curse.getName()) > 0)
luck += curse.luck();
return luck;
}
@@ -628,28 +774,35 @@ public class EntityEventHandler {
if (rand.nextInt(chance) == 0 && live
.getCreatureAttribute() != JewelrycraftUtil.HEARTS) {
if (type == "White") {
- EntityHeart h = new EntityHalfHeart(live.worldObj);
+ EntityHeart h = new EntityHalfHeart(
+ live.worldObj);
h.setType(type);
- h.setLocationAndAngles(live.posX, live.posY, live.posZ,
+ h.setLocationAndAngles(live.posX,
+ live.posY, live.posZ,
MathHelper.wrapAngleTo180_float(
rand.nextFloat() * 360.0F),
0.0F);
live.worldObj.spawnEntityInWorld(h);
} else {
- for (int i = 1;
- i <= 1 + rand.nextInt(
- 1 + (int) (live.getMaxHealth() / 2));
- i++) {
+ for (int i = 1; i <= 1 + rand.nextInt(1
+ + (int) (live.getMaxHealth()
+ / 2)); i++) {
EntityHeart[] hearts = {
new EntityHeart(live.worldObj),
- new EntityHalfHeart(entity.worldObj) };
- EntityHeart h = hearts[rand.nextInt(2)];
+ new EntityHalfHeart(
+ entity.worldObj)
+ };
+ EntityHeart h = hearts[rand
+ .nextInt(2)];
h.setType(type);
- h.setLocationAndAngles(live.posX, live.posY, live.posZ,
+ h.setLocationAndAngles(live.posX,
+ live.posY,
+ live.posZ,
MathHelper.wrapAngleTo180_float(
rand.nextFloat() * 360.0F),
0.0F);
- live.worldObj.spawnEntityInWorld(h);
+ live.worldObj.spawnEntityInWorld(
+ h);
}
}
}
@@ -658,44 +811,64 @@ public class EntityEventHandler {
@SubscribeEvent
public void onEntityDead(LivingDeathEvent event) {
final Entity entity = event.entity;
- if (!entity.worldObj.isRemote && !(entity instanceof EntityPlayer)
+ if (!entity.worldObj.isRemote
+ && !(entity instanceof EntityPlayer)
&& entity instanceof EntityLiving
&& event.source.getEntity() != null
&& event.source.getEntity() instanceof EntityPlayer) {
System.out.println(luck);
spawnHearts(entity, Math.max(2, 20 - luck));
- EntityPlayer player = (EntityPlayer) event.source.getEntity();
+ EntityPlayer player = (EntityPlayer) event.source
+ .getEntity();
NBTTagCompound playerInfo = PlayerUtils
- .getModPlayerPersistTag(player, Variables.MODID);
+ .getModPlayerPersistTag(player,
+ Variables.MODID);
if (ConfigHandler.CURSES_ENABLED)
for (Curse curse : Curse.getCurseList())
- if (curse.canCurseBeActivated(player.worldObj)
- && playerInfo.getInteger(curse.getName()) > 0)
- curse.entityDeathAction(player.worldObj,
- event.entityLiving, player);
+ if (curse.canCurseBeActivated(
+ player.worldObj)
+ && playerInfo.getInteger(
+ curse.getName()) > 0)
+ curse.entityDeathAction(
+ player.worldObj,
+ event.entityLiving,
+ player);
}
if (entity instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) entity;
NBTTagCompound playerInfo = PlayerUtils
- .getModPlayerPersistTag(player, Variables.MODID);
+ .getModPlayerPersistTag(player,
+ Variables.MODID);
playerInfo.setFloat("BlueHeart", 0f);
playerInfo.setFloat("BlackHeart", 0f);
playerInfo.setFloat("WhiteHeart", 0f);
if (playerInfo.hasKey("reselectCurses")
- && playerInfo.getBoolean("reselectCurses")) {
+ && playerInfo.getBoolean(
+ "reselectCurses")) {
playerInfo.setInteger("activeCurses", 0);
if (ConfigHandler.CURSES_ENABLED)
- for (Curse l : Curse.getCurseList()) {
- if (l.canCurseBeActivated(player.worldObj)
- && playerInfo
- .getInteger(l.getName()) == 1) {
- playerInfo.setInteger(l.getName(), 0);
- l.setTicksActive(0);
- if (!Curse.availableCurses.contains(l))
- Curse.availableCurses.add(l);
- } else if (l.canCurseBeActivated(player.worldObj)
- && playerInfo.getInteger(l.getName()) >= 2)
- playerInfo.setInteger(l.getName(), 1);
+ for (Curse l : Curse
+ .getCurseList()) {
+ if (l.canCurseBeActivated(
+ player.worldObj)
+ && playerInfo.getInteger(
+ l.getName()) == 1) {
+ playerInfo.setInteger(
+ l.getName(),
+ 0);
+ l.setTicksActive(
+ 0);
+ if (!Curse.availableCurses
+ .contains(l))
+ Curse.availableCurses
+ .add(l);
+ } else if (l.canCurseBeActivated(
+ player.worldObj)
+ && playerInfo.getInteger(
+ l.getName()) >= 2)
+ playerInfo.setInteger(
+ l.getName(),
+ 1);
}
if (entity.worldObj.isRemote)
JewelrycraftMod.netWrapper
@@ -704,32 +877,43 @@ public class EntityEventHandler {
if (ConfigHandler.CURSES_ENABLED) {
for (Curse curse : Curse.getCurseList())
- if (curse.canCurseBeActivated(player.worldObj)
- && playerInfo.getInteger(curse.getName()) > 0)
- curse.playerDeathAction(player.worldObj, player,
+ if (curse.canCurseBeActivated(
+ player.worldObj)
+ && playerInfo.getInteger(
+ curse.getName()) > 0)
+ curse.playerDeathAction(
+ player.worldObj,
+ player,
event);
}
for (int i = 0; i < 18; i++)
- if (getJewelryItems(playerInfo, i) != null) {
+ if (getJewelryItems(playerInfo,
+ i) != null) {
if (getJewelryItems(playerInfo, i)
.getItem() instanceof ItemBaseJewelry)
- ((ItemBaseJewelry) getJewelryItems(playerInfo, i)
- .getItem()).onPlayerDead(
- getJewelryItems(playerInfo, i),
- player, event.source);
+ ((ItemBaseJewelry) getJewelryItems(
+ playerInfo,
+ i).getItem()).onPlayerDead(
+ getJewelryItems(playerInfo,
+ i),
+ player,
+ event.source);
if (getJewelryItems(playerInfo, i)
.getItem() instanceof IJewelryItem)
- ((IJewelryItem) getJewelryItems(playerInfo, i)
- .getItem()).onPlayerDeadAction(
- getJewelryItems(playerInfo, i),
- player, event.source);
+ ((IJewelryItem) getJewelryItems(
+ playerInfo,
+ i).getItem()).onPlayerDeadAction(
+ getJewelryItems(playerInfo,
+ i),
+ player,
+ event.source);
}
}
if (event.entity instanceof EntityPlayer
&& !(event.entity instanceof EntityPlayerMP))
- JewelrycraftMod.netWrapper
- .sendToServer(new PacketRequestPlayerInfo());
+ JewelrycraftMod.netWrapper.sendToServer(
+ new PacketRequestPlayerInfo());
}
@SubscribeEvent
@@ -737,30 +921,40 @@ public class EntityEventHandler {
if (event.entity instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) event.entity;
NBTTagCompound playerInfo = PlayerUtils
- .getModPlayerPersistTag(player, Variables.MODID);
+ .getModPlayerPersistTag(player,
+ Variables.MODID);
if (ConfigHandler.CURSES_ENABLED) {
for (Curse curse : Curse.getCurseList())
- if (curse.canCurseBeActivated(player.worldObj)
- && playerInfo.getInteger(curse.getName()) > 0)
- curse.playerHealAction(player.worldObj, player,
+ if (curse.canCurseBeActivated(
+ player.worldObj)
+ && playerInfo.getInteger(
+ curse.getName()) > 0)
+ curse.playerHealAction(
+ player.worldObj,
+ player,
event);
}
}
}
-
+
@SubscribeEvent
public void onPlayerSleep(PlayerSleepInBedEvent event) {
if (event.entity instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) event.entity;
NBTTagCompound playerInfo = PlayerUtils
- .getModPlayerPersistTag(player, Variables.MODID);
+ .getModPlayerPersistTag(player,
+ Variables.MODID);
if (ConfigHandler.CURSES_ENABLED) {
for (Curse curse : Curse.getCurseList())
- if (curse.canCurseBeActivated(player.worldObj)
- && playerInfo.getInteger(curse.getName()) > 0)
- curse.playerSleepAction(player.worldObj, player,
+ if (curse.canCurseBeActivated(
+ player.worldObj)
+ && playerInfo.getInteger(
+ curse.getName()) > 0)
+ curse.playerSleepAction(
+ player.worldObj,
+ player,
event);
}
}
diff --git a/src/main/java/darkknight/jewelrycraft/events/EventList.java b/src/main/java/darkknight/jewelrycraft/events/EventList.java
index 2098345..17f6d0e 100755
--- a/src/main/java/darkknight/jewelrycraft/events/EventList.java
+++ b/src/main/java/darkknight/jewelrycraft/events/EventList.java
@@ -21,10 +21,11 @@ import net.minecraftforge.common.MinecraftForge;
public class EventList {
public static void preInit(FMLPreInitializationEvent e) {
- MinecraftForge.EVENT_BUS.register(new EntityEventHandler());
+ MinecraftForge.EVENT_BUS
+ .register(new EntityEventHandler());
MinecraftForge.EVENT_BUS.register(new BlockEventHandler());
MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE);
-
+
FMLCommonHandler.instance().bus()
.register(new EventCommonHandler());
BucketHandler.INSTANCE.buckets.put(BlockList.moltenMetal,
@@ -36,7 +37,8 @@ public class EventList {
GameRegistry.registerWorldGenerator(new Generation(), 0);
JewelrycraftMod.proxy.init();
new GuiHandler();
- FMLCommonHandler.instance().bus().register(ConfigHandler.INSTANCE);
+ FMLCommonHandler.instance().bus()
+ .register(ConfigHandler.INSTANCE);
}
public static void postInit(FMLPostInitializationEvent e) {
diff --git a/src/main/java/darkknight/jewelrycraft/events/KeyBindings.java b/src/main/java/darkknight/jewelrycraft/events/KeyBindings.java
index c7f5bef..d196a05 100755
--- a/src/main/java/darkknight/jewelrycraft/events/KeyBindings.java
+++ b/src/main/java/darkknight/jewelrycraft/events/KeyBindings.java
@@ -12,11 +12,13 @@ import net.minecraft.client.settings.KeyBinding;
public class KeyBindings {
public static KeyBinding render = new KeyBinding(
- "Pretty Render", Keyboard.KEY_Z, Variables.MODNAME);
+ "Pretty Render", Keyboard.KEY_Z,
+ Variables.MODNAME);
public static KeyBinding inventory = new KeyBinding(
- "Jewelry Inventory", Keyboard.KEY_J, Variables.MODNAME);
- public static KeyBinding curses = new KeyBinding("Curses Tab",
- Keyboard.KEY_C, Variables.MODNAME);
+ "Jewelry Inventory", Keyboard.KEY_J,
+ Variables.MODNAME);
+ public static KeyBinding curses = new KeyBinding(
+ "Curses Tab", Keyboard.KEY_C, Variables.MODNAME);
/**
*
@@ -35,10 +37,10 @@ public class KeyBindings {
if (render.isPressed())
JewelrycraftMod.fancyRender = !JewelrycraftMod.fancyRender;
if (inventory.isPressed())
- JewelrycraftMod.netWrapper
- .sendToServer(new PacketKeyPressEvent(0));
+ JewelrycraftMod.netWrapper.sendToServer(
+ new PacketKeyPressEvent(0));
if (curses.isPressed())
- JewelrycraftMod.netWrapper
- .sendToServer(new PacketKeyPressEvent(1));
+ JewelrycraftMod.netWrapper.sendToServer(
+ new PacketKeyPressEvent(1));
}
} \ No newline at end of file
diff --git a/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java b/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java
index 4bbb2c5..40be3e5 100755
--- a/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java
@@ -23,56 +23,66 @@ import net.minecraftforge.client.event.RenderHandEvent;
import net.minecraftforge.client.event.RenderPlayerEvent;
public class PlayerRenderHandler {
- EarringsRender earrings = new EarringsRender();
- BraceletRender bracelet = new BraceletRender();
- NecklaceRender necklace = new NecklaceRender();
- RingRender ring = new RingRender();
+ EarringsRender earrings = new EarringsRender();
+ BraceletRender bracelet = new BraceletRender();
+ NecklaceRender necklace = new NecklaceRender();
+ RingRender ring = new RingRender();
public static NBTTagCompound playersInfo = new NBTTagCompound();
- float size = 0.055F;
+ float size = 0.055F;
@SubscribeEvent
public void renderScreen(RenderPlayerEvent.Specials.Post event) {
GL11.glPushMatrix();
- ModelRenderer rightArm =
- event.renderer.modelBipedMain.bipedRightArm;
+ ModelRenderer rightArm = event.renderer.modelBipedMain.bipedRightArm;
ModelRenderer leftArm = event.renderer.modelBipedMain.bipedLeftArm;
ModelRenderer head = event.renderer.modelBipedMain.bipedHead;
ModelRenderer body = event.renderer.modelBipedMain.bipedBody;
- Iterator<EntityPlayer> players =
- event.entityPlayer.worldObj.playerEntities.iterator();
+ Iterator<EntityPlayer> players = event.entityPlayer.worldObj.playerEntities
+ .iterator();
float rotAngleX = 0F, rotAngleY = 0F, rotAngleZ = 0F;
if (playersInfo != null) {
while (players.hasNext()) {
- int[] gemColor = { -1, -1, -1, -1 };
- int[] ingotColor = { -1, -1, -1, -1 };
+ int[] gemColor = {
+ -1, -1, -1, -1
+ };
+ int[] ingotColor = {
+ -1, -1, -1, -1
+ };
int gem = -1;
int ingot = -1;
EntityPlayer player = players.next();
NBTTagCompound playerInfo = (NBTTagCompound) playersInfo
.getTag(player.getDisplayName());
if (ConfigHandler.CURSES_ENABLED)
- for (Curse curse : Curse.getCurseList())
- if (curse != null
- && curse.canCurseBeActivated(
+ for (Curse curse : Curse
+ .getCurseList())
+ if (curse != null && curse
+ .canCurseBeActivated(
player.worldObj)
&& playerInfo != null
&& curse.getName() != null
- && playerInfo
- .getInteger(curse.getName()) > 0
+ && playerInfo.getInteger(
+ curse.getName()) > 0
&& event.entityPlayer != null
&& player != null
- && event.entityPlayer.getDisplayName()
+ && event.entityPlayer
+ .getDisplayName()
.equals(player.getDisplayName())
- && playerInfo
- .getInteger("cursePoints") > 0)
- curse.playerRender(player, event);
+ && playerInfo.getInteger(
+ "cursePoints") > 0)
+ curse.playerRender(
+ player,
+ event);
int no = 0;
ModelRenderer arm = rightArm;
for (int i = 0; i <= 9; i++)
- if (playerInfo != null && event.entityPlayer != null
+ if (playerInfo != null
+ && event.entityPlayer != null
&& player != null
- && playerInfo.hasKey("ext" + i)
- && event.entityPlayer.getDisplayName()
+ && playerInfo.hasKey(
+ "ext" + i)
+ && event.entityPlayer
+ .getDisplayName()
.equals(player.getDisplayName())) {
gem = -1;
ingot = -1;
@@ -81,268 +91,426 @@ public class PlayerRenderHandler {
float s = 0.055F;
NBTTagCompound nbt = (NBTTagCompound) playerInfo
.getTag("ext" + i);
- ItemStack item =
- ItemStack.loadItemStackFromNBT(nbt);
+ ItemStack item = ItemStack
+ .loadItemStackFromNBT(
+ nbt);
if (Loader.isModLoaded(
"alpaca") /*
- * &&
- * fiskfille.alpaca.AlpacaAPI.
- * isAlpacaClient(event.
- * entityPlayer)
- */)
+ * &&
+ * fiskfille
+ * .
+ * alpaca
+ * .
+ * AlpacaAPI.
+ * isAlpacaClient
+ * (
+ * event.
+ * entityPlayer)
+ */)
arm = body;
GL11.glPushMatrix();
if (arm.rotateAngleX == 0.0F
&& arm.rotateAngleY == 0.0F
&& arm.rotateAngleZ == 0.0F) {
- if ((arm.rotationPointX + rotAngleX) != 0.0F
+ if ((arm.rotationPointX
+ + rotAngleX) != 0.0F
|| (arm.rotationPointY
+ rotAngleY) != 0.0F
|| (arm.rotationPointZ
+ rotAngleZ) != 0.0F)
GL11.glTranslatef(
- (arm.rotationPointX + rotAngleX)
+ (arm.rotationPointX
+ + rotAngleX)
* s,
- (arm.rotationPointY + rotAngleY)
+ (arm.rotationPointY
+ + rotAngleY)
* s,
- (arm.rotationPointZ + rotAngleZ)
+ (arm.rotationPointZ
+ + rotAngleZ)
* s);
- } else if (!Loader.isModLoaded(
- "alpaca") /*
- * || (Loader.isModLoaded(
- * "alpaca") &&
- * !fiskfille.alpaca.AlpacaAPI.
- * isAlpacaClient(event.
- * entityPlayer))
+ } else if (!Loader
+ .isModLoaded("alpaca") /*
+ * ||
+ * (Loader
+ * .
+ * isModLoaded(
+ * "alpaca")
+ * &&
+ * !fiskfille
+ * .
+ * alpaca
+ * .
+ * AlpacaAPI.
+ * isAlpacaClient
+ * (
+ * event.
+ * entityPlayer
+ * )
+ * )
*/) {
GL11.glTranslatef(
- (arm.rotationPointX + rotAngleX) * s,
- (arm.rotationPointY + rotAngleY) * s,
- (arm.rotationPointZ + rotAngleZ) * s);
+ (arm.rotationPointX
+ + rotAngleX)
+ * s,
+ (arm.rotationPointY
+ + rotAngleY)
+ * s,
+ (arm.rotationPointZ
+ + rotAngleZ)
+ * s);
if (arm.rotateAngleZ != 0.0F)
- GL11.glRotatef(
- arm.rotateAngleZ
- * (180F / (float) Math.PI),
- 0.0F, 0.0F, 1.0F);
+ GL11.glRotatef(arm.rotateAngleZ
+ * (180F / (float) Math.PI),
+ 0.0F,
+ 0.0F,
+ 1.0F);
if (arm.rotateAngleY != 0.0F)
- GL11.glRotatef(
- arm.rotateAngleY
- * (180F / (float) Math.PI),
- 0.0F, 1.0F, 0.0F);
+ GL11.glRotatef(arm.rotateAngleY
+ * (180F / (float) Math.PI),
+ 0.0F,
+ 1.0F,
+ 0.0F);
if (arm.rotateAngleX != 0.0F)
- GL11.glRotatef(
- arm.rotateAngleX
- * (180F / (float) Math.PI),
- 1.0F, 0.0F, 0.0F);
+ GL11.glRotatef(arm.rotateAngleX
+ * (180F / (float) Math.PI),
+ 1.0F,
+ 0.0F,
+ 0.0F);
}
- if (JewelryNBT.ingot(item) != null)
+ if (JewelryNBT.ingot(
+ item) != null)
ingot = JewelrycraftUtil
- .getColor(JewelryNBT.ingot(item));
- if (JewelryNBT.gem(item) != null)
+ .getColor(JewelryNBT
+ .ingot(item));
+ if (JewelryNBT.gem(
+ item) != null)
gem = JewelrycraftUtil
- .getColor(JewelryNBT.gem(item));
+ .getColor(JewelryNBT
+ .gem(item));
float scale = 0.1f;
if (Loader.isModLoaded(
"alpaca") /*
- * &&
- * fiskfille.alpaca.AlpacaAPI.
- * isAlpacaClient(event.
- * entityPlayer)
- */) {
+ * &&
+ * fiskfille
+ * .
+ * alpaca
+ * .
+ * AlpacaAPI.
+ * isAlpacaClient
+ * (
+ * event.
+ * entityPlayer)
+ */) {
if (i <= 4) {
- GL11.glTranslatef(0.35F, -4.35F,
+ GL11.glTranslatef(
+ 0.35F,
+ -4.35F,
-2.8F + 0.15F * i);
- GL11.glRotatef(90f, 0F, 1F, 0F);
+ GL11.glRotatef(90f,
+ 0F,
+ 1F,
+ 0F);
} else {
- GL11.glTranslatef(-0.35F, -4.35F,
+ GL11.glTranslatef(
+ -0.35F,
+ -4.35F,
1.48F + 0.15F * i);
- GL11.glRotatef(-90f, 0F, 1F, 0F);
+ GL11.glRotatef(-90f,
+ 0F,
+ 1F,
+ 0F);
}
scale = 0.3F;
} else {
if (i <= 4)
- GL11.glTranslatef(0.64F + 0.05F * i,
- -1.15F, 0.07F);
+ GL11.glTranslatef(
+ 0.64F + 0.05F * i,
+ -1.15F,
+ 0.07F);
else
- GL11.glTranslatef(0.59F + 0.05F * i,
- -1.15F, 0.07F);
+ GL11.glTranslatef(
+ 0.59F + 0.05F * i,
+ -1.15F,
+ 0.07F);
}
- GL11.glScalef(scale, scale + scale / 2, scale);
- ring.doRender(event.entityPlayer, 0F, 0F,
- (float) ingot, (float) gem, 0F);
+ GL11.glScalef(scale, scale
+ + scale / 2,
+ scale);
+ ring.doRender(event.entityPlayer,
+ 0F, 0F,
+ (float) ingot,
+ (float) gem,
+ 0F);
GL11.glPopMatrix();
// no++;
}
for (int i = 10; i <= 13; i++)
- if (playerInfo != null && event.entityPlayer != null
+ if (playerInfo != null
+ && event.entityPlayer != null
&& player != null
- && playerInfo.hasKey("ext" + i)
- && event.entityPlayer.getDisplayName()
+ && playerInfo.hasKey(
+ "ext" + i)
+ && event.entityPlayer
+ .getDisplayName()
.equals(player.getDisplayName())) {
NBTTagCompound nbt = (NBTTagCompound) playerInfo
.getTag("ext" + i);
- ItemStack item =
- ItemStack.loadItemStackFromNBT(nbt);
- if (JewelryNBT.ingot(item) != null)
+ ItemStack item = ItemStack
+ .loadItemStackFromNBT(
+ nbt);
+ if (JewelryNBT.ingot(
+ item) != null)
ingotColor[i - 10] = JewelrycraftUtil
- .getColor(JewelryNBT.ingot(item));
- if (JewelryNBT.gem(item) != null)
+ .getColor(JewelryNBT
+ .ingot(item));
+ if (JewelryNBT.gem(
+ item) != null)
gemColor[i - 10] = JewelrycraftUtil
- .getColor(JewelryNBT.gem(item));
+ .getColor(JewelryNBT
+ .gem(item));
}
- if (playerInfo != null && event.entityPlayer != null
+ if (playerInfo != null
+ && event.entityPlayer != null
&& player != null
- && (playerInfo.hasKey("ext10")
- || playerInfo.hasKey("ext11"))
- && event.entityPlayer.getDisplayName()
+ && (playerInfo.hasKey(
+ "ext10")
+ || playerInfo.hasKey(
+ "ext11"))
+ && event.entityPlayer
+ .getDisplayName()
.equals(player.getDisplayName())) {
GL11.glPushMatrix();
GL11.glColor4f(1, 1, 1, 1);
if (Loader.isModLoaded(
"alpaca") /*
- * && fiskfille.alpaca.AlpacaAPI.
- * isAlpacaClient(event.
- * entityPlayer)
- */) {
+ * &&
+ * fiskfille
+ * .
+ * alpaca
+ * .
+ * AlpacaAPI.
+ * isAlpacaClient
+ * (
+ * event.
+ * entityPlayer)
+ */) {
rightArm = body;
- GL11.glTranslatef(0.0F, 0.05F, 0.0F);
- GL11.glRotatef(-30F, 0.0F, 1.0F, 0.0F);
+ GL11.glTranslatef(0.0F,
+ 0.05F,
+ 0.0F);
+ GL11.glRotatef(-30F, 0.0F,
+ 1.0F,
+ 0.0F);
}
if (rightArm.rotateAngleX == 0.0F
&& rightArm.rotateAngleY == 0.0F
&& rightArm.rotateAngleZ == 0.0F) {
- if ((rightArm.rotationPointX + rotAngleX) != 0.0F
+ if ((rightArm.rotationPointX
+ + rotAngleX) != 0.0F
|| (rightArm.rotationPointY
+ rotAngleY) != 0.0F
|| (rightArm.rotationPointZ
+ rotAngleZ) != 0.0F)
GL11.glTranslatef(
- (rightArm.rotationPointX + rotAngleX)
+ (rightArm.rotationPointX
+ + rotAngleX)
* size,
- (rightArm.rotationPointY + rotAngleY)
+ (rightArm.rotationPointY
+ + rotAngleY)
* size,
- (rightArm.rotationPointZ + rotAngleZ)
+ (rightArm.rotationPointZ
+ + rotAngleZ)
* size);
} else if (!Loader.isModLoaded(
"alpaca") /*
- * || (Loader.isModLoaded("alpaca")
- * && fiskfille.alpaca.AlpacaAPI.
- * isAlpacaClient(event.
- * entityPlayer))
- */) {
+ * ||
+ * (Loader
+ * .
+ * isModLoaded
+ * (
+ * "alpaca")
+ * &&
+ * fiskfille
+ * .
+ * alpaca
+ * .
+ * AlpacaAPI.
+ * isAlpacaClient
+ * (
+ * event.
+ * entityPlayer
+ * )
+ * )
+ */) {
GL11.glTranslatef(
- (rightArm.rotationPointX + rotAngleX)
+ (rightArm.rotationPointX
+ + rotAngleX)
* size,
- (rightArm.rotationPointY + rotAngleY)
+ (rightArm.rotationPointY
+ + rotAngleY)
* size,
- (rightArm.rotationPointZ + rotAngleZ)
+ (rightArm.rotationPointZ
+ + rotAngleZ)
* size);
if (rightArm.rotateAngleZ != 0.0F)
- GL11.glRotatef(
- rightArm.rotateAngleZ
- * (180F / (float) Math.PI),
- 0.0F, 0.0F, 1.0F);
+ GL11.glRotatef(rightArm.rotateAngleZ
+ * (180F / (float) Math.PI),
+ 0.0F,
+ 0.0F,
+ 1.0F);
if (rightArm.rotateAngleY != 0.0F)
- GL11.glRotatef(
- rightArm.rotateAngleY
- * (180F / (float) Math.PI),
- 0.0F, 1.0F, 0.0F);
+ GL11.glRotatef(rightArm.rotateAngleY
+ * (180F / (float) Math.PI),
+ 0.0F,
+ 1.0F,
+ 0.0F);
if (rightArm.rotateAngleX != 0.0F)
- GL11.glRotatef(
- rightArm.rotateAngleX
- * (180F / (float) Math.PI),
- 1.0F, 0.0F, 0.0F);
+ GL11.glRotatef(rightArm.rotateAngleX
+ * (180F / (float) Math.PI),
+ 1.0F,
+ 0.0F,
+ 0.0F);
}
GL11.glScalef(0.05f, 0.03f, 0.05f);
- bracelet.doRender(event.entityPlayer,
- (float) ingotColor[0], (float) gemColor[0],
- (float) ingotColor[1], (float) gemColor[1],
+ bracelet.doRender(
+ event.entityPlayer,
+ (float) ingotColor[0],
+ (float) gemColor[0],
+ (float) ingotColor[1],
+ (float) gemColor[1],
0.0F);
GL11.glPopMatrix();
}
- if (playerInfo != null && event.entityPlayer != null
+ if (playerInfo != null
+ && event.entityPlayer != null
&& player != null
- && (playerInfo.hasKey("ext12")
- || playerInfo.hasKey("ext13"))
- && event.entityPlayer.getDisplayName()
+ && (playerInfo.hasKey(
+ "ext12")
+ || playerInfo.hasKey(
+ "ext13"))
+ && event.entityPlayer
+ .getDisplayName()
.equals(player.getDisplayName())) {
GL11.glPushMatrix();
GL11.glColor4f(1, 1, 1, 1);
if (Loader.isModLoaded(
"alpaca") /*
- * && fiskfille.alpaca.AlpacaAPI.
- * isAlpacaClient(event.
- * entityPlayer)
- */) {
+ * &&
+ * fiskfille
+ * .
+ * alpaca
+ * .
+ * AlpacaAPI.
+ * isAlpacaClient
+ * (
+ * event.
+ * entityPlayer)
+ */) {
leftArm = body;
- GL11.glTranslatef(-0.1F, 0.0F, 0.1F);
- GL11.glRotatef(-140F, 0.0F, 1.0F, 0.0F);
+ GL11.glTranslatef(-0.1F,
+ 0.0F,
+ 0.1F);
+ GL11.glRotatef(-140F, 0.0F,
+ 1.0F,
+ 0.0F);
}
if (leftArm.rotateAngleX == 0.0F
&& leftArm.rotateAngleY == 0.0F
&& leftArm.rotateAngleZ == 0.0F) {
- if ((leftArm.rotationPointX + rotAngleX) != 0.0F
+ if ((leftArm.rotationPointX
+ + rotAngleX) != 0.0F
|| (leftArm.rotationPointY
+ rotAngleY) != 0.0F
|| (leftArm.rotationPointZ
+ rotAngleZ) != 0.0F)
GL11.glTranslatef(
- (leftArm.rotationPointX + rotAngleX)
+ (leftArm.rotationPointX
+ + rotAngleX)
* size,
- (leftArm.rotationPointY + rotAngleY)
+ (leftArm.rotationPointY
+ + rotAngleY)
* size,
- (leftArm.rotationPointZ + rotAngleZ)
+ (leftArm.rotationPointZ
+ + rotAngleZ)
* size);
} else if (!Loader.isModLoaded(
"alpaca") /*
- * || (Loader.isModLoaded("alpaca")
- * && !fiskfille.alpaca.AlpacaAPI.
- * isAlpacaClient(event.
- * entityPlayer))
- */) {
+ * ||
+ * (Loader
+ * .
+ * isModLoaded
+ * (
+ * "alpaca")
+ * &&
+ * !fiskfille
+ * .
+ * alpaca
+ * .
+ * AlpacaAPI.
+ * isAlpacaClient
+ * (
+ * event.
+ * entityPlayer
+ * )
+ * )
+ */) {
GL11.glTranslatef(
- (leftArm.rotationPointX + rotAngleX) * size
+ (leftArm.rotationPointX
+ + rotAngleX)
+ * size
+ 0.2F,
- (leftArm.rotationPointY + rotAngleY)
+ (leftArm.rotationPointY
+ + rotAngleY)
* size,
- (leftArm.rotationPointZ + rotAngleZ)
+ (leftArm.rotationPointZ
+ + rotAngleZ)
* size);
if (leftArm.rotateAngleZ != 0.0F)
- GL11.glRotatef(
- leftArm.rotateAngleZ
- * (180F / (float) Math.PI),
- 0.0F, 0.0F, 1.0F);
+ GL11.glRotatef(leftArm.rotateAngleZ
+ * (180F / (float) Math.PI),
+ 0.0F,
+ 0.0F,
+ 1.0F);
if (leftArm.rotateAngleY != 0.0F)
- GL11.glRotatef(
- leftArm.rotateAngleY
- * (180F / (float) Math.PI),
- 0.0F, 1.0F, 0.0F);
+ GL11.glRotatef(leftArm.rotateAngleY
+ * (180F / (float) Math.PI),
+ 0.0F,
+ 1.0F,
+ 0.0F);
if (leftArm.rotateAngleX != 0.0F)
- GL11.glRotatef(
- leftArm.rotateAngleX
- * (180F / (float) Math.PI),
- 1.0F, 0.0F, 0.0F);
+ GL11.glRotatef(leftArm.rotateAngleX
+ * (180F / (float) Math.PI),
+ 1.0F,
+ 0.0F,
+ 0.0F);
}
GL11.glScalef(0.05f, 0.03f, 0.05f);
- bracelet.doRender(event.entityPlayer,
- (float) ingotColor[2], (float) gemColor[2],
- (float) ingotColor[3], (float) gemColor[3],
+ bracelet.doRender(
+ event.entityPlayer,
+ (float) ingotColor[2],
+ (float) gemColor[2],
+ (float) ingotColor[3],
+ (float) gemColor[3],
0F);
GL11.glPopMatrix();
}
no = 0;
for (int i = 14; i <= 16; i++)
- if (playerInfo != null && event.entityPlayer != null
+ if (playerInfo != null
+ && event.entityPlayer != null
&& player != null
- && playerInfo.hasKey("ext" + i)
- && event.entityPlayer.getDisplayName()
+ && playerInfo.hasKey(
+ "ext" + i)
+ && event.entityPlayer
+ .getDisplayName()
.equals(player.getDisplayName())) {
gem = -1;
ingot = -1;
NBTTagCompound nbt = (NBTTagCompound) playerInfo
.getTag("ext" + i);
- ItemStack item =
- ItemStack.loadItemStackFromNBT(nbt);
+ ItemStack item = ItemStack
+ .loadItemStackFromNBT(
+ nbt);
GL11.glPushMatrix();
if (body.rotateAngleX == 0.0F
&& body.rotateAngleY == 0.0F
@@ -351,79 +519,141 @@ public class PlayerRenderHandler {
|| body.rotationPointY != 0.0F
|| body.rotationPointZ != 0.0F)
GL11.glTranslatef(
- body.rotationPointX * size,
- body.rotationPointY * size,
- body.rotationPointZ * size);
- } else if (!Loader.isModLoaded(
- "alpaca") /*
- * || (Loader.isModLoaded(
- * "alpaca") &&
- * !fiskfille.alpaca.AlpacaAPI.
- * isAlpacaClient(event.
- * entityPlayer))
+ body.rotationPointX
+ * size,
+ body.rotationPointY
+ * size,
+ body.rotationPointZ
+ * size);
+ } else if (!Loader
+ .isModLoaded("alpaca") /*
+ * ||
+ * (Loader
+ * .
+ * isModLoaded(
+ * "alpaca")
+ * &&
+ * !fiskfille
+ * .
+ * alpaca
+ * .
+ * AlpacaAPI.
+ * isAlpacaClient
+ * (
+ * event.
+ * entityPlayer
+ * )
+ * )
*/) {
- GL11.glTranslatef(body.rotationPointX * size,
- body.rotationPointY * size,
- body.rotationPointZ * size);
+ GL11.glTranslatef(
+ body.rotationPointX
+ * size,
+ body.rotationPointY
+ * size,
+ body.rotationPointZ
+ * size);
if (body.rotateAngleZ != 0.0F)
- GL11.glRotatef(
- body.rotateAngleZ
- * (180F / (float) Math.PI),
- 0.0F, 0.0F, 1.0F);
+ GL11.glRotatef(body.rotateAngleZ
+ * (180F / (float) Math.PI),
+ 0.0F,
+ 0.0F,
+ 1.0F);
if (body.rotateAngleY != 0.0F)
- GL11.glRotatef(
- body.rotateAngleY
- * (180F / (float) Math.PI),
- 0.0F, 1.0F, 0.0F);
+ GL11.glRotatef(body.rotateAngleY
+ * (180F / (float) Math.PI),
+ 0.0F,
+ 1.0F,
+ 0.0F);
if (body.rotateAngleX != 0.0F)
- GL11.glRotatef(
- body.rotateAngleX
- * (180F / (float) Math.PI),
- 1.0F, 0.0F, 0.0F);
+ GL11.glRotatef(body.rotateAngleX
+ * (180F / (float) Math.PI),
+ 1.0F,
+ 0.0F,
+ 0.0F);
}
if (Loader.isModLoaded(
"alpaca") /*
- * &&
- * fiskfille.alpaca.AlpacaAPI.
- * isAlpacaClient(event.
- * entityPlayer)
- */)
- GL11.glTranslatef(0.0F, 0.55F, -0.28F);
- GL11.glScalef(0.0625f, 0.0625f, 0.0625f);
- if (JewelryNBT.ingot(item) != null)
+ * &&
+ * fiskfille
+ * .
+ * alpaca
+ * .
+ * AlpacaAPI.
+ * isAlpacaClient
+ * (
+ * event.
+ * entityPlayer)
+ */)
+ GL11.glTranslatef(
+ 0.0F,
+ 0.55F,
+ -0.28F);
+ GL11.glScalef(0.0625f,
+ 0.0625f,
+ 0.0625f);
+ if (JewelryNBT.ingot(
+ item) != null)
ingot = JewelrycraftUtil
- .getColor(JewelryNBT.ingot(item));
- if (JewelryNBT.gem(item) != null)
+ .getColor(JewelryNBT
+ .ingot(item));
+ if (JewelryNBT.gem(
+ item) != null)
gem = JewelrycraftUtil
- .getColor(JewelryNBT.gem(item));
+ .getColor(JewelryNBT
+ .gem(item));
if (no > 0) {
- GL11.glRotatef(no == 1 ? 25f : -25f, 0F, 0f,
+ GL11.glRotatef(no == 1
+ ? 25f
+ : -25f,
+ 0F,
+ 0f,
1f);
- GL11.glRotatef(no == 1 ? -5f : -10f, 1F, 0f,
+ GL11.glRotatef(no == 1
+ ? -5f
+ : -10f,
+ 1F,
+ 0f,
0f);
}
- necklace.doRender(event.entityPlayer, 0F, 0F,
- (float) ingot, (float) gem, 0F);
+ necklace.doRender(
+ event.entityPlayer,
+ 0F, 0F,
+ (float) ingot,
+ (float) gem,
+ 0F);
GL11.glPopMatrix();
no++;
}
- if (playerInfo != null && event.entityPlayer != null
- && player != null && playerInfo.hasKey("ext17")
- && event.entityPlayer.getDisplayName()
+ if (playerInfo != null
+ && event.entityPlayer != null
+ && player != null
+ && playerInfo.hasKey(
+ "ext17")
+ && event.entityPlayer
+ .getDisplayName()
.equals(player.getDisplayName())) {
gem = -1;
ingot = -1;
- NBTTagCompound nbt =
- (NBTTagCompound) playerInfo.getTag("ext17");
- ItemStack item = ItemStack.loadItemStackFromNBT(nbt);
+ NBTTagCompound nbt = (NBTTagCompound) playerInfo
+ .getTag("ext17");
+ ItemStack item = ItemStack
+ .loadItemStackFromNBT(
+ nbt);
GL11.glPushMatrix();
float s = 0.0625F;
if (Loader.isModLoaded(
"alpaca") /*
- * && fiskfille.alpaca.AlpacaAPI.
- * isAlpacaClient(event.
- * entityPlayer)
- */)
+ * &&
+ * fiskfille
+ * .
+ * alpaca
+ * .
+ * AlpacaAPI.
+ * isAlpacaClient
+ * (
+ * event.
+ * entityPlayer)
+ */)
head = body;
if (head.rotateAngleX == 0.0F
&& head.rotateAngleY == 0.0F
@@ -431,52 +661,92 @@ public class PlayerRenderHandler {
if (head.rotationPointX != 0.0F
|| head.rotationPointY != 0.0F
|| head.rotationPointZ != 0.0F)
- GL11.glTranslatef(head.rotationPointX * size,
- head.rotationPointY * size,
- head.rotationPointZ * size);
+ GL11.glTranslatef(
+ head.rotationPointX
+ * size,
+ head.rotationPointY
+ * size,
+ head.rotationPointZ
+ * size);
} else if (!Loader.isModLoaded(
"alpaca") /*
- * || (Loader.isModLoaded("alpaca")
- * && !fiskfille.alpaca.AlpacaAPI.
- * isAlpacaClient(event.
- * entityPlayer))
- */) {
- GL11.glTranslatef(head.rotationPointX * size,
- head.rotationPointY * size,
- head.rotationPointZ * size);
+ * ||
+ * (Loader
+ * .
+ * isModLoaded
+ * (
+ * "alpaca")
+ * &&
+ * !fiskfille
+ * .
+ * alpaca
+ * .
+ * AlpacaAPI.
+ * isAlpacaClient
+ * (
+ * event.
+ * entityPlayer
+ * )
+ * )
+ */) {
+ GL11.glTranslatef(
+ head.rotationPointX
+ * size,
+ head.rotationPointY
+ * size,
+ head.rotationPointZ
+ * size);
if (head.rotateAngleZ != 0.0F)
- GL11.glRotatef(
- head.rotateAngleZ
- * (180F / (float) Math.PI),
- 0.0F, 0.0F, 1.0F);
+ GL11.glRotatef(head.rotateAngleZ
+ * (180F / (float) Math.PI),
+ 0.0F,
+ 0.0F,
+ 1.0F);
if (head.rotateAngleY != 0.0F)
- GL11.glRotatef(
- head.rotateAngleY
- * (180F / (float) Math.PI),
- 0.0F, 1.0F, 0.0F);
+ GL11.glRotatef(head.rotateAngleY
+ * (180F / (float) Math.PI),
+ 0.0F,
+ 1.0F,
+ 0.0F);
if (head.rotateAngleX != 0.0F)
- GL11.glRotatef(
- head.rotateAngleX
- * (180F / (float) Math.PI),
- 1.0F, 0.0F, 0.0F);
+ GL11.glRotatef(head.rotateAngleX
+ * (180F / (float) Math.PI),
+ 1.0F,
+ 0.0F,
+ 0.0F);
}
if (Loader.isModLoaded(
"alpaca") /*
- * && fiskfille.alpaca.AlpacaAPI.
- * isAlpacaClient(event.
- * entityPlayer)
- */)
- GL11.glTranslatef(0.0F, 0.7F, -0.2F);
+ * &&
+ * fiskfille
+ * .
+ * alpaca
+ * .
+ * AlpacaAPI.
+ * isAlpacaClient
+ * (
+ * event.
+ * entityPlayer)
+ */)
+ GL11.glTranslatef(0.0F,
+ 0.7F,
+ -0.2F);
GL11.glScalef(s, s, s);
- GL11.glTranslatef(0.0F, 1.0F, -2.0F);
+ GL11.glTranslatef(0.0F, 1.0F,
+ -2.0F);
if (JewelryNBT.ingot(item) != null)
ingot = JewelrycraftUtil
- .getColor(JewelryNBT.ingot(item));
+ .getColor(JewelryNBT
+ .ingot(item));
if (JewelryNBT.gem(item) != null)
gem = JewelrycraftUtil
- .getColor(JewelryNBT.gem(item));
- earrings.doRender(event.entityPlayer, 0F, 0F,
- (float) ingot, (float) gem, 0F);
+ .getColor(JewelryNBT
+ .gem(item));
+ earrings.doRender(
+ event.entityPlayer,
+ 0F, 0F,
+ (float) ingot,
+ (float) gem, 0F);
GL11.glPopMatrix();
}
}
@@ -489,21 +759,29 @@ public class PlayerRenderHandler {
@SubscribeEvent
public void renderHand(RenderHandEvent event) {
if (playersInfo != null) {
- EntityPlayer player = Minecraft.getMinecraft().thePlayer;
+ EntityPlayer player = Minecraft
+ .getMinecraft().thePlayer;
if (player != null) {
NBTTagCompound playerInfo = (NBTTagCompound) playersInfo
.getTag(player.getDisplayName());
if (ConfigHandler.CURSES_ENABLED)
- for (Curse curse : Curse.getCurseList())
- if (curse.canCurseBeActivated(player.worldObj)
- && curse != null && playerInfo != null
- && playerInfo.hasKey(curse.getName())
- && playerInfo
- .getInteger(curse.getName()) > 0
- && playerInfo.hasKey("cursePoints")
- && playerInfo
- .getInteger("cursePoints") > 0)
- curse.playerHandRender(player, event);
+ for (Curse curse : Curse
+ .getCurseList())
+ if (curse.canCurseBeActivated(
+ player.worldObj)
+ && curse != null
+ && playerInfo != null
+ && playerInfo.hasKey(
+ curse.getName())
+ && playerInfo.getInteger(
+ curse.getName()) > 0
+ && playerInfo.hasKey(
+ "cursePoints")
+ && playerInfo.getInteger(
+ "cursePoints") > 0)
+ curse.playerHandRender(
+ player,
+ event);
}
}
}
diff --git a/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java b/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java
index cf02d9e..9df771d 100755
--- a/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java
@@ -13,9 +13,9 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
public class ScreenHandler extends Gui {
- private Minecraft mc;
+ private Minecraft mc;
public static NBTTagCompound tagCache = null;
- public static int cooldown;
+ public static int cooldown;
public ScreenHandler(Minecraft mc) {
super();
@@ -38,59 +38,78 @@ public class ScreenHandler extends Gui {
size = 16;
if (tagCache.getFloat("BlueHeart") > 0) {
drawTexturedModalRect(
- resolution.getScaledWidth() / 2 + 90 + 35 * count,
- resolution.getScaledHeight() - 40, 0 * size, 0 * size,
- size, size);
- mc.fontRenderer.drawStringWithShadow(
- "x" + (MathHelper.ceiling_float_int(
- tagCache.getFloat("BlueHeart")) / 2.0F),
- resolution.getScaledWidth() / 2 + 105 + 35 * count,
- resolution.getScaledHeight() - 36, 16777215);
+ resolution.getScaledWidth() / 2
+ + 90 + 35 * count,
+ resolution.getScaledHeight() - 40,
+ 0 * size, 0 * size, size, size);
+ mc.fontRenderer.drawStringWithShadow("x"
+ + (MathHelper.ceiling_float_int(
+ tagCache.getFloat(
+ "BlueHeart"))
+ / 2.0F),
+ resolution.getScaledWidth() / 2
+ + 105 + 35 * count,
+ resolution.getScaledHeight() - 36,
+ 16777215);
}
count++;
mc.renderEngine.bindTexture(Variables.MISC_TEXTURE);
if (tagCache.getFloat("BlackHeart") > 0) {
- drawTexturedModalRect(
- resolution.getScaledWidth() / 2 + 90
- + (mc.fontRenderer.getStringWidth(String
- .valueOf((MathHelper.ceiling_float_int(
- tagCache.getFloat("BlueHeart"))
- / 2.0F)))
- - 14)
- + 35 * count,
- resolution.getScaledHeight() - 40, 1 * size, 0 * size,
- size, size);
- mc.fontRenderer.drawStringWithShadow(
- "x" + (MathHelper.ceiling_float_int(
- tagCache.getFloat("BlackHeart")) / 2.0F),
- resolution.getScaledWidth() / 2 + 105
- + (mc.fontRenderer.getStringWidth(String
- .valueOf((MathHelper.ceiling_float_int(
- tagCache.getFloat("BlueHeart"))
- / 2.0F)))
+ drawTexturedModalRect(resolution.getScaledWidth()
+ / 2
+ + 90
+ + (mc.fontRenderer.getStringWidth(
+ String.valueOf((MathHelper
+ .ceiling_float_int(
+ tagCache.getFloat(
+ "BlueHeart"))
+ / 2.0F)))
+ - 14)
+ + 35 * count,
+ resolution.getScaledHeight() - 40,
+ 1 * size, 0 * size, size, size);
+ mc.fontRenderer.drawStringWithShadow("x"
+ + (MathHelper.ceiling_float_int(
+ tagCache.getFloat(
+ "BlackHeart"))
+ / 2.0F),
+ resolution.getScaledWidth() / 2
+ + 105
+ + (mc.fontRenderer
+ .getStringWidth(String
+ .valueOf((MathHelper
+ .ceiling_float_int(
+ tagCache.getFloat(
+ "BlueHeart"))
+ / 2.0F)))
- 14)
+ 35 * count,
- resolution.getScaledHeight() - 36, 16777215);
+ resolution.getScaledHeight() - 36,
+ 16777215);
}
count++;
mc.renderEngine.bindTexture(Variables.MISC_TEXTURE);
if (tagCache.getFloat("WhiteHeart") > 0)
- drawTexturedModalRect(
- resolution.getScaledWidth() / 2 + 90
- + (mc.fontRenderer.getStringWidth(String
- .valueOf((MathHelper.ceiling_float_int(
- tagCache.getFloat("BlueHeart"))
- / 2.0F)))
- - 14)
- + (mc.fontRenderer.getStringWidth(String
- .valueOf((MathHelper.ceiling_float_int(
+ drawTexturedModalRect(resolution.getScaledWidth()
+ / 2
+ + 90
+ + (mc.fontRenderer.getStringWidth(
+ String.valueOf((MathHelper
+ .ceiling_float_int(
+ tagCache.getFloat(
+ "BlueHeart"))
+ / 2.0F)))
+ - 14)
+ + (mc.fontRenderer.getStringWidth(
+ String.valueOf((MathHelper
+ .ceiling_float_int(
tagCache.getFloat(
"BlackHeart"))
- / 2.0F)))
- - 14)
- + 35 * count,
- resolution.getScaledHeight() - 40, 2 * size, 1 * size,
- size, size);
+ / 2.0F)))
+ - 14)
+ + 35 * count,
+ resolution.getScaledHeight() - 40,
+ 2 * size, 1 * size, size, size);
GL11.glPopMatrix();
}
} \ No newline at end of file
diff --git a/src/main/java/darkknight/jewelrycraft/events/TextureEvent.java b/src/main/java/darkknight/jewelrycraft/events/TextureEvent.java
index 9ab9958..0fed13f 100755
--- a/src/main/java/darkknight/jewelrycraft/events/TextureEvent.java
+++ b/src/main/java/darkknight/jewelrycraft/events/TextureEvent.java
@@ -11,7 +11,9 @@ public class TextureEvent {
@SideOnly(Side.CLIENT)
public void textureFix(TextureStitchEvent.Post e) {
if (e.map.getTextureType() == 0)
- BlockList.moltenMetalFluid.setIcons(
- BlockList.moltenMetal.getBlockTextureFromSide(0));
+ BlockList.moltenMetalFluid
+ .setIcons(BlockList.moltenMetal
+ .getBlockTextureFromSide(
+ 0));
}
} \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-18 12:39:15 +0000