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,10 +1,9 @@
package tconstruct.tools;
import java.util.List;
import cpw.mods.fml.common.eventhandler.Event.Result;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent;
import java.util.List;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.monster.EntityCreeper;
@@ -36,42 +35,37 @@ import tconstruct.util.ItemHelper;
import tconstruct.util.config.PHConstruct;
import tconstruct.util.network.MovementUpdatePacket;
public class TinkerToolEvents
{
public class TinkerToolEvents {
@SubscribeEvent
public void onCrafting (ItemCraftedEvent event)
{
if (event.crafting == null || event.player == null || event.player.worldObj == null || event.craftMatrix == null)
return;
public void onCrafting(ItemCraftedEvent event) {
if (event.crafting == null
|| event.player == null
|| event.player.worldObj == null
|| event.craftMatrix == null) return;
Item item = event.crafting.getItem();
if (!event.player.worldObj.isRemote)
{
if (item == Item.getItemFromBlock(TinkerTools.toolStationWood))
{
if (!PHConstruct.beginnerBook)
{
if (!event.player.worldObj.isRemote) {
if (item == Item.getItemFromBlock(TinkerTools.toolStationWood)) {
if (!PHConstruct.beginnerBook) {
return;
}
TPlayerStats stats = TPlayerStats.get(event.player);
if (!stats.materialManual)
{
if (!stats.materialManual) {
stats.materialManual = true;
AbilityHelper.spawnItemAtPlayer(event.player, new ItemStack(TinkerTools.manualBook, 1, 1));
}
}
// slab pattern chest
if(item == Item.getItemFromBlock(TinkerTools.craftingSlabWood) && event.crafting.getItemDamage() == 4) {
if (item == Item.getItemFromBlock(TinkerTools.craftingSlabWood) && event.crafting.getItemDamage() == 4) {
// copy over NBT
for(int i = 0; i < event.craftMatrix.getSizeInventory(); i++) {
for (int i = 0; i < event.craftMatrix.getSizeInventory(); i++) {
ItemStack stack = event.craftMatrix.getStackInSlot(i);
if(stack == null)
continue;
if (stack == null) continue;
// regular pattern chest
if(stack.getItem() == Item.getItemFromBlock(TinkerTools.toolStationWood) && stack.getItemDamage() == 5)
{
if (stack.getItem() == Item.getItemFromBlock(TinkerTools.toolStationWood)
&& stack.getItemDamage() == 5) {
event.crafting.setTagCompound(stack.getTagCompound());
break;
}
@@ -81,11 +75,9 @@ public class TinkerToolEvents
}
@SubscribeEvent
public void buildTool (ToolBuildEvent event)
{
public void buildTool(ToolBuildEvent event) {
// check if the handle is a bone
if (event.handleStack.getItem() == Items.bone)
{
if (event.handleStack.getItem() == Items.bone) {
event.handleStack = new ItemStack(TinkerTools.toolRod, 1, 5); // bone tool rod
return;
}
@@ -93,25 +85,21 @@ public class TinkerToolEvents
// check if the handle is a stick
List<ItemStack> sticks = OreDictionary.getOres("stickWood");
for (ItemStack stick : sticks)
if (OreDictionary.itemMatches(stick, event.handleStack, false))
{
if (OreDictionary.itemMatches(stick, event.handleStack, false)) {
event.handleStack = new ItemStack(TinkerTools.toolRod, 1, 0); // wooden tool rod
return;
}
}
@SubscribeEvent
public void craftTool (ToolCraftEvent.NormalTool event)
{
public void craftTool(ToolCraftEvent.NormalTool event) {
NBTTagCompound toolTag = event.toolTag.getCompoundTag("InfiTool");
if (PHConstruct.denyMattock && event.tool == TinkerTools.mattock)
{
if (PHConstruct.denyMattock && event.tool == TinkerTools.mattock) {
int head = toolTag.getInteger("Head");
int handle = toolTag.getInteger("Handle");
int accessory = toolTag.getInteger("Accessory");
if (!allowCrafting(head, handle, accessory))
{
if (!allowCrafting(head, handle, accessory)) {
event.setResult(Result.DENY);
return;
}
@@ -121,169 +109,140 @@ public class TinkerToolEvents
handlePaper(toolTag, event.tool);
handleThaumium(toolTag, event.tool);
if (event.tool == TinkerTools.battlesign)
{
if (event.tool == TinkerTools.battlesign) {
int modifiers = toolTag.getInteger("Modifiers");
modifiers += 1;
toolTag.setInteger("Modifiers", modifiers);
}
}
private void handlePaper (NBTTagCompound toolTag, ToolCore tool)
{
private void handlePaper(NBTTagCompound toolTag, ToolCore tool) {
int modifiers = toolTag.getInteger("Modifiers");
if (toolTag.getInteger("Head") == TinkerTools.MaterialID.Paper)
modifiers++;
if (toolTag.getInteger("Handle") == TinkerTools.MaterialID.Paper)
modifiers++;
if (toolTag.getInteger("Accessory") == TinkerTools.MaterialID.Paper)
modifiers++;
if (toolTag.getInteger("Extra") == TinkerTools.MaterialID.Paper)
modifiers++;
if (toolTag.getInteger("Head") == TinkerTools.MaterialID.Paper) modifiers++;
if (toolTag.getInteger("Handle") == TinkerTools.MaterialID.Paper) modifiers++;
if (toolTag.getInteger("Accessory") == TinkerTools.MaterialID.Paper) modifiers++;
if (toolTag.getInteger("Extra") == TinkerTools.MaterialID.Paper) modifiers++;
// 2 part tools gain 2 modifiers for the head
if (tool.getPartAmount() == 2 && toolTag.getInteger("Head") == TinkerTools.MaterialID.Paper)
modifiers++;
if (tool.getPartAmount() == 2 && toolTag.getInteger("Head") == TinkerTools.MaterialID.Paper) modifiers++;
toolTag.setInteger("Modifiers", modifiers);
}
private void handleThaumium (NBTTagCompound toolTag, ToolCore tool)
{
private void handleThaumium(NBTTagCompound toolTag, ToolCore tool) {
// count thaumic parts
int thaum = 0;
if (toolTag.getInteger("Head") == TinkerTools.MaterialID.Thaumium)
thaum++;
if (toolTag.getInteger("Handle") == TinkerTools.MaterialID.Thaumium)
thaum++;
if (toolTag.getInteger("Accessory") == TinkerTools.MaterialID.Thaumium)
thaum++;
if (toolTag.getInteger("Extra") == TinkerTools.MaterialID.Thaumium)
thaum++;
if (toolTag.getInteger("Head") == TinkerTools.MaterialID.Thaumium) thaum++;
if (toolTag.getInteger("Handle") == TinkerTools.MaterialID.Thaumium) thaum++;
if (toolTag.getInteger("Accessory") == TinkerTools.MaterialID.Thaumium) thaum++;
if (toolTag.getInteger("Extra") == TinkerTools.MaterialID.Thaumium) thaum++;
// each part gives 0.5 modifiers, rounded up
int bonusModifiers = (int) Math.ceil((double) thaum / 2d);
// 2-part tools get 1 modifier per part
if (tool.getPartAmount() == 2)
bonusModifiers = thaum;
if (tool.getPartAmount() == 2) bonusModifiers = thaum;
int modifiers = toolTag.getInteger("Modifiers");
modifiers += bonusModifiers;
toolTag.setInteger("Modifiers", modifiers);
}
private boolean allowCrafting (int head, int handle, int accessory)
{
int[] nonMetals = { 0, 1, 3, 4, 5, 6, 7, 8, 9, 17 };
for (int i = 0; i < nonMetals.length; i++)
{
if (head == nonMetals[i] || handle == nonMetals[i] || accessory == nonMetals[i])
return false;
private boolean allowCrafting(int head, int handle, int accessory) {
int[] nonMetals = {0, 1, 3, 4, 5, 6, 7, 8, 9, 17};
for (int i = 0; i < nonMetals.length; i++) {
if (head == nonMetals[i] || handle == nonMetals[i] || accessory == nonMetals[i]) return false;
}
return true;
}
@SubscribeEvent
public void craftPart (PartBuilderEvent.NormalPart event)
{
public void craftPart(PartBuilderEvent.NormalPart event) {
// bowstring
if (event.pattern.getItem() == TinkerTools.woodPattern && event.pattern.getItemDamage() == 23)
{
if (event.pattern.getItem() == TinkerTools.woodPattern && event.pattern.getItemDamage() == 23) {
ItemStack result = craftBowString(event.material);
if (result != null)
{
event.overrideResult(new ItemStack[] { result, null });
if (result != null) {
event.overrideResult(new ItemStack[] {result, null});
}
}
// fletching
if (event.pattern.getItem() == TinkerTools.woodPattern && event.pattern.getItemDamage() == 24)
{
if (event.pattern.getItem() == TinkerTools.woodPattern && event.pattern.getItemDamage() == 24) {
ItemStack result = craftFletching(event.material);
if (result != null)
{
event.overrideResult(new ItemStack[] { result, null });
if (result != null) {
event.overrideResult(new ItemStack[] {result, null});
}
}
}
public static ItemStack craftBowString (ItemStack stack)
{
if (stack.stackSize < 3)
return null;
public static ItemStack craftBowString(ItemStack stack) {
if (stack.stackSize < 3) return null;
BowstringMaterial mat = (BowstringMaterial) TConstructRegistry.getCustomMaterial(stack, BowstringMaterial.class);
if (mat != null)
return mat.craftingItem.copy();
BowstringMaterial mat =
(BowstringMaterial) TConstructRegistry.getCustomMaterial(stack, BowstringMaterial.class);
if (mat != null) return mat.craftingItem.copy();
return null;
}
public static ItemStack craftFletching (ItemStack stack)
{
FletchingMaterial mat = (FletchingMaterial) TConstructRegistry.getCustomMaterial(stack, FletchingMaterial.class);
public static ItemStack craftFletching(ItemStack stack) {
FletchingMaterial mat =
(FletchingMaterial) TConstructRegistry.getCustomMaterial(stack, FletchingMaterial.class);
// maybe it's a leaf fletchling
if (mat == null)
mat = (FletchingMaterial) TConstructRegistry.getCustomMaterial(stack, FletchlingLeafMaterial.class);
if (mat != null)
return mat.craftingItem.copy();
if (mat != null) return mat.craftingItem.copy();
return null;
}
@SubscribeEvent
public void onAttack (LivingAttackEvent event)
{
//System.out.println("Damage: "+event.ammount);
if (event.entityLiving instanceof EntityPlayer)
{
public void onAttack(LivingAttackEvent event) {
// System.out.println("Damage: "+event.ammount);
if (event.entityLiving instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) event.entityLiving;
//Cutlass
// Cutlass
ItemStack stack = player.getCurrentEquippedItem();
if (stack != null && stack.getItem() == TinkerTools.battlesign)
{
if (stack != null && stack.getItem() == TinkerTools.battlesign) {
// broken battlesign?
if(!stack.hasTagCompound() || stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Broken"))
return;
if (!stack.hasTagCompound()
|| stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Broken")) return;
DamageSource source = event.source;
if (!source.isUnblockable() && !source.isMagicDamage() && !source.isExplosion())
{
if (source.isProjectile())
{
if (!source.isUnblockable() && !source.isMagicDamage() && !source.isExplosion()) {
if (source.isProjectile()) {
Entity projectile = source.getSourceOfDamage();
if(projectile == null)
return;
Vec3 motion = Vec3.createVectorHelper(projectile.motionX, projectile.motionY, projectile.motionZ);
if (projectile == null) return;
Vec3 motion =
Vec3.createVectorHelper(projectile.motionX, projectile.motionY, projectile.motionZ);
Vec3 look = player.getLookVec();
// this gives a factor of how much we're looking at the incoming arrow
double strength = -look.dotProduct(motion.normalize());
// we're looking away. oh no.
if(strength < 0.1)
return;
if (strength < 0.1) return;
// no damage, hooraaay
event.setCanceled(true);
double speed = projectile.motionX*projectile.motionX + projectile.motionY*projectile.motionY + projectile.motionZ*projectile.motionZ;
double speed = projectile.motionX * projectile.motionX
+ projectile.motionY * projectile.motionY
+ projectile.motionZ * projectile.motionZ;
speed = Math.sqrt(speed);
speed = (speed+2)*strength;
speed = (speed + 2) * strength;
// now we simply set the look vector with the speed and get our new vector!
projectile.motionX = look.xCoord * speed;
projectile.motionY = look.yCoord * speed;
projectile.motionZ = look.zCoord * speed;
projectile.rotationYaw = (float)(Math.atan2(projectile.motionX, projectile.motionZ) * 180.0D / Math.PI);
projectile.rotationPitch = (float)(Math.atan2(projectile.motionY, speed) * 180.0D / Math.PI);
projectile.rotationYaw =
(float) (Math.atan2(projectile.motionX, projectile.motionZ) * 180.0D / Math.PI);
projectile.rotationPitch = (float) (Math.atan2(projectile.motionY, speed) * 180.0D / Math.PI);
// send the current status to the client
TConstruct.packetPipeline.sendToAll(new MovementUpdatePacket(projectile));
if(projectile instanceof EntityArrow) {
if (projectile instanceof EntityArrow) {
((EntityArrow) projectile).shootingEntity = player;
// the inverse is done when the event is cancelled in arrows etc.
@@ -291,110 +250,95 @@ public class TinkerToolEvents
projectile.motionX /= -0.10000000149011612D;
projectile.motionY /= -0.10000000149011612D;
projectile.motionZ /= -0.10000000149011612D;
// projectile.rotationYaw -= 180.0F;
// projectile.prevRotationYaw -= 180.0F;
// projectile.rotationYaw -= 180.0F;
// projectile.prevRotationYaw -= 180.0F;
// not needed at the client since it gets the absolute values sent
// tinker projectiles don't check for stuff hit to prevent weird behaviour.
// we have to de-defuse them so the reflected projectiles can hit stuff again
if(projectile instanceof ProjectileBase)
((ProjectileBase) projectile).defused = false;
if (projectile instanceof ProjectileBase) ((ProjectileBase) projectile).defused = false;
}
}
else
{
} else {
Entity attacker = source.getEntity();
if (attacker != null)
{
if (attacker != null) {
attacker.attackEntityFrom(DamageSource.causeThornsDamage(player), event.ammount);
}
}
// durability--
AbilityHelper.damageTool(stack, (int)Math.ceil(event.ammount/2f), player, false);
AbilityHelper.damageTool(stack, (int) Math.ceil(event.ammount / 2f), player, false);
}
}
}
}
@SubscribeEvent
public void onLivingDrop (LivingDropsEvent event)
{
if (event.entityLiving == null)
return;
public void onLivingDrop(LivingDropsEvent event) {
if (event.entityLiving == null) return;
if (event.recentlyHit)
{
if (event.entityLiving instanceof EntitySkeleton)
{
if (event.recentlyHit) {
if (event.entityLiving instanceof EntitySkeleton) {
EntitySkeleton enemy = (EntitySkeleton) event.entityLiving;
if (event.source.damageType.equals("player"))
{
if (event.source.damageType.equals("player")) {
EntityPlayer player = (EntityPlayer) event.source.getEntity();
ItemStack stack = player.getCurrentEquippedItem();
if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore)
{
int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading");
if (stack.getItem() == TinkerTools.cleaver)
beheading += 2;
if (beheading > 0 && TConstruct.random.nextInt(100) < beheading * 10)
{
if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) {
int beheading = stack.getTagCompound()
.getCompoundTag("InfiTool")
.getInteger("Beheading");
if (stack.getItem() == TinkerTools.cleaver) beheading += 2;
if (beheading > 0 && TConstruct.random.nextInt(100) < beheading * 10) {
ItemHelper.addDrops(event, new ItemStack(Items.skull, 1, enemy.getSkeletonType()));
}
}
}
if (enemy.getSkeletonType() == 1 && TConstruct.random.nextInt(Math.max(1, 5 - event.lootingLevel)) == 0)
{
if (enemy.getSkeletonType() == 1
&& TConstruct.random.nextInt(Math.max(1, 5 - event.lootingLevel)) == 0) {
ItemHelper.addDrops(event, new ItemStack(TinkerTools.materials, 1, 8));
}
}
if (event.entityLiving.getClass() == EntityZombie.class)
{
if (event.entityLiving.getClass() == EntityZombie.class) {
EntityZombie enemy = (EntityZombie) event.entityLiving;
if (event.source.damageType.equals("player"))
{
if (event.source.damageType.equals("player")) {
EntityPlayer player = (EntityPlayer) event.source.getEntity();
ItemStack stack = player.getCurrentEquippedItem();
if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore)
{
int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading");
if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) {
int beheading = stack.getTagCompound()
.getCompoundTag("InfiTool")
.getInteger("Beheading");
if (stack != null && stack.hasTagCompound() && stack.getItem() == TinkerTools.cleaver)
beheading += 2;
if (beheading > 0 && TConstruct.random.nextInt(100) < beheading * 10)
{
if (beheading > 0 && TConstruct.random.nextInt(100) < beheading * 10) {
ItemHelper.addDrops(event, new ItemStack(Items.skull, 1, 2));
}
}
if (stack != null && stack.hasTagCompound() && stack.getItem() == TinkerTools.cleaver && TConstruct.random.nextInt(100) < 10)
{
if (stack != null
&& stack.hasTagCompound()
&& stack.getItem() == TinkerTools.cleaver
&& TConstruct.random.nextInt(100) < 10) {
ItemHelper.addDrops(event, new ItemStack(Items.skull, 1, 2));
}
}
}
if (event.entityLiving.getClass() == EntityCreeper.class)
{
if (event.entityLiving.getClass() == EntityCreeper.class) {
EntityCreeper enemy = (EntityCreeper) event.entityLiving;
if (event.source.damageType.equals("player"))
{
if (event.source.damageType.equals("player")) {
EntityPlayer player = (EntityPlayer) event.source.getEntity();
ItemStack stack = player.getCurrentEquippedItem();
if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore)
{
int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading");
if (stack.getItem() == TinkerTools.cleaver)
beheading += 2;
if (beheading > 0 && TConstruct.random.nextInt(100) < beheading * 5)
{
if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) {
int beheading = stack.getTagCompound()
.getCompoundTag("InfiTool")
.getInteger("Beheading");
if (stack.getItem() == TinkerTools.cleaver) beheading += 2;
if (beheading > 0 && TConstruct.random.nextInt(100) < beheading * 5) {
ItemHelper.addDrops(event, new ItemStack(Items.skull, 1, 4));
}
}
@@ -402,30 +346,23 @@ public class TinkerToolEvents
}
}
if (event.entityLiving instanceof EntityPlayer)
{
if (event.entityLiving instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) event.entityLiving;
if (PHConstruct.dropPlayerHeads)
{
if (PHConstruct.dropPlayerHeads) {
ItemStack dropStack = new ItemStack(Items.skull, 1, 3);
NBTTagCompound nametag = new NBTTagCompound();
nametag.setString("SkullOwner", player.getDisplayName());
dropStack.setTagCompound(nametag);
ItemHelper.addDrops(event, dropStack);
}
else if (event.source.damageType.equals("player"))
{
} else if (event.source.damageType.equals("player")) {
EntityPlayer source = (EntityPlayer) event.source.getEntity();
ItemStack stack = source.getCurrentEquippedItem();
if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore)
{
int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading");
if (stack.getItem() == TinkerTools.cleaver)
beheading += 2;
if (beheading > 0 && TConstruct.random.nextInt(100) < beheading * 50)
{
if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) {
int beheading =
stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading");
if (stack.getItem() == TinkerTools.cleaver) beheading += 2;
if (beheading > 0 && TConstruct.random.nextInt(100) < beheading * 50) {
ItemStack dropStack = new ItemStack(Items.skull, 1, 3);
NBTTagCompound nametag = new NBTTagCompound();
nametag.setString("SkullOwner", player.getDisplayName());
@@ -438,53 +375,41 @@ public class TinkerToolEvents
}
@SubscribeEvent
public void registerOre (OreRegisterEvent evt)
{
public void registerOre(OreRegisterEvent evt) {
if (evt.Name.equals("crystalQuartz"))
{
if (evt.Name.equals("crystalQuartz")) {
TinkerTools.modAttack.addStackToMatchList(evt.Ore, 2);
}
else if (evt.Name.equals("crystalCertusQuartz"))
{
} else if (evt.Name.equals("crystalCertusQuartz")) {
TinkerTools.modAttack.addStackToMatchList(evt.Ore, 24);
}
}
@SubscribeEvent
public void damageToolsOnDeath (PlayerDropsEvent event)
{
if(!PHConstruct.deathPenality)
return;
public void damageToolsOnDeath(PlayerDropsEvent event) {
if (!PHConstruct.deathPenality) return;
EnumDifficulty difficulty = event.entityPlayer.worldObj.difficultySetting;
// easy and peaceful don't punish
if(difficulty == EnumDifficulty.PEACEFUL || difficulty == EnumDifficulty.EASY)
return;
if (difficulty == EnumDifficulty.PEACEFUL || difficulty == EnumDifficulty.EASY) return;
int punishment = 20; // normal has 5%
if(difficulty == EnumDifficulty.HARD)
punishment = 10; // hard has 10%
if (difficulty == EnumDifficulty.HARD) punishment = 10; // hard has 10%
// check if we have to reduce it
// did the player live long enough to receive derp-protection?
// (yes, you receive protection every time you log in. we're that nice.)
int derp = 1;
if(event.entityPlayer.ticksExisted < 60*5*20 ) {
if (event.entityPlayer.ticksExisted < 60 * 5 * 20) {
derp = TPlayerStats.get(event.entityPlayer).derpLevel;
if(derp <= 0) derp = 1;
if (derp <= 0) derp = 1;
punishment *= derp;
}
boolean damaged = false;
for(EntityItem drop : event.drops)
{
for (EntityItem drop : event.drops) {
// we're only interested in tools
if(!(drop.getEntityItem().getItem() instanceof ToolCore) || !drop.getEntityItem().hasTagCompound())
continue;
if (!(drop.getEntityItem().getItem() instanceof ToolCore)
|| !drop.getEntityItem().hasTagCompound()) continue;
// damage tools by 10% of their total durability!
NBTTagCompound tags = drop.getEntityItem().getTagCompound().getCompoundTag("InfiTool");
@@ -495,11 +420,11 @@ public class TinkerToolEvents
damaged = true;
}
if(damaged) {
if (damaged) {
derp++;
}
// increase derplevel by 1. Minimal derp level is 1.
TPlayerStats.get(event.entityPlayer).derpLevel = derp+1;
TPlayerStats.get(event.entityPlayer).derpLevel = derp + 1;
}
}