From ca264e9292494da62ee5f8751192ae699e736058 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Tue, 21 Jan 2025 15:03:58 +0700 Subject: [PATCH] Move MItems, MBlocks, MFluids and MCreativeTabs to content subpackage --- .../ru/dbotthepony/mc/otm/datagen/DataGen.kt | 1 + .../mc/otm/datagen/DecorativeData.kt | 4 +- .../dbotthepony/mc/otm/datagen/MatterData.kt | 2 +- .../mc/otm/datagen/ResearchData.kt | 2 +- .../ru/dbotthepony/mc/otm/datagen/WorldGen.kt | 2 +- .../datagen/advancements/AdvancementData.kt | 13 +- .../advancements/AndroidAdvancementsData.kt | 2 +- .../advancements/ExopackAdvancementsData.kt | 2 +- .../advancements/MachineAdvancementsData.kt | 72 +++-- .../mc/otm/datagen/blocks/Banks.kt | 2 +- .../mc/otm/datagen/blocks/BlockModels.kt | 2 +- .../mc/otm/datagen/blocks/BlockStates.kt | 2 +- .../otm/datagen/blocks/ComplexBlockStates.kt | 2 +- .../mc/otm/datagen/items/ItemModels.kt | 2 +- .../mc/otm/datagen/lang/English.kt | 8 +- .../mc/otm/datagen/lang/Russian.kt | 4 +- .../mc/otm/datagen/loot/AdvancementLoot.kt | 2 +- .../mc/otm/datagen/loot/DecorativeLoot.kt | 2 +- .../mc/otm/datagen/loot/LootModifiersData.kt | 2 +- .../mc/otm/datagen/loot/LootTablesChests.kt | 2 +- .../mc/otm/datagen/loot/LootTablesData.kt | 16 +- .../mc/otm/datagen/loot/MachineLoot.kt | 2 +- .../mc/otm/datagen/loot/VaultLoot.kt | 2 +- .../otm/datagen/recipes/ComponentRecipes.kt | 2 +- .../mc/otm/datagen/recipes/CookingRecipes.kt | 2 +- .../datagen/recipes/CraftingTableRecipes.kt | 4 +- .../otm/datagen/recipes/DecorativesRecipes.kt | 4 +- .../datagen/recipes/MachineUpgradeRecipes.kt | 2 +- .../datagen/recipes/MatterEntanglerRecipes.kt | 2 +- .../mc/otm/datagen/recipes/PainterRecipes.kt | 2 +- .../otm/datagen/recipes/PlatePressRecipes.kt | 2 +- .../otm/datagen/recipes/ShapelessRecipes.kt | 2 +- .../otm/datagen/recipes/StorageItemRecipes.kt | 2 +- .../otm/datagen/recipes/SuspiciousRecipes.kt | 2 +- .../mc/otm/datagen/recipes/ToolsRecipes.kt | 2 +- .../mc/otm/datagen/tags/ConstructionTags.kt | 4 +- .../mc/otm/datagen/tags/DyeTags.kt | 2 +- .../mc/otm/datagen/tags/EquipmentTags.kt | 2 +- .../mc/otm/datagen/tags/MineableTags.kt | 2 +- .../mc/otm/datagen/tags/ResourceTags.kt | 5 +- .../mc/otm/datagen/tags/SuspiciousTags.kt | 2 +- .../dbotthepony/mc/otm/datagen/tags/Tags.kt | 9 +- .../mc/otm/mixin/MixinAnvilBlock.java | 2 +- .../mc/otm/mixin/MixinLivingEntity.java | 2 +- .../mc/otm/OverdriveThatMatters.kt | 4 + .../mc/otm/block/decorative/LaboratoryLamp.kt | 2 +- .../mc/otm/block/entity/ExperienceStorage.kt | 2 +- .../mc/otm/block/entity/MatteryBlockEntity.kt | 2 +- .../block/entity/MultiblockTestBlockEntity.kt | 2 +- .../entity/blackhole/BlackHoleBlockEntity.kt | 2 +- .../BlackHoleGeneratorBlockEntity.kt | 2 +- .../entity/decorative/GrillBlockEntity.kt | 2 +- .../entity/decorative/HoloSignBlockEntity.kt | 2 +- .../matter/MatterDecomposerBlockEntity.kt | 2 +- .../matter/MatterReplicatorBlockEntity.kt | 2 +- .../entity/tech/EssenceStorageBlockEntity.kt | 2 +- .../mc/otm/block/tech/EssenceStorageBlock.kt | 3 +- .../block/tech/GravitationStabilizerBlock.kt | 2 +- .../otm/block/tech/PhantomAttractorBlock.kt | 2 +- .../mc/otm/capability/MatteryPlayer.kt | 2 +- .../render/blockentity/BlackHoleRenderer.kt | 2 +- .../render/blockentity/FluidTankRenderer.kt | 2 +- .../screen/storage/DriveViewerScreen.kt | 2 +- .../screen/tech/EssenceStorageScreen.kt | 2 +- .../CondensedCreativeCompat.kt | 4 +- .../mc/otm/compat/jei/JEIPlugin.kt | 2 +- .../jei/MatterEntanglerRecipeCategory.kt | 2 +- .../otm/compat/jei/MicrowaveRecipeCategory.kt | 2 +- .../otm/compat/jei/PainterRecipeCategory.kt | 3 +- .../compat/jei/PlatePressRecipeCategory.kt | 2 +- .../mc/otm/entity/MinecartCargoCrate.kt | 2 +- .../mc/otm/item/armor/TritaniumArmorItem.kt | 3 +- .../mc/otm/item/block/EnergyCableItem.kt | 2 +- .../exopack/AbstractExopackSlotUpgradeItem.kt | 2 +- .../mc/otm/menu/tech/EssenceStorageMenu.kt | 2 +- .../mc/otm/recipe/MatterEntanglerRecipe.kt | 2 +- .../mc/otm/recipe/MatteryCookingRecipe.kt | 2 +- .../mc/otm/recipe/PainterRecipe.kt | 2 +- .../mc/otm/recipe/PlatePressRecipe.kt | 4 +- .../mc/otm/registry/MBlockColors.kt | 1 + .../mc/otm/registry/MBlockEntities.kt | 1 + .../dbotthepony/mc/otm/registry/MRegistry.kt | 3 +- .../mc/otm/registry/{ => content}/MBlocks.kt | 8 +- .../registry/{ => content}/MCreativeTabs.kt | 6 +- .../mc/otm/registry/{ => content}/MFluids.kt | 14 +- .../mc/otm/registry/{ => content}/MItems.kt | 291 ++++++++++-------- .../otm/worldgen/feature/BlackHolePlacer.kt | 2 +- 87 files changed, 330 insertions(+), 283 deletions(-) rename src/main/kotlin/ru/dbotthepony/mc/otm/registry/{ => content}/MBlocks.kt (98%) rename src/main/kotlin/ru/dbotthepony/mc/otm/registry/{ => content}/MCreativeTabs.kt (97%) rename src/main/kotlin/ru/dbotthepony/mc/otm/registry/{ => content}/MFluids.kt (84%) rename src/main/kotlin/ru/dbotthepony/mc/otm/registry/{ => content}/MItems.kt (87%) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt index dee93ed75..7566ef406 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt @@ -57,6 +57,7 @@ import ru.dbotthepony.mc.otm.datagen.tags.addSuspiciousTags import ru.dbotthepony.mc.otm.datagen.tags.addTags import ru.dbotthepony.mc.otm.datagen.textures.ColorizedSpritesProvider import ru.dbotthepony.mc.otm.matter.MatterDataProvider +import ru.dbotthepony.mc.otm.registry.content.MBlocks import ru.dbotthepony.mc.otm.registry.objects.ColoredDecorativeBlock import ru.dbotthepony.mc.otm.registry.objects.DecorativeBlock import kotlin.properties.Delegates diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt index b17950ceb..5fd2c8d0f 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt @@ -16,8 +16,8 @@ import ru.dbotthepony.mc.otm.core.registryName import ru.dbotthepony.mc.otm.datagen.blocks.MatteryBlockStateProvider import ru.dbotthepony.mc.otm.datagen.items.MatteryItemModelProvider import ru.dbotthepony.mc.otm.datagen.models.MatteryBlockModelProvider -import ru.dbotthepony.mc.otm.registry.MBlocks -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.registry.MNames import ru.dbotthepony.mc.otm.registry.MRegistry import kotlin.properties.Delegates diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/MatterData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/MatterData.kt index 689660765..2f39a80c8 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/MatterData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/MatterData.kt @@ -7,7 +7,7 @@ import net.neoforged.neoforge.common.Tags import ru.dbotthepony.mc.otm.core.math.Decimal import ru.dbotthepony.mc.otm.matter.MatterDataProvider import ru.dbotthepony.mc.otm.registry.MItemTags -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems // general rule - anything plant or organic is much more complex than mineral // and anything mineral has much bigger matter value than complexity (just throw a lot of same molecules) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/ResearchData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/ResearchData.kt index dd5834e13..2b75fda5e 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/ResearchData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/ResearchData.kt @@ -13,7 +13,7 @@ import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.datagen.lang.MatteryLanguageProvider import ru.dbotthepony.mc.otm.registry.AndroidFeatures import ru.dbotthepony.mc.otm.registry.MItemTags -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.registry.MNames import java.util.LinkedList import java.util.function.Consumer diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/WorldGen.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/WorldGen.kt index 36f55e046..0cb7d2e70 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/WorldGen.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/WorldGen.kt @@ -27,7 +27,7 @@ import net.neoforged.neoforge.registries.NeoForgeRegistries import ru.dbotthepony.mc.otm.core.math.Decimal import ru.dbotthepony.mc.otm.data.world.EllipsoidPlacement import ru.dbotthepony.mc.otm.data.world.StandardDeviationHeightProvider -import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MBlocks import ru.dbotthepony.mc.otm.registry.MWorldGenFeatures import ru.dbotthepony.mc.otm.worldgen.feature.BlackHolePlacerFeature 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 5b4fc5700..5a05f31c9 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 @@ -11,7 +11,7 @@ import ru.dbotthepony.mc.otm.core.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.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.registry.MRegistry import ru.dbotthepony.mc.otm.triggers.BlackHoleTrigger import ru.dbotthepony.mc.otm.triggers.NailedEntityTrigger @@ -330,10 +330,12 @@ fun addAdvancements(serializer: Consumer, lang: MatteryLangua } .save(serializer, modLocation("regular/industrial_glass")) - CraftEntry(MItems.FLUID_TANK, "Liquid Packaging", + CraftEntry( + MItems.FLUID_TANK, "Liquid Packaging", russianName = "Упаковка для жидкостей").make(serializer, glass, translation) - CraftEntry(MItems.FLUID_CAPSULE, "Liquid Canning", + CraftEntry( + MItems.FLUID_CAPSULE, "Liquid Canning", russianName = "Банка для жидкостей").make(serializer, glass, translation) AdvancementBuilder() @@ -595,6 +597,7 @@ fun addAdvancements(serializer: Consumer, lang: MatteryLangua .addCriterion("damage", NailedEntityTrigger.Instance().criterion()) .save(serializer, modLocation("regular/explosive_hammer")) - CraftEntry(MItems.ESSENCE_STORAGE.values, "Did not Forget to Remember", - russianName = "Не забыл запомнить").make(serializer, essenceCapsule, translation) + CraftEntry( + MItems.ESSENCE_STORAGE.values, "Did not Forget to Remember", + russianName = "Не забыл запомнить").make(serializer, essenceCapsule, translation) } diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/AndroidAdvancementsData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/AndroidAdvancementsData.kt index e20d60046..769267056 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/AndroidAdvancementsData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/AndroidAdvancementsData.kt @@ -14,7 +14,7 @@ import ru.dbotthepony.mc.otm.datagen.DataGen import ru.dbotthepony.mc.otm.datagen.lang.MatteryLanguageProvider import ru.dbotthepony.mc.otm.datagen.modLocation import ru.dbotthepony.mc.otm.registry.AndroidFeatures -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.registry.MNames import ru.dbotthepony.mc.otm.triggers.AndroidBatteryTrigger import ru.dbotthepony.mc.otm.triggers.AndroidResearchTrigger diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/ExopackAdvancementsData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/ExopackAdvancementsData.kt index fa702670e..2f44b7fe4 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/ExopackAdvancementsData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/ExopackAdvancementsData.kt @@ -7,7 +7,7 @@ import net.minecraft.world.item.ItemStack import net.minecraft.world.item.Items import ru.dbotthepony.mc.otm.datagen.lang.MatteryLanguageProvider import ru.dbotthepony.mc.otm.datagen.modLocation -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.triggers.ExopackBatterySlotTrigger import ru.dbotthepony.mc.otm.triggers.ExopackGainedCraftingTrigger import ru.dbotthepony.mc.otm.triggers.ExopackGainedEnderAccessTrigger diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/MachineAdvancementsData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/MachineAdvancementsData.kt index 0bfc69121..0c3028437 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/MachineAdvancementsData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/MachineAdvancementsData.kt @@ -12,7 +12,7 @@ import ru.dbotthepony.mc.otm.core.key import ru.dbotthepony.mc.otm.core.registryName import ru.dbotthepony.mc.otm.datagen.lang.MatteryLanguageProvider import ru.dbotthepony.mc.otm.datagen.modLocation -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.triggers.TakeItemOutOfReplicatorTrigger import java.util.function.Consumer @@ -103,33 +103,45 @@ fun addMachineAdvancements(serializer: Consumer, lang: Matter .requirements(AdvancementRequirements.Strategy.OR) .save(serializer, modLocation("machines/plate_press")) - CraftEntry(MItems.ENERGY_SERVO.values, "Power Goes In, Powered Things Go Out", + CraftEntry( + MItems.ENERGY_SERVO.values, "Power Goes In, Powered Things Go Out", russianName = "Энергия на вход, электроинструмент на выход").make(serializer, press, translation) - val scanner = CraftEntry(MItems.MATTER_SCANNER.values, "Scanning Things that Matter", + val scanner = CraftEntry( + MItems.MATTER_SCANNER.values, "Scanning Things that Matter", russianName = "Сканируем вещи которые материальны") - val decomposer = CraftEntry(MItems.MATTER_DECOMPOSER.values, "Decaying the Atoms", "Keep your limbs outside of the working chamber at all times", + val decomposer = CraftEntry( + MItems.MATTER_DECOMPOSER.values, "Decaying the Atoms", "Keep your limbs outside of the working chamber at all times", russianName = "Разлагаем атомы", russianSuffix = "Во всех ситуациях держите свои конечности вне рабочей камеры") - val panel = CraftEntry(MItems.MATTER_PANEL.values, "Indexing the Library", + val panel = CraftEntry( + MItems.MATTER_PANEL.values, "Indexing the Library", russianName = "Индексируем библиотеку") - val replicator = CraftEntry(MItems.MATTER_REPLICATOR.values, "Cook with (Im)Perfection", "Now let's bake some perfect bread", + val replicator = CraftEntry( + MItems.MATTER_REPLICATOR.values, "Cook with (Im)Perfection", "Now let's bake some perfect bread", russianName = "Повар с (не) идеальностями", russianSuffix = "А теперь давайте выпечем немного идеального хлеба") - val bottler = CraftEntry(MItems.MATTER_BOTTLER.values, "Transfusing Pure Matter", "For those who loved to play with water in their childhood", + val bottler = CraftEntry( + MItems.MATTER_BOTTLER.values, "Transfusing Pure Matter", "For those who loved to play with water in their childhood", russianName = "Переливаем чистую материю", russianSuffix = "Для тех, кто любил играться в воде в детстве") - val recycler = CraftEntry(MItems.MATTER_RECYCLER.values, "Refine and Redefine", "This is what waste recycling should look like", + val recycler = CraftEntry( + MItems.MATTER_RECYCLER.values, "Refine and Redefine", "This is what waste recycling should look like", russianName = "Переработка и перегонка", russianSuffix = "Вот он, пик переработки отходов") - val capacitor = CraftEntry(MItems.MATTER_CAPACITOR_BANK.values, "Modular Matter Tank", + val capacitor = CraftEntry( + MItems.MATTER_CAPACITOR_BANK.values, "Modular Matter Tank", russianName = "Модульный бак материи") - val counter = CraftEntry(MItems.ENERGY_COUNTER.values, "Visualize Power Burn", + val counter = CraftEntry( + MItems.ENERGY_COUNTER.values, "Visualize Power Burn", russianName = "Визуализация сжигания энергии") - val battery = CraftEntry(MItems.BATTERY_BANK.values, "Batteries Not Included", "By all means avoid the urge to hammer incompatible batteries into the power bus.", + val battery = CraftEntry( + MItems.BATTERY_BANK.values, "Batteries Not Included", "By all means avoid the urge to hammer incompatible batteries into the power bus.", russianName = "Батарейки в комплект не входят", russianSuffix = "Пожалуйста, воздержитесь от вбивания кувалдой несовместимых батарей в энергетическую шину.") - val pattern = CraftEntry(MItems.PATTERN_STORAGE, "Digital Knowledge Library", + val pattern = CraftEntry( + MItems.PATTERN_STORAGE, "Digital Knowledge Library", russianName = "Цифровая библиотека знаний") - val reconstructor = CraftEntry(MItems.MATTER_RECONSTRUCTOR.values, "Flipping Hourglass", + val reconstructor = CraftEntry( + MItems.MATTER_RECONSTRUCTOR.values, "Flipping Hourglass", russianName = "Переворачиваем песочные часы") decomposer.make(serializer, press, translation).also { @@ -150,7 +162,8 @@ fun addMachineAdvancements(serializer: Consumer, lang: Matter }, frameType = AdvancementType.GOAL ) - .addCriterion("replicate_something", TakeItemOutOfReplicatorTrigger.Instance(ItemPredicate.Builder.item().of(MItems.MATTER_DUST).build(), true).criterion()) + .addCriterion("replicate_something", TakeItemOutOfReplicatorTrigger.Instance(ItemPredicate.Builder.item().of( + MItems.MATTER_DUST).build(), true).criterion()) .save(serializer, modLocation("machines/replicate_something")) AdvancementBuilder() @@ -165,7 +178,8 @@ fun addMachineAdvancements(serializer: Consumer, lang: Matter russian("Наблюдайте неудачный результат репликации, где ваш заказ рассыпался в материальную труху") }, ) - .addCriterion("replicate_failure", TakeItemOutOfReplicatorTrigger.Instance(ItemPredicate.Builder.item().of(MItems.MATTER_DUST).build()).criterion()) + .addCriterion("replicate_failure", TakeItemOutOfReplicatorTrigger.Instance(ItemPredicate.Builder.item().of( + MItems.MATTER_DUST).build()).criterion()) .save(serializer, modLocation("machines/replicate_failure")) } @@ -181,33 +195,39 @@ fun addMachineAdvancements(serializer: Consumer, lang: Matter battery.make(serializer, it, translation) } - val station = CraftEntry(MItems.ANDROID_STATION.values, "Android Home Page", + val station = CraftEntry( + MItems.ANDROID_STATION.values, "Android Home Page", russianName = "Домашняя страница андроидов", russianSuffix = "Только пользоваться этим устройством могут вёдра с болтами", englishSuffix = "Except only buckets of bolts can use this thing") - val charger = CraftEntry(MItems.ANDROID_CHARGER.values, "Android Home Router", + val charger = CraftEntry( + MItems.ANDROID_CHARGER.values, "Android Home Router", russianName = "Домашняя страница андроидов") station.make(serializer, press, translation).also { charger.make(serializer, it, translation) } - CraftEntry(MItems.COBBLESTONE_GENERATOR.values, "Cobblestone: Infinity + 1", + CraftEntry( + MItems.COBBLESTONE_GENERATOR.values, "Cobblestone: Infinity + 1", russianName = "Булыжник: бесконечность + 1", russianSuffix = "Смотрите, чтоб он не просыпался во все сундуки", englishSuffix = "Watch for not to spill it over all your chests").make(serializer, press, translation) - CraftEntry(MItems.POWERED_FURNACE.values, "One Big Resistor", - russianName = "Один большой резистор", - russianSuffix = "Каждый элемент электрической цепи способен испускать свет и тепло, единожды.", - englishSuffix = "Any electrical element can emit light and heat, once.") + CraftEntry( + MItems.POWERED_FURNACE.values, "One Big Resistor", + russianName = "Один большой резистор", + russianSuffix = "Каждый элемент электрической цепи способен испускать свет и тепло, единожды.", + englishSuffix = "Any electrical element can emit light and heat, once.") .make(serializer, press, translation) .also { - CraftEntry(MItems.POWERED_BLAST_FURNACE.values, "Big Microwave Oven", - russianName = "Большая микроволновая печь").make(serializer, it, translation) + CraftEntry( + MItems.POWERED_BLAST_FURNACE.values, "Big Microwave Oven", + russianName = "Большая микроволновая печь").make(serializer, it, translation) - CraftEntry(MItems.POWERED_SMOKER.values, "Small Microwave Oven", - russianName = "Маленькая микроволновая печь").make(serializer, it, translation) + CraftEntry( + MItems.POWERED_SMOKER.values, "Small Microwave Oven", + russianName = "Маленькая микроволновая печь").make(serializer, it, translation) } } diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/Banks.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/Banks.kt index d07aee31d..840b93d02 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/Banks.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/Banks.kt @@ -10,7 +10,7 @@ import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom import ru.dbotthepony.mc.otm.core.math.yRotationBlockstateNorth import ru.dbotthepony.mc.otm.datagen.DataGen import ru.dbotthepony.mc.otm.datagen.modLocation -import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MBlocks private fun nothingOrNumber(input: Int): String { if (input == 0) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt index f0c1c7b18..930e2d007 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.mc.otm.datagen.blocks import ru.dbotthepony.mc.otm.datagen.models.MatteryBlockModelProvider -import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MBlocks fun addBlockModels(provider: MatteryBlockModelProvider) { with(provider) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt index 27d27c191..1a8174ce7 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt @@ -16,7 +16,7 @@ import ru.dbotthepony.mc.otm.core.math.yRotationBlockstateNorth import ru.dbotthepony.mc.otm.core.math.yRotationBlockstateSouth import ru.dbotthepony.mc.otm.core.registryName import ru.dbotthepony.mc.otm.datagen.modLocation -import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MBlocks import ru.dbotthepony.mc.otm.registry.MNames import ru.dbotthepony.mc.otm.registry.MRegistry import java.util.ArrayList diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/ComplexBlockStates.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/ComplexBlockStates.kt index ec9d37129..8a4e3eda4 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/ComplexBlockStates.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/ComplexBlockStates.kt @@ -9,7 +9,7 @@ import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom import ru.dbotthepony.mc.otm.core.math.yRotationBlockstateNorth import ru.dbotthepony.mc.otm.core.registryName import ru.dbotthepony.mc.otm.datagen.modLocation -import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MBlocks fun addComplexBlockStates(provider: MatteryBlockStateProvider) { for (block in MBlocks.DRIVE_VIEWER.values) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt index e7fb51bb3..c5f25ed3d 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.datagen.items import net.minecraft.world.item.DyeColor import ru.dbotthepony.mc.otm.core.registryName import ru.dbotthepony.mc.otm.datagen.modLocation -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.registry.MRegistry fun addItemModels(provider: MatteryItemModelProvider) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt index 1de9f025b..6b88a4beb 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt @@ -2,6 +2,8 @@ package ru.dbotthepony.mc.otm.datagen.lang import ru.dbotthepony.mc.otm.config.CablesConfig import ru.dbotthepony.mc.otm.registry.* +import ru.dbotthepony.mc.otm.registry.content.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MItems private fun decoratives(provider: MatteryLanguageProvider) { with(provider.englishColors) { @@ -735,12 +737,12 @@ private fun items(provider: MatteryLanguageProvider) { add(MItems.MATTER_IO_PORT, "Matter IO Port") add(MItems.MATTER_TRANSFORM_MATRIX, "Matter Transformation Matrix") add(MItems.ENERGY_BUS, "Energy Bus") - add(MItems.ELECTRIC_PARTS, "Electric Parts") + add(MItems.ELECTRIC_PARTS, "Electric Parts") add(MItems.MACHINE_FRAME, "Machine Frame") - add(MItems.TRITANIUM_PLATE, "Tritanium Plate") + add(MItems.TRITANIUM_PLATE, "Tritanium Plate") add(MItems.IRON_PLATE, "Iron Plate") add(MItems.GOLD_PLATE, "Gold Plate") - add(MItems.COPPER_WIRING, "Copper Wiring") + add(MItems.COPPER_WIRING, "Copper Wiring") add(MItems.GOLD_WIRING, "Gold Wiring") add(MItems.PORTABLE_CONDENSATION_DRIVE_CASING, "Portable Condensation Drive Casing") add(MItems.PORTABLE_DENSE_CONDENSATION_DRIVE_CASING, "Portable Dense Condensation Drive Casing") diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt index 0603e4475..9929e6f69 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt @@ -2,9 +2,9 @@ package ru.dbotthepony.mc.otm.datagen.lang import ru.dbotthepony.mc.otm.config.CablesConfig import ru.dbotthepony.mc.otm.registry.AndroidFeatures -import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MBlocks import ru.dbotthepony.mc.otm.registry.MEntityTypes -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.registry.MRegistry import ru.dbotthepony.mc.otm.registry.MSoundEvents diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/AdvancementLoot.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/AdvancementLoot.kt index 721eb28e7..0701a8661 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/AdvancementLoot.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/AdvancementLoot.kt @@ -4,7 +4,7 @@ import net.minecraft.world.item.Items import net.minecraft.world.level.storage.loot.entries.LootItem import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets import ru.dbotthepony.mc.otm.datagen.modLootTable -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems fun addAdvancementLoot(lootTables: LootTables) { lootTables.builder(LootContextParamSets.ADVANCEMENT_ENTITY, modLootTable("research_all_android")) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/DecorativeLoot.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/DecorativeLoot.kt index 51a64178f..33eaef219 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/DecorativeLoot.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/DecorativeLoot.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.datagen.loot import net.minecraft.world.level.block.state.properties.BlockStateProperties import net.minecraft.world.level.block.state.properties.DoubleBlockHalf import net.minecraft.world.level.storage.loot.predicates.ExplosionCondition -import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MBlocks import ru.dbotthepony.mc.otm.registry.MRegistry fun addDecorativeLoot(lootTables: LootTables) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootModifiersData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootModifiersData.kt index 21a58a335..618abc9b8 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootModifiersData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootModifiersData.kt @@ -21,7 +21,7 @@ import ru.dbotthepony.mc.otm.data.loot.LootPoolAppender 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.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems @Suppress("FunctionName") fun LootTableIdCondition(location: String): LootItemCondition { 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 41b3b1e1b..9cdfcc763 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 @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.datagen.loot import net.minecraft.world.item.Items import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets import ru.dbotthepony.mc.otm.datagen.modLootTable -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems fun addChestLootTables(loot: LootTables) { loot.builder(LootContextParamSets.CHEST, modLootTable("food_box")) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt index 90492e0e4..27f024ce9 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt @@ -6,31 +6,19 @@ import net.minecraft.advancements.critereon.ItemPredicate import net.minecraft.advancements.critereon.ItemSubPredicates import net.minecraft.advancements.critereon.MinMaxBounds import net.minecraft.util.valueproviders.UniformInt -import net.minecraft.world.item.Items import net.minecraft.world.item.enchantment.Enchantments import net.minecraft.world.level.ItemLike import net.minecraft.world.level.block.Block -import net.minecraft.world.level.block.state.properties.BlockStateProperties -import net.minecraft.world.level.block.state.properties.DoubleBlockHalf import net.minecraft.world.level.storage.loot.entries.AlternativesEntry import net.minecraft.world.level.storage.loot.entries.LootItem import net.minecraft.world.level.storage.loot.functions.ApplyBonusCount import net.minecraft.world.level.storage.loot.functions.SetItemCountFunction -import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets import net.minecraft.world.level.storage.loot.predicates.ExplosionCondition import net.minecraft.world.level.storage.loot.predicates.MatchTool -import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator import ru.dbotthepony.mc.otm.core.lookupOrThrow -import ru.dbotthepony.mc.otm.core.math.Decimal import ru.dbotthepony.mc.otm.data.loot.Int2NumberProvider -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.MBlocks -import ru.dbotthepony.mc.otm.registry.MItems -import ru.dbotthepony.mc.otm.registry.MRegistry +import ru.dbotthepony.mc.otm.registry.content.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MItems private fun ore(lootTables: LootTables, ore: Block, clump: ItemLike, count: Int = 1) { lootTables.builder(ore) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/MachineLoot.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/MachineLoot.kt index ee7841a3c..0977ef6b5 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/MachineLoot.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/MachineLoot.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.datagen.loot import net.minecraft.world.level.block.state.properties.BlockStateProperties import net.minecraft.world.level.block.state.properties.DoubleBlockHalf import net.minecraft.world.level.storage.loot.predicates.ExplosionCondition -import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MBlocks fun addMachineLoot(lootTables: LootTables) { lootTables.block(MBlocks.PHANTOM_ATTRACTOR) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/VaultLoot.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/VaultLoot.kt index 2930740ac..ddea595ca 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/VaultLoot.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/VaultLoot.kt @@ -8,7 +8,7 @@ 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.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems fun addVaultLoot(lootTables: LootTables) { lootTables.builder(LootContextParamSets.VAULT, modLootTable("trials/matter_dust")) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ComponentRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ComponentRecipes.kt index 590504417..bd3ceb8f8 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ComponentRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ComponentRecipes.kt @@ -5,7 +5,7 @@ import net.minecraft.data.recipes.RecipeOutput import net.minecraft.tags.ItemTags import net.neoforged.neoforge.common.Tags import ru.dbotthepony.mc.otm.registry.MItemTags -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems fun addComponentRecipes(consumer: RecipeOutput) { // Обычный рецепт diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CookingRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CookingRecipes.kt index bcc21b130..04f98af2e 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CookingRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CookingRecipes.kt @@ -11,7 +11,7 @@ import net.minecraft.world.level.ItemLike import ru.dbotthepony.mc.otm.core.registryName import ru.dbotthepony.mc.otm.datagen.modLocation import ru.dbotthepony.mc.otm.registry.MItemTags -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems private fun RecipeOutput.addRecyclingRecipe(inputs: Collection, result: Item, name: String) { val inputStacks = inputs.map(::ItemStack) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt index cf4492d50..2a24167fc 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt @@ -12,9 +12,9 @@ import net.neoforged.neoforge.common.Tags import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity import ru.dbotthepony.mc.otm.config.CablesConfig import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MBlocks import ru.dbotthepony.mc.otm.registry.MItemTags -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.registry.MRegistry import ru.dbotthepony.mc.otm.core.registryName import ru.dbotthepony.mc.otm.datagen.modLocation diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt index 2f4119420..7617704c7 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt @@ -9,9 +9,9 @@ import net.minecraft.world.level.ItemLike import net.neoforged.neoforge.common.Tags import ru.dbotthepony.mc.otm.core.registryName import ru.dbotthepony.mc.otm.datagen.modLocation -import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MBlocks import ru.dbotthepony.mc.otm.registry.MItemTags -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.registry.MRegistry private fun stairs(base: ItemLike, result: ItemLike, consumer: RecipeOutput) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MachineUpgradeRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MachineUpgradeRecipes.kt index d8bb39d84..05b296796 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MachineUpgradeRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MachineUpgradeRecipes.kt @@ -4,7 +4,7 @@ import net.minecraft.data.recipes.RecipeOutput import net.minecraft.world.item.Items import net.neoforged.neoforge.common.Tags import ru.dbotthepony.mc.otm.registry.MItemTags -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems fun addMachineUpgradeRecipes(consumer: RecipeOutput) { MatteryRecipe(MItems.MachineUpgrades.Basic.BLANK, 4) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatterEntanglerRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatterEntanglerRecipes.kt index 3f7a4c7a1..a62bdc7a1 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatterEntanglerRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatterEntanglerRecipes.kt @@ -10,7 +10,7 @@ import ru.dbotthepony.mc.otm.core.math.Decimal import ru.dbotthepony.mc.otm.datagen.modLocation import ru.dbotthepony.mc.otm.recipe.MatterEntanglerRecipe import ru.dbotthepony.mc.otm.registry.MItemTags -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import java.util.* private fun pattern( diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PainterRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PainterRecipes.kt index 1e512c396..122c07741 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PainterRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PainterRecipes.kt @@ -17,7 +17,7 @@ import ru.dbotthepony.mc.otm.core.registryName import ru.dbotthepony.mc.otm.datagen.modLocation import ru.dbotthepony.mc.otm.recipe.PainterArmorDyeRecipe import ru.dbotthepony.mc.otm.recipe.PainterRecipe -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.registry.MRegistry private val Item.recipeName get() = registryName!!.namespace + "/" + registryName!!.path diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PlatePressRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PlatePressRecipes.kt index d76bce930..160d6c0ac 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PlatePressRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PlatePressRecipes.kt @@ -5,7 +5,7 @@ import net.minecraft.world.item.Items import net.minecraft.world.item.crafting.Ingredient import net.neoforged.neoforge.common.Tags import ru.dbotthepony.mc.otm.registry.MItemTags -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems fun addPlatePressRecipes(provider: MatteryRecipeProvider) { val baselineMetals = arrayOf("iron" to 0.2f, "silver" to 0.3f, "bronze" to 0.3f, "lead" to 0.3f, "constantan" to 0.4f, "brass" to 0.3f) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ShapelessRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ShapelessRecipes.kt index b4f4b1e3a..b3d7eefa0 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ShapelessRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ShapelessRecipes.kt @@ -14,7 +14,7 @@ import net.neoforged.neoforge.common.Tags import ru.dbotthepony.mc.otm.core.registryName import ru.dbotthepony.mc.otm.datagen.modLocation import ru.dbotthepony.mc.otm.registry.MItemTags -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.registry.MRegistry fun hammerRecipe(output: ItemLike, input: ItemLike, consumer: RecipeOutput) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/StorageItemRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/StorageItemRecipes.kt index d54c98d69..ec0005ebe 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/StorageItemRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/StorageItemRecipes.kt @@ -5,7 +5,7 @@ import net.minecraft.data.recipes.RecipeOutput import net.neoforged.neoforge.common.Tags import ru.dbotthepony.mc.otm.recipe.UpgradeRecipe import ru.dbotthepony.mc.otm.registry.MItemTags -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems fun addStorageItemRecipes(consumer: RecipeOutput) { // простые батарейки diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/SuspiciousRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/SuspiciousRecipes.kt index 78420761f..31d960b6e 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/SuspiciousRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/SuspiciousRecipes.kt @@ -9,7 +9,7 @@ import net.minecraft.world.item.crafting.Ingredient import net.neoforged.neoforge.common.Tags import ru.dbotthepony.mc.otm.core.registryName import ru.dbotthepony.mc.otm.datagen.modLocation -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems fun addSuspiciousRecipes(consumer: RecipeOutput) { for (item in MItems.SUSPICIOUS_FOODS.ITEMS) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ToolsRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ToolsRecipes.kt index 65ad4c579..d9cc04e22 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ToolsRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ToolsRecipes.kt @@ -4,7 +4,7 @@ import net.minecraft.data.recipes.RecipeCategory import net.minecraft.data.recipes.RecipeOutput import net.neoforged.neoforge.common.Tags import ru.dbotthepony.mc.otm.registry.MItemTags -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems fun addToolsRecipes(consumer: RecipeOutput) { MatteryRecipe(MItems.ENERGY_SWORD, category = RecipeCategory.COMBAT) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/ConstructionTags.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/ConstructionTags.kt index 628aad72f..c868c05c5 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/ConstructionTags.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/ConstructionTags.kt @@ -5,9 +5,9 @@ import net.minecraft.tags.ItemTags import net.minecraft.world.item.Items import net.minecraft.world.level.block.Blocks import ru.dbotthepony.mc.otm.registry.MBlockTags -import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MBlocks import ru.dbotthepony.mc.otm.registry.MItemTags -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.registry.MRegistry fun addConstructionTags(tagsProvider: TagsProvider) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/DyeTags.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/DyeTags.kt index 37e26be08..b2ed67011 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/DyeTags.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/DyeTags.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.mc.otm.datagen.tags -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.registry.MRegistry fun addDyeTags(tagsProvider: TagsProvider) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/EquipmentTags.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/EquipmentTags.kt index 3f717dbcb..7ef932b7c 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/EquipmentTags.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/EquipmentTags.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.datagen.tags import net.minecraft.tags.ItemTags import net.neoforged.neoforge.common.Tags import ru.dbotthepony.mc.otm.registry.MItemTags -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems fun addEquipmentTags(tagsProvider: TagsProvider) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/MineableTags.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/MineableTags.kt index e4ff8f226..a76d4f46a 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/MineableTags.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/MineableTags.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.datagen.tags import net.minecraft.world.item.Tiers import net.minecraft.world.level.block.Block -import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MBlocks import ru.dbotthepony.mc.otm.registry.MRegistry fun addMineableTags(tagsProvider: TagsProvider) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/ResourceTags.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/ResourceTags.kt index 272f13ba8..37189ec13 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/ResourceTags.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/ResourceTags.kt @@ -1,9 +1,8 @@ package ru.dbotthepony.mc.otm.datagen.tags -import ru.dbotthepony.mc.otm.registry.MBlockTags -import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MBlocks import ru.dbotthepony.mc.otm.registry.MItemTags -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems fun addResourceTags(tagsProvider: TagsProvider) { tagsProvider.circuits.add("basic", MItems.BASIC_CONTROL_CIRCUIT) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/SuspiciousTags.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/SuspiciousTags.kt index 91915731e..0d7b5bfbd 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/SuspiciousTags.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/SuspiciousTags.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.datagen.tags import net.minecraft.tags.ItemTags import net.minecraft.world.entity.EntityType import net.minecraft.world.item.Items -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems fun addSuspiciousTags(tagsProvider: TagsProvider) { tagsProvider.entityTypes.Appender(MItems.SUSPICIOUS_FOODS.OWNED_MEAT_CONSUMERS) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt index dbd3760b4..66cbae09b 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt @@ -4,16 +4,13 @@ import net.minecraft.tags.BlockTags import net.minecraft.tags.ItemTags import net.minecraft.world.effect.MobEffects import net.minecraft.world.item.Items -import net.minecraft.world.item.Tiers -import net.minecraft.world.level.block.Block -import net.minecraft.world.level.block.Blocks import net.neoforged.neoforge.common.Tags import ru.dbotthepony.mc.otm.core.ResourceLocation import ru.dbotthepony.mc.otm.registry.MBlockTags -import ru.dbotthepony.mc.otm.registry.MBlocks -import ru.dbotthepony.mc.otm.registry.MFluids +import ru.dbotthepony.mc.otm.registry.content.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MFluids import ru.dbotthepony.mc.otm.registry.MItemTags -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.registry.MRegistry fun addTags(tagsProvider: TagsProvider) { diff --git a/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinAnvilBlock.java b/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinAnvilBlock.java index bee94603d..a0dfe7d42 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinAnvilBlock.java +++ b/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinAnvilBlock.java @@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import ru.dbotthepony.mc.otm.registry.MBlocks; +import ru.dbotthepony.mc.otm.registry.content.MBlocks; @Mixin(AnvilBlock.class) @SuppressWarnings("unused") diff --git a/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinLivingEntity.java b/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinLivingEntity.java index 00ca27c88..f5f9b9a70 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinLivingEntity.java +++ b/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinLivingEntity.java @@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import ru.dbotthepony.mc.otm.capability.IMatteryPlayer; import ru.dbotthepony.mc.otm.config.ServerConfig; import ru.dbotthepony.mc.otm.core.util.ExperienceUtilsKt; -import ru.dbotthepony.mc.otm.registry.MItems; +import ru.dbotthepony.mc.otm.registry.content.MItems; @SuppressWarnings("ConstantConditions") @Mixin(LivingEntity.class) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/OverdriveThatMatters.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/OverdriveThatMatters.kt index 5d985e5bc..ea31ce79b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/OverdriveThatMatters.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/OverdriveThatMatters.kt @@ -64,6 +64,10 @@ import ru.dbotthepony.mc.otm.matter.IMatterFunction import ru.dbotthepony.mc.otm.matter.MatterManager import ru.dbotthepony.mc.otm.network.* import ru.dbotthepony.mc.otm.registry.* +import ru.dbotthepony.mc.otm.registry.content.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MCreativeTabs +import ru.dbotthepony.mc.otm.registry.content.MFluids +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.server.MCommands import ru.dbotthepony.mc.otm.storage.StorageStack import ru.dbotthepony.mc.otm.triggers.KillAsAndroidTrigger diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/LaboratoryLamp.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/LaboratoryLamp.kt index a2ad72b16..69d2d948a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/LaboratoryLamp.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/LaboratoryLamp.kt @@ -26,7 +26,7 @@ import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom import ru.dbotthepony.mc.otm.core.math.blockRotation import ru.dbotthepony.mc.otm.core.math.plus import ru.dbotthepony.mc.otm.once -import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MBlocks private val FACING_FULL = BlockRotationFreedom.DIRECTIONAL.property diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/ExperienceStorage.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/ExperienceStorage.kt index 9e80b32ed..2dcdfc949 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/ExperienceStorage.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/ExperienceStorage.kt @@ -17,7 +17,7 @@ import net.neoforged.neoforge.fluids.capability.IFluidHandler import ru.dbotthepony.mc.otm.block.INeighbourChangeListener import ru.dbotthepony.mc.otm.block.entity.tech.EssenceStorageBlockEntity import ru.dbotthepony.mc.otm.core.math.plus -import ru.dbotthepony.mc.otm.registry.MFluids +import ru.dbotthepony.mc.otm.registry.content.MFluids import java.util.function.DoubleSupplier class ExperienceStorage(val maxExperience: DoubleSupplier = DoubleSupplier { Double.POSITIVE_INFINITY }) : IFluidHandler, INBTSerializable, INeighbourChangeListener { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryBlockEntity.kt index b34b3701c..ca785154f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryBlockEntity.kt @@ -55,7 +55,7 @@ import ru.dbotthepony.mc.otm.core.util.countingLazy import ru.dbotthepony.mc.otm.network.BlockEntitySyncPacket import ru.dbotthepony.mc.otm.network.syncher.SynchableGroup import ru.dbotthepony.mc.otm.onceServer -import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MBlocks import ru.dbotthepony.mc.otm.sometimeServer import java.lang.ref.WeakReference import java.util.* diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MultiblockTestBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MultiblockTestBlockEntity.kt index 37fd54bd5..b21c7db32 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MultiblockTestBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MultiblockTestBlockEntity.kt @@ -9,7 +9,7 @@ import net.minecraft.world.level.block.state.BlockState import ru.dbotthepony.mc.otm.core.multiblock.multiblockEntity import ru.dbotthepony.mc.otm.core.multiblock.shapedMultiblock import ru.dbotthepony.mc.otm.registry.MBlockEntities -import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MBlocks class MultiblockTestBlockEntity(blockPos: BlockPos, blockState: BlockState) : MatteryBlockEntity(MBlockEntities.MULTIBLOCK_TEST, blockPos, blockState) { val config = CONFIG.create(blockPos) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleBlockEntity.kt index 084c09392..3e92b134f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleBlockEntity.kt @@ -35,7 +35,7 @@ import ru.dbotthepony.mc.otm.core.gracefulBlockBreak import ru.dbotthepony.mc.otm.core.math.Decimal import ru.dbotthepony.mc.otm.core.math.plus import ru.dbotthepony.mc.otm.registry.MBlockEntities -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.core.math.getSphericalBlockPositions import ru.dbotthepony.mc.otm.core.math.times import ru.dbotthepony.mc.otm.core.nbt.map diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleGeneratorBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleGeneratorBlockEntity.kt index 1f303921f..8dd04ac46 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleGeneratorBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleGeneratorBlockEntity.kt @@ -42,7 +42,7 @@ import ru.dbotthepony.mc.otm.core.multiblock.shapedMultiblock import ru.dbotthepony.mc.otm.menu.tech.BlackHoleGeneratorMenu import ru.dbotthepony.mc.otm.registry.MBlockEntities import ru.dbotthepony.mc.otm.registry.MBlockTags -import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MBlocks import java.io.Closeable import kotlin.math.min diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/GrillBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/GrillBlockEntity.kt index 6957326a5..a0344d95a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/GrillBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/GrillBlockEntity.kt @@ -43,7 +43,7 @@ import ru.dbotthepony.mc.otm.core.util.countingLazy import ru.dbotthepony.mc.otm.data.codec.minRange import ru.dbotthepony.mc.otm.menu.decorative.GrillMenu import ru.dbotthepony.mc.otm.registry.MBlockEntities -import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MBlocks import kotlin.jvm.optionals.getOrNull class GrillBlockEntity(blockPos: BlockPos, blockState: BlockState) : MatteryBlockEntity(MBlockEntities.GRILL, blockPos, blockState), MenuProvider, IBlockWithCustomName { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/HoloSignBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/HoloSignBlockEntity.kt index 716d829de..1f2269b56 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/HoloSignBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/HoloSignBlockEntity.kt @@ -24,7 +24,7 @@ import ru.dbotthepony.mc.otm.core.math.component3 import ru.dbotthepony.mc.otm.menu.decorative.HoloSignMenu import ru.dbotthepony.mc.otm.once import ru.dbotthepony.mc.otm.registry.MBlockEntities -import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MBlocks class HoloSignBlockEntity(blockPos: BlockPos, blockState: BlockState) : MatteryBlockEntity(MBlockEntities.HOLO_SIGN, blockPos, blockState), MenuProvider, IRedstoneControlled { override val redstoneControl = SynchronizedRedstoneControl(syncher) { _, _ -> setChanged() } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterDecomposerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterDecomposerBlockEntity.kt index 3795b0711..b4bda14c8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterDecomposerBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterDecomposerBlockEntity.kt @@ -30,7 +30,7 @@ import ru.dbotthepony.mc.otm.graph.matter.SimpleMatterNode import ru.dbotthepony.mc.otm.matter.MatterManager import ru.dbotthepony.mc.otm.menu.matter.MatterDecomposerMenu import ru.dbotthepony.mc.otm.registry.MBlockEntities -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems class MatterDecomposerBlockEntity(pos: BlockPos, state: BlockState) : MatteryWorkerBlockEntity(MBlockEntities.MATTER_DECOMPOSER, pos, state, DecomposerJob.CODEC) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReplicatorBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReplicatorBlockEntity.kt index 40d9fc6e8..7bfaeb583 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReplicatorBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReplicatorBlockEntity.kt @@ -35,7 +35,7 @@ import ru.dbotthepony.mc.otm.matter.MatterManager import ru.dbotthepony.mc.otm.menu.matter.MatterReplicatorMenu import ru.dbotthepony.mc.otm.registry.MBlockEntities import ru.dbotthepony.mc.otm.registry.MItemTags -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import java.util.* class MatterReplicatorBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) : diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EssenceStorageBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EssenceStorageBlockEntity.kt index 3aaa2acc3..377dbf35a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EssenceStorageBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EssenceStorageBlockEntity.kt @@ -34,7 +34,7 @@ import ru.dbotthepony.mc.otm.item.EssenceServoItem import ru.dbotthepony.mc.otm.menu.tech.EssenceStorageMenu import ru.dbotthepony.mc.otm.registry.MBlockEntities import ru.dbotthepony.mc.otm.registry.MDataComponentTypes -import ru.dbotthepony.mc.otm.registry.MFluids +import ru.dbotthepony.mc.otm.registry.content.MFluids class EssenceStorageBlockEntity(blockPos: BlockPos, blockState: BlockState) : MatteryDeviceBlockEntity(MBlockEntities.ESSENCE_STORAGE, blockPos, blockState), IFluidHandler { var experienceStored = 0L diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/EssenceStorageBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/EssenceStorageBlock.kt index 4f325722d..b7239670a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/EssenceStorageBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/EssenceStorageBlock.kt @@ -4,7 +4,6 @@ import net.minecraft.ChatFormatting import net.minecraft.core.BlockPos import net.minecraft.nbt.LongTag import net.minecraft.world.InteractionHand -import net.minecraft.world.InteractionResult import net.minecraft.world.ItemInteractionResult import net.minecraft.world.entity.player.Player import net.minecraft.world.item.DyeColor @@ -33,7 +32,7 @@ import ru.dbotthepony.mc.otm.client.minecraft import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.core.get import ru.dbotthepony.mc.otm.core.util.getLevelFromXp -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.shapes.BlockShapes class EssenceStorageBlock(val color: DyeColor?) : RotatableMatteryBlock(Properties.of().mapColor(color?.mapColor ?: MapColor.METAL).pushReaction(PushReaction.BLOCK).requiresCorrectToolForDrops().destroyTime(1.5f).explosionResistance(60.0f)), EntityBlock { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/GravitationStabilizerBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/GravitationStabilizerBlock.kt index 88de99688..56ec09a02 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/GravitationStabilizerBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/GravitationStabilizerBlock.kt @@ -36,7 +36,7 @@ import ru.dbotthepony.mc.otm.core.math.times import ru.dbotthepony.mc.otm.core.runInBackground import ru.dbotthepony.mc.otm.oncePre import ru.dbotthepony.mc.otm.registry.MBlockEntities -import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MBlocks import ru.dbotthepony.mc.otm.shapes.BlockShapes import kotlin.math.PI diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/PhantomAttractorBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/PhantomAttractorBlock.kt index 0abebe549..dc415d495 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/PhantomAttractorBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/PhantomAttractorBlock.kt @@ -33,7 +33,7 @@ import ru.dbotthepony.mc.otm.core.get import ru.dbotthepony.mc.otm.core.math.minus import ru.dbotthepony.mc.otm.core.math.plus import ru.dbotthepony.mc.otm.once -import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MBlocks import ru.dbotthepony.mc.otm.shapes.BlockShapes class PhantomAttractorBlock : RotatableMatteryBlock(Properties.of().mapColor(MapColor.COLOR_BLUE).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).destroyTime(3f).explosionResistance(12f).randomTicks()) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayer.kt index 084f7276b..cf5ec3802 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayer.kt @@ -101,7 +101,7 @@ import ru.dbotthepony.mc.otm.network.* import ru.dbotthepony.mc.otm.network.SmokeParticlesPacket.Companion.makeSmoke import ru.dbotthepony.mc.otm.registry.AndroidFeatures import ru.dbotthepony.mc.otm.registry.MDamageTypes -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.registry.MRegistry import ru.dbotthepony.mc.otm.registry.MatteryDamageSource import ru.dbotthepony.mc.otm.triggers.AndroidResearchTrigger diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/BlackHoleRenderer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/BlackHoleRenderer.kt index 450df5823..0da30cb8c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/BlackHoleRenderer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/BlackHoleRenderer.kt @@ -31,7 +31,7 @@ import ru.dbotthepony.mc.otm.core.math.minus import ru.dbotthepony.mc.otm.core.math.rotateAroundAxis import ru.dbotthepony.mc.otm.core.math.times import ru.dbotthepony.mc.otm.core.util.formatMatter -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import kotlin.math.PI import kotlin.math.pow diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/FluidTankRenderer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/FluidTankRenderer.kt index 01e8c6a9e..5e98c99ff 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/FluidTankRenderer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/FluidTankRenderer.kt @@ -28,7 +28,7 @@ import ru.dbotthepony.mc.otm.client.render.overlayCoords import ru.dbotthepony.mc.otm.client.render.uv import ru.dbotthepony.mc.otm.client.render.vertex import ru.dbotthepony.mc.otm.core.math.linearInterpolation -import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MBlocks class FluidTankRenderer(private val context: BlockEntityRendererProvider.Context) : BlockEntityRenderer { override fun render( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/DriveViewerScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/DriveViewerScreen.kt index d37c8e84b..73c343e18 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/DriveViewerScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/DriveViewerScreen.kt @@ -20,7 +20,7 @@ import ru.dbotthepony.mc.otm.client.screen.widget.WideProfiledPowerGaugePanel import ru.dbotthepony.mc.otm.core.util.ItemStorageStackSorter import ru.dbotthepony.mc.otm.item.PortableCondensationDriveItem import ru.dbotthepony.mc.otm.menu.storage.DriveViewerMenu -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import yalter.mousetweaks.api.MouseTweaksDisableWheelTweak @MouseTweaksDisableWheelTweak diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EssenceStorageScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EssenceStorageScreen.kt index 9e6708ec7..3412a594a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EssenceStorageScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EssenceStorageScreen.kt @@ -29,7 +29,7 @@ import ru.dbotthepony.mc.otm.core.util.getLevelFromXp import ru.dbotthepony.mc.otm.core.util.getTotalXpRequiredForLevel import ru.dbotthepony.mc.otm.core.util.getXpRequiredForLevelUp import ru.dbotthepony.mc.otm.menu.tech.EssenceStorageMenu -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems class EssenceStorageScreen(menu: EssenceStorageMenu, inventory: Inventory, title: Component) : MatteryScreen(menu, title) { override fun makeMainFrame(): FramePanel> { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/condensed_creative/CondensedCreativeCompat.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/condensed_creative/CondensedCreativeCompat.kt index 0c0b3a249..0666d6378 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/condensed_creative/CondensedCreativeCompat.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/condensed_creative/CondensedCreativeCompat.kt @@ -14,8 +14,8 @@ import net.neoforged.neoforge.capabilities.Capabilities import net.neoforged.neoforge.fluids.FluidStack import net.neoforged.neoforge.fluids.capability.IFluidHandler import ru.dbotthepony.mc.otm.core.registryName -import ru.dbotthepony.mc.otm.registry.MCreativeTabs -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MCreativeTabs +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.registry.MRegistry @CondensedCreativeInitializer.InitializeCondensedEntries diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/JEIPlugin.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/JEIPlugin.kt index 4ff76e6e7..876fa07b9 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/JEIPlugin.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/JEIPlugin.kt @@ -33,7 +33,7 @@ import ru.dbotthepony.mc.otm.menu.matter.MatterEntanglerMenu import ru.dbotthepony.mc.otm.menu.tech.PlatePressMenu import ru.dbotthepony.mc.otm.menu.tech.PoweredFurnaceMenu import ru.dbotthepony.mc.otm.recipe.PainterRecipe -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.registry.MRecipes import java.util.* import java.util.stream.Collectors diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/MatterEntanglerRecipeCategory.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/MatterEntanglerRecipeCategory.kt index 132eb418b..673a11ca7 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/MatterEntanglerRecipeCategory.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/MatterEntanglerRecipeCategory.kt @@ -23,7 +23,7 @@ import ru.dbotthepony.mc.otm.recipe.IMatterEntanglerRecipe import ru.dbotthepony.mc.otm.recipe.get import ru.dbotthepony.mc.otm.recipe.height import ru.dbotthepony.mc.otm.recipe.width -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.registry.MNames object MatterEntanglerRecipeCategory : IRecipeCategory, IDrawable { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/MicrowaveRecipeCategory.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/MicrowaveRecipeCategory.kt index 3f85185ac..422aedf91 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/MicrowaveRecipeCategory.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/MicrowaveRecipeCategory.kt @@ -21,7 +21,7 @@ import ru.dbotthepony.mc.otm.core.ResourceLocation import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.core.registryName import ru.dbotthepony.mc.otm.recipe.MicrowaveRecipe -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import kotlin.math.roundToInt object MicrowaveRecipeCategory : IRecipeCategory, IDrawable { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/PainterRecipeCategory.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/PainterRecipeCategory.kt index 98213c09a..6b20ccb89 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/PainterRecipeCategory.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/PainterRecipeCategory.kt @@ -9,7 +9,6 @@ import mezz.jei.api.recipe.RecipeType import mezz.jei.api.recipe.category.IRecipeCategory import net.minecraft.client.gui.GuiGraphics import net.minecraft.network.chat.Component -import net.minecraft.resources.ResourceLocation import net.minecraft.world.item.ItemStack import net.minecraft.world.item.Items import net.minecraft.world.item.crafting.Ingredient @@ -20,7 +19,7 @@ import ru.dbotthepony.mc.otm.client.screen.panels.slot.AbstractSlotPanel import ru.dbotthepony.mc.otm.client.screen.widget.ProgressGaugePanel import ru.dbotthepony.mc.otm.core.ResourceLocation import ru.dbotthepony.mc.otm.recipe.PainterRecipe -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.registry.MNames object PainterRecipeCategory : IRecipeCategory, IDrawable { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/PlatePressRecipeCategory.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/PlatePressRecipeCategory.kt index 21a57cb2d..cba717fda 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/PlatePressRecipeCategory.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/PlatePressRecipeCategory.kt @@ -21,7 +21,7 @@ import ru.dbotthepony.mc.otm.core.ResourceLocation import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.core.registryName import ru.dbotthepony.mc.otm.recipe.PlatePressRecipe -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import kotlin.math.roundToInt object PlatePressRecipeCategory : IRecipeCategory, IDrawable { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/entity/MinecartCargoCrate.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/entity/MinecartCargoCrate.kt index 3e9863b8b..d6cf55238 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/entity/MinecartCargoCrate.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/entity/MinecartCargoCrate.kt @@ -21,7 +21,7 @@ import ru.dbotthepony.mc.otm.block.decorative.CargoCrateBlock import ru.dbotthepony.mc.otm.block.entity.decorative.CargoCrateBlockEntity import ru.dbotthepony.mc.otm.core.position import ru.dbotthepony.mc.otm.menu.decorative.MinecartCargoCrateMenu -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.registry.MRegistry import ru.dbotthepony.mc.otm.registry.MSoundEvents diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/armor/TritaniumArmorItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/armor/TritaniumArmorItem.kt index cecba4c59..d98bd9fd8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/armor/TritaniumArmorItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/armor/TritaniumArmorItem.kt @@ -15,8 +15,7 @@ import ru.dbotthepony.mc.otm.OverdriveThatMatters.loc import ru.dbotthepony.mc.otm.client.model.TritaniumArmorModel import ru.dbotthepony.mc.otm.registry.ClientExtensionsListener import ru.dbotthepony.mc.otm.registry.MArmorMaterials -import ru.dbotthepony.mc.otm.registry.MItems -import java.util.function.Consumer +import ru.dbotthepony.mc.otm.registry.content.MItems private object TritaniumArmorRenderProperties : IClientItemExtensions { override fun getHumanoidArmorModel( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/block/EnergyCableItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/block/EnergyCableItem.kt index 4edebdec6..c051c66d0 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/block/EnergyCableItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/block/EnergyCableItem.kt @@ -7,7 +7,7 @@ import net.minecraft.world.item.ItemStack import net.minecraft.world.item.TooltipFlag import ru.dbotthepony.mc.otm.config.CablesConfig import ru.dbotthepony.mc.otm.core.util.formatPower -import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MBlocks class EnergyCableItem(val conf: CablesConfig.E, properties: Properties) : BlockItem(MBlocks.ENERGY_CABLES[conf]!!, properties) { override fun appendHoverText( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/AbstractExopackSlotUpgradeItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/AbstractExopackSlotUpgradeItem.kt index 2375bd310..9a1fd900d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/AbstractExopackSlotUpgradeItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/AbstractExopackSlotUpgradeItem.kt @@ -20,7 +20,7 @@ import ru.dbotthepony.mc.otm.client.minecraft import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.core.isExplosion import ru.dbotthepony.mc.otm.core.isFire -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.runIfClient import ru.dbotthepony.mc.otm.triggers.ExopackSlotsExpandedTrigger import java.util.UUID diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EssenceStorageMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EssenceStorageMenu.kt index 138318b40..8be27107c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EssenceStorageMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EssenceStorageMenu.kt @@ -17,7 +17,7 @@ import ru.dbotthepony.mc.otm.menu.MatterySlot import ru.dbotthepony.mc.otm.menu.input.EnumInputWithFeedback import ru.dbotthepony.mc.otm.menu.input.FluidConfigPlayerInput import ru.dbotthepony.mc.otm.menu.input.ItemConfigPlayerInput -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.registry.MMenus import java.util.function.LongSupplier diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/MatterEntanglerRecipe.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/MatterEntanglerRecipe.kt index 06483cf20..1bb33519a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/MatterEntanglerRecipe.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/MatterEntanglerRecipe.kt @@ -26,7 +26,7 @@ import ru.dbotthepony.mc.otm.data.codec.minRange import ru.dbotthepony.mc.otm.network.StreamCodecs import ru.dbotthepony.mc.otm.network.optional import ru.dbotthepony.mc.otm.network.wrap -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.registry.MRecipes import java.util.Optional import java.util.UUID diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/MatteryCookingRecipe.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/MatteryCookingRecipe.kt index dbf831d0e..5ee18a292 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/MatteryCookingRecipe.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/MatteryCookingRecipe.kt @@ -17,7 +17,7 @@ import ru.dbotthepony.mc.otm.core.registryName import ru.dbotthepony.mc.otm.data.codec.minRange import ru.dbotthepony.mc.otm.network.StreamCodecs import ru.dbotthepony.mc.otm.network.streamCodec -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.registry.MRecipes abstract class MatteryCookingRecipe( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PainterRecipe.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PainterRecipe.kt index ea81b4d6b..4b6b2219c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PainterRecipe.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PainterRecipe.kt @@ -30,7 +30,7 @@ import ru.dbotthepony.mc.otm.data.codec.PredicatedCodecList import ru.dbotthepony.mc.otm.data.codec.minRange import ru.dbotthepony.mc.otm.network.MatteryStreamCodec import ru.dbotthepony.mc.otm.network.nullable -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.registry.MRecipes import java.util.function.Predicate import kotlin.collections.ArrayList diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PlatePressRecipe.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PlatePressRecipe.kt index 708be3d26..7b09f66e2 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PlatePressRecipe.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PlatePressRecipe.kt @@ -8,7 +8,6 @@ import net.minecraft.core.NonNullList import net.minecraft.network.RegistryFriendlyByteBuf import net.minecraft.network.codec.ByteBufCodecs import net.minecraft.network.codec.StreamCodec -import net.minecraft.resources.ResourceLocation import net.minecraft.util.valueproviders.ConstantFloat import net.minecraft.util.valueproviders.FloatProvider import net.minecraft.world.Container @@ -25,9 +24,8 @@ import ru.dbotthepony.mc.otm.core.get import ru.dbotthepony.mc.otm.registry.MRecipes import ru.dbotthepony.mc.otm.core.registryName import ru.dbotthepony.mc.otm.data.codec.minRange -import ru.dbotthepony.mc.otm.network.StreamCodecs import ru.dbotthepony.mc.otm.network.streamCodec -import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.content.MItems class PlatePressRecipe( val input: Ingredient, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockColors.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockColors.kt index 0e4471da9..048764c70 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockColors.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockColors.kt @@ -11,6 +11,7 @@ import net.neoforged.bus.api.IEventBus import net.neoforged.neoforge.client.event.RegisterColorHandlersEvent import ru.dbotthepony.mc.otm.block.entity.decorative.HoloSignBlockEntity import ru.dbotthepony.kommons.math.RGBAColor +import ru.dbotthepony.mc.otm.registry.content.MBlocks object MBlockColors { private const val DEFAULT_WATER_TINT: Int = 0x3F76E4 diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockEntities.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockEntities.kt index 69fd0631b..d4a6bf12e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockEntities.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockEntities.kt @@ -30,6 +30,7 @@ import ru.dbotthepony.mc.otm.block.entity.tech.PlatePressBlockEntity import ru.dbotthepony.mc.otm.client.render.blockentity.* import ru.dbotthepony.mc.otm.config.CablesConfig import ru.dbotthepony.mc.otm.core.collect.SupplierMap +import ru.dbotthepony.mc.otm.registry.content.MBlocks import java.util.function.Supplier @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS") // Type<*> is unused in BlockEntityType.Builder diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt index 5ddc1efae..1d7668271 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt @@ -38,16 +38,15 @@ import ru.dbotthepony.mc.otm.block.decorative.TritaniumPressurePlate import ru.dbotthepony.mc.otm.capability.matteryEnergy import ru.dbotthepony.mc.otm.client.MatteryGUI import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom import ru.dbotthepony.mc.otm.core.math.Decimal import ru.dbotthepony.mc.otm.isClient import ru.dbotthepony.mc.otm.item.armor.TritaniumArmorItem import ru.dbotthepony.mc.otm.item.weapon.EnergySwordItem +import ru.dbotthepony.mc.otm.registry.content.MItems import ru.dbotthepony.mc.otm.registry.objects.ColoredDecorativeBlock import ru.dbotthepony.mc.otm.registry.objects.DecorativeBlock import ru.dbotthepony.mc.otm.registry.objects.IBlockItemRegistryAcceptor import ru.dbotthepony.mc.otm.registry.objects.StripedColoredDecorativeBlock -import ru.dbotthepony.mc.otm.shapes.BlockShapes object MRegistry : IBlockItemRegistryAcceptor { private val features = RegistryDelegate>("android_features") { sync(true) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/content/MBlocks.kt similarity index 98% rename from src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/registry/content/MBlocks.kt index 8c9cc1a68..1fc29df75 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/content/MBlocks.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.registry +package ru.dbotthepony.mc.otm.registry.content import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet import net.minecraft.core.Direction @@ -85,6 +85,10 @@ import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.config.CablesConfig import ru.dbotthepony.mc.otm.core.collect.SupplierList import ru.dbotthepony.mc.otm.core.collect.SupplierMap +import ru.dbotthepony.mc.otm.registry.MBlockEntities +import ru.dbotthepony.mc.otm.registry.MDeferredRegister +import ru.dbotthepony.mc.otm.registry.MNames +import ru.dbotthepony.mc.otm.registry.MRegistry import java.util.function.Supplier object MBlocks { @@ -123,7 +127,7 @@ object MBlocks { fun register(bus: IEventBus) { registry.register(bus) - bus.addListener(::registerCapabilities) + bus.addListener(MBlocks::registerCapabilities) } val ANDROID_STATION = registry.coloredWithBase(MNames.ANDROID_STATION, ::AndroidStationBlock) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/content/MCreativeTabs.kt similarity index 97% rename from src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/registry/content/MCreativeTabs.kt index dc9a01d14..2150f182d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/content/MCreativeTabs.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.registry +package ru.dbotthepony.mc.otm.registry.content import net.minecraft.core.registries.BuiltInRegistries import net.minecraft.core.registries.Registries @@ -20,7 +20,9 @@ import ru.dbotthepony.mc.otm.core.ResourceLocation import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.core.registryName import ru.dbotthepony.mc.otm.core.util.CreativeMenuItemComparator -import ru.dbotthepony.mc.otm.registry.MItems.BATTERY_CREATIVE +import ru.dbotthepony.mc.otm.registry.MDeferredRegister +import ru.dbotthepony.mc.otm.registry.MRegistry +import ru.dbotthepony.mc.otm.registry.content.MItems.BATTERY_CREATIVE private fun CreativeModeTab.Output.accept(values: Collection) { for (item in values) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MFluids.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/content/MFluids.kt similarity index 84% rename from src/main/kotlin/ru/dbotthepony/mc/otm/registry/MFluids.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/registry/content/MFluids.kt index 2bc9bd59f..c9974fdf0 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MFluids.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/content/MFluids.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.registry +package ru.dbotthepony.mc.otm.registry.content import net.minecraft.core.registries.BuiltInRegistries import net.minecraft.resources.ResourceLocation @@ -12,6 +12,8 @@ import net.neoforged.neoforge.fluids.FluidType import net.neoforged.neoforge.registries.NeoForgeRegistries import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.registry.content.MBlocks +import ru.dbotthepony.mc.otm.registry.MDeferredRegister import java.util.function.Consumer object MFluids { @@ -24,7 +26,11 @@ object MFluids { } private fun makeXpProps(): BaseFlowingFluid.Properties { - return BaseFlowingFluid.Properties(::LIQUID_XP_TYPE, ::LIQUID_XP, ::LIQUID_XP_FLOWING).bucket(MItems::LIQUID_XP_BUCKET).block(MBlocks::LIQUID_XP) + return BaseFlowingFluid.Properties( + MFluids::LIQUID_XP_TYPE, + MFluids::LIQUID_XP, + MFluids::LIQUID_XP_FLOWING + ).bucket(MItems::LIQUID_XP_BUCKET).block(MBlocks::LIQUID_XP) } private val xpProps = makeXpProps() @@ -63,5 +69,7 @@ object MFluids { } val LIQUID_XP: BaseFlowingFluid.Source by fluids.register("liquid_xp") { BaseFlowingFluid.Source(xpProps) } - val LIQUID_XP_FLOWING: BaseFlowingFluid.Flowing by fluids.register("liquid_xp_flowing") { BaseFlowingFluid.Flowing(xpProps) } + val LIQUID_XP_FLOWING: BaseFlowingFluid.Flowing by fluids.register("liquid_xp_flowing") { BaseFlowingFluid.Flowing( + xpProps + ) } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/content/MItems.kt similarity index 87% rename from src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/registry/content/MItems.kt index 2d71f3701..7f16f0ae0 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/content/MItems.kt @@ -1,5 +1,5 @@ -package ru.dbotthepony.mc.otm.registry +package ru.dbotthepony.mc.otm.registry.content import net.minecraft.core.component.DataComponents import net.minecraft.core.registries.BuiltInRegistries @@ -15,7 +15,6 @@ import net.minecraft.world.item.HoeItem import net.minecraft.world.item.Item import net.minecraft.world.item.Item.Properties import net.minecraft.world.item.ItemStack -import net.minecraft.world.item.Items import net.minecraft.world.item.PickaxeItem import net.minecraft.world.item.Rarity import net.minecraft.world.item.ShearsItem @@ -59,7 +58,6 @@ import ru.dbotthepony.mc.otm.item.addSimpleDescription import ru.dbotthepony.mc.otm.item.armor.PortableGravitationStabilizerItem import ru.dbotthepony.mc.otm.item.armor.TritaniumArmorItem import ru.dbotthepony.mc.otm.item.block.EnergyCableItem -import ru.dbotthepony.mc.otm.item.consumables.NotNormalFood import ru.dbotthepony.mc.otm.item.consumables.NotNormalPill import ru.dbotthepony.mc.otm.item.exopack.ExopackProbeItem import ru.dbotthepony.mc.otm.item.exopack.ExopackSlotUpgradeItem @@ -73,6 +71,13 @@ import ru.dbotthepony.mc.otm.item.tool.ExplosiveHammerItem import ru.dbotthepony.mc.otm.item.tool.MatteryAxeItem import ru.dbotthepony.mc.otm.item.tool.RedstoneInteractorItem import ru.dbotthepony.mc.otm.item.weapon.EnergySwordItem +import ru.dbotthepony.mc.otm.registry.MArmorMaterials +import ru.dbotthepony.mc.otm.registry.content.MBlocks +import ru.dbotthepony.mc.otm.registry.MDeferredRegister +import ru.dbotthepony.mc.otm.registry.MItemTags +import ru.dbotthepony.mc.otm.registry.MNames +import ru.dbotthepony.mc.otm.registry.MRegistry +import ru.dbotthepony.mc.otm.registry.SuspiciousFoods import java.util.function.Supplier object MItems { @@ -129,7 +134,9 @@ object MItems { val GRAVITATION_STABILIZER: BlockItem by registry.register(MNames.GRAVITATION_STABILIZER) { BlockItem(MBlocks.GRAVITATION_STABILIZER, DEFAULT_PROPERTIES) } - val PHANTOM_ATTRACTOR: DoubleHighBlockItem by registry.register(MNames.PHANTOM_ATTRACTOR) { DoubleHighBlockItem(MBlocks.PHANTOM_ATTRACTOR, DEFAULT_PROPERTIES) } + val PHANTOM_ATTRACTOR: DoubleHighBlockItem by registry.register(MNames.PHANTOM_ATTRACTOR) { DoubleHighBlockItem( + MBlocks.PHANTOM_ATTRACTOR, DEFAULT_PROPERTIES + ) } val ENERGY_SERVO = register(MNames.ENERGY_SERVO, MBlocks.ENERGY_SERVO) val COBBLESTONE_GENERATOR = register(MNames.COBBLESTONE_GENERATOR, MBlocks.COBBLESTONE_GENERATOR) @@ -169,40 +176,40 @@ object MItems { machines.addAll(CHEMICAL_GENERATOR.asSupplierArray()) machines.addAll(ENERGY_SERVO.asSupplierArray()) - machines.add(::PHANTOM_ATTRACTOR) - machines.add(::PAINTER) + machines.add(MItems::PHANTOM_ATTRACTOR) + machines.add(MItems::PAINTER) machines.addAll(COBBLESTONE_GENERATOR.asSupplierArray().iterator()) machines.addAll(ESSENCE_STORAGE.asSupplierArray().iterator()) machines.addAll(MATTER_DECOMPOSER.asSupplierArray().iterator()) machines.addAll(MATTER_CAPACITOR_BANK.asSupplierArray().iterator()) - machines.add(::MATTER_CABLE) - machines.add(::PATTERN_STORAGE) + machines.add(MItems::MATTER_CABLE) + machines.add(MItems::PATTERN_STORAGE) machines.addAll(MATTER_SCANNER.asSupplierArray().iterator()) machines.addAll(MATTER_PANEL.asSupplierArray().iterator()) machines.addAll(MATTER_REPLICATOR.asSupplierArray().iterator()) machines.addAll(MATTER_BOTTLER.asSupplierArray().iterator()) - machines.add(::MATTER_ENTANGLER) + machines.add(MItems::MATTER_ENTANGLER) machines.addAll(MATTER_RECYCLER.asSupplierArray().iterator()) machines.addAll(MATTER_RECONSTRUCTOR.asSupplierArray().iterator()) - machines.add(::GRAVITATION_STABILIZER) + machines.add(MItems::GRAVITATION_STABILIZER) - machines.add(::BLACK_HOLE_GENERATOR) - machines.add(::ITEM_INPUT_HATCH) - machines.add(::ITEM_OUTPUT_HATCH) - machines.add(::ENERGY_INPUT_HATCH) - machines.add(::ENERGY_OUTPUT_HATCH) - machines.add(::MATTER_INPUT_HATCH) - machines.add(::MATTER_OUTPUT_HATCH) + machines.add(MItems::BLACK_HOLE_GENERATOR) + machines.add(MItems::ITEM_INPUT_HATCH) + machines.add(MItems::ITEM_OUTPUT_HATCH) + machines.add(MItems::ENERGY_INPUT_HATCH) + machines.add(MItems::ENERGY_OUTPUT_HATCH) + machines.add(MItems::MATTER_INPUT_HATCH) + machines.add(MItems::MATTER_OUTPUT_HATCH) - machines.add(::STORAGE_BUS) - machines.add(::STORAGE_IMPORTER) - machines.add(::STORAGE_EXPORTER) + machines.add(MItems::STORAGE_BUS) + machines.add(MItems::STORAGE_IMPORTER) + machines.add(MItems::STORAGE_EXPORTER) machines.addAll(DRIVE_VIEWER.asSupplierArray().iterator()) - machines.add(::DRIVE_RACK) + machines.add(MItems::DRIVE_RACK) machines.addAll(ITEM_MONITOR.asSupplierArray().iterator()) - machines.add(::STORAGE_CABLE) + machines.add(MItems::STORAGE_CABLE) machines.addAll(STORAGE_POWER_SUPPLIER.asSupplierArray().iterator()) MACHINES = SupplierList(machines) @@ -280,20 +287,20 @@ object MItems { val MATTER_STORAGE_FLAT_SMALL: SimpleUpgrade by registry.register("creative_matter_storage_flat2_upgrade") { SimpleUpgrade(Item.Properties().rarity(Rarity.EPIC), UpgradeType.MATTER_STORAGE.set(), matterStorageFlat = Decimal.INT_MAX_VALUE) } val LIST = SupplierList( - ::SPEED, - ::ENERGY_CONSUMPTION, - ::ENERGY_STORAGE, - ::ENERGY_STORAGE_FLAT, - ::ENERGY_STORAGE_FLAT_SMALL, - ::ENERGY_THROUGHPUT, - ::ENERGY_THROUGHPUT_FLAT, - ::ENERGY_THROUGHPUT_FLAT_SMALL, - ::FAILSAFE, - ::FAILURE, - ::PROCESSING_ITEMS, - ::MATTER_STORAGE, - ::MATTER_STORAGE_FLAT, - ::MATTER_STORAGE_FLAT_SMALL, + Creative::SPEED, + Creative::ENERGY_CONSUMPTION, + Creative::ENERGY_STORAGE, + Creative::ENERGY_STORAGE_FLAT, + Creative::ENERGY_STORAGE_FLAT_SMALL, + Creative::ENERGY_THROUGHPUT, + Creative::ENERGY_THROUGHPUT_FLAT, + Creative::ENERGY_THROUGHPUT_FLAT_SMALL, + Creative::FAILSAFE, + Creative::FAILURE, + Creative::PROCESSING_ITEMS, + Creative::MATTER_STORAGE, + Creative::MATTER_STORAGE_FLAT, + Creative::MATTER_STORAGE_FLAT_SMALL, ) } @@ -348,23 +355,28 @@ object MItems { 16, ) { Ingredient.of(TRITANIUM_INGOT) } - val TRITANIUM_SWORD: SwordItem by registry.register(MNames.TRITANIUM_SWORD) { SwordItem(TRITANIUM_COMPONENT, + val TRITANIUM_SWORD: SwordItem by registry.register(MNames.TRITANIUM_SWORD) { SwordItem( + TRITANIUM_COMPONENT, Properties().attributes(SwordItem.createAttributes(TRITANIUM_COMPONENT, 4f, -2.7f))) } - val TRITANIUM_SHOVEL: ShovelItem by registry.register(MNames.TRITANIUM_SHOVEL) { ShovelItem(TRITANIUM_COMPONENT, + val TRITANIUM_SHOVEL: ShovelItem by registry.register(MNames.TRITANIUM_SHOVEL) { ShovelItem( + TRITANIUM_COMPONENT, Properties().attributes(ShovelItem.createAttributes(TRITANIUM_COMPONENT, 1.5f, -2.4f))) } - val TRITANIUM_AXE: MatteryAxeItem by registry.register(MNames.TRITANIUM_AXE) { MatteryAxeItem(TRITANIUM_COMPONENT, + val TRITANIUM_AXE: MatteryAxeItem by registry.register(MNames.TRITANIUM_AXE) { MatteryAxeItem( + TRITANIUM_COMPONENT, Properties().attributes(AxeItem.createAttributes(TRITANIUM_COMPONENT, 8.5f, -3.4f))) } - val TRITANIUM_PICKAXE: PickaxeItem by registry.register(MNames.TRITANIUM_PICKAXE) { PickaxeItem(TRITANIUM_COMPONENT, + val TRITANIUM_PICKAXE: PickaxeItem by registry.register(MNames.TRITANIUM_PICKAXE) { PickaxeItem( + TRITANIUM_COMPONENT, Properties().attributes(PickaxeItem.createAttributes(TRITANIUM_COMPONENT, 2f, -2.8f))) } - val TRITANIUM_HOE: HoeItem by registry.register(MNames.TRITANIUM_HOE) { HoeItem(TRITANIUM_COMPONENT, + val TRITANIUM_HOE: HoeItem by registry.register(MNames.TRITANIUM_HOE) { HoeItem( + TRITANIUM_COMPONENT, Properties().attributes(ShovelItem.createAttributes(TRITANIUM_COMPONENT, 0f, -3.4f))) } @@ -382,12 +394,12 @@ object MItems { } } val TRITANIUM_TOOLS = SupplierList( - ::TRITANIUM_SWORD, - ::TRITANIUM_SHOVEL, - ::TRITANIUM_AXE, - ::TRITANIUM_PICKAXE, - ::TRITANIUM_HOE, - ::TRITANIUM_SHEARS, + MItems::TRITANIUM_SWORD, + MItems::TRITANIUM_SHOVEL, + MItems::TRITANIUM_AXE, + MItems::TRITANIUM_PICKAXE, + MItems::TRITANIUM_HOE, + MItems::TRITANIUM_SHEARS, ) val TRITANIUM_HELMET: TritaniumArmorItem by registry.register(MNames.TRITANIUM_HELMET) { TritaniumArmorItem(ArmorItem.Type.HELMET) } @@ -395,23 +407,27 @@ object MItems { val TRITANIUM_PANTS: TritaniumArmorItem by registry.register(MNames.TRITANIUM_PANTS) { TritaniumArmorItem(ArmorItem.Type.LEGGINGS) } val TRITANIUM_BOOTS: TritaniumArmorItem by registry.register(MNames.TRITANIUM_BOOTS) { TritaniumArmorItem(ArmorItem.Type.BOOTS) } - val SIMPLE_TRITANIUM_HELMET: ArmorItem by registry.register(MNames.SIMPLE_TRITANIUM_HELMET) { ArmorItem(MArmorMaterials.SIMPLE_TRITANIUM, ArmorItem.Type.HELMET, Properties().stacksTo(1).durability(ArmorItem.Type.HELMET.getDurability(24))) } - val SIMPLE_TRITANIUM_CHESTPLATE: ArmorItem by registry.register(MNames.SIMPLE_TRITANIUM_CHESTPLATE) { ArmorItem(MArmorMaterials.SIMPLE_TRITANIUM, ArmorItem.Type.CHESTPLATE, Properties().stacksTo(1).durability(ArmorItem.Type.CHESTPLATE.getDurability(24))) } - val SIMPLE_TRITANIUM_PANTS: ArmorItem by registry.register(MNames.SIMPLE_TRITANIUM_PANTS) { ArmorItem(MArmorMaterials.SIMPLE_TRITANIUM, ArmorItem.Type.LEGGINGS, Properties().stacksTo(1).durability(ArmorItem.Type.LEGGINGS.getDurability(24))) } - val SIMPLE_TRITANIUM_BOOTS: ArmorItem by registry.register(MNames.SIMPLE_TRITANIUM_BOOTS) { ArmorItem(MArmorMaterials.SIMPLE_TRITANIUM, ArmorItem.Type.BOOTS, Properties().stacksTo(1).durability(ArmorItem.Type.BOOTS.getDurability(24))) } + val SIMPLE_TRITANIUM_HELMET: ArmorItem by registry.register(MNames.SIMPLE_TRITANIUM_HELMET) { ArmorItem( + MArmorMaterials.SIMPLE_TRITANIUM, ArmorItem.Type.HELMET, Properties().stacksTo(1).durability(ArmorItem.Type.HELMET.getDurability(24))) } + val SIMPLE_TRITANIUM_CHESTPLATE: ArmorItem by registry.register(MNames.SIMPLE_TRITANIUM_CHESTPLATE) { ArmorItem( + MArmorMaterials.SIMPLE_TRITANIUM, ArmorItem.Type.CHESTPLATE, Properties().stacksTo(1).durability(ArmorItem.Type.CHESTPLATE.getDurability(24))) } + val SIMPLE_TRITANIUM_PANTS: ArmorItem by registry.register(MNames.SIMPLE_TRITANIUM_PANTS) { ArmorItem( + MArmorMaterials.SIMPLE_TRITANIUM, ArmorItem.Type.LEGGINGS, Properties().stacksTo(1).durability(ArmorItem.Type.LEGGINGS.getDurability(24))) } + val SIMPLE_TRITANIUM_BOOTS: ArmorItem by registry.register(MNames.SIMPLE_TRITANIUM_BOOTS) { ArmorItem( + MArmorMaterials.SIMPLE_TRITANIUM, ArmorItem.Type.BOOTS, Properties().stacksTo(1).durability(ArmorItem.Type.BOOTS.getDurability(24))) } val TRITANIUM_ARMOR = SupplierList( - ::TRITANIUM_HELMET, - ::TRITANIUM_CHESTPLATE, - ::TRITANIUM_PANTS, - ::TRITANIUM_BOOTS + MItems::TRITANIUM_HELMET, + MItems::TRITANIUM_CHESTPLATE, + MItems::TRITANIUM_PANTS, + MItems::TRITANIUM_BOOTS ) val SIMPLE_TRITANIUM_ARMOR = SupplierList( - ::SIMPLE_TRITANIUM_HELMET, - ::SIMPLE_TRITANIUM_CHESTPLATE, - ::SIMPLE_TRITANIUM_PANTS, - ::SIMPLE_TRITANIUM_BOOTS + MItems::SIMPLE_TRITANIUM_HELMET, + MItems::SIMPLE_TRITANIUM_CHESTPLATE, + MItems::SIMPLE_TRITANIUM_PANTS, + MItems::SIMPLE_TRITANIUM_BOOTS ) val EXPLOSIVE_HAMMER: ExplosiveHammerItem by registry.register("explosive_hammer") { ExplosiveHammerItem() } @@ -435,11 +451,11 @@ object MItems { val PILL_NOT_NORMAL: Item by registry.register(MNames.PILL_NOT_NORMAL) { NotNormalPill() } val PILLS = SupplierList( - ::PILL_ANDROID, - ::PILL_HUMANE, - ::PILL_OBLIVION, - ::PILL_HEAL, - ::PILL_NOT_NORMAL, + MItems::PILL_ANDROID, + MItems::PILL_HUMANE, + MItems::PILL_OBLIVION, + MItems::PILL_HEAL, + MItems::PILL_NOT_NORMAL, ) val SUSPICIOUS_FOODS = SuspiciousFoods(registry) @@ -453,37 +469,38 @@ object MItems { val QUANTUM_BATTERY: QuantumBatteryItem by registry.register(MNames.QUANTUM_BATTERY) { QuantumBatteryItem(MNames.QUANTUM_BATTERY, ItemsConfig.Batteries.QUANTUM_BATTERY) } val QUANTUM_CAPACITOR: QuantumBatteryItem by registry.register(MNames.QUANTUM_CAPACITOR) { QuantumBatteryItem(MNames.QUANTUM_CAPACITOR, ItemsConfig.Batteries.QUANTUM_CAPACITOR) } - val QUANTUM_BATTERY_CREATIVE: QuantumBatteryItem by registry.register(MNames.QUANTUM_BATTERY_CREATIVE) { QuantumBatteryItem(MNames.QUANTUM_BATTERY_CREATIVE, null) } + val QUANTUM_BATTERY_CREATIVE: QuantumBatteryItem by registry.register(MNames.QUANTUM_BATTERY_CREATIVE) { QuantumBatteryItem( + MNames.QUANTUM_BATTERY_CREATIVE, null) } val ZPM_BATTERY: ZPMItem by registry.register(MNames.ZPM_BATTERY) { ZPMItem() } val PROCEDURAL_BATTERY: ProceduralBatteryItem by registry.register(MNames.PROCEDURAL_BATTERY) { ProceduralBatteryItem() } val BATTERIES = SupplierList( - ::BATTERY_CRUDE, - ::BATTERY_BASIC, - ::BATTERY_NORMAL, - ::BATTERY_DENSE, - ::BATTERY_CAPACITOR, + MItems::BATTERY_CRUDE, + MItems::BATTERY_BASIC, + MItems::BATTERY_NORMAL, + MItems::BATTERY_DENSE, + MItems::BATTERY_CAPACITOR, ) val UNIQUE_BATTERIES = SupplierList( - ::QUANTUM_BATTERY, - ::QUANTUM_CAPACITOR, - ::QUANTUM_BATTERY_CREATIVE, - ::ZPM_BATTERY, + MItems::QUANTUM_BATTERY, + MItems::QUANTUM_CAPACITOR, + MItems::QUANTUM_BATTERY_CREATIVE, + MItems::ZPM_BATTERY, ) val ALL_BATTERIES = SupplierList( - ::BATTERY_CRUDE, - ::BATTERY_BASIC, - ::BATTERY_NORMAL, - ::BATTERY_DENSE, - ::BATTERY_CAPACITOR, - ::BATTERY_CREATIVE, + MItems::BATTERY_CRUDE, + MItems::BATTERY_BASIC, + MItems::BATTERY_NORMAL, + MItems::BATTERY_DENSE, + MItems::BATTERY_CAPACITOR, + MItems::BATTERY_CREATIVE, - ::QUANTUM_BATTERY, - ::QUANTUM_CAPACITOR, - ::QUANTUM_BATTERY_CREATIVE, - ::ZPM_BATTERY, + MItems::QUANTUM_BATTERY, + MItems::QUANTUM_CAPACITOR, + MItems::QUANTUM_BATTERY_CREATIVE, + MItems::ZPM_BATTERY, ) val MATTER_CAPACITOR_BASIC: Item by registry.register(MNames.MATTER_CAPACITOR_BASIC) { MatterCapacitorItem(ItemsConfig.Capacitors::BASIC) } @@ -492,10 +509,10 @@ object MItems { val MATTER_CAPACITOR_CREATIVE: Item by registry.register(MNames.MATTER_CAPACITOR_CREATIVE) { MatterCapacitorItem() } val MATTER_CAPACITORS = SupplierList( - ::MATTER_CAPACITOR_BASIC, - ::MATTER_CAPACITOR_NORMAL, - ::MATTER_CAPACITOR_DENSE, - ::MATTER_CAPACITOR_CREATIVE, + MItems::MATTER_CAPACITOR_BASIC, + MItems::MATTER_CAPACITOR_NORMAL, + MItems::MATTER_CAPACITOR_DENSE, + MItems::MATTER_CAPACITOR_CREATIVE, ) val PATTERN_DRIVE_NORMAL: Item by registry.register(MNames.PATTERN_DRIVE_NORMAL) { PatternStorageItem(ItemsConfig.PatternDrives::NORMAL) } @@ -531,14 +548,20 @@ object MItems { val GOLD_PLATE: Item by registry.register(MNames.GOLD_PLATE) { Item(DEFAULT_PROPERTIES) } val COPPER_WIRING: Item by registry.register(MNames.COPPER_WIRING) { Item(DEFAULT_PROPERTIES) } val GOLD_WIRING: Item by registry.register(MNames.GOLD_WIRING) { Item(DEFAULT_PROPERTIES) } - val PORTABLE_CONDENSATION_DRIVE_CASING: Item by registry.register(MNames.PORTABLE_CONDENSATION_DRIVE_CASING) { Item(DEFAULT_PROPERTIES) } - val PORTABLE_DENSE_CONDENSATION_DRIVE_CASING: Item by registry.register(MNames.PORTABLE_DENSE_CONDENSATION_DRIVE_CASING) { Item(DEFAULT_PROPERTIES) } + val PORTABLE_CONDENSATION_DRIVE_CASING: Item by registry.register(MNames.PORTABLE_CONDENSATION_DRIVE_CASING) { Item( + DEFAULT_PROPERTIES + ) } + val PORTABLE_DENSE_CONDENSATION_DRIVE_CASING: Item by registry.register(MNames.PORTABLE_DENSE_CONDENSATION_DRIVE_CASING) { Item( + DEFAULT_PROPERTIES + ) } val CIRCUIT_PLATING: Item by registry.register(MNames.CIRCUIT_PLATING) { Item(DEFAULT_PROPERTIES) } val BASIC_CONTROL_CIRCUIT: Item by registry.register(MNames.BASIC_CONTROL_CIRCUIT) { Item(DEFAULT_PROPERTIES) } val ADVANCED_CONTROL_CIRCUIT: Item by registry.register(MNames.ADVANCED_CONTROL_CIRCUIT) { Item(DEFAULT_PROPERTIES) } val MATTER_CAPACITOR_PARTS: Item by registry.register(MNames.MATTER_CAPACITOR_PARTS) { Item(DEFAULT_PROPERTIES) } val CARBON_MESH: Item by registry.register(MNames.CARBON_MESH) { Item(DEFAULT_PROPERTIES) } - val REINFORCED_TRITANIUM_PLATE: Item by registry.register(MNames.REINFORCED_TRITANIUM_PLATE) { MatteryItem(DEFAULT_PROPERTIES).addSimpleDescription() } + val REINFORCED_TRITANIUM_PLATE: Item by registry.register(MNames.REINFORCED_TRITANIUM_PLATE) { MatteryItem( + DEFAULT_PROPERTIES + ).addSimpleDescription() } val QUANTUM_TRANSCEIVER: Item by registry.register(MNames.QUANTUM_TRANSCEIVER) { Item(DEFAULT_PROPERTIES) } val ELECTROMAGNET: Item by registry.register(MNames.ELECTROMAGNET) { Item(DEFAULT_PROPERTIES) } @@ -550,31 +573,31 @@ object MItems { * List of components for everything else */ val COMPONENTS = SupplierList( - ::MATTER_IO_PORT, - ::MATTER_TRANSFORM_MATRIX, - ::ENERGY_BUS, - ::ELECTRIC_PARTS, - ::MACHINE_FRAME, - ::TRITANIUM_PLATE, - ::IRON_PLATE, - ::GOLD_PLATE, - ::COPPER_WIRING, - ::GOLD_WIRING, - ::PORTABLE_CONDENSATION_DRIVE_CASING, - ::PORTABLE_DENSE_CONDENSATION_DRIVE_CASING, - ::CIRCUIT_PLATING, - ::BASIC_CONTROL_CIRCUIT, - ::ADVANCED_CONTROL_CIRCUIT, - ::MATTER_CAPACITOR_PARTS, + MItems::MATTER_IO_PORT, + MItems::MATTER_TRANSFORM_MATRIX, + MItems::ENERGY_BUS, + MItems::ELECTRIC_PARTS, + MItems::MACHINE_FRAME, + MItems::TRITANIUM_PLATE, + MItems::IRON_PLATE, + MItems::GOLD_PLATE, + MItems::COPPER_WIRING, + MItems::GOLD_WIRING, + MItems::PORTABLE_CONDENSATION_DRIVE_CASING, + MItems::PORTABLE_DENSE_CONDENSATION_DRIVE_CASING, + MItems::CIRCUIT_PLATING, + MItems::BASIC_CONTROL_CIRCUIT, + MItems::ADVANCED_CONTROL_CIRCUIT, + MItems::MATTER_CAPACITOR_PARTS, - ::QUANTUM_TRANSCEIVER, - ::ELECTROMAGNET, - ::ELECTROMOTOR, - ::MIRROR_COMPOUND, - ::MIRROR, + MItems::QUANTUM_TRANSCEIVER, + MItems::ELECTROMAGNET, + MItems::ELECTROMOTOR, + MItems::MIRROR_COMPOUND, + MItems::MIRROR, - ::CARBON_MESH, - ::REINFORCED_TRITANIUM_PLATE, + MItems::CARBON_MESH, + MItems::REINFORCED_TRITANIUM_PLATE, MachineUpgrades.Basic::BLANK, MachineUpgrades.Normal::BLANK, @@ -585,27 +608,27 @@ object MItems { * List of components for datagen code */ val DATAGEN_COMPONENTS = SupplierList( - ::ENERGY_BUS, - ::ELECTRIC_PARTS, - ::TRITANIUM_PLATE, - ::IRON_PLATE, - ::GOLD_PLATE, - ::COPPER_WIRING, - ::GOLD_WIRING, - ::CIRCUIT_PLATING, - ::BASIC_CONTROL_CIRCUIT, - ::ADVANCED_CONTROL_CIRCUIT, - ::MATTER_CAPACITOR_PARTS, - ::MATTER_IO_PORT, - ::MATTER_TRANSFORM_MATRIX, - ::QUANTUM_TRANSCEIVER, - ::ELECTROMAGNET, - ::ELECTROMOTOR, - ::MIRROR_COMPOUND, - ::MIRROR, + MItems::ENERGY_BUS, + MItems::ELECTRIC_PARTS, + MItems::TRITANIUM_PLATE, + MItems::IRON_PLATE, + MItems::GOLD_PLATE, + MItems::COPPER_WIRING, + MItems::GOLD_WIRING, + MItems::CIRCUIT_PLATING, + MItems::BASIC_CONTROL_CIRCUIT, + MItems::ADVANCED_CONTROL_CIRCUIT, + MItems::MATTER_CAPACITOR_PARTS, + MItems::MATTER_IO_PORT, + MItems::MATTER_TRANSFORM_MATRIX, + MItems::QUANTUM_TRANSCEIVER, + MItems::ELECTROMAGNET, + MItems::ELECTROMOTOR, + MItems::MIRROR_COMPOUND, + MItems::MIRROR, - ::CARBON_MESH, - ::REINFORCED_TRITANIUM_PLATE, + MItems::CARBON_MESH, + MItems::REINFORCED_TRITANIUM_PLATE, ) val CARGO_CRATE_MINECARTS = registry.coloredWithBase(MNames.MINECART_CARGO_CRATE, ::MinecartCargoCrateItem) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/feature/BlackHolePlacer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/feature/BlackHolePlacer.kt index 374c5fe4b..0356f0ed2 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/feature/BlackHolePlacer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/feature/BlackHolePlacer.kt @@ -10,7 +10,7 @@ import ru.dbotthepony.mc.otm.config.ServerConfig import ru.dbotthepony.mc.otm.core.math.Decimal import ru.dbotthepony.mc.otm.core.math.nextDecimal import ru.dbotthepony.mc.otm.data.codec.DecimalCodec -import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.content.MBlocks object BlackHolePlacerFeature : Feature( RecordCodecBuilder.create {