Factory Dropper stack size ignored for un-stackable items (#209).

This commit is contained in:
stfwi 2022-04-30 09:59:10 +02:00
parent 71dab20e75
commit 86a2d2f865
4 changed files with 8 additions and 5 deletions

View file

@ -7,4 +7,4 @@ meta_download=https://www.curseforge.com/minecraft/mc-mods/engineers-decor/
version_minecraft=1.18.2
version_forge_minecraft=1.18.2-40.0.32
version_jei=1.18.2:9.5.4.171
version_engineersdecor=1.1.22-b2
version_engineersdecor=1.1.22

View file

@ -1,6 +1,7 @@
{
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
"1.18.2": {
"1.1.22": "[R] Release build v1.1.22.\n[M] Factory Dropper stack size ignored for un-stackable items (issue #209, ty LesBeans).",
"1.1.22-b2": "[F] Fixed stairs block reference (issue #207, ty freopt)",
"1.1.22-b1": "[U] Updated to 1.18.2.",
"1.1.21": "[A] Added French translation (PR#203, dracnis).",
@ -54,7 +55,7 @@
"1.1.2-b1": "[U] Ported to MC1.16.2."
},
"promos": {
"1.18.2-recommended": "1.1.21",
"1.18.2-latest": "1.1.22-b2"
"1.18.2-recommended": "1.1.22",
"1.18.2-latest": "1.1.22"
}
}

View file

@ -11,6 +11,9 @@ Mod sources for Minecraft version 1.18.x.
## Version history
- v1.1.22 [R] Release build v1.1.22.
[M] Factory Dropper stack size ignored for un-stackable items (issue #209, ty LesBeans).
- v1.1.22-b2 [F] Fixed stairs block reference (issue #207, ty freopt)
- v1.1.22-b1 [U] Updated to 1.18.2.

View file

@ -51,7 +51,6 @@ import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import wile.engineersdecor.ModConfig;
import wile.engineersdecor.ModContent;
import wile.engineersdecor.ModEngineersDecor;
import wile.engineersdecor.libmc.blocks.StandardBlocks;
import wile.engineersdecor.libmc.blocks.StandardEntityBlocks;
import wile.engineersdecor.libmc.detail.Auxiliaries;
@ -560,7 +559,7 @@ public class EdDropper
final int ic = drop_slot_index_;
drop_slot_index_ = next_slot(drop_slot_index_);
ItemStack ds = main_inventory_.getItem(ic);
if((!ds.isEmpty()) && (ds.getCount() >= drop_count_)) {
if((!ds.isEmpty()) && ((ds.getCount() >= drop_count_) || (!ds.isStackable()))) {
boolean skip_stack = false;
for(int ci = 0; (ci<CTRL_SLOTS_SIZE)&&(!skip_stack); ++ci) {
final ItemStack cmp_stack = main_inventory_.getItem(CTRL_SLOTS_FIRST+ci);