AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-19 04:15:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix slot type checking

Browse Source
This commit is contained in:
Bixilon 2022-02-25 21:37:15 +01:00
parent e9ab22e20a
commit 5028064bbc
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
7 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/de/bixilon/minosoft/data/registries/other/containers/slots/ReadOnlySlotType.kt
View File

@ -19,6 +19,5 @@ import de.bixilon.minosoft.data.registries.other.containers.Container
object ReadOnlySlotType : SlotType {
override fun canRemove(container: Container, slot: Int, stack: ItemStack): Boolean = false
override fun canModify(container: Container, slot: Int, stack: ItemStack): Boolean = false
override fun canPut(container: Container, slot: Int, stack: ItemStack): Boolean = false
}

3
src/main/java/de/bixilon/minosoft/data/registries/other/containers/slots/RemoveOnlySlotType.kt
View File

@ -19,6 +19,5 @@ import de.bixilon.minosoft.data.registries.other.containers.Container
object RemoveOnlySlotType : SlotType {
override fun canRemove(container: Container, slot: Int, stack: ItemStack): Boolean = true
override fun canModify(container: Container, slot: Int, stack: ItemStack): Boolean = true
override fun canPut(container: Container, slot: Int, stack: ItemStack): Boolean = true
override fun canPut(container: Container, slot: Int, stack: ItemStack): Boolean = false
}

7
src/main/java/de/bixilon/minosoft/data/registries/other/containers/slots/SlotType.kt
View File

@ -18,7 +18,10 @@ import de.bixilon.minosoft.data.registries.other.containers.Container
interface SlotType {
fun canRemove(container: Container, slot: Int, stack: ItemStack) = true
fun canModify(container: Container, slot: Int, stack: ItemStack) = true
fun canRemove(container: Container, slot: Int, stack: ItemStack): Boolean {
// ToDo: Check course of binding
return true
}
fun canPut(container: Container, slot: Int, stack: ItemStack) = true
}

2
src/main/java/de/bixilon/minosoft/data/registries/other/containers/slots/equipment/ChestSlotType.kt
View File

@ -25,6 +25,6 @@ object ChestSlotType : EquipmentSlotType {
if (item !is ArmorItem) {
return false
}
return item.equipmentSlot == InventorySlots.EquipmentSlots.CHEST
return item.equipmentSlot == InventorySlots.EquipmentSlots.CHEST && super.canPut(container, slot, stack)
}
}

2
src/main/java/de/bixilon/minosoft/data/registries/other/containers/slots/equipment/FeetSlotType.kt
View File

@ -25,6 +25,6 @@ object FeetSlotType : EquipmentSlotType {
if (item !is ArmorItem) {
return false
}
return item.equipmentSlot == InventorySlots.EquipmentSlots.FEET
return item.equipmentSlot == InventorySlots.EquipmentSlots.FEET && super.canPut(container, slot, stack)
}
}

7
src/main/java/de/bixilon/minosoft/data/registries/other/containers/slots/equipment/HeadSlotType.kt
View File

@ -15,6 +15,7 @@ package de.bixilon.minosoft.data.registries.other.containers.slots.equipment
import de.bixilon.minosoft.data.inventory.InventorySlots
import de.bixilon.minosoft.data.inventory.stack.ItemStack
import de.bixilon.minosoft.data.registries.blocks.MinecraftBlocks
import de.bixilon.minosoft.data.registries.items.armor.ArmorItem
import de.bixilon.minosoft.data.registries.other.containers.Container
@ -22,10 +23,12 @@ object HeadSlotType : EquipmentSlotType {
override fun canPut(container: Container, slot: Int, stack: ItemStack): Boolean {
val item = stack.item.item
// ToDo: Carved pumpkin
if (item.resourceLocation == MinecraftBlocks.CARVED_PUMPKIN) {
return super.canPut(container, slot, stack)
}
if (item !is ArmorItem) {
return false
}
return item.equipmentSlot == InventorySlots.EquipmentSlots.HEAD
return item.equipmentSlot == InventorySlots.EquipmentSlots.HEAD && super.canPut(container, slot, stack)
}
}

2
src/main/java/de/bixilon/minosoft/data/registries/other/containers/slots/equipment/LegsSlotType.kt
View File

@ -25,6 +25,6 @@ object LegsSlotType : EquipmentSlotType {
if (item !is ArmorItem) {
return false
}
return item.equipmentSlot == InventorySlots.EquipmentSlots.LEGS
return item.equipmentSlot == InventorySlots.EquipmentSlots.LEGS && super.canPut(container, slot, stack)
}
}