minecraft/quickiefabric
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

started refactoring itembag placement

Browse Source
This commit is contained in:
Jörg Henke 2022-02-13 22:29:53 +01:00
parent 1b282bd49c
commit e196bded07
1 changed files with 84 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemBag.java
View File

@ -1,5 +1,8 @@
package de.jottyfan.minecraft.quickiefabric.items; package de.jottyfan.minecraft.quickiefabric.items;
import java.util.ArrayList;
import java.util.List;
import de.jottyfan.minecraft.quickiefabric.container.BackpackInventory; import de.jottyfan.minecraft.quickiefabric.container.BackpackInventory;
import de.jottyfan.minecraft.quickiefabric.item.ModdedItemUsageContext; import de.jottyfan.minecraft.quickiefabric.item.ModdedItemUsageContext;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
@ -21,6 +24,20 @@ import net.minecraft.world.World;
*/ */
public class ItemBag extends ItemBackpack { public class ItemBag extends ItemBackpack {
private Integer useItemsOfStack(ItemStack stack, List<BlockPos> posList, ItemUsageContext context, World world,
PlayerEntity player, Item item) {
for (BlockPos pos : posList) {
BlockHitResult hit = new BlockHitResult(context.getHitPos(), context.getSide(), pos, context.hitsInsideBlock());
ModdedItemUsageContext iuc = new ModdedItemUsageContext(world, player, Hand.MAIN_HAND, stack, hit);
item.useOnBlock(iuc);
stack.decrement(1);
if (stack.getCount() < 1) { // interrupt if stack is empty
break;
}
}
return stack.getCount();
}
@Override @Override
public ActionResult useOnBlock(ItemUsageContext context) { public ActionResult useOnBlock(ItemUsageContext context) {
BlockPos pos = context.getBlockPos(); BlockPos pos = context.getBlockPos();
@ -34,21 +51,21 @@ public class ItemBag extends ItemBackpack {
for (int slot = 0; slot < ItemBackpack.SLOTSIZE; slot++) { for (int slot = 0; slot < ItemBackpack.SLOTSIZE; slot++) {
ItemStack stack = bi.getStack(slot); ItemStack stack = bi.getStack(slot);
if (stack.getCount() > 0) { if (stack.getCount() > 0) {
Item item = stack.getItem(); // not yet working recursive calls of findFreeFields; do not use this now!
// List<BlockPos> posList = findFreeFields(new ArrayList<>(), world, pos, stack.getCount());
List<BlockPos> posList = hackedFindFields(world, pos);
for (int i = stack.getCount(); i > 0; i--) { for (int i = stack.getCount(); i > 0; i--) {
pos = findNextFreeField(world, pos); int beforeUsage = stack.getCount();
if (pos == null) { int afterUsage = useItemsOfStack(stack, posList, context, world, player, stack.getItem());
break; if (afterUsage == beforeUsage) {
} break; // no more fields found
BlockHitResult hit = new BlockHitResult(context.getHitPos(), context.getSide(), pos, } else {
context.hitsInsideBlock()); stack.setCount(afterUsage);
ModdedItemUsageContext iuc = new ModdedItemUsageContext(world, player, Hand.MAIN_HAND, stack, hit);
item.useOnBlock(iuc);
stack.decrement(1);
bi.setStack(slot, stack); bi.setStack(slot, stack);
} }
} }
} }
}
ItemStack thisBackpack = context.getStack(); ItemStack thisBackpack = context.getStack();
BackpackInventory.setItemsToBackpack(thisBackpack, bi); BackpackInventory.setItemsToBackpack(thisBackpack, bi);
player.setStackInHand(context.getHand(), thisBackpack); player.setStackInHand(context.getHand(), thisBackpack);
@ -59,68 +76,71 @@ public class ItemBag extends ItemBackpack {
} }
/** /**
* find the next free field that can be used to set a sapling to... * add pos to list if it is farmland
* *
* @param list the list
* @param world the world * @param world the world
* @param start the starting position * @param pos the pos
* @return the next free block of farmland - might be even the one on start * @return the added pos; might be up or down also; if null, no farmland was
* found or the element has been already added or there are more
* farmland fields than seed
*/ */
private final BlockPos findNextFreeField(World world, BlockPos start) { private BlockPos addToListIfNotYetDone(List<BlockPos> list, World world, BlockPos pos, Integer limit) {
if (isFreeFarmland(world, start)) { if (limit < list.size()) {
return start; return null; // interrupt here to reduce calculation time
} else if (isFreeFarmland(world, start.east())) { } else if (!list.contains(pos) && isFreeFarmland(world, pos)) {
return start.east(); list.add(pos);
} else if (isFreeFarmland(world, start.west())) { return pos;
return start.west(); } else if (!list.contains(pos.up()) && isFreeFarmland(world, pos.up())) {
} else if (isFreeFarmland(world, start.south())) { list.add(pos.up());
return start.south(); return pos.up();
} else if (isFreeFarmland(world, start.north())) { } else if (!list.contains(pos.down()) && isFreeFarmland(world, pos.down())) {
return start.north(); list.add(pos.down());
} else if (isFreeFarmland(world, start.east().south())) { return pos.down();
return start.east().south();
} else if (isFreeFarmland(world, start.west().south())) {
return start.west().south();
} else if (isFreeFarmland(world, start.east().north())) {
return start.east().north();
} else if (isFreeFarmland(world, start.west().north())) {
return start.west().north();
} else if (isFreeFarmland(world, start.east().up())) {
return start.east().up();
} else if (isFreeFarmland(world, start.west().up())) {
return start.west().up();
} else if (isFreeFarmland(world, start.south().up())) {
return start.south().up();
} else if (isFreeFarmland(world, start.north().up())) {
return start.north().up();
} else if (isFreeFarmland(world, start.east().south().up())) {
return start.east().south().up();
} else if (isFreeFarmland(world, start.west().south().up())) {
return start.west().south().up();
} else if (isFreeFarmland(world, start.east().north().up())) {
return start.east().north().up();
} else if (isFreeFarmland(world, start.west().north().up())) {
return start.west().north().up();
} else if (isFreeFarmland(world, start.east().down())) {
return start.east().down();
} else if (isFreeFarmland(world, start.west().down())) {
return start.west().down();
} else if (isFreeFarmland(world, start.south().down())) {
return start.south().down();
} else if (isFreeFarmland(world, start.north().down())) {
return start.north().down();
} else if (isFreeFarmland(world, start.east().south().down())) {
return start.east().south().down();
} else if (isFreeFarmland(world, start.west().south().down())) {
return start.west().south().down();
} else if (isFreeFarmland(world, start.east().north().down())) {
return start.east().north().down();
} else if (isFreeFarmland(world, start.west().north().down())) {
return start.west().north().down();
} else { } else {
return null; return null;
} }
} }
/**
* find the next free fields that can be used to set a sapling to...
*
* @param world the world
* @param start the starting position
* @return the next free blocks of farmland - might be even the one on start
* @deprecated not yet safe abort condition; do not use it in the game
*/
@Deprecated
private final List<BlockPos> findFreeFields(List<BlockPos> list, World world, BlockPos start, Integer limit) {
addToListIfNotYetDone(list, world, start, limit);
BlockPos east = addToListIfNotYetDone(list, world, start.east(), limit);
if (east != null) {
list.addAll(findFreeFields(list, world, east, limit));
}
BlockPos west = addToListIfNotYetDone(list, world, start.west(), limit);
if (west != null) {
list.addAll(findFreeFields(list, world, west, limit));
}
BlockPos south = addToListIfNotYetDone(list, world, start.south(), limit);
if (south != null) {
list.addAll(findFreeFields(list, world, south, limit));
}
BlockPos north = addToListIfNotYetDone(list, world, start.north(), limit);
if (north != null) {
list.addAll(findFreeFields(list, world, north, limit));
}
return list;
}
@Deprecated
private final List<BlockPos> hackedFindFields(World world, BlockPos pos) {
List<BlockPos> list = new ArrayList<>();
if (isFreeFarmland(world, pos)) {
list.add(pos);
}
return list;
}
/** /**
* check if the block on pos is farmland and the one above is air * check if the block on pos is farmland and the one above is air
* *