Skip to content

Commit

Permalink
pain
Browse files Browse the repository at this point in the history
  • Loading branch information
@HbmMods
HbmMods committed Feb 6, 2025
1 parent fe9808f commit b60db5b
Show file tree
Hide file tree
Showing 3 changed files with 89 additions and 73 deletions.
153 changes: 85 additions & 68 deletions src/main/java/com/hbm/inventory/container/ContainerNT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,28 @@ public ItemStack transferStackInSlot(EntityPlayer player, int index) {
return null;
}

// fuck you mojang
@Override
public ItemStack slotClick(int index, int button, int mode, EntityPlayer player) {

ItemStack itemstack = null;
/*
* INDEX
* -999: Mouse outside GUI
* MODE
* 2: Hotbar keys
* 3: Duplicate item
* 4: Drop item
* 5: Drag
*/

ItemStack returnStack = null;
InventoryPlayer invPlayer = player.inventory;
Slot slot = index >= 0 && index < this.inventorySlots.size() ? (Slot) this.inventorySlots.get(index) : null;

int i1;
ItemStack itemstack3;

/// DRAG ///
if(mode == 5) {
int l = this.field_94536_g;
this.field_94536_g = func_94532_c(button);
Expand All @@ -59,7 +73,6 @@ public ItemStack slotClick(int index, int button, int mode, EntityPlayer player)
this.func_94533_d();
}
} else if(this.field_94536_g == 1) {
Slot slot = (Slot) this.inventorySlots.get(index);

if(slot != null && func_94527_a(slot, invPlayer.getItemStack(), true) && slot.isItemValid(invPlayer.getItemStack())
&& invPlayer.getItemStack().stackSize > this.field_94537_h.size() && this.canDragIntoSlot(slot)) {
Expand Down Expand Up @@ -106,13 +119,17 @@ public ItemStack slotClick(int index, int button, int mode, EntityPlayer player)
} else {
this.func_94533_d();
}
/// NOBODY KNOWS ///
} else if(this.field_94536_g != 0) {
this.func_94533_d();

/// NON-DRAG ///
} else {
Slot slot2;

int l1;
ItemStack itemstack5;

/// LMB/RMB ///
if((mode == 0 || mode == 1) && (button == 0 || button == 1)) {
if(index == -999) {
if(invPlayer.getItemStack() != null && index == -999) {
Expand All @@ -134,16 +151,16 @@ public ItemStack slotClick(int index, int button, int mode, EntityPlayer player)
return null;
}

slot2 = (Slot) this.inventorySlots.get(index);
slot = (Slot) this.inventorySlots.get(index);

if(slot2 != null && slot2.canTakeStack(player)) {
if(slot != null && slot.canTakeStack(player)) {
itemstack3 = this.transferStackInSlot(player, index);

if(itemstack3 != null) {
Item item = itemstack3.getItem();
itemstack = itemstack3.copy();
returnStack = itemstack3.copy();

if(slot2.getStack() != null && slot2.getStack().getItem() == item) {
if(slot.getStack() != null && slot.getStack().getItem() == item) {
this.retrySlotClick(index, button, true, player);
}
}
Expand All @@ -153,142 +170,142 @@ public ItemStack slotClick(int index, int button, int mode, EntityPlayer player)
return null;
}

slot2 = (Slot) this.inventorySlots.get(index);
slot = (Slot) this.inventorySlots.get(index);

if(slot2 != null) {
itemstack3 = slot2.getStack();
ItemStack itemstack4 = invPlayer.getItemStack();
if(slot != null) {
itemstack3 = slot.getStack();
ItemStack draggedStack = invPlayer.getItemStack();

if(itemstack3 != null) {
itemstack = itemstack3.copy();
returnStack = itemstack3.copy();
}

if(itemstack3 == null) {
if(itemstack4 != null && slot2.isItemValid(itemstack4)) {
l1 = button == 0 ? itemstack4.stackSize : 1;
if(draggedStack != null && slot.isItemValid(draggedStack)) {
l1 = button == 0 ? draggedStack.stackSize : 1;

if(l1 > slot2.getSlotStackLimit()) {
l1 = slot2.getSlotStackLimit();
if(l1 > slot.getSlotStackLimit()) {
l1 = slot.getSlotStackLimit();
}

if(itemstack4.stackSize >= l1) {
slot2.putStack(itemstack4.splitStack(l1));
if(draggedStack.stackSize >= l1) {
slot.putStack(draggedStack.splitStack(l1));
}

if(itemstack4.stackSize == 0) {
if(draggedStack.stackSize == 0) {
invPlayer.setItemStack((ItemStack) null);
}
}
} else if(slot2.canTakeStack(player)) {
if(itemstack4 == null) {
} else if(slot.canTakeStack(player)) {
if(draggedStack == null) {
l1 = button == 0 ? itemstack3.stackSize : (itemstack3.stackSize + 1) / 2;
itemstack5 = slot2.decrStackSize(l1);
itemstack5 = slot.decrStackSize(l1);
invPlayer.setItemStack(itemstack5);

if(itemstack3.stackSize == 0) {
slot2.putStack((ItemStack) null);
slot.putStack((ItemStack) null);
}

slot2.onPickupFromSlot(player, invPlayer.getItemStack());
} else if(slot2.isItemValid(itemstack4)) {
if(itemstack3.getItem() == itemstack4.getItem() && itemstack3.getItemDamage() == itemstack4.getItemDamage()
&& ItemStack.areItemStackTagsEqual(itemstack3, itemstack4)) {
l1 = button == 0 ? itemstack4.stackSize : 1;
slot.onPickupFromSlot(player, invPlayer.getItemStack());
} else if(slot.isItemValid(draggedStack)) {
if(itemstack3.getItem() == draggedStack.getItem() && itemstack3.getItemDamage() == draggedStack.getItemDamage()
&& ItemStack.areItemStackTagsEqual(itemstack3, draggedStack)) {
l1 = button == 0 ? draggedStack.stackSize : 1;

if(l1 > slot2.getSlotStackLimit() - itemstack3.stackSize) {
l1 = slot2.getSlotStackLimit() - itemstack3.stackSize;
if(l1 > slot.getSlotStackLimit() - itemstack3.stackSize) {
l1 = slot.getSlotStackLimit() - itemstack3.stackSize;
}

if(l1 > itemstack4.getMaxStackSize() - itemstack3.stackSize) {
l1 = itemstack4.getMaxStackSize() - itemstack3.stackSize;
if(l1 > draggedStack.getMaxStackSize() - itemstack3.stackSize) {
l1 = draggedStack.getMaxStackSize() - itemstack3.stackSize;
}

itemstack4.splitStack(l1);
draggedStack.splitStack(l1);

if(itemstack4.stackSize == 0) {
if(draggedStack.stackSize == 0) {
invPlayer.setItemStack((ItemStack) null);
}

itemstack3.stackSize += l1;
} else if(itemstack4.stackSize <= slot2.getSlotStackLimit()) {
slot2.putStack(itemstack4);
} else if(draggedStack.stackSize <= slot.getSlotStackLimit()) {
slot.putStack(draggedStack);
invPlayer.setItemStack(itemstack3);
}
} else if(itemstack3.getItem() == itemstack4.getItem() && itemstack4.getMaxStackSize() > 1
&& (!itemstack3.getHasSubtypes() || itemstack3.getItemDamage() == itemstack4.getItemDamage()) && ItemStack.areItemStackTagsEqual(itemstack3, itemstack4)) {
} else if(itemstack3.getItem() == draggedStack.getItem() && draggedStack.getMaxStackSize() > 1
&& (!itemstack3.getHasSubtypes() || itemstack3.getItemDamage() == draggedStack.getItemDamage()) && ItemStack.areItemStackTagsEqual(itemstack3, draggedStack)) {
l1 = itemstack3.stackSize;

if(l1 > 0 && l1 + itemstack4.stackSize <= itemstack4.getMaxStackSize()) {
itemstack4.stackSize += l1;
itemstack3 = slot2.decrStackSize(l1);
if(l1 > 0 && l1 + draggedStack.stackSize <= draggedStack.getMaxStackSize()) {
draggedStack.stackSize += l1;
itemstack3 = slot.decrStackSize(l1);

if(itemstack3.stackSize == 0) {
slot2.putStack((ItemStack) null);
slot.putStack((ItemStack) null);
}

slot2.onPickupFromSlot(player, invPlayer.getItemStack());
slot.onPickupFromSlot(player, invPlayer.getItemStack());
}
}
}

slot2.onSlotChanged();
slot.onSlotChanged();
}
}
} else if(mode == 2 && button >= 0 && button < 9) {
slot2 = (Slot) this.inventorySlots.get(index);
slot = (Slot) this.inventorySlots.get(index);

if(slot2.canTakeStack(player)) {
if(slot.canTakeStack(player)) {
itemstack3 = invPlayer.getStackInSlot(button);
boolean flag = itemstack3 == null || slot2.inventory == invPlayer && slot2.isItemValid(itemstack3);
boolean flag = itemstack3 == null || slot.inventory == invPlayer && slot.isItemValid(itemstack3);
l1 = -1;

if(!flag) {
l1 = invPlayer.getFirstEmptyStack();
flag |= l1 > -1;
}

if(slot2.getHasStack() && flag) {
itemstack5 = slot2.getStack();
if(slot.getHasStack() && flag) {
itemstack5 = slot.getStack();
invPlayer.setInventorySlotContents(button, itemstack5.copy());

if((slot2.inventory != invPlayer || !slot2.isItemValid(itemstack3)) && itemstack3 != null) {
if((slot.inventory != invPlayer || !slot.isItemValid(itemstack3)) && itemstack3 != null) {
if(l1 > -1) {
invPlayer.addItemStackToInventory(itemstack3);
slot2.decrStackSize(itemstack5.stackSize);
slot2.putStack((ItemStack) null);
slot2.onPickupFromSlot(player, itemstack5);
slot.decrStackSize(itemstack5.stackSize);
slot.putStack((ItemStack) null);
slot.onPickupFromSlot(player, itemstack5);
}
} else {
slot2.decrStackSize(itemstack5.stackSize);
slot2.putStack(itemstack3);
slot2.onPickupFromSlot(player, itemstack5);
slot.decrStackSize(itemstack5.stackSize);
slot.putStack(itemstack3);
slot.onPickupFromSlot(player, itemstack5);
}
} else if(!slot2.getHasStack() && itemstack3 != null && slot2.isItemValid(itemstack3)) {
} else if(!slot.getHasStack() && itemstack3 != null && slot.isItemValid(itemstack3)) {
invPlayer.setInventorySlotContents(button, (ItemStack) null);
slot2.putStack(itemstack3);
slot.putStack(itemstack3);
}
}
} else if(mode == 3 && player.capabilities.isCreativeMode && invPlayer.getItemStack() == null && index >= 0) {
slot2 = (Slot) this.inventorySlots.get(index);
slot = (Slot) this.inventorySlots.get(index);

if(slot2 != null && slot2.getHasStack()) {
itemstack3 = slot2.getStack().copy();
if(slot != null && slot.getHasStack()) {
itemstack3 = slot.getStack().copy();
itemstack3.stackSize = itemstack3.getMaxStackSize();
invPlayer.setItemStack(itemstack3);
}
} else if(mode == 4 && invPlayer.getItemStack() == null && index >= 0) {
slot2 = (Slot) this.inventorySlots.get(index);
slot = (Slot) this.inventorySlots.get(index);

if(slot2 != null && slot2.getHasStack() && slot2.canTakeStack(player)) {
itemstack3 = slot2.decrStackSize(button == 0 ? 1 : slot2.getStack().stackSize);
slot2.onPickupFromSlot(player, itemstack3);
if(slot != null && slot.getHasStack() && slot.canTakeStack(player)) {
itemstack3 = slot.decrStackSize(button == 0 ? 1 : slot.getStack().stackSize);
slot.onPickupFromSlot(player, itemstack3);
player.dropPlayerItemWithRandomChoice(itemstack3, true);
}
} else if(mode == 6 && index >= 0) {
slot2 = (Slot) this.inventorySlots.get(index);
slot = (Slot) this.inventorySlots.get(index);
itemstack3 = invPlayer.getItemStack();

if(itemstack3 != null && (slot2 == null || !slot2.getHasStack() || !slot2.canTakeStack(player))) {
if(itemstack3 != null && (slot == null || !slot.getHasStack() || !slot.canTakeStack(player))) {
i1 = button == 0 ? 0 : this.inventorySlots.size() - 1;
l1 = button == 0 ? 1 : -1;

Expand Down Expand Up @@ -316,6 +333,6 @@ public ItemStack slotClick(int index, int button, int mode, EntityPlayer player)
}
}

return itemstack;
return returnStack;
}
}
5 changes: 2 additions & 3 deletions src/main/java/com/hbm/tileentity/machine/albion/TileEntityPADetector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,12 @@ public void onEnter(Particle particle, ForgeDirection dir) {
if(particle.defocus > 0) { particle.crash(PAState.CRASH_DEFOCUS); return; }
if(this.power < usage) { particle.crash(PAState.CRASH_NOPOWER); return; }
if(!isCool()) { particle.crash(PAState.CRASH_NOCOOL); return; }
this.power -= usage;

for(ParticleAcceleratorRecipe recipe : ParticleAcceleratorRecipes.recipes) {
if(!recipe.matchesRecipe(particle.input1, particle.input2)) continue; // another W for continue

if(particle.momentum < recipe.momentum) {
this.power -= usage;
particle.crash(PAState.CRASH_UNDERSPEED);
return;
}
Expand All @@ -141,12 +142,10 @@ public void onEnter(Particle particle, ForgeDirection dir) {
}
}
}
this.power -= usage;
particle.crash(PAState.SUCCESS);
return;
}

this.power -= usage;
particle.crash(PAState.CRASH_NORECIPE);
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/hbm/lang/en_US.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4866,9 +4866,9 @@ pa.crash_nocoil.desc=The particle has entered a dipole$or quadrupole which lacks
pa.crash_overspeed=Overspeed!
pa.crash_overspeed.desc=The particle has entered a dipole$or quadrupole, while its speed exceeded$the coil's rating. Install higher$tier coils, or configure the dipoles$to leave the accelerator ring sooner.
pa.crash_norecipe=No recipe!
pa.crash_norecipe.desc=The particle entered a detector with an invalid set of inputs. Ensure the particle source inputs match a valid recipe.
pa.crash_norecipe.desc=The particle entered a detector$with an invalid set of inputs.$Ensure the particle source inputs$match a valid recipe.
pa.crash_underspeed=Underspeed!
pa.crash_underspeed.desc=The particle entered a detector with insufficient speed to perform the current recipe. Ensure the accelerator is configured correctly for the recipe.
pa.crash_underspeed.desc=The particle entered a detector$with insufficient speed to perform$the current recipe. Ensure the$accelerator is configured$correctly for the recipe.

potion.hbm_bang=! ! !
potion.hbm_death=Astolfization
Expand Down

0 comments on commit b60db5b

Please sign in to comment.