mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-22 13:09:53 +00:00
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:
1 parent
18bfeaff32
commit
39be06c23b
571 files changed
+25959
-28223
No files matched your search
@@ -8,48 +8,37 @@ import net.minecraft.potion.*;
|
||||
import tconstruct.armor.player.*;
|
||||
import tconstruct.util.config.PHConstruct;
|
||||
|
||||
public class PlayerAbilityHelper
|
||||
{
|
||||
public class PlayerAbilityHelper {
|
||||
|
||||
public static void toggleGoggles (EntityPlayer player, boolean active)
|
||||
{
|
||||
public static void toggleGoggles(EntityPlayer player, boolean active) {
|
||||
TPlayerStats stats = TPlayerStats.get(player);
|
||||
stats.activeGoggles = active;
|
||||
if (!stats.activeGoggles)
|
||||
{
|
||||
if (!stats.activeGoggles) {
|
||||
player.removePotionEffect(Potion.nightVision.id);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
player.addPotionEffect(new PotionEffect(Potion.nightVision.id, 15 * 20, 0, true));
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean isDimensionAllowed (EntityPlayer player) {
|
||||
public static boolean isDimensionAllowed(EntityPlayer player) {
|
||||
int currentDimID = player.worldObj.provider.dimensionId;
|
||||
for (int id : PHConstruct.cfgForbiddenDim)
|
||||
{
|
||||
if (id == currentDimID)
|
||||
return false;
|
||||
for (int id : PHConstruct.cfgForbiddenDim) {
|
||||
if (id == currentDimID) return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public static void swapBelt (EntityPlayer player, ArmorExtended armor)
|
||||
{
|
||||
public static void swapBelt(EntityPlayer player, ArmorExtended armor) {
|
||||
if (!isDimensionAllowed(player)) return;
|
||||
NBTTagList slots = new NBTTagList();
|
||||
InventoryPlayer hotbar = player.inventory;
|
||||
ItemStack belt = armor.inventory[3];
|
||||
if(belt == null)
|
||||
return;
|
||||
if (belt == null) return;
|
||||
|
||||
NBTTagCompound itemTag;
|
||||
|
||||
for (int i = 0; i < 9; ++i)
|
||||
{
|
||||
if (hotbar.mainInventory[i] != null)
|
||||
{
|
||||
for (int i = 0; i < 9; ++i) {
|
||||
if (hotbar.mainInventory[i] != null) {
|
||||
itemTag = new NBTTagCompound();
|
||||
itemTag.setByte("Slot", (byte) i);
|
||||
hotbar.mainInventory[i].writeToNBT(itemTag);
|
||||
@@ -59,16 +48,13 @@ public class PlayerAbilityHelper
|
||||
}
|
||||
|
||||
NBTTagList replaceSlots = belt.getTagCompound().getTagList("Inventory", 10);
|
||||
for (int i = 0; i < replaceSlots.tagCount(); ++i)
|
||||
{
|
||||
for (int i = 0; i < replaceSlots.tagCount(); ++i) {
|
||||
NBTTagCompound nbttagcompound = replaceSlots.getCompoundTagAt(i);
|
||||
int j = nbttagcompound.getByte("Slot") & 255;
|
||||
ItemStack itemstack = ItemStack.loadItemStackFromNBT(nbttagcompound);
|
||||
|
||||
if (itemstack != null)
|
||||
{
|
||||
if (j >= 0 && j < hotbar.mainInventory.length)
|
||||
{
|
||||
if (itemstack != null) {
|
||||
if (j >= 0 && j < hotbar.mainInventory.length) {
|
||||
hotbar.mainInventory[j] = itemstack;
|
||||
}
|
||||
}
|
||||
@@ -76,12 +62,10 @@ public class PlayerAbilityHelper
|
||||
belt.getTagCompound().setTag("Inventory", slots);
|
||||
}
|
||||
|
||||
public static void setEntitySize (Entity entity, float width, float height)
|
||||
{
|
||||
public static void setEntitySize(Entity entity, float width, float height) {
|
||||
float f2;
|
||||
|
||||
if (width != entity.width || height != entity.height)
|
||||
{
|
||||
if (width != entity.width || height != entity.height) {
|
||||
f2 = entity.width;
|
||||
entity.width = width;
|
||||
entity.height = height;
|
||||
@@ -89,36 +73,24 @@ public class PlayerAbilityHelper
|
||||
entity.boundingBox.maxZ = entity.boundingBox.minZ + (double) entity.width;
|
||||
entity.boundingBox.maxY = entity.boundingBox.minY + (double) entity.height;
|
||||
|
||||
if (entity.width > f2 && !entity.worldObj.isRemote)
|
||||
{
|
||||
if (entity.width > f2 && !entity.worldObj.isRemote) {
|
||||
entity.moveEntity((double) (f2 - entity.width), 0.0D, (double) (f2 - entity.width));
|
||||
}
|
||||
}
|
||||
|
||||
f2 = width % 2.0F;
|
||||
|
||||
if ((double) f2 < 0.375D)
|
||||
{
|
||||
if ((double) f2 < 0.375D) {
|
||||
entity.myEntitySize = Entity.EnumEntitySize.SIZE_1;
|
||||
}
|
||||
else if ((double) f2 < 0.75D)
|
||||
{
|
||||
} else if ((double) f2 < 0.75D) {
|
||||
entity.myEntitySize = Entity.EnumEntitySize.SIZE_2;
|
||||
}
|
||||
else if ((double) f2 < 1.0D)
|
||||
{
|
||||
} else if ((double) f2 < 1.0D) {
|
||||
entity.myEntitySize = Entity.EnumEntitySize.SIZE_3;
|
||||
}
|
||||
else if ((double) f2 < 1.375D)
|
||||
{
|
||||
} else if ((double) f2 < 1.375D) {
|
||||
entity.myEntitySize = Entity.EnumEntitySize.SIZE_4;
|
||||
}
|
||||
else if ((double) f2 < 1.75D)
|
||||
{
|
||||
} else if ((double) f2 < 1.75D) {
|
||||
entity.myEntitySize = Entity.EnumEntitySize.SIZE_5;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
entity.myEntitySize = Entity.EnumEntitySize.SIZE_6;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user