From 80ee96051c2d82d2539449590ca0bd31ca61c471 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 1 Jun 2023 10:36:10 +0100 Subject: [PATCH] Cleanup GUI packages --- .../client/gui/{builder => }/GuiBase.java | 9 ++-- .../gui/{guibuilder => }/GuiBuilder.java | 5 +- .../gui/builder/widget/GuiButtonSimple.java | 47 ------------------- .../slot => config}/FluidConfigGui.java | 8 ++-- .../gui/{builder/slot => config}/GuiTab.java | 5 +- .../RedstoneConfigGui.java | 5 +- .../slot => config}/SlotConfigGui.java | 8 ++-- .../elements/AbstractConfigPopupElement.java | 4 +- .../elements/ButtonElement.java | 4 +- .../elements/CheckBoxElement.java | 4 +- .../elements/ConfigFluidElement.java | 4 +- .../elements/ConfigSlotElement.java | 4 +- .../slot => config}/elements/ElementBase.java | 6 +-- .../elements/FluidConfigPopupElement.java | 4 +- .../elements/GuiSpriteAtlasHolder.java | 2 +- .../slot => config}/elements/GuiSprites.java | 2 +- .../elements/ParentElement.java | 4 +- .../elements/SlotConfigPopupElement.java | 4 +- .../slot => config}/elements/SlotType.java | 2 +- .../widget/GuiButtonExtended.java | 2 +- .../widget/GuiButtonHologram.java | 2 +- .../{builder => }/widget/GuiButtonUpDown.java | 4 +- .../client/mixin/MixinMinecraftClient.java | 2 +- .../java/techreborn/TechRebornClient.java | 2 +- .../client/compat/rei/ReiPlugin.java | 6 +-- .../compat/rei/SlotConfigExclusionZones.java | 6 +-- .../FluidGeneratorRecipeCategory.java | 2 +- .../FluidReplicatorRecipeCategory.java | 2 +- .../machine/AssemblingMachineCategory.java | 2 +- .../rei/machine/BlastFurnaceCategory.java | 2 +- .../machine/DistillationTowerCategory.java | 2 +- .../rei/machine/ElectrolyzerCategory.java | 2 +- .../compat/rei/machine/GrinderCategory.java | 2 +- .../machine/ImplosionCompressorCategory.java | 2 +- .../machine/IndustrialCentrifugeCategory.java | 2 +- .../machine/OneInputOneOutputCategory.java | 2 +- .../compat/rei/machine/SawmillCategory.java | 2 +- .../TwoInputsCenterOutputCategory.java | 2 +- .../java/techreborn/client/gui/GuiAESU.java | 6 +-- .../client/gui/GuiAlloyFurnace.java | 4 +- .../client/gui/GuiAlloySmelter.java | 4 +- .../client/gui/GuiAssemblingMachine.java | 4 +- .../client/gui/GuiAutoCrafting.java | 4 +- .../java/techreborn/client/gui/GuiBatbox.java | 2 +- .../client/gui/GuiBlastFurnace.java | 6 +-- .../client/gui/GuiBlockBreaker.java | 2 +- .../techreborn/client/gui/GuiBlockPlacer.java | 2 +- .../techreborn/client/gui/GuiCentrifuge.java | 4 +- .../techreborn/client/gui/GuiChargeBench.java | 2 +- .../client/gui/GuiChemicalReactor.java | 4 +- .../techreborn/client/gui/GuiChunkLoader.java | 6 +-- .../techreborn/client/gui/GuiCompressor.java | 4 +- .../client/gui/GuiDieselGenerator.java | 4 +- .../client/gui/GuiDistillationTower.java | 6 +-- .../client/gui/GuiElectricFurnace.java | 4 +- .../techreborn/client/gui/GuiElevator.java | 2 +- .../techreborn/client/gui/GuiExtractor.java | 4 +- .../client/gui/GuiFishingStation.java | 2 +- .../client/gui/GuiFluidReplicator.java | 6 +-- .../client/gui/GuiFusionReactor.java | 10 ++-- .../techreborn/client/gui/GuiGasTurbine.java | 4 +- .../techreborn/client/gui/GuiGenerator.java | 2 +- .../client/gui/GuiGreenhouseController.java | 4 +- .../techreborn/client/gui/GuiGrinder.java | 4 +- .../java/techreborn/client/gui/GuiIDSU.java | 2 +- .../client/gui/GuiImplosionCompressor.java | 6 +-- .../client/gui/GuiIndustrialElectrolyzer.java | 4 +- .../client/gui/GuiIndustrialGrinder.java | 6 +-- .../client/gui/GuiIndustrialSawmill.java | 6 +-- .../techreborn/client/gui/GuiIronFurnace.java | 4 +- .../java/techreborn/client/gui/GuiLESU.java | 2 +- .../techreborn/client/gui/GuiLaunchpad.java | 4 +- .../java/techreborn/client/gui/GuiMFE.java | 2 +- .../java/techreborn/client/gui/GuiMFSU.java | 2 +- .../java/techreborn/client/gui/GuiManual.java | 2 +- .../client/gui/GuiMatterFabricator.java | 4 +- .../client/gui/GuiPlasmaGenerator.java | 4 +- .../client/gui/GuiPlayerDetector.java | 4 +- .../java/techreborn/client/gui/GuiPump.java | 4 +- .../techreborn/client/gui/GuiRecycler.java | 4 +- .../client/gui/GuiRollingMachine.java | 4 +- .../client/gui/GuiScrapboxinator.java | 4 +- .../client/gui/GuiSemifluidGenerator.java | 4 +- .../java/techreborn/client/gui/GuiSolar.java | 2 +- .../client/gui/GuiSolidCanningMachine.java | 4 +- .../techreborn/client/gui/GuiStorageUnit.java | 2 +- .../techreborn/client/gui/GuiTankUnit.java | 2 +- .../client/gui/GuiThermalGenerator.java | 4 +- .../client/gui/GuiVacuumFreezer.java | 6 +-- .../techreborn/client/gui/GuiWireMill.java | 4 +- 90 files changed, 166 insertions(+), 215 deletions(-) rename RebornCore/src/client/java/reborncore/client/gui/{builder => }/GuiBase.java (97%) rename RebornCore/src/client/java/reborncore/client/gui/{guibuilder => }/GuiBuilder.java (99%) delete mode 100644 RebornCore/src/client/java/reborncore/client/gui/builder/widget/GuiButtonSimple.java rename RebornCore/src/client/java/reborncore/client/gui/{builder/slot => config}/FluidConfigGui.java (91%) rename RebornCore/src/client/java/reborncore/client/gui/{builder/slot => config}/GuiTab.java (94%) rename RebornCore/src/client/java/reborncore/client/gui/{builder => config}/RedstoneConfigGui.java (97%) rename RebornCore/src/client/java/reborncore/client/gui/{builder/slot => config}/SlotConfigGui.java (96%) rename RebornCore/src/client/java/reborncore/client/gui/{builder/slot => config}/elements/AbstractConfigPopupElement.java (98%) rename RebornCore/src/client/java/reborncore/client/gui/{builder/slot => config}/elements/ButtonElement.java (95%) rename RebornCore/src/client/java/reborncore/client/gui/{builder/slot => config}/elements/CheckBoxElement.java (96%) rename RebornCore/src/client/java/reborncore/client/gui/{builder/slot => config}/elements/ConfigFluidElement.java (96%) rename RebornCore/src/client/java/reborncore/client/gui/{builder/slot => config}/elements/ConfigSlotElement.java (97%) rename RebornCore/src/client/java/reborncore/client/gui/{builder/slot => config}/elements/ElementBase.java (96%) rename RebornCore/src/client/java/reborncore/client/gui/{builder/slot => config}/elements/FluidConfigPopupElement.java (97%) rename RebornCore/src/client/java/reborncore/client/gui/{builder/slot => config}/elements/GuiSpriteAtlasHolder.java (97%) rename RebornCore/src/client/java/reborncore/client/gui/{builder/slot => config}/elements/GuiSprites.java (98%) rename RebornCore/src/client/java/reborncore/client/gui/{builder/slot => config}/elements/ParentElement.java (95%) rename RebornCore/src/client/java/reborncore/client/gui/{builder/slot => config}/elements/SlotConfigPopupElement.java (97%) rename RebornCore/src/client/java/reborncore/client/gui/{builder/slot => config}/elements/SlotType.java (97%) rename RebornCore/src/client/java/reborncore/client/gui/{builder => }/widget/GuiButtonExtended.java (97%) rename RebornCore/src/client/java/reborncore/client/gui/{builder => }/widget/GuiButtonHologram.java (97%) rename RebornCore/src/client/java/reborncore/client/gui/{builder => }/widget/GuiButtonUpDown.java (96%) diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/GuiBase.java b/RebornCore/src/client/java/reborncore/client/gui/GuiBase.java similarity index 97% rename from RebornCore/src/client/java/reborncore/client/gui/builder/GuiBase.java rename to RebornCore/src/client/java/reborncore/client/gui/GuiBase.java index bb2c140f9..6acabe451 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/GuiBase.java +++ b/RebornCore/src/client/java/reborncore/client/gui/GuiBase.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package reborncore.client.gui.builder; +package reborncore.client.gui; import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.MinecraftClient; @@ -41,9 +41,8 @@ import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; import org.lwjgl.glfw.GLFW; import reborncore.api.blockentity.IUpgradeable; -import reborncore.client.gui.builder.slot.GuiTab; -import reborncore.client.gui.builder.widget.GuiButtonHologram; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.config.GuiTab; +import reborncore.client.gui.widget.GuiButtonHologram; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.screen.slot.PlayerInventorySlot; @@ -224,7 +223,7 @@ public class GuiBase extends HandledScreen { drawText(drawContext, text, (backgroundWidth / 2 - getTextRenderer().getWidth(text) / 2), y, colour, layer); } - protected void drawCentredText(DrawContext drawContext, Text text, int y, int colour, int modifier, Layer layer) { + public void drawCentredText(DrawContext drawContext, Text text, int y, int colour, int modifier, Layer layer) { drawText(drawContext, text, (backgroundWidth / 2 - (getTextRenderer().getWidth(text)) / 2) + modifier, y, colour, layer); } diff --git a/RebornCore/src/client/java/reborncore/client/gui/guibuilder/GuiBuilder.java b/RebornCore/src/client/java/reborncore/client/gui/GuiBuilder.java similarity index 99% rename from RebornCore/src/client/java/reborncore/client/gui/guibuilder/GuiBuilder.java rename to RebornCore/src/client/java/reborncore/client/gui/GuiBuilder.java index 97db19711..d0662a515 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/guibuilder/GuiBuilder.java +++ b/RebornCore/src/client/java/reborncore/client/gui/GuiBuilder.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package reborncore.client.gui.guibuilder; +package reborncore.client.gui; import com.google.common.collect.Lists; import net.fabricmc.fabric.api.transfer.v1.client.fluid.FluidVariantRendering; @@ -38,8 +38,7 @@ import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; import reborncore.api.IListInfoProvider; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.slot.GuiTab; +import reborncore.client.gui.config.GuiTab; import reborncore.common.fluid.FluidUtils; import reborncore.common.fluid.FluidValue; import reborncore.common.fluid.container.FluidInstance; diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/widget/GuiButtonSimple.java b/RebornCore/src/client/java/reborncore/client/gui/builder/widget/GuiButtonSimple.java deleted file mode 100644 index 0244f4919..000000000 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/widget/GuiButtonSimple.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This file is part of RebornCore, licensed under the MIT License (MIT). - * - * Copyright (c) 2021 TeamReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package reborncore.client.gui.builder.widget; - -import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.text.Text; - -public class GuiButtonSimple extends ButtonWidget { - - /** - * @deprecated Please use {@link ButtonWidget} - */ - @Deprecated - public GuiButtonSimple(int x, int y, Text buttonText, ButtonWidget.PressAction pressAction) { - super(x, y, 20, 200, buttonText, pressAction, ButtonWidget.DEFAULT_NARRATION_SUPPLIER); - } - - /** - * @deprecated Please use {@link ButtonWidget} - */ - @Deprecated - public GuiButtonSimple(int x, int y, int widthIn, int heightIn, Text buttonText, ButtonWidget.PressAction pressAction) { - super(x, y, widthIn, heightIn, buttonText, pressAction, ButtonWidget.DEFAULT_NARRATION_SUPPLIER); - } -} diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/FluidConfigGui.java b/RebornCore/src/client/java/reborncore/client/gui/config/FluidConfigGui.java similarity index 91% rename from RebornCore/src/client/java/reborncore/client/gui/builder/slot/FluidConfigGui.java rename to RebornCore/src/client/java/reborncore/client/gui/config/FluidConfigGui.java index a38e79400..ef61c18a3 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/FluidConfigGui.java +++ b/RebornCore/src/client/java/reborncore/client/gui/config/FluidConfigGui.java @@ -22,15 +22,15 @@ * SOFTWARE. */ -package reborncore.client.gui.builder.slot; +package reborncore.client.gui.config; import net.minecraft.client.gui.DrawContext; import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemStack; import org.jetbrains.annotations.Nullable; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.slot.elements.ConfigFluidElement; -import reborncore.client.gui.builder.slot.elements.SlotType; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.config.elements.ConfigFluidElement; +import reborncore.client.gui.config.elements.SlotType; import java.util.Objects; diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/GuiTab.java b/RebornCore/src/client/java/reborncore/client/gui/config/GuiTab.java similarity index 94% rename from RebornCore/src/client/java/reborncore/client/gui/builder/slot/GuiTab.java rename to RebornCore/src/client/java/reborncore/client/gui/config/GuiTab.java index dbe13af83..b07fc67bd 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/GuiTab.java +++ b/RebornCore/src/client/java/reborncore/client/gui/config/GuiTab.java @@ -22,12 +22,11 @@ * SOFTWARE. */ -package reborncore.client.gui.builder.slot; +package reborncore.client.gui.config; import net.minecraft.client.gui.DrawContext; import net.minecraft.item.ItemStack; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.RedstoneConfigGui; +import reborncore.client.gui.GuiBase; import reborncore.common.blockentity.MachineBaseBlockEntity; import java.util.Collections; diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/RedstoneConfigGui.java b/RebornCore/src/client/java/reborncore/client/gui/config/RedstoneConfigGui.java similarity index 97% rename from RebornCore/src/client/java/reborncore/client/gui/builder/RedstoneConfigGui.java rename to RebornCore/src/client/java/reborncore/client/gui/config/RedstoneConfigGui.java index 98d74d530..143194b48 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/RedstoneConfigGui.java +++ b/RebornCore/src/client/java/reborncore/client/gui/config/RedstoneConfigGui.java @@ -22,14 +22,15 @@ * SOFTWARE. */ -package reborncore.client.gui.builder; +package reborncore.client.gui.config; import net.minecraft.client.gui.DrawContext; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.text.Text; import reborncore.client.ClientNetworkManager; -import reborncore.client.gui.builder.slot.GuiTab; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.config.GuiTab; import reborncore.common.blockentity.RedstoneConfiguration; import reborncore.common.network.IdentifiedPacket; import reborncore.common.network.ServerBoundPackets; diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/SlotConfigGui.java b/RebornCore/src/client/java/reborncore/client/gui/config/SlotConfigGui.java similarity index 96% rename from RebornCore/src/client/java/reborncore/client/gui/builder/slot/SlotConfigGui.java rename to RebornCore/src/client/java/reborncore/client/gui/config/SlotConfigGui.java index ec25b8931..ab6c26606 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/SlotConfigGui.java +++ b/RebornCore/src/client/java/reborncore/client/gui/config/SlotConfigGui.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package reborncore.client.gui.builder.slot; +package reborncore.client.gui.config; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; @@ -36,9 +36,9 @@ import org.jetbrains.annotations.Nullable; import org.lwjgl.glfw.GLFW; import reborncore.client.ClientChatUtils; import reborncore.client.ClientNetworkManager; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.slot.elements.ConfigSlotElement; -import reborncore.client.gui.builder.slot.elements.SlotType; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.config.elements.ConfigSlotElement; +import reborncore.client.gui.config.elements.SlotType; import reborncore.common.network.ServerBoundPackets; import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.util.Color; diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/AbstractConfigPopupElement.java b/RebornCore/src/client/java/reborncore/client/gui/config/elements/AbstractConfigPopupElement.java similarity index 98% rename from RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/AbstractConfigPopupElement.java rename to RebornCore/src/client/java/reborncore/client/gui/config/elements/AbstractConfigPopupElement.java index 9e6e93316..b48b99800 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/AbstractConfigPopupElement.java +++ b/RebornCore/src/client/java/reborncore/client/gui/config/elements/AbstractConfigPopupElement.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package reborncore.client.gui.builder.slot.elements; +package reborncore.client.gui.config.elements; import net.minecraft.block.BlockState; import net.minecraft.client.MinecraftClient; @@ -38,7 +38,7 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.math.Direction; import net.minecraft.util.math.RotationAxis; import org.joml.Quaternionf; -import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.GuiBase; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.util.MachineFacing; diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ButtonElement.java b/RebornCore/src/client/java/reborncore/client/gui/config/elements/ButtonElement.java similarity index 95% rename from RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ButtonElement.java rename to RebornCore/src/client/java/reborncore/client/gui/config/elements/ButtonElement.java index 9a3dc4e27..e529b6c90 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ButtonElement.java +++ b/RebornCore/src/client/java/reborncore/client/gui/config/elements/ButtonElement.java @@ -22,10 +22,10 @@ * SOFTWARE. */ -package reborncore.client.gui.builder.slot.elements; +package reborncore.client.gui.config.elements; import net.minecraft.client.gui.DrawContext; -import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.GuiBase; public class ButtonElement extends ElementBase { private final GuiSprites.Button buttonSprite; diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/CheckBoxElement.java b/RebornCore/src/client/java/reborncore/client/gui/config/elements/CheckBoxElement.java similarity index 96% rename from RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/CheckBoxElement.java rename to RebornCore/src/client/java/reborncore/client/gui/config/elements/CheckBoxElement.java index 9b74db08a..55a6f78a3 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/CheckBoxElement.java +++ b/RebornCore/src/client/java/reborncore/client/gui/config/elements/CheckBoxElement.java @@ -22,12 +22,12 @@ * SOFTWARE. */ -package reborncore.client.gui.builder.slot.elements; +package reborncore.client.gui.config.elements; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.text.Text; -import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.GuiBase; import java.util.function.Predicate; diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ConfigFluidElement.java b/RebornCore/src/client/java/reborncore/client/gui/config/elements/ConfigFluidElement.java similarity index 96% rename from RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ConfigFluidElement.java rename to RebornCore/src/client/java/reborncore/client/gui/config/elements/ConfigFluidElement.java index 56ad00037..95fe29be8 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ConfigFluidElement.java +++ b/RebornCore/src/client/java/reborncore/client/gui/config/elements/ConfigFluidElement.java @@ -22,11 +22,11 @@ * SOFTWARE. */ -package reborncore.client.gui.builder.slot.elements; +package reborncore.client.gui.config.elements; import net.minecraft.client.gui.DrawContext; import net.minecraft.text.Text; -import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.GuiBase; public class ConfigFluidElement extends ParentElement { private final SlotType type; diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ConfigSlotElement.java b/RebornCore/src/client/java/reborncore/client/gui/config/elements/ConfigSlotElement.java similarity index 97% rename from RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ConfigSlotElement.java rename to RebornCore/src/client/java/reborncore/client/gui/config/elements/ConfigSlotElement.java index c323afd35..1273f039b 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ConfigSlotElement.java +++ b/RebornCore/src/client/java/reborncore/client/gui/config/elements/ConfigSlotElement.java @@ -22,13 +22,13 @@ * SOFTWARE. */ -package reborncore.client.gui.builder.slot.elements; +package reborncore.client.gui.config.elements; import net.minecraft.client.gui.DrawContext; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; -import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.GuiBase; import reborncore.common.blockentity.SlotConfiguration; import reborncore.common.screen.slot.BaseSlot; diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ElementBase.java b/RebornCore/src/client/java/reborncore/client/gui/config/elements/ElementBase.java similarity index 96% rename from RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ElementBase.java rename to RebornCore/src/client/java/reborncore/client/gui/config/elements/ElementBase.java index 55f0a667b..189a510cd 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ElementBase.java +++ b/RebornCore/src/client/java/reborncore/client/gui/config/elements/ElementBase.java @@ -22,15 +22,15 @@ * SOFTWARE. */ -package reborncore.client.gui.builder.slot.elements; +package reborncore.client.gui.config.elements; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.texture.Sprite; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.text.Text; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.GuiBuilder; public class ElementBase { private final int x; diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/FluidConfigPopupElement.java b/RebornCore/src/client/java/reborncore/client/gui/config/elements/FluidConfigPopupElement.java similarity index 97% rename from RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/FluidConfigPopupElement.java rename to RebornCore/src/client/java/reborncore/client/gui/config/elements/FluidConfigPopupElement.java index a53d26422..d7f10dd23 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/FluidConfigPopupElement.java +++ b/RebornCore/src/client/java/reborncore/client/gui/config/elements/FluidConfigPopupElement.java @@ -22,13 +22,13 @@ * SOFTWARE. */ -package reborncore.client.gui.builder.slot.elements; +package reborncore.client.gui.config.elements; import net.minecraft.client.gui.DrawContext; import net.minecraft.util.math.Direction; import reborncore.RebornCore; import reborncore.client.ClientNetworkManager; -import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.GuiBase; import reborncore.common.blockentity.FluidConfiguration; import reborncore.common.network.IdentifiedPacket; import reborncore.common.network.ServerBoundPackets; diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/GuiSpriteAtlasHolder.java b/RebornCore/src/client/java/reborncore/client/gui/config/elements/GuiSpriteAtlasHolder.java similarity index 97% rename from RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/GuiSpriteAtlasHolder.java rename to RebornCore/src/client/java/reborncore/client/gui/config/elements/GuiSpriteAtlasHolder.java index b5c3f4598..f165cc0c9 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/GuiSpriteAtlasHolder.java +++ b/RebornCore/src/client/java/reborncore/client/gui/config/elements/GuiSpriteAtlasHolder.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package reborncore.client.gui.builder.slot.elements; +package reborncore.client.gui.config.elements; import net.minecraft.client.texture.Sprite; import net.minecraft.client.texture.SpriteAtlasHolder; diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/GuiSprites.java b/RebornCore/src/client/java/reborncore/client/gui/config/elements/GuiSprites.java similarity index 98% rename from RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/GuiSprites.java rename to RebornCore/src/client/java/reborncore/client/gui/config/elements/GuiSprites.java index bb2eb559d..02b235d18 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/GuiSprites.java +++ b/RebornCore/src/client/java/reborncore/client/gui/config/elements/GuiSprites.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package reborncore.client.gui.builder.slot.elements; +package reborncore.client.gui.config.elements; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ParentElement.java b/RebornCore/src/client/java/reborncore/client/gui/config/elements/ParentElement.java similarity index 95% rename from RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ParentElement.java rename to RebornCore/src/client/java/reborncore/client/gui/config/elements/ParentElement.java index 8e92d33e1..4059d6c8b 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ParentElement.java +++ b/RebornCore/src/client/java/reborncore/client/gui/config/elements/ParentElement.java @@ -22,12 +22,12 @@ * SOFTWARE. */ -package reborncore.client.gui.builder.slot.elements; +package reborncore.client.gui.config.elements; import com.google.common.collect.Lists; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.SpriteIdentifier; -import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.GuiBase; import java.util.ArrayList; import java.util.List; diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/SlotConfigPopupElement.java b/RebornCore/src/client/java/reborncore/client/gui/config/elements/SlotConfigPopupElement.java similarity index 97% rename from RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/SlotConfigPopupElement.java rename to RebornCore/src/client/java/reborncore/client/gui/config/elements/SlotConfigPopupElement.java index a5ea5f402..ada32af61 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/SlotConfigPopupElement.java +++ b/RebornCore/src/client/java/reborncore/client/gui/config/elements/SlotConfigPopupElement.java @@ -22,13 +22,13 @@ * SOFTWARE. */ -package reborncore.client.gui.builder.slot.elements; +package reborncore.client.gui.config.elements; import net.minecraft.client.gui.DrawContext; import net.minecraft.util.math.Direction; import reborncore.RebornCore; import reborncore.client.ClientNetworkManager; -import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.GuiBase; import reborncore.common.blockentity.SlotConfiguration; import reborncore.common.network.IdentifiedPacket; import reborncore.common.network.ServerBoundPackets; diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/SlotType.java b/RebornCore/src/client/java/reborncore/client/gui/config/elements/SlotType.java similarity index 97% rename from RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/SlotType.java rename to RebornCore/src/client/java/reborncore/client/gui/config/elements/SlotType.java index a4ce4b5d0..0d9ee8359 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/SlotType.java +++ b/RebornCore/src/client/java/reborncore/client/gui/config/elements/SlotType.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package reborncore.client.gui.builder.slot.elements; +package reborncore.client.gui.config.elements; import net.minecraft.client.util.SpriteIdentifier; diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/widget/GuiButtonExtended.java b/RebornCore/src/client/java/reborncore/client/gui/widget/GuiButtonExtended.java similarity index 97% rename from RebornCore/src/client/java/reborncore/client/gui/builder/widget/GuiButtonExtended.java rename to RebornCore/src/client/java/reborncore/client/gui/widget/GuiButtonExtended.java index 843143d55..4e22fb2b1 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/widget/GuiButtonExtended.java +++ b/RebornCore/src/client/java/reborncore/client/gui/widget/GuiButtonExtended.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package reborncore.client.gui.builder.widget; +package reborncore.client.gui.widget; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.text.Text; diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/widget/GuiButtonHologram.java b/RebornCore/src/client/java/reborncore/client/gui/widget/GuiButtonHologram.java similarity index 97% rename from RebornCore/src/client/java/reborncore/client/gui/builder/widget/GuiButtonHologram.java rename to RebornCore/src/client/java/reborncore/client/gui/widget/GuiButtonHologram.java index 2b0af7d8b..3cef36932 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/widget/GuiButtonHologram.java +++ b/RebornCore/src/client/java/reborncore/client/gui/widget/GuiButtonHologram.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package reborncore.client.gui.builder.widget; +package reborncore.client.gui.widget; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.widget.ButtonWidget; diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/widget/GuiButtonUpDown.java b/RebornCore/src/client/java/reborncore/client/gui/widget/GuiButtonUpDown.java similarity index 96% rename from RebornCore/src/client/java/reborncore/client/gui/builder/widget/GuiButtonUpDown.java rename to RebornCore/src/client/java/reborncore/client/gui/widget/GuiButtonUpDown.java index 00e2a3ce7..301bed176 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/widget/GuiButtonUpDown.java +++ b/RebornCore/src/client/java/reborncore/client/gui/widget/GuiButtonUpDown.java @@ -22,12 +22,12 @@ * SOFTWARE. */ -package reborncore.client.gui.builder.widget; +package reborncore.client.gui.widget; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.text.Text; -import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.GuiBase; /** * @author drcrazy diff --git a/RebornCore/src/client/java/reborncore/client/mixin/MixinMinecraftClient.java b/RebornCore/src/client/java/reborncore/client/mixin/MixinMinecraftClient.java index 5b3fa658d..4ef487389 100644 --- a/RebornCore/src/client/java/reborncore/client/mixin/MixinMinecraftClient.java +++ b/RebornCore/src/client/java/reborncore/client/mixin/MixinMinecraftClient.java @@ -34,7 +34,7 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import reborncore.client.gui.builder.slot.elements.GuiSpriteAtlasHolder; +import reborncore.client.gui.config.elements.GuiSpriteAtlasHolder; @Mixin(MinecraftClient.class) public class MixinMinecraftClient { diff --git a/src/client/java/techreborn/TechRebornClient.java b/src/client/java/techreborn/TechRebornClient.java index 9b2d9c824..c27f14d62 100644 --- a/src/client/java/techreborn/TechRebornClient.java +++ b/src/client/java/techreborn/TechRebornClient.java @@ -51,7 +51,7 @@ import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; import org.jetbrains.annotations.Nullable; import reborncore.client.ClientJumpEvent; -import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.GuiBase; import reborncore.client.multiblock.MultiblockRenderer; import reborncore.common.powerSystem.RcEnergyItem; import reborncore.common.util.ItemUtils; diff --git a/src/client/java/techreborn/client/compat/rei/ReiPlugin.java b/src/client/java/techreborn/client/compat/rei/ReiPlugin.java index de2f9f7d3..156d26ecb 100644 --- a/src/client/java/techreborn/client/compat/rei/ReiPlugin.java +++ b/src/client/java/techreborn/client/compat/rei/ReiPlugin.java @@ -60,9 +60,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import org.jetbrains.annotations.Nullable; import reborncore.api.blockentity.IUpgradeable; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.slot.GuiTab; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.config.GuiTab; +import reborncore.client.gui.GuiBuilder; import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.RebornRecipeType; import reborncore.common.crafting.RecipeManager; diff --git a/src/client/java/techreborn/client/compat/rei/SlotConfigExclusionZones.java b/src/client/java/techreborn/client/compat/rei/SlotConfigExclusionZones.java index 8fbe1e1bc..ef8e60650 100644 --- a/src/client/java/techreborn/client/compat/rei/SlotConfigExclusionZones.java +++ b/src/client/java/techreborn/client/compat/rei/SlotConfigExclusionZones.java @@ -27,9 +27,9 @@ package techreborn.client.compat.rei; import com.google.common.collect.Lists; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.client.registry.screen.ExclusionZonesProvider; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.slot.SlotConfigGui; -import reborncore.client.gui.builder.slot.elements.ConfigSlotElement; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.config.SlotConfigGui; +import reborncore.client.gui.config.elements.ConfigSlotElement; import java.util.Collection; import java.util.Collections; diff --git a/src/client/java/techreborn/client/compat/rei/fluidgenerator/FluidGeneratorRecipeCategory.java b/src/client/java/techreborn/client/compat/rei/fluidgenerator/FluidGeneratorRecipeCategory.java index 798792584..ffe330cd0 100644 --- a/src/client/java/techreborn/client/compat/rei/fluidgenerator/FluidGeneratorRecipeCategory.java +++ b/src/client/java/techreborn/client/compat/rei/fluidgenerator/FluidGeneratorRecipeCategory.java @@ -37,7 +37,7 @@ import me.shedaniel.rei.api.common.util.EntryStacks; import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBuilder; import techreborn.TechReborn; import techreborn.client.compat.rei.ReiPlugin; import techreborn.init.TRContent; diff --git a/src/client/java/techreborn/client/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java b/src/client/java/techreborn/client/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java index ea398f71b..936a71c57 100644 --- a/src/client/java/techreborn/client/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java +++ b/src/client/java/techreborn/client/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java @@ -39,7 +39,7 @@ import net.minecraft.item.Items; import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBuilder; import reborncore.common.crafting.RebornRecipeType; import techreborn.api.recipe.recipes.FluidReplicatorRecipe; import techreborn.client.compat.rei.ReiPlugin; diff --git a/src/client/java/techreborn/client/compat/rei/machine/AssemblingMachineCategory.java b/src/client/java/techreborn/client/compat/rei/machine/AssemblingMachineCategory.java index 5f304670a..4b6f6327a 100644 --- a/src/client/java/techreborn/client/compat/rei/machine/AssemblingMachineCategory.java +++ b/src/client/java/techreborn/client/compat/rei/machine/AssemblingMachineCategory.java @@ -29,7 +29,7 @@ import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.client.gui.widgets.Widget; import me.shedaniel.rei.api.client.gui.widgets.Widgets; import net.minecraft.text.Text; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBuilder; import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.RebornRecipeType; import techreborn.client.compat.rei.MachineRecipeDisplay; diff --git a/src/client/java/techreborn/client/compat/rei/machine/BlastFurnaceCategory.java b/src/client/java/techreborn/client/compat/rei/machine/BlastFurnaceCategory.java index b24f0c00b..89e87c03b 100644 --- a/src/client/java/techreborn/client/compat/rei/machine/BlastFurnaceCategory.java +++ b/src/client/java/techreborn/client/compat/rei/machine/BlastFurnaceCategory.java @@ -29,7 +29,7 @@ import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.client.gui.widgets.Widget; import me.shedaniel.rei.api.client.gui.widgets.Widgets; import net.minecraft.text.Text; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBuilder; import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.RebornRecipeType; import techreborn.client.compat.rei.MachineRecipeDisplay; diff --git a/src/client/java/techreborn/client/compat/rei/machine/DistillationTowerCategory.java b/src/client/java/techreborn/client/compat/rei/machine/DistillationTowerCategory.java index 07e3f390a..5271b28ce 100644 --- a/src/client/java/techreborn/client/compat/rei/machine/DistillationTowerCategory.java +++ b/src/client/java/techreborn/client/compat/rei/machine/DistillationTowerCategory.java @@ -29,7 +29,7 @@ import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.client.gui.widgets.Widget; import me.shedaniel.rei.api.client.gui.widgets.Widgets; import net.minecraft.text.Text; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBuilder; import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.RebornRecipeType; import techreborn.client.compat.rei.MachineRecipeDisplay; diff --git a/src/client/java/techreborn/client/compat/rei/machine/ElectrolyzerCategory.java b/src/client/java/techreborn/client/compat/rei/machine/ElectrolyzerCategory.java index 666f5ac70..1de39c593 100644 --- a/src/client/java/techreborn/client/compat/rei/machine/ElectrolyzerCategory.java +++ b/src/client/java/techreborn/client/compat/rei/machine/ElectrolyzerCategory.java @@ -29,7 +29,7 @@ import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.client.gui.widgets.Widget; import me.shedaniel.rei.api.client.gui.widgets.Widgets; import net.minecraft.text.Text; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBuilder; import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.RebornRecipeType; import techreborn.client.compat.rei.MachineRecipeDisplay; diff --git a/src/client/java/techreborn/client/compat/rei/machine/GrinderCategory.java b/src/client/java/techreborn/client/compat/rei/machine/GrinderCategory.java index 764adfa11..49c5e72d0 100644 --- a/src/client/java/techreborn/client/compat/rei/machine/GrinderCategory.java +++ b/src/client/java/techreborn/client/compat/rei/machine/GrinderCategory.java @@ -34,7 +34,7 @@ import me.shedaniel.rei.api.client.gui.widgets.Widgets; import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBuilder; import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.RebornRecipeType; import techreborn.client.compat.rei.MachineRecipeDisplay; diff --git a/src/client/java/techreborn/client/compat/rei/machine/ImplosionCompressorCategory.java b/src/client/java/techreborn/client/compat/rei/machine/ImplosionCompressorCategory.java index 58f396c75..37ff87488 100644 --- a/src/client/java/techreborn/client/compat/rei/machine/ImplosionCompressorCategory.java +++ b/src/client/java/techreborn/client/compat/rei/machine/ImplosionCompressorCategory.java @@ -29,7 +29,7 @@ import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.client.gui.widgets.Widget; import me.shedaniel.rei.api.client.gui.widgets.Widgets; import net.minecraft.text.Text; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBuilder; import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.RebornRecipeType; import techreborn.client.compat.rei.MachineRecipeDisplay; diff --git a/src/client/java/techreborn/client/compat/rei/machine/IndustrialCentrifugeCategory.java b/src/client/java/techreborn/client/compat/rei/machine/IndustrialCentrifugeCategory.java index 78501cbfa..776354dac 100644 --- a/src/client/java/techreborn/client/compat/rei/machine/IndustrialCentrifugeCategory.java +++ b/src/client/java/techreborn/client/compat/rei/machine/IndustrialCentrifugeCategory.java @@ -29,7 +29,7 @@ import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.client.gui.widgets.Widget; import me.shedaniel.rei.api.client.gui.widgets.Widgets; import net.minecraft.text.Text; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBuilder; import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.RebornRecipeType; import techreborn.client.compat.rei.MachineRecipeDisplay; diff --git a/src/client/java/techreborn/client/compat/rei/machine/OneInputOneOutputCategory.java b/src/client/java/techreborn/client/compat/rei/machine/OneInputOneOutputCategory.java index 123a6ce86..eb24896b9 100644 --- a/src/client/java/techreborn/client/compat/rei/machine/OneInputOneOutputCategory.java +++ b/src/client/java/techreborn/client/compat/rei/machine/OneInputOneOutputCategory.java @@ -29,7 +29,7 @@ import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.client.gui.widgets.Widget; import me.shedaniel.rei.api.client.gui.widgets.Widgets; import net.minecraft.text.Text; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBuilder; import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.RebornRecipeType; import techreborn.client.compat.rei.MachineRecipeDisplay; diff --git a/src/client/java/techreborn/client/compat/rei/machine/SawmillCategory.java b/src/client/java/techreborn/client/compat/rei/machine/SawmillCategory.java index 731490646..03a7e71ed 100644 --- a/src/client/java/techreborn/client/compat/rei/machine/SawmillCategory.java +++ b/src/client/java/techreborn/client/compat/rei/machine/SawmillCategory.java @@ -29,7 +29,7 @@ import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.client.gui.widgets.Widget; import me.shedaniel.rei.api.client.gui.widgets.Widgets; import net.minecraft.text.Text; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBuilder; import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.RebornRecipeType; import techreborn.client.compat.rei.MachineRecipeDisplay; diff --git a/src/client/java/techreborn/client/compat/rei/machine/TwoInputsCenterOutputCategory.java b/src/client/java/techreborn/client/compat/rei/machine/TwoInputsCenterOutputCategory.java index 9a77bd7fe..b51241359 100644 --- a/src/client/java/techreborn/client/compat/rei/machine/TwoInputsCenterOutputCategory.java +++ b/src/client/java/techreborn/client/compat/rei/machine/TwoInputsCenterOutputCategory.java @@ -29,7 +29,7 @@ import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.client.gui.widgets.Widget; import me.shedaniel.rei.api.client.gui.widgets.Widgets; import net.minecraft.text.Text; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBuilder; import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.RebornRecipeType; import techreborn.client.compat.rei.MachineRecipeDisplay; diff --git a/src/client/java/techreborn/client/gui/GuiAESU.java b/src/client/java/techreborn/client/gui/GuiAESU.java index 497c43258..08ad3fb17 100644 --- a/src/client/java/techreborn/client/gui/GuiAESU.java +++ b/src/client/java/techreborn/client/gui/GuiAESU.java @@ -29,9 +29,9 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; import reborncore.client.ClientNetworkManager; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.widget.GuiButtonUpDown; -import reborncore.client.gui.builder.widget.GuiButtonUpDown.UpDownButtonType; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.widget.GuiButtonUpDown; +import reborncore.client.gui.widget.GuiButtonUpDown.UpDownButtonType; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.storage.energy.AdjustableSUBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiAlloyFurnace.java b/src/client/java/techreborn/client/gui/GuiAlloyFurnace.java index 392b4e066..206b79369 100644 --- a/src/client/java/techreborn/client/gui/GuiAlloyFurnace.java +++ b/src/client/java/techreborn/client/gui/GuiAlloyFurnace.java @@ -26,8 +26,8 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.iron.IronAlloyFurnaceBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiAlloySmelter.java b/src/client/java/techreborn/client/gui/GuiAlloySmelter.java index b1008f473..d2a0f1cf0 100644 --- a/src/client/java/techreborn/client/gui/GuiAlloySmelter.java +++ b/src/client/java/techreborn/client/gui/GuiAlloySmelter.java @@ -26,8 +26,8 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier1.AlloySmelterBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiAssemblingMachine.java b/src/client/java/techreborn/client/gui/GuiAssemblingMachine.java index 3baffe608..a852d258f 100644 --- a/src/client/java/techreborn/client/gui/GuiAssemblingMachine.java +++ b/src/client/java/techreborn/client/gui/GuiAssemblingMachine.java @@ -26,8 +26,8 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier1.AssemblingMachineBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiAutoCrafting.java b/src/client/java/techreborn/client/gui/GuiAutoCrafting.java index 24513994a..44f3494a8 100644 --- a/src/client/java/techreborn/client/gui/GuiAutoCrafting.java +++ b/src/client/java/techreborn/client/gui/GuiAutoCrafting.java @@ -30,8 +30,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.recipe.CraftingRecipe; import net.minecraft.util.Identifier; import reborncore.client.ClientNetworkManager; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier1.AutoCraftingTableBlockEntity; import techreborn.packets.ServerboundPackets; diff --git a/src/client/java/techreborn/client/gui/GuiBatbox.java b/src/client/java/techreborn/client/gui/GuiBatbox.java index 9d5101c2e..9222fbc6d 100644 --- a/src/client/java/techreborn/client/gui/GuiBatbox.java +++ b/src/client/java/techreborn/client/gui/GuiBatbox.java @@ -28,7 +28,7 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; -import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.GuiBase; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.storage.energy.LowVoltageSUBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiBlastFurnace.java b/src/client/java/techreborn/client/gui/GuiBlastFurnace.java index a99ecfe95..c6393fe1c 100644 --- a/src/client/java/techreborn/client/gui/GuiBlastFurnace.java +++ b/src/client/java/techreborn/client/gui/GuiBlastFurnace.java @@ -26,9 +26,9 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.widget.GuiButtonExtended; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.widget.GuiButtonExtended; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.multiblock.IndustrialBlastFurnaceBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiBlockBreaker.java b/src/client/java/techreborn/client/gui/GuiBlockBreaker.java index f5f24e530..f58e224c3 100644 --- a/src/client/java/techreborn/client/gui/GuiBlockBreaker.java +++ b/src/client/java/techreborn/client/gui/GuiBlockBreaker.java @@ -26,7 +26,7 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.GuiBase; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier0.block.BlockBreakerBlockEntity; import techreborn.blockentity.machine.tier0.block.blockbreaker.BlockBreakerProcessor; diff --git a/src/client/java/techreborn/client/gui/GuiBlockPlacer.java b/src/client/java/techreborn/client/gui/GuiBlockPlacer.java index 446407092..7862c3ac1 100644 --- a/src/client/java/techreborn/client/gui/GuiBlockPlacer.java +++ b/src/client/java/techreborn/client/gui/GuiBlockPlacer.java @@ -26,7 +26,7 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.GuiBase; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier0.block.BlockPlacerBlockEntity; import techreborn.blockentity.machine.tier0.block.blockplacer.BlockPlacerProcessor; diff --git a/src/client/java/techreborn/client/gui/GuiCentrifuge.java b/src/client/java/techreborn/client/gui/GuiCentrifuge.java index c4b68c63a..a8661e6c0 100644 --- a/src/client/java/techreborn/client/gui/GuiCentrifuge.java +++ b/src/client/java/techreborn/client/gui/GuiCentrifuge.java @@ -26,8 +26,8 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier3.IndustrialCentrifugeBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiChargeBench.java b/src/client/java/techreborn/client/gui/GuiChargeBench.java index f76a9e5bb..716595d6a 100644 --- a/src/client/java/techreborn/client/gui/GuiChargeBench.java +++ b/src/client/java/techreborn/client/gui/GuiChargeBench.java @@ -26,7 +26,7 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.GuiBase; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.misc.ChargeOMatBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiChemicalReactor.java b/src/client/java/techreborn/client/gui/GuiChemicalReactor.java index 459b1f930..f49745096 100644 --- a/src/client/java/techreborn/client/gui/GuiChemicalReactor.java +++ b/src/client/java/techreborn/client/gui/GuiChemicalReactor.java @@ -26,8 +26,8 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier1.ChemicalReactorBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiChunkLoader.java b/src/client/java/techreborn/client/gui/GuiChunkLoader.java index 34c497704..8d1dbda48 100644 --- a/src/client/java/techreborn/client/gui/GuiChunkLoader.java +++ b/src/client/java/techreborn/client/gui/GuiChunkLoader.java @@ -30,9 +30,9 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; import reborncore.client.ClientChunkManager; import reborncore.client.ClientNetworkManager; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.widget.GuiButtonUpDown; -import reborncore.client.gui.builder.widget.GuiButtonUpDown.UpDownButtonType; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.widget.GuiButtonUpDown; +import reborncore.client.gui.widget.GuiButtonUpDown.UpDownButtonType; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier3.ChunkLoaderBlockEntity; import techreborn.packets.ServerboundPackets; diff --git a/src/client/java/techreborn/client/gui/GuiCompressor.java b/src/client/java/techreborn/client/gui/GuiCompressor.java index 3fa66b2b0..6101228b2 100644 --- a/src/client/java/techreborn/client/gui/GuiCompressor.java +++ b/src/client/java/techreborn/client/gui/GuiCompressor.java @@ -26,8 +26,8 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier1.CompressorBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiDieselGenerator.java b/src/client/java/techreborn/client/gui/GuiDieselGenerator.java index e58ab7fe2..6d2556e31 100644 --- a/src/client/java/techreborn/client/gui/GuiDieselGenerator.java +++ b/src/client/java/techreborn/client/gui/GuiDieselGenerator.java @@ -26,8 +26,8 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.generator.advanced.DieselGeneratorBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiDistillationTower.java b/src/client/java/techreborn/client/gui/GuiDistillationTower.java index 81845a7c2..12cb21a52 100644 --- a/src/client/java/techreborn/client/gui/GuiDistillationTower.java +++ b/src/client/java/techreborn/client/gui/GuiDistillationTower.java @@ -26,9 +26,9 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.widget.GuiButtonExtended; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.widget.GuiButtonExtended; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.multiblock.DistillationTowerBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiElectricFurnace.java b/src/client/java/techreborn/client/gui/GuiElectricFurnace.java index e37995572..8778a79e8 100644 --- a/src/client/java/techreborn/client/gui/GuiElectricFurnace.java +++ b/src/client/java/techreborn/client/gui/GuiElectricFurnace.java @@ -26,8 +26,8 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier1.ElectricFurnaceBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiElevator.java b/src/client/java/techreborn/client/gui/GuiElevator.java index 9e2fb1331..021d16b63 100644 --- a/src/client/java/techreborn/client/gui/GuiElevator.java +++ b/src/client/java/techreborn/client/gui/GuiElevator.java @@ -26,7 +26,7 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.GuiBase; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier1.ElevatorBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiExtractor.java b/src/client/java/techreborn/client/gui/GuiExtractor.java index 41de019a2..72fdab719 100644 --- a/src/client/java/techreborn/client/gui/GuiExtractor.java +++ b/src/client/java/techreborn/client/gui/GuiExtractor.java @@ -26,8 +26,8 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier1.ExtractorBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiFishingStation.java b/src/client/java/techreborn/client/gui/GuiFishingStation.java index d85909338..4ecfc4373 100644 --- a/src/client/java/techreborn/client/gui/GuiFishingStation.java +++ b/src/client/java/techreborn/client/gui/GuiFishingStation.java @@ -26,7 +26,7 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.GuiBase; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier2.FishingStationBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiFluidReplicator.java b/src/client/java/techreborn/client/gui/GuiFluidReplicator.java index 26c1cadfe..caecc89a1 100644 --- a/src/client/java/techreborn/client/gui/GuiFluidReplicator.java +++ b/src/client/java/techreborn/client/gui/GuiFluidReplicator.java @@ -26,9 +26,9 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.widget.GuiButtonExtended; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.widget.GuiButtonExtended; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.multiblock.FluidReplicatorBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiFusionReactor.java b/src/client/java/techreborn/client/gui/GuiFusionReactor.java index 65e04f411..e12912f1c 100644 --- a/src/client/java/techreborn/client/gui/GuiFusionReactor.java +++ b/src/client/java/techreborn/client/gui/GuiFusionReactor.java @@ -30,11 +30,11 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; import org.apache.commons.lang3.tuple.Pair; import reborncore.client.ClientNetworkManager; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.widget.GuiButtonExtended; -import reborncore.client.gui.builder.widget.GuiButtonUpDown; -import reborncore.client.gui.builder.widget.GuiButtonUpDown.UpDownButtonType; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.widget.GuiButtonExtended; +import reborncore.client.gui.widget.GuiButtonUpDown; +import reborncore.client.gui.widget.GuiButtonUpDown.UpDownButtonType; +import reborncore.client.gui.GuiBuilder; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.util.Color; diff --git a/src/client/java/techreborn/client/gui/GuiGasTurbine.java b/src/client/java/techreborn/client/gui/GuiGasTurbine.java index 9304fcdf2..ecd1943f4 100644 --- a/src/client/java/techreborn/client/gui/GuiGasTurbine.java +++ b/src/client/java/techreborn/client/gui/GuiGasTurbine.java @@ -26,8 +26,8 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.generator.advanced.GasTurbineBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiGenerator.java b/src/client/java/techreborn/client/gui/GuiGenerator.java index 2ea6856d9..05a2a922d 100644 --- a/src/client/java/techreborn/client/gui/GuiGenerator.java +++ b/src/client/java/techreborn/client/gui/GuiGenerator.java @@ -26,7 +26,7 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.GuiBase; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.generator.basic.SolidFuelGeneratorBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiGreenhouseController.java b/src/client/java/techreborn/client/gui/GuiGreenhouseController.java index f498166d0..41a3b6b95 100644 --- a/src/client/java/techreborn/client/gui/GuiGreenhouseController.java +++ b/src/client/java/techreborn/client/gui/GuiGreenhouseController.java @@ -29,8 +29,8 @@ import net.minecraft.client.resource.language.I18n; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; import net.minecraft.util.Identifier; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.widget.GuiButtonExtended; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.widget.GuiButtonExtended; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier1.GreenhouseControllerBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiGrinder.java b/src/client/java/techreborn/client/gui/GuiGrinder.java index 5c592083f..6e96a00f9 100644 --- a/src/client/java/techreborn/client/gui/GuiGrinder.java +++ b/src/client/java/techreborn/client/gui/GuiGrinder.java @@ -26,8 +26,8 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier1.GrinderBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiIDSU.java b/src/client/java/techreborn/client/gui/GuiIDSU.java index 3b8358a0e..50fc58c73 100644 --- a/src/client/java/techreborn/client/gui/GuiIDSU.java +++ b/src/client/java/techreborn/client/gui/GuiIDSU.java @@ -28,7 +28,7 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; -import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.GuiBase; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.storage.energy.idsu.InterdimensionalSUBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiImplosionCompressor.java b/src/client/java/techreborn/client/gui/GuiImplosionCompressor.java index aa172b6de..8fc58eb56 100644 --- a/src/client/java/techreborn/client/gui/GuiImplosionCompressor.java +++ b/src/client/java/techreborn/client/gui/GuiImplosionCompressor.java @@ -26,9 +26,9 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.widget.GuiButtonExtended; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.widget.GuiButtonExtended; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.multiblock.ImplosionCompressorBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java b/src/client/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java index 928a45839..f3b3cc338 100644 --- a/src/client/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java +++ b/src/client/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java @@ -26,8 +26,8 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier1.IndustrialElectrolyzerBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiIndustrialGrinder.java b/src/client/java/techreborn/client/gui/GuiIndustrialGrinder.java index b677a1d40..581537cca 100644 --- a/src/client/java/techreborn/client/gui/GuiIndustrialGrinder.java +++ b/src/client/java/techreborn/client/gui/GuiIndustrialGrinder.java @@ -26,9 +26,9 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.widget.GuiButtonExtended; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.widget.GuiButtonExtended; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.multiblock.IndustrialGrinderBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiIndustrialSawmill.java b/src/client/java/techreborn/client/gui/GuiIndustrialSawmill.java index 62663bfef..050a66022 100644 --- a/src/client/java/techreborn/client/gui/GuiIndustrialSawmill.java +++ b/src/client/java/techreborn/client/gui/GuiIndustrialSawmill.java @@ -26,9 +26,9 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.widget.GuiButtonExtended; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.widget.GuiButtonExtended; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.multiblock.IndustrialSawmillBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiIronFurnace.java b/src/client/java/techreborn/client/gui/GuiIronFurnace.java index a59b9c55e..73abed89a 100644 --- a/src/client/java/techreborn/client/gui/GuiIronFurnace.java +++ b/src/client/java/techreborn/client/gui/GuiIronFurnace.java @@ -32,8 +32,8 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; import net.minecraft.util.Identifier; import reborncore.client.ClientNetworkManager; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.iron.IronFurnaceBlockEntity; import techreborn.packets.ServerboundPackets; diff --git a/src/client/java/techreborn/client/gui/GuiLESU.java b/src/client/java/techreborn/client/gui/GuiLESU.java index 74b23f3ea..30432de10 100644 --- a/src/client/java/techreborn/client/gui/GuiLESU.java +++ b/src/client/java/techreborn/client/gui/GuiLESU.java @@ -28,7 +28,7 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; -import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.GuiBase; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.storage.energy.lesu.LapotronicSUBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiLaunchpad.java b/src/client/java/techreborn/client/gui/GuiLaunchpad.java index ceb24219a..5cb6b38e0 100644 --- a/src/client/java/techreborn/client/gui/GuiLaunchpad.java +++ b/src/client/java/techreborn/client/gui/GuiLaunchpad.java @@ -28,8 +28,8 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; import reborncore.client.ClientNetworkManager; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.widget.GuiButtonUpDown; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.widget.GuiButtonUpDown; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier2.LaunchpadBlockEntity; import techreborn.packets.ServerboundPackets; diff --git a/src/client/java/techreborn/client/gui/GuiMFE.java b/src/client/java/techreborn/client/gui/GuiMFE.java index 29b2ddfd7..fde622617 100644 --- a/src/client/java/techreborn/client/gui/GuiMFE.java +++ b/src/client/java/techreborn/client/gui/GuiMFE.java @@ -28,7 +28,7 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; -import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.GuiBase; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.storage.energy.MediumVoltageSUBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiMFSU.java b/src/client/java/techreborn/client/gui/GuiMFSU.java index 8c6db9408..83df7fe31 100644 --- a/src/client/java/techreborn/client/gui/GuiMFSU.java +++ b/src/client/java/techreborn/client/gui/GuiMFSU.java @@ -28,7 +28,7 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; -import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.GuiBase; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.storage.energy.HighVoltageSUBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiManual.java b/src/client/java/techreborn/client/gui/GuiManual.java index f86973b2c..ad274b88d 100644 --- a/src/client/java/techreborn/client/gui/GuiManual.java +++ b/src/client/java/techreborn/client/gui/GuiManual.java @@ -31,7 +31,7 @@ import net.minecraft.text.Text; import net.minecraft.util.Identifier; import net.minecraft.util.Util; import reborncore.client.ClientNetworkManager; -import reborncore.client.gui.builder.widget.GuiButtonExtended; +import reborncore.client.gui.widget.GuiButtonExtended; import techreborn.config.TechRebornConfig; import techreborn.packets.ServerboundPackets; diff --git a/src/client/java/techreborn/client/gui/GuiMatterFabricator.java b/src/client/java/techreborn/client/gui/GuiMatterFabricator.java index 37beea6b9..00ae8a862 100644 --- a/src/client/java/techreborn/client/gui/GuiMatterFabricator.java +++ b/src/client/java/techreborn/client/gui/GuiMatterFabricator.java @@ -26,8 +26,8 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier3.MatterFabricatorBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiPlasmaGenerator.java b/src/client/java/techreborn/client/gui/GuiPlasmaGenerator.java index 986c4c3b8..51a3639f5 100644 --- a/src/client/java/techreborn/client/gui/GuiPlasmaGenerator.java +++ b/src/client/java/techreborn/client/gui/GuiPlasmaGenerator.java @@ -26,8 +26,8 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.generator.PlasmaGeneratorBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiPlayerDetector.java b/src/client/java/techreborn/client/gui/GuiPlayerDetector.java index b339d876d..c5baab9e6 100644 --- a/src/client/java/techreborn/client/gui/GuiPlayerDetector.java +++ b/src/client/java/techreborn/client/gui/GuiPlayerDetector.java @@ -28,8 +28,8 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; import reborncore.client.ClientNetworkManager; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.widget.GuiButtonUpDown; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.widget.GuiButtonUpDown; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier1.PlayerDetectorBlockEntity; import techreborn.packets.ServerboundPackets; diff --git a/src/client/java/techreborn/client/gui/GuiPump.java b/src/client/java/techreborn/client/gui/GuiPump.java index 915914c15..4144a2cbc 100644 --- a/src/client/java/techreborn/client/gui/GuiPump.java +++ b/src/client/java/techreborn/client/gui/GuiPump.java @@ -28,8 +28,8 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; import reborncore.client.ClientNetworkManager; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.widget.GuiButtonUpDown; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.widget.GuiButtonUpDown; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier2.PumpBlockEntity; import techreborn.packets.ServerboundPackets; diff --git a/src/client/java/techreborn/client/gui/GuiRecycler.java b/src/client/java/techreborn/client/gui/GuiRecycler.java index 75c6ef450..2df0f21cf 100644 --- a/src/client/java/techreborn/client/gui/GuiRecycler.java +++ b/src/client/java/techreborn/client/gui/GuiRecycler.java @@ -26,8 +26,8 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier1.RecyclerBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiRollingMachine.java b/src/client/java/techreborn/client/gui/GuiRollingMachine.java index 4e90e96e8..69ade3336 100644 --- a/src/client/java/techreborn/client/gui/GuiRollingMachine.java +++ b/src/client/java/techreborn/client/gui/GuiRollingMachine.java @@ -27,8 +27,8 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; import reborncore.client.ClientNetworkManager; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier1.RollingMachineBlockEntity; import techreborn.packets.ServerboundPackets; diff --git a/src/client/java/techreborn/client/gui/GuiScrapboxinator.java b/src/client/java/techreborn/client/gui/GuiScrapboxinator.java index 2d4084808..a02a3d7bc 100644 --- a/src/client/java/techreborn/client/gui/GuiScrapboxinator.java +++ b/src/client/java/techreborn/client/gui/GuiScrapboxinator.java @@ -26,8 +26,8 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier1.ScrapboxinatorBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiSemifluidGenerator.java b/src/client/java/techreborn/client/gui/GuiSemifluidGenerator.java index 315fa5fc0..5dcc5d16b 100644 --- a/src/client/java/techreborn/client/gui/GuiSemifluidGenerator.java +++ b/src/client/java/techreborn/client/gui/GuiSemifluidGenerator.java @@ -26,8 +26,8 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.generator.advanced.SemiFluidGeneratorBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiSolar.java b/src/client/java/techreborn/client/gui/GuiSolar.java index cdbf84c7c..539c221e1 100644 --- a/src/client/java/techreborn/client/gui/GuiSolar.java +++ b/src/client/java/techreborn/client/gui/GuiSolar.java @@ -27,7 +27,7 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; -import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.GuiBase; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.generator.SolarPanelBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiSolidCanningMachine.java b/src/client/java/techreborn/client/gui/GuiSolidCanningMachine.java index ba1b3f0d0..e7491ed72 100644 --- a/src/client/java/techreborn/client/gui/GuiSolidCanningMachine.java +++ b/src/client/java/techreborn/client/gui/GuiSolidCanningMachine.java @@ -26,8 +26,8 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier1.SolidCanningMachineBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiStorageUnit.java b/src/client/java/techreborn/client/gui/GuiStorageUnit.java index 245b7a7f5..9cf1c3ae1 100644 --- a/src/client/java/techreborn/client/gui/GuiStorageUnit.java +++ b/src/client/java/techreborn/client/gui/GuiStorageUnit.java @@ -28,7 +28,7 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; import reborncore.client.ClientNetworkManager; -import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.GuiBase; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.storage.item.StorageUnitBaseBlockEntity; import techreborn.packets.ServerboundPackets; diff --git a/src/client/java/techreborn/client/gui/GuiTankUnit.java b/src/client/java/techreborn/client/gui/GuiTankUnit.java index e4dd2af3c..359838b99 100644 --- a/src/client/java/techreborn/client/gui/GuiTankUnit.java +++ b/src/client/java/techreborn/client/gui/GuiTankUnit.java @@ -27,7 +27,7 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; -import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.GuiBase; import reborncore.common.fluid.FluidUtils; import reborncore.common.fluid.container.FluidInstance; import reborncore.common.screen.BuiltScreenHandler; diff --git a/src/client/java/techreborn/client/gui/GuiThermalGenerator.java b/src/client/java/techreborn/client/gui/GuiThermalGenerator.java index 339170385..53d2e19ac 100644 --- a/src/client/java/techreborn/client/gui/GuiThermalGenerator.java +++ b/src/client/java/techreborn/client/gui/GuiThermalGenerator.java @@ -26,8 +26,8 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.generator.advanced.ThermalGeneratorBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiVacuumFreezer.java b/src/client/java/techreborn/client/gui/GuiVacuumFreezer.java index b81be6f8e..cf997befd 100644 --- a/src/client/java/techreborn/client/gui/GuiVacuumFreezer.java +++ b/src/client/java/techreborn/client/gui/GuiVacuumFreezer.java @@ -26,9 +26,9 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.widget.GuiButtonExtended; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.widget.GuiButtonExtended; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.multiblock.VacuumFreezerBlockEntity; diff --git a/src/client/java/techreborn/client/gui/GuiWireMill.java b/src/client/java/techreborn/client/gui/GuiWireMill.java index 39244dbef..40161d207 100644 --- a/src/client/java/techreborn/client/gui/GuiWireMill.java +++ b/src/client/java/techreborn/client/gui/GuiWireMill.java @@ -26,8 +26,8 @@ package techreborn.client.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.client.gui.GuiBase; +import reborncore.client.gui.GuiBuilder; import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier1.WireMillBlockEntity;