From f77332e76f0b4008299d307a67f9aca6abfcae06 Mon Sep 17 00:00:00 2001 From: Magic_Sweepy Date: Fri, 14 Nov 2025 18:57:34 +0800 Subject: [PATCH 01/20] Update MUI2 and GTCEu version. --- build.gradle.kts | 2 +- gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 19996f267..60e738b2a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -123,7 +123,7 @@ dependencies { implementation(deobf(libs.modularui)) api(libs.codeChickenLib) implementation(deobf(files("libs/morphismlib-1.12.2-1.0.0.jar"))) - implementation(deobf(files("libs/gregtech-1.12.2-master-#2851.jar"))) + implementation(deobf(files("libs/gregtech-1.12.2-master-#2874.jar"))) implementation(deobf(libs.ae2ExtendedLife)) implementation(libs.jei) implementation(libs.theOneProbe) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 73dd65a35..c28777714 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ jetbrainsAnnotations = "24.1.0" # Mods forgelin = "2.1.0.0" mixinBooter = "9.1" -modularui = "2.5.0-rc4" +modularui = "3.0.4" codeChickenLib = "3.2.3.358" groovyScript = "1.2.0-hotfix1" craftTweaker2 = "1.12-4.1.20.700" From 2b9a8401f9b0b6f7bddbe903d0e9266607141090 Mon Sep 17 00:00:00 2001 From: Magic_Sweepy Date: Fri, 14 Nov 2025 19:06:15 +0800 Subject: [PATCH 02/20] Try to fix Wire Coil type failure. --- .../gtlitecore/common/block/adapter/GTWireCoil.kt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/block/adapter/GTWireCoil.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/block/adapter/GTWireCoil.kt index 89eeebadd..9c0ea18e9 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/block/adapter/GTWireCoil.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/block/adapter/GTWireCoil.kt @@ -25,9 +25,18 @@ enum class GTWireCoil : BlockVariant get() = MetaBlocks.WIRE_COIL.getStateFromMeta(this.ordinal) override fun getStack(count: Int): ItemStack + = MetaBlocks.WIRE_COIL.getItemVariant(getCoilTypeByName(), count) + + private fun getCoilTypeByName() = when (this) { - return MetaBlocks.WIRE_COIL.getItemVariant( - BlockWireCoil.CoilType.valueOf(this.name), count) + CUPRONICKEL -> BlockWireCoil.CoilType.CUPRONICKEL + KANTHAL -> BlockWireCoil.CoilType.KANTHAL + NICHROME -> BlockWireCoil.CoilType.NICHROME + RTM_ALLOY -> BlockWireCoil.CoilType.RTM_ALLOY + HSS_G -> BlockWireCoil.CoilType.HSS_G + NAQUADAH -> BlockWireCoil.CoilType.NAQUADAH + TRINIUM -> BlockWireCoil.CoilType.TRINIUM + TRITANIUM -> BlockWireCoil.CoilType.TRITANIUM } } \ No newline at end of file From 94c551650b3f405ea88a4899b5c3c3c94dc270b8 Mon Sep 17 00:00:00 2001 From: Magic_Sweepy Date: Fri, 14 Nov 2025 19:06:47 +0800 Subject: [PATCH 03/20] Fix unused PropertyEnum in stone variant class. --- .../common/block/GTLiteStoneVariantBlock.kt | 61 +++++++------------ 1 file changed, 21 insertions(+), 40 deletions(-) diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/block/GTLiteStoneVariantBlock.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/block/GTLiteStoneVariantBlock.kt index 21b185900..1dbcc3a66 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/block/GTLiteStoneVariantBlock.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/block/GTLiteStoneVariantBlock.kt @@ -1,5 +1,6 @@ package gregtechlite.gtlitecore.common.block +import gregtech.api.block.IStateSpawnControl import gregtech.api.block.VariantBlock import gregtech.api.unification.material.Materials import gregtech.api.unification.ore.OrePrefix @@ -23,14 +24,9 @@ import net.minecraft.world.World import java.util.* import gregtech.api.unification.material.Material as GTMaterial -@Suppress("unused") -class GTLiteStoneVariantBlock(val stoneVariant: StoneVariant) : - VariantBlock(Material.ROCK) +// todo oreDic generation? +class GTLiteStoneVariantBlock(val stoneVariant: StoneVariant) : VariantBlock(Material.ROCK) { - companion object - { - private val PROPERTY: PropertyEnum = PropertyEnum.create("variant", StoneType::class.java) - } init { @@ -44,45 +40,26 @@ class GTLiteStoneVariantBlock(val stoneVariant: StoneVariant) : setCreativeTab(GTLiteCreativeTabs.TAB_DECORATION) } - override fun createBlockState(): BlockStateContainer - { - VARIANT = PROPERTY - VALUES = StoneType.entries.toTypedArray() - return BlockStateContainer(this, VARIANT) - } - - override fun canCreatureSpawn( - state: IBlockState, - world: IBlockAccess, - pos: BlockPos, - type: EntityLiving.SpawnPlacementType - ): Boolean - { - return false - } - - override fun canSilkHarvest( - world: World, - pos: BlockPos, - state: IBlockState, - player: EntityPlayer - ): Boolean - { - return stoneVariant == StoneVariant.SMOOTH - } + @Deprecated("Deprecated in Java") + override fun canSilkHarvest(): Boolean + = this.stoneVariant == StoneVariant.SMOOTH override fun getItemDropped(state: IBlockState, rand: Random, fortune: Int): Item { - return Item.getItemFromBlock( - if (stoneVariant == StoneVariant.SMOOTH) - GTLiteBlocks.STONES.get(StoneVariant.COBBLE) as Block else this) + return if (this.stoneVariant == StoneVariant.SMOOTH) + Item.getItemFromBlock(GTLiteBlocks.STONES[StoneVariant.COBBLE]!!) + else + Item.getItemFromBlock(this) } - enum class StoneType(private val serialName: String, val mapColor: MapColor) : IStringSerializable + /** + * These rock types referenced to GT6, thanks gregorius create these stones. We modified the components with reality + * world correspondenced rock components, and modified textures with GTCEu style. + */ + enum class StoneType(private val serialName: String, + mapColor: MapColor, + val allowSpawn: Boolean = true) : IStringSerializable, IStateSpawnControl { - // Rock type referenced to GregTech6, thanks gregorius create these stones, - // we modified the components with reality world correspondenced rock components, - // and modified textures with GregTechCEu style. LIMESTONE("limestone", MapColor.GRAY_STAINED_HARDENED_CLAY), KOMATIITE("komatiite", MapColor.YELLOW_STAINED_HARDENED_CLAY), GREEN_SCHIST("green_schist", MapColor.GREEN_STAINED_HARDENED_CLAY), @@ -109,6 +86,10 @@ class GTLiteStoneVariantBlock(val stoneVariant: StoneVariant) : } override fun getName(): String = serialName + + override fun canCreatureSpawn(state: IBlockState, world: IBlockAccess, pos: BlockPos, + type: EntityLiving.SpawnPlacementType): Boolean = allowSpawn + } enum class StoneVariant( From e6fd3653e72ca1e3a06cb73ca87e4ff5e017008e Mon Sep 17 00:00:00 2001 From: Magic_Sweepy Date: Fri, 14 Nov 2025 19:20:41 +0800 Subject: [PATCH 04/20] MUI2 theme -> colorType fixes. --- .../gtlitecore/api/gui/GTLiteMuiTextures.kt | 162 +++++------------- 1 file changed, 42 insertions(+), 120 deletions(-) diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt index 43b701ed2..ddc632110 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt @@ -1,66 +1,40 @@ package gregtechlite.gtlitecore.api.gui +import com.cleanroommc.modularui.drawable.ColorType import com.cleanroommc.modularui.drawable.UITexture -import gregtech.api.GTValues -import gregtech.api.util.Size +import gregtechlite.gtlitecore.api.MOD_ID @Suppress("SameParameterValue") object GTLiteMuiTextures { - // region Slot Textures - @JvmField val PRIMITIVE_FLUID_SLOT: UITexture = fullImage( "textures/gui/primitive/primitive_fluid_slot.png") - // endregion - - // region Progress Bar Textures - + // Large Nuclear Reactor (LNR) Stored Plasma Oxygen Bar @JvmField - val PRIMITIVE_BLAST_FURNACE_PROGRESS_BAR: UITexture = fullImage( - "textures/gui/primitive/progress_bar_primitive_blast_furnace.png") + val PROGRESS_BAR_LNR_PLASMA_OXYGEN: UITexture = progressBar( + "textures/gui/progress_bar/progress_bar_lnr_plasma_oxygen.png", 94, 14) - /** - * Multiblock Progress Bar for Large Naquadah Reactor (LNR). - */ + // Large Rocket Engine (LRE) Stored Hydrogen Bar @JvmField - val PROGRESS_BAR_LNR_PLASMA_OXYGEN = progressBar("textures/gui/progress_bar/progress_bar_lnr_plasma_oxygen.png", - 94, 14) + val PROGRESS_BAR_LRE_HYDROGEN: UITexture = progressBar( + "textures/gui/progress_bar/progress_bar_lre_hydrogen.png", 62, 14) - /** - * Multiblock Progress Bar for Large Rocket Engine (LRE). - */ + // Large Rocket Engine (LRE) Stored Liquid Air Bar @JvmField - val PROGRESS_BAR_LRE_HYDROGEN = progressBar("textures/gui/progress_bar/progress_bar_lre_hydrogen.png", - 62, 14) + val PROGRESS_BAR_LRE_LIQUID_AIR: UITexture = progressBar( + "textures/gui/progress_bar/progress_bar_lre_liquid_air.png", 62, 14) - /** - * Multiblock Progress Bar for Large Rocket Engine (LRE). - */ @JvmField - val PROGRESS_BAR_LRE_LIQUID_AIR = progressBar("textures/gui/progress_bar/progress_bar_lre_liquid_air.png", - 62, 14) - - /** - * Multiblock Progress Bar for Large Rocket Engine (LRE). - */ - @JvmField - val PROGRESS_BAR_LRE_CARBON_DIOXIDE = progressBar("textures/gui/progress_bar/progress_bar_lre_carbon_dioxide.png", - 62, 14) - - // endregion - - // region Overlay Textures + val PROGRESS_BAR_LRE_CARBON_DIOXIDE: UITexture = progressBar( + "textures/gui/progress_bar/progress_bar_lre_carbon_dioxide.png", 62, 14) @JvmField val PRIMITIVE_INT_CIRCUIT_OVERLAY: UITexture = fullImage( "textures/gui/primitive/int_circuit_overlay_primitive.png") - // endregion - - // region Widget Textures @JvmField val FUSION_REACTOR_MK4_TITLE: UITexture = fullImage( "textures/gui/widget/fusion_reactor_mk4_title") @@ -69,101 +43,49 @@ object GTLiteMuiTextures val FUSION_REACTOR_MK5_TITLE: UITexture = fullImage( "textures/gui/widget/fusion_reactor_mk5_title") - /** - * Multiblock Button for Space Elevator to enabled/disabled extension structure. - * - * - 0: Disabled - * - 1: Enabled - */ + // Enabled/Disabled Extension Structure for Space Elevator (0: Disabled, 1: Enabled). @JvmField - val BUTTON_ELEVATOR_EXTENSION = slice("textures/gui/widget/button_elevator_extension.png", - 18, 36, 18, 18, false) + val BUTTON_ELEVATOR_EXTENSION = sliceImage( + "textures/gui/widget/button_elevator_extension.png", 18, 36, + 18, 18, ColorType.DEFAULT) - /** - * Multiblock Button for Space Elevator Modules to refreshed its structure pattern. - */ + // Refresh the Structure Pattern for Space Elevator Modules. @JvmField val BUTTON_REFRESH_STRUCTURE_PATTERN: UITexture = fullImage( "textures/gui/widget/button_refresh_structure_pattern.png") - // endregion - - // region Helper Methods - private fun fullImage(path: String): UITexture - { - return fullImage(path, false) - } - - private fun fullImage(path: String, canApplyTheme: Boolean): UITexture - { - return UITexture.fullImage(GTValues.MODID, path, canApplyTheme) - } - - private fun progressBar(path: String): UITexture - { - return progressBar(path, 20, 40) - } - - private fun progressBar(path: String, canApplyTheme: Boolean): UITexture - { - return progressBar(path, 20, 40, false) - } +} - private fun progressBar(path: String, width: Int, height: Int): UITexture - { - return progressBar(path, width, height, false) - } +private fun fullImage(path: String, colorType: ColorType? = null) = UITexture.fullImage(MOD_ID, path, colorType) - private fun progressBar(path: String, size: Size): UITexture - { - return progressBar(path, size, false) - } - - private fun progressBar(path: String, width: Int, height: Int, canApplyTheme: Boolean): UITexture - { - val builder = UITexture.Builder() - .location(GTValues.MODID, path) - .imageSize(width, height) - if (canApplyTheme) builder.canApplyTheme() - return builder.build() - } +@Suppress("SameParameterValue") +private fun sliceImage(path: String, width: Int, height: Int, newWidth: Int, newHeight: Int, colorType: ColorType? = null): Array +{ + require((width % newWidth == 0) || (height % newHeight == 0)) - private fun progressBar(path: String, size: Size, canApplyTheme: Boolean): UITexture - { - return progressBar(path, size.width, size.height, canApplyTheme) - } + val countX= width / newWidth + val countY= height / newHeight + val slices = arrayOfNulls(countX * countY) - private fun slice(path: String, width: Int, height: Int, sliceWidth: Int, sliceHeight: Int, - canApplyTheme: Boolean): Array + for (indexX in 0 ..< countX) { - require(!(width % sliceWidth != 0 || height % sliceHeight != 0)) { - "Slice height and slice width must divide the image evenly!" - } - val countX = width / sliceWidth - val countY = height / sliceHeight - - val slices = mutableListOf() - for (indexX in 0 ..< countX) + for (indexY in 0 ..< countY) { - for (indexY in 0 ..< countY) - { - slices.add(UITexture.builder() - .location(GTValues.MODID, path) - .canApplyTheme(canApplyTheme) - .imageSize(width, height) - .uv(indexX * sliceWidth, indexY * sliceHeight, sliceWidth, sliceHeight) - .build()) + slices[(indexX * countX) + indexY] = uiTexture{ + location(MOD_ID, path) + colorType(colorType) + imageSize(width, height) + xy(indexX * newWidth, indexY * newHeight, newWidth, newHeight) } } - return slices.toTypedArray() - } - - private fun slice(path: String, size: Size, sliceSize: Size, canApplyTheme: Boolean): Array - { - return slice(path, size.width, size.height, - sliceSize.width, sliceSize.height, canApplyTheme) } + return slices +} - // endregion +private fun progressBar(path: String, width: Int = 20, height: Int = 40, colorType: ColorType? = null) = uiTexture { + location(MOD_ID, path) + imageSize(width, height) + colorType(colorType) +} -} \ No newline at end of file +private fun uiTexture(builder: UITexture.Builder.() -> Unit) = UITexture.builder().apply(builder).build() From 348815859626487cb6e95a543f77ef328adec0de Mon Sep 17 00:00:00 2001 From: Magic_Sweepy Date: Fri, 14 Nov 2025 19:21:17 +0800 Subject: [PATCH 05/20] Deleted unused MUI2 widget. --- .../api/gui/widget/SlotLikeButtonWidget.kt | 89 ------------------- 1 file changed, 89 deletions(-) delete mode 100644 src/main/kotlin/gregtechlite/gtlitecore/api/gui/widget/SlotLikeButtonWidget.kt diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/gui/widget/SlotLikeButtonWidget.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/gui/widget/SlotLikeButtonWidget.kt deleted file mode 100644 index 134c7f74d..000000000 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/gui/widget/SlotLikeButtonWidget.kt +++ /dev/null @@ -1,89 +0,0 @@ -package gregtechlite.gtlitecore.api.gui.widget - -import com.cleanroommc.modularui.api.ITheme -import com.cleanroommc.modularui.api.drawable.IDrawable -import com.cleanroommc.modularui.drawable.DynamicDrawable -import com.cleanroommc.modularui.drawable.GuiDraw -import com.cleanroommc.modularui.drawable.ItemDrawable -import com.cleanroommc.modularui.integration.jei.JeiIngredientProvider -import com.cleanroommc.modularui.screen.viewport.ModularGuiContext -import com.cleanroommc.modularui.theme.WidgetSlotTheme -import com.cleanroommc.modularui.theme.WidgetTheme -import com.cleanroommc.modularui.widgets.ButtonWidget -import gregtech.api.items.metaitem.MetaItem -import net.minecraft.client.renderer.GlStateManager -import net.minecraft.item.ItemStack - -/** - * Button widget that looks like and partially behaves like item slot. - * Draws supplied [ItemStack], draws white overlay when hovered and allows interaction with JEI. - */ -class SlotLikeButtonWidget : ButtonWidget, JeiIngredientProvider -{ - - private val itemSupplier: () -> ItemStack - private val itemDrawable: IDrawable - - /** - * @param itemStack The [ItemStack] to "put into the slot". - */ - constructor(itemStack: ItemStack) - { - this.itemSupplier = { itemStack } - this.itemDrawable = ItemDrawable(itemStack).asIcon() - this.disableHoverBackground() - } - - /** - * @param metaItem The [MetaItem] to specify the correspondenced [ItemStack] to put into the slot. - */ - constructor(metaItem: MetaItem<*>.MetaValueItem) - { - this.itemSupplier = { metaItem.stackForm } - this.itemDrawable = ItemDrawable(metaItem.stackForm).asIcon() - this.disableHoverBackground() - } - - /** - * @param itemSupplier Supplier that specifies `ItemStack` to be present in the slot. - */ - constructor(itemSupplier: () -> ItemStack) - { - this.itemSupplier = itemSupplier - this.itemDrawable = DynamicDrawable { ItemDrawable(itemSupplier.invoke()) }.asIcon() - this.disableHoverBackground() - } - - override fun getWidgetThemeInternal(theme: ITheme): WidgetTheme? - { - return theme.itemSlotTheme - } - - override fun draw(context: ModularGuiContext?, widgetTheme: WidgetTheme?) - { - super.draw(context, widgetTheme) - this.itemDrawable.drawAtZero(context, area, widgetTheme) - if (this.isHovering) - { - GlStateManager.disableLighting() - GlStateManager.enableBlend() - GlStateManager.colorMask(true, true, true, false) - GuiDraw.drawRect(1f, 1f, 16f, 16f, getHoverColor(widgetTheme)) - GlStateManager.colorMask(true, true, true, true) - GlStateManager.disableBlend() - } - } - - private fun getHoverColor(widgetTheme: WidgetTheme?): Int - { - if (widgetTheme is WidgetSlotTheme) - { - val slotTheme = widgetTheme - return slotTheme.slotHoverColor - } - return ITheme.getDefault().itemSlotTheme.slotHoverColor - } - - override fun getIngredient(): Any? = itemSupplier.invoke() - -} From 2f3fbef0e5aa9f83bf34cf3e5efbc544f69f62c5 Mon Sep 17 00:00:00 2001 From: Magic_Sweepy Date: Fri, 14 Nov 2025 19:38:38 +0800 Subject: [PATCH 06/20] Various MUI2 update problems fixes. --- .../item/behavior/StructureWriterBehavior.kt | 4 +- .../primitive/MultiblockCoagulationTank.kt | 9 +- .../part/PartMachineAirIntakeHatch.kt | 10 +- .../part/PartMachineDualHatch.kt | 33 +++---- .../part/PartMachineHugeItemBus.kt | 99 ++++++++++--------- 5 files changed, 84 insertions(+), 71 deletions(-) diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/item/behavior/StructureWriterBehavior.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/item/behavior/StructureWriterBehavior.kt index 288d7a8f7..f8955b488 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/item/behavior/StructureWriterBehavior.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/item/behavior/StructureWriterBehavior.kt @@ -1,8 +1,10 @@ +@file:Suppress("Deprecation") package gregtechlite.gtlitecore.common.item.behavior import com.cleanroommc.modularui.api.drawable.IKey import com.cleanroommc.modularui.factory.HandGuiData import com.cleanroommc.modularui.screen.ModularPanel +import com.cleanroommc.modularui.screen.UISettings import com.cleanroommc.modularui.utils.Alignment import com.cleanroommc.modularui.value.sync.PanelSyncManager import com.cleanroommc.modularui.widget.ParentWidget @@ -46,7 +48,7 @@ object StructureWriterBehavior : IItemBehaviour, ItemUIFactory } @Suppress("UnstableApiUsage") - override fun buildUI(guiData: HandGuiData, guiSyncManager: PanelSyncManager): ModularPanel + override fun buildUI(guiData: HandGuiData, guiSyncManager: PanelSyncManager, settings: UISettings): ModularPanel { return GTGuis.createPanel(guiData.mainHandItem, 176, 120) .background(GTGuiTextures.BACKGROUND) diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/primitive/MultiblockCoagulationTank.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/primitive/MultiblockCoagulationTank.kt index 112e1e3ac..507a84a29 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/primitive/MultiblockCoagulationTank.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/primitive/MultiblockCoagulationTank.kt @@ -5,9 +5,9 @@ import codechicken.lib.render.pipeline.IVertexOperation import codechicken.lib.vec.Matrix4 import com.cleanroommc.modularui.value.sync.DoubleSyncValue import com.cleanroommc.modularui.value.sync.SyncHandlers -import com.cleanroommc.modularui.widgets.ItemSlot import com.cleanroommc.modularui.widgets.ProgressWidget import com.cleanroommc.modularui.widgets.SlotGroupWidget +import com.cleanroommc.modularui.widgets.slot.ItemSlot import gregtech.api.capability.IGhostSlotConfigurable import gregtech.api.capability.impl.GhostCircuitItemStackHandler import gregtech.api.capability.impl.ItemHandlerList @@ -195,7 +195,7 @@ class MultiblockCoagulationTank(id: ResourceLocation) override fun getUITheme(): GTGuiTheme = GTGuiTheme.PRIMITIVE @Suppress("UnstableApiUsage") - override fun createUIFactory(): MultiblockUIFactory? + override fun createUIFactory(): MultiblockUIFactory { return MultiblockUIFactory(this) .setSize(176, 166) @@ -214,8 +214,9 @@ class MultiblockCoagulationTank(id: ResourceLocation) parent.child(KeyUtil.lang(metaFullName).asWidget() .pos(6, 6)) - .child(SlotGroupWidget.playerInventory() - .left(7).bottom(7)) + .child(SlotGroupWidget.playerInventory(false) + .left(7) + .bottom(7)) .child(ItemSlot() .slot(SyncHandlers.itemSlot(importItems, 0) .slotGroup("item_inv")) diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/part/PartMachineAirIntakeHatch.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/part/PartMachineAirIntakeHatch.kt index fcb0a270e..dce995cad 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/part/PartMachineAirIntakeHatch.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/part/PartMachineAirIntakeHatch.kt @@ -6,13 +6,14 @@ import codechicken.lib.vec.Matrix4 import com.cleanroommc.modularui.api.drawable.IKey import com.cleanroommc.modularui.factory.PosGuiData import com.cleanroommc.modularui.screen.ModularPanel +import com.cleanroommc.modularui.screen.UISettings import com.cleanroommc.modularui.utils.Alignment import com.cleanroommc.modularui.utils.Color import com.cleanroommc.modularui.value.sync.PanelSyncManager import com.cleanroommc.modularui.value.sync.SyncHandlers -import com.cleanroommc.modularui.widgets.ItemSlot import com.cleanroommc.modularui.widgets.RichTextWidget import com.cleanroommc.modularui.widgets.SlotGroupWidget +import com.cleanroommc.modularui.widgets.slot.ItemSlot import gregtech.api.capability.GregtechDataCodes import gregtech.api.capability.impl.FilteredItemHandler import gregtech.api.capability.impl.FluidTankList @@ -236,7 +237,7 @@ class PartMachineAirIntakeHatch(id: ResourceLocation, override fun createExportItemHandler(): IItemHandlerModifiable = ItemStackHandler(1) @Suppress("UnstableApiUsage") - override fun buildUI(guiData: PosGuiData, syncManager: PanelSyncManager): ModularPanel + override fun buildUI(guiData: PosGuiData, syncManager: PanelSyncManager, settings: UISettings): ModularPanel { syncManager.registerSlotGroup("item_inv", 2) @@ -247,8 +248,9 @@ class PartMachineAirIntakeHatch(id: ResourceLocation, return GTGuis.createPanel(this, 176, 166) .child(IKey.lang(metaFullName).asWidget() .pos(5, 5)) - .child(SlotGroupWidget.playerInventory() - .left(7).bottom(7)) + .child(SlotGroupWidget.playerInventory(false) + .left(7) + .bottom(7)) .child(GTGuiTextures.DISPLAY.asWidget() .left(7).top(16) .size(81, 55)) diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/part/PartMachineDualHatch.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/part/PartMachineDualHatch.kt index 8a7bb5ac3..cb3e96bc8 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/part/PartMachineDualHatch.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/part/PartMachineDualHatch.kt @@ -8,16 +8,17 @@ import com.cleanroommc.modularui.api.drawable.IKey import com.cleanroommc.modularui.api.widget.IWidget import com.cleanroommc.modularui.factory.PosGuiData import com.cleanroommc.modularui.screen.ModularPanel +import com.cleanroommc.modularui.screen.UISettings import com.cleanroommc.modularui.value.BoolValue import com.cleanroommc.modularui.value.sync.BooleanSyncValue import com.cleanroommc.modularui.value.sync.PanelSyncManager import com.cleanroommc.modularui.value.sync.SyncHandlers import com.cleanroommc.modularui.widget.Widget -import com.cleanroommc.modularui.widgets.ItemSlot import com.cleanroommc.modularui.widgets.SlotGroupWidget import com.cleanroommc.modularui.widgets.ToggleButton import com.cleanroommc.modularui.widgets.layout.Flow import com.cleanroommc.modularui.widgets.layout.Grid +import com.cleanroommc.modularui.widgets.slot.ItemSlot import gregtech.api.GTValues import gregtech.api.capability.DualHandler import gregtech.api.capability.GregtechDataCodes @@ -215,7 +216,7 @@ class PartMachineDualHatch(id: ResourceLocation, override fun usesMui2(): Boolean = true @Suppress("UnstableApiUsage") - override fun buildUI(guiData: PosGuiData, syncManager: PanelSyncManager): ModularPanel + override fun buildUI(guiData: PosGuiData, syncManager: PanelSyncManager, settings: UISettings): ModularPanel { val rowSize = sqrt(getItemSize().toDouble()).toInt() syncManager.registerSlotGroup("item_inv", rowSize) @@ -224,10 +225,10 @@ class PartMachineDualHatch(id: ResourceLocation, rowSize * 18 + 14 + 18) // Bus Inv width val backgroundHeight = 18 + 18 * rowSize + 94 - val widgets: MutableList> = ArrayList>() + val widgets: MutableList> = ArrayList() for (i in 0 ..< rowSize) { - widgets.add(ArrayList()) + widgets.add(ArrayList()) for (j in 0 ..< rowSize) { val index = i * rowSize + j @@ -235,11 +236,9 @@ class PartMachineDualHatch(id: ResourceLocation, widgets[i].add(ItemSlot() .slot(SyncHandlers.itemSlot(handler, index) .slotGroup("item_inv") - .changeListener { newItem: ItemStack?, onlyAmountChanged: Boolean, client: Boolean, init: Boolean -> + .changeListener { newItem, onlyAmountChanged, client, init -> if (onlyAmountChanged && handler is GTItemStackHandler) - { handler.onContentsChanged(index) - } } .accessibility(!isExportHatch, true))) } @@ -264,8 +263,9 @@ class PartMachineDualHatch(id: ResourceLocation, return GTGuis.createPanel(this, backgroundWidth, backgroundHeight) .child(IKey.lang(metaFullName).asWidget() .pos(5, 5)) - .child(SlotGroupWidget.playerInventory() - .left(7).bottom(7)) + .child(SlotGroupWidget.playerInventory(false) + .left(7) + .bottom(7)) .child(Grid() .top(18) .height(rowSize * 18) @@ -321,16 +321,15 @@ class PartMachineDualHatch(id: ResourceLocation, it.addLine(IKey.lang("gregtech.gui.item_auto_collapse.tooltip.disabled")) } }) + .childIf(hasGhostCircuit, GhostCircuitSlotWidget() - .slot(SyncHandlers.itemSlot(circuitInventory, 0) - .changeListener { newItem: ItemStack?, onlyAmountChanged: Boolean, client: Boolean, init: Boolean -> - // Add the dual handler to the notified list. - dualHandler!!.onContentsChanged() - }) - .background(GTGuiTextures.SLOT, GTGuiTextures.INT_CIRCUIT_OVERLAY)) + .slot(circuitInventory, 0) + .background(GTGuiTextures.SLOT, GTGuiTextures.INT_CIRCUIT_OVERLAY)) .childIf(!hasGhostCircuit, Widget() .background(GTGuiTextures.SLOT, GTGuiTextures.BUTTON_X) - .tooltip { it.addLine(IKey.lang("gregtech.gui.configurator_slot.unavailable.tooltip")) })) + .tooltip { + it.addLine(IKey.lang("gregtech.gui.configurator_slot.unavailable.tooltip")) + })) } override fun renderMetaTileEntity(renderState: CCRenderState?, @@ -488,7 +487,7 @@ class PartMachineDualHatch(id: ResourceLocation, // Gather a snapshot of the provided inventory val inventoryContents = GTHashMaps.fromItemHandler(inventory, true) - val inventoryItemContents: MutableList = ArrayList() + val inventoryItemContents: MutableList = ArrayList() // Populate the list of item stacks in the inventory with apportioned item stacks, for easy replacement for (e in inventoryContents.object2IntEntrySet()) diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/part/PartMachineHugeItemBus.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/part/PartMachineHugeItemBus.kt index 84d8683a9..788e08c59 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/part/PartMachineHugeItemBus.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/part/PartMachineHugeItemBus.kt @@ -3,16 +3,16 @@ package gregtechlite.gtlitecore.common.metatileentity.part import com.cleanroommc.modularui.api.drawable.IKey import com.cleanroommc.modularui.factory.PosGuiData import com.cleanroommc.modularui.screen.ModularPanel +import com.cleanroommc.modularui.screen.UISettings import com.cleanroommc.modularui.value.sync.BooleanSyncValue import com.cleanroommc.modularui.value.sync.PanelSyncManager import com.cleanroommc.modularui.value.sync.SyncHandlers import com.cleanroommc.modularui.widget.Widget -import com.cleanroommc.modularui.widgets.ItemSlot import com.cleanroommc.modularui.widgets.SlotGroupWidget import com.cleanroommc.modularui.widgets.ToggleButton import com.cleanroommc.modularui.widgets.layout.Flow import com.cleanroommc.modularui.widgets.layout.Grid -import com.cleanroommc.modularui.widgets.slot.ModularSlot +import com.cleanroommc.modularui.widgets.slot.ItemSlot import gregtech.api.capability.GregtechDataCodes import gregtech.api.capability.IControllable import gregtech.api.capability.IGhostSlotConfigurable @@ -293,7 +293,7 @@ class PartMachineHugeItemBus(metaTileEntityId: ResourceLocation, tier: Int) } @Suppress("UnstableApiUsage") - override fun buildUI(guiData: PosGuiData, panelSyncManager: PanelSyncManager): ModularPanel + override fun buildUI(guiData: PosGuiData, panelSyncManager: PanelSyncManager, settings: UISettings): ModularPanel { val rowSize = sqrt(getInventorySize().toDouble()).toInt() panelSyncManager.registerSlotGroup("item_inv", rowSize) @@ -302,20 +302,23 @@ class PartMachineHugeItemBus(metaTileEntityId: ResourceLocation, tier: Int) rowSize * 18 + 14) // Bus Inv width val backgroundHeight = 18 + 18 * rowSize + 94 - val workingStateValue = BooleanSyncValue({ workingEnabled }, - { workingStatus -> workingEnabled = workingStatus }) + val workingStateValue = BooleanSyncValue( + { workingEnabled }, + { workingStatus -> workingEnabled = workingStatus }) - val collapseStateValue = BooleanSyncValue({ autoCollapse }, - { collapseMode -> autoCollapse = collapseMode }) + val collapseStateValue = BooleanSyncValue( + { autoCollapse }, + { collapseMode: Boolean -> autoCollapse = collapseMode }) - val handler = importItems - val hasGhostCircuit = hasGhostCircuitInventory() && this.circuitInventory != null + val handler = if (isExportHatch) exportItems else importItems + val hasGhostCircuit = hasGhostCircuitInventory() && circuitInventory != null return GTGuis.createPanel(this, backgroundWidth, backgroundHeight) .child(IKey.lang(metaFullName).asWidget() .pos(5, 5)) - .child(SlotGroupWidget.playerInventory() - .left(7).bottom(7)) + .child(SlotGroupWidget.playerInventory(false) + .left(7) + .bottom(7)) .child(Grid() .top(18) .height(rowSize * 18) @@ -323,18 +326,16 @@ class PartMachineHugeItemBus(metaTileEntityId: ResourceLocation, tier: Int) .minColWidth(18) .minRowHeight(18) .alignX(0.5f) - .mapTo(rowSize, rowSize * rowSize) { index -> + .mapTo(rowSize, rowSize * rowSize) { slotIdx: Int -> ItemSlot() - .slot(object : ModularSlot(handler, index) { override fun getSlotStackLimit(): Int = Int.MAX_VALUE } - .ignoreMaxStackSize(true) + .slot(SyncHandlers.itemSlot(handler, slotIdx) .slotGroup("item_inv") .changeListener { newItem, onlyAmountChanged, client, init -> if (onlyAmountChanged && handler is GTItemStackHandler) - { - handler.onContentsChanged(index) - } + handler.onContentsChanged(slotIdx) } - .accessibility(!this.isExportHatch, true)) + .ignoreMaxStackSize(true) + .accessibility(!isExportHatch, true)) }) .child(Flow.column() .pos(backgroundWidth - 7 - 18, backgroundHeight - 18 * 4 - 7 - 5) @@ -348,40 +349,48 @@ class PartMachineHugeItemBus(metaTileEntityId: ResourceLocation, tier: Int) .value(workingStateValue) .overlay(GTGuiTextures.BUTTON_ITEM_OUTPUT) .tooltipAutoUpdate(true) - .tooltipBuilder { tooltip -> - tooltip.addLine(if (workingStateValue.boolValue) - IKey.lang("gregtech.gui.item_auto_input.tooltip.enabled") - else - IKey.lang("gregtech.gui.item_auto_input.tooltip.disabled")) - }) - .child(ToggleButton() - .top(18) - .value(collapseStateValue) - .overlay(GTGuiTextures.BUTTON_AUTO_COLLAPSE) - .tooltipAutoUpdate(true) - .tooltipBuilder { tooltip -> - tooltip.addLine(if (collapseStateValue.boolValue) - IKey.lang("gregtech.gui.item_auto_collapse.tooltip.enabled") + .tooltipBuilder { + if (isExportHatch) + { + if (workingStateValue.boolValue) + it.addLine(IKey.lang("gregtech.gui.item_auto_output.tooltip.enabled")) + else + it.addLine(IKey.lang("gregtech.gui.item_auto_output.tooltip.disabled")) + } else - IKey.lang("gregtech.gui.item_auto_collapse.tooltip.disabled")) + { + if (workingStateValue.boolValue) + it.addLine(IKey.lang("gregtech.gui.item_auto_input.tooltip.enabled")) + else + it.addLine(IKey.lang("gregtech.gui.item_auto_input.tooltip.disabled")) + } }) - .childIf(hasGhostCircuit, GhostCircuitSlotWidget() - .slot(SyncHandlers.itemSlot(circuitInventory, 0)) - .background(GTGuiTextures.SLOT, GTGuiTextures.INT_CIRCUIT_OVERLAY)) - .childIf(!hasGhostCircuit, Widget() - .background(GTGuiTextures.SLOT, GTGuiTextures.BUTTON_X) - .tooltip { tooltip -> - tooltip.addLine(IKey.lang("gregtech.gui.configurator_slot.unavailable.tooltip")) - })) + .child(ToggleButton() + .top(18) + .value(collapseStateValue) + .overlay(GTGuiTextures.BUTTON_AUTO_COLLAPSE) + .tooltipAutoUpdate(true) + .tooltipBuilder { + + if (collapseStateValue.boolValue) + it.addLine( IKey.lang("gregtech.gui.item_auto_collapse.tooltip.enabled")) + else + it.addLine(IKey.lang("gregtech.gui.item_auto_collapse.tooltip.disabled")) + }) + .childIf(hasGhostCircuit, GhostCircuitSlotWidget() + .slot(circuitInventory, 0) + .background(GTGuiTextures.SLOT, GTGuiTextures.INT_CIRCUIT_OVERLAY)) + .childIf(!hasGhostCircuit, Widget() + .background(GTGuiTextures.SLOT, GTGuiTextures.BUTTON_X) + .tooltip { + it.addLine(IKey.lang("gregtech.gui.configurator_slot.unavailable.tooltip")) + })) } - override fun getSubItems(creativeTab: CreativeTabs, - subItems: NonNullList) + override fun getSubItems(creativeTab: CreativeTabs, subItems: NonNullList) { for (bus in GTLiteMetaTileEntities.HUGE_ITEM_IMPORT_BUS) - { subItems.add(bus.stackForm) - } } } \ No newline at end of file From 040c989af6a989ad45d81ce9480639290c54505b Mon Sep 17 00:00:00 2001 From: Magic_Sweepy Date: Fri, 14 Nov 2025 19:45:36 +0800 Subject: [PATCH 07/20] Disabled MUI2 dependencies transitive to resolve JEI version conflicts. --- build.gradle.kts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 60e738b2a..2ee31aaae 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -120,7 +120,11 @@ dependencies { implementation(libs.forgelin) { exclude("net.minecraftforge") } - implementation(deobf(libs.modularui)) + + implementation(libs.modularui) { + isTransitive = false + } + api(libs.codeChickenLib) implementation(deobf(files("libs/morphismlib-1.12.2-1.0.0.jar"))) implementation(deobf(files("libs/gregtech-1.12.2-master-#2874.jar"))) From f5fb53d1d27356b15857c6a6274862c96f873025 Mon Sep 17 00:00:00 2001 From: Magic_Sweepy Date: Fri, 14 Nov 2025 20:12:08 +0800 Subject: [PATCH 08/20] Resolved type parameter problem caused by PropertyEnum -> PropertyIntMap. --- .../gtlitecore/api/block/variant/types/CrucibleBlock.kt | 2 ++ .../gtlitecore/api/block/variant/types/MetalActiveBlock.kt | 2 ++ .../gtlitecore/api/block/variant/types/MetalBlock.kt | 2 ++ .../gtlitecore/api/block/variant/types/MetalCutoutBlock.kt | 2 ++ .../gtlitecore/api/block/variant/types/TransparentBlock.kt | 2 ++ .../gtlitecore/api/block/variant/types/WireCoilBlock.kt | 2 ++ 6 files changed, 12 insertions(+) diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/block/variant/types/CrucibleBlock.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/block/variant/types/CrucibleBlock.kt index bb4332e23..8be8ee980 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/block/variant/types/CrucibleBlock.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/block/variant/types/CrucibleBlock.kt @@ -27,6 +27,8 @@ fun VariantBlockFactory.makeCrucibleBlock() : VariantBlock this.setDefaultState(getState(Crucible.BRONZE)) } + override fun computeVariants(): Collection = enumValues().toList() + override fun canCreatureSpawn(state: IBlockState, world: IBlockAccess, pos: BlockPos, diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/block/variant/types/MetalActiveBlock.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/block/variant/types/MetalActiveBlock.kt index cb8840341..23287ead1 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/block/variant/types/MetalActiveBlock.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/block/variant/types/MetalActiveBlock.kt @@ -21,6 +21,8 @@ inline fun VariantBlockFactory.makeMetalActiveBlock() : VariantActiv this.setDefaultState(getState(VALUES[0])) } + override fun computeVariants(): Collection = enumValues().toList() + override fun canCreatureSpawn(state: IBlockState, world: IBlockAccess, pos: BlockPos, diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/block/variant/types/MetalBlock.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/block/variant/types/MetalBlock.kt index 14bb1296d..39e9ba888 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/block/variant/types/MetalBlock.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/block/variant/types/MetalBlock.kt @@ -21,6 +21,8 @@ inline fun VariantBlockFactory.makeMetalBlock() : VariantBlock wh this.setDefaultState(getState(VALUES[0])) } + override fun computeVariants(): Collection = enumValues().toList() + override fun canCreatureSpawn(state: IBlockState, world: IBlockAccess, pos: BlockPos, diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/block/variant/types/MetalCutoutBlock.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/block/variant/types/MetalCutoutBlock.kt index ac5483eeb..13d6d4365 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/block/variant/types/MetalCutoutBlock.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/block/variant/types/MetalCutoutBlock.kt @@ -24,6 +24,8 @@ inline fun VariantBlockFactory.makeMetalCutoutBlock() : VariantBlock this.setDefaultState(getState(VALUES[0])) } + override fun computeVariants(): Collection = enumValues().toList() + @Deprecated("Deprecated in Java") override fun isOpaqueCube(state: IBlockState) = false diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/block/variant/types/TransparentBlock.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/block/variant/types/TransparentBlock.kt index a1610e4d7..3209613e5 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/block/variant/types/TransparentBlock.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/block/variant/types/TransparentBlock.kt @@ -26,6 +26,8 @@ inline fun VariantBlockFactory.makeTransparentBlock() : VariantBlock this.useNeighborBrightness = true } + override fun computeVariants(): Collection = enumValues().toList() + override fun canCreatureSpawn(state: IBlockState, world: IBlockAccess, pos: BlockPos, diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/block/variant/types/WireCoilBlock.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/block/variant/types/WireCoilBlock.kt index f2aff2c68..7845859ca 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/block/variant/types/WireCoilBlock.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/block/variant/types/WireCoilBlock.kt @@ -32,6 +32,8 @@ fun VariantBlockFactory.makeWireCoilBlock() : VariantActiveBlock this.setDefaultState(getState(WireCoil.ADAMANTIUM)) } + override fun computeVariants(): Collection = enumValues().toList() + override fun canCreatureSpawn(state: IBlockState, world: IBlockAccess, pos: BlockPos, From ac47b61ab46522a4a2595061a0402cb144d55076 Mon Sep 17 00:00:00 2001 From: Magic_Sweepy Date: Sat, 15 Nov 2025 10:29:27 +0800 Subject: [PATCH 09/20] Let CTM dependency level be API. --- build.gradle.kts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2ee31aaae..1c4b6e588 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -126,6 +126,7 @@ dependencies { } api(libs.codeChickenLib) + api(libs.ctm) implementation(deobf(files("libs/morphismlib-1.12.2-1.0.0.jar"))) implementation(deobf(files("libs/gregtech-1.12.2-master-#2874.jar"))) implementation(deobf(libs.ae2ExtendedLife)) @@ -138,8 +139,6 @@ dependencies { compileOnly(libs.craftTweaker2) - runtimeOnly(deobf(libs.ctm)) - compileOnlyApi(libs.jetbrainsAnnotations) annotationProcessor(libs.jetbrainsAnnotations) } From c0e35dc2e13572d2121acd203c8244119efe17a5 Mon Sep 17 00:00:00 2001 From: Magic_Sweepy Date: Tue, 9 Dec 2025 19:49:08 +0800 Subject: [PATCH 10/20] Update GTCEu version. --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1c4b6e588..460bc1e8a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -128,7 +128,7 @@ dependencies { api(libs.codeChickenLib) api(libs.ctm) implementation(deobf(files("libs/morphismlib-1.12.2-1.0.0.jar"))) - implementation(deobf(files("libs/gregtech-1.12.2-master-#2874.jar"))) + implementation(deobf(files("libs/gregtech-1.12.2-master-#2700.jar"))) implementation(deobf(libs.ae2ExtendedLife)) implementation(libs.jei) implementation(libs.theOneProbe) From 17ae23c789063a20ad81774294fd3b692248ae97 Mon Sep 17 00:00:00 2001 From: Magic_Sweepy Date: Fri, 9 Jan 2026 21:33:48 +0800 Subject: [PATCH 11/20] Synced MUI2 related updating. --- .../gtlitecore/api/gui/GTLiteMuiTextures.kt | 86 +++++-------------- 1 file changed, 23 insertions(+), 63 deletions(-) diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt index 7f4e43a28..ebf1b6308 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt @@ -1,5 +1,6 @@ package gregtechlite.gtlitecore.api.gui +import com.cleanroommc.modularui.drawable.ColorType import com.cleanroommc.modularui.drawable.UITexture import gregtech.api.util.Size import gregtechlite.gtlitecore.api.MOD_ID @@ -71,8 +72,8 @@ object GTLiteMuiTextures * - 1: Enabled */ @JvmField - val BUTTON_ELEVATOR_EXTENSION = slice("textures/gui/widget/button_elevator_extension.png", - 18, 36, 18, 18, false) + val BUTTON_ELEVATOR_EXTENSION = sliceImage("textures/gui/widget/button_elevator_extension.png", + 18, 36, 18, 18) /** * Multiblock Button for Space Elevator Modules to refreshed its structure pattern. @@ -84,81 +85,40 @@ object GTLiteMuiTextures // region Helper Methods - private fun fullImage(path: String): UITexture - { - return fullImage(path, false) - } + private fun fullImage(path: String, colorType: ColorType? = null): UITexture = UITexture.fullImage(MOD_ID, path, colorType) - private fun fullImage(path: String, canApplyTheme: Boolean): UITexture + @Suppress("SameParameterValue") + private fun sliceImage(path: String, width: Int, height: Int, newWidth: Int, newHeight: Int, colorType: ColorType? = null): Array { - return UITexture.fullImage(MOD_ID, path, canApplyTheme) - } + require((width % newWidth == 0) || (height % newHeight == 0)) - private fun progressBar(path: String): UITexture - { - return progressBar(path, 20, 40) - } + val countX= width / newWidth + val countY= height / newHeight + val slices = arrayOfNulls(countX * countY) - private fun progressBar(path: String, canApplyTheme: Boolean): UITexture - { - return progressBar(path, 20, 40, false) - } - - private fun progressBar(path: String, width: Int, height: Int): UITexture - { - return progressBar(path, width, height, false) - } - - private fun progressBar(path: String, size: Size): UITexture - { - return progressBar(path, size, false) - } - - private fun progressBar(path: String, width: Int, height: Int, canApplyTheme: Boolean): UITexture - { - val builder = UITexture.Builder() - .location(MOD_ID, path) - .imageSize(width, height) - if (canApplyTheme) builder.canApplyTheme() - return builder.build() - } - - private fun progressBar(path: String, size: Size, canApplyTheme: Boolean): UITexture - { - return progressBar(path, size.width, size.height, canApplyTheme) - } - - private fun slice(path: String, width: Int, height: Int, sliceWidth: Int, sliceHeight: Int, - canApplyTheme: Boolean): Array - { - require(!(width % sliceWidth != 0 || height % sliceHeight != 0)) { - "Slice height and slice width must divide the image evenly!" - } - val countX = width / sliceWidth - val countY = height / sliceHeight - - val slices = mutableListOf() for (indexX in 0 ..< countX) { for (indexY in 0 ..< countY) { - slices.add(UITexture.builder() - .location(MOD_ID, path) - .canApplyTheme(canApplyTheme) - .imageSize(width, height) - .uv(indexX * sliceWidth, indexY * sliceHeight, sliceWidth, sliceHeight) - .build()) + slices[(indexX * countX) + indexY] = uiTexture{ + location(MOD_ID, path) + colorType(colorType) + imageSize(width, height) + xy(indexX * newWidth, indexY * newHeight, newWidth, newHeight) + } } } - return slices.toTypedArray() + return slices } - private fun slice(path: String, size: Size, sliceSize: Size, canApplyTheme: Boolean): Array - { - return slice(path, size.width, size.height, - sliceSize.width, sliceSize.height, canApplyTheme) + private fun progressBar(path: String, width: Int = 20, height: Int = 40, colorType: ColorType? = null) = uiTexture { + location(MOD_ID, path) + imageSize(width, height) + colorType(colorType) } + private fun uiTexture(builder: UITexture.Builder.() -> Unit) = UITexture.builder().apply(builder).build() + // endregion } \ No newline at end of file From 8bdf7c29f245b1de91153b76c56fa7989a3cc0a9 Mon Sep 17 00:00:00 2001 From: Magic_Sweepy Date: Wed, 11 Mar 2026 10:42:54 +0800 Subject: [PATCH 12/20] clean up unused api imports --- .../kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt | 1 - .../api/metatileentity/multiblock/MultiblockTooltipBuilder.kt | 2 -- .../gregtechlite/gtlitecore/api/recipe/GTLiteRecipeMaps.kt | 2 +- .../gtlitecore/api/recipe/GTLiteRecipeProperties.kt | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt index ebf1b6308..b9a92d879 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt @@ -2,7 +2,6 @@ package gregtechlite.gtlitecore.api.gui import com.cleanroommc.modularui.drawable.ColorType import com.cleanroommc.modularui.drawable.UITexture -import gregtech.api.util.Size import gregtechlite.gtlitecore.api.MOD_ID @Suppress("SameParameterValue") diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/metatileentity/multiblock/MultiblockTooltipBuilder.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/metatileentity/multiblock/MultiblockTooltipBuilder.kt index 003639ebb..950de5953 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/metatileentity/multiblock/MultiblockTooltipBuilder.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/metatileentity/multiblock/MultiblockTooltipBuilder.kt @@ -3,8 +3,6 @@ package gregtechlite.gtlitecore.api.metatileentity.multiblock import gregtech.api.capability.IMultipleRecipeMaps import gregtech.api.metatileentity.multiblock.MultiblockWithDisplayBase import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController -import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import net.minecraft.client.resources.I18n import net.minecraft.util.text.TextFormatting import net.minecraftforge.fml.relauncher.Side diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/recipe/GTLiteRecipeMaps.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/recipe/GTLiteRecipeMaps.kt index f0386cf65..e5f2728e9 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/recipe/GTLiteRecipeMaps.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/recipe/GTLiteRecipeMaps.kt @@ -29,12 +29,12 @@ import gregtechlite.gtlitecore.api.recipe.builder.PCBFactoryRecipeBuilder import gregtechlite.gtlitecore.api.recipe.builder.PseudoMultiRecipeBuilder import gregtechlite.gtlitecore.api.recipe.builder.QuantumForceTransformerRecipeBuilder import gregtechlite.gtlitecore.api.recipe.map.PseudoGroupRecipeMapBuilder -import gregtechlite.gtlitecore.api.recipe.ui.SingularityAssemblyUnitUI import gregtechlite.gtlitecore.api.recipe.ui.AntimatterForgeUI import gregtechlite.gtlitecore.api.recipe.ui.ComponentAssemblyLineUI import gregtechlite.gtlitecore.api.recipe.ui.LargeMixerUI import gregtechlite.gtlitecore.api.recipe.ui.MiningDroneAirportUI import gregtechlite.gtlitecore.api.recipe.ui.NanoAssemblyMatrixUI +import gregtechlite.gtlitecore.api.recipe.ui.SingularityAssemblyUnitUI import gregtechlite.gtlitecore.api.recipe.ui.SpaceAssemblerUI import gregtechlite.gtlitecore.api.recipe.ui.StellarForgeUI import gregtechlite.gtlitecore.core.sound.GTLiteSoundEvents diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/recipe/GTLiteRecipeProperties.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/recipe/GTLiteRecipeProperties.kt index 3d92cd9d6..8f37b3219 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/recipe/GTLiteRecipeProperties.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/recipe/GTLiteRecipeProperties.kt @@ -5,9 +5,9 @@ import gregtech.api.recipes.properties.RecipeProperty import gregtech.api.recipes.properties.impl.FusionEUToStartProperty import gregtech.common.items.MetaItems import gregtechlite.gtlitecore.GTLiteMod -import gregtechlite.gtlitecore.api.recipe.util.createDataItemWithTag import gregtechlite.gtlitecore.api.recipe.property.CircuitPatternProperty import gregtechlite.gtlitecore.api.recipe.property.RecipePropertyBuilder +import gregtechlite.gtlitecore.api.recipe.util.createDataItemWithTag import gregtechlite.gtlitecore.common.item.GTLiteMetaItems import net.minecraft.client.resources.I18n From 69b903af0875c80d9100080faa357717e15bb6c2 Mon Sep 17 00:00:00 2001 From: Magic_Sweepy Date: Wed, 11 Mar 2026 10:56:51 +0800 Subject: [PATCH 13/20] expose mui2 location ui texture methods for addon mod --- .../gtlitecore/api/gui/GTLiteMuiTextures.kt | 66 +++++++++++++------ 1 file changed, 45 insertions(+), 21 deletions(-) diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt index b9a92d879..0de5ceac9 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt @@ -11,14 +11,14 @@ object GTLiteMuiTextures // region Slot Textures @JvmField - val PRIMITIVE_FLUID_SLOT = fullImage("textures/gui/primitive/primitive_fluid_slot.png") + val PRIMITIVE_FLUID_SLOT = texture("textures/gui/primitive/primitive_fluid_slot.png") // endregion // region Progress Bar Textures @JvmField - val PRIMITIVE_BLAST_FURNACE_PROGRESS_BAR = fullImage("textures/gui/primitive/progress_bar_primitive_blast_furnace.png") + val PRIMITIVE_BLAST_FURNACE_PROGRESS_BAR = texture("textures/gui/primitive/progress_bar_primitive_blast_furnace.png") /** * Multiblock Progress Bar for Large Naquadah Reactor (LNR). @@ -53,16 +53,17 @@ object GTLiteMuiTextures // region Overlay Textures @JvmField - val PRIMITIVE_INT_CIRCUIT_OVERLAY = fullImage("textures/gui/primitive/int_circuit_overlay_primitive.png") + val PRIMITIVE_INT_CIRCUIT_OVERLAY = texture("textures/gui/primitive/int_circuit_overlay_primitive.png") // endregion // region Widget Textures + @JvmField - val FUSION_REACTOR_MK4_TITLE = fullImage("textures/gui/widget/fusion_reactor_mk4_title") + val FUSION_REACTOR_MK4_TITLE = texture("textures/gui/widget/fusion_reactor_mk4_title") @JvmField - val FUSION_REACTOR_MK5_TITLE = fullImage("textures/gui/widget/fusion_reactor_mk5_title") + val FUSION_REACTOR_MK5_TITLE = texture("textures/gui/widget/fusion_reactor_mk5_title") /** * Multiblock Button for Space Elevator to enabled/disabled extension structure. @@ -71,35 +72,51 @@ object GTLiteMuiTextures * - 1: Enabled */ @JvmField - val BUTTON_ELEVATOR_EXTENSION = sliceImage("textures/gui/widget/button_elevator_extension.png", - 18, 36, 18, 18) + val BUTTON_ELEVATOR_EXTENSION = texture("textures/gui/widget/button_elevator_extension.png", + 18, 36, 18, 18) /** * Multiblock Button for Space Elevator Modules to refreshed its structure pattern. */ @JvmField - val BUTTON_REFRESH_STRUCTURE_PATTERN = fullImage("textures/gui/widget/button_refresh_structure_pattern.png") + val BUTTON_REFRESH_STRUCTURE_PATTERN = texture("textures/gui/widget/button_refresh_structure_pattern.png") // endregion - // region Helper Methods - - private fun fullImage(path: String, colorType: ColorType? = null): UITexture = UITexture.fullImage(MOD_ID, path, colorType) + /** + * Creates ui texture with its [path] and [colorType] as theme. + * + * @param path The path in the mod specified namespace. + * @param colorType The color type (theme) of the texture. + */ + @JvmStatic + fun texture(path: String, colorType: ColorType? = null): UITexture = UITexture.fullImage(MOD_ID, path, colorType) - @Suppress("SameParameterValue") - private fun sliceImage(path: String, width: Int, height: Int, newWidth: Int, newHeight: Int, colorType: ColorType? = null): Array + /** + * Creates sliced ui texture with its [path] and [colorType] as theme. + * + * @param path The path in the mod specified namespace. + * @param width The original width of the ui texture. + * @param height The original height of the ui texture. + * @param newWidth The sliced width for the ui texture, should satisfy [width] / [newWidth] % 0. + * @param newHeight The sliced height for the ui texture, should satisfy [height] / [newHeight] % 0. + * @param colorType The color type (theme) of the texture. + */ + @JvmStatic + fun texture(path: String, width: Int, height: Int, newWidth: Int, newHeight: Int, + colorType: ColorType? = null): Array { require((width % newWidth == 0) || (height % newHeight == 0)) - val countX= width / newWidth - val countY= height / newHeight + val countX = width / newWidth + val countY = height / newHeight val slices = arrayOfNulls(countX * countY) for (indexX in 0 ..< countX) { for (indexY in 0 ..< countY) { - slices[(indexX * countX) + indexY] = uiTexture{ + slices[(indexX * countX) + indexY] = ui { location(MOD_ID, path) colorType(colorType) imageSize(width, height) @@ -107,17 +124,24 @@ object GTLiteMuiTextures } } } - return slices + return slices.filterNotNull().toTypedArray() } - private fun progressBar(path: String, width: Int = 20, height: Int = 40, colorType: ColorType? = null) = uiTexture { + /** + * Creates a GT format progress bar ui texture. + * + * @param path The path in the mod specified namespace. + * @param width The original width of the progress bar texture. + * @param height The original height of the progress bar texture. + * @param colorType The color type (theme) of the texture. + */ + @JvmStatic + fun progressBar(path: String, width: Int = 20, height: Int = 40, colorType: ColorType? = null): UITexture = ui { location(MOD_ID, path) imageSize(width, height) colorType(colorType) } - private fun uiTexture(builder: UITexture.Builder.() -> Unit) = UITexture.builder().apply(builder).build() - - // endregion + private fun ui(builder: UITexture.Builder.() -> Unit) = UITexture.builder().apply(builder).build() } \ No newline at end of file From 571db14e95db14ef634bc435fa01446fc96f413a Mon Sep 17 00:00:00 2001 From: Magic_Sweepy Date: Wed, 11 Mar 2026 11:02:55 +0800 Subject: [PATCH 14/20] expose internal mui texture area methods for addon mod --- .../gtlitecore/api/gui/GTLiteGuiTextures.kt | 33 +++++++++++++++---- .../gtlitecore/api/gui/GTLiteMuiTextures.kt | 2 +- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteGuiTextures.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteGuiTextures.kt index b6dcc9d99..3a2dadea2 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteGuiTextures.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteGuiTextures.kt @@ -304,18 +304,39 @@ object GTLiteGuiTextures // endregion - fun texture(path: String) = TextureArea(GTLiteMod.id(path), 0.0, 0.0, 1.0, 1.0) + /** + * Creates texture area with its [path]. + * + * This method create internal Modular UI format [TextureArea] for legacy GTCEu API, if you want to create an ui + * texture for Modular UI 2 format, please use methods in [GTLiteMuiTextures] class. + * + * @param path The path in the mod specified namespace. + * + * @see GTLiteMuiTextures.texture + */ + @JvmStatic + fun texture(path: String): TextureArea = TextureArea(GTLiteMod.id(path), 0.0, 0.0, 1.0, 1.0) + /** + * Creates steam textures with its [path]. + * + * This method create internal Modular UI format [TextureArea] for legacy GTCEu API, if you want to create an ui + * texture for Modular UI 2 format, please use methods in [GTLiteMuiTextures] class. + * + * @param path The path in the mod specified namespace. + * + * @see GTLiteMuiTextures.texture + * @see gregtech.api.mui.GTGuiTheme.BRONZE + * @see gregtech.api.mui.GTGuiTheme.STEEL + */ + @JvmStatic fun steamTexture(path: String): SteamTexture = runCatching { val constructor = SteamTexture::class.constructors .first { it.parameters.size == 2 } .also { it.isAccessible = true } - val bronzeTexture = TextureArea(GTLiteMod.id(String.format(path, "bronze")), - 0.0, 0.0, 1.0, 1.0) - - val steelTexture = TextureArea(GTLiteMod.id(String.format(path, "steel")), - 0.0, 0.0, 1.0, 1.0) + val bronzeTexture = TextureArea(GTLiteMod.id(path.format("bronze")), 0.0, 0.0, 1.0, 1.0) + val steelTexture = TextureArea(GTLiteMod.id(path.format("steel")), 0.0, 0.0, 1.0, 1.0) return@runCatching constructor.call(bronzeTexture, steelTexture) } diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt index 0de5ceac9..6add42082 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt @@ -142,6 +142,6 @@ object GTLiteMuiTextures colorType(colorType) } - private fun ui(builder: UITexture.Builder.() -> Unit) = UITexture.builder().apply(builder).build() + private fun ui(builder: UITexture.Builder.() -> Unit): UITexture = UITexture.builder().apply(builder).build() } \ No newline at end of file From 62bc84e67dba41f7fd5ede0ead3d74b633b58e7e Mon Sep 17 00:00:00 2001 From: Magic_Sweepy Date: Wed, 11 Mar 2026 11:31:13 +0800 Subject: [PATCH 15/20] clean up global imports --- .../gregtechlite/gtlitecore/api/collection/JavaMaps.kt | 2 +- .../gtlitecore/client/model/MaterialBlockStateLoader.kt | 2 +- .../client/renderer/handler/WrappedItemRenderer.kt | 5 +---- .../gregtechlite/gtlitecore/common/block/GTLiteBlocks.kt | 2 +- .../gtlitecore/common/block/GTLiteStoneVariantBlock.kt | 5 ----- .../multiblock/MultiblockAlloyBlastSmelter.kt | 6 +++--- .../multiblock/MultiblockBedrockDrillingRig.kt | 6 +++--- .../metatileentity/multiblock/MultiblockCVDUnit.kt | 6 +++--- .../multiblock/MultiblockCosmicRayDetector.kt | 6 +++--- .../multiblock/MultiblockCrystallizationCrucible.kt | 6 +++--- .../multiblock/MultiblockLaserInducedCVDUnit.kt | 6 +++--- .../multiblock/MultiblockNanoscaleFabricator.kt | 6 +++--- .../multiblock/MultiblockPlasmaEnhancedCVDUnit.kt | 6 +++--- .../metatileentity/multiblock/MultiblockSonicator.kt | 6 +++--- .../metatileentity/multiblock/MultiblockStellarForge.kt | 6 +++--- .../advanced/MultiblockAdvancedFusionReactor.kt | 6 +++--- .../multiblock/advanced/MultiblockArcFurnace.kt | 4 ++-- .../multiblock/advanced/MultiblockAssembler.kt | 6 +++--- .../multiblock/advanced/MultiblockAutoclave.kt | 6 +++--- .../multiblock/advanced/MultiblockBender.kt | 6 +++--- .../multiblock/advanced/MultiblockBioReactor.kt | 4 ++-- .../multiblock/advanced/MultiblockBrewery.kt | 6 +++--- .../multiblock/advanced/MultiblockBurnerReactor.kt | 6 +++--- .../multiblock/advanced/MultiblockCentrifuge.kt | 4 ++-- .../multiblock/advanced/MultiblockChemicalPlant.kt | 6 +++--- .../multiblock/advanced/MultiblockCryogenicFreezer.kt | 6 +++--- .../multiblock/advanced/MultiblockCryogenicReactor.kt | 6 +++--- .../multiblock/advanced/MultiblockCutter.kt | 6 +++--- .../multiblock/advanced/MultiblockDistillery.kt | 4 ++-- .../advanced/MultiblockElectricImplosionCompressor.kt | 6 +++--- .../multiblock/advanced/MultiblockElectrolyzer.kt | 6 +++--- .../multiblock/advanced/MultiblockElectromagnet.kt | 4 ++-- .../multiblock/advanced/MultiblockExtractor.kt | 6 +++--- .../multiblock/advanced/MultiblockExtruder.kt | 4 ++-- .../multiblock/advanced/MultiblockFluidSolidifier.kt | 6 +++--- .../multiblock/advanced/MultiblockFoodProcessor.kt | 6 +++--- .../multiblock/advanced/MultiblockForgeHammer.kt | 4 ++-- .../multiblock/advanced/MultiblockGasCollector.kt | 6 +++--- .../multiblock/advanced/MultiblockIndustrialCokeOven.kt | 4 ++-- .../multiblock/advanced/MultiblockLaserEngraver.kt | 6 +++--- .../multiblock/advanced/MultiblockMacerator.kt | 6 +++--- .../multiblock/advanced/MultiblockMassFabricator.kt | 6 +++--- .../multiblock/advanced/MultiblockMixer.kt | 6 +++--- .../multiblock/advanced/MultiblockOreWasher.kt | 6 +++--- .../multiblock/advanced/MultiblockPacker.kt | 4 ++-- .../multiblock/advanced/MultiblockReplicator.kt | 6 +++--- .../multiblock/advanced/MultiblockRockBreaker.kt | 6 +++--- .../multiblock/advanced/MultiblockSifter.kt | 4 ++-- .../multiblock/advanced/MultiblockVolcanus.kt | 6 +++--- .../multiblock/advanced/MultiblockWiremill.kt | 6 +++--- .../multiblock/mega/MultiblockEPCouplingAccelerator.kt | 4 ++-- .../mega/MultiblockEntrodynamicallyPhaseChanger.kt | 9 +++------ .../multiblock/mega/MultiblockNanoAssemblyComplex.kt | 6 +++--- .../multiblock/mega/MultiblockPlasmaArcTransmitter.kt | 6 +++--- .../integration/justenoughitems/JustEnoughItemsModule.kt | 1 - .../gtlitecore/loader/recipe/machine/AssemblerRecipes.kt | 1 - 56 files changed, 140 insertions(+), 153 deletions(-) diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/collection/JavaMaps.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/collection/JavaMaps.kt index a0104d36a..ae066c011 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/collection/JavaMaps.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/collection/JavaMaps.kt @@ -2,8 +2,8 @@ package gregtechlite.gtlitecore.api.collection +import java.util.* import com.google.gson.internal.LinkedTreeMap as MutableTreeMap -import java.util.TreeMap // region Tree Map diff --git a/src/main/kotlin/gregtechlite/gtlitecore/client/model/MaterialBlockStateLoader.kt b/src/main/kotlin/gregtechlite/gtlitecore/client/model/MaterialBlockStateLoader.kt index 67119cb38..8308fce37 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/client/model/MaterialBlockStateLoader.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/client/model/MaterialBlockStateLoader.kt @@ -8,8 +8,8 @@ import gregtech.api.unification.material.info.MaterialIconType import gregtech.api.util.GTUtility import gregtechlite.gtlitecore.api.GTLiteLog import gregtechlite.gtlitecore.api.MOD_ID -import gregtechlite.gtlitecore.api.collection.openHashMapOf import gregtechlite.gtlitecore.api.collection.hashTableOf +import gregtechlite.gtlitecore.api.collection.openHashMapOf import net.minecraft.client.renderer.block.model.IBakedModel import net.minecraft.client.renderer.block.model.ModelResourceLocation import net.minecraft.client.renderer.vertex.DefaultVertexFormats diff --git a/src/main/kotlin/gregtechlite/gtlitecore/client/renderer/handler/WrappedItemRenderer.kt b/src/main/kotlin/gregtechlite/gtlitecore/client/renderer/handler/WrappedItemRenderer.kt index 6432ca040..d0fa3aa3c 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/client/renderer/handler/WrappedItemRenderer.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/client/renderer/handler/WrappedItemRenderer.kt @@ -3,20 +3,17 @@ package gregtechlite.gtlitecore.client.renderer.handler import codechicken.lib.model.ModelRegistryHelper import com.morphismmc.morphismlib.client.Games import gregtechlite.gtlitecore.client.model.WrappedModelGetter -import net.minecraft.client.Minecraft import net.minecraft.client.renderer.EntityRenderer import net.minecraft.client.renderer.Tessellator import net.minecraft.client.renderer.block.model.BakedQuad import net.minecraft.client.renderer.block.model.IBakedModel -import net.minecraft.client.renderer.block.model.ModelResourceLocation import net.minecraft.client.renderer.texture.TextureUtil import net.minecraft.client.renderer.vertex.DefaultVertexFormats import net.minecraft.item.ItemStack import net.minecraft.util.EnumFacing -import net.minecraft.util.registry.IRegistry import net.minecraftforge.client.model.pipeline.LightUtil import net.minecraftforge.common.model.IModelState -import java.util.LinkedList +import java.util.* abstract class WrappedItemRenderer : PerspectiveAwareItemRenderer { diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/block/GTLiteBlocks.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/block/GTLiteBlocks.kt index 13b47c09b..177adc38c 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/block/GTLiteBlocks.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/block/GTLiteBlocks.kt @@ -13,8 +13,8 @@ import gregtechlite.gtlitecore.GTLiteMod import gregtechlite.gtlitecore.api.MOD_ID import gregtechlite.gtlitecore.api.block.variant.BlockVariantType import gregtechlite.gtlitecore.api.block.variant.VariantBlockFactory -import gregtechlite.gtlitecore.api.collection.openHashMapOf import gregtechlite.gtlitecore.api.collection.immutableMapOf +import gregtechlite.gtlitecore.api.collection.openHashMapOf import gregtechlite.gtlitecore.api.collection.treeMapOf import gregtechlite.gtlitecore.common.block.variant.ActiveUniqueCasing import gregtechlite.gtlitecore.common.block.variant.BoilerCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/block/GTLiteStoneVariantBlock.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/block/GTLiteStoneVariantBlock.kt index 1dbcc3a66..88a68577a 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/block/GTLiteStoneVariantBlock.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/block/GTLiteStoneVariantBlock.kt @@ -7,20 +7,15 @@ import gregtech.api.unification.ore.OrePrefix import gregtechlite.gtlitecore.api.MOD_ID import gregtechlite.gtlitecore.api.unification.GTLiteMaterials import gregtechlite.gtlitecore.common.creativetabs.GTLiteCreativeTabs -import net.minecraft.block.Block import net.minecraft.block.SoundType import net.minecraft.block.material.MapColor import net.minecraft.block.material.Material -import net.minecraft.block.properties.PropertyEnum -import net.minecraft.block.state.BlockStateContainer import net.minecraft.block.state.IBlockState import net.minecraft.entity.EntityLiving -import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.Item import net.minecraft.util.IStringSerializable import net.minecraft.util.math.BlockPos import net.minecraft.world.IBlockAccess -import net.minecraft.world.World import java.util.* import gregtech.api.unification.material.Material as GTMaterial diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockAlloyBlastSmelter.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockAlloyBlastSmelter.kt index dfe90f3d6..eb82920ef 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockAlloyBlastSmelter.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockAlloyBlastSmelter.kt @@ -23,12 +23,12 @@ import gregtech.api.util.TextFormattingUtil import gregtech.client.renderer.ICubeRenderer import gregtech.common.blocks.BlockWireCoil import gregtechlite.gtlitecore.api.GTLiteAPI -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault -import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault +import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTBoilerCasing import gregtechlite.gtlitecore.common.block.variant.ActiveUniqueCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockBedrockDrillingRig.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockBedrockDrillingRig.kt index 920b43265..663628f02 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockBedrockDrillingRig.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockBedrockDrillingRig.kt @@ -18,13 +18,13 @@ import gregtech.client.renderer.texture.Textures import gregtechlite.gtlitecore.api.GTLiteAPI.MOTOR_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.PISTON_CASING_TIER import gregtechlite.gtlitecore.api.extension.toItem +import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip +import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode +import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.motorCasings import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pistonCasings import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.DRILLING_RECIPES -import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip -import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.HSLASteel import gregtechlite.gtlitecore.common.block.adapter.GTMetalCasing import gregtechlite.gtlitecore.common.block.adapter.GTMultiblockCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockCVDUnit.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockCVDUnit.kt index 0614b357f..e640e6ff1 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockCVDUnit.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockCVDUnit.kt @@ -16,13 +16,13 @@ import gregtech.api.recipes.properties.RecipePropertyStorage import gregtech.client.renderer.ICubeRenderer import gregtechlite.gtlitecore.api.GTLiteAPI.EMITTER_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.PUMP_CASING_TIER +import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip +import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode +import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.emitterCasings import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pumpCasings import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.CVD_RECIPES -import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip -import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTGlassCasing import gregtechlite.gtlitecore.common.block.variant.MetalCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockCosmicRayDetector.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockCosmicRayDetector.kt index 18a2cb685..ea7c5d4d3 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockCosmicRayDetector.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockCosmicRayDetector.kt @@ -19,6 +19,9 @@ import gregtechlite.gtlitecore.api.GTLiteAPI.EMITTER_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.FIELD_GEN_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.PROCESSOR_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.SENSOR_CASING_TIER +import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip +import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode +import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.emitterCasings import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.fieldGenCasings import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault @@ -26,9 +29,6 @@ import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.processorCasin import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.sensorCasings import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.COSMIC_RAY_DETECTING_RECIPES import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeProperties -import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip -import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.HDCS import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTFusionCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockCrystallizationCrucible.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockCrystallizationCrucible.kt index 7f4d17013..a45c2d543 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockCrystallizationCrucible.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockCrystallizationCrucible.kt @@ -29,13 +29,13 @@ import gregtech.client.renderer.texture.Textures import gregtech.common.blocks.BlockWireCoil import gregtechlite.gtlitecore.api.GTLiteAPI.COIL_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.MOTOR_CASING_TIER +import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip +import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode +import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.coils import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.motorCasings import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.CRYSTALLIZATION_RECIPES -import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip -import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTMetalCasing import gregtechlite.gtlitecore.common.block.variant.ActiveUniqueCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockLaserInducedCVDUnit.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockLaserInducedCVDUnit.kt index 4926dcfe1..f3eb6fab6 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockLaserInducedCVDUnit.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockLaserInducedCVDUnit.kt @@ -18,6 +18,9 @@ import gregtech.client.renderer.ICubeRenderer import gregtechlite.gtlitecore.api.GTLiteAPI.EMITTER_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.PUMP_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.SENSOR_CASING_TIER +import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip +import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode +import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.emitterCasings import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pumpCasings @@ -26,9 +29,6 @@ import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.CRYSTALLIZATION_RECIP import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.LASER_CVD_RECIPES import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.MOLECULAR_BEAM_RECIPES import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.SONICATION_RECIPES -import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip -import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.HastelloyX import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.variant.GlassCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockNanoscaleFabricator.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockNanoscaleFabricator.kt index f1f1f585c..74108631b 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockNanoscaleFabricator.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockNanoscaleFabricator.kt @@ -25,15 +25,15 @@ import gregtech.core.sound.GTSoundEvents import gregtechlite.gtlitecore.api.GTLiteAPI.CRUCIBLE_STATS import gregtechlite.gtlitecore.api.GTLiteAPI.EMITTER_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.ROBOT_ARM_CASING_TIER +import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip +import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode +import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.emitterCasings import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getTierOrDefault import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.robotArmCasings import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.MOLECULAR_BEAM_RECIPES import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeProperties -import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip -import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.GTLiteBlocks import gregtechlite.gtlitecore.common.block.adapter.GTGlassCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockPlasmaEnhancedCVDUnit.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockPlasmaEnhancedCVDUnit.kt index 9a9fb3068..30bd7ab64 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockPlasmaEnhancedCVDUnit.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockPlasmaEnhancedCVDUnit.kt @@ -19,6 +19,9 @@ import gregtechlite.gtlitecore.api.GTLiteAPI.EMITTER_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.FIELD_GEN_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.PUMP_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.SENSOR_CASING_TIER +import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip +import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode +import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.emitterCasings import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.fieldGenCasings import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault @@ -28,9 +31,6 @@ import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.CRYSTALLIZATION_RECIP import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.MOLECULAR_BEAM_RECIPES import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.PLASMA_CVD_RECIPES import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.SONICATION_RECIPES -import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip -import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.variant.ActiveUniqueCasing import gregtechlite.gtlitecore.common.block.variant.GlassCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockSonicator.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockSonicator.kt index f27cf1588..8fc9c2dbe 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockSonicator.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockSonicator.kt @@ -18,14 +18,14 @@ import gregtech.client.renderer.ICubeRenderer import gregtechlite.gtlitecore.api.GTLiteAPI.BOROSILICATE_GLASS_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.MOTOR_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.PUMP_CASING_TIER +import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip +import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode +import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.borosilicateGlasses import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.motorCasings import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pumpCasings import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.SONICATION_RECIPES -import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip -import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTBoilerCasing import gregtechlite.gtlitecore.common.block.variant.MetalCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockStellarForge.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockStellarForge.kt index 5524ee5d4..56f341e8c 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockStellarForge.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/MultiblockStellarForge.kt @@ -17,13 +17,13 @@ import gregtech.api.recipes.properties.RecipePropertyStorage import gregtech.client.renderer.ICubeRenderer import gregtechlite.gtlitecore.api.GTLiteAPI.EMITTER_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.FIELD_GEN_CASING_TIER +import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip +import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode +import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.emitterCasings import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.fieldGenCasings import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.STELLAR_FORGE_RECIPES -import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip -import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Bedrockium import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTGlassCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockAdvancedFusionReactor.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockAdvancedFusionReactor.kt index d3ead4a6d..25afd9a72 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockAdvancedFusionReactor.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockAdvancedFusionReactor.kt @@ -24,6 +24,9 @@ import gregtechlite.gtlitecore.api.GTLiteAPI.DIVERTOR_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.FUSION_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.FUSION_COIL_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.VACUUM_TIER +import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip +import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode +import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.cryostats import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.divertors import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.fusionCasings @@ -32,9 +35,6 @@ import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.fusionVacuums import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.ADVANCED_FUSION_RECIPES import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeProperties -import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip -import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import net.minecraft.item.ItemStack import net.minecraft.util.ResourceLocation diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockArcFurnace.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockArcFurnace.kt index 908e58554..cae31e13c 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockArcFurnace.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockArcFurnace.kt @@ -21,11 +21,11 @@ import gregtech.client.renderer.texture.Textures import gregtech.common.blocks.BlockWireCoil import gregtechlite.gtlitecore.api.GTLiteAPI.COIL_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.PUMP_CASING_TIER -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pumpCasings import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pumpCasings import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTBoilerCasing import gregtechlite.gtlitecore.common.block.adapter.GTMetalCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockAssembler.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockAssembler.kt index a6c9e7bb7..8ab049ac1 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockAssembler.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockAssembler.kt @@ -18,12 +18,12 @@ import gregtech.client.renderer.ICubeRenderer import gregtech.client.renderer.texture.Textures import gregtechlite.gtlitecore.api.GTLiteAPI.CONVEYOR_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.ROBOT_ARM_CASING_TIER -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.conveyorCasings -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.robotArmCasings import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.conveyorCasings +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.robotArmCasings import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTBoilerCasing import gregtechlite.gtlitecore.common.block.adapter.GTGlassCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockAutoclave.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockAutoclave.kt index b1858bbae..ca98c5289 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockAutoclave.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockAutoclave.kt @@ -19,13 +19,13 @@ import gregtech.client.renderer.ICubeRenderer import gregtech.client.renderer.texture.Textures import gregtechlite.gtlitecore.api.GTLiteAPI.PISTON_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.PUMP_CASING_TIER +import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip +import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode +import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pistonCasings import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pumpCasings import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.VACUUM_CHAMBER_RECIPES -import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip -import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTBoilerCasing import gregtechlite.gtlitecore.common.block.adapter.GTGlassCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockBender.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockBender.kt index 470280c96..933a83255 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockBender.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockBender.kt @@ -20,12 +20,12 @@ import gregtech.client.renderer.ICubeRenderer import gregtech.client.renderer.texture.Textures import gregtechlite.gtlitecore.api.GTLiteAPI.MOTOR_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.PISTON_CASING_TIER -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.motorCasings -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pistonCasings import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.motorCasings +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pistonCasings import gregtechlite.gtlitecore.common.block.adapter.GTBoilerCasing import gregtechlite.gtlitecore.common.block.adapter.GTMetalCasing import net.minecraft.item.ItemStack diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockBioReactor.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockBioReactor.kt index 3e6ba1a2d..d7ec04555 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockBioReactor.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockBioReactor.kt @@ -22,13 +22,13 @@ import gregtech.client.renderer.ICubeRenderer import gregtech.client.renderer.texture.Textures import gregtechlite.gtlitecore.api.GTLiteAPI.CLEANROOM_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.SENSOR_CASING_TIER +import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip +import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.cleanroomCasings import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.sensorCasings import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.BIO_REACTOR_RECIPES import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.GREENHOUSE_RECIPES -import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTMultiblockCasing import gregtechlite.gtlitecore.common.block.variant.GlassCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockBrewery.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockBrewery.kt index fe043916a..9c46d265c 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockBrewery.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockBrewery.kt @@ -20,13 +20,13 @@ import gregtech.api.recipes.properties.RecipePropertyStorage import gregtech.client.renderer.ICubeRenderer import gregtechlite.gtlitecore.api.GTLiteAPI.MOTOR_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.PUMP_CASING_TIER +import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip +import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode +import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.motorCasings import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pumpCasings import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.CHEMICAL_DEHYDRATOR_RECIPES -import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip -import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTBoilerCasing import gregtechlite.gtlitecore.common.block.adapter.GTGlassCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockBurnerReactor.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockBurnerReactor.kt index 86051d98f..0226a968f 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockBurnerReactor.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockBurnerReactor.kt @@ -19,13 +19,13 @@ import gregtech.api.util.GTUtility.getTierByVoltage import gregtech.client.renderer.ICubeRenderer import gregtech.common.blocks.BlockFireboxCasing import gregtechlite.gtlitecore.api.GTLiteAPI.MOTOR_CASING_TIER +import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip +import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode +import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.motorCasings import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.BURNER_REACTOR_RECIPES import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.ROASTER_RECIPES -import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip -import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.IncoloyMA813 import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTBoilerCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockCentrifuge.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockCentrifuge.kt index bcfbba010..976f46300 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockCentrifuge.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockCentrifuge.kt @@ -20,11 +20,11 @@ import gregtech.api.util.GTUtility.getTierByVoltage import gregtech.client.renderer.ICubeRenderer import gregtech.client.renderer.texture.Textures import gregtechlite.gtlitecore.api.GTLiteAPI.MOTOR_CASING_TIER -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.motorCasings import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.motorCasings import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTBoilerCasing import gregtechlite.gtlitecore.common.block.adapter.GTMultiblockCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockChemicalPlant.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockChemicalPlant.kt index 732e68d3f..16a4458f9 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockChemicalPlant.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockChemicalPlant.kt @@ -16,13 +16,13 @@ import gregtech.client.renderer.texture.Textures import gregtech.common.blocks.BlockWireCoil import gregtechlite.gtlitecore.api.GTLiteAPI.COIL_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.PUMP_CASING_TIER +import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip +import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode +import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.coils import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pumpCasings import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.CHEMICAL_PLANT_RECIPES -import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip -import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.variant.BoilerCasing import gregtechlite.gtlitecore.common.block.variant.MetalCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockCryogenicFreezer.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockCryogenicFreezer.kt index fd4458326..b4ac1f8e8 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockCryogenicFreezer.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockCryogenicFreezer.kt @@ -21,12 +21,12 @@ import gregtech.client.renderer.ICubeRenderer import gregtech.client.renderer.texture.Textures import gregtechlite.gtlitecore.api.GTLiteAPI.MOTOR_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.PUMP_CASING_TIER -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.motorCasings -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pumpCasings import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.motorCasings +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pumpCasings import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.GelidCryotheum import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.variant.MetalCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockCryogenicReactor.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockCryogenicReactor.kt index 2c6790cec..c07aa710e 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockCryogenicReactor.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockCryogenicReactor.kt @@ -20,13 +20,13 @@ import gregtech.api.util.GTUtility.getTierByVoltage import gregtech.client.renderer.ICubeRenderer import gregtech.client.renderer.texture.Textures import gregtechlite.gtlitecore.api.GTLiteAPI.PUMP_CASING_TIER +import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip +import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode +import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pumpCasings import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.BATH_CONDENSER_RECIPES import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.CRYOGENIC_REACTOR_RECIPES -import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip -import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.HSLASteel import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTBoilerCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockCutter.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockCutter.kt index 199f5a47c..82c6a7cdf 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockCutter.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockCutter.kt @@ -20,14 +20,14 @@ import gregtech.client.renderer.ICubeRenderer import gregtech.client.renderer.texture.Textures import gregtechlite.gtlitecore.api.GTLiteAPI.CONVEYOR_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.MOTOR_CASING_TIER +import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip +import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode +import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.conveyorCasings import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.motorCasings import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.POLISHER_RECIPES import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.SLICER_RECIPES -import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip -import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.variant.MetalCasing import net.minecraft.item.ItemStack diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockDistillery.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockDistillery.kt index d9b383606..33f3418a4 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockDistillery.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockDistillery.kt @@ -33,10 +33,10 @@ import gregtech.api.util.RelativeDirection.UP import gregtech.client.renderer.ICubeRenderer import gregtech.client.renderer.texture.Textures import gregtechlite.gtlitecore.api.GTLiteAPI.PUMP_CASING_TIER -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pumpCasings import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pumpCasings import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTBoilerCasing import gregtechlite.gtlitecore.common.block.variant.MetalCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockElectricImplosionCompressor.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockElectricImplosionCompressor.kt index 568e91954..7214788e5 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockElectricImplosionCompressor.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockElectricImplosionCompressor.kt @@ -19,13 +19,13 @@ import gregtech.client.renderer.ICubeRenderer import gregtech.client.renderer.texture.Textures import gregtechlite.gtlitecore.api.GTLiteAPI.EMITTER_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.PISTON_CASING_TIER +import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip +import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode +import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.emitterCasings import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pistonCasings import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.ELECTRIC_IMPLOSION_RECIPES -import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip -import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTBoilerCasing import gregtechlite.gtlitecore.common.block.variant.GlassCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockElectrolyzer.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockElectrolyzer.kt index 107ed8879..054e15d8a 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockElectrolyzer.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockElectrolyzer.kt @@ -17,12 +17,12 @@ import gregtech.api.recipes.properties.RecipePropertyStorage import gregtech.client.renderer.ICubeRenderer import gregtechlite.gtlitecore.api.GTLiteAPI.MOTOR_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.PUMP_CASING_TIER -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.motorCasings -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pumpCasings import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.motorCasings +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pumpCasings import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTBoilerCasing import gregtechlite.gtlitecore.common.block.variant.MetalCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockElectromagnet.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockElectromagnet.kt index da6cbceab..2df2a3f18 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockElectromagnet.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockElectromagnet.kt @@ -19,11 +19,11 @@ import gregtech.api.recipes.properties.RecipePropertyStorage import gregtech.api.util.GTUtility.getTierByVoltage import gregtech.client.renderer.ICubeRenderer import gregtechlite.gtlitecore.api.GTLiteAPI.FIELD_GEN_CASING_TIER -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.fieldGenCasings -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.fieldGenCasings +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTMultiblockCasing import gregtechlite.gtlitecore.common.block.variant.MetalCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockExtractor.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockExtractor.kt index e9f325f7f..cac20c08b 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockExtractor.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockExtractor.kt @@ -20,12 +20,12 @@ import gregtech.client.renderer.ICubeRenderer import gregtech.client.renderer.texture.Textures import gregtechlite.gtlitecore.api.GTLiteAPI.MOTOR_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.PUMP_CASING_TIER -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.motorCasings -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pumpCasings import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.motorCasings +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pumpCasings import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTBoilerCasing import gregtechlite.gtlitecore.common.block.variant.MetalCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockExtruder.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockExtruder.kt index f9d037ddc..0ac246d96 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockExtruder.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockExtruder.kt @@ -17,11 +17,11 @@ import gregtech.api.recipes.properties.RecipePropertyStorage import gregtech.client.renderer.ICubeRenderer import gregtech.client.renderer.texture.Textures import gregtechlite.gtlitecore.api.GTLiteAPI.PISTON_CASING_TIER -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pistonCasings import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pistonCasings import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTBoilerCasing import gregtechlite.gtlitecore.common.block.variant.MetalCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockFluidSolidifier.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockFluidSolidifier.kt index 078c45204..cdf51a996 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockFluidSolidifier.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockFluidSolidifier.kt @@ -15,14 +15,14 @@ import gregtech.api.util.GTUtility.getTierByVoltage import gregtech.client.renderer.ICubeRenderer import gregtech.client.renderer.texture.Textures import gregtechlite.gtlitecore.api.GTLiteAPI.PUMP_CASING_TIER +import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip +import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode +import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pumpCasings import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.LAMINATOR_RECIPES import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.TOOL_CASTER_RECIPES import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.VULCANIZATION_RECIPES -import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip -import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.common.block.adapter.GTBoilerCasing import gregtechlite.gtlitecore.common.block.adapter.GTMetalCasing import net.minecraft.item.ItemStack diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockFoodProcessor.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockFoodProcessor.kt index 0b03c5692..16b7e0f4a 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockFoodProcessor.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockFoodProcessor.kt @@ -14,14 +14,14 @@ import gregtech.api.recipes.properties.RecipePropertyStorage import gregtech.client.renderer.ICubeRenderer import gregtechlite.gtlitecore.api.GTLiteAPI.PUMP_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.ROBOT_ARM_CASING_TIER +import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip +import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode +import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pumpCasings import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.robotArmCasings import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.FOOD_PROCESSOR_RECIPES import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.MULTICOOKER_RECIPES -import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip -import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTCleanroomCasing import gregtechlite.gtlitecore.common.block.adapter.GTGlassCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockForgeHammer.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockForgeHammer.kt index 680725f42..c0f24a147 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockForgeHammer.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockForgeHammer.kt @@ -19,11 +19,11 @@ import gregtech.api.recipes.properties.RecipePropertyStorage import gregtech.client.renderer.ICubeRenderer import gregtech.client.renderer.texture.Textures import gregtechlite.gtlitecore.api.GTLiteAPI.PISTON_CASING_TIER -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pistonCasings import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pistonCasings import gregtechlite.gtlitecore.common.block.adapter.GTMetalCasing import net.minecraft.item.ItemStack import net.minecraft.util.ResourceLocation diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockGasCollector.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockGasCollector.kt index 64984002f..5437ba5d2 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockGasCollector.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockGasCollector.kt @@ -17,12 +17,12 @@ import gregtech.api.util.GTUtility.getTierByVoltage import gregtech.client.renderer.ICubeRenderer import gregtech.client.renderer.texture.Textures import gregtechlite.gtlitecore.api.GTLiteAPI.PUMP_CASING_TIER -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pumpCasings -import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.LARGE_GAS_COLLECTOR_RECIPES import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pumpCasings +import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.LARGE_GAS_COLLECTOR_RECIPES import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.HSLASteel import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTGlassCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockIndustrialCokeOven.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockIndustrialCokeOven.kt index d7ba27a15..8d9d867b3 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockIndustrialCokeOven.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockIndustrialCokeOven.kt @@ -14,11 +14,11 @@ import gregtech.api.util.GTUtility.getTierByVoltage import gregtech.client.renderer.ICubeRenderer import gregtech.common.blocks.BlockWireCoil import gregtechlite.gtlitecore.api.GTLiteAPI.COIL_TIER -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.coils -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.coils +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.variant.MetalCasing import net.minecraft.item.ItemStack diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockLaserEngraver.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockLaserEngraver.kt index 1329dfcc6..75ad356bc 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockLaserEngraver.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockLaserEngraver.kt @@ -18,12 +18,12 @@ import gregtech.client.renderer.ICubeRenderer import gregtech.client.renderer.texture.Textures import gregtechlite.gtlitecore.api.GTLiteAPI.CONVEYOR_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.EMITTER_CASING_TIER -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.conveyorCasings -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.emitterCasings -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.conveyorCasings +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.emitterCasings +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.variant.GlassCasing import gregtechlite.gtlitecore.common.block.variant.MetalCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockMacerator.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockMacerator.kt index 49df817c8..f32b0a77e 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockMacerator.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockMacerator.kt @@ -17,12 +17,12 @@ import gregtech.api.recipes.properties.RecipePropertyStorage import gregtech.client.renderer.ICubeRenderer import gregtechlite.gtlitecore.api.GTLiteAPI.MOTOR_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.PISTON_CASING_TIER -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.motorCasings -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pistonCasings import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.motorCasings +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pistonCasings import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.variant.MetalCasing import net.minecraft.item.ItemStack diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockMassFabricator.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockMassFabricator.kt index 174c011be..778a68783 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockMassFabricator.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockMassFabricator.kt @@ -20,14 +20,14 @@ import gregtechlite.gtlitecore.api.GTLiteAPI.EMITTER_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.FIELD_GEN_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.PROCESSOR_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.SENSOR_CASING_TIER +import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip +import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode +import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.emitterCasings import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.fieldGenCasings import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.processorCasings import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.sensorCasings -import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip -import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTBoilerCasing import gregtechlite.gtlitecore.common.block.adapter.GTFusionCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockMixer.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockMixer.kt index b7674d9e0..422ac7cc0 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockMixer.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockMixer.kt @@ -12,12 +12,12 @@ import gregtech.api.recipes.properties.RecipePropertyStorage import gregtech.client.renderer.ICubeRenderer import gregtech.client.renderer.texture.Textures import gregtechlite.gtlitecore.api.GTLiteAPI.MOTOR_CASING_TIER -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.motorCasings -import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.LARGE_MIXER_RECIPES import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.motorCasings +import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.LARGE_MIXER_RECIPES import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTTurbineCasing import gregtechlite.gtlitecore.common.block.variant.MetalCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockOreWasher.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockOreWasher.kt index 68c93400c..3f68b04fa 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockOreWasher.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockOreWasher.kt @@ -20,12 +20,12 @@ import gregtech.api.recipes.properties.RecipePropertyStorage import gregtech.api.util.GTUtility.getTierByVoltage import gregtech.client.renderer.ICubeRenderer import gregtechlite.gtlitecore.api.GTLiteAPI.PUMP_CASING_TIER -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pumpCasings -import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.CATALYTIC_REFORMER_RECIPES import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pumpCasings +import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.CATALYTIC_REFORMER_RECIPES import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTBoilerCasing import gregtechlite.gtlitecore.common.block.variant.MetalCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockPacker.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockPacker.kt index 453a7855c..8b073b25e 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockPacker.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockPacker.kt @@ -18,11 +18,11 @@ import gregtech.api.util.GTUtility.getTierByVoltage import gregtech.client.renderer.ICubeRenderer import gregtech.client.renderer.texture.Textures import gregtechlite.gtlitecore.api.GTLiteAPI.ROBOT_ARM_CASING_TIER -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.robotArmCasings import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.robotArmCasings import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.variant.MetalCasing import net.minecraft.item.ItemStack diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockReplicator.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockReplicator.kt index 54bf4e1f1..6baddf75d 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockReplicator.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockReplicator.kt @@ -20,14 +20,14 @@ import gregtechlite.gtlitecore.api.GTLiteAPI.EMITTER_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.FIELD_GEN_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.PROCESSOR_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.SENSOR_CASING_TIER +import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip +import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode +import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.emitterCasings import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.fieldGenCasings import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.processorCasings import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.sensorCasings -import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip -import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTFusionCasing import gregtechlite.gtlitecore.common.block.variant.MetalCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockRockBreaker.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockRockBreaker.kt index 8b979daea..c902f7b58 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockRockBreaker.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockRockBreaker.kt @@ -18,12 +18,12 @@ import gregtech.client.renderer.ICubeRenderer import gregtech.client.renderer.texture.Textures import gregtechlite.gtlitecore.api.GTLiteAPI.CONVEYOR_CASING_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.PISTON_CASING_TIER -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.conveyorCasings -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pistonCasings import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.conveyorCasings +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.pistonCasings import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.variant.MetalCasing import net.minecraft.item.ItemStack diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockSifter.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockSifter.kt index 07da58d64..869ba5bff 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockSifter.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockSifter.kt @@ -13,11 +13,11 @@ import gregtech.api.recipes.properties.RecipePropertyStorage import gregtech.api.util.GTUtility.getTierByVoltage import gregtech.client.renderer.ICubeRenderer import gregtechlite.gtlitecore.api.GTLiteAPI.CONVEYOR_CASING_TIER -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.conveyorCasings -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.conveyorCasings +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTMultiblockCasing import gregtechlite.gtlitecore.common.block.variant.MetalCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockVolcanus.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockVolcanus.kt index 7ef38b72a..b966611c1 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockVolcanus.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockVolcanus.kt @@ -30,12 +30,12 @@ import gregtech.common.blocks.BlockWireCoil import gregtech.core.sound.GTSoundEvents import gregtechlite.gtlitecore.api.GTLiteAPI.COIL_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.MOTOR_CASING_TIER -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.coils -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.motorCasings import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.coils +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.motorCasings import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.BlazingPyrotheum import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.variant.MetalCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockWiremill.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockWiremill.kt index 097a5ad57..b1234c2dc 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockWiremill.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/advanced/MultiblockWiremill.kt @@ -19,12 +19,12 @@ import gregtech.api.util.GTUtility.getTierByVoltage import gregtech.client.renderer.ICubeRenderer import gregtech.client.renderer.texture.Textures import gregtechlite.gtlitecore.api.GTLiteAPI.MOTOR_CASING_TIER -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.motorCasings -import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.LOOM_RECIPES import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.motorCasings +import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.LOOM_RECIPES import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTTurbineCasing import gregtechlite.gtlitecore.common.block.variant.MetalCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/mega/MultiblockEPCouplingAccelerator.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/mega/MultiblockEPCouplingAccelerator.kt index f2d8e8c79..a97f322c3 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/mega/MultiblockEPCouplingAccelerator.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/mega/MultiblockEPCouplingAccelerator.kt @@ -23,11 +23,11 @@ import gregtech.common.metatileentities.multi.electric.MetaTileEntityMultiSmelte import gregtechlite.gtlitecore.api.GTLiteAPI.FUSION_COIL_TIER import gregtechlite.gtlitecore.api.capability.logic.ExtendedPowerMultiblockRecipeLogic import gregtechlite.gtlitecore.api.extension.EUt -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.fusionCoils -import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.fusionCoils +import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTComputerCasing import gregtechlite.gtlitecore.common.block.variant.science.ScienceCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/mega/MultiblockEntrodynamicallyPhaseChanger.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/mega/MultiblockEntrodynamicallyPhaseChanger.kt index cb525dcbd..05db22ec9 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/mega/MultiblockEntrodynamicallyPhaseChanger.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/mega/MultiblockEntrodynamicallyPhaseChanger.kt @@ -1,10 +1,8 @@ package gregtechlite.gtlitecore.common.metatileentity.multiblock.mega import gregtech.api.GTValues.LV -import gregtech.api.GTValues.VOC import gregtech.api.capability.IHeatingCoil import gregtech.api.capability.impl.EnergyContainerList -import gregtech.api.capability.impl.HeatingCoilRecipeLogic import gregtech.api.metatileentity.interfaces.IGregTechTileEntity import gregtech.api.metatileentity.multiblock.IMultiblockPart import gregtech.api.metatileentity.multiblock.MultiMapMultiblockController @@ -23,7 +21,6 @@ import gregtech.api.recipes.logic.OCParams import gregtech.api.recipes.logic.OverclockingLogic.PERFECT_DURATION_FACTOR import gregtech.api.recipes.properties.RecipePropertyStorage import gregtech.api.recipes.properties.impl.TemperatureProperty -import gregtech.api.util.GTUtility.getFloorTierByVoltage import gregtech.api.util.GTUtility.getTierByVoltage import gregtech.api.util.KeyUtil import gregtech.api.util.TextFormattingUtil.formatNumbers @@ -31,13 +28,13 @@ import gregtech.client.renderer.ICubeRenderer import gregtech.common.blocks.BlockWireCoil import gregtechlite.gtlitecore.api.GTLiteAPI.COIL_TIER import gregtechlite.gtlitecore.api.capability.logic.ExtendedPowerHeatingCoilRecipeLogic +import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip +import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode +import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.coils import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.ALLOY_BLAST_RECIPES import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.TOPOLOGICAL_ORDER_CHANGING_RECIPES -import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip -import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.variant.GlassCasing import gregtechlite.gtlitecore.common.block.variant.MetalCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/mega/MultiblockNanoAssemblyComplex.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/mega/MultiblockNanoAssemblyComplex.kt index 6846ea725..ea2a1ffed 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/mega/MultiblockNanoAssemblyComplex.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/mega/MultiblockNanoAssemblyComplex.kt @@ -14,11 +14,11 @@ import gregtech.api.recipes.RecipeMaps.ASSEMBLER_RECIPES import gregtech.api.recipes.logic.OverclockingLogic.PERFECT_DURATION_FACTOR import gregtech.client.renderer.ICubeRenderer import gregtechlite.gtlitecore.api.capability.logic.ExtendedPowerMultiblockRecipeLogic -import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.SINGULARITY_ASSEMBLY_RECIPES -import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.NANO_ASSEMBLY_MATRIX_RECIPES -import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.PCB_FACTORY_RECIPES import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode +import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.NANO_ASSEMBLY_MATRIX_RECIPES +import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.PCB_FACTORY_RECIPES +import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.SINGULARITY_ASSEMBLY_RECIPES import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.adapter.GTGlassCasing import gregtechlite.gtlitecore.common.block.variant.ActiveUniqueCasing diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/mega/MultiblockPlasmaArcTransmitter.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/mega/MultiblockPlasmaArcTransmitter.kt index dab07417b..a93d86a3c 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/mega/MultiblockPlasmaArcTransmitter.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/metatileentity/multiblock/mega/MultiblockPlasmaArcTransmitter.kt @@ -19,14 +19,14 @@ import gregtechlite.gtlitecore.api.GTLiteAPI.STANDARD_SPACETIME_FIELD_GEN_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.STANDARD_STABILIZATION_FIELD_GEN_TIER import gregtechlite.gtlitecore.api.GTLiteAPI.STANDARD_TIME_ACCELERATION_FIELD_GEN_TIER import gregtechlite.gtlitecore.api.capability.logic.ExtendedPowerMultiblockRecipeLogic +import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip +import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode +import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.getAttributeOrDefault import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.standardSpacetimeFieldGens import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.standardStabilizationFieldGens import gregtechlite.gtlitecore.api.pattern.TraceabilityPredicates.standardTimeAccelerationFieldGens import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.PLASMA_ARC_TRANSMITTER_RECIPES -import gregtechlite.gtlitecore.api.metatileentity.multiblock.MultiblockTooltipBuilder.Companion.addTooltip -import gregtechlite.gtlitecore.api.metatileentity.multiblock.OverclockMode -import gregtechlite.gtlitecore.api.metatileentity.multiblock.UpgradeMode import gregtechlite.gtlitecore.client.renderer.texture.GTLiteOverlays import gregtechlite.gtlitecore.common.block.variant.science.ScienceCasing import net.minecraft.client.resources.I18n diff --git a/src/main/kotlin/gregtechlite/gtlitecore/integration/justenoughitems/JustEnoughItemsModule.kt b/src/main/kotlin/gregtechlite/gtlitecore/integration/justenoughitems/JustEnoughItemsModule.kt index c6ab780b3..7505267bc 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/integration/justenoughitems/JustEnoughItemsModule.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/integration/justenoughitems/JustEnoughItemsModule.kt @@ -11,7 +11,6 @@ import gregtechlite.gtlitecore.api.module.Module import gregtechlite.gtlitecore.api.recipe.frontend.SpacePumpRecipeFrontend import gregtechlite.gtlitecore.common.item.GTLiteMetaItem1 import gregtechlite.gtlitecore.common.item.GTLiteMetaItem2 -import gregtechlite.gtlitecore.common.item.GTLiteMetaItems import gregtechlite.gtlitecore.common.item.behavior.CropSeedBehavior import gregtechlite.gtlitecore.common.metatileentity.GTLiteMetaTileEntities import gregtechlite.gtlitecore.core.module.GTLiteModules.Companion.MODULE_JEI diff --git a/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/machine/AssemblerRecipes.kt b/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/machine/AssemblerRecipes.kt index 91737a157..ab1b53639 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/machine/AssemblerRecipes.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/machine/AssemblerRecipes.kt @@ -81,7 +81,6 @@ import gregtech.common.metatileentities.MetaTileEntities.ALUMINIUM_CRATE import gregtech.common.metatileentities.MetaTileEntities.ALUMINIUM_DRUM import gregtech.common.metatileentities.MetaTileEntities.BRONZE_CRATE import gregtech.common.metatileentities.MetaTileEntities.BRONZE_DRUM -import gregtech.common.metatileentities.MetaTileEntities.ENERGY_OUTPUT_HATCH_16A import gregtech.common.metatileentities.MetaTileEntities.ENERGY_OUTPUT_HATCH_4A import gregtech.common.metatileentities.MetaTileEntities.FLUID_EXPORT_HATCH import gregtech.common.metatileentities.MetaTileEntities.FLUID_IMPORT_HATCH From 236867525f4f053f6e50af657463e26d9b18eaa6 Mon Sep 17 00:00:00 2001 From: Magic_Sweepy Date: Wed, 11 Mar 2026 11:57:16 +0800 Subject: [PATCH 16/20] try to update to the latest GTCEu version --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 485306da5..127f2af72 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -128,7 +128,7 @@ dependencies { api(libs.codeChickenLib) api(libs.ctm) implementation(deobf(files("libs/morphismlib-1.12.2-1.0.0.jar"))) - implementation(deobf(files("libs/gregtech-1.12.2-master-#2700.jar"))) + implementation(deobf(files("libs/gregtech-1.12.2-master-#2901.jar"))) implementation(deobf(libs.ae2ExtendedLife)) implementation(libs.jei) implementation(libs.theOneProbe) From c3522271972fbb599f3e7ec83db5070d0793a197 Mon Sep 17 00:00:00 2001 From: Magic_Sweepy Date: Wed, 11 Mar 2026 14:08:45 +0800 Subject: [PATCH 17/20] adhoc compatibility fixes for MUI2 3.0.6 with GTCEu --- gradle/libs.versions.toml | 2 +- .../gtlitecore/mixins/LateMixinLoader.java | 2 +- .../gregtech/AccessorMultiblockUIFactory.java | 17 +++ .../gregtech/MixinMultiblockUIFactory.java | 118 ++++++++++++++++++ .../modularui/MixinPanelSyncManager.java | 19 +++ .../resources/mixins.gtlitecore.gregtech.json | 2 + .../mixins.gtlitecore.modularui.json | 13 ++ 7 files changed, 171 insertions(+), 2 deletions(-) create mode 100644 src/main/java/gregtechlite/gtlitecore/mixins/gregtech/AccessorMultiblockUIFactory.java create mode 100644 src/main/java/gregtechlite/gtlitecore/mixins/gregtech/MixinMultiblockUIFactory.java create mode 100644 src/main/java/gregtechlite/gtlitecore/mixins/modularui/MixinPanelSyncManager.java create mode 100644 src/main/resources/mixins.gtlitecore.modularui.json diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 59f484d3a..6cdc0582e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ jetbrainsAnnotations = "24.1.0" # Mods forgelin = "2.1.0.0" mixinBooter = "9.1" -modularui = "3.0.4" +modularui = "3.0.6" codeChickenLib = "3.2.3.358" groovyScript = "1.2.0-hotfix1" craftTweaker2 = "1.12-4.1.20.700" diff --git a/src/main/java/gregtechlite/gtlitecore/mixins/LateMixinLoader.java b/src/main/java/gregtechlite/gtlitecore/mixins/LateMixinLoader.java index 0cdd9d353..c07679d40 100644 --- a/src/main/java/gregtechlite/gtlitecore/mixins/LateMixinLoader.java +++ b/src/main/java/gregtechlite/gtlitecore/mixins/LateMixinLoader.java @@ -11,7 +11,7 @@ public final class LateMixinLoader implements ILateMixinLoader @Override public List getMixinConfigs() { - return MixinUtil.getMixinConfigs("gregtech", "jei"); + return MixinUtil.getMixinConfigs("gregtech", "jei", "modularui"); } } diff --git a/src/main/java/gregtechlite/gtlitecore/mixins/gregtech/AccessorMultiblockUIFactory.java b/src/main/java/gregtechlite/gtlitecore/mixins/gregtech/AccessorMultiblockUIFactory.java new file mode 100644 index 000000000..142bf2f7c --- /dev/null +++ b/src/main/java/gregtechlite/gtlitecore/mixins/gregtech/AccessorMultiblockUIFactory.java @@ -0,0 +1,17 @@ +package gregtechlite.gtlitecore.mixins.gregtech; + +import gregtech.api.metatileentity.multiblock.MultiblockWithDisplayBase; +import gregtech.api.metatileentity.multiblock.ui.MultiblockUIFactory; +import gregtechlite.gtlitecore.mixins.Implemented; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Implemented(at = "https://github.com/GregTechCEu/GregTech/pull/2900") +@Mixin(value = MultiblockUIFactory.class, remap = false) +public interface AccessorMultiblockUIFactory +{ + + @Accessor("mte") + MultiblockWithDisplayBase mte(); + +} diff --git a/src/main/java/gregtechlite/gtlitecore/mixins/gregtech/MixinMultiblockUIFactory.java b/src/main/java/gregtechlite/gtlitecore/mixins/gregtech/MixinMultiblockUIFactory.java new file mode 100644 index 000000000..9a18152bf --- /dev/null +++ b/src/main/java/gregtechlite/gtlitecore/mixins/gregtech/MixinMultiblockUIFactory.java @@ -0,0 +1,118 @@ +package gregtechlite.gtlitecore.mixins.gregtech; + +import com.cleanroommc.modularui.factory.PosGuiData; +import com.cleanroommc.modularui.screen.ModularPanel; +import com.cleanroommc.modularui.utils.Alignment; +import com.cleanroommc.modularui.value.sync.PanelSyncManager; +import com.cleanroommc.modularui.widget.Widget; +import com.cleanroommc.modularui.widgets.SlotGroupWidget; +import com.cleanroommc.modularui.widgets.layout.Flow; +import gregtech.api.metatileentity.multiblock.MultiblockWithDisplayBase; +import gregtech.api.metatileentity.multiblock.ProgressBarMultiblock; +import gregtech.api.metatileentity.multiblock.ui.MultiblockUIFactory; +import gregtech.api.metatileentity.multiblock.ui.MultiblockUIFactory.Bars; +import gregtech.api.mui.GTGuis; +import gregtechlite.gtlitecore.mixins.Compat; +import gregtechlite.gtlitecore.mixins.Implemented; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; + +@Implemented(at = "https://github.com/GregTechCEu/GregTech/pull/2900") +@Compat(modId = { "gregtech", "modularui" }) +@Mixin(value = MultiblockUIFactory.class, remap = false) +public abstract class MixinMultiblockUIFactory +{ + + @Shadow + private int width; + + @Shadow + private int height; + + @Shadow + private MultiblockUIFactory.ScreenFunction screenFunction; + + @Shadow + private boolean disableDisplay; + + @Shadow + private boolean disableButtons; + + /** + * @author Magic_Sweepy + * @reason For Modular UI 3.0.6+ version, the name of a {@link ModularPanel} be final, so it cannot be rewritten by + * the legacy {@code debugName} method. We should make compatible with Retro Sophisticated Backpacks mod, + * but GTCEu only compatible with Modular UI 3.0.4, so we used mixin to fix this method call in GTCEu. + */ + @NotNull + @Overwrite + public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager syncManager) + { + MultiblockWithDisplayBase mte = ((AccessorMultiblockUIFactory) this).mte(); + + ModularPanel panel = GTGuis.createPanel(mte, width, height) + .childIf(!disableDisplay, () -> createScreen(syncManager)); + + if (mte instanceof ProgressBarMultiblock && ((ProgressBarMultiblock) mte).hasBars()) + { + ProgressBarMultiblock progressBarMTE = ((ProgressBarMultiblock) mte); + panel.height(height + (Bars.HEIGHT * gtlitecore$calculateRows(progressBarMTE.getProgressBarCount())) - 2); + panel.child(createBars(progressBarMTE, syncManager)); + } + + if (disableDisplay && screenFunction != null) + { + screenFunction.addWidgets(panel, syncManager); + } + + SlotGroupWidget playerInv = SlotGroupWidget.playerInventory(false); + if (disableButtons) + { + playerInv.alignX(0.5f); + } + else + { + playerInv.left(4); + } + + return panel.child(Flow.row() + .bottom(7) + .coverChildrenHeight() + .margin(4, 0) + .crossAxisAlignment(Alignment.CrossAxis.CENTER) + .child(playerInv) + .childIf(!disableButtons, () -> createButtons(panel, syncManager, guiData))); + } + + @NotNull + @Shadow + protected abstract Flow createButtons(@NotNull ModularPanel mainPanel, @NotNull PanelSyncManager panelSyncManager, PosGuiData guiData); + + @Nullable + @Shadow + protected abstract Flow createBars(@NotNull ProgressBarMultiblock progressMulti, @NotNull PanelSyncManager panelSyncManager); + + @Shadow + protected abstract Widget createScreen(PanelSyncManager syncManager); + + @Unique + private static int gtlitecore$calculateRows(int count) + { + if (count <= 3) + { + return 1; + } + + if (count <= 8) + { + return 2; + } + + throw new UnsupportedOperationException("Cannot compute progress bar rows for count " + count); + } + +} diff --git a/src/main/java/gregtechlite/gtlitecore/mixins/modularui/MixinPanelSyncManager.java b/src/main/java/gregtechlite/gtlitecore/mixins/modularui/MixinPanelSyncManager.java new file mode 100644 index 000000000..0ab7e91d2 --- /dev/null +++ b/src/main/java/gregtechlite/gtlitecore/mixins/modularui/MixinPanelSyncManager.java @@ -0,0 +1,19 @@ +package gregtechlite.gtlitecore.mixins.modularui; + +import com.cleanroommc.modularui.value.sync.ISyncRegistrar; +import com.cleanroommc.modularui.value.sync.PanelSyncManager; +import com.cleanroommc.modularui.value.sync.SyncHandler; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; + +@Mixin(value = PanelSyncManager.class, remap = false) +public abstract class MixinPanelSyncManager implements ISyncRegistrar +{ + + @Unique + public PanelSyncManager syncValue(String name, SyncHandler syncHandler) + { + return syncValue(name, 0, syncHandler); + } + +} diff --git a/src/main/resources/mixins.gtlitecore.gregtech.json b/src/main/resources/mixins.gtlitecore.gregtech.json index 921469897..6bf1bdc67 100644 --- a/src/main/resources/mixins.gtlitecore.gregtech.json +++ b/src/main/resources/mixins.gtlitecore.gregtech.json @@ -6,8 +6,10 @@ "minVersion": "0.8.3", "compatibilityLevel": "JAVA_8", "mixins": [ + "AccessorMultiblockUIFactory", "AccessorTraceabilityPredicate", "MixinBlockPattern", + "MixinMultiblockUIFactory", "MixinCoreModule", "MixinDualHandler", "MixinFuelRecipeLogic", diff --git a/src/main/resources/mixins.gtlitecore.modularui.json b/src/main/resources/mixins.gtlitecore.modularui.json new file mode 100644 index 000000000..c328c7d0e --- /dev/null +++ b/src/main/resources/mixins.gtlitecore.modularui.json @@ -0,0 +1,13 @@ +{ + "package": "gregtechlite.gtlitecore.mixins.modularui", + "required": true, + "refmap": "mixins.gtlitecore.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8.3", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinPanelSyncManager" + ], + "server": [], + "client": [] +} From 1001944b1e19abc5b872ee3f47ba667b0a5fcbd9 Mon Sep 17 00:00:00 2001 From: Magic_Sweepy Date: Wed, 11 Mar 2026 14:13:21 +0800 Subject: [PATCH 18/20] slotGroup registration fixes --- .../mixins/modularui/MixinPanelSyncManager.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/main/java/gregtechlite/gtlitecore/mixins/modularui/MixinPanelSyncManager.java b/src/main/java/gregtechlite/gtlitecore/mixins/modularui/MixinPanelSyncManager.java index 0ab7e91d2..a7a8c497b 100644 --- a/src/main/java/gregtechlite/gtlitecore/mixins/modularui/MixinPanelSyncManager.java +++ b/src/main/java/gregtechlite/gtlitecore/mixins/modularui/MixinPanelSyncManager.java @@ -3,9 +3,13 @@ import com.cleanroommc.modularui.value.sync.ISyncRegistrar; import com.cleanroommc.modularui.value.sync.PanelSyncManager; import com.cleanroommc.modularui.value.sync.SyncHandler; +import com.cleanroommc.modularui.widgets.slot.SlotGroup; +import gregtechlite.gtlitecore.mixins.Implemented; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; +@Implemented(at = "https://github.com/GregTechCEu/GregTech/pull/2900") @Mixin(value = PanelSyncManager.class, remap = false) public abstract class MixinPanelSyncManager implements ISyncRegistrar { @@ -16,4 +20,13 @@ public PanelSyncManager syncValue(String name, SyncHandler syncHandler) return syncValue(name, 0, syncHandler); } + @Unique + public PanelSyncManager registerSlotGroup(String name, int rowSize) + { + return registerSlotGroup(new SlotGroup(name, rowSize, 100, true)); + } + + @Shadow + public abstract PanelSyncManager registerSlotGroup(SlotGroup slotGroup); + } From 7cbbc834ccbced580d603f03577fe79726a744e7 Mon Sep 17 00:00:00 2001 From: Magic_Sweepy Date: Wed, 11 Mar 2026 14:16:11 +0800 Subject: [PATCH 19/20] add missing compat annotation for mixins class --- .../gtlitecore/mixins/modularui/MixinPanelSyncManager.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/gregtechlite/gtlitecore/mixins/modularui/MixinPanelSyncManager.java b/src/main/java/gregtechlite/gtlitecore/mixins/modularui/MixinPanelSyncManager.java index a7a8c497b..52248a3f6 100644 --- a/src/main/java/gregtechlite/gtlitecore/mixins/modularui/MixinPanelSyncManager.java +++ b/src/main/java/gregtechlite/gtlitecore/mixins/modularui/MixinPanelSyncManager.java @@ -4,12 +4,14 @@ import com.cleanroommc.modularui.value.sync.PanelSyncManager; import com.cleanroommc.modularui.value.sync.SyncHandler; import com.cleanroommc.modularui.widgets.slot.SlotGroup; +import gregtechlite.gtlitecore.mixins.Compat; import gregtechlite.gtlitecore.mixins.Implemented; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; @Implemented(at = "https://github.com/GregTechCEu/GregTech/pull/2900") +@Compat(modId = { "gregtech", "modularui" }) @Mixin(value = PanelSyncManager.class, remap = false) public abstract class MixinPanelSyncManager implements ISyncRegistrar { From 110a2fe9b1eb3f0663ffb91acd201c55cdacc63f Mon Sep 17 00:00:00 2001 From: Magic_Sweepy Date: Fri, 13 Mar 2026 10:25:26 +0800 Subject: [PATCH 20/20] resolve some conflicts for MUI2 API usage --- .../gtlitecore/api/gui/GTLiteMuiTextures.kt | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt index aa84f3ae7..544dfb0e8 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/gui/GTLiteMuiTextures.kt @@ -83,30 +83,27 @@ object GTLiteMuiTextures /** * Multiblock Button for Space Elevator Modules to enable modules. - * */ @JvmField - val BUTTON_ENABLE_MODULE = fullImage("textures/gui/widget/button_enable_module.png") + val BUTTON_ENABLE_MODULE = texture("textures/gui/widget/button_enable_module.png") /** * Multiblock Button for Space Elevator Modules to disable modules. - * */ @JvmField - val BUTTON_DISABLE_MODULE = fullImage("textures/gui/widget/button_disable_module.png") + val BUTTON_DISABLE_MODULE = texture("textures/gui/widget/button_disable_module.png") /** - * Space Elevator Logo - * + * Space Elevator Logo. */ @JvmField - val SPACE_ELEVATOR_LOGO = fullImage("textures/gui/icon/space_elevator_logo.png") + val SPACE_ELEVATOR_LOGO = texture("textures/gui/icon/space_elevator_logo.png") /** - * Space Elevator Logo Dark + * Space Elevator Logo Dark. */ @JvmField - val SPACE_ELEVATOR_LOGO_DARK = fullImage("textures/gui/icon/space_elevator_logo_dark.png") + val SPACE_ELEVATOR_LOGO_DARK = texture("textures/gui/icon/space_elevator_logo_dark.png") // endregion