From 538c36e50a37cca0790f4a27bbc6f467f7ef5ded Mon Sep 17 00:00:00 2001 From: YuRaNnNzZZ Date: Thu, 11 Jan 2024 09:47:01 +0300 Subject: [PATCH 1/3] shield decorator for all shield-like items --- .../kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt index a5ff63f79..7bb4a8a19 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt @@ -15,7 +15,7 @@ import net.minecraft.world.entity.ai.village.poi.PoiTypes import net.minecraft.world.item.DyeColor import net.minecraft.world.item.DyeableArmorItem import net.minecraft.world.item.Item -import net.minecraft.world.item.Items +import net.minecraft.world.item.ShieldItem import net.minecraft.world.level.BlockGetter import net.minecraft.world.level.block.* import net.minecraft.world.level.block.state.BlockBehaviour @@ -30,7 +30,7 @@ import net.minecraftforge.eventbus.api.IEventBus import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent import net.minecraftforge.fml.loading.FMLEnvironment -import net.minecraftforge.registries.DeferredRegister +import net.minecraftforge.registries.ForgeRegistries import net.minecraftforge.registries.NewRegistryEvent import net.minecraftforge.registries.RegisterEvent import ru.dbotthepony.mc.otm.OverdriveThatMatters @@ -406,7 +406,8 @@ object MRegistry : IBlockItemRegistryAcceptor { } private fun registerItemDecorators(event: RegisterItemDecorationsEvent) { - event.register(Items.SHIELD, MatteryGUI::renderShieldCooldownOverlay) - event.register(MItems.TRITANIUM_SHIELD, MatteryGUI::renderShieldCooldownOverlay) + ForgeRegistries.ITEMS.filterIsInstance().forEach { + event.register(it, MatteryGUI::renderShieldCooldownOverlay) + } } } From c01b949b451be8c719844e27d272f50eb3ae1b87 Mon Sep 17 00:00:00 2001 From: YuRaNnNzZZ Date: Thu, 11 Jan 2024 09:50:45 +0300 Subject: [PATCH 2/3] =?UTF-8?q?DBot=20=E2=80=94=20=D0=A1=D0=B5=D0=B3=D0=BE?= =?UTF-8?q?=D0=B4=D0=BD=D1=8F,=20=D0=B2=209:08=20=D0=A2=D0=BE=D1=82=20?= =?UTF-8?q?=D0=B6=D0=B5=20=D0=B2=D0=BE=D0=BF=D1=80=D0=BE=D1=81=20=D0=AF=20?= =?UTF-8?q?=D0=BD=D0=B5=20=D0=B4=D1=83=D0=BC=D0=B0=D1=8E.=20=D0=AF=20?= =?UTF-8?q?=D0=B4=D1=83=D0=BC=D0=B0=D1=8E2=20=D1=87=D1=82=D0=BE=20=D0=BD?= =?UTF-8?q?=D0=B0=D0=B4=D0=BE=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B8=D1=82=D1=8C?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B5=D0=B4=D0=BC=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dbotthepony/mc/otm/menu/tech/EssenceStorageMenu.kt | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EssenceStorageMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EssenceStorageMenu.kt index c5f0cc91b..b9661dec9 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EssenceStorageMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EssenceStorageMenu.kt @@ -7,7 +7,6 @@ import net.minecraft.world.item.ItemStack import net.minecraft.world.item.enchantment.Enchantments import ru.dbotthepony.mc.otm.block.entity.RedstoneSetting import ru.dbotthepony.mc.otm.block.entity.tech.EssenceStorageBlockEntity -import ru.dbotthepony.mc.otm.capability.matteryPlayer import ru.dbotthepony.mc.otm.core.util.getTotalXpRequiredForLevel import ru.dbotthepony.mc.otm.item.EssenceCapsuleItem import ru.dbotthepony.mc.otm.item.EssenceServoItem @@ -88,18 +87,10 @@ class EssenceStorageMenu @JvmOverloads constructor( } init { - storeLevels.filter { - it.isCreative || it.matteryPlayer?.isAndroid == true || servoSlot.item.item == MItems.ESSENCE_SERVO //|| it.itemsStream(true).anyMatch { it.item == MItems.ESSENCE_SERVO } - } - storeLevels.filter { it.experienceProgress > 0f || it.experienceLevel > 0 } - dispenseLevels.filter { - it.isCreative || it.matteryPlayer?.isAndroid == true || servoSlot.item.item == MItems.ESSENCE_SERVO //|| it.itemsStream(true).anyMatch { it.item == MItems.ESSENCE_SERVO } - } - dispenseLevels.filter { (tile?.experienceStored ?: experienceStored) > 0L } if (tile != null) { From 878b715a3e871216928a7c318f73e0256dacf09c Mon Sep 17 00:00:00 2001 From: YuRaNnNzZZ Date: Thu, 11 Jan 2024 10:05:37 +0300 Subject: [PATCH 3/3] =?UTF-8?q?DBot=20=E2=80=94=20=D0=A1=D0=B5=D0=B3=D0=BE?= =?UTF-8?q?=D0=B4=D0=BD=D1=8F,=20=D0=B2=2010:01=20=D0=9E=D0=BD=D0=BE=20?= =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D1=91=D1=82=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D0=BC=D0=B5=D0=B6=D1=83=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9=20?= =?UTF-8?q?=D1=81=D0=BF=D0=B8=D1=81=D0=BE=D0=BA,=20=D0=BB=D1=83=D1=87?= =?UTF-8?q?=D1=88=D0=B5=20=D0=BF=D1=80=D0=BE=D1=81=D1=82=D0=BE=20foreach?= =?UTF-8?q?=20=D0=B8=20is=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt index 7bb4a8a19..e53a262a6 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt @@ -406,8 +406,10 @@ object MRegistry : IBlockItemRegistryAcceptor { } private fun registerItemDecorators(event: RegisterItemDecorationsEvent) { - ForgeRegistries.ITEMS.filterIsInstance().forEach { - event.register(it, MatteryGUI::renderShieldCooldownOverlay) + ForgeRegistries.ITEMS.forEach { + if (it is ShieldItem) { + event.register(it, MatteryGUI::renderShieldCooldownOverlay) + } } } }