fix off by one (#12)

This commit is contained in:
Glease authored and GitHub committed 2022-12-18 13:18:39 +00:00
1 parent 1a29fce77a
commit dedd607537
5 files changed
+646 -190

No files matched your search

+44
View File
@@ -0,0 +1,44 @@
* text eol=lf
*.[jJ][aA][rR] binary
*.[pP][nN][gG] binary
*.[jJ][pP][gG] binary
*.[jJ][pP][eE][gG] binary
*.[gG][iI][fF] binary
*.[tT][iI][fF] binary
*.[tT][iI][fF][fF] binary
*.[iI][cC][oO] binary
*.[sS][vV][gG] text
*.[eE][pP][sS] binary
*.[xX][cC][fF] binary
*.[kK][aA][rR] binary
*.[mM]4[aA] binary
*.[mM][iI][dD] binary
*.[mM][iI][dD][iI] binary
*.[mM][pP]3 binary
*.[oO][gG][gG] binary
*.[rR][aA] binary
*.7[zZ] binary
*.[gG][zZ] binary
*.[tT][aA][rR] binary
*.[tT][gG][zZ] binary
*.[zZ][iI][pP] binary
*.[tT][cC][nN] binary
*.[sS][oO] binary
*.[dD][lL][lL] binary
*.[dD][yY][lL][iI][bB] binary
*.[pP][sS][dD] binary
*.[tT][tT][fF] binary
*.[oO][tT][fF] binary
*.[pP][aA][tT][cC][hH] -text
*.[bB][aA][tT] text eol=crlf
*.[cC][mM][dD] text eol=crlf
*.[pP][sS]1 text eol=crlf
*[aA][uU][tT][oO][gG][eE][nN][eE][rR][aA][tT][eE][dD]* binary
+583 -189
View File
File diff suppressed because it is too large. Load diff
+1
View File
@@ -58,3 +58,4 @@ containsMixinsAndOrCoreModOnly = false
# If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
# responsibility check the licence and request permission for distribution, if required.
usesShadowedDependencies = false
disableSpotless = true
+10
View File
@@ -0,0 +1,10 @@
plugins {
id 'com.diffplug.blowdryerSetup' version '1.6.0'
}
apply plugin: 'com.diffplug.blowdryerSetup'
blowdryerSetup {
github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.1.5')
//devLocal '.' // Use this when testing config updates locally
}
@@ -112,9 +112,16 @@ public class ContainerCharmPouch extends Container{
ItemStack is2 = slot.getStack();
is = is2.copy();
if (slotId < 9){
if (slotId < 8){
if (!mergeItemStack(is2,9,inventorySlots.size(),true))return null;
}
else if (slotId == 8){
if (!mergeItemStack(is2,0,3,false) && !mergeItemStack(is2, 9, inventorySlots.size(), true))return null;
for (int i = 0; i < runeInv.getSizeInventory(); i++){
runeInv.decrStackSize(i, 1);
}
}
else{
if (is2.getItem() == ItemList.charm){
if (!mergeItemStack(is2,0,3,false))return null;