teeny tiny refactoring

Bread-Experts-Group · Jul 29, 2024 · d6ac89d · d6ac89d
1 parent a38b338
commit d6ac89d
Show file tree

Hide file tree

Showing 65 changed files with 147 additions and 141 deletions.
diff --git 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
@@ -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
@@ -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/...hine/entity/AbstractMachineBlockEntity.kt → ...ity/machine/AbstractMachineBlockEntity.kt b/...hine/entity/AbstractMachineBlockEntity.kt → ...ity/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<T: AbstractMachineBlockEntity<T>>(
         var maxProgress = 0
             protected set
 
-        open fun tick(pLevel: Level, pPos: BlockPos, pState: BlockState, pBlockEntity: Progressive<T,R>) {
+        open fun tick(pLevel: Level, pPos: BlockPos, pState: BlockState, pBlockEntity: Progressive<T, R>) {
             preTick(pLevel, pPos, pState, pBlockEntity)
             currentRecipe.ifPresentOrElse({
                 progress++
@@ -211,7 +211,7 @@ abstract class AbstractMachineBlockEntity<T: AbstractMachineBlockEntity<T>>(
             craftingWidthHeight: Pair<Int, Int>,
             powerHandler: Pair<EnergyBattery, List<Direction?>>,
             vararg additionalCapabilities: Pair<Capability<*>, CapabilityContainer>
-        ): Progressive<T,R>(
+        ): Progressive<T, R>(
             pType,
             pPos,
             pBlockState,
@@ -222,10 +222,10 @@ abstract class AbstractMachineBlockEntity<T: AbstractMachineBlockEntity<T>>(
             ForgeCapabilities.ENERGY to powerHandler,
             *additionalCapabilities
         ) {
-            open fun recipeTickPrePower(pLevel: Level, pPos: BlockPos, pState: BlockState, pBlockEntity: Progressive<T,R>, recipe: R) {}
+            open fun recipeTickPrePower(pLevel: Level, pPos: BlockPos, pState: BlockState, pBlockEntity: Progressive<T, R>, recipe: R) {}
 
             private var energyDivision: Int? = null
-            final override fun tick(pLevel: Level, pPos: BlockPos, pState: BlockState, pBlockEntity: Progressive<T,R>) {
+            final override fun tick(pLevel: Level, pPos: BlockPos, pState: BlockState, pBlockEntity: Progressive<T, R>) {
                 preTick(pLevel, pPos, pState, pBlockEntity)
                 currentRecipe.ifPresentOrElse({
                     preTick(pLevel, pPos, pState, pBlockEntity)

diff --git a/...ne/entity/CreativeGeneratorBlockEntity.kt → ...y/machine/CreativeGeneratorBlockEntity.kt b/...ne/entity/CreativeGeneratorBlockEntity.kt → ...y/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/...machine/entity/DoughMachineBlockEntity.kt → ...entity/machine/DoughMachineBlockEntity.kt b/...machine/entity/DoughMachineBlockEntity.kt → ...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/...ck/machine/entity/GeneratorBlockEntity.kt → ...ck/entity/machine/GeneratorBlockEntity.kt b/...ck/machine/entity/GeneratorBlockEntity.kt → ...ck/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/...lock/machine/entity/ToasterBlockEntity.kt → ...lock/entity/machine/ToasterBlockEntity.kt b/...lock/machine/entity/ToasterBlockEntity.kt → ...lock/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/...machine/entity/WheatCrusherBlockEntity.kt → ...entity/machine/WheatCrusherBlockEntity.kt b/...machine/entity/WheatCrusherBlockEntity.kt → ...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/...mer/entity/FarmerControllerBlockEntity.kt → ...ock/farmer/FarmerControllerBlockEntity.kt b/...mer/entity/FarmerControllerBlockEntity.kt → ...ock/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/...k/farmer/entity/FarmerInputBlockEntity.kt → ...ltiblock/farmer/FarmerInputBlockEntity.kt b/...k/farmer/entity/FarmerInputBlockEntity.kt → ...ltiblock/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/.../farmer/entity/FarmerOutputBlockEntity.kt → ...tiblock/farmer/FarmerOutputBlockEntity.kt b/.../farmer/entity/FarmerOutputBlockEntity.kt → ...tiblock/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/...neric/entity/PowerInterfaceBlockEntity.kt → ...lock/generic/PowerInterfaceBlockEntity.kt b/...neric/entity/PowerInterfaceBlockEntity.kt → ...lock/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/...torage/entity/EnergyStorageBlockEntity.kt → ...ntity/storage/EnergyStorageBlockEntity.kt b/...torage/entity/EnergyStorageBlockEntity.kt → ...ntity/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/...storage/entity/FluidStorageBlockEntity.kt → ...entity/storage/FluidStorageBlockEntity.kt b/...storage/entity/FluidStorageBlockEntity.kt → ...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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...achine/entity/menu/AbstractMachineMenu.kt → ...block/menu/machine/AbstractMachineMenu.kt b/...achine/entity/menu/AbstractMachineMenu.kt → ...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/...k/machine/entity/menu/DoughMachineMenu.kt → ...od/block/menu/machine/DoughMachineMenu.kt b/...k/machine/entity/menu/DoughMachineMenu.kt → ...od/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/...k/machine/entity/menu/WheatCrusherMenu.kt → ...od/block/menu/machine/WheatCrusherMenu.kt b/...k/machine/entity/menu/WheatCrusherMenu.kt → ...od/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/...ultiblock/farmer/FarmerControllerBlock.kt → ...ultiblock/farmer/FarmerControllerBlock.kt b/...ultiblock/farmer/FarmerControllerBlock.kt → ...ultiblock/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/...ine/multiblock/farmer/FarmerInputBlock.kt → ...ock/multiblock/farmer/FarmerInputBlock.kt b/...ine/multiblock/farmer/FarmerInputBlock.kt → ...ock/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/...ne/multiblock/farmer/FarmerOutputBlock.kt → ...ck/multiblock/farmer/FarmerOutputBlock.kt b/...ne/multiblock/farmer/FarmerOutputBlock.kt → ...ck/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/...multiblock/generic/PowerInterfaceBlock.kt → ...multiblock/generic/PowerInterfaceBlock.kt b/...multiblock/generic/PowerInterfaceBlock.kt → ...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
@@ -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
@@ -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/...ain/kotlin/breadmod/hud/ToolGunOverlay.kt → ...lin/breadmod/client/hud/ToolGunOverlay.kt b/...ain/kotlin/breadmod/hud/ToolGunOverlay.kt → ...lin/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/...n/kotlin/breadmod/compat/jei/JEIPlugin.kt → ...n/kotlin/breadmod/client/jei/JEIPlugin.kt b/...n/kotlin/breadmod/compat/jei/JEIPlugin.kt → ...n/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/...ain/kotlin/breadmod/compat/jei/JEIUtil.kt → ...ain/kotlin/breadmod/client/jei/JEIUtil.kt b/...ain/kotlin/breadmod/compat/jei/JEIUtil.kt → ...ain/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/.../breadmod/compat/jei/ModJEIRecipeTypes.kt → .../breadmod/client/jei/ModJEIRecipeTypes.kt b/.../breadmod/compat/jei/ModJEIRecipeTypes.kt → .../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