From d6ac89d29d15de13e15ad10aadacc8942abf4e7b Mon Sep 17 00:00:00 2001 From: ttttdoy Date: Mon, 29 Jul 2024 16:34:26 -0400 Subject: [PATCH] teeny tiny refactoring --- .../entity/DieselGeneratorBlockEntity.kt | 2 +- src/main/kotlin/breadmod/ClientModEventBus.kt | 15 +++---- src/main/kotlin/breadmod/CommonModEventBus.kt | 2 +- .../machine}/AbstractMachineBlockEntity.kt | 10 ++--- .../machine}/CreativeGeneratorBlockEntity.kt | 2 +- .../machine}/DoughMachineBlockEntity.kt | 4 +- .../machine}/GeneratorBlockEntity.kt | 2 +- .../machine}/ToasterBlockEntity.kt | 2 +- .../machine}/WheatCrusherBlockEntity.kt | 4 +- .../farmer}/FarmerControllerBlockEntity.kt | 2 +- .../farmer}/FarmerInputBlockEntity.kt | 2 +- .../farmer}/FarmerOutputBlockEntity.kt | 2 +- .../generic}/PowerInterfaceBlockEntity.kt | 4 +- .../storage}/EnergyStorageBlockEntity.kt | 4 +- .../storage}/FluidStorageBlockEntity.kt | 4 +- .../block/machine/BaseAbstractMachineBlock.kt | 2 +- .../breadmod/block/machine/CraftingManager.kt | 2 +- .../block/machine/CreativeGeneratorBlock.kt | 2 +- .../block/machine/DoughMachineBlock.kt | 2 +- .../breadmod/block/machine/GeneratorBlock.kt | 2 +- .../breadmod/block/machine/ToasterBlock.kt | 2 +- .../block/machine/WheatCrusherBlock.kt | 2 +- .../machine}/AbstractMachineMenu.kt | 4 +- .../menu => menu/machine}/DoughMachineMenu.kt | 4 +- .../menu => menu/machine}/WheatCrusherMenu.kt | 4 +- .../farmer/FarmerControllerBlock.kt | 4 +- .../multiblock/farmer/FarmerInputBlock.kt | 4 +- .../multiblock/farmer/FarmerOutputBlock.kt | 4 +- .../multiblock/generic/PowerInterfaceBlock.kt | 4 +- .../block/storage/EnergyStorageBlock.kt | 2 +- .../block/storage/FluidStorageBlock.kt | 2 +- .../{ => client}/hud/ToolGunOverlay.kt | 2 +- .../{compat => client}/jei/JEIPlugin.kt | 44 ++++++++++++------- .../{compat => client}/jei/JEIUtil.kt | 2 +- .../jei/ModJEIRecipeTypes.kt | 2 +- .../category/DoughMachineRecipeCategory.kt | 14 +++--- .../jei/category/FluidEnergyRecipeCategory.kt | 2 +- .../jei/category/ToasterRecipeCategory.kt | 10 ++--- .../category/WheatCrusherRecipeCategory.kt | 10 ++--- .../JEIArmorPotionCraftingExtension.kt | 2 +- .../JEISliceCraftingExtension.kt | 4 +- .../render}/CreativeGeneratorRenderer.kt | 4 +- .../GenericMachineBlockEntityRenderer.kt | 4 +- .../render}/SidedScreenRenderer.kt | 2 +- .../render}/ToasterRenderer.kt | 4 +- .../BaseAbstractStorageBlockRenderer.kt | 4 +- .../render/storage}/EnergyStorageRenderer.kt | 4 +- .../render/storage}/FluidStorageRenderer.kt | 4 +- .../render/tool_gun}/ToolGunItemRenderer.kt | 2 +- .../render/tool_gun}/ToolGunRenderUtil.kt | 2 +- .../screen/DoughMachineScreen.kt | 4 +- .../screen/WheatCrusherScreen.kt | 4 +- .../waila}/jade/JadePlugin.kt | 2 +- .../farmersdelight/FarmersDelightPlugin.kt | 5 --- .../datagen/lang/USEnglishLanguageProvider.kt | 2 +- src/main/kotlin/breadmod/item/WrenchItem.kt | 2 +- .../breadmod/item/tool_gun/IToolGunMode.kt | 2 +- .../breadmod/item/tool_gun/ToolGunItem.kt | 2 +- .../item/tool_gun/mode/ToolGunExplodeMode.kt | 4 +- .../client/CapabilitySideDataPacket.kt | 2 +- .../network/server/ToggleMachinePacket.kt | 2 +- .../breadmod/network/server/VoidTankPacket.kt | 2 +- .../registry/block/ModBlockEntityTypes.kt | 14 +++--- .../breadmod/registry/block/ModBlocks.kt | 8 ++-- .../breadmod/registry/menu/ModMenuTypes.kt | 4 +- 65 files changed, 147 insertions(+), 141 deletions(-) rename src/main/kotlin/breadmod/block/{machine/entity => entity/machine}/AbstractMachineBlockEntity.kt (98%) rename src/main/kotlin/breadmod/block/{machine/entity => entity/machine}/CreativeGeneratorBlockEntity.kt (98%) rename src/main/kotlin/breadmod/block/{machine/entity => entity/machine}/DoughMachineBlockEntity.kt (97%) rename src/main/kotlin/breadmod/block/{machine/entity => entity/machine}/GeneratorBlockEntity.kt (99%) rename src/main/kotlin/breadmod/block/{machine/entity => entity/machine}/ToasterBlockEntity.kt (99%) rename src/main/kotlin/breadmod/block/{machine/entity => entity/machine}/WheatCrusherBlockEntity.kt (96%) rename src/main/kotlin/breadmod/block/{machine/multiblock/farmer/entity => entity/multiblock/farmer}/FarmerControllerBlockEntity.kt (87%) rename src/main/kotlin/breadmod/block/{machine/multiblock/farmer/entity => entity/multiblock/farmer}/FarmerInputBlockEntity.kt (98%) rename src/main/kotlin/breadmod/block/{machine/multiblock/farmer/entity => entity/multiblock/farmer}/FarmerOutputBlockEntity.kt (98%) rename src/main/kotlin/breadmod/block/{machine/multiblock/generic/entity => entity/multiblock/generic}/PowerInterfaceBlockEntity.kt (83%) rename src/main/kotlin/breadmod/block/{storage/entity => entity/storage}/EnergyStorageBlockEntity.kt (95%) rename src/main/kotlin/breadmod/block/{storage/entity => entity/storage}/FluidStorageBlockEntity.kt (90%) rename src/main/kotlin/breadmod/block/{machine/entity/menu => menu/machine}/AbstractMachineMenu.kt (97%) rename src/main/kotlin/breadmod/block/{machine/entity/menu => menu/machine}/DoughMachineMenu.kt (94%) rename src/main/kotlin/breadmod/block/{machine/entity/menu => menu/machine}/WheatCrusherMenu.kt (91%) rename src/main/kotlin/breadmod/block/{machine => }/multiblock/farmer/FarmerControllerBlock.kt (95%) rename src/main/kotlin/breadmod/block/{machine => }/multiblock/farmer/FarmerInputBlock.kt (94%) rename src/main/kotlin/breadmod/block/{machine => }/multiblock/farmer/FarmerOutputBlock.kt (94%) rename src/main/kotlin/breadmod/block/{machine => }/multiblock/generic/PowerInterfaceBlock.kt (90%) rename src/main/kotlin/breadmod/{ => client}/hud/ToolGunOverlay.kt (99%) rename src/main/kotlin/breadmod/{compat => client}/jei/JEIPlugin.kt (77%) rename src/main/kotlin/breadmod/{compat => client}/jei/JEIUtil.kt (98%) rename src/main/kotlin/breadmod/{compat => client}/jei/ModJEIRecipeTypes.kt (96%) rename src/main/kotlin/breadmod/{compat => client}/jei/category/DoughMachineRecipeCategory.kt (91%) rename src/main/kotlin/breadmod/{compat => client}/jei/category/FluidEnergyRecipeCategory.kt (94%) rename src/main/kotlin/breadmod/{compat => client}/jei/category/ToasterRecipeCategory.kt (92%) rename src/main/kotlin/breadmod/{compat => client}/jei/category/WheatCrusherRecipeCategory.kt (93%) rename src/main/kotlin/breadmod/{compat => client}/jei/vanillaExtension/JEIArmorPotionCraftingExtension.kt (97%) rename src/main/kotlin/breadmod/{compat => client}/jei/vanillaExtension/JEISliceCraftingExtension.kt (94%) rename src/main/kotlin/breadmod/{block/machine/entity/renderer => client/render}/CreativeGeneratorRenderer.kt (96%) rename src/main/kotlin/breadmod/{block/machine/entity/renderer => client/render}/GenericMachineBlockEntityRenderer.kt (96%) rename src/main/kotlin/breadmod/{block/entity/renderer => client/render}/SidedScreenRenderer.kt (93%) rename src/main/kotlin/breadmod/{block/machine/entity/renderer => client/render}/ToasterRenderer.kt (96%) rename src/main/kotlin/breadmod/{block/storage/entity/renderer => client/render/storage}/BaseAbstractStorageBlockRenderer.kt (93%) rename src/main/kotlin/breadmod/{block/storage/entity/renderer => client/render/storage}/EnergyStorageRenderer.kt (93%) rename src/main/kotlin/breadmod/{block/storage/entity/renderer => client/render/storage}/FluidStorageRenderer.kt (81%) rename src/main/kotlin/breadmod/{item/tool_gun/render => client/render/tool_gun}/ToolGunItemRenderer.kt (98%) rename src/main/kotlin/breadmod/{item/tool_gun/render => client/render/tool_gun}/ToolGunRenderUtil.kt (99%) rename src/main/kotlin/breadmod/{block/machine/entity => client}/screen/DoughMachineScreen.kt (98%) rename src/main/kotlin/breadmod/{block/machine/entity => client}/screen/WheatCrusherScreen.kt (97%) rename src/main/kotlin/breadmod/{compat => client/waila}/jade/JadePlugin.kt (94%) delete mode 100644 src/main/kotlin/breadmod/compat/farmersdelight/FarmersDelightPlugin.kt diff --git a/advanced/src/main/kotlin/breadmodadvanced/block/machine/entity/DieselGeneratorBlockEntity.kt b/advanced/src/main/kotlin/breadmodadvanced/block/machine/entity/DieselGeneratorBlockEntity.kt index 61db81d5..29c3711f 100644 --- a/advanced/src/main/kotlin/breadmodadvanced/block/machine/entity/DieselGeneratorBlockEntity.kt +++ b/advanced/src/main/kotlin/breadmodadvanced/block/machine/entity/DieselGeneratorBlockEntity.kt @@ -1,6 +1,6 @@ package breadmodadvanced.block.machine.entity -import breadmod.block.machine.entity.AbstractMachineBlockEntity +import breadmod.block.entity.machine.AbstractMachineBlockEntity import breadmod.block.util.getBurnTime import breadmod.util.capability.EnergyBattery import breadmod.util.capability.FluidContainer diff --git a/src/main/kotlin/breadmod/ClientModEventBus.kt b/src/main/kotlin/breadmod/ClientModEventBus.kt index afffc8ff..173ab86d 100644 --- a/src/main/kotlin/breadmod/ClientModEventBus.kt +++ b/src/main/kotlin/breadmod/ClientModEventBus.kt @@ -2,23 +2,22 @@ package breadmod import breadmod.ModMain.ID import breadmod.ModMain.modLocation -import breadmod.block.entity.renderer.SidedScreenRenderer -import breadmod.block.machine.entity.renderer.CreativeGeneratorRenderer -import breadmod.block.machine.entity.renderer.GenericMachineBlockEntityRenderer -import breadmod.block.machine.entity.screen.DoughMachineScreen -import breadmod.block.machine.entity.screen.WheatCrusherScreen -import breadmod.block.storage.entity.renderer.EnergyStorageRenderer +import breadmod.client.render.SidedScreenRenderer +import breadmod.client.render.CreativeGeneratorRenderer +import breadmod.client.render.GenericMachineBlockEntityRenderer +import breadmod.client.screen.DoughMachineScreen +import breadmod.client.screen.WheatCrusherScreen +import breadmod.client.render.storage.EnergyStorageRenderer import breadmod.datagen.tool_gun.BreadModToolGunModeProvider.Companion.TOOL_GUN_DEF import breadmod.datagen.tool_gun.BreadModToolGunModeProvider.Control import breadmod.entity.renderer.BreadBulletEntityRenderer import breadmod.entity.renderer.PrimedHappyBlockRenderer -import breadmod.hud.ToolGunOverlay +import breadmod.client.hud.ToolGunOverlay import breadmod.item.armor.BreadArmorItem import breadmod.item.armor.ArmorColor import breadmod.item.screen.CertificateScreen import breadmod.item.tool_gun.ToolGunItem.Companion.changeMode import breadmod.registry.block.ModBlockEntityTypes -import breadmod.registry.block.ModBlocks import breadmod.registry.entity.ModEntityTypes.BREAD_BULLET_ENTITY import breadmod.registry.entity.ModEntityTypes.HAPPY_BLOCK_ENTITY import breadmod.registry.item.ModItems diff --git a/src/main/kotlin/breadmod/CommonModEventBus.kt b/src/main/kotlin/breadmod/CommonModEventBus.kt index 919a1a9a..5eaeb022 100644 --- a/src/main/kotlin/breadmod/CommonModEventBus.kt +++ b/src/main/kotlin/breadmod/CommonModEventBus.kt @@ -1,7 +1,7 @@ package breadmod import breadmod.ModMain.LOGGER -import breadmod.block.machine.entity.renderer.ToasterRenderer +import breadmod.client.render.ToasterRenderer import breadmod.compat.curios.ModCuriosSlotsProvider import breadmod.compat.projecte.ModEMCProvider import breadmod.datagen.* diff --git a/src/main/kotlin/breadmod/block/machine/entity/AbstractMachineBlockEntity.kt b/src/main/kotlin/breadmod/block/entity/machine/AbstractMachineBlockEntity.kt similarity index 98% rename from src/main/kotlin/breadmod/block/machine/entity/AbstractMachineBlockEntity.kt rename to src/main/kotlin/breadmod/block/entity/machine/AbstractMachineBlockEntity.kt index 219c292a..399ee7bb 100644 --- a/src/main/kotlin/breadmod/block/machine/entity/AbstractMachineBlockEntity.kt +++ b/src/main/kotlin/breadmod/block/entity/machine/AbstractMachineBlockEntity.kt @@ -1,4 +1,4 @@ -package breadmod.block.machine.entity +package breadmod.block.entity.machine import breadmod.block.machine.CraftingManager import breadmod.network.PacketHandler.NETWORK @@ -153,7 +153,7 @@ abstract class AbstractMachineBlockEntity>( var maxProgress = 0 protected set - open fun tick(pLevel: Level, pPos: BlockPos, pState: BlockState, pBlockEntity: Progressive) { + open fun tick(pLevel: Level, pPos: BlockPos, pState: BlockState, pBlockEntity: Progressive) { preTick(pLevel, pPos, pState, pBlockEntity) currentRecipe.ifPresentOrElse({ progress++ @@ -211,7 +211,7 @@ abstract class AbstractMachineBlockEntity>( craftingWidthHeight: Pair, powerHandler: Pair>, vararg additionalCapabilities: Pair, CapabilityContainer> - ): Progressive( + ): Progressive( pType, pPos, pBlockState, @@ -222,10 +222,10 @@ abstract class AbstractMachineBlockEntity>( ForgeCapabilities.ENERGY to powerHandler, *additionalCapabilities ) { - open fun recipeTickPrePower(pLevel: Level, pPos: BlockPos, pState: BlockState, pBlockEntity: Progressive, recipe: R) {} + open fun recipeTickPrePower(pLevel: Level, pPos: BlockPos, pState: BlockState, pBlockEntity: Progressive, recipe: R) {} private var energyDivision: Int? = null - final override fun tick(pLevel: Level, pPos: BlockPos, pState: BlockState, pBlockEntity: Progressive) { + final override fun tick(pLevel: Level, pPos: BlockPos, pState: BlockState, pBlockEntity: Progressive) { preTick(pLevel, pPos, pState, pBlockEntity) currentRecipe.ifPresentOrElse({ preTick(pLevel, pPos, pState, pBlockEntity) diff --git a/src/main/kotlin/breadmod/block/machine/entity/CreativeGeneratorBlockEntity.kt b/src/main/kotlin/breadmod/block/entity/machine/CreativeGeneratorBlockEntity.kt similarity index 98% rename from src/main/kotlin/breadmod/block/machine/entity/CreativeGeneratorBlockEntity.kt rename to src/main/kotlin/breadmod/block/entity/machine/CreativeGeneratorBlockEntity.kt index 9eea6409..69297e18 100644 --- a/src/main/kotlin/breadmod/block/machine/entity/CreativeGeneratorBlockEntity.kt +++ b/src/main/kotlin/breadmod/block/entity/machine/CreativeGeneratorBlockEntity.kt @@ -1,4 +1,4 @@ -package breadmod.block.machine.entity +package breadmod.block.entity.machine import breadmod.registry.block.ModBlockEntityTypes import breadmod.util.capability.EnergyBattery diff --git a/src/main/kotlin/breadmod/block/machine/entity/DoughMachineBlockEntity.kt b/src/main/kotlin/breadmod/block/entity/machine/DoughMachineBlockEntity.kt similarity index 97% rename from src/main/kotlin/breadmod/block/machine/entity/DoughMachineBlockEntity.kt rename to src/main/kotlin/breadmod/block/entity/machine/DoughMachineBlockEntity.kt index fd5b3705..5d1c007e 100644 --- a/src/main/kotlin/breadmod/block/machine/entity/DoughMachineBlockEntity.kt +++ b/src/main/kotlin/breadmod/block/entity/machine/DoughMachineBlockEntity.kt @@ -1,7 +1,7 @@ -package breadmod.block.machine.entity +package breadmod.block.entity.machine import breadmod.ModMain.modTranslatable -import breadmod.block.machine.entity.menu.DoughMachineMenu +import breadmod.block.menu.machine.DoughMachineMenu import breadmod.recipe.fluidEnergy.DoughMachineRecipe import breadmod.registry.block.ModBlockEntityTypes import breadmod.registry.recipe.ModRecipeTypes diff --git a/src/main/kotlin/breadmod/block/machine/entity/GeneratorBlockEntity.kt b/src/main/kotlin/breadmod/block/entity/machine/GeneratorBlockEntity.kt similarity index 99% rename from src/main/kotlin/breadmod/block/machine/entity/GeneratorBlockEntity.kt rename to src/main/kotlin/breadmod/block/entity/machine/GeneratorBlockEntity.kt index 7a347540..e3a934a3 100644 --- a/src/main/kotlin/breadmod/block/machine/entity/GeneratorBlockEntity.kt +++ b/src/main/kotlin/breadmod/block/entity/machine/GeneratorBlockEntity.kt @@ -1,4 +1,4 @@ -package breadmod.block.machine.entity +package breadmod.block.entity.machine import breadmod.block.machine.CraftingManager import breadmod.registry.ModConfiguration diff --git a/src/main/kotlin/breadmod/block/machine/entity/ToasterBlockEntity.kt b/src/main/kotlin/breadmod/block/entity/machine/ToasterBlockEntity.kt similarity index 99% rename from src/main/kotlin/breadmod/block/machine/entity/ToasterBlockEntity.kt rename to src/main/kotlin/breadmod/block/entity/machine/ToasterBlockEntity.kt index 982e0fda..4e740734 100644 --- a/src/main/kotlin/breadmod/block/machine/entity/ToasterBlockEntity.kt +++ b/src/main/kotlin/breadmod/block/entity/machine/ToasterBlockEntity.kt @@ -1,4 +1,4 @@ -package breadmod.block.machine.entity +package breadmod.block.entity.machine import breadmod.recipe.fluidEnergy.ToasterRecipe import breadmod.registry.block.ModBlockEntityTypes diff --git a/src/main/kotlin/breadmod/block/machine/entity/WheatCrusherBlockEntity.kt b/src/main/kotlin/breadmod/block/entity/machine/WheatCrusherBlockEntity.kt similarity index 96% rename from src/main/kotlin/breadmod/block/machine/entity/WheatCrusherBlockEntity.kt rename to src/main/kotlin/breadmod/block/entity/machine/WheatCrusherBlockEntity.kt index 505ef506..3024fb4e 100644 --- a/src/main/kotlin/breadmod/block/machine/entity/WheatCrusherBlockEntity.kt +++ b/src/main/kotlin/breadmod/block/entity/machine/WheatCrusherBlockEntity.kt @@ -1,7 +1,7 @@ -package breadmod.block.machine.entity +package breadmod.block.entity.machine import breadmod.ModMain.modTranslatable -import breadmod.block.machine.entity.menu.WheatCrusherMenu +import breadmod.block.menu.machine.WheatCrusherMenu import breadmod.recipe.fluidEnergy.WheatCrushingRecipe import breadmod.registry.block.ModBlockEntityTypes import breadmod.registry.recipe.ModRecipeTypes diff --git a/src/main/kotlin/breadmod/block/machine/multiblock/farmer/entity/FarmerControllerBlockEntity.kt b/src/main/kotlin/breadmod/block/entity/multiblock/farmer/FarmerControllerBlockEntity.kt similarity index 87% rename from src/main/kotlin/breadmod/block/machine/multiblock/farmer/entity/FarmerControllerBlockEntity.kt rename to src/main/kotlin/breadmod/block/entity/multiblock/farmer/FarmerControllerBlockEntity.kt index 661b7c1b..2e8e6a57 100644 --- a/src/main/kotlin/breadmod/block/machine/multiblock/farmer/entity/FarmerControllerBlockEntity.kt +++ b/src/main/kotlin/breadmod/block/entity/multiblock/farmer/FarmerControllerBlockEntity.kt @@ -1,4 +1,4 @@ -package breadmod.block.machine.multiblock.farmer.entity +package breadmod.block.entity.multiblock.farmer import breadmod.registry.block.ModBlockEntityTypes import net.minecraft.core.BlockPos diff --git a/src/main/kotlin/breadmod/block/machine/multiblock/farmer/entity/FarmerInputBlockEntity.kt b/src/main/kotlin/breadmod/block/entity/multiblock/farmer/FarmerInputBlockEntity.kt similarity index 98% rename from src/main/kotlin/breadmod/block/machine/multiblock/farmer/entity/FarmerInputBlockEntity.kt rename to src/main/kotlin/breadmod/block/entity/multiblock/farmer/FarmerInputBlockEntity.kt index 08bd5a87..5e050626 100644 --- a/src/main/kotlin/breadmod/block/machine/multiblock/farmer/entity/FarmerInputBlockEntity.kt +++ b/src/main/kotlin/breadmod/block/entity/multiblock/farmer/FarmerInputBlockEntity.kt @@ -1,4 +1,4 @@ -package breadmod.block.machine.multiblock.farmer.entity +package breadmod.block.entity.multiblock.farmer import breadmod.ModMain import breadmod.registry.block.ModBlockEntityTypes diff --git a/src/main/kotlin/breadmod/block/machine/multiblock/farmer/entity/FarmerOutputBlockEntity.kt b/src/main/kotlin/breadmod/block/entity/multiblock/farmer/FarmerOutputBlockEntity.kt similarity index 98% rename from src/main/kotlin/breadmod/block/machine/multiblock/farmer/entity/FarmerOutputBlockEntity.kt rename to src/main/kotlin/breadmod/block/entity/multiblock/farmer/FarmerOutputBlockEntity.kt index 596533f0..32694ef7 100644 --- a/src/main/kotlin/breadmod/block/machine/multiblock/farmer/entity/FarmerOutputBlockEntity.kt +++ b/src/main/kotlin/breadmod/block/entity/multiblock/farmer/FarmerOutputBlockEntity.kt @@ -1,4 +1,4 @@ -package breadmod.block.machine.multiblock.farmer.entity +package breadmod.block.entity.multiblock.farmer import breadmod.ModMain import breadmod.registry.block.ModBlockEntityTypes diff --git a/src/main/kotlin/breadmod/block/machine/multiblock/generic/entity/PowerInterfaceBlockEntity.kt b/src/main/kotlin/breadmod/block/entity/multiblock/generic/PowerInterfaceBlockEntity.kt similarity index 83% rename from src/main/kotlin/breadmod/block/machine/multiblock/generic/entity/PowerInterfaceBlockEntity.kt rename to src/main/kotlin/breadmod/block/entity/multiblock/generic/PowerInterfaceBlockEntity.kt index e00a940b..a4f5a2c2 100644 --- a/src/main/kotlin/breadmod/block/machine/multiblock/generic/entity/PowerInterfaceBlockEntity.kt +++ b/src/main/kotlin/breadmod/block/entity/multiblock/generic/PowerInterfaceBlockEntity.kt @@ -1,6 +1,6 @@ -package breadmod.block.machine.multiblock.generic.entity +package breadmod.block.entity.multiblock.generic -import breadmod.block.machine.entity.AbstractMachineBlockEntity +import breadmod.block.entity.machine.AbstractMachineBlockEntity import breadmod.registry.block.ModBlockEntityTypes import breadmod.util.capability.CapabilityHolder.Companion.ACCEPT_ALL import breadmod.util.capability.EnergyBattery diff --git a/src/main/kotlin/breadmod/block/storage/entity/EnergyStorageBlockEntity.kt b/src/main/kotlin/breadmod/block/entity/storage/EnergyStorageBlockEntity.kt similarity index 95% rename from src/main/kotlin/breadmod/block/storage/entity/EnergyStorageBlockEntity.kt rename to src/main/kotlin/breadmod/block/entity/storage/EnergyStorageBlockEntity.kt index d62d6751..598fd193 100644 --- a/src/main/kotlin/breadmod/block/storage/entity/EnergyStorageBlockEntity.kt +++ b/src/main/kotlin/breadmod/block/entity/storage/EnergyStorageBlockEntity.kt @@ -1,6 +1,6 @@ -package breadmod.block.storage.entity +package breadmod.block.entity.storage -import breadmod.block.machine.entity.AbstractMachineBlockEntity +import breadmod.block.entity.machine.AbstractMachineBlockEntity import breadmod.block.util.ModBlockStateProperties import breadmod.registry.block.ModBlockEntityTypes import breadmod.util.capability.CapabilityHolder.Companion.ACCEPT_ALL diff --git a/src/main/kotlin/breadmod/block/storage/entity/FluidStorageBlockEntity.kt b/src/main/kotlin/breadmod/block/entity/storage/FluidStorageBlockEntity.kt similarity index 90% rename from src/main/kotlin/breadmod/block/storage/entity/FluidStorageBlockEntity.kt rename to src/main/kotlin/breadmod/block/entity/storage/FluidStorageBlockEntity.kt index fcebad52..141963df 100644 --- a/src/main/kotlin/breadmod/block/storage/entity/FluidStorageBlockEntity.kt +++ b/src/main/kotlin/breadmod/block/entity/storage/FluidStorageBlockEntity.kt @@ -1,6 +1,6 @@ -package breadmod.block.storage.entity +package breadmod.block.entity.storage -import breadmod.block.machine.entity.AbstractMachineBlockEntity +import breadmod.block.entity.machine.AbstractMachineBlockEntity import breadmod.registry.block.ModBlockEntityTypes import breadmod.util.capability.CapabilityHolder.Companion.ACCEPT_ALL import breadmod.util.capability.FluidContainer diff --git a/src/main/kotlin/breadmod/block/machine/BaseAbstractMachineBlock.kt b/src/main/kotlin/breadmod/block/machine/BaseAbstractMachineBlock.kt index fbca591e..8a1160ed 100644 --- a/src/main/kotlin/breadmod/block/machine/BaseAbstractMachineBlock.kt +++ b/src/main/kotlin/breadmod/block/machine/BaseAbstractMachineBlock.kt @@ -1,6 +1,6 @@ package breadmod.block.machine -import breadmod.block.machine.entity.AbstractMachineBlockEntity +import breadmod.block.entity.machine.AbstractMachineBlockEntity import net.minecraft.core.BlockPos import net.minecraft.world.level.Level import net.minecraft.world.level.block.Block diff --git a/src/main/kotlin/breadmod/block/machine/CraftingManager.kt b/src/main/kotlin/breadmod/block/machine/CraftingManager.kt index 9fc1c3fe..b9f0398c 100644 --- a/src/main/kotlin/breadmod/block/machine/CraftingManager.kt +++ b/src/main/kotlin/breadmod/block/machine/CraftingManager.kt @@ -1,6 +1,6 @@ package breadmod.block.machine -import breadmod.block.machine.entity.AbstractMachineBlockEntity +import breadmod.block.entity.machine.AbstractMachineBlockEntity import breadmod.util.capability.IndexableItemHandler import net.minecraft.world.entity.player.Player import net.minecraft.world.entity.player.StackedContents diff --git a/src/main/kotlin/breadmod/block/machine/CreativeGeneratorBlock.kt b/src/main/kotlin/breadmod/block/machine/CreativeGeneratorBlock.kt index 17c811c7..632aeeec 100644 --- a/src/main/kotlin/breadmod/block/machine/CreativeGeneratorBlock.kt +++ b/src/main/kotlin/breadmod/block/machine/CreativeGeneratorBlock.kt @@ -1,6 +1,6 @@ package breadmod.block.machine -import breadmod.block.machine.entity.CreativeGeneratorBlockEntity +import breadmod.block.entity.machine.CreativeGeneratorBlockEntity import breadmod.registry.block.ModBlockEntityTypes import net.minecraft.core.BlockPos import net.minecraft.sounds.SoundEvents diff --git a/src/main/kotlin/breadmod/block/machine/DoughMachineBlock.kt b/src/main/kotlin/breadmod/block/machine/DoughMachineBlock.kt index f89db40e..14bcd75c 100644 --- a/src/main/kotlin/breadmod/block/machine/DoughMachineBlock.kt +++ b/src/main/kotlin/breadmod/block/machine/DoughMachineBlock.kt @@ -1,6 +1,6 @@ package breadmod.block.machine -import breadmod.block.machine.entity.DoughMachineBlockEntity +import breadmod.block.entity.machine.DoughMachineBlockEntity import breadmod.block.util.handlePlayerFluidInteraction import breadmod.registry.block.ModBlockEntityTypes import breadmod.registry.block.ModBlocks diff --git a/src/main/kotlin/breadmod/block/machine/GeneratorBlock.kt b/src/main/kotlin/breadmod/block/machine/GeneratorBlock.kt index 546efdfc..762e4653 100644 --- a/src/main/kotlin/breadmod/block/machine/GeneratorBlock.kt +++ b/src/main/kotlin/breadmod/block/machine/GeneratorBlock.kt @@ -1,6 +1,6 @@ package breadmod.block.machine -import breadmod.block.machine.entity.GeneratorBlockEntity +import breadmod.block.entity.machine.GeneratorBlockEntity import breadmod.block.util.smokeAtEdge import breadmod.registry.block.ModBlockEntityTypes import net.minecraft.core.BlockPos diff --git a/src/main/kotlin/breadmod/block/machine/ToasterBlock.kt b/src/main/kotlin/breadmod/block/machine/ToasterBlock.kt index 85ea934b..62ad55bd 100644 --- a/src/main/kotlin/breadmod/block/machine/ToasterBlock.kt +++ b/src/main/kotlin/breadmod/block/machine/ToasterBlock.kt @@ -1,7 +1,7 @@ package breadmod.block.machine import breadmod.ModMain -import breadmod.block.machine.entity.ToasterBlockEntity +import breadmod.block.entity.machine.ToasterBlockEntity import breadmod.datagen.tag.ModItemTags import breadmod.registry.block.ModBlockEntityTypes import breadmod.util.capability.IndexableItemHandler diff --git a/src/main/kotlin/breadmod/block/machine/WheatCrusherBlock.kt b/src/main/kotlin/breadmod/block/machine/WheatCrusherBlock.kt index b86f422f..fe9d7137 100644 --- a/src/main/kotlin/breadmod/block/machine/WheatCrusherBlock.kt +++ b/src/main/kotlin/breadmod/block/machine/WheatCrusherBlock.kt @@ -1,6 +1,6 @@ package breadmod.block.machine -import breadmod.block.machine.entity.WheatCrusherBlockEntity +import breadmod.block.entity.machine.WheatCrusherBlockEntity import breadmod.registry.block.ModBlockEntityTypes import net.minecraft.core.BlockPos import net.minecraft.server.level.ServerPlayer diff --git a/src/main/kotlin/breadmod/block/machine/entity/menu/AbstractMachineMenu.kt b/src/main/kotlin/breadmod/block/menu/machine/AbstractMachineMenu.kt similarity index 97% rename from src/main/kotlin/breadmod/block/machine/entity/menu/AbstractMachineMenu.kt rename to src/main/kotlin/breadmod/block/menu/machine/AbstractMachineMenu.kt index 2128bfd8..ba72ee06 100644 --- a/src/main/kotlin/breadmod/block/machine/entity/menu/AbstractMachineMenu.kt +++ b/src/main/kotlin/breadmod/block/menu/machine/AbstractMachineMenu.kt @@ -1,6 +1,6 @@ -package breadmod.block.machine.entity.menu +package breadmod.block.menu.machine -import breadmod.block.machine.entity.AbstractMachineBlockEntity +import breadmod.block.entity.machine.AbstractMachineBlockEntity import breadmod.recipe.fluidEnergy.FluidEnergyRecipe import breadmod.util.capability.EnergyBattery import net.minecraft.world.entity.player.Inventory diff --git a/src/main/kotlin/breadmod/block/machine/entity/menu/DoughMachineMenu.kt b/src/main/kotlin/breadmod/block/menu/machine/DoughMachineMenu.kt similarity index 94% rename from src/main/kotlin/breadmod/block/machine/entity/menu/DoughMachineMenu.kt rename to src/main/kotlin/breadmod/block/menu/machine/DoughMachineMenu.kt index 15f8f938..457aac47 100644 --- a/src/main/kotlin/breadmod/block/machine/entity/menu/DoughMachineMenu.kt +++ b/src/main/kotlin/breadmod/block/menu/machine/DoughMachineMenu.kt @@ -1,6 +1,6 @@ -package breadmod.block.machine.entity.menu +package breadmod.block.menu.machine -import breadmod.block.machine.entity.DoughMachineBlockEntity +import breadmod.block.entity.machine.DoughMachineBlockEntity import breadmod.recipe.fluidEnergy.DoughMachineRecipe import breadmod.registry.block.ModBlockEntityTypes import breadmod.registry.menu.ModMenuTypes diff --git a/src/main/kotlin/breadmod/block/machine/entity/menu/WheatCrusherMenu.kt b/src/main/kotlin/breadmod/block/menu/machine/WheatCrusherMenu.kt similarity index 91% rename from src/main/kotlin/breadmod/block/machine/entity/menu/WheatCrusherMenu.kt rename to src/main/kotlin/breadmod/block/menu/machine/WheatCrusherMenu.kt index bf814677..6b02654f 100644 --- a/src/main/kotlin/breadmod/block/machine/entity/menu/WheatCrusherMenu.kt +++ b/src/main/kotlin/breadmod/block/menu/machine/WheatCrusherMenu.kt @@ -1,6 +1,6 @@ -package breadmod.block.machine.entity.menu +package breadmod.block.menu.machine -import breadmod.block.machine.entity.WheatCrusherBlockEntity +import breadmod.block.entity.machine.WheatCrusherBlockEntity import breadmod.recipe.fluidEnergy.WheatCrushingRecipe import breadmod.registry.block.ModBlockEntityTypes import breadmod.registry.menu.ModMenuTypes diff --git a/src/main/kotlin/breadmod/block/machine/multiblock/farmer/FarmerControllerBlock.kt b/src/main/kotlin/breadmod/block/multiblock/farmer/FarmerControllerBlock.kt similarity index 95% rename from src/main/kotlin/breadmod/block/machine/multiblock/farmer/FarmerControllerBlock.kt rename to src/main/kotlin/breadmod/block/multiblock/farmer/FarmerControllerBlock.kt index 5b03eba8..eff4c2a5 100644 --- a/src/main/kotlin/breadmod/block/machine/multiblock/farmer/FarmerControllerBlock.kt +++ b/src/main/kotlin/breadmod/block/multiblock/farmer/FarmerControllerBlock.kt @@ -1,6 +1,6 @@ -package breadmod.block.machine.multiblock.farmer +package breadmod.block.multiblock.farmer -import breadmod.block.machine.multiblock.generic.entity.PowerInterfaceBlockEntity +import breadmod.block.entity.multiblock.generic.PowerInterfaceBlockEntity import breadmod.registry.block.ModBlocks import net.minecraft.core.BlockPos import net.minecraft.core.Direction diff --git a/src/main/kotlin/breadmod/block/machine/multiblock/farmer/FarmerInputBlock.kt b/src/main/kotlin/breadmod/block/multiblock/farmer/FarmerInputBlock.kt similarity index 94% rename from src/main/kotlin/breadmod/block/machine/multiblock/farmer/FarmerInputBlock.kt rename to src/main/kotlin/breadmod/block/multiblock/farmer/FarmerInputBlock.kt index 5b0eb357..00690246 100644 --- a/src/main/kotlin/breadmod/block/machine/multiblock/farmer/FarmerInputBlock.kt +++ b/src/main/kotlin/breadmod/block/multiblock/farmer/FarmerInputBlock.kt @@ -1,6 +1,6 @@ -package breadmod.block.machine.multiblock.farmer +package breadmod.block.multiblock.farmer -import breadmod.block.machine.multiblock.farmer.entity.FarmerInputBlockEntity +import breadmod.block.entity.multiblock.farmer.FarmerInputBlockEntity import net.minecraft.core.BlockPos import net.minecraft.core.Direction import net.minecraft.world.Containers diff --git a/src/main/kotlin/breadmod/block/machine/multiblock/farmer/FarmerOutputBlock.kt b/src/main/kotlin/breadmod/block/multiblock/farmer/FarmerOutputBlock.kt similarity index 94% rename from src/main/kotlin/breadmod/block/machine/multiblock/farmer/FarmerOutputBlock.kt rename to src/main/kotlin/breadmod/block/multiblock/farmer/FarmerOutputBlock.kt index a0808937..c050ce2e 100644 --- a/src/main/kotlin/breadmod/block/machine/multiblock/farmer/FarmerOutputBlock.kt +++ b/src/main/kotlin/breadmod/block/multiblock/farmer/FarmerOutputBlock.kt @@ -1,6 +1,6 @@ -package breadmod.block.machine.multiblock.farmer +package breadmod.block.multiblock.farmer -import breadmod.block.machine.multiblock.farmer.entity.FarmerOutputBlockEntity +import breadmod.block.entity.multiblock.farmer.FarmerOutputBlockEntity import net.minecraft.core.BlockPos import net.minecraft.core.Direction import net.minecraft.world.Containers diff --git a/src/main/kotlin/breadmod/block/machine/multiblock/generic/PowerInterfaceBlock.kt b/src/main/kotlin/breadmod/block/multiblock/generic/PowerInterfaceBlock.kt similarity index 90% rename from src/main/kotlin/breadmod/block/machine/multiblock/generic/PowerInterfaceBlock.kt rename to src/main/kotlin/breadmod/block/multiblock/generic/PowerInterfaceBlock.kt index 31cd5737..2e325dab 100644 --- a/src/main/kotlin/breadmod/block/machine/multiblock/generic/PowerInterfaceBlock.kt +++ b/src/main/kotlin/breadmod/block/multiblock/generic/PowerInterfaceBlock.kt @@ -1,6 +1,6 @@ -package breadmod.block.machine.multiblock.generic +package breadmod.block.multiblock.generic -import breadmod.block.machine.multiblock.generic.entity.PowerInterfaceBlockEntity +import breadmod.block.entity.multiblock.generic.PowerInterfaceBlockEntity import net.minecraft.core.BlockPos import net.minecraft.core.Direction import net.minecraft.world.item.context.BlockPlaceContext diff --git a/src/main/kotlin/breadmod/block/storage/EnergyStorageBlock.kt b/src/main/kotlin/breadmod/block/storage/EnergyStorageBlock.kt index 1e713308..53a427c5 100644 --- a/src/main/kotlin/breadmod/block/storage/EnergyStorageBlock.kt +++ b/src/main/kotlin/breadmod/block/storage/EnergyStorageBlock.kt @@ -2,7 +2,7 @@ package breadmod.block.storage import breadmod.block.util.ModBlockStateProperties import breadmod.block.machine.BaseAbstractMachineBlock -import breadmod.block.storage.entity.EnergyStorageBlockEntity +import breadmod.block.entity.storage.EnergyStorageBlockEntity import breadmod.registry.block.ModBlockEntityTypes import net.minecraft.world.item.context.BlockPlaceContext import net.minecraft.world.level.Level diff --git a/src/main/kotlin/breadmod/block/storage/FluidStorageBlock.kt b/src/main/kotlin/breadmod/block/storage/FluidStorageBlock.kt index 17c6d47b..d1a7d970 100644 --- a/src/main/kotlin/breadmod/block/storage/FluidStorageBlock.kt +++ b/src/main/kotlin/breadmod/block/storage/FluidStorageBlock.kt @@ -1,7 +1,7 @@ package breadmod.block.storage import breadmod.block.machine.BaseAbstractMachineBlock -import breadmod.block.storage.entity.FluidStorageBlockEntity +import breadmod.block.entity.storage.FluidStorageBlockEntity import breadmod.block.util.ModBlockStateProperties import breadmod.registry.block.ModBlockEntityTypes import net.minecraft.world.item.context.BlockPlaceContext diff --git a/src/main/kotlin/breadmod/hud/ToolGunOverlay.kt b/src/main/kotlin/breadmod/client/hud/ToolGunOverlay.kt similarity index 99% rename from src/main/kotlin/breadmod/hud/ToolGunOverlay.kt rename to src/main/kotlin/breadmod/client/hud/ToolGunOverlay.kt index f60e848f..f8d1a9e8 100644 --- a/src/main/kotlin/breadmod/hud/ToolGunOverlay.kt +++ b/src/main/kotlin/breadmod/client/hud/ToolGunOverlay.kt @@ -1,4 +1,4 @@ -package breadmod.hud +package breadmod.client.hud import breadmod.ClientModEventBus.toolGunBindList import breadmod.ModMain.modLocation diff --git a/src/main/kotlin/breadmod/compat/jei/JEIPlugin.kt b/src/main/kotlin/breadmod/client/jei/JEIPlugin.kt similarity index 77% rename from src/main/kotlin/breadmod/compat/jei/JEIPlugin.kt rename to src/main/kotlin/breadmod/client/jei/JEIPlugin.kt index 772dbf85..b61de6d6 100644 --- a/src/main/kotlin/breadmod/compat/jei/JEIPlugin.kt +++ b/src/main/kotlin/breadmod/client/jei/JEIPlugin.kt @@ -1,15 +1,15 @@ -package breadmod.compat.jei +package breadmod.client.jei import breadmod.ModMain -import breadmod.block.machine.entity.menu.DoughMachineMenu -import breadmod.block.machine.entity.screen.DoughMachineScreen -import breadmod.block.machine.entity.menu.WheatCrusherMenu -import breadmod.block.machine.entity.screen.WheatCrusherScreen -import breadmod.compat.jei.category.DoughMachineRecipeCategory -import breadmod.compat.jei.category.ToasterRecipeCategory -import breadmod.compat.jei.category.WheatCrusherRecipeCategory -import breadmod.compat.jei.vanillaExtension.JEIArmorPotionCraftingExtension -import breadmod.compat.jei.vanillaExtension.JEISliceCraftingExtension +import breadmod.block.menu.machine.DoughMachineMenu +import breadmod.client.screen.DoughMachineScreen +import breadmod.block.menu.machine.WheatCrusherMenu +import breadmod.client.screen.WheatCrusherScreen +import breadmod.client.jei.category.DoughMachineRecipeCategory +import breadmod.client.jei.category.ToasterRecipeCategory +import breadmod.client.jei.category.WheatCrusherRecipeCategory +import breadmod.client.jei.vanillaExtension.JEIArmorPotionCraftingExtension +import breadmod.client.jei.vanillaExtension.JEISliceCraftingExtension import breadmod.recipe.crafting.ArmorPotionRecipe import breadmod.recipe.crafting.BreadSliceRecipe import breadmod.recipe.crafting.ToastedBreadSliceRecipe @@ -34,9 +34,11 @@ class JEIPlugin : IModPlugin { override fun registerVanillaCategoryExtensions(registration: IVanillaCategoryExtensionRegistration) { registration.craftingCategory.addCategoryExtension(ArmorPotionRecipe::class.java) { JEIArmorPotionCraftingExtension(it) } registration.craftingCategory.addCategoryExtension(BreadSliceRecipe::class.java) { JEISliceCraftingExtension( - Items.BREAD, ModItems.BREAD_SLICE.get(), 1, 8, 8, 8)} + Items.BREAD, ModItems.BREAD_SLICE.get(), 1, 8, 8, 8) + } registration.craftingCategory.addCategoryExtension(ToastedBreadSliceRecipe::class.java) { JEISliceCraftingExtension( - ModItems.TOASTED_BREAD.get(), ModItems.TOAST_SLICE.get(), 1, 8, 8, 8)} + ModItems.TOASTED_BREAD.get(), ModItems.TOAST_SLICE.get(), 1, 8, 8, 8) + } } override fun registerCategories(registration: IRecipeCategoryRegistration) { @@ -49,8 +51,12 @@ class JEIPlugin : IModPlugin { } override fun registerRecipeCatalysts(registration: IRecipeCatalystRegistration) { - registration.addRecipeCatalyst(ModBlocks.DOUGH_MACHINE_BLOCK.get().defaultInstance, ModJEIRecipeTypes.doughMachineRecipeType) - registration.addRecipeCatalyst(ModBlocks.WHEAT_CRUSHER_BLOCK.get().defaultInstance, ModJEIRecipeTypes.wheatCrusherRecipeType) + registration.addRecipeCatalyst(ModBlocks.DOUGH_MACHINE_BLOCK.get().defaultInstance, + ModJEIRecipeTypes.doughMachineRecipeType + ) + registration.addRecipeCatalyst(ModBlocks.WHEAT_CRUSHER_BLOCK.get().defaultInstance, + ModJEIRecipeTypes.wheatCrusherRecipeType + ) registration.addRecipeCatalyst(ModBlocks.TOASTER.get().defaultInstance, ModJEIRecipeTypes.toasterRecipeType) } @@ -68,8 +74,14 @@ class JEIPlugin : IModPlugin { } override fun registerGuiHandlers(registration: IGuiHandlerRegistration) { - registration.addRecipeClickArea(DoughMachineScreen::class.java, 47, 34, 23, 17, ModJEIRecipeTypes.doughMachineRecipeType) - registration.addRecipeClickArea(WheatCrusherScreen::class.java, 84, 34, 7, 48, ModJEIRecipeTypes.wheatCrusherRecipeType) + registration.addRecipeClickArea( + DoughMachineScreen::class.java, 47, 34, 23, 17, + ModJEIRecipeTypes.doughMachineRecipeType + ) + registration.addRecipeClickArea( + WheatCrusherScreen::class.java, 84, 34, 7, 48, + ModJEIRecipeTypes.wheatCrusherRecipeType + ) } override fun registerRecipeTransferHandlers(registration: IRecipeTransferRegistration) { diff --git a/src/main/kotlin/breadmod/compat/jei/JEIUtil.kt b/src/main/kotlin/breadmod/client/jei/JEIUtil.kt similarity index 98% rename from src/main/kotlin/breadmod/compat/jei/JEIUtil.kt rename to src/main/kotlin/breadmod/client/jei/JEIUtil.kt index 3f98bf53..ba0da7f8 100644 --- a/src/main/kotlin/breadmod/compat/jei/JEIUtil.kt +++ b/src/main/kotlin/breadmod/client/jei/JEIUtil.kt @@ -1,4 +1,4 @@ -package breadmod.compat.jei +package breadmod.client.jei import breadmod.ModMain import breadmod.recipe.fluidEnergy.FluidEnergyRecipe diff --git a/src/main/kotlin/breadmod/compat/jei/ModJEIRecipeTypes.kt b/src/main/kotlin/breadmod/client/jei/ModJEIRecipeTypes.kt similarity index 96% rename from src/main/kotlin/breadmod/compat/jei/ModJEIRecipeTypes.kt rename to src/main/kotlin/breadmod/client/jei/ModJEIRecipeTypes.kt index 6d0af1ac..078b31a3 100644 --- a/src/main/kotlin/breadmod/compat/jei/ModJEIRecipeTypes.kt +++ b/src/main/kotlin/breadmod/client/jei/ModJEIRecipeTypes.kt @@ -1,4 +1,4 @@ -package breadmod.compat.jei +package breadmod.client.jei import breadmod.ModMain import breadmod.recipe.fluidEnergy.DoughMachineRecipe diff --git a/src/main/kotlin/breadmod/compat/jei/category/DoughMachineRecipeCategory.kt b/src/main/kotlin/breadmod/client/jei/category/DoughMachineRecipeCategory.kt similarity index 91% rename from src/main/kotlin/breadmod/compat/jei/category/DoughMachineRecipeCategory.kt rename to src/main/kotlin/breadmod/client/jei/category/DoughMachineRecipeCategory.kt index 692f0240..da40474f 100644 --- a/src/main/kotlin/breadmod/compat/jei/category/DoughMachineRecipeCategory.kt +++ b/src/main/kotlin/breadmod/client/jei/category/DoughMachineRecipeCategory.kt @@ -1,12 +1,12 @@ -package breadmod.compat.jei.category +package breadmod.client.jei.category import breadmod.ModMain.modLocation -import breadmod.block.machine.entity.DoughMachineBlockEntity.Companion.INPUT_TANK_CAPACITY -import breadmod.block.machine.entity.DoughMachineBlockEntity.Companion.OUTPUT_TANK_CAPACITY -import breadmod.compat.jei.ModJEIRecipeTypes -import breadmod.compat.jei.createCachedArrows -import breadmod.compat.jei.drawArrow -import breadmod.compat.jei.drawRecipeTime +import breadmod.block.entity.machine.DoughMachineBlockEntity.Companion.INPUT_TANK_CAPACITY +import breadmod.block.entity.machine.DoughMachineBlockEntity.Companion.OUTPUT_TANK_CAPACITY +import breadmod.client.jei.ModJEIRecipeTypes +import breadmod.client.jei.createCachedArrows +import breadmod.client.jei.drawArrow +import breadmod.client.jei.drawRecipeTime import breadmod.recipe.fluidEnergy.DoughMachineRecipe import breadmod.registry.block.ModBlocks import breadmod.util.isTag diff --git a/src/main/kotlin/breadmod/compat/jei/category/FluidEnergyRecipeCategory.kt b/src/main/kotlin/breadmod/client/jei/category/FluidEnergyRecipeCategory.kt similarity index 94% rename from src/main/kotlin/breadmod/compat/jei/category/FluidEnergyRecipeCategory.kt rename to src/main/kotlin/breadmod/client/jei/category/FluidEnergyRecipeCategory.kt index 26cd424d..e214bf4d 100644 --- a/src/main/kotlin/breadmod/compat/jei/category/FluidEnergyRecipeCategory.kt +++ b/src/main/kotlin/breadmod/client/jei/category/FluidEnergyRecipeCategory.kt @@ -1,4 +1,4 @@ -package breadmod.compat.jei.category +package breadmod.client.jei.category import breadmod.recipe.fluidEnergy.FluidEnergyRecipe diff --git a/src/main/kotlin/breadmod/compat/jei/category/ToasterRecipeCategory.kt b/src/main/kotlin/breadmod/client/jei/category/ToasterRecipeCategory.kt similarity index 92% rename from src/main/kotlin/breadmod/compat/jei/category/ToasterRecipeCategory.kt rename to src/main/kotlin/breadmod/client/jei/category/ToasterRecipeCategory.kt index 015adc04..1a21805f 100644 --- a/src/main/kotlin/breadmod/compat/jei/category/ToasterRecipeCategory.kt +++ b/src/main/kotlin/breadmod/client/jei/category/ToasterRecipeCategory.kt @@ -1,10 +1,10 @@ -package breadmod.compat.jei.category +package breadmod.client.jei.category import breadmod.ModMain.modLocation -import breadmod.compat.jei.ModJEIRecipeTypes -import breadmod.compat.jei.createCachedArrows -import breadmod.compat.jei.drawArrow -import breadmod.compat.jei.drawRecipeTime +import breadmod.client.jei.ModJEIRecipeTypes +import breadmod.client.jei.createCachedArrows +import breadmod.client.jei.drawArrow +import breadmod.client.jei.drawRecipeTime import breadmod.recipe.fluidEnergy.ToasterRecipe import breadmod.registry.block.ModBlocks import mezz.jei.api.gui.builder.IRecipeLayoutBuilder diff --git a/src/main/kotlin/breadmod/compat/jei/category/WheatCrusherRecipeCategory.kt b/src/main/kotlin/breadmod/client/jei/category/WheatCrusherRecipeCategory.kt similarity index 93% rename from src/main/kotlin/breadmod/compat/jei/category/WheatCrusherRecipeCategory.kt rename to src/main/kotlin/breadmod/client/jei/category/WheatCrusherRecipeCategory.kt index 5f391371..60d4791c 100644 --- a/src/main/kotlin/breadmod/compat/jei/category/WheatCrusherRecipeCategory.kt +++ b/src/main/kotlin/breadmod/client/jei/category/WheatCrusherRecipeCategory.kt @@ -1,10 +1,10 @@ -package breadmod.compat.jei.category +package breadmod.client.jei.category import breadmod.ModMain.modLocation -import breadmod.compat.jei.ModJEIRecipeTypes -import breadmod.compat.jei.createCachedArrows -import breadmod.compat.jei.drawArrow -import breadmod.compat.jei.drawRecipeTime +import breadmod.client.jei.ModJEIRecipeTypes +import breadmod.client.jei.createCachedArrows +import breadmod.client.jei.drawArrow +import breadmod.client.jei.drawRecipeTime import breadmod.recipe.fluidEnergy.WheatCrushingRecipe import breadmod.registry.block.ModBlocks import mezz.jei.api.gui.builder.IRecipeLayoutBuilder diff --git a/src/main/kotlin/breadmod/compat/jei/vanillaExtension/JEIArmorPotionCraftingExtension.kt b/src/main/kotlin/breadmod/client/jei/vanillaExtension/JEIArmorPotionCraftingExtension.kt similarity index 97% rename from src/main/kotlin/breadmod/compat/jei/vanillaExtension/JEIArmorPotionCraftingExtension.kt rename to src/main/kotlin/breadmod/client/jei/vanillaExtension/JEIArmorPotionCraftingExtension.kt index 831b84d6..a9be8b93 100644 --- a/src/main/kotlin/breadmod/compat/jei/vanillaExtension/JEIArmorPotionCraftingExtension.kt +++ b/src/main/kotlin/breadmod/client/jei/vanillaExtension/JEIArmorPotionCraftingExtension.kt @@ -1,4 +1,4 @@ -package breadmod.compat.jei.vanillaExtension +package breadmod.client.jei.vanillaExtension import breadmod.recipe.crafting.ArmorPotionRecipe import breadmod.registry.item.ModItems diff --git a/src/main/kotlin/breadmod/compat/jei/vanillaExtension/JEISliceCraftingExtension.kt b/src/main/kotlin/breadmod/client/jei/vanillaExtension/JEISliceCraftingExtension.kt similarity index 94% rename from src/main/kotlin/breadmod/compat/jei/vanillaExtension/JEISliceCraftingExtension.kt rename to src/main/kotlin/breadmod/client/jei/vanillaExtension/JEISliceCraftingExtension.kt index af545a94..adcff017 100644 --- a/src/main/kotlin/breadmod/compat/jei/vanillaExtension/JEISliceCraftingExtension.kt +++ b/src/main/kotlin/breadmod/client/jei/vanillaExtension/JEISliceCraftingExtension.kt @@ -1,6 +1,6 @@ -package breadmod.compat.jei.vanillaExtension +package breadmod.client.jei.vanillaExtension -import breadmod.compat.jei.recipeList +import breadmod.client.jei.recipeList import mezz.jei.api.gui.builder.IRecipeLayoutBuilder import mezz.jei.api.gui.ingredient.ICraftingGridHelper import mezz.jei.api.recipe.IFocusGroup diff --git a/src/main/kotlin/breadmod/block/machine/entity/renderer/CreativeGeneratorRenderer.kt b/src/main/kotlin/breadmod/client/render/CreativeGeneratorRenderer.kt similarity index 96% rename from src/main/kotlin/breadmod/block/machine/entity/renderer/CreativeGeneratorRenderer.kt rename to src/main/kotlin/breadmod/client/render/CreativeGeneratorRenderer.kt index f58f8b54..8b20099a 100644 --- a/src/main/kotlin/breadmod/block/machine/entity/renderer/CreativeGeneratorRenderer.kt +++ b/src/main/kotlin/breadmod/client/render/CreativeGeneratorRenderer.kt @@ -1,8 +1,8 @@ -package breadmod.block.machine.entity.renderer +package breadmod.client.render import breadmod.ClientModEventBus import breadmod.ModMain.modLocation -import breadmod.block.machine.entity.CreativeGeneratorBlockEntity +import breadmod.block.entity.machine.CreativeGeneratorBlockEntity import breadmod.util.render.renderBlockModel import com.mojang.blaze3d.vertex.PoseStack import com.mojang.math.Axis diff --git a/src/main/kotlin/breadmod/block/machine/entity/renderer/GenericMachineBlockEntityRenderer.kt b/src/main/kotlin/breadmod/client/render/GenericMachineBlockEntityRenderer.kt similarity index 96% rename from src/main/kotlin/breadmod/block/machine/entity/renderer/GenericMachineBlockEntityRenderer.kt rename to src/main/kotlin/breadmod/client/render/GenericMachineBlockEntityRenderer.kt index 5bc8c81b..2ec3b3a1 100644 --- a/src/main/kotlin/breadmod/block/machine/entity/renderer/GenericMachineBlockEntityRenderer.kt +++ b/src/main/kotlin/breadmod/client/render/GenericMachineBlockEntityRenderer.kt @@ -1,7 +1,7 @@ -package breadmod.block.machine.entity.renderer +package breadmod.client.render import breadmod.ModMain.modLocation -import breadmod.block.machine.entity.AbstractMachineBlockEntity +import breadmod.block.entity.machine.AbstractMachineBlockEntity import breadmod.util.render.texturedQuadTest import breadmod.util.render.translateOnBlockSide import com.mojang.blaze3d.vertex.PoseStack diff --git a/src/main/kotlin/breadmod/block/entity/renderer/SidedScreenRenderer.kt b/src/main/kotlin/breadmod/client/render/SidedScreenRenderer.kt similarity index 93% rename from src/main/kotlin/breadmod/block/entity/renderer/SidedScreenRenderer.kt rename to src/main/kotlin/breadmod/client/render/SidedScreenRenderer.kt index b17665bd..7fe5f655 100644 --- a/src/main/kotlin/breadmod/block/entity/renderer/SidedScreenRenderer.kt +++ b/src/main/kotlin/breadmod/client/render/SidedScreenRenderer.kt @@ -1,4 +1,4 @@ -package breadmod.block.entity.renderer +package breadmod.client.render import breadmod.block.entity.BreadScreenBlockEntity import com.mojang.blaze3d.vertex.PoseStack diff --git a/src/main/kotlin/breadmod/block/machine/entity/renderer/ToasterRenderer.kt b/src/main/kotlin/breadmod/client/render/ToasterRenderer.kt similarity index 96% rename from src/main/kotlin/breadmod/block/machine/entity/renderer/ToasterRenderer.kt rename to src/main/kotlin/breadmod/client/render/ToasterRenderer.kt index 2a6a5790..ca5292c3 100644 --- a/src/main/kotlin/breadmod/block/machine/entity/renderer/ToasterRenderer.kt +++ b/src/main/kotlin/breadmod/client/render/ToasterRenderer.kt @@ -1,7 +1,7 @@ -package breadmod.block.machine.entity.renderer +package breadmod.client.render import breadmod.ModMain -import breadmod.block.machine.entity.ToasterBlockEntity +import breadmod.block.entity.machine.ToasterBlockEntity import breadmod.util.render.renderBlockModel import breadmod.util.render.renderStaticItem import com.mojang.blaze3d.vertex.PoseStack diff --git a/src/main/kotlin/breadmod/block/storage/entity/renderer/BaseAbstractStorageBlockRenderer.kt b/src/main/kotlin/breadmod/client/render/storage/BaseAbstractStorageBlockRenderer.kt similarity index 93% rename from src/main/kotlin/breadmod/block/storage/entity/renderer/BaseAbstractStorageBlockRenderer.kt rename to src/main/kotlin/breadmod/client/render/storage/BaseAbstractStorageBlockRenderer.kt index 67eb162f..1254aa23 100644 --- a/src/main/kotlin/breadmod/block/storage/entity/renderer/BaseAbstractStorageBlockRenderer.kt +++ b/src/main/kotlin/breadmod/client/render/storage/BaseAbstractStorageBlockRenderer.kt @@ -1,6 +1,6 @@ -package breadmod.block.storage.entity.renderer +package breadmod.client.render.storage -import breadmod.block.machine.entity.AbstractMachineBlockEntity +import breadmod.block.entity.machine.AbstractMachineBlockEntity import breadmod.util.capability.EnergyBattery import breadmod.util.capability.FluidContainer import breadmod.util.capability.IndexableItemHandler diff --git a/src/main/kotlin/breadmod/block/storage/entity/renderer/EnergyStorageRenderer.kt b/src/main/kotlin/breadmod/client/render/storage/EnergyStorageRenderer.kt similarity index 93% rename from src/main/kotlin/breadmod/block/storage/entity/renderer/EnergyStorageRenderer.kt rename to src/main/kotlin/breadmod/client/render/storage/EnergyStorageRenderer.kt index 13070be7..bfd3df61 100644 --- a/src/main/kotlin/breadmod/block/storage/entity/renderer/EnergyStorageRenderer.kt +++ b/src/main/kotlin/breadmod/client/render/storage/EnergyStorageRenderer.kt @@ -1,6 +1,6 @@ -package breadmod.block.storage.entity.renderer +package breadmod.client.render.storage -import breadmod.block.storage.entity.EnergyStorageBlockEntity +import breadmod.block.entity.storage.EnergyStorageBlockEntity import breadmod.util.render.drawTextOnSide import com.mojang.blaze3d.vertex.PoseStack import net.minecraft.client.renderer.MultiBufferSource diff --git a/src/main/kotlin/breadmod/block/storage/entity/renderer/FluidStorageRenderer.kt b/src/main/kotlin/breadmod/client/render/storage/FluidStorageRenderer.kt similarity index 81% rename from src/main/kotlin/breadmod/block/storage/entity/renderer/FluidStorageRenderer.kt rename to src/main/kotlin/breadmod/client/render/storage/FluidStorageRenderer.kt index e238bb17..f4cdbf47 100644 --- a/src/main/kotlin/breadmod/block/storage/entity/renderer/FluidStorageRenderer.kt +++ b/src/main/kotlin/breadmod/client/render/storage/FluidStorageRenderer.kt @@ -1,6 +1,6 @@ -package breadmod.block.storage.entity.renderer +package breadmod.client.render.storage -import breadmod.block.storage.entity.FluidStorageBlockEntity +import breadmod.block.entity.storage.FluidStorageBlockEntity import com.mojang.blaze3d.vertex.PoseStack import net.minecraft.client.renderer.MultiBufferSource diff --git a/src/main/kotlin/breadmod/item/tool_gun/render/ToolGunItemRenderer.kt b/src/main/kotlin/breadmod/client/render/tool_gun/ToolGunItemRenderer.kt similarity index 98% rename from src/main/kotlin/breadmod/item/tool_gun/render/ToolGunItemRenderer.kt rename to src/main/kotlin/breadmod/client/render/tool_gun/ToolGunItemRenderer.kt index 09ba1a91..c03dd408 100644 --- a/src/main/kotlin/breadmod/item/tool_gun/render/ToolGunItemRenderer.kt +++ b/src/main/kotlin/breadmod/client/render/tool_gun/ToolGunItemRenderer.kt @@ -1,4 +1,4 @@ -package breadmod.item.tool_gun.render +package breadmod.client.render.tool_gun import breadmod.ModMain.modLocation import breadmod.datagen.tool_gun.BreadModToolGunModeProvider.Companion.TOOL_GUN_DEF diff --git a/src/main/kotlin/breadmod/item/tool_gun/render/ToolGunRenderUtil.kt b/src/main/kotlin/breadmod/client/render/tool_gun/ToolGunRenderUtil.kt similarity index 99% rename from src/main/kotlin/breadmod/item/tool_gun/render/ToolGunRenderUtil.kt rename to src/main/kotlin/breadmod/client/render/tool_gun/ToolGunRenderUtil.kt index 16431f23..04e5f1e6 100644 --- a/src/main/kotlin/breadmod/item/tool_gun/render/ToolGunRenderUtil.kt +++ b/src/main/kotlin/breadmod/client/render/tool_gun/ToolGunRenderUtil.kt @@ -1,4 +1,4 @@ -package breadmod.item.tool_gun.render +package breadmod.client.render.tool_gun import breadmod.util.render.renderText import com.mojang.blaze3d.vertex.PoseStack diff --git a/src/main/kotlin/breadmod/block/machine/entity/screen/DoughMachineScreen.kt b/src/main/kotlin/breadmod/client/screen/DoughMachineScreen.kt similarity index 98% rename from src/main/kotlin/breadmod/block/machine/entity/screen/DoughMachineScreen.kt rename to src/main/kotlin/breadmod/client/screen/DoughMachineScreen.kt index 95f5916c..c9e46444 100644 --- a/src/main/kotlin/breadmod/block/machine/entity/screen/DoughMachineScreen.kt +++ b/src/main/kotlin/breadmod/client/screen/DoughMachineScreen.kt @@ -1,8 +1,8 @@ -package breadmod.block.machine.entity.screen +package breadmod.client.screen import breadmod.ModMain.modLocation import breadmod.ModMain.modTranslatable -import breadmod.block.machine.entity.menu.DoughMachineMenu +import breadmod.block.menu.machine.DoughMachineMenu import breadmod.network.PacketHandler.NETWORK import breadmod.network.server.VoidTankPacket import breadmod.util.capability.EnergyBattery diff --git a/src/main/kotlin/breadmod/block/machine/entity/screen/WheatCrusherScreen.kt b/src/main/kotlin/breadmod/client/screen/WheatCrusherScreen.kt similarity index 97% rename from src/main/kotlin/breadmod/block/machine/entity/screen/WheatCrusherScreen.kt rename to src/main/kotlin/breadmod/client/screen/WheatCrusherScreen.kt index 42497baf..005aa4d2 100644 --- a/src/main/kotlin/breadmod/block/machine/entity/screen/WheatCrusherScreen.kt +++ b/src/main/kotlin/breadmod/client/screen/WheatCrusherScreen.kt @@ -1,8 +1,8 @@ -package breadmod.block.machine.entity.screen +package breadmod.client.screen import breadmod.ModMain.modLocation import breadmod.ModMain.modTranslatable -import breadmod.block.machine.entity.menu.WheatCrusherMenu +import breadmod.block.menu.machine.WheatCrusherMenu import breadmod.util.capability.EnergyBattery import breadmod.util.formatUnit import com.mojang.blaze3d.systems.RenderSystem diff --git a/src/main/kotlin/breadmod/compat/jade/JadePlugin.kt b/src/main/kotlin/breadmod/client/waila/jade/JadePlugin.kt similarity index 94% rename from src/main/kotlin/breadmod/compat/jade/JadePlugin.kt rename to src/main/kotlin/breadmod/client/waila/jade/JadePlugin.kt index 2bd816c0..cc275378 100644 --- a/src/main/kotlin/breadmod/compat/jade/JadePlugin.kt +++ b/src/main/kotlin/breadmod/client/waila/jade/JadePlugin.kt @@ -1,4 +1,4 @@ -package breadmod.compat.jade +package breadmod.client.waila.jade import breadmod.ModMain import snownee.jade.api.IWailaClientRegistration diff --git a/src/main/kotlin/breadmod/compat/farmersdelight/FarmersDelightPlugin.kt b/src/main/kotlin/breadmod/compat/farmersdelight/FarmersDelightPlugin.kt deleted file mode 100644 index 99e31c2b..00000000 --- a/src/main/kotlin/breadmod/compat/farmersdelight/FarmersDelightPlugin.kt +++ /dev/null @@ -1,5 +0,0 @@ -package breadmod.compat.farmersdelight - -class FarmersDelightPlugin { - // TODO: To be implemented -} \ No newline at end of file diff --git a/src/main/kotlin/breadmod/datagen/lang/USEnglishLanguageProvider.kt b/src/main/kotlin/breadmod/datagen/lang/USEnglishLanguageProvider.kt index 4b847633..ce1e4946 100644 --- a/src/main/kotlin/breadmod/datagen/lang/USEnglishLanguageProvider.kt +++ b/src/main/kotlin/breadmod/datagen/lang/USEnglishLanguageProvider.kt @@ -3,7 +3,7 @@ package breadmod.datagen.lang import breadmod.ModMain import breadmod.ModMain.modAdd import breadmod.ModMain.modAddExt -import breadmod.compat.jade.JadePlugin.Companion.TOOLTIP_RENDERER +import breadmod.client.waila.jade.JadePlugin.Companion.TOOLTIP_RENDERER import breadmod.datagen.tool_gun.BreadModToolGunModeProvider.Companion.TOOL_GUN_DEF import breadmod.registry.block.ModBlocks import breadmod.registry.fluid.ModFluids diff --git a/src/main/kotlin/breadmod/item/WrenchItem.kt b/src/main/kotlin/breadmod/item/WrenchItem.kt index 6532f9d0..86c876a0 100644 --- a/src/main/kotlin/breadmod/item/WrenchItem.kt +++ b/src/main/kotlin/breadmod/item/WrenchItem.kt @@ -1,6 +1,6 @@ package breadmod.item -import breadmod.block.machine.entity.AbstractMachineBlockEntity +import breadmod.block.entity.machine.AbstractMachineBlockEntity import net.minecraft.world.InteractionResult import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack diff --git a/src/main/kotlin/breadmod/item/tool_gun/IToolGunMode.kt b/src/main/kotlin/breadmod/item/tool_gun/IToolGunMode.kt index 0174ae34..1beb3562 100644 --- a/src/main/kotlin/breadmod/item/tool_gun/IToolGunMode.kt +++ b/src/main/kotlin/breadmod/item/tool_gun/IToolGunMode.kt @@ -1,6 +1,6 @@ package breadmod.item.tool_gun -import breadmod.item.tool_gun.render.ToolGunItemRenderer +import breadmod.client.render.tool_gun.ToolGunItemRenderer import breadmod.datagen.tool_gun.BreadModToolGunModeProvider import breadmod.registry.sound.ModSounds import com.mojang.blaze3d.vertex.PoseStack diff --git a/src/main/kotlin/breadmod/item/tool_gun/ToolGunItem.kt b/src/main/kotlin/breadmod/item/tool_gun/ToolGunItem.kt index aff1f97e..db1d7097 100644 --- a/src/main/kotlin/breadmod/item/tool_gun/ToolGunItem.kt +++ b/src/main/kotlin/breadmod/item/tool_gun/ToolGunItem.kt @@ -6,7 +6,7 @@ import breadmod.ModMain.modTranslatable import breadmod.datagen.tool_gun.BreadModToolGunModeProvider.Companion.TOOL_GUN_DEF import breadmod.datagen.tool_gun.ModToolGunModeDataLoader import breadmod.item.tool_gun.mode.ToolGunNoMode -import breadmod.item.tool_gun.render.ToolGunItemRenderer +import breadmod.client.render.tool_gun.ToolGunItemRenderer import breadmod.network.PacketHandler.NETWORK import breadmod.network.tool_gun.ToolGunPacket import breadmod.registry.item.IRegisterSpecialCreativeTab diff --git a/src/main/kotlin/breadmod/item/tool_gun/mode/ToolGunExplodeMode.kt b/src/main/kotlin/breadmod/item/tool_gun/mode/ToolGunExplodeMode.kt index 8a737a7d..7501d9d5 100644 --- a/src/main/kotlin/breadmod/item/tool_gun/mode/ToolGunExplodeMode.kt +++ b/src/main/kotlin/breadmod/item/tool_gun/mode/ToolGunExplodeMode.kt @@ -5,8 +5,8 @@ import breadmod.datagen.tool_gun.BreadModToolGunModeProvider import breadmod.item.tool_gun.IToolGunMode import breadmod.item.tool_gun.IToolGunMode.Companion.playModeSound import breadmod.item.tool_gun.IToolGunMode.Companion.playToolGunSound -import breadmod.item.tool_gun.render.drawTextOnScreen -import breadmod.item.tool_gun.render.drawWrappedTextOnScreen +import breadmod.client.render.tool_gun.drawTextOnScreen +import breadmod.client.render.tool_gun.drawWrappedTextOnScreen import breadmod.network.PacketHandler.NETWORK import breadmod.network.client.BeamPacket import breadmod.util.RayMarchResult.Companion.rayMarchBlock diff --git a/src/main/kotlin/breadmod/network/client/CapabilitySideDataPacket.kt b/src/main/kotlin/breadmod/network/client/CapabilitySideDataPacket.kt index 34a6fbde..d85ba088 100644 --- a/src/main/kotlin/breadmod/network/client/CapabilitySideDataPacket.kt +++ b/src/main/kotlin/breadmod/network/client/CapabilitySideDataPacket.kt @@ -1,6 +1,6 @@ package breadmod.network.client -import breadmod.block.machine.entity.AbstractMachineBlockEntity +import breadmod.block.entity.machine.AbstractMachineBlockEntity import net.minecraft.client.Minecraft import net.minecraft.core.BlockPos import net.minecraft.core.Direction diff --git a/src/main/kotlin/breadmod/network/server/ToggleMachinePacket.kt b/src/main/kotlin/breadmod/network/server/ToggleMachinePacket.kt index 414f007f..fa9b8db0 100644 --- a/src/main/kotlin/breadmod/network/server/ToggleMachinePacket.kt +++ b/src/main/kotlin/breadmod/network/server/ToggleMachinePacket.kt @@ -1,6 +1,6 @@ package breadmod.network.server -import breadmod.block.machine.entity.AbstractMachineBlockEntity +import breadmod.block.entity.machine.AbstractMachineBlockEntity import net.minecraft.core.BlockPos import net.minecraft.core.SectionPos import net.minecraft.network.FriendlyByteBuf diff --git a/src/main/kotlin/breadmod/network/server/VoidTankPacket.kt b/src/main/kotlin/breadmod/network/server/VoidTankPacket.kt index 30781516..f898a821 100644 --- a/src/main/kotlin/breadmod/network/server/VoidTankPacket.kt +++ b/src/main/kotlin/breadmod/network/server/VoidTankPacket.kt @@ -1,6 +1,6 @@ package breadmod.network.server -import breadmod.block.machine.entity.AbstractMachineBlockEntity +import breadmod.block.entity.machine.AbstractMachineBlockEntity import breadmod.util.capability.FluidContainer import net.minecraft.core.BlockPos import net.minecraft.core.SectionPos diff --git a/src/main/kotlin/breadmod/registry/block/ModBlockEntityTypes.kt b/src/main/kotlin/breadmod/registry/block/ModBlockEntityTypes.kt index 16e81c16..96bdc475 100644 --- a/src/main/kotlin/breadmod/registry/block/ModBlockEntityTypes.kt +++ b/src/main/kotlin/breadmod/registry/block/ModBlockEntityTypes.kt @@ -2,13 +2,13 @@ package breadmod.registry.block import breadmod.ModMain import breadmod.block.entity.* -import breadmod.block.machine.entity.* -import breadmod.block.machine.multiblock.farmer.entity.FarmerControllerBlockEntity -import breadmod.block.machine.multiblock.farmer.entity.FarmerInputBlockEntity -import breadmod.block.machine.multiblock.farmer.entity.FarmerOutputBlockEntity -import breadmod.block.machine.multiblock.generic.entity.PowerInterfaceBlockEntity -import breadmod.block.storage.entity.EnergyStorageBlockEntity -import breadmod.block.storage.entity.FluidStorageBlockEntity +import breadmod.block.entity.machine.* +import breadmod.block.entity.multiblock.farmer.FarmerControllerBlockEntity +import breadmod.block.entity.multiblock.farmer.FarmerInputBlockEntity +import breadmod.block.entity.multiblock.farmer.FarmerOutputBlockEntity +import breadmod.block.entity.multiblock.generic.PowerInterfaceBlockEntity +import breadmod.block.entity.storage.EnergyStorageBlockEntity +import breadmod.block.entity.storage.FluidStorageBlockEntity import breadmod.registry.block.ModBlocks.DOUGH_MACHINE_BLOCK import breadmod.registry.block.ModBlocks.WHEAT_CRUSHER_BLOCK import net.minecraft.world.level.block.entity.BlockEntityType diff --git a/src/main/kotlin/breadmod/registry/block/ModBlocks.kt b/src/main/kotlin/breadmod/registry/block/ModBlocks.kt index 3bd61db6..c854341d 100644 --- a/src/main/kotlin/breadmod/registry/block/ModBlocks.kt +++ b/src/main/kotlin/breadmod/registry/block/ModBlocks.kt @@ -3,10 +3,10 @@ package breadmod.registry.block import breadmod.ModMain import breadmod.block.* import breadmod.block.machine.* -import breadmod.block.machine.multiblock.farmer.FarmerControllerBlock -import breadmod.block.machine.multiblock.farmer.FarmerInputBlock -import breadmod.block.machine.multiblock.farmer.FarmerOutputBlock -import breadmod.block.machine.multiblock.generic.PowerInterfaceBlock +import breadmod.block.multiblock.farmer.FarmerControllerBlock +import breadmod.block.multiblock.farmer.FarmerInputBlock +import breadmod.block.multiblock.farmer.FarmerOutputBlock +import breadmod.block.multiblock.generic.PowerInterfaceBlock import breadmod.block.storage.EnergyStorageBlock import breadmod.block.specialItem.OreBlock import breadmod.block.specialItem.UseBlockStateNBT diff --git a/src/main/kotlin/breadmod/registry/menu/ModMenuTypes.kt b/src/main/kotlin/breadmod/registry/menu/ModMenuTypes.kt index 61a96ba0..fa56cfd3 100644 --- a/src/main/kotlin/breadmod/registry/menu/ModMenuTypes.kt +++ b/src/main/kotlin/breadmod/registry/menu/ModMenuTypes.kt @@ -1,8 +1,8 @@ package breadmod.registry.menu import breadmod.ModMain -import breadmod.block.machine.entity.menu.DoughMachineMenu -import breadmod.block.machine.entity.menu.WheatCrusherMenu +import breadmod.block.menu.machine.DoughMachineMenu +import breadmod.block.menu.machine.WheatCrusherMenu import breadmod.item.menu.CertificateMenu import net.minecraft.world.inventory.MenuType import net.minecraftforge.common.extensions.IForgeMenuType