xtex/quaedam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xtex:ed6776f9dffd2becb8b177e68f981af3b23ae049
Branches Tags
xtex:main
...
compare: xtex:decb0d3921672c60fbb2128878d78809d5c84c4f
Branches Tags
xtex:main

2 Commits
ed6776f9df ... decb0d3921

Author SHA1 Message Date
xtex
decb0d3921
fix: item exchanging 2023-07-04 22:17:49 +08:00
xtex
442f536b26
feat: use projector as icon of item group 2023-07-04 22:17:35 +08:00
2 changed files with 6 additions and 4 deletions
Show Stats Expand all files Collapse all files

2
common/src/main/kotlin/quaedam/Quaedam.kt
View File

@ -33,7 +33,7 @@ object Quaedam {
val creativeModeTab: RegistrySupplier<CreativeModeTab> = creativeModeTabs.register("quaedam") { val creativeModeTab: RegistrySupplier<CreativeModeTab> = creativeModeTabs.register("quaedam") {
CreativeTabRegistry.create(Component.translatable("category.quaedam")) { CreativeTabRegistry.create(Component.translatable("category.quaedam")) {
ItemStack(Items.TORCH) ItemStack(Projector.item.get())
} }
} }

8
common/src/main/kotlin/quaedam/projection/swarm/ai/ExchangeItem.kt
View File

@ -69,7 +69,7 @@ class ExchangeItem<E> : Behavior<E>(
val container = level.getBlockEntity(target!!) as Container val container = level.getBlockEntity(target!!) as Container
val inventory = entity.inventory val inventory = entity.inventory
for (i in 1..6) { for (i in 1..6) {
val maxCount = level.random.nextInt(16) val maxCount = 1 + level.random.nextInt(16)
if (level.random.nextBoolean()) { if (level.random.nextBoolean()) {
// take // take
val slot = level.random.nextInt(container.containerSize) val slot = level.random.nextInt(container.containerSize)
@ -78,7 +78,7 @@ class ExchangeItem<E> : Behavior<E>(
val takeCount = min(item.count, maxCount) val takeCount = min(item.count, maxCount)
val takeItem = item.copyWithCount(takeCount) val takeItem = item.copyWithCount(takeCount)
if (inventory.canTakeItem(container, slot, takeItem) && entity.canHoldItem(takeItem)) { if (inventory.canTakeItem(container, slot, takeItem) && entity.canHoldItem(takeItem)) {
val remaining = entity.inventory.addItem(entity.equipItemIfPossible(takeItem)) val remaining = inventory.addItem(/*entity.equipItemIfPossible(takeItem)*/ takeItem)
val actualCount = takeCount - remaining.count val actualCount = takeCount - remaining.count
item.shrink(actualCount) item.shrink(actualCount)
container.setItem(slot, item) container.setItem(slot, item)
@ -116,11 +116,13 @@ class ExchangeItem<E> : Behavior<E>(
} }
val putCount = takeCount - takeItem.count val putCount = takeCount - takeItem.count
item.shrink(putCount) item.shrink(putCount)
container.setItem(slot, item) inventory.setItem(slot, item)
} }
} }
} }
} }
container.setChanged()
inventory.setChanged()
} }
} }