patch of Multiloader on Cloche · round #0 · pull #1 · lesbian.skin/cfs

-16

src/main/kotlin/xyz/naomieow/asbestos/AsbestosModClient.kt

···

       1
       1
       -
       package xyz.naomieow.asbestos

     

       2
       2
       -
       

     

       3
       3
       -
       import net.fabricmc.api.ClientModInitializer

     

       4
       4
       -
       import net.fabricmc.api.EnvType

     

       5
       5
       -
       import net.fabricmc.api.Environment

     

       6
       6
       -
       import net.minecraft.client.gui.screens.MenuScreens

     

       7
       7
       -
       import xyz.naomieow.asbestos.screen.CancerMeterScreen

     

       8
       8
       -
       import xyz.naomieow.asbestos.screen.ModMenuTypes

     

       9
       9
       -
       

     

       10
       10
       -
       @Environment(EnvType.CLIENT)

     

       11
       11
       -
       class AsbestosModClient : ClientModInitializer {

     

       12
       12
       -
           override fun onInitializeClient() {

     

       13
       13
       -
               MenuScreens.register(ModMenuTypes.CancerMeter, ::CancerMeterScreen)

     

       14
       14
       -
           }

     

       15
       15
       -
       

     

       16
       16
       -
       }

+24

src/main/kotlin/xyz/naomieow/asbestos/client/AsbestosModClient.kt

···

       1
       1
       +
       package xyz.naomieow.asbestos.client

     

       2
       2
       +
       

     

       3
       3
       +
       import net.fabricmc.api.ClientModInitializer

     

       4
       4
       +
       import net.fabricmc.api.EnvType

     

       5
       5
       +
       import net.fabricmc.api.Environment

     

       6
       6
       +
       import net.minecraft.client.gui.screens.MenuScreens

     

       7
       7
       +
       import net.minecraft.resources.ResourceLocation

     

       8
       8
       +
       import xyz.naomieow.asbestos.client.screen.CancerMeterScreen

     

       9
       9
       +
       import xyz.naomieow.asbestos.client.screen.ModMenuTypes

     

       10
       10
       +
       

     

       11
       11
       +
       const val MOD_ID: String = "asbestos"

     

       12
       12
       +
       

     

       13
       13
       +
       internal inline fun id(path: String): ResourceLocation {

     

       14
       14
       +
           return ResourceLocation(MOD_ID, path)

     

       15
       15
       +
       }

     

       16
       16
       +
       

     

       17
       17
       +
       @Environment(EnvType.CLIENT)

     

       18
       18
       +
       class AsbestosModClient : ClientModInitializer {

     

       19
       19
       +
           override fun onInitializeClient() {

     

       20
       20
       +
               ModMenuTypes.register()

     

       21
       21
       +
               MenuScreens.register(ModMenuTypes.CancerMeter, ::CancerMeterScreen)

     

       22
       22
       +
           }

     

       23
       23
       +
       

     

       24
       24
       +
       }

+67

src/main/kotlin/xyz/naomieow/asbestos/client/ModMenuIntegration.kt

···

       1
       1
       +
       package xyz.naomieow.asbestos.client

     

       2
       2
       +
       

     

       3
       3
       +
       import com.terraformersmc.modmenu.api.ConfigScreenFactory

     

       4
       4
       +
       import com.terraformersmc.modmenu.api.ModMenuApi

     

       5
       5
       +
       import dev.isxander.yacl3.api.ConfigCategory

     

       6
       6
       +
       import dev.isxander.yacl3.api.Option

     

       7
       7
       +
       import dev.isxander.yacl3.api.OptionDescription

     

       8
       8
       +
       import dev.isxander.yacl3.api.YetAnotherConfigLib

     

       9
       9
       +
       import dev.isxander.yacl3.api.controller.FloatFieldControllerBuilder

     

       10
       10
       +
       import dev.isxander.yacl3.api.controller.IntegerFieldControllerBuilder

     

       11
       11
       +
       import dev.isxander.yacl3.api.controller.IntegerSliderControllerBuilder

     

       12
       12
       +
       import net.minecraft.network.chat.Component

     

       13
       13
       +
       import xyz.naomieow.asbestos.config.AsbestosConfig.Companion.exsanguination

     

       14
       14
       +
       import xyz.naomieow.asbestos.config.AsbestosConfig.Companion.offset

     

       15
       15
       +
       import xyz.naomieow.asbestos.config.AsbestosConfig.Companion.period

     

       16
       16
       +
       import xyz.naomieow.asbestos.config.AsbestosConfig.Companion.threshold

     

       17
       17
       +
       

     

       18
       18
       +
       class ModMenuIntegration: ModMenuApi {

     

       19
       19
       +
           override fun getModConfigScreenFactory(): ConfigScreenFactory<*> {

     

       20
       20
       +
               return ConfigScreenFactory { parent ->

     

       21
       21
       +
                   YetAnotherConfigLib.createBuilder()

     

       22
       22
       +
                       .title(Component.translatable("text.config.asbestos_config.title"))

     

       23
       23
       +
                       .category(ConfigCategory.createBuilder()

     

       24
       24
       +
                           .name(Component.translatable("text.config.asbestos_config.title"))

     

       25
       25
       +
                           .option(Option.createBuilder<Int>()

     

       26
       26
       +
                               .name(Component.translatable("text.config.asbestos_config.option.offset"))

     

       27
       27
       +
                               .description(OptionDescription.of(Component.translatable("text.config.asbestos_config.option.offset.desc")))

     

       28
       28
       +
                               .binding(3, { offset }) { value ->

     

       29
       29
       +
                                   offset = value

     

       30
       30
       +
                               }

     

       31
       31
       +
                               .controller {

     

       32
       32
       +
                                   IntegerSliderControllerBuilder

     

       33
       33
       +
                                       .create(it)

     

       34
       34
       +
                                       .step(1)

     

       35
       35
       +
                                       .range(0, 32)

     

       36
       36
       +
                               }

     

       37
       37
       +
                               .build())

     

       38
       38
       +
                           .option(Option.createBuilder<Float>()

     

       39
       39
       +
                               .name(Component.translatable("text.config.asbestos_config.option.period"))

     

       40
       40
       +
                               .description(OptionDescription.of(Component.translatable("text.config.asbestos_config.option.period.desc")))

     

       41
       41
       +
                               .binding(5.0f, { period }) { value ->

     

       42
       42
       +
                                   period = value

     

       43
       43
       +
                               }

     

       44
       44
       +
                               .controller(FloatFieldControllerBuilder::create)

     

       45
       45
       +
                               .build())

     

       46
       46
       +
                           .option(Option.createBuilder<Int>()

     

       47
       47
       +
                               .name(Component.translatable("text.config.asbestos_config.option.threshold"))

     

       48
       48
       +
                               .description(OptionDescription.of(Component.translatable("text.config.asbestos_config.option.threshold.desc")))

     

       49
       49
       +
                               .binding(180, { threshold }) { value ->

     

       50
       50
       +
                                   threshold = value

     

       51
       51
       +
                               }

     

       52
       52
       +
                               .controller(IntegerFieldControllerBuilder::create)

     

       53
       53
       +
                               .build())

     

       54
       54
       +
                           .option(Option.createBuilder<Float>()

     

       55
       55
       +
                               .name(Component.translatable("text.config.asbestos_config.option.exsanguination"))

     

       56
       56
       +
                               .description(OptionDescription.of(Component.translatable("text.config.asbestos_config.option.exsanguination.desc")))

     

       57
       57
       +
                               .binding(1.0f, { exsanguination }) { value ->

     

       58
       58
       +
                                   exsanguination = value

     

       59
       59
       +
                               }

     

       60
       60
       +
                               .controller(FloatFieldControllerBuilder::create)

     

       61
       61
       +
                               .build())

     

       62
       62
       +
                           .build())

     

       63
       63
       +
                       .build()

     

       64
       64
       +
                       .generateScreen(parent)

     

       65
       65
       +
               }

     

       66
       66
       +
           }

     

       67
       67
       +
       }

+3 -3

src/main/kotlin/xyz/naomieow/asbestos/screen/CancerMeterScreen.kt src/main/kotlin/xyz/naomieow/asbestos/client/screen/CancerMeterScreen.kt

···

       1
       1
       -
       package xyz.naomieow.asbestos.screen

     

       1
       1
       +
       package xyz.naomieow.asbestos.client.screen

     

       2
       2
        
       

     

       3
       3
        
       import net.fabricmc.api.EnvType

     

       4
       4
        
       import net.fabricmc.api.Environment

     
···

       7
       7
        
       import net.minecraft.network.chat.Component

     

       8
       8
        
       import net.minecraft.resources.ResourceLocation

     

       9
       9
        
       import net.minecraft.world.entity.player.Inventory

     

       10
       10
       -
       import xyz.naomieow.asbestos.id

     

       10
       10
       +
       import xyz.naomieow.asbestos.client.screen.util.MouseUtil

     

       11
       11
       +
       import xyz.naomieow.asbestos.client.id

     

       11
       12
        
       import xyz.naomieow.asbestos.config.AsbestosConfig

     

       12
       12
       -
       import xyz.naomieow.asbestos.screen.util.MouseUtil

     

       13
       13
        
       import java.util.Optional

     

       14
       14
        
       

     

       15
       15
        
       @Environment(EnvType.CLIENT)

+1 -1

src/main/kotlin/xyz/naomieow/asbestos/screen/CancerMeterScreenHandler.kt src/main/kotlin/xyz/naomieow/asbestos/client/screen/CancerMeterScreenHandler.kt

···

       1
       1
       -
       package xyz.naomieow.asbestos.screen

     

       1
       1
       +
       package xyz.naomieow.asbestos.client.screen

     

       2
       2
        
       

     

       3
       3
        
       import net.minecraft.network.FriendlyByteBuf

     

       4
       4
        
       import net.minecraft.world.entity.EquipmentSlot

-61

src/main/kotlin/xyz/naomieow/asbestos/config/AsbestosConfig.kt

···

       1
       1
        
       package xyz.naomieow.asbestos.config

     

       2
       2
        
       

     

       3
       3
       -
       import dev.isxander.yacl3.api.ConfigCategory

     

       4
       4
       -
       import dev.isxander.yacl3.api.Option

     

       5
       5
       -
       import dev.isxander.yacl3.api.OptionDescription

     

       6
       6
       -
       import dev.isxander.yacl3.api.YetAnotherConfigLib

     

       7
       7
       -
       import dev.isxander.yacl3.api.controller.ControllerBuilder

     

       8
       8
       -
       import dev.isxander.yacl3.api.controller.FloatFieldControllerBuilder

     

       9
       9
       -
       import dev.isxander.yacl3.api.controller.IntegerFieldControllerBuilder

     

       10
       10
       -
       import dev.isxander.yacl3.api.controller.IntegerSliderControllerBuilder

     

       11
       3
        
       import dev.isxander.yacl3.config.v2.api.ConfigClassHandler

     

       12
       4
        
       import dev.isxander.yacl3.config.v2.api.SerialEntry

     

       13
       5
        
       import dev.isxander.yacl3.config.v2.api.serializer.GsonConfigSerializerBuilder

     

       14
       14
       -
       import dev.isxander.yacl3.dsl.binding

     

       15
       15
       -
       import dev.isxander.yacl3.dsl.controller

     

       16
       16
       -
       import dev.isxander.yacl3.gui.controllers.slider.IntegerSliderController

     

       17
       17
       -
       import dev.isxander.yacl3.impl.YetAnotherConfigLibImpl

     

       18
       6
        
       import net.fabricmc.loader.api.FabricLoader

     

       19
       19
       -
       import net.minecraft.client.gui.screens.Screen

     

       20
       20
       -
       import net.minecraft.network.chat.Component

     

       21
       7
        
       import xyz.naomieow.asbestos.id

     

       22
       8
        
       

     

       23
       9
        
       class AsbestosConfig {

     
···

       38
       24
        
               @SerialEntry

     

       39
       25
        
               var exsanguination: Float = 1.0f

     

       40
       26
        
       

     

       41
       41
       -
               fun screen(parent: Screen?): Screen {

     

       42
       42
       -
                   return YetAnotherConfigLib.createBuilder()

     

       43
       43
       -
                       .title(Component.translatable("text.config.asbestos_config.title"))

     

       44
       44
       -
                       .category(ConfigCategory.createBuilder()

     

       45
       45
       -
                           .name(Component.translatable("text.config.asbestos_config.title"))

     

       46
       46
       -
                           .option(Option.createBuilder<Int>()

     

       47
       47
       -
                               .name(Component.translatable("text.config.asbestos_config.option.offset"))

     

       48
       48
       -
                               .description(OptionDescription.of(Component.translatable("text.config.asbestos_config.option.offset.desc")))

     

       49
       49
       -
                               .binding(3, { offset }) { value ->

     

       50
       50
       -
                                   offset = value

     

       51
       51
       -
                               }

     

       52
       52
       -
                               .controller {

     

       53
       53
       -
                                   IntegerSliderControllerBuilder

     

       54
       54
       -
                                       .create(it)

     

       55
       55
       -
                                       .step(1)

     

       56
       56
       -
                                       .range(0, 32)

     

       57
       57
       -
                               }

     

       58
       58
       -
                               .build())

     

       59
       59
       -
                           .option(Option.createBuilder<Float>()

     

       60
       60
       -
                               .name(Component.translatable("text.config.asbestos_config.option.period"))

     

       61
       61
       -
                               .description(OptionDescription.of(Component.translatable("text.config.asbestos_config.option.period.desc")))

     

       62
       62
       -
                               .binding(5.0f, { period }) { value ->

     

       63
       63
       -
                                   period = value

     

       64
       64
       -
                               }

     

       65
       65
       -
                               .controller(FloatFieldControllerBuilder::create)

     

       66
       66
       -
                               .build())

     

       67
       67
       -
                           .option(Option.createBuilder<Int>()

     

       68
       68
       -
                               .name(Component.translatable("text.config.asbestos_config.option.threshold"))

     

       69
       69
       -
                               .description(OptionDescription.of(Component.translatable("text.config.asbestos_config.option.threshold.desc")))

     

       70
       70
       -
                               .binding(180, { threshold }) { value ->

     

       71
       71
       -
                                   threshold = value

     

       72
       72
       -
                               }

     

       73
       73
       -
                               .controller(IntegerFieldControllerBuilder::create)

     

       74
       74
       -
                               .build())

     

       75
       75
       -
                           .option(Option.createBuilder<Float>()

     

       76
       76
       -
                               .name(Component.translatable("text.config.asbestos_config.option.exsanguination"))

     

       77
       77
       -
                               .description(OptionDescription.of(Component.translatable("text.config.asbestos_config.option.exsanguination.desc")))

     

       78
       78
       -
                               .binding(1.0f, { exsanguination }) { value ->

     

       79
       79
       -
                                   exsanguination = value

     

       80
       80
       -
                               }

     

       81
       81
       -
                               .controller(FloatFieldControllerBuilder::create)

     

       82
       82
       -
                               .build())

     

       83
       83
       -
                           .build())

     

       84
       84
       -
                       .build()

     

       85
       85
       -
                       .generateScreen(parent)

     

       86
       86
       -
               }

     

       87
       87
       -
       

     

       88
       27
        
               val Handler: ConfigClassHandler<AsbestosConfig> = ConfigClassHandler.createBuilder(AsbestosConfig::class.java)

     

       89
       28
        
                   .id(id("asbestos_config"))

     

       90
       29
        
                   .serializer { config ->

-13

src/main/kotlin/xyz/naomieow/asbestos/config/ModMenuIntegration.kt

···

       1
       1
       -
       package xyz.naomieow.asbestos.config

     

       2
       2
       -
       

     

       3
       3
       -
       import com.terraformersmc.modmenu.api.ConfigScreenFactory

     

       4
       4
       -
       import com.terraformersmc.modmenu.api.ModMenuApi

     

       5
       5
       -
       import net.minecraft.client.gui.screens.Screen

     

       6
       6
       -
       

     

       7
       7
       -
       class ModMenuIntegration: ModMenuApi {

     

       8
       8
       -
           override fun getModConfigScreenFactory(): ConfigScreenFactory<*> {

     

       9
       9
       -
               return ConfigScreenFactory { parent ->

     

       10
       10
       -
                   AsbestosConfig.screen(parent)

     

       11
       11
       -
               }

     

       12
       12
       -
           }

     

       13
       13
       -
       }

+1 -1

src/main/kotlin/xyz/naomieow/asbestos/inventory/CancerMeterInventory.kt

···

       12
       12
        
       import net.minecraft.world.inventory.AbstractContainerMenu

     

       13
       13
        
       import net.minecraft.world.item.ItemStack

     

       14
       14
        
       import net.minecraft.world.level.Level

     

       15
       15
       -
       import xyz.naomieow.asbestos.screen.CancerMeterScreenHandler

     

       15
       15
       +
       import xyz.naomieow.asbestos.client.screen.CancerMeterScreenHandler

     

       16
       16
        
       

     

       17
       17
        
       class CancerMeterInventory(

     

       18
       18
        
           private var stack: ItemStack,

+43

src/common/main/kotlin/xyz/naomieow/asbestos/Asbestos.kt

···

       1
       1
       +
       package xyz.naomieow.asbestos

     

       2
       2
       +
       

     

       3
       3
       +
       import dev.mayaqq.cynosure.events.api.EventSubscriber

     

       4
       4
       +
       import net.minecraft.core.registries.Registries

     

       5
       5
       +
       import net.minecraft.resources.ResourceKey

     

       6
       6
       +
       import net.minecraft.resources.ResourceLocation

     

       7
       7
       +
       import net.minecraft.world.level.block.Block

     

       8
       8
       +
       import net.minecraft.world.level.levelgen.placement.PlacedFeature

     

       9
       9
       +
       import org.slf4j.Logger

     

       10
       10
       +
       import org.slf4j.LoggerFactory

     

       11
       11
       +
       import uwu.serenity.kritter.RegistryManager

     

       12
       12
       +
       import xyz.naomieow.asbestos.block.AsbestosBlocks

     

       13
       13
       +
       import xyz.naomieow.asbestos.item.AsbestosCreativeTabs

     

       14
       14
       +
       import xyz.naomieow.asbestos.item.AsbestosItems

     

       15
       15
       +
       import xyz.naomieow.asbestos.mob_effect.AsbestosMobEffects

     

       16
       16
       +
       

     

       17
       17
       +
       public const val MOD_ID: String = "asbestos"

     

       18
       18
       +
       public const val MOD_NAME: String = "Carcinogenic Fibrous Silicate"

     

       19
       19
       +
       

     

       20
       20
       +
       @Suppress("NOTHING_TO_INLINE")

     

       21
       21
       +
       public inline fun id(path: String): ResourceLocation {

     

       22
       22
       +
           return ResourceLocation(MOD_ID, path)

     

       23
       23
       +
       }

     

       24
       24
       +
       

     

       25
       25
       +
       @EventSubscriber

     

       26
       26
       +
       public object Asbestos:

     

       27
       27
       +
           Logger by LoggerFactory.getLogger(MOD_NAME),

     

       28
       28
       +
           RegistryManager by RegistryManager(MOD_ID)

     

       29
       29
       +
       {

     

       30
       30
       +
           public val harmfulPassiveBlocks: Array<Block> by lazy { arrayOf(AsbestosBlocks.AsbestosBlock) }

     

       31
       31
       +
           public val serpentinitePlacedKey: ResourceKey<PlacedFeature> = ResourceKey.create(

     

       32
       32
       +
               Registries.PLACED_FEATURE,

     

       33
       33
       +
               id("serpentinite")

     

       34
       34
       +
           )

     

       35
       35
       +
       

     

       36
       36
       +
           public fun init() {

     

       37
       37
       +
               AsbestosMobEffects.register()

     

       38
       38
       +
               AsbestosBlocks.register()

     

       39
       39
       +
               AsbestosItems.register()

     

       40
       40
       +
               AsbestosCreativeTabs.register()

     

       41
       41
       +
               info("Now entitled to financial compensation..")

     

       42
       42
       +
           }

     

       43
       43
       +
       }

+3 -3

src/main/kotlin/xyz/naomieow/asbestos/armor/ProtectiveMaterial.kt src/common/main/kotlin/xyz/naomieow/asbestos/armor/ProtectiveMaterial.kt

···

       7
       7
        
       import net.minecraft.world.item.Items

     

       8
       8
        
       import net.minecraft.world.item.crafting.Ingredient

     

       9
       9
        
       

     

       10
       10
       -
       class ProtectiveMaterial : ArmorMaterial {

     

       10
       10
       +
       public class ProtectiveMaterial : ArmorMaterial {

     

       11
       11
        
           override fun getDurabilityForType(type: ArmorItem.Type): Int {

     

       12
       12
        
               return BASE_DURABILITY[type.slot.index]

     

       13
       13
        
           }

     
···

       40
       40
        
               return 0f

     

       41
       41
        
           }

     

       42
       42
        
       

     

       43
       43
       -
           companion object {

     

       43
       43
       +
           public companion object {

     

       44
       44
        
               private val BASE_DURABILITY = intArrayOf(13, 15, 16, 11)

     

       45
       45
        
               private val PROTECTION_VALUES = intArrayOf(1, 1, 2, 1)

     

       46
       46
        
       

     

       47
       47
       -
               val INSTANCE: ProtectiveMaterial = ProtectiveMaterial()

     

       47
       47
       +
               public val INSTANCE: ProtectiveMaterial = ProtectiveMaterial()

     

       48
       48
        
           }

     

       49
       49
        
       }

+8 -8

src/main/kotlin/xyz/naomieow/asbestos/block/ModBlocks.kt src/common/main/kotlin/xyz/naomieow/asbestos/block/AsbestosBlocks.kt

···

       5
       5
        
       import net.minecraft.world.level.block.Blocks

     

       6
       6
        
       import uwu.serenity.kritter.api.Registrar

     

       7
       7
        
       import uwu.serenity.kritter.stdlib.block

     

       8
       8
       -
       import xyz.naomieow.asbestos.AsbestosMod

     

       8
       8
       +
       import xyz.naomieow.asbestos.Asbestos

     

       9
       9
        
       

     

       10
       10
        
       @Suppress("UNUSED")

     

       11
       11
       -
       object ModBlocks: Registrar<Block> by AsbestosMod..Registries.BLOCK {

     

       12
       12
       -
           val AsbestosBlock: Block by block("asbestos_block", { properties ->

     

       11
       11
       +
       public object AsbestosBlocks: Registrar<Block> by Asbestos..Registries.BLOCK {

     

       12
       12
       +
           public val AsbestosBlock: Block by block("asbestos_block", { properties ->

     

       13
       13
        
               CarcinogenicBlock(properties, 40)

     

       14
       14
        
           }) {

     

       15
       15
        
               copyProperties(Blocks::WHITE_WOOL)

     
···

       19
       19
        
               }

     

       20
       20
        
           }

     

       21
       21
        
       

     

       22
       22
       -
           val SerpentiniteBlock: Block by block("serpentinite_block", { properties ->

     

       22
       22
       +
           public val SerpentiniteBlock: Block by block("serpentinite_block", { properties ->

     

       23
       23
        
               CarcinogenicBlock(properties, 20)

     

       24
       24
        
           }) {

     

       25
       25
        
               copyProperties(Blocks::STONE)

     
···

       30
       30
        
               }

     

       31
       31
        
           }

     

       32
       32
        
       

     

       33
       33
       -
           val PopcornCeilingBlock: Block by block("popcorn_ceiling_block", { properties ->

     

       33
       33
       +
           public val PopcornCeilingBlock: Block by block("popcorn_ceiling_block", { properties ->

     

       34
       34
        
               CarcinogenicBlock(properties, 20)

     

       35
       35
        
           }) {

     

       36
       36
        
               copyProperties(Blocks::OAK_PLANKS)

     
···

       40
       40
        
               }

     

       41
       41
        
           }

     

       42
       42
        
       

     

       43
       43
       -
           val AsbestosTileBlock: Block by block("asbestos_tile_block", { properties ->

     

       43
       43
       +
           public val AsbestosTileBlock: Block by block("asbestos_tile_block", { properties ->

     

       44
       44
        
               CarcinogenicBlock(properties, 20)

     

       45
       45
        
           }) {

     

       46
       46
        
               copyProperties(Blocks::NETHER_BRICKS)

     
···

       50
       50
        
               }

     

       51
       51
        
           }

     

       52
       52
        
       

     

       53
       53
       -
           val AsbestosRoofBlock: Block by block("asbestos_roof_block", { properties ->

     

       54
       54
       -
               CarcinogenicBlock(properties, 20)

     

       53
       53
       +
           public val AsbestosRoofBlock: Block by block("asbestos_roof_block", { properties ->

     

       54
       54
       +
               AsbestosRoofBlock(properties, 20)

     

       55
       55
        
           }) {

     

       56
       56
        
               copyProperties { AsbestosTileBlock }

     

       57
       57
        
               properties {

+9 -10

src/main/kotlin/xyz/naomieow/asbestos/block/AsbestosRoofBlock.kt src/common/main/kotlin/xyz/naomieow/asbestos/block/AsbestosRoofBlock.kt

···

       1
       1
        
       package xyz.naomieow.asbestos.block

     

       2
       2
        
       

     

       3
       3
       -
       import net.fabricmc.api.EnvType

     

       4
       4
       -
       import net.fabricmc.api.Environment

     

       5
       5
       -
       import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap

     

       6
       6
       -
       import net.fabricmc.loader.api.FabricLoader

     

       7
       7
       -
       import net.minecraft.client.renderer.RenderType

     

       3
       3
       +
       //import net.fabricmc.api.EnvType

     

       4
       4
       +
       //import net.fabricmc.api.Environment

     

       5
       5
       +
       //import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap

     

       6
       6
       +
       //import net.fabricmc.loader.api.FabricLoader

     

       7
       7
       +
       //import net.minecraft.client.renderer.RenderType

     

       8
       8
        
       import net.minecraft.core.BlockPos

     

       9
       9
        
       import net.minecraft.core.Direction

     

       10
       10
        
       import net.minecraft.world.item.context.BlockPlaceContext

     
···

       17
       17
        
       import net.minecraft.world.phys.shapes.Shapes

     

       18
       18
        
       import net.minecraft.world.phys.shapes.VoxelShape

     

       19
       19
        
       

     

       20
       20
       -
       class AsbestosRoofBlock(settings: Properties, dangerLevel: Int) : CarcinogenicBlock(settings, dangerLevel) {

     

       20
       20
       +
       public class AsbestosRoofBlock(settings: Properties, dangerLevel: Int) : CarcinogenicBlock(settings, dangerLevel) {

     

       21
       21
        
           init {

     

       22
       22
        
               registerDefaultState(

     

       23
       23
        
                   this.getStateDefinition().any()

     

       24
       24
        
                       .setValue<Direction?, Direction?>(BlockStateProperties.HORIZONTAL_FACING, Direction.NORTH)

     

       25
       25
        
               )

     

       26
       26
       -
               if (FabricLoader.getInstance().environmentType != EnvType.SERVER) {

     

       27
       27
       -
                   BlockRenderLayerMap.INSTANCE.putBlock(this, RenderType.cutout())

     

       28
       28
       -
               }

     

       26
       26
       +
       //        if (FabricLoader.getInstance().environmentType != EnvType.SERVER) {

     

       27
       27
       +
       //            BlockRenderLayerMap.INSTANCE.putBlock(this, RenderType.cutout())

     

       28
       28
       +
       //        }

     

       29
       29
        
           }

     

       30
       30
        
       

     

       31
       31
        
           override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block?, BlockState?>) {

     
···

       73
       73
        
           }

     

       74
       74
        
       

     

       75
       75
        
           @Deprecated("Deprecated in Java")

     

       76
       76
       -
           @Environment(EnvType.CLIENT)

     

       77
       76
        
           override fun getShadeBrightness(state: BlockState, world: BlockGetter, pos: BlockPos): Float {

     

       78
       77
        
               return 1.0f

     

       79
       78
        
           }

+54

src/common/main/kotlin/xyz/naomieow/asbestos/block/CarcinogenicBlock.kt

···

       1
       1
       +
       package xyz.naomieow.asbestos.block

     

       2
       2
       +
       

     

       3
       3
       +
       import net.minecraft.core.BlockPos

     

       4
       4
       +
       import net.minecraft.server.level.ServerLevel

     

       5
       5
       +
       import net.minecraft.util.RandomSource

     

       6
       6
       +
       import net.minecraft.world.entity.player.Player

     

       7
       7
       +
       import net.minecraft.world.item.Item

     

       8
       8
       +
       import net.minecraft.world.level.Level

     

       9
       9
       +
       import net.minecraft.world.level.block.Block

     

       10
       10
       +
       import net.minecraft.world.level.block.state.BlockState

     

       11
       11
       +
       import xyz.naomieow.asbestos.config.AsbestosConfig

     

       12
       12
       +
       import xyz.naomieow.asbestos.item.AsbestosItems

     

       13
       13
       +
       import xyz.naomieow.asbestos.util.toVector3i

     

       14
       14
       +
       import xyz.naomieow.asbestos.mesothelioma.getMesothelioma

     

       15
       15
       +
       import xyz.naomieow.asbestos.mesothelioma.setMesothelioma

     

       16
       16
       +
       import kotlin.math.sqrt

     

       17
       17
       +
       

     

       18
       18
       +
       public open class CarcinogenicBlock(settings: Properties, private val dangerLevel: Int) : Block(settings) {

     

       19
       19
       +
           override fun playerWillDestroy(world: Level, pos: BlockPos, state: BlockState, player: Player) {

     

       20
       20
       +
               super.playerWillDestroy(world, pos, state, player)

     

       21
       21
       +
               if (!isProtectedFromAsbestos(player)) {

     

       22
       22
       +
                   val exposure = player.getMesothelioma()

     

       23
       23
       +
                   player.setMesothelioma(exposure + 1)

     

       24
       24
       +
               }

     

       25
       25
       +
           }

     

       26
       26
       +
       

     

       27
       27
       +
           @Deprecated("Deprecated in Java")

     

       28
       28
       +
           override fun tick(state: BlockState, level: ServerLevel, pos: BlockPos, random: RandomSource) {

     

       29
       29
       +
               if (level.server.tickCount % (AsbestosConfig.period * 20.0f) != 0.0f) return

     

       30
       30
       +
               level.players().forEach { player ->

     

       31
       31
       +
                   val dist = sqrt(pos.distSqr(player.position().toVector3i()))

     

       32
       32
       +
                   if (dist > AsbestosConfig.offset || isProtectedFromAsbestos(player)) return@forEach

     

       33
       33
       +
               }

     

       34
       34
       +
       

     

       35
       35
       +
           }

     

       36
       36
       +
       

     

       37
       37
       +
           public companion object {

     

       38
       38
       +
               public val PROTECTIVE_ARMOUR: Array<Item> by lazy { arrayOf<Item>(

     

       39
       39
       +
                   AsbestosItems.PPEHelmet,

     

       40
       40
       +
                   AsbestosItems.PPEChestplate,

     

       41
       41
       +
                   AsbestosItems.PPELeggings,

     

       42
       42
       +
                   AsbestosItems.PPEBoots

     

       43
       43
       +
               ) }

     

       44
       44
       +
       

     

       45
       45
       +
               public fun isProtectedFromAsbestos(player: Player): Boolean {

     

       46
       46
       +
                   for (item in player.armorSlots) {

     

       47
       47
       +
                       if (!listOf(*PROTECTIVE_ARMOUR).contains(item.item)) {

     

       48
       48
       +
                           return false

     

       49
       49
       +
                       }

     

       50
       50
       +
                   }

     

       51
       51
       +
                   return true

     

       52
       52
       +
               }

     

       53
       53
       +
           }

     

       54
       54
       +
       }

+10

src/common/main/kotlin/xyz/naomieow/asbestos/client/AsbestosClient.kt

···

       1
       1
       +
       @file:EventSubscriber(env = [Environment.CLIENT])

     

       2
       2
       +
       package xyz.naomieow.asbestos.client

     

       3
       3
       +
       

     

       4
       4
       +
       import dev.mayaqq.cynosure.core.Environment

     

       5
       5
       +
       import dev.mayaqq.cynosure.events.api.EventSubscriber

     

       6
       6
       +
       import xyz.naomieow.asbestos.client.screen.ModMenuTypes

     

       7
       7
       +
       

     

       8
       8
       +
       public fun asbestosClient() {

     

       9
       9
       +
           ModMenuTypes.register()

     

       10
       10
       +
       }

+9 -12

src/main/kotlin/xyz/naomieow/asbestos/client/screen/CancerMeterScreen.kt src/common/main/kotlin/xyz/naomieow/asbestos/client/screen/CancerMeterScreen.kt

···

       1
       1
        
       package xyz.naomieow.asbestos.client.screen

     

       2
       2
        
       

     

       3
       3
       -
       import net.fabricmc.api.EnvType

     

       4
       4
       -
       import net.fabricmc.api.Environment

     

       5
       3
        
       import net.minecraft.client.gui.GuiGraphics

     

       6
       4
        
       import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen

     

       7
       5
        
       import net.minecraft.network.chat.Component

     

       8
       6
        
       import net.minecraft.resources.ResourceLocation

     

       9
       7
        
       import net.minecraft.world.entity.player.Inventory

     

       10
       10
       -
       import xyz.naomieow.asbestos.client.screen.util.MouseUtil

     

       11
       11
       -
       import xyz.naomieow.asbestos.client.id

     

       12
       8
        
       import xyz.naomieow.asbestos.config.AsbestosConfig

     

       9
       9
       +
       import xyz.naomieow.asbestos.id

     

       10
       10
       +
       import xyz.naomieow.asbestos.util.MouseUtil

     

       13
       11
        
       import java.util.Optional

     

       14
       12
        
       

     

       15
       15
       -
       @Environment(EnvType.CLIENT)

     

       16
       16
       -
       class CancerMeterScreen(

     

       13
       13
       +
       public class CancerMeterScreen(

     

       17
       14
        
           abstractContainerMenu: CancerMeterScreenHandler,

     

       18
       15
        
           inventory: Inventory,

     

       19
       16
        
           component: Component,

     
···

       22
       19
        
           inventory,

     

       23
       20
        
           component

     

       24
       21
        
       ) {

     

       25
       25
       -
           private val TEXTURE: ResourceLocation = id("textures/gui/cancer_meter.png")

     

       26
       26
       -
           var screenHandler = abstractContainerMenu;

     

       22
       22
       +
           private val texture: ResourceLocation = id("textures/gui/cancer_meter.png")

     

       23
       23
       +
           public var screenHandler: CancerMeterScreenHandler = abstractContainerMenu;

     

       27
       24
        
       

     

       28
       25
        
           override fun render(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {

     

       29
       26
        
               renderBackground(context)

     
···

       35
       32
        
               val x = (width - imageWidth) / 2

     

       36
       33
        
               val y = (height - imageHeight) / 2

     

       37
       34
        
               context.blit(

     

       38
       38
       -
                   TEXTURE,

     

       35
       35
       +
                   texture,

     

       39
       36
        
                   x, y,

     

       40
       37
        
                   0, 0,

     

       41
       38
        
                   imageWidth,

     
···

       53
       50
        
                       font,

     

       54
       51
        
                       listOf(

     

       55
       52
        
                           Component.literal(

     

       56
       56
       -
                               screenHandler.getCancerMeter().toString() + "/" + AsbestosConfig.threshold

     

       53
       53
       +
                               screenHandler.getCancerMeter().toString() + "/" + AsbestosConfig.Companion.threshold

     

       57
       54
        
                           )

     

       58
       55
        
                       ),

     

       59
       56
        
                       Optional.empty(),

     
···

       72
       69
        
           }

     

       73
       70
        
       

     

       74
       71
        
           private fun drawCancerProgress(context: GuiGraphics, x: Int, y: Int) {

     

       75
       75
       -
               val offset = screenHandler.getCancerMeter() * 58 / AsbestosConfig.threshold

     

       72
       72
       +
               val offset = screenHandler.getCancerMeter() * 58 / AsbestosConfig.Companion.threshold

     

       76
       73
        
               context.blit(

     

       77
       77
       -
                   TEXTURE,

     

       74
       74
       +
                   texture,

     

       78
       75
        
                   x, y,

     

       79
       76
        
                   176, 56,

     

       80
       77
        
                   offset, 7

+16 -14

src/main/kotlin/xyz/naomieow/asbestos/client/screen/CancerMeterScreenHandler.kt src/common/main/kotlin/xyz/naomieow/asbestos/client/screen/CancerMeterScreenHandler.kt

···

       10
       10
        
       import net.minecraft.world.item.ItemStack

     

       11
       11
        
       import xyz.naomieow.asbestos.inventory.CancerMeterInventory

     

       12
       12
        
       import xyz.naomieow.asbestos.inventory.ICancerMeterInventory

     

       13
       13
       +
       import xyz.naomieow.asbestos.item.AsbestosItems

     

       13
       14
        
       import xyz.naomieow.asbestos.item.CancerMeterItem

     

       14
       14
       -
       import xyz.naomieow.asbestos.item.ModItems

     

       15
       15
       -
       import java.util.*

     

       15
       15
       +
       import java.util.Objects

     

       16
       16
        
       

     

       17
       17
       -
       class CancerMeterScreenHandler(

     

       18
       18
       -
           type: MenuType<*>,

     

       17
       17
       +
       public class CancerMeterScreenHandler(

     

       19
       18
        
           syncId: Int,

     

       20
       20
       -
           var playerInventory: Inventory,

     

       21
       21
       -
           var inventory: ICancerMeterInventory,

     

       22
       22
       -
       ): AbstractContainerMenu(type, syncId) {

     

       23
       23
       -
           constructor(

     

       19
       19
       +
           public var playerInventory: Inventory

     

       20
       20
       +
       ): AbstractContainerMenu(ModMenuTypes.CancerMeter, syncId) {

     

       21
       21
       +
           public lateinit var inventory: ICancerMeterInventory

     

       22
       22
       +
       

     

       23
       23
       +
           public constructor(

     

       24
       24
        
               syncId: Int,

     

       25
       25
        
               playerInventory: Inventory,

     

       26
       26
        
               buf: FriendlyByteBuf

     

       27
       27
        
           ): this(syncId, playerInventory, createInventory(playerInventory, buf))

     

       28
       28
        
       

     

       29
       29
       -
           constructor(

     

       29
       29
       +
           public constructor(

     

       30
       30
        
               syncId: Int,

     

       31
       31
        
               playerInventory: Inventory,

     

       32
       32
        
               inventory: ICancerMeterInventory,

     

       33
       33
       -
           ): this(ModMenuTypes.CancerMeter, syncId, playerInventory, inventory)

     

       33
       33
       +
           ): this(syncId, playerInventory) {

     

       34
       34
       +
               this.inventory = inventory

     

       35
       35
       +
           }

     

       34
       36
        
       

     

       35
       37
        
           init {

     

       36
       38
        
               addSlot(object : Slot(inventory.getInventory(), 0, 80, 54) {

     

       37
       39
        
                   override fun mayPlace(stack: ItemStack): Boolean {

     

       38
       38
       -
                       return stack.`is`(ModItems.FilledSyringe)

     

       40
       40
       +
                       return stack.`is`(AsbestosItems.FilledSyringe)

     

       39
       41
        
                   }

     

       40
       42
        
               })

     

       41
       43
        
       

     
···

       54
       56
        
                           return ItemStack.EMPTY

     

       55
       57
        
                       }

     

       56
       58
        
                       slot.onQuickCraft(stackInSlot, itemStack)

     

       57
       57
       -
                   } else if (itemStack.`is`(ModItems.FilledSyringe)) {

     

       59
       59
       +
                   } else if (itemStack.`is`(AsbestosItems.FilledSyringe)) {

     

       58
       60
        
                       if (!this.moveItemStackTo(stackInSlot, 0, 1, false)) {

     

       59
       61
        
                           return ItemStack.EMPTY

     

       60
       62
        
                       }

     
···

       109
       111
        
               }

     

       110
       112
        
           }

     

       111
       113
        
       

     

       112
       112
       -
           fun getCancerMeter(): Int {

     

       114
       114
       +
           public fun getCancerMeter(): Int {

     

       113
       115
        
               val nbt = this.inventory.getInventory().getItem(0).getOrCreateTag()

     

       114
       116
        
               return if (nbt.contains("CancerMeter")) nbt.getInt("CancerMeter") else 0

     

       115
       117
        
           }

     

       116
       118
        
       

     

       117
       117
       -
           companion object {

     

       119
       119
       +
           private companion object {

     

       118
       120
        
               private const val INVENTORY_START: Int = 1

     

       119
       121
        
               private const val INVENTORY_END: Int = 28

     

       120
       122
        
               private const val HOTBAR_START: Int = 28

+12

src/common/main/kotlin/xyz/naomieow/asbestos/client/screen/ModMenuTypes.kt

···

       1
       1
       +
       package xyz.naomieow.asbestos.client.screen

     

       2
       2
       +
       

     

       3
       3
       +
       import net.minecraft.core.registries.Registries

     

       4
       4
       +
       import net.minecraft.world.flag.FeatureFlags

     

       5
       5
       +
       import net.minecraft.world.inventory.MenuType

     

       6
       6
       +
       import uwu.serenity.kritter.api.Registrar

     

       7
       7
       +
       import uwu.serenity.kritter.api.entry

     

       8
       8
       +
       import xyz.naomieow.asbestos.Asbestos

     

       9
       9
       +
       

     

       10
       10
       +
       public object ModMenuTypes: Registrar<MenuType<*>> by Asbestos..Registries.MENU {

     

       11
       11
       +
           public val CancerMeter: MenuType<CancerMeterScreenHandler> by entry("cancer_meter", {MenuType(::CancerMeterScreenHandler, FeatureFlags.DEFAULT_FLAGS)})

     

       12
       12
       +
       }

+10 -11

src/main/kotlin/xyz/naomieow/asbestos/config/AsbestosConfig.kt src/common/main/kotlin/xyz/naomieow/asbestos/config/AsbestosConfig.kt

···

       3
       3
        
       import dev.isxander.yacl3.config.v2.api.ConfigClassHandler

     

       4
       4
        
       import dev.isxander.yacl3.config.v2.api.SerialEntry

     

       5
       5
        
       import dev.isxander.yacl3.config.v2.api.serializer.GsonConfigSerializerBuilder

     

       6
       6
       -
       import net.fabricmc.loader.api.FabricLoader

     

       6
       6
       +
       import dev.isxander.yacl3.platform.YACLPlatform

     

       7
       7
        
       import xyz.naomieow.asbestos.id

     

       8
       8
        
       

     

       9
       9
       -
       class AsbestosConfig {

     

       10
       10
       -
           companion object {

     

       9
       9
       +
       public class AsbestosConfig {

     

       10
       10
       +
           public companion object {

     

       11
       11
        
               @JvmField

     

       12
       12
        
               @SerialEntry

     

       13
       13
       -
               var offset: Int = 3

     

       13
       13
       +
               public var offset: Int = 3

     

       14
       14
        
       

     

       15
       15
        
               @JvmField

     

       16
       16
        
               @SerialEntry

     

       17
       17
       -
               var period: Float = 5.0f

     

       17
       17
       +
               public var period: Float = 5.0f

     

       18
       18
        
       

     

       19
       19
        
               @JvmField

     

       20
       20
        
               @SerialEntry

     

       21
       21
       -
               var threshold: Int = 180

     

       21
       21
       +
               public var threshold: Int = 180

     

       22
       22
        
       

     

       23
       23
        
               @JvmField

     

       24
       24
        
               @SerialEntry

     

       25
       25
       -
               var exsanguination: Float = 1.0f

     

       25
       25
       +
               public var exsanguination: Float = 1.0f

     

       26
       26
        
       

     

       27
       27
       -
               val Handler: ConfigClassHandler<AsbestosConfig> = ConfigClassHandler.createBuilder(AsbestosConfig::class.java)

     

       27
       27
       +
               public val Handler: ConfigClassHandler<AsbestosConfig> = ConfigClassHandler.createBuilder(AsbestosConfig::class.java)

     

       28
       28
        
                   .id(id("asbestos_config"))

     

       29
       29
        
                   .serializer { config ->

     

       30
       30
        
                       GsonConfigSerializerBuilder.create(config)

     

       31
       31
       -
                           .setPath(FabricLoader

     

       32
       32
       -
                               .getInstance()

     

       33
       33
       -
                               .configDir

     

       31
       31
       +
                           .setPath(YACLPlatform

     

       32
       32
       +
                               .getConfigDir()

     

       34
       33
        
                               .resolve("asbestos.json5")

     

       35
       34
        
                           )

     

       36
       35
        
                           .setJson5(true)

+4 -4

src/main/kotlin/xyz/naomieow/asbestos/damage/ModDamageTypes.kt src/common/main/kotlin/xyz/naomieow/asbestos/damage/AsbestosDamageTypes.kt

···

       7
       7
        
       import net.minecraft.world.level.Level

     

       8
       8
        
       import xyz.naomieow.asbestos.id

     

       9
       9
        
       

     

       10
       10
       -
       object ModDamageTypes {

     

       11
       11
       -
           val MESOTHELIOMA: ResourceKey<DamageType> = ResourceKey.create(

     

       10
       10
       +
       public object AsbestosDamageTypes {

     

       11
       11
       +
           public val MESOTHELIOMA: ResourceKey<DamageType> = ResourceKey.create(

     

       12
       12
        
               Registries.DAMAGE_TYPE,

     

       13
       13
        
               id("mesothelioma")

     

       14
       14
        
           )

     

       15
       15
       -
           val BLOOD_EXTRACT: ResourceKey<DamageType> = ResourceKey.create(

     

       15
       15
       +
           public val BLOOD_EXTRACT: ResourceKey<DamageType> = ResourceKey.create(

     

       16
       16
        
               Registries.DAMAGE_TYPE,

     

       17
       17
        
               id("blood_extract")

     

       18
       18
        
           )

     

       19
       19
        
       

     

       20
       20
       -
           fun of(level: Level, key: ResourceKey<DamageType>): DamageSource {

     

       20
       20
       +
           public fun of(level: Level, key: ResourceKey<DamageType>): DamageSource {

     

       21
       21
        
               return DamageSource(level

     

       22
       22
        
                   .registryAccess()

     

       23
       23
        
                   .registryOrThrow(Registries.DAMAGE_TYPE)

+13 -28

src/main/kotlin/xyz/naomieow/asbestos/inventory/CancerMeterInventory.kt src/common/main/kotlin/xyz/naomieow/asbestos/inventory/CancerMeterInventory.kt

···

       1
       1
        
       package xyz.naomieow.asbestos.inventory

     

       2
       2
        
       

     

       3
       3
       -
       import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory

     

       4
       3
        
       import net.minecraft.core.NonNullList

     

       5
       4
        
       import net.minecraft.nbt.CompoundTag

     

       6
       5
        
       import net.minecraft.nbt.ListTag

     

       7
       7
       -
       import net.minecraft.network.FriendlyByteBuf

     

       8
       6
        
       import net.minecraft.network.chat.Component

     

       9
       9
       -
       import net.minecraft.server.level.ServerPlayer

     

       10
       10
       -
       import net.minecraft.world.entity.player.Inventory

     

       7
       7
       +
       import net.minecraft.world.SimpleMenuProvider

     

       11
       8
        
       import net.minecraft.world.entity.player.Player

     

       12
       12
       -
       import net.minecraft.world.inventory.AbstractContainerMenu

     

       13
       9
        
       import net.minecraft.world.item.ItemStack

     

       14
       10
        
       import net.minecraft.world.level.Level

     

       15
       11
        
       import xyz.naomieow.asbestos.client.screen.CancerMeterScreenHandler

     

       16
       12
        
       

     

       17
       17
       -
       class CancerMeterInventory(

     

       13
       13
       +
       public class CancerMeterInventory(

     

       18
       14
        
           private var stack: ItemStack,

     

       19
       15
        
           private val player: Player,

     

       20
       16
        
           private val screenId: Byte,

     
···

       25
       21
        
               readAllData(stack.orCreateTag)

     

       26
       22
        
           }

     

       27
       23
        
       

     

       28
       28
       -
           fun setStack(itemStack: ItemStack) {

     

       24
       24
       +
           public fun setStack(itemStack: ItemStack) {

     

       29
       25
        
               stack = itemStack

     

       30
       26
        
           }

     

       31
       27
        
       

     
···

       91
       87
        
               }

     

       92
       88
        
           }

     

       93
       89
        
       

     

       94
       94
       -
           companion object {

     

       95
       95
       -
               fun openHandledScreen(player: Player, stack: ItemStack, screenID: Byte) {

     

       90
       90
       +
           public companion object {

     

       91
       91
       +
               public fun openHandledScreen(player: Player, stack: ItemStack, screenID: Byte) {

     

       96
       92
        
                   if (!player.level().isClientSide()) {

     

       97
       97
       -
                       player.openMenu(object : ExtendedScreenHandlerFactory {

     

       98
       98
       -
                           override fun writeScreenOpeningData(player: ServerPlayer, buf: FriendlyByteBuf) {

     

       99
       99
       -
                               buf.writeByte(screenID.toInt())

     

       100
       100
       -
                           }

     

       101
       101
       -
       

     

       102
       102
       -
                           override fun getDisplayName(): Component {

     

       103
       103
       -
                               return Component.translatable("screen.asbestos.cancer_meter")

     

       104
       104
       -
                           }

     

       105
       105
       -
       

     

       106
       106
       -
                           override fun createMenu(

     

       107
       107
       -
                               syncId: Int,

     

       108
       108
       -
                               playerInventory: Inventory,

     

       109
       109
       -
                               player: Player

     

       110
       110
       -
                           ): AbstractContainerMenu {

     

       111
       111
       -
                               return CancerMeterScreenHandler(

     

       112
       112
       -
                                   syncId,

     

       113
       113
       -
                                   playerInventory,

     

       93
       93
       +
                       player.openMenu(SimpleMenuProvider(

     

       94
       94
       +
                           {id, inventory, player ->

     

       95
       95
       +
                               CancerMeterScreenHandler(

     

       96
       96
       +
                                   id,

     

       97
       97
       +
                                   inventory,

     

       114
       98
        
                                   CancerMeterInventory(stack, player, screenID)

     

       115
       99
        
                               )

     

       116
       116
       -
                           }

     

       117
       117
       -
                       })

     

       100
       100
       +
                           },

     

       101
       101
       +
                           Component.translatable("screen.asbestos.cancer_meter")

     

       102
       102
       +
                       ))

     

       118
       103
        
                   }

     

       119
       104
        
               }

     

       120
       105

+27

src/common/main/kotlin/xyz/naomieow/asbestos/inventory/ICancerMeterInventory.kt

···

       1
       1
       +
       package xyz.naomieow.asbestos.inventory

     

       2
       2
       +
       

     

       3
       3
       +
       import net.minecraft.nbt.CompoundTag

     

       4
       4
       +
       import net.minecraft.world.entity.player.Player

     

       5
       5
       +
       import net.minecraft.world.item.ItemStack

     

       6
       6
       +
       import net.minecraft.world.level.Level

     

       7
       7
       +
       

     

       8
       8
       +
       public interface ICancerMeterInventory {

     

       9
       9
       +
           public fun writeItems(tag: CompoundTag)

     

       10
       10
       +
           public fun readItems(tag: CompoundTag)

     

       11
       11
       +
           public fun writeAllData(tag: CompoundTag)

     

       12
       12
       +
           public fun readAllData(tag: CompoundTag)

     

       13
       13
       +
           public fun getInventory(): InventoryImproved

     

       14
       14
       +
           public fun getScreenID(): Byte

     

       15
       15
       +
           public fun getLevel(): Level

     

       16
       16
       +
           public fun getItemStack(): ItemStack

     

       17
       17
       +
           public fun setUsingPlayer(player: Player?)

     

       18
       18
       +
           public fun markDataDirty(vararg dataIds: Byte)

     

       19
       19
       +
           public fun markDirty()

     

       20
       20
       +
       

     

       21
       21
       +
           public companion object {

     

       22
       22
       +
               public const val INVENTORY_DATA: Byte = 0

     

       23
       23
       +
               public const val COMBINED_INVENTORY_DATA: Byte = 1

     

       24
       24
       +
               public const val SLOT_DATA: Byte = 2

     

       25
       25
       +
               public const val ALL_DATA: Byte = 3

     

       26
       26
       +
           }

     

       27
       27
       +
       }

+4 -4

src/main/kotlin/xyz/naomieow/asbestos/inventory/InventoryImproved.kt src/common/main/kotlin/xyz/naomieow/asbestos/inventory/InventoryImproved.kt

···

       5
       5
        
       import net.minecraft.world.ContainerHelper

     

       6
       6
        
       import net.minecraft.world.entity.player.Player

     

       7
       7
        
       import net.minecraft.world.item.ItemStack

     

       8
       8
       -
       import xyz.naomieow.asbestos.item.ModItems

     

       8
       8
       +
       import xyz.naomieow.asbestos.item.AsbestosItems

     

       9
       9
        
       

     

       10
       10
        
       /*

     

       11
       11
        
       * Converted from Tiviacz1337's InventoryImproved from Travelers Backpack:

     

       12
       12
        
       * https://github.com/Tiviacz1337/Travelers-Backpack/blob/3dc0bfeec381537a5ce85c2ae1e6e00d62542206/src/main/java/com/tiviacz/travelersbackpack/inventory/InventoryImproved.java

     

       13
       13
        
        */

     

       14
       14
       -
       abstract class InventoryImproved(

     

       14
       14
       +
       public abstract class InventoryImproved(

     

       15
       15
        
           @get:JvmName("getInventoryStacks")

     

       16
       16
        
           protected var stacks: NonNullList<ItemStack>

     

       17
       17
        
       ): Container {

     

       18
       18
       -
           fun getStacks(): NonNullList<ItemStack> {

     

       18
       18
       +
           public fun getStacks(): NonNullList<ItemStack> {

     

       19
       19
        
               return stacks

     

       20
       20
        
           }

     

       21
       21
        
       

     
···

       66
       66
        
           abstract override fun setChanged()

     

       67
       67
        
       

     

       68
       68
        
           override fun canPlaceItem(slot: Int, itemStack: ItemStack): Boolean {

     

       69
       69
       -
               return itemStack.item !== ModItems.CancerMeter

     

       69
       69
       +
               return itemStack.item !== AsbestosItems.CancerMeter

     

       70
       70
        
           }

     

       71
       71
        
       

     

       72
       72
        
           override fun stillValid(player: Player): Boolean {

+36

src/common/main/kotlin/xyz/naomieow/asbestos/item/AsbestosCreativeTabs.kt

···

       1
       1
       +
       package xyz.naomieow.asbestos.item

     

       2
       2
       +
       

     

       3
       3
       +
       import net.minecraft.core.registries.Registries

     

       4
       4
       +
       import net.minecraft.network.chat.Component

     

       5
       5
       +
       import net.minecraft.world.item.CreativeModeTab

     

       6
       6
       +
       import uwu.serenity.kritter.api.Registrar

     

       7
       7
       +
       import uwu.serenity.kritter.api.entry.RegistryEntry

     

       8
       8
       +
       import uwu.serenity.kritter.stdlib.creativeTab

     

       9
       9
       +
       import xyz.naomieow.asbestos.Asbestos

     

       10
       10
       +
       import xyz.naomieow.asbestos.block.AsbestosBlocks

     

       11
       11
       +
       

     

       12
       12
       +
       @Suppress("UNUSED")

     

       13
       13
       +
       public object AsbestosCreativeTabs: Registrar<CreativeModeTab> by Asbestos..Registries.CREATIVE_MODE_TAB {

     

       14
       14
       +
           public val Asbestos: RegistryEntry<CreativeModeTab> = creativeTab("asbestos") {

     

       15
       15
       +
               title = Component.translatable("itemGroup.asbestos.asbestos")

     

       16
       16
       +
               icon { AsbestosItems.AsbestosFibers.defaultInstance }

     

       17
       17
       +
               displayItems {

     

       18
       18
       +
                   // Items

     

       19
       19
       +
                   accept(AsbestosItems.AsbestosFibers)

     

       20
       20
       +
                   accept(AsbestosItems.IronScraper)

     

       21
       21
       +
                   accept(AsbestosItems.EmptySyringe)

     

       22
       22
       +
                   accept(AsbestosItems.FilledSyringe)

     

       23
       23
       +
                   accept(AsbestosItems.CancerMeter)

     

       24
       24
       +
                   accept(AsbestosItems.PPEHelmet)

     

       25
       25
       +
                   accept(AsbestosItems.PPEChestplate)

     

       26
       26
       +
                   accept(AsbestosItems.PPELeggings)

     

       27
       27
       +
                   accept(AsbestosItems.PPEBoots)

     

       28
       28
       +
                   // Blocks

     

       29
       29
       +
                   accept(AsbestosBlocks.AsbestosBlock)

     

       30
       30
       +
                   accept(AsbestosBlocks.SerpentiniteBlock)

     

       31
       31
       +
                   accept(AsbestosBlocks.PopcornCeilingBlock)

     

       32
       32
       +
                   accept(AsbestosBlocks.AsbestosTileBlock)

     

       33
       33
       +
                   accept(AsbestosBlocks.AsbestosRoofBlock)

     

       34
       34
       +
               }

     

       35
       35
       +
           }

     

       36
       36
       +
       }

+11 -11

src/main/kotlin/xyz/naomieow/asbestos/item/ModItems.kt src/common/main/kotlin/xyz/naomieow/asbestos/item/AsbestosItems.kt

···

       8
       8
        
       import net.minecraft.world.item.Item

     

       9
       9
        
       import uwu.serenity.kritter.api.Registrar

     

       10
       10
        
       import uwu.serenity.kritter.stdlib.item

     

       11
       11
       -
       import xyz.naomieow.asbestos.AsbestosMod

     

       11
       11
       +
       import xyz.naomieow.asbestos.Asbestos

     

       12
       12
        
       import xyz.naomieow.asbestos.armor.ProtectiveMaterial

     

       13
       13
        
       

     

       14
       14
        
       @Suppress("UNUSED")

     

       15
       15
       -
       object ModItems: Registrar<Item> by AsbestosMod..Registries.ITEM {

     

       16
       16
       -
           val AsbestosFibers by item("asbestos_fibers", ::Item) {

     

       15
       15
       +
       public object AsbestosItems: Registrar<Item> by Asbestos..Registries.ITEM {

     

       16
       16
       +
           public val AsbestosFibers: Item by item("asbestos_fibers", ::Item) {

     

       17
       17
        
               properties {

     

       18
       18
        
                   fireResistant()

     

       19
       19
        
                   food(FoodProperties.Builder()

     
···

       28
       28
        
               }

     

       29
       29
        
           }

     

       30
       30
        
       

     

       31
       31
       -
           val IronScraper by item("iron_scraper", { properties ->

     

       31
       31
       +
           public val IronScraper: Item by item("iron_scraper", { properties ->

     

       32
       32
        
               ScraperItem(

     

       33
       33
        
                   ScraperItemMaterial.INSTANCE,

     

       34
       34
        
                   0.0f, -3.0f,

     
···

       36
       36
        
               )

     

       37
       37
        
           })

     

       38
       38
        
       

     

       39
       39
       -
           val FilledSyringe by item("filled_syringe", ::FilledSyringeItem) {

     

       39
       39
       +
           public val FilledSyringe: Item by item("filled_syringe", ::FilledSyringeItem) {

     

       40
       40
        
               properties {

     

       41
       41
        
                   stacksTo(1)

     

       42
       42
        
               }

     

       43
       43
        
           }

     

       44
       44
        
       

     

       45
       45
       -
           val EmptySyringe by item("empty_syringe", ::EmptySyringeItem) {

     

       45
       45
       +
           public val EmptySyringe: Item by item("empty_syringe", ::EmptySyringeItem) {

     

       46
       46
        
               properties {

     

       47
       47
        
                   stacksTo(16)

     

       48
       48
        
               }

     

       49
       49
        
           }

     

       50
       50
        
       

     

       51
       51
       -
           val CancerMeter by item("cancer_meter", ::CancerMeterItem) {

     

       51
       51
       +
           public val CancerMeter: Item by item("cancer_meter", ::CancerMeterItem) {

     

       52
       52
        
               properties {

     

       53
       53
        
                   stacksTo(1)

     

       54
       54
        
               }

     

       55
       55
        
           }

     

       56
       56
        
       

     

       57
       57
       -
           val PPEHelmet by item("ppe_helmet", { properties ->

     

       57
       57
       +
           public val PPEHelmet: Item by item("ppe_helmet", { properties ->

     

       58
       58
        
               ArmorItem(

     

       59
       59
        
                   ProtectiveMaterial.INSTANCE,

     

       60
       60
        
                   ArmorItem.Type.HELMET,

     
···

       62
       62
        
               )

     

       63
       63
        
           })

     

       64
       64
        
       

     

       65
       65
       -
           val PPEChestplate by item("ppe_chestplate", { properties ->

     

       65
       65
       +
           public val PPEChestplate: Item by item("ppe_chestplate", { properties ->

     

       66
       66
        
               ArmorItem(

     

       67
       67
        
                   ProtectiveMaterial.INSTANCE,

     

       68
       68
        
                   ArmorItem.Type.CHESTPLATE,

     
···

       70
       70
        
               )

     

       71
       71
        
           })

     

       72
       72
        
       

     

       73
       73
       -
           val PPELeggings by item("ppe_leggings", { properties ->

     

       73
       73
       +
           public val PPELeggings: Item by item("ppe_leggings", { properties ->

     

       74
       74
        
               ArmorItem(

     

       75
       75
        
                   ProtectiveMaterial.INSTANCE,

     

       76
       76
        
                   ArmorItem.Type.LEGGINGS,

     
···

       78
       78
        
               )

     

       79
       79
        
           })

     

       80
       80
        
       

     

       81
       81
       -
           val PPEBoots by item("ppe_boots", { properties ->

     

       81
       81
       +
           public val PPEBoots: Item by item("ppe_boots", { properties ->

     

       82
       82
        
               ArmorItem(

     

       83
       83
        
                   ProtectiveMaterial.INSTANCE,

     

       84
       84
        
                   ArmorItem.Type.BOOTS,

+1 -1

src/main/kotlin/xyz/naomieow/asbestos/item/CancerMeterItem.kt src/common/main/kotlin/xyz/naomieow/asbestos/item/CancerMeterItem.kt

···

       8
       8
        
       import net.minecraft.world.level.Level

     

       9
       9
        
       import xyz.naomieow.asbestos.inventory.CancerMeterInventory

     

       10
       10
        
       

     

       11
       11
       -
       class CancerMeterItem(

     

       11
       11
       +
       public class CancerMeterItem(

     

       12
       12
        
           properties: Properties

     

       13
       13
        
       ): Item(

     

       14
       14
        
           properties

+9 -11

src/main/kotlin/xyz/naomieow/asbestos/item/EmptySyringeItem.kt src/common/main/kotlin/xyz/naomieow/asbestos/item/EmptySyringeItem.kt

···

       10
       10
        
       import net.minecraft.world.item.Item

     

       11
       11
        
       import net.minecraft.world.item.ItemStack

     

       12
       12
        
       import net.minecraft.world.level.Level

     

       13
       13
       -
       import xyz.naomieow.asbestos.AsbestosMod

     

       14
       13
        
       import xyz.naomieow.asbestos.config.AsbestosConfig

     

       15
       15
       -
       import xyz.naomieow.asbestos.damage.ModDamageTypes

     

       14
       14
       +
       import xyz.naomieow.asbestos.damage.AsbestosDamageTypes

     

       16
       15
        
       

     

       17
       17
       -
       class EmptySyringeItem(

     

       18
       18
       -
           properties: Item.Properties

     

       16
       16
       +
       public class EmptySyringeItem(

     

       17
       17
       +
           properties: Properties

     

       19
       18
        
       ): Item(

     

       20
       19
        
           properties

     

       21
       20
        
       ) {

     
···

       30
       29
        
               entity: LivingEntity,

     

       31
       30
        
               hand: InteractionHand

     

       32
       31
        
           ): InteractionResult {

     

       33
       33
       -
               val world = user.level()

     

       34
       34
       -
               useEmptySyringe(user, entity, hand, world)

     

       32
       32
       +
               useEmptySyringe(user, entity, hand, user.level())

     

       35
       33
        
               return InteractionResult.CONSUME

     

       36
       34
        
           }

     

       37
       35
        
       

     
···

       44
       42
        
                   1.0f, 1.0f

     

       45
       43
        
               )

     

       46
       44
        
               val handStack = user.getItemInHand(hand)

     

       47
       47
       -
               val newStack = ItemStack(ModItems.FilledSyringe, 1)

     

       45
       45
       +
               val newStack = ItemStack(AsbestosItems.FilledSyringe, 1)

     

       48
       46
        
               newStack.tag = handStack.getOrCreateTag().copy()

     

       49
       47
        
               FilledSyringeItem.writeNbt(target, newStack)

     

       50
       48
        
               target.hurt(

     

       51
       51
       -
                   ModDamageTypes.of(user.level(), ModDamageTypes.BLOOD_EXTRACT),

     

       49
       49
       +
                   AsbestosDamageTypes.of(user.level(), AsbestosDamageTypes.BLOOD_EXTRACT),

     

       52
       50
        
                   AsbestosConfig.exsanguination

     

       53
       51
        
               )

     

       54
       54
       -
               if (!user.inventory.add(newStack)) {

     

       55
       55
       -
                   user.drop(newStack, false)

     

       56
       56
       -
               }

     

       57
       52
        
               if (!user.abilities.instabuild) {

     

       58
       53
        
                   handStack.shrink(1)

     

       59
       54
        
               }

     

       55
       55
       +
               if (!user.inventory.add(newStack)) {

     

       56
       56
       +
                   user.drop(newStack, false)

     

       57
       57
       +
               }

     

       60
       58
        
           }

     

       61
       59
        
       }

+6 -7

src/main/kotlin/xyz/naomieow/asbestos/item/FilledSyringeItem.kt src/common/main/kotlin/xyz/naomieow/asbestos/item/FilledSyringeItem.kt

···

       7
       7
        
       import net.minecraft.world.entity.player.Player

     

       8
       8
        
       import net.minecraft.world.item.Item

     

       9
       9
        
       import net.minecraft.world.item.ItemStack

     

       10
       10
       -
       import xyz.naomieow.asbestos.AsbestosMod

     

       10
       10
       +
       import xyz.naomieow.asbestos.mesothelioma.getMesothelioma

     

       11
       11
        
       

     

       12
       12
       -
       class FilledSyringeItem(

     

       12
       12
       +
       public class FilledSyringeItem(

     

       13
       13
        
           properties: Properties

     

       14
       14
        
       ): Item(

     

       15
       15
        
           properties

     

       16
       16
        
       ) {

     

       17
       17
       -
           companion object {

     

       17
       17
       +
           public companion object {

     

       18
       18
        
               private const val TYPE_KEY: String = "EntityType"

     

       19
       19
        
               private const val CANCER_KEY: String = "CancerMeter"

     

       20
       20
        
       

     

       21
       21
       -
               fun writeNbt(target: LivingEntity, syringe: ItemStack) {

     

       21
       21
       +
               public fun writeNbt(target: LivingEntity, syringe: ItemStack) {

     

       22
       22
        
                   val nbt = syringe.getOrCreateTag()

     

       23
       23
       -
                   syringe.setHoverName(Component.translatable(

     

       23
       23
       +
                   syringe.hoverName = Component.translatable(

     

       24
       24
        
                       "item.asbestos.filled_syringe",

     

       25
       25
        
                       target.name)

     

       26
       26
        
                       .withStyle(ChatFormatting.RESET)

     

       27
       27
       -
                   )

     

       28
       27
        
                   nbt.putString(TYPE_KEY, EntityType.getKey(target.type).toString())

     

       29
       28
        
                   if (target is Player) {

     

       30
       30
       -
                       nbt.putInt(CANCER_KEY, AsbestosMod.MESOTHELIOMA.get(target).getMeso())

     

       29
       29
       +
                       nbt.putInt(CANCER_KEY, target.getMesothelioma())

     

       31
       30
        
                   }

     

       32
       31
        
               }

     

       33
       32
        
           }

+2 -2

src/main/kotlin/xyz/naomieow/asbestos/item/ScraperItem.kt src/common/main/kotlin/xyz/naomieow/asbestos/item/ScraperItem.kt

···

       7
       7
        
       import net.minecraft.world.level.block.Block

     

       8
       8
        
       import xyz.naomieow.asbestos.id

     

       9
       9
        
       

     

       10
       10
       -
       class ScraperItem(

     

       10
       10
       +
       public class ScraperItem(

     

       11
       11
        
           tier: Tier,

     

       12
       12
        
           attackDamage: Float,

     

       13
       13
        
           attackSpeed: Float,

     
···

       19
       19
        
           AFFECTED_BLOCKS,

     

       20
       20
        
           properties

     

       21
       21
        
       ) {

     

       22
       22
       -
           companion object {

     

       22
       22
       +
           public companion object {

     

       23
       23
        
               private val AFFECTED_BLOCKS: TagKey<Block> = TagKey.create(

     

       24
       24
        
                   Registries.BLOCK,

     

       25
       25
        
                   id("scrapeable")

+4 -3

src/main/kotlin/xyz/naomieow/asbestos/item/ScraperItemMaterial.kt src/common/main/kotlin/xyz/naomieow/asbestos/item/ScraperItemMaterial.kt

···

       4
       4
        
       import net.minecraft.world.item.Tier

     

       5
       5
        
       import net.minecraft.world.item.crafting.Ingredient

     

       6
       6
        
       

     

       7
       7
       -
       class ScraperItemMaterial: Tier {

     

       7
       7
       +
       public class ScraperItemMaterial: Tier {

     

       8
       8
        
           override fun getUses(): Int {

     

       9
       9
        
               return 300

     

       10
       10
        
           }

     
···

       17
       17
        
               return 2.5f

     

       18
       18
        
           }

     

       19
       19
        
       

     

       20
       20
       +
           @Deprecated("Deprecated in Java")

     

       20
       21
        
           override fun getLevel(): Int {

     

       21
       22
        
               return 1

     

       22
       23
        
           }

     
···

       29
       30
        
               return Ingredient.of(Items.IRON_INGOT)

     

       30
       31
        
           }

     

       31
       32
        
       

     

       32
       32
       -
           companion object {

     

       33
       33
       -
               val INSTANCE: ScraperItemMaterial = ScraperItemMaterial()

     

       33
       33
       +
           public companion object {

     

       34
       34
       +
               public val INSTANCE: ScraperItemMaterial = ScraperItemMaterial()

     

       34
       35
        
           }

     

       35
       36
        
       }

+6

src/common/main/kotlin/xyz/naomieow/asbestos/mesothelioma/Mesothelioma.kt

···

       1
       1
       +
       package xyz.naomieow.asbestos.mesothelioma

     

       2
       2
       +
       

     

       3
       3
       +
       import net.minecraft.world.entity.player.Player

     

       4
       4
       +
       

     

       5
       5
       +
       public expect fun Player.getMesothelioma(): Int

     

       6
       6
       +
       public expect fun Player.setMesothelioma(value: Int)

+11

src/common/main/kotlin/xyz/naomieow/asbestos/mob_effect/AsbestosMobEffects.kt

···

       1
       1
       +
       package xyz.naomieow.asbestos.mob_effect

     

       2
       2
       +
       

     

       3
       3
       +
       import net.minecraft.core.registries.Registries

     

       4
       4
       +
       import net.minecraft.world.effect.MobEffect

     

       5
       5
       +
       import uwu.serenity.kritter.api.Registrar

     

       6
       6
       +
       import uwu.serenity.kritter.api.entry

     

       7
       7
       +
       import xyz.naomieow.asbestos.Asbestos

     

       8
       8
       +
       

     

       9
       9
       +
       public object AsbestosMobEffects: Registrar<MobEffect> by Asbestos..Registries.MOB_EFFECT {

     

       10
       10
       +
           public val mesotheliomaMobEffect: MesotheliomaMobEffect by entry("mesothelioma", ::MesotheliomaMobEffect)

     

       11
       11
       +
       }

+8 -8

src/main/kotlin/xyz/naomieow/asbestos/mesothelioma/MesoStatusEffect.kt src/common/main/kotlin/xyz/naomieow/asbestos/mob_effect/MesotheliomaMobEffect.kt

···

       1
       1
       -
       package xyz.naomieow.asbestos.mesothelioma

     

       1
       1
       +
       package xyz.naomieow.asbestos.mob_effect

     

       2
       2
        
       

     

       3
       3
        
       import net.minecraft.world.effect.MobEffect

     

       4
       4
        
       import net.minecraft.world.effect.MobEffectCategory

     
···

       6
       6
        
       import net.minecraft.world.effect.MobEffects

     

       7
       7
        
       import net.minecraft.world.entity.LivingEntity

     

       8
       8
        
       import net.minecraft.world.entity.player.Player

     

       9
       9
       -
       import xyz.naomieow.asbestos.AsbestosMod

     

       10
       9
        
       import xyz.naomieow.asbestos.config.AsbestosConfig

     

       11
       11
       -
       import xyz.naomieow.asbestos.damage.ModDamageTypes

     

       10
       10
       +
       import xyz.naomieow.asbestos.damage.AsbestosDamageTypes

     

       11
       11
       +
       import xyz.naomieow.asbestos.mesothelioma.getMesothelioma

     

       12
       12
        
       

     

       13
       13
       -
       class MesoStatusEffect: MobEffect(

     

       13
       13
       +
       public class MesotheliomaMobEffect: MobEffect(

     

       14
       14
        
           MobEffectCategory.HARMFUL,

     

       15
       15
        
           0x302412,

     

       16
       16
        
       ) {

     
···

       22
       22
        
           override fun applyEffectTick(entity: LivingEntity, amplifier: Int) {

     

       23
       23
        
               super.applyEffectTick(entity, amplifier)

     

       24
       24
        
               if (entity is Player) {

     

       25
       25
       -
                   val exposure: Int = AsbestosMod.MESOTHELIOMA.get(entity).getMeso()

     

       26
       26
       -
                   if (exposure >= (AsbestosConfig.threshold / 1.5f)) {

     

       25
       25
       +
                   val exposure: Int = entity.getMesothelioma()

     

       26
       26
       +
                   if (exposure >= (AsbestosConfig.Companion.threshold / 1.5f)) {

     

       27
       27
        
                       entity.addEffect(MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, -1, 1))

     

       28
       28
        
                   }

     

       29
       29
        
       

     

       30
       30
       -
                   if (exposure >= AsbestosConfig.threshold) {

     

       31
       31
       -
                       entity.hurt(ModDamageTypes.of(entity.level(), ModDamageTypes.MESOTHELIOMA), (1 shl amplifier).toFloat())

     

       30
       30
       +
                   if (exposure >= AsbestosConfig.Companion.threshold) {

     

       31
       31
       +
                       entity.hurt(AsbestosDamageTypes.of(entity.level(), AsbestosDamageTypes.MESOTHELIOMA), (1 shl amplifier).toFloat())

     

       32
       32
        
                   }

     

       33
       33
        
               }

     

       34
       34
        
           }

+15

src/common/main/kotlin/xyz/naomieow/asbestos/util/MouseUtil.kt

···

       1
       1
       +
       package xyz.naomieow.asbestos.util

     

       2
       2
       +
       

     

       3
       3
       +
       public object MouseUtil {

     

       4
       4
       +
           public fun isMouseOver(mouseX: Double, mouseY: Double, x: Int, y: Int): Boolean {

     

       5
       5
       +
               return isMouseOver(mouseX, mouseY, x, y, 16)

     

       6
       6
       +
           }

     

       7
       7
       +
       

     

       8
       8
       +
           public fun isMouseOver(mouseX: Double, mouseY: Double, x: Int, y: Int, size: Int): Boolean {

     

       9
       9
       +
               return isMouseOver(mouseX, mouseY, x, y, size, size)

     

       10
       10
       +
           }

     

       11
       11
       +
       

     

       12
       12
       +
           public fun isMouseOver(mouseX: Double, mouseY: Double, x: Int, y: Int, sizeX: Int, sizeY: Int): Boolean {

     

       13
       13
       +
               return (mouseX >= x && mouseX <= x + sizeX) && (mouseY >= y && mouseY <= y + sizeY)

     

       14
       14
       +
           }

     

       15
       15
       +
       }

+12

src/common/main/kotlin/xyz/naomieow/asbestos/util/VectorUtil.kt

···

       1
       1
       +
       package xyz.naomieow.asbestos.util

     

       2
       2
       +
       

     

       3
       3
       +
       import net.minecraft.core.Vec3i

     

       4
       4
       +
       import net.minecraft.world.phys.Vec3

     

       5
       5
       +
       

     

       6
       6
       +
       public fun Vec3.toVector3i(): Vec3i {

     

       7
       7
       +
           return Vec3i(

     

       8
       8
       +
               this.x.toInt(),

     

       9
       9
       +
               this.y.toInt(),

     

       10
       10
       +
               this.z.toInt(),

     

       11
       11
       +
           )

     

       12
       12
       +
       }

src/main/resources/assets/asbestos/blockstates/asbestos_block.json src/common/resources/assets/asbestos/blockstates/asbestos_block.json

src/main/resources/assets/asbestos/blockstates/asbestos_roof_block.json src/common/resources/assets/asbestos/blockstates/asbestos_roof_block.json

src/main/resources/assets/asbestos/blockstates/asbestos_tile_block.json src/common/resources/assets/asbestos/blockstates/asbestos_tile_block.json

src/main/resources/assets/asbestos/blockstates/popcorn_ceiling_block.json src/common/resources/assets/asbestos/blockstates/popcorn_ceiling_block.json

src/main/resources/assets/asbestos/blockstates/serpentinite_block.json src/common/resources/assets/asbestos/blockstates/serpentinite_block.json

src/main/resources/assets/asbestos/icon.png src/common/resources/assets/asbestos/icon.png

src/main/resources/assets/asbestos/icon.svg src/common/resources/assets/asbestos/icon.svg

src/main/resources/assets/asbestos/lang/en_us.json src/common/resources/assets/asbestos/lang/en_us.json

src/main/resources/assets/asbestos/models/block/asbestos_block.json src/common/resources/assets/asbestos/models/block/asbestos_block.json

src/main/resources/assets/asbestos/models/block/asbestos_roof_block.json src/common/resources/assets/asbestos/models/block/asbestos_roof_block.json

src/main/resources/assets/asbestos/models/block/asbestos_tile_block.json src/common/resources/assets/asbestos/models/block/asbestos_tile_block.json

src/main/resources/assets/asbestos/models/block/popcorn_ceiling_block.json src/common/resources/assets/asbestos/models/block/popcorn_ceiling_block.json

src/main/resources/assets/asbestos/models/block/serpentinite_block.json src/common/resources/assets/asbestos/models/block/serpentinite_block.json

src/main/resources/assets/asbestos/models/item/asbestos_block.json src/common/resources/assets/asbestos/models/item/asbestos_block.json

src/main/resources/assets/asbestos/models/item/asbestos_fibers.json src/common/resources/assets/asbestos/models/item/asbestos_fibers.json

src/main/resources/assets/asbestos/models/item/asbestos_roof_block.json src/common/resources/assets/asbestos/models/item/asbestos_roof_block.json

src/main/resources/assets/asbestos/models/item/asbestos_tile_block.json src/common/resources/assets/asbestos/models/item/asbestos_tile_block.json

src/main/resources/assets/asbestos/models/item/cancer_meter.json src/common/resources/assets/asbestos/models/item/cancer_meter.json

src/main/resources/assets/asbestos/models/item/empty_syringe.json src/common/resources/assets/asbestos/models/item/empty_syringe.json

src/main/resources/assets/asbestos/models/item/filled_syringe.json src/common/resources/assets/asbestos/models/item/filled_syringe.json

src/main/resources/assets/asbestos/models/item/iron_scraper.json src/common/resources/assets/asbestos/models/item/iron_scraper.json

src/main/resources/assets/asbestos/models/item/popcorn_ceiling_block.json src/common/resources/assets/asbestos/models/item/popcorn_ceiling_block.json

src/main/resources/assets/asbestos/models/item/ppe_boots.json src/common/resources/assets/asbestos/models/item/ppe_boots.json

src/main/resources/assets/asbestos/models/item/ppe_chestplate.json src/common/resources/assets/asbestos/models/item/ppe_chestplate.json

src/main/resources/assets/asbestos/models/item/ppe_helmet.json src/common/resources/assets/asbestos/models/item/ppe_helmet.json

src/main/resources/assets/asbestos/models/item/ppe_leggings.json src/common/resources/assets/asbestos/models/item/ppe_leggings.json

src/main/resources/assets/asbestos/models/item/serpentinite_block.json src/common/resources/assets/asbestos/models/item/serpentinite_block.json

src/main/resources/assets/asbestos/textures/block/asbestos_block.png src/common/resources/assets/asbestos/textures/block/asbestos_block.png

src/main/resources/assets/asbestos/textures/block/asbestos_roof_side.png src/common/resources/assets/asbestos/textures/block/asbestos_roof_side.png

src/main/resources/assets/asbestos/textures/block/asbestos_roof_top.png src/common/resources/assets/asbestos/textures/block/asbestos_roof_top.png

src/main/resources/assets/asbestos/textures/block/asbestos_tiles.png src/common/resources/assets/asbestos/textures/block/asbestos_tiles.png

src/main/resources/assets/asbestos/textures/block/popcorn_bottom.png src/common/resources/assets/asbestos/textures/block/popcorn_bottom.png

src/main/resources/assets/asbestos/textures/block/popcorn_side.png src/common/resources/assets/asbestos/textures/block/popcorn_side.png

src/main/resources/assets/asbestos/textures/block/popcorn_top.png src/common/resources/assets/asbestos/textures/block/popcorn_top.png

src/main/resources/assets/asbestos/textures/block/serpentinite_block.png src/common/resources/assets/asbestos/textures/block/serpentinite_block.png

src/main/resources/assets/asbestos/textures/gui/cancer_meter.ase src/common/resources/assets/asbestos/textures/gui/cancer_meter.ase

src/main/resources/assets/asbestos/textures/gui/cancer_meter.png src/common/resources/assets/asbestos/textures/gui/cancer_meter.png

src/main/resources/assets/asbestos/textures/item/asbestos_fibers.png src/common/resources/assets/asbestos/textures/item/asbestos_fibers.png

src/main/resources/assets/asbestos/textures/item/cancer_meter.aseprite src/common/resources/assets/asbestos/textures/item/cancer_meter.aseprite

src/main/resources/assets/asbestos/textures/item/cancer_meter.png src/common/resources/assets/asbestos/textures/item/cancer_meter.png

src/main/resources/assets/asbestos/textures/item/empty_syringe.aseprite src/common/resources/assets/asbestos/textures/item/empty_syringe.aseprite

src/main/resources/assets/asbestos/textures/item/empty_syringe.png src/common/resources/assets/asbestos/textures/item/empty_syringe.png

src/main/resources/assets/asbestos/textures/item/filled_syringe.aseprite src/common/resources/assets/asbestos/textures/item/filled_syringe.aseprite

src/main/resources/assets/asbestos/textures/item/filled_syringe.png src/common/resources/assets/asbestos/textures/item/filled_syringe.png

src/main/resources/assets/asbestos/textures/item/iron_scraper.png src/common/resources/assets/asbestos/textures/item/iron_scraper.png

src/main/resources/assets/asbestos/textures/item/ppe_boots.png src/common/resources/assets/asbestos/textures/item/ppe_boots.png

src/main/resources/assets/asbestos/textures/item/ppe_chestplate.png src/common/resources/assets/asbestos/textures/item/ppe_chestplate.png

src/main/resources/assets/asbestos/textures/item/ppe_helmet.png src/common/resources/assets/asbestos/textures/item/ppe_helmet.png

src/main/resources/assets/asbestos/textures/item/ppe_leggings.png src/common/resources/assets/asbestos/textures/item/ppe_leggings.png

src/main/resources/assets/asbestos/textures/mob_effect/mesothelioma.png src/common/resources/assets/asbestos/textures/mob_effect/mesothelioma.png

src/main/resources/assets/minecraft/textures/models/armor/asbestos_protective_layer_1.png src/common/resources/assets/minecraft/textures/models/armor/asbestos_protective_layer_1.png

src/main/resources/assets/minecraft/textures/models/armor/asbestos_protective_layer_2.png src/common/resources/assets/minecraft/textures/models/armor/asbestos_protective_layer_2.png

src/main/resources/data/asbestos/damage_type/blood_extract.json src/common/resources/data/asbestos/damage_type/blood_extract.json

src/main/resources/data/asbestos/damage_type/mesothelioma.json src/common/resources/data/asbestos/damage_type/mesothelioma.json

src/main/resources/data/asbestos/loot_tables/blocks/asbestos_block.json src/common/resources/data/asbestos/loot_tables/blocks/asbestos_block.json

src/main/resources/data/asbestos/loot_tables/blocks/asbestos_roof_block.json src/common/resources/data/asbestos/loot_tables/blocks/asbestos_roof_block.json

src/main/resources/data/asbestos/loot_tables/blocks/asbestos_tile_block.json src/common/resources/data/asbestos/loot_tables/blocks/asbestos_tile_block.json

src/main/resources/data/asbestos/loot_tables/blocks/popcorn_ceiling_block.json src/common/resources/data/asbestos/loot_tables/blocks/popcorn_ceiling_block.json

src/main/resources/data/asbestos/loot_tables/blocks/serpentinite_block.json src/common/resources/data/asbestos/loot_tables/blocks/serpentinite_block.json

src/main/resources/data/asbestos/recipes/asbestos_block.json src/common/resources/data/asbestos/recipes/asbestos_block.json

src/main/resources/data/asbestos/recipes/asbestos_roof_block.json src/common/resources/data/asbestos/recipes/asbestos_roof_block.json

src/main/resources/data/asbestos/recipes/asbestos_tile_block.json src/common/resources/data/asbestos/recipes/asbestos_tile_block.json

src/main/resources/data/asbestos/recipes/cancer_meter.json src/common/resources/data/asbestos/recipes/cancer_meter.json

src/main/resources/data/asbestos/recipes/empty_syringe.json src/common/resources/data/asbestos/recipes/empty_syringe.json

src/main/resources/data/asbestos/recipes/iron_scraper.json src/common/resources/data/asbestos/recipes/iron_scraper.json

src/main/resources/data/asbestos/recipes/popcorn_ceiling_block.json src/common/resources/data/asbestos/recipes/popcorn_ceiling_block.json

src/main/resources/data/asbestos/recipes/ppe_boots.json src/common/resources/data/asbestos/recipes/ppe_boots.json

src/main/resources/data/asbestos/recipes/ppe_chestplate.json src/common/resources/data/asbestos/recipes/ppe_chestplate.json

src/main/resources/data/asbestos/recipes/ppe_helmet.json src/common/resources/data/asbestos/recipes/ppe_helmet.json

src/main/resources/data/asbestos/recipes/ppe_leggings.json src/common/resources/data/asbestos/recipes/ppe_leggings.json

src/main/resources/data/asbestos/tags/blocks/scrapable.json src/common/resources/data/asbestos/tags/blocks/scrapable.json

src/main/resources/data/asbestos/worldgen/configured_feature/serpentinite_overworld.json src/common/resources/data/asbestos/worldgen/configured_feature/serpentinite_overworld.json

src/main/resources/data/asbestos/worldgen/placed_feature/serpentinite.json src/common/resources/data/asbestos/worldgen/placed_feature/serpentinite.json

src/main/resources/data/minecraft/tags/blocks/mineable/axe.json src/common/resources/data/minecraft/tags/blocks/mineable/axe.json

src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json src/common/resources/data/minecraft/tags/blocks/mineable/pickaxe.json

src/main/resources/data/minecraft/tags/damage_type/bypasses_cooldown.json src/common/resources/data/minecraft/tags/damage_type/bypasses_cooldown.json

+24

src/fabric/main/kotlin/xyz/naomieow/asbestos/AsbestosFabric.kt

···

       1
       1
       +
       @file:JvmName("AsbestosFabric")

     

       2
       2
       +
       package xyz.naomieow.asbestos

     

       3
       3
       +
       

     

       4
       4
       +
       public fun init() {

     

       5
       5
       +
           Asbestos.init()

     

       6
       6
       +
       }

     

       7
       7
       +
       //

     

       8
       8
       +
       //    override fun onInitialize() {

     

       9
       9
       +
       //

     

       10
       10
       +
       //        Registry.register(

     

       11
       11
       +
       //            BuiltInRegistries.MOB_EFFECT,

     

       12
       12
       +
       //            id("mesothelioma"),

     

       13
       13
       +
       //            MESO_STATUS

     

       14
       14
       +
       //        )

     

       15
       15
       +
       //

     

       16
       16
       +
       //        BiomeModifications.addFeature(

     

       17
       17
       +
       //            BiomeSelectors.foundInOverworld(),

     

       18
       18
       +
       //            GenerationStep.Decoration.UNDERGROUND_ORES,

     

       19
       19
       +
       //            Asbestos.serpentinitePlacedKey

     

       20
       20
       +
       //        )

     

       21
       21
       +
       //

     

       22
       22
       +
       //        ModScheduler.init()

     

       23
       23
       +
       //    }

     

       24
       24
       +
       //}

+7 -4

src/main/kotlin/xyz/naomieow/asbestos/ModScheduler.kt src/fabric/main/kotlin/xyz/naomieow/asbestos/ModScheduler.kt

···

       9
       9
        
       import xyz.naomieow.asbestos.block.CarcinogenicBlock

     

       10
       10
        
       import xyz.naomieow.asbestos.config.AsbestosConfig

     

       11
       11
        
       import java.util.function.Consumer

     

       12
       12
       +
       import xyz.naomieow.asbestos.mesothelioma.getMesothelioma

     

       13
       13
       +
       import xyz.naomieow.asbestos.mesothelioma.setMesothelioma

     

       14
       14
       +
       import xyz.naomieow.asbestos.mob_effect.AsbestosMobEffects

     

       12
       15
        
       

     

       13
       16
        
       object ModScheduler {

     

       14
       17
        
           fun init() {

     
···

       17
       20
        
                       server.allLevels.forEach(Consumer { level: ServerLevel ->

     

       18
       21
        
                           level.players().forEach(

     

       19
       22
        
                               Consumer { player: ServerPlayer ->

     

       20
       20
       -
                                   val exposure = AsbestosMod.MESOTHELIOMA.get(player).getMeso()

     

       23
       23
       +
                                   val exposure = player.getMesothelioma()

     

       21
       24
        
                                   if (exposure >= (AsbestosConfig.threshold / 2)) {

     

       22
       22
       -
                                       player.addEffect(MobEffectInstance(AsbestosMod.MESO_STATUS, -1))

     

       25
       25
       +
                                       player.addEffect(MobEffectInstance(AsbestosMobEffects.mesotheliomaMobEffect, -1))

     

       23
       26
        
                                   }

     

       24
       27
        
       

     

       25
       28
        
                                   if (CarcinogenicBlock.isProtectedFromAsbestos(player)) {

     
···

       38
       41
        
                                                   offsetPos.z().toInt()

     

       39
       42
        
                                               )

     

       40
       43
        
                                               val block = level.getBlockState(pos).block

     

       41
       41
       -
                                               if (listOf(*AsbestosMod.HARMFUL_PASSIVE_BLOCKS)

     

       44
       44
       +
                                               if (listOf(*Asbestos.harmfulPassiveBlocks)

     

       42
       45
        
                                                       .contains(block)

     

       43
       46
        
                                               ) {

     

       44
       44
       -
                                                   AsbestosMod.MESOTHELIOMA.get(player).setMeso(exposure + 1)

     

       47
       47
       +
                                                   player.setMesothelioma(exposure + 1)

     

       45
       48
        
                                                   break@findasbestos

     

       46
       49
        
                                               }

     

       47
       50
        
                                           }

+6

src/fabric/main/kotlin/xyz/naomieow/asbestos/client/AsbestosClientFabric.kt

···

       1
       1
       +
       @file:JvmName("AsbestosClientFabric")

     

       2
       2
       +
       package xyz.naomieow.asbestos.client

     

       3
       3
       +
       

     

       4
       4
       +
       public fun init() {

     

       5
       5
       +
           asbestosClient()

     

       6
       6
       +
       }

-8

src/main/kotlin/xyz/naomieow/asbestos/client/AsbestosModClient.kt src/fabric/main/kotlin/xyz/naomieow/asbestos/client/AsbestosModClient.kt

···

       4
       4
        
       import net.fabricmc.api.EnvType

     

       5
       5
        
       import net.fabricmc.api.Environment

     

       6
       6
        
       import net.minecraft.client.gui.screens.MenuScreens

     

       7
       7
       -
       import net.minecraft.resources.ResourceLocation

     

       8
       7
        
       import xyz.naomieow.asbestos.client.screen.CancerMeterScreen

     

       9
       8
        
       import xyz.naomieow.asbestos.client.screen.ModMenuTypes

     

       10
       9
        
       

     

       11
       11
       -
       const val MOD_ID: String = "asbestos"

     

       12
       12
       -
       

     

       13
       13
       -
       internal inline fun id(path: String): ResourceLocation {

     

       14
       14
       -
           return ResourceLocation(MOD_ID, path)

     

       15
       15
       -
       }

     

       16
       16
       -
       

     

       17
       10
        
       @Environment(EnvType.CLIENT)

     

       18
       11
        
       class AsbestosModClient : ClientModInitializer {

     

       19
       12
        
           override fun onInitializeClient() {

     

       20
       20
       -
               ModMenuTypes.register()

     

       21
       13
        
               MenuScreens.register(ModMenuTypes.CancerMeter, ::CancerMeterScreen)

     

       22
       14
        
           }

     

       23
       15

src/main/kotlin/xyz/naomieow/asbestos/client/ModMenuIntegration.kt src/fabric/main/kotlin/xyz/naomieow/asbestos/client/ModMenuIntegration.kt

+13

src/fabric/main/kotlin/xyz/naomieow/asbestos/mesothelioma/Mesothelioma.kt

···

       1
       1
       +
       package xyz.naomieow.asbestos.mesothelioma

     

       2
       2
       +
       

     

       3
       3
       +
       import net.minecraft.world.entity.player.Player

     

       4
       4
       +
       

     

       5
       5
       +
       @Suppress("ACTUAL_WITHOUT_EXPECT")

     

       6
       6
       +
       public actual fun Player.getMesothelioma(): Int {

     

       7
       7
       +
           return this.getAttachedOrSet(MesotheliomaAttachment.mesothelioma, 0);

     

       8
       8
       +
       }

     

       9
       9
       +
       

     

       10
       10
       +
       @Suppress("ACTUAL_WITHOUT_EXPECT")

     

       11
       11
       +
       public actual fun Player.setMesothelioma(value: Int) {

     

       12
       12
       +
           return this.setAttachment(MesotheliomaAttachment.mesothelioma, value);

     

       13
       13
       +
       }

+14

src/fabric/main/kotlin/xyz/naomieow/asbestos/mesothelioma/MesotheliomaAttachment.kt

···

       1
       1
       +
       package xyz.naomieow.asbestos.mesothelioma

     

       2
       2
       +
       

     

       3
       3
       +
       import com.mojang.serialization.Codec

     

       4
       4
       +
       

     

       5
       5
       +
       import net.fabricmc.fabric.api.attachment.v1.AttachmentRegistry

     

       6
       6
       +
       import net.fabricmc.fabric.api.attachment.v1.AttachmentType

     

       7
       7
       +
       import xyz.naomieow.asbestos.id

     

       8
       8
       +
       

     

       9
       9
       +
       public object MesotheliomaAttachment {

     

       10
       10
       +
           public val mesothelioma: AttachmentType<Int> = AttachmentRegistry.createPersistent(

     

       11
       11
       +
               id("mesothelioma"),

     

       12
       12
       +
               Codec.INT,

     

       13
       13
       +
           );

     

       14
       14
       +
       }

+36

src/forge/main/kotlin/xyz/naomieow/asbestos/AsbestosForge.kt

···

       1
       1
       +
       package xyz.naomieow.asbestos

     

       2
       2
       +
       

     

       3
       3
       +
       import net.minecraft.world.entity.Entity

     

       4
       4
       +
       import net.minecraft.world.entity.player.Player

     

       5
       5
       +
       import net.minecraft.world.inventory.MenuType

     

       6
       6
       +
       import net.minecraftforge.common.capabilities.RegisterCapabilitiesEvent

     

       7
       7
       +
       import net.minecraftforge.event.AttachCapabilitiesEvent

     

       8
       8
       +
       import net.minecraftforge.eventbus.api.SubscribeEvent

     

       9
       9
       +
       import net.minecraftforge.fml.common.Mod

     

       10
       10
       +
       import net.minecraftforge.registries.DeferredRegister

     

       11
       11
       +
       import net.minecraftforge.registries.ForgeRegistries

     

       12
       12
       +
       import xyz.naomieow.asbestos.mesothelioma.MesotheliomaCapability

     

       13
       13
       +
       import xyz.naomieow.asbestos.mesothelioma.MesotheliomaCapabilityProvider

     

       14
       14
       +
       

     

       15
       15
       +
       @Mod(MOD_ID)

     

       16
       16
       +
       public class AsbestosForge {

     

       17
       17
       +
           init {

     

       18
       18
       +
               Asbestos.init()

     

       19
       19
       +
           }

     

       20
       20
       +
       

     

       21
       21
       +
           @SubscribeEvent

     

       22
       22
       +
           public fun registerCapabilities(event: RegisterCapabilitiesEvent) {

     

       23
       23
       +
               MesotheliomaCapability.register(event)

     

       24
       24
       +
           }

     

       25
       25
       +
       

     

       26
       26
       +
           @SubscribeEvent

     

       27
       27
       +
           public fun attachEntityCapabilities(event: AttachCapabilitiesEvent<Entity>) {

     

       28
       28
       +
               when (event.`object`) {

     

       29
       29
       +
                   is Player -> MesotheliomaCapabilityProvider.attach(event)

     

       30
       30
       +
               }

     

       31
       31
       +
           }

     

       32
       32
       +
       

     

       33
       33
       +
           public companion object {

     

       34
       34
       +
               public val menuTypeRegister: DeferredRegister<MenuType<*>> = DeferredRegister.create(ForgeRegistries.MENU_TYPES, MOD_ID)

     

       35
       35
       +
           }

     

       36
       36
       +
       }

+12

src/forge/main/kotlin/xyz/naomieow/asbestos/client/AsbestosClientForge.kt

···

       1
       1
       +
       @file:EventBusSubscriber(modid = MOD_ID, bus = EventBusSubscriber.Bus.MOD)

     

       2
       2
       +
       package xyz.naomieow.asbestos.client

     

       3
       3
       +
       

     

       4
       4
       +
       import net.minecraftforge.eventbus.api.SubscribeEvent

     

       5
       5
       +
       import net.minecraftforge.fml.common.Mod.EventBusSubscriber

     

       6
       6
       +
       import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent

     

       7
       7
       +
       import xyz.naomieow.asbestos.MOD_ID

     

       8
       8
       +
       

     

       9
       9
       +
       @SubscribeEvent

     

       10
       10
       +
       public fun onClientInit(event: FMLClientSetupEvent) {

     

       11
       11
       +
           event.enqueueWork(::asbestosClient)

     

       12
       12
       +
       }

+9

src/forge/main/kotlin/xyz/naomieow/asbestos/mesothelioma/IMesotheliomaCapability.kt

···

       1
       1
       +
       package xyz.naomieow.asbestos.mesothelioma

     

       2
       2
       +
       

     

       3
       3
       +
       import net.minecraft.nbt.CompoundTag

     

       4
       4
       +
       import net.minecraftforge.common.util.INBTSerializable

     

       5
       5
       +
       

     

       6
       6
       +
       public interface IMesotheliomaCapability: INBTSerializable<CompoundTag> {

     

       7
       7
       +
           public fun getValue(): Int

     

       8
       8
       +
           public fun setValue(value: Int)

     

       9
       9
       +
       }

+13

src/forge/main/kotlin/xyz/naomieow/asbestos/mesothelioma/Mesothelioma.kt

···

       1
       1
       +
       package xyz.naomieow.asbestos.mesothelioma

     

       2
       2
       +
       

     

       3
       3
       +
       import net.minecraft.world.entity.player.Player

     

       4
       4
       +
       

     

       5
       5
       +
       @Suppress("ACTUAL_WITHOUT_EXPECT")

     

       6
       6
       +
       public actual fun Player.getMesothelioma(): Int {

     

       7
       7
       +
           return this.getCapability(MesotheliomaCapability.instance).resolve().get().getValue()

     

       8
       8
       +
       }

     

       9
       9
       +
       

     

       10
       10
       +
       @Suppress("ACTUAL_WITHOUT_EXPECT")

     

       11
       11
       +
       public actual fun Player.setMesothelioma(value: Int) {

     

       12
       12
       +
           this.getCapability(MesotheliomaCapability.instance).resolve().get().setValue(value)

     

       13
       13
       +
       }

+12

src/forge/main/kotlin/xyz/naomieow/asbestos/mesothelioma/MesotheliomaCapability.kt

···

       1
       1
       +
       package xyz.naomieow.asbestos.mesothelioma

     

       2
       2
       +
       

     

       3
       3
       +
       import net.minecraftforge.common.capabilities.*

     

       4
       4
       +
       

     

       5
       5
       +
       public object MesotheliomaCapability {

     

       6
       6
       +
           public val instance: Capability<IMesotheliomaCapability> =

     

       7
       7
       +
               CapabilityManager.get<IMesotheliomaCapability>(object : CapabilityToken<IMesotheliomaCapability>() {})

     

       8
       8
       +
       

     

       9
       9
       +
           public fun register(event: RegisterCapabilitiesEvent) {

     

       10
       10
       +
               event.register(IMesotheliomaCapability::class.java)

     

       11
       11
       +
           }

     

       12
       12
       +
       }

+44

src/forge/main/kotlin/xyz/naomieow/asbestos/mesothelioma/MesotheliomaCapabilityProvider.kt

···

       1
       1
       +
       package xyz.naomieow.asbestos.mesothelioma

     

       2
       2
       +
       

     

       3
       3
       +
       import net.minecraft.core.Direction

     

       4
       4
       +
       import net.minecraft.nbt.CompoundTag

     

       5
       5
       +
       import net.minecraft.world.entity.Entity

     

       6
       6
       +
       import net.minecraftforge.common.capabilities.Capability

     

       7
       7
       +
       import net.minecraftforge.common.capabilities.ICapabilitySerializable

     

       8
       8
       +
       import net.minecraftforge.common.util.LazyOptional

     

       9
       9
       +
       import net.minecraftforge.event.AttachCapabilitiesEvent

     

       10
       10
       +
       import xyz.naomieow.asbestos.id

     

       11
       11
       +
       

     

       12
       12
       +
       public class MesotheliomaCapabilityProvider: ICapabilitySerializable<CompoundTag> {

     

       13
       13
       +
           private val backend: IMesotheliomaCapability = MesotheliomaImplementation()

     

       14
       14
       +
           private val optionalData: LazyOptional<IMesotheliomaCapability> = LazyOptional.of { backend }

     

       15
       15
       +
       

     

       16
       16
       +
           private fun invalidiate() {

     

       17
       17
       +
               optionalData.invalidate()

     

       18
       18
       +
           }

     

       19
       19
       +
       

     

       20
       20
       +
           override fun <T : Any?> getCapability(

     

       21
       21
       +
               capability: Capability<T?>,

     

       22
       22
       +
               direction: Direction?

     

       23
       23
       +
           ): LazyOptional<T?> {

     

       24
       24
       +
               return MesotheliomaCapability.instance.orEmpty(capability, this.optionalData)

     

       25
       25
       +
           }

     

       26
       26
       +
       

     

       27
       27
       +
           override fun serializeNBT(): CompoundTag {

     

       28
       28
       +
               return this.backend.serializeNBT()

     

       29
       29
       +
           }

     

       30
       30
       +
       

     

       31
       31
       +
           override fun deserializeNBT(tag: CompoundTag) {

     

       32
       32
       +
               return this.backend.deserializeNBT(tag)

     

       33
       33
       +
           }

     

       34
       34
       +
       

     

       35
       35
       +
           public companion object {

     

       36
       36
       +
               public val identifier = id("mesothelioma_cap")

     

       37
       37
       +
       

     

       38
       38
       +
               public fun attach(event: AttachCapabilitiesEvent<Entity>) {

     

       39
       39
       +
                   val provider: MesotheliomaCapabilityProvider = MesotheliomaCapabilityProvider()

     

       40
       40
       +
       

     

       41
       41
       +
                   event.addCapability(identifier, provider)

     

       42
       42
       +
               }

     

       43
       43
       +
           }

     

       44
       44
       +
       }

+30

src/forge/main/kotlin/xyz/naomieow/asbestos/mesothelioma/MesotheliomaImplementation.kt

···

       1
       1
       +
       package xyz.naomieow.asbestos.mesothelioma

     

       2
       2
       +
       

     

       3
       3
       +
       import net.minecraft.nbt.CompoundTag

     

       4
       4
       +
       

     

       5
       5
       +
       public class MesotheliomaImplementation: IMesotheliomaCapability {

     

       6
       6
       +
           private var mesothelioma: Int = 0;

     

       7
       7
       +
       

     

       8
       8
       +
           override fun getValue(): Int {

     

       9
       9
       +
               return mesothelioma

     

       10
       10
       +
           }

     

       11
       11
       +
       

     

       12
       12
       +
           override fun setValue(value: Int) {

     

       13
       13
       +
               mesothelioma = value

     

       14
       14
       +
           }

     

       15
       15
       +
       

     

       16
       16
       +
           override fun serializeNBT(): CompoundTag {

     

       17
       17
       +
               val tag: CompoundTag = CompoundTag();

     

       18
       18
       +
               tag.putInt(MESOTHELIOMA_NBT_KEY, mesothelioma)

     

       19
       19
       +
               return tag

     

       20
       20
       +
           }

     

       21
       21
       +
       

     

       22
       22
       +
           override fun deserializeNBT(tag: CompoundTag) {

     

       23
       23
       +
               mesothelioma = tag.getInt(MESOTHELIOMA_NBT_KEY)

     

       24
       24
       +
           }

     

       25
       25
       +
       

     

       26
       26
       +
           private companion object {

     

       27
       27
       +
               private const val MESOTHELIOMA_NBT_KEY: String = "mesothelioma"

     

       28
       28
       +
           }

     

       29
       29
       +
       

     

       30
       30
       +
       }

-38

src/main/kotlin/xyz/naomieow/asbestos/block/CarcinogenicBlock.kt

···

       1
       1
       -
       package xyz.naomieow.asbestos.block

     

       2
       2
       -
       

     

       3
       3
       -
       import net.minecraft.core.BlockPos

     

       4
       4
       -
       import net.minecraft.world.entity.player.Player

     

       5
       5
       -
       import net.minecraft.world.item.Item

     

       6
       6
       -
       import net.minecraft.world.level.Level

     

       7
       7
       -
       import net.minecraft.world.level.block.Block

     

       8
       8
       -
       import net.minecraft.world.level.block.state.BlockState

     

       9
       9
       -
       import xyz.naomieow.asbestos.AsbestosMod

     

       10
       10
       -
       import xyz.naomieow.asbestos.item.ModItems

     

       11
       11
       -
       

     

       12
       12
       -
       open class CarcinogenicBlock(settings: Properties, private val dangerLevel: Int) : Block(settings) {

     

       13
       13
       -
           override fun playerWillDestroy(world: Level, pos: BlockPos, state: BlockState, player: Player) {

     

       14
       14
       -
               super.playerWillDestroy(world, pos, state, player)

     

       15
       15
       -
               if (!isProtectedFromAsbestos(player)) {

     

       16
       16
       -
                   val exposure = AsbestosMod.MESOTHELIOMA.get(player).getMeso()

     

       17
       17
       -
                   AsbestosMod.MESOTHELIOMA.get(player).setMeso(exposure + dangerLevel)

     

       18
       18
       -
               }

     

       19
       19
       -
           }

     

       20
       20
       -
       

     

       21
       21
       -
           companion object {

     

       22
       22
       -
               val PROTECTIVE_ARMOUR: Array<Item> by lazy { arrayOf<Item>(

     

       23
       23
       -
                   ModItems.PPEHelmet,

     

       24
       24
       -
                   ModItems.PPEChestplate,

     

       25
       25
       -
                   ModItems.PPELeggings,

     

       26
       26
       -
                   ModItems.PPEBoots

     

       27
       27
       -
               ) }

     

       28
       28
       -
       

     

       29
       29
       -
               fun isProtectedFromAsbestos(player: Player): Boolean {

     

       30
       30
       -
                   for (item in player.armorSlots) {

     

       31
       31
       -
                       if (!listOf(*PROTECTIVE_ARMOUR).contains(item.item)) {

     

       32
       32
       -
                           return false

     

       33
       33
       -
                       }

     

       34
       34
       -
                   }

     

       35
       35
       -
                   return true

     

       36
       36
       -
               }

     

       37
       37
       -
           }

     

       38
       38
       -
       }

-27

src/main/kotlin/xyz/naomieow/asbestos/inventory/ICancerMeterInventory.kt

···

       1
       1
       -
       package xyz.naomieow.asbestos.inventory

     

       2
       2
       -
       

     

       3
       3
       -
       import net.minecraft.nbt.CompoundTag

     

       4
       4
       -
       import net.minecraft.world.entity.player.Player

     

       5
       5
       -
       import net.minecraft.world.item.ItemStack

     

       6
       6
       -
       import net.minecraft.world.level.Level

     

       7
       7
       -
       

     

       8
       8
       -
       interface ICancerMeterInventory {

     

       9
       9
       -
           fun writeItems(tag: CompoundTag)

     

       10
       10
       -
           fun readItems(tag: CompoundTag)

     

       11
       11
       -
           fun writeAllData(tag: CompoundTag)

     

       12
       12
       -
           fun readAllData(tag: CompoundTag)

     

       13
       13
       -
           fun getInventory(): InventoryImproved

     

       14
       14
       -
           fun getScreenID(): Byte

     

       15
       15
       -
           fun getLevel(): Level

     

       16
       16
       -
           fun getItemStack(): ItemStack

     

       17
       17
       -
           fun setUsingPlayer(player: Player?)

     

       18
       18
       -
           fun markDataDirty(vararg dataIds: Byte)

     

       19
       19
       -
           fun markDirty()

     

       20
       20
       -
       

     

       21
       21
       -
           companion object {

     

       22
       22
       -
               const val INVENTORY_DATA: Byte = 0

     

       23
       23
       -
               const val COMBINED_INVENTORY_DATA: Byte = 1

     

       24
       24
       -
               const val SLOT_DATA: Byte = 2

     

       25
       25
       -
               const val ALL_DATA: Byte = 3

     

       26
       26
       -
           }

     

       27
       27
       -
       }

-36

src/main/kotlin/xyz/naomieow/asbestos/item/ModCreativeTabs.kt

···

       1
       1
       -
       package xyz.naomieow.asbestos.item

     

       2
       2
       -
       

     

       3
       3
       -
       import net.minecraft.core.registries.Registries

     

       4
       4
       -
       import net.minecraft.network.chat.Component

     

       5
       5
       -
       import net.minecraft.world.item.CreativeModeTab

     

       6
       6
       -
       import uwu.serenity.kritter.api.Registrar

     

       7
       7
       -
       import uwu.serenity.kritter.api.entry.RegistryEntry

     

       8
       8
       -
       import uwu.serenity.kritter.stdlib.creativeTab

     

       9
       9
       -
       import xyz.naomieow.asbestos.AsbestosMod

     

       10
       10
       -
       import xyz.naomieow.asbestos.block.ModBlocks

     

       11
       11
       -
       

     

       12
       12
       -
       @Suppress("UNUSED")

     

       13
       13
       -
       object ModCreativeTabs: Registrar<CreativeModeTab> by AsbestosMod..Registries.CREATIVE_MODE_TAB {

     

       14
       14
       -
           val Asbestos: RegistryEntry<CreativeModeTab> = creativeTab("asbestos") {

     

       15
       15
       -
               title = Component.translatable("itemGroup.asbestos.asbestos")

     

       16
       16
       -
               icon { ModItems.AsbestosFibers.defaultInstance }

     

       17
       17
       -
               displayItems {

     

       18
       18
       -
                   // Items

     

       19
       19
       -
                   accept(ModItems.AsbestosFibers)

     

       20
       20
       -
                   accept(ModItems.IronScraper)

     

       21
       21
       -
                   accept(ModItems.EmptySyringe)

     

       22
       22
       -
                   accept(ModItems.FilledSyringe)

     

       23
       23
       -
                   accept(ModItems.CancerMeter)

     

       24
       24
       -
                   accept(ModItems.PPEHelmet)

     

       25
       25
       -
                   accept(ModItems.PPEChestplate)

     

       26
       26
       -
                   accept(ModItems.PPELeggings)

     

       27
       27
       -
                   accept(ModItems.PPEBoots)

     

       28
       28
       -
                   // Blocks

     

       29
       29
       -
                   accept(ModBlocks.AsbestosBlock)

     

       30
       30
       -
                   accept(ModBlocks.SerpentiniteBlock)

     

       31
       31
       -
                   accept(ModBlocks.PopcornCeilingBlock)

     

       32
       32
       -
                   accept(ModBlocks.AsbestosTileBlock)

     

       33
       33
       -
                   accept(ModBlocks.AsbestosRoofBlock)

     

       34
       34
       -
               }

     

       35
       35
       -
           }

     

       36
       36
       -
       }

-8

src/main/kotlin/xyz/naomieow/asbestos/mesothelioma/MesoComponent.kt

···

       1
       1
       -
       package xyz.naomieow.asbestos.mesothelioma

     

       2
       2
       -
       

     

       3
       3
       -
       import dev.onyxstudios.cca.api.v3.component.ComponentV3

     

       4
       4
       -
       

     

       5
       5
       -
       interface IMesoComponent: ComponentV3 {

     

       6
       6
       -
           fun getMeso(): Int

     

       7
       7
       -
           fun setMeso(exposure: Int)

     

       8
       8
       -
       }

-29

src/main/kotlin/xyz/naomieow/asbestos/mesothelioma/PlayerMesoComponent.kt

···

       1
       1
       -
       package xyz.naomieow.asbestos.mesothelioma

     

       2
       2
       -
       

     

       3
       3
       -
       import dev.onyxstudios.cca.api.v3.component.sync.AutoSyncedComponent

     

       4
       4
       -
       import net.minecraft.nbt.CompoundTag

     

       5
       5
       -
       import net.minecraft.world.entity.player.Player

     

       6
       6
       -
       import xyz.naomieow.asbestos.AsbestosMod

     

       7
       7
       -
       

     

       8
       8
       -
       class PlayerMesoComponent(

     

       9
       9
       -
           var playerEntity: Player

     

       10
       10
       -
       ): IMesoComponent, AutoSyncedComponent {

     

       11
       11
       -
           private var mesothelioma: Int = 0

     

       12
       12
       -
       

     

       13
       13
       -
           override fun readFromNbt(tag: CompoundTag) {

     

       14
       14
       -
               setMeso(tag.getInt("mesothelioma"))

     

       15
       15
       -
           }

     

       16
       16
       -
       

     

       17
       17
       -
           override fun writeToNbt(tag: CompoundTag) {

     

       18
       18
       -
               tag.putInt("mesothelioma", getMeso())

     

       19
       19
       -
           }

     

       20
       20
       -
       

     

       21
       21
       -
           override fun getMeso(): Int {

     

       22
       22
       -
               return mesothelioma

     

       23
       23
       -
           }

     

       24
       24
       -
       

     

       25
       25
       -
           override fun setMeso(exposure: Int) {

     

       26
       26
       -
               mesothelioma = exposure

     

       27
       27
       -
               AsbestosMod.MESOTHELIOMA.sync(playerEntity)

     

       28
       28
       -
           }

     

       29
       29
       -
       }