From 235419018421b83c193f48985b78dcfb9170e76e Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Mon, 31 Mar 2025 08:23:17 +0700 Subject: [PATCH] Update method references after merge --- .../mc/otm/datagen/advancements/AdvancementData.kt | 11 ++++------- .../mc/otm/datagen/loot/LootTablesChests.kt | 8 ++------ .../mc/otm/datagen/models/MatteryModelProvider.kt | 7 +++---- .../ru/dbotthepony/mc/otm/entity/AndroidMelee.kt | 2 +- .../kotlin/ru/dbotthepony/mc/otm/entity/Enforcer.kt | 4 +--- .../ru/dbotthepony/mc/otm/entity/RocketProjectile.kt | 4 +--- 6 files changed, 12 insertions(+), 24 deletions(-) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/AdvancementData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/AdvancementData.kt index 3c05b8393..d4f253ded 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/AdvancementData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/AdvancementData.kt @@ -1,23 +1,20 @@ package ru.dbotthepony.mc.otm.datagen.advancements import net.minecraft.advancements.AdvancementHolder -import net.minecraft.advancements.AdvancementRewards import net.minecraft.advancements.AdvancementRequirements.Strategy +import net.minecraft.advancements.AdvancementRewards import net.minecraft.advancements.AdvancementType -import net.minecraft.advancements.Criterion -import net.minecraft.advancements.critereon.* +import net.minecraft.advancements.critereon.InventoryChangeTrigger import net.minecraft.world.item.DyeColor import net.minecraft.world.item.ItemStack -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.datagen.lang.MatteryLanguageProvider import ru.dbotthepony.mc.otm.datagen.modLocation import ru.dbotthepony.mc.otm.registry.MItemTags -import ru.dbotthepony.mc.otm.registry.game.MItems import ru.dbotthepony.mc.otm.registry.MRegistry -import ru.dbotthepony.mc.otm.registry.game.MEntityTypes +import ru.dbotthepony.mc.otm.registry.game.MItems import ru.dbotthepony.mc.otm.triggers.BlackHoleTrigger import ru.dbotthepony.mc.otm.triggers.NailedEntityTrigger +import ru.dbotthepony.mc.otm.util.registryName import java.util.function.Consumer fun addAdvancements(serializer: Consumer, lang: MatteryLanguageProvider) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesChests.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesChests.kt index 4eda86369..ad6b7ae37 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesChests.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesChests.kt @@ -1,20 +1,16 @@ package ru.dbotthepony.mc.otm.datagen.loot -import net.minecraft.resources.ResourceLocation import net.minecraft.util.valueproviders.UniformInt import net.minecraft.world.item.Items +import net.minecraft.world.level.storage.loot.entries.NestedLootTable import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets -import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.data.world.UniformDecimal import ru.dbotthepony.mc.otm.datagen.modLootTable import ru.dbotthepony.mc.otm.item.ProceduralBatteryItem import ru.dbotthepony.mc.otm.item.exopack.ProceduralExopackSlotUpgradeItem import ru.dbotthepony.mc.otm.item.matter.MatterDustItem import ru.dbotthepony.mc.otm.registry.game.MItems -import net.minecraft.world.level.storage.loot.entries.NestedLootTable -import net.neoforged.neoforge.common.Tags.Enchantments -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.math.Decimal fun addChestLootTables(loot: LootTables) { loot.builder(LootContextParamSets.CHEST, modLootTable("food_box")) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt index af7add6cb..52354d4a7 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt @@ -2,14 +2,13 @@ package ru.dbotthepony.mc.otm.datagen.models import net.minecraft.world.item.DyeColor import net.minecraft.world.level.block.Block -import net.minecraft.world.level.block.WaterloggedTransparentBlock import net.neoforged.neoforge.client.model.generators.BlockModelProvider import net.neoforged.neoforge.data.event.GatherDataEvent -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import ru.dbotthepony.mc.otm.datagen.DataGen -import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.datagen.modLocation -import java.util.LinkedList +import ru.dbotthepony.mc.otm.util.registryName +import java.util.* class MatteryBlockModelProvider(event: GatherDataEvent) : BlockModelProvider(event.generator.packOutput, DataGen.MOD_ID, event.existingFileHelper) { private val callbacks = LinkedList<(MatteryBlockModelProvider) -> Unit>() diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/entity/AndroidMelee.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/entity/AndroidMelee.kt index ae69b5cea..edfb9e4d6 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/entity/AndroidMelee.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/entity/AndroidMelee.kt @@ -25,7 +25,7 @@ import net.minecraft.world.item.ItemStack import net.minecraft.world.level.Level import net.minecraft.world.level.storage.loot.LootTable import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation class AndroidMelee(type: EntityType, level: Level) : Monster(type, level) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/entity/Enforcer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/entity/Enforcer.kt index 2b2b15835..53ae805ed 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/entity/Enforcer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/entity/Enforcer.kt @@ -34,10 +34,8 @@ import net.minecraft.world.entity.player.Player import net.minecraft.world.entity.projectile.SmallFireball import net.minecraft.world.level.Level import net.minecraft.world.phys.Vec3 -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.util.TickList -import ru.dbotthepony.mc.otm.registry.MNames import ru.dbotthepony.mc.otm.registry.game.MSoundEvents +import ru.dbotthepony.mc.otm.util.TickList import java.util.* import kotlin.math.cos import kotlin.math.sin diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/entity/RocketProjectile.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/entity/RocketProjectile.kt index 4e10d0c50..eac43e839 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/entity/RocketProjectile.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/entity/RocketProjectile.kt @@ -8,15 +8,13 @@ import net.minecraft.world.entity.projectile.ProjectileUtil import net.minecraft.world.item.ItemStack import net.minecraft.world.level.Level import net.minecraft.world.level.block.Blocks -import net.minecraft.world.level.block.LevelEvent import net.minecraft.world.phys.BlockHitResult import net.minecraft.world.phys.EntityHitResult import net.minecraft.world.phys.HitResult import net.neoforged.neoforge.event.EventHooks -import ru.dbotthepony.mc.otm.core.damageType -import ru.dbotthepony.mc.otm.registry.MDamageTypes import ru.dbotthepony.mc.otm.registry.game.MEntityTypes import ru.dbotthepony.mc.otm.registry.MatteryDamageSource +import ru.dbotthepony.mc.otm.util.damageType class RocketProjectile(level: Level) : Projectile(MEntityTypes.PLASMA, level) { var inflictor: ItemStack? = null