From af828c12961976b111cb50c016098e245e3664f2 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Mon, 30 Aug 2021 10:50:09 +0700 Subject: [PATCH] Move screen package to client package --- .../java/ru/dbotthepony/mc/otm/Registry.java | 4 +--- .../mc/otm/android/AndroidResearch.java | 17 +---------------- .../mc/otm/android/AndroidResearchBuilder.java | 2 +- .../screen/AndroidStationScreen.java | 6 ++---- .../{ => client}/screen/BatteryBankScreen.java | 14 +++----------- .../{ => client}/screen/DriveViewerScreen.java | 7 ++----- .../screen/MatterBottlerScreen.java | 5 ++--- .../screen/MatterCapacitorBankScreen.java | 6 ++---- .../screen/MatterDecomposerScreen.java | 7 ++----- .../{ => client}/screen/MatterPanelScreen.java | 4 ++-- .../screen/MatterReplicatorScreen.java | 6 ++---- .../screen/MatterScannerScreen.java | 6 ++---- .../otm/{ => client}/screen/MatteryScreen.java | 8 ++------ .../screen/PatternStorageScreen.java | 5 ++--- .../mc/otm/{ => client}/screen/RGBAColor.java | 2 +- .../otm/{ => client}/screen/RenderHelper.java | 3 +-- .../mc/otm/{ => client}/screen/SkinElement.java | 2 +- .../mc/otm/{ => client}/screen/UVCoords.java | 2 +- .../otm/{ => client}/screen/UVWindingOrder.java | 2 +- .../screen/panels/AbstractSlotPanel.java | 12 ++++-------- .../{ => client}/screen/panels/ButtonPanel.java | 4 ++-- .../mc/otm/{ => client}/screen/panels/Dock.java | 2 +- .../screen/panels/DraggableCanvasPanel.java | 4 ++-- .../screen/panels/EditBoxPanel.java | 5 ++--- .../screen/panels/EditablePanel.java | 8 +++----- .../screen/panels/FlexGridPanel.java | 5 ++--- .../{ => client}/screen/panels/FramePanel.java | 6 +++--- .../{ => client}/screen/panels/GridPanel.java | 4 ++-- .../screen/panels/MatteryWidgetPanel.java | 8 ++------ .../screen/panels/MinecraftWidgetPanel.java | 7 ++----- .../screen/panels/ScrollBarPanel.java | 6 +++--- .../{ => client}/screen/panels/SlotPanel.java | 12 +++--------- .../screen/panels/SupplierSlotPanel.java | 4 ++-- .../mc/otm/menu/MatterBottlerMenu.java | 7 +------ .../mc/otm/menu/widget/AbstractWidget.java | 2 +- .../mc/otm/menu/widget/BatteryLevelWidget.java | 2 -- .../mc/otm/menu/widget/GaugeWidget.java | 5 ++--- .../mc/otm/menu/widget/MatterLevelWidget.java | 2 -- .../mc/otm/menu/widget/ProgressGaugeWidget.java | 3 --- 39 files changed, 68 insertions(+), 148 deletions(-) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/AndroidStationScreen.java (97%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/BatteryBankScreen.java (59%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/DriveViewerScreen.java (97%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/MatterBottlerScreen.java (92%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/MatterCapacitorBankScreen.java (83%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/MatterDecomposerScreen.java (84%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/MatterPanelScreen.java (99%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/MatterReplicatorScreen.java (86%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/MatterScannerScreen.java (86%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/MatteryScreen.java (98%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/PatternStorageScreen.java (87%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/RGBAColor.java (96%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/RenderHelper.java (99%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/SkinElement.java (98%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/UVCoords.java (60%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/UVWindingOrder.java (94%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/panels/AbstractSlotPanel.java (90%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/panels/ButtonPanel.java (88%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/panels/Dock.java (55%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/panels/DraggableCanvasPanel.java (92%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/panels/EditBoxPanel.java (90%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/panels/EditablePanel.java (99%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/panels/FlexGridPanel.java (97%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/panels/FramePanel.java (97%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/panels/GridPanel.java (92%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/panels/MatteryWidgetPanel.java (84%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/panels/MinecraftWidgetPanel.java (93%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/panels/ScrollBarPanel.java (96%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/panels/SlotPanel.java (88%) rename src/main/java/ru/dbotthepony/mc/otm/{ => client}/screen/panels/SupplierSlotPanel.java (88%) diff --git a/src/main/java/ru/dbotthepony/mc/otm/Registry.java b/src/main/java/ru/dbotthepony/mc/otm/Registry.java index 36e4516de..dda6eebcf 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/Registry.java +++ b/src/main/java/ru/dbotthepony/mc/otm/Registry.java @@ -5,8 +5,6 @@ import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.resources.ResourceLocation; import net.minecraft.stats.StatFormatter; -import net.minecraft.stats.StatType; -import net.minecraft.stats.Stats; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.food.FoodProperties; import net.minecraft.world.inventory.MenuType; @@ -35,7 +33,7 @@ import ru.dbotthepony.mc.otm.block.entity.*; import ru.dbotthepony.mc.otm.android.AndroidFeatureType; import ru.dbotthepony.mc.otm.item.*; import ru.dbotthepony.mc.otm.menu.*; -import ru.dbotthepony.mc.otm.screen.*; +import ru.dbotthepony.mc.otm.client.screen.*; import java.math.BigDecimal; diff --git a/src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearch.java b/src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearch.java index 5cbd6786f..f69c04ef4 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearch.java +++ b/src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearch.java @@ -1,30 +1,15 @@ package ru.dbotthepony.mc.otm.android; -import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.ChatFormatting; -import net.minecraft.client.Minecraft; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TranslatableComponent; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; import net.minecraftforge.common.util.INBTSerializable; -import net.minecraftforge.registries.ForgeRegistry; -import net.minecraftforge.registries.RegistryManager; -import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.capability.AndroidCapabilityPlayer; -import ru.dbotthepony.mc.otm.capability.MatteryCapability; import ru.dbotthepony.mc.otm.network.MatteryNetworking; import ru.dbotthepony.mc.otm.network.android.AndroidResearchRequestPacket; -import ru.dbotthepony.mc.otm.screen.SkinElement; +import ru.dbotthepony.mc.otm.client.screen.SkinElement; import javax.annotation.Nullable; -import java.util.ArrayList; import java.util.List; -import java.util.Objects; -import java.util.function.Supplier; public abstract class AndroidResearch implements INBTSerializable { public final AndroidResearchType type; diff --git a/src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearchBuilder.java b/src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearchBuilder.java index 8e84c6edf..546ec44b9 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearchBuilder.java +++ b/src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearchBuilder.java @@ -9,7 +9,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraftforge.registries.RegistryManager; import ru.dbotthepony.mc.otm.Registry; -import ru.dbotthepony.mc.otm.screen.SkinElement; +import ru.dbotthepony.mc.otm.client.screen.SkinElement; import javax.annotation.Nullable; import java.util.ArrayList; diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/AndroidStationScreen.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/AndroidStationScreen.java similarity index 97% rename from src/main/java/ru/dbotthepony/mc/otm/screen/AndroidStationScreen.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/AndroidStationScreen.java index b5e2fbd0c..636e06cf9 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/AndroidStationScreen.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/AndroidStationScreen.java @@ -1,6 +1,5 @@ -package ru.dbotthepony.mc.otm.screen; +package ru.dbotthepony.mc.otm.client.screen; -import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; @@ -13,10 +12,9 @@ import ru.dbotthepony.mc.otm.android.AndroidResearchType; import ru.dbotthepony.mc.otm.capability.MatteryCapability; import ru.dbotthepony.mc.otm.capability.AndroidCapabilityPlayer; import ru.dbotthepony.mc.otm.menu.AndroidStationMenu; -import ru.dbotthepony.mc.otm.menu.slot.BatterySlot; import ru.dbotthepony.mc.otm.menu.slot.MatterySlot; import ru.dbotthepony.mc.otm.menu.widget.GaugeWidget; -import ru.dbotthepony.mc.otm.screen.panels.*; +import ru.dbotthepony.mc.otm.client.screen.panels.*; import javax.annotation.Nullable; import java.util.*; diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/BatteryBankScreen.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/BatteryBankScreen.java similarity index 59% rename from src/main/java/ru/dbotthepony/mc/otm/screen/BatteryBankScreen.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/BatteryBankScreen.java index 5244cf662..2f8288875 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/BatteryBankScreen.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/BatteryBankScreen.java @@ -1,20 +1,12 @@ -package ru.dbotthepony.mc.otm.screen; +package ru.dbotthepony.mc.otm.client.screen; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; -import ru.dbotthepony.mc.otm.OverdriveThatMatters; -import ru.dbotthepony.mc.otm.menu.AndroidStationMenu; import ru.dbotthepony.mc.otm.menu.BatteryBankMenu; -import ru.dbotthepony.mc.otm.menu.MatteryMenu; import ru.dbotthepony.mc.otm.menu.widget.GaugeWidget; -import ru.dbotthepony.mc.otm.screen.panels.Dock; -import ru.dbotthepony.mc.otm.screen.panels.FlexGridPanel; -import ru.dbotthepony.mc.otm.screen.panels.FramePanel; -import ru.dbotthepony.mc.otm.screen.panels.SlotPanel; +import ru.dbotthepony.mc.otm.client.screen.panels.FlexGridPanel; +import ru.dbotthepony.mc.otm.client.screen.panels.SlotPanel; -import javax.annotation.Nullable; import java.util.List; public class BatteryBankScreen extends MatteryScreen implements MatteryScreen.IMatteryScreenGaugeGetter, MatteryScreen.IMatteryScreenGridBased { diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/DriveViewerScreen.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/DriveViewerScreen.java similarity index 97% rename from src/main/java/ru/dbotthepony/mc/otm/screen/DriveViewerScreen.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/DriveViewerScreen.java index 24e837d0a..35594b7ea 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/DriveViewerScreen.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/DriveViewerScreen.java @@ -1,9 +1,6 @@ -package ru.dbotthepony.mc.otm.screen; +package ru.dbotthepony.mc.otm.client.screen; import com.mojang.blaze3d.platform.InputConstants; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.client.gui.components.Button; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.world.entity.player.Inventory; @@ -15,7 +12,7 @@ import ru.dbotthepony.mc.otm.menu.DriveViewerMenu; import ru.dbotthepony.mc.otm.menu.slot.MatterySlot; import ru.dbotthepony.mc.otm.menu.widget.GaugeWidget; import ru.dbotthepony.mc.otm.network.MatteryNetworking; -import ru.dbotthepony.mc.otm.screen.panels.*; +import ru.dbotthepony.mc.otm.client.screen.panels.*; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/MatterBottlerScreen.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterBottlerScreen.java similarity index 92% rename from src/main/java/ru/dbotthepony/mc/otm/screen/MatterBottlerScreen.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterBottlerScreen.java index 7a6926c6e..3846aa796 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/MatterBottlerScreen.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterBottlerScreen.java @@ -1,13 +1,12 @@ -package ru.dbotthepony.mc.otm.screen; +package ru.dbotthepony.mc.otm.client.screen; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.world.entity.player.Inventory; import ru.dbotthepony.mc.otm.menu.MatterBottlerMenu; -import ru.dbotthepony.mc.otm.menu.slot.BatterySlot; import ru.dbotthepony.mc.otm.menu.slot.MatterySlot; import ru.dbotthepony.mc.otm.menu.widget.GaugeWidget; -import ru.dbotthepony.mc.otm.screen.panels.*; +import ru.dbotthepony.mc.otm.client.screen.panels.*; import javax.annotation.Nullable; import java.util.List; diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/MatterCapacitorBankScreen.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterCapacitorBankScreen.java similarity index 83% rename from src/main/java/ru/dbotthepony/mc/otm/screen/MatterCapacitorBankScreen.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterCapacitorBankScreen.java index 8562257bf..de413e728 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/MatterCapacitorBankScreen.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterCapacitorBankScreen.java @@ -1,13 +1,11 @@ -package ru.dbotthepony.mc.otm.screen; +package ru.dbotthepony.mc.otm.client.screen; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; import ru.dbotthepony.mc.otm.menu.MatterCapacitorBankMenu; -import ru.dbotthepony.mc.otm.menu.slot.BatterySlot; import ru.dbotthepony.mc.otm.menu.widget.GaugeWidget; -import ru.dbotthepony.mc.otm.screen.panels.*; +import ru.dbotthepony.mc.otm.client.screen.panels.*; -import javax.annotation.Nullable; import java.util.List; public class MatterCapacitorBankScreen extends MatteryScreen implements MatteryScreen.IMatteryScreenGaugeGetter, MatteryScreen.IMatteryScreenGridBased { diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/MatterDecomposerScreen.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterDecomposerScreen.java similarity index 84% rename from src/main/java/ru/dbotthepony/mc/otm/screen/MatterDecomposerScreen.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterDecomposerScreen.java index 88106b6d8..8d5fee650 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/MatterDecomposerScreen.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterDecomposerScreen.java @@ -1,15 +1,12 @@ -package ru.dbotthepony.mc.otm.screen; +package ru.dbotthepony.mc.otm.client.screen; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; import ru.dbotthepony.mc.otm.menu.MatterDecomposerMenu; -import ru.dbotthepony.mc.otm.menu.slot.BatterySlot; import ru.dbotthepony.mc.otm.menu.slot.MatterySlot; import ru.dbotthepony.mc.otm.menu.widget.GaugeWidget; -import ru.dbotthepony.mc.otm.screen.panels.*; +import ru.dbotthepony.mc.otm.client.screen.panels.*; -import javax.annotation.Nullable; import java.util.List; public class MatterDecomposerScreen extends MatteryScreen implements MatteryScreen.IMatteryScreenGaugeGetter, MatteryScreen.IMatteryScreenBatteryGetter, MatteryScreen.IMatteryScreenGridBased { diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/MatterPanelScreen.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterPanelScreen.java similarity index 99% rename from src/main/java/ru/dbotthepony/mc/otm/screen/MatterPanelScreen.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterPanelScreen.java index 6d4663dc4..145f01e09 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/MatterPanelScreen.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterPanelScreen.java @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.screen; +package ru.dbotthepony.mc.otm.client.screen; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.components.EditBox; @@ -14,7 +14,7 @@ import ru.dbotthepony.mc.otm.capability.PatternState; import ru.dbotthepony.mc.otm.menu.MatterPanelMenu; import ru.dbotthepony.mc.otm.network.MatteryNetworking; import ru.dbotthepony.mc.otm.network.PatternReplicationRequestPacket; -import ru.dbotthepony.mc.otm.screen.panels.*; +import ru.dbotthepony.mc.otm.client.screen.panels.*; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/MatterReplicatorScreen.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterReplicatorScreen.java similarity index 86% rename from src/main/java/ru/dbotthepony/mc/otm/screen/MatterReplicatorScreen.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterReplicatorScreen.java index 1c215764e..d04bda4d2 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/MatterReplicatorScreen.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterReplicatorScreen.java @@ -1,14 +1,12 @@ -package ru.dbotthepony.mc.otm.screen; +package ru.dbotthepony.mc.otm.client.screen; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; import ru.dbotthepony.mc.otm.menu.MatterReplicatorMenu; -import ru.dbotthepony.mc.otm.menu.slot.BatterySlot; import ru.dbotthepony.mc.otm.menu.slot.MatterySlot; import ru.dbotthepony.mc.otm.menu.widget.GaugeWidget; -import ru.dbotthepony.mc.otm.screen.panels.*; +import ru.dbotthepony.mc.otm.client.screen.panels.*; -import javax.annotation.Nullable; import java.util.List; public class MatterReplicatorScreen extends MatteryScreen implements MatteryScreen.IMatteryScreenGaugeGetter, MatteryScreen.IMatteryScreenBatteryGetter, MatteryScreen.IMatteryScreenGridBased { diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/MatterScannerScreen.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterScannerScreen.java similarity index 86% rename from src/main/java/ru/dbotthepony/mc/otm/screen/MatterScannerScreen.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterScannerScreen.java index 0e9af37e8..e80cce666 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/MatterScannerScreen.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterScannerScreen.java @@ -1,14 +1,12 @@ -package ru.dbotthepony.mc.otm.screen; +package ru.dbotthepony.mc.otm.client.screen; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; import ru.dbotthepony.mc.otm.menu.MatterScannerMenu; -import ru.dbotthepony.mc.otm.menu.slot.BatterySlot; import ru.dbotthepony.mc.otm.menu.slot.MatterySlot; import ru.dbotthepony.mc.otm.menu.widget.GaugeWidget; -import ru.dbotthepony.mc.otm.screen.panels.*; +import ru.dbotthepony.mc.otm.client.screen.panels.*; -import javax.annotation.Nullable; import java.util.List; public class MatterScannerScreen extends MatteryScreen implements MatteryScreen.IMatteryScreenGaugeGetter, MatteryScreen.IMatteryScreenBatteryGetter, MatteryScreen.IMatteryScreenGridBased { diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/MatteryScreen.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatteryScreen.java similarity index 98% rename from src/main/java/ru/dbotthepony/mc/otm/screen/MatteryScreen.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/MatteryScreen.java index 3e9d6a0f3..2ed5ff386 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/MatteryScreen.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatteryScreen.java @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.screen; +package ru.dbotthepony.mc.otm.client.screen; import com.google.common.collect.Sets; import com.mojang.blaze3d.platform.InputConstants; @@ -12,20 +12,16 @@ import net.minecraft.client.gui.components.Widget; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.client.renderer.entity.ItemRenderer; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.ClickType; import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; -import ru.dbotthepony.mc.otm.OverdriveThatMatters; import ru.dbotthepony.mc.otm.menu.MatteryMenu; -import ru.dbotthepony.mc.otm.menu.PoweredMatteryMenu; -import ru.dbotthepony.mc.otm.menu.slot.BatterySlot; import ru.dbotthepony.mc.otm.menu.slot.MatterySlot; import ru.dbotthepony.mc.otm.menu.widget.GaugeWidget; -import ru.dbotthepony.mc.otm.screen.panels.*; +import ru.dbotthepony.mc.otm.client.screen.panels.*; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/PatternStorageScreen.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/PatternStorageScreen.java similarity index 87% rename from src/main/java/ru/dbotthepony/mc/otm/screen/PatternStorageScreen.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/PatternStorageScreen.java index fed15e796..0aa4372b7 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/PatternStorageScreen.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/PatternStorageScreen.java @@ -1,12 +1,11 @@ -package ru.dbotthepony.mc.otm.screen; +package ru.dbotthepony.mc.otm.client.screen; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; import ru.dbotthepony.mc.otm.menu.PatternStorageMenu; import ru.dbotthepony.mc.otm.menu.widget.GaugeWidget; -import ru.dbotthepony.mc.otm.screen.panels.*; +import ru.dbotthepony.mc.otm.client.screen.panels.*; -import javax.annotation.Nullable; import java.util.List; public class PatternStorageScreen extends MatteryScreen implements MatteryScreen.IMatteryScreenGaugeGetter, MatteryScreen.IMatteryScreenGridBased { diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/RGBAColor.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/RGBAColor.java similarity index 96% rename from src/main/java/ru/dbotthepony/mc/otm/screen/RGBAColor.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/RGBAColor.java index 9d6020e70..b6eb6c04e 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/RGBAColor.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/RGBAColor.java @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.screen; +package ru.dbotthepony.mc.otm.client.screen; import com.mojang.blaze3d.systems.RenderSystem; diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/RenderHelper.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/RenderHelper.java similarity index 99% rename from src/main/java/ru/dbotthepony/mc/otm/screen/RenderHelper.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/RenderHelper.java index c05e1ff63..321779e37 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/RenderHelper.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/RenderHelper.java @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.screen; +package ru.dbotthepony.mc.otm.client.screen; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.*; @@ -11,7 +11,6 @@ import ru.dbotthepony.mc.otm.OverdriveThatMatters; import java.util.Stack; import static org.lwjgl.opengl.GL11.GL_ALWAYS; -import static org.lwjgl.opengl.GL11.GL_LESS; /** * I am too lazy to learn how Mojang's API works diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/SkinElement.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/SkinElement.java similarity index 98% rename from src/main/java/ru/dbotthepony/mc/otm/screen/SkinElement.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/SkinElement.java index 3dc84b662..b1e659747 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/SkinElement.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/SkinElement.java @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.screen; +package ru.dbotthepony.mc.otm.client.screen; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/UVCoords.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/UVCoords.java similarity index 60% rename from src/main/java/ru/dbotthepony/mc/otm/screen/UVCoords.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/UVCoords.java index a48816f16..d8fa04616 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/UVCoords.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/UVCoords.java @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.screen; +package ru.dbotthepony.mc.otm.client.screen; public record UVCoords(float u0, float v0, float u1, float v1) { } diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/UVWindingOrder.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/UVWindingOrder.java similarity index 94% rename from src/main/java/ru/dbotthepony/mc/otm/screen/UVWindingOrder.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/UVWindingOrder.java index fa289b8e8..1223ea154 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/UVWindingOrder.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/UVWindingOrder.java @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.screen; +package ru.dbotthepony.mc.otm.client.screen; public enum UVWindingOrder { U0_V0_U1_V1(0, 1, 2, 3), // normal operation diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/AbstractSlotPanel.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/AbstractSlotPanel.java similarity index 90% rename from src/main/java/ru/dbotthepony/mc/otm/screen/panels/AbstractSlotPanel.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/AbstractSlotPanel.java index d3ab1167f..669df073d 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/AbstractSlotPanel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/AbstractSlotPanel.java @@ -1,19 +1,15 @@ -package ru.dbotthepony.mc.otm.screen.panels; +package ru.dbotthepony.mc.otm.client.screen.panels; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.Component; -import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.item.ItemStack; -import ru.dbotthepony.mc.otm.OverdriveThatMatters; -import ru.dbotthepony.mc.otm.menu.slot.MatterySlot; -import ru.dbotthepony.mc.otm.screen.MatteryScreen; -import ru.dbotthepony.mc.otm.screen.RGBAColor; -import ru.dbotthepony.mc.otm.screen.RenderHelper; +import ru.dbotthepony.mc.otm.client.screen.MatteryScreen; +import ru.dbotthepony.mc.otm.client.screen.RGBAColor; +import ru.dbotthepony.mc.otm.client.screen.RenderHelper; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/ButtonPanel.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/ButtonPanel.java similarity index 88% rename from src/main/java/ru/dbotthepony/mc/otm/screen/panels/ButtonPanel.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/ButtonPanel.java index ba87a2827..14e8f6c1d 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/ButtonPanel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/ButtonPanel.java @@ -1,8 +1,8 @@ -package ru.dbotthepony.mc.otm.screen.panels; +package ru.dbotthepony.mc.otm.client.screen.panels; import net.minecraft.client.gui.components.Button; import net.minecraft.network.chat.Component; -import ru.dbotthepony.mc.otm.screen.MatteryScreen; +import ru.dbotthepony.mc.otm.client.screen.MatteryScreen; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/Dock.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/Dock.java similarity index 55% rename from src/main/java/ru/dbotthepony/mc/otm/screen/panels/Dock.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/Dock.java index 1629c4156..d245db9e3 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/Dock.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/Dock.java @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.screen.panels; +package ru.dbotthepony.mc.otm.client.screen.panels; public enum Dock { NONE, diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/DraggableCanvasPanel.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/DraggableCanvasPanel.java similarity index 92% rename from src/main/java/ru/dbotthepony/mc/otm/screen/panels/DraggableCanvasPanel.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/DraggableCanvasPanel.java index 370acaeb5..b099d922a 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/DraggableCanvasPanel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/DraggableCanvasPanel.java @@ -1,6 +1,6 @@ -package ru.dbotthepony.mc.otm.screen.panels; +package ru.dbotthepony.mc.otm.client.screen.panels; -import ru.dbotthepony.mc.otm.screen.MatteryScreen; +import ru.dbotthepony.mc.otm.client.screen.MatteryScreen; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/EditBoxPanel.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/EditBoxPanel.java similarity index 90% rename from src/main/java/ru/dbotthepony/mc/otm/screen/panels/EditBoxPanel.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/EditBoxPanel.java index ab7919965..fa22706ae 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/EditBoxPanel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/EditBoxPanel.java @@ -1,10 +1,9 @@ -package ru.dbotthepony.mc.otm.screen.panels; +package ru.dbotthepony.mc.otm.client.screen.panels; import net.minecraft.client.gui.components.EditBox; -import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; import ru.dbotthepony.mc.otm.OverdriveThatMatters; -import ru.dbotthepony.mc.otm.screen.MatteryScreen; +import ru.dbotthepony.mc.otm.client.screen.MatteryScreen; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/EditablePanel.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/EditablePanel.java similarity index 99% rename from src/main/java/ru/dbotthepony/mc/otm/screen/panels/EditablePanel.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/EditablePanel.java index 18a7227a3..00f558eae 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/EditablePanel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/EditablePanel.java @@ -1,13 +1,11 @@ -package ru.dbotthepony.mc.otm.screen.panels; +package ru.dbotthepony.mc.otm.client.screen.panels; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.math.Vector3f; -import com.mojang.math.Vector4f; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.events.GuiEventListener; -import ru.dbotthepony.mc.otm.screen.MatteryScreen; -import ru.dbotthepony.mc.otm.screen.RenderHelper; +import ru.dbotthepony.mc.otm.client.screen.MatteryScreen; +import ru.dbotthepony.mc.otm.client.screen.RenderHelper; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/FlexGridPanel.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/FlexGridPanel.java similarity index 97% rename from src/main/java/ru/dbotthepony/mc/otm/screen/panels/FlexGridPanel.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/FlexGridPanel.java index af03e8729..3aaadc7fe 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/FlexGridPanel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/FlexGridPanel.java @@ -1,7 +1,6 @@ -package ru.dbotthepony.mc.otm.screen.panels; +package ru.dbotthepony.mc.otm.client.screen.panels; -import ru.dbotthepony.mc.otm.OverdriveThatMatters; -import ru.dbotthepony.mc.otm.screen.MatteryScreen; +import ru.dbotthepony.mc.otm.client.screen.MatteryScreen; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/FramePanel.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/FramePanel.java similarity index 97% rename from src/main/java/ru/dbotthepony/mc/otm/screen/panels/FramePanel.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/FramePanel.java index 22d61a39d..706289f00 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/FramePanel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/FramePanel.java @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.screen.panels; +package ru.dbotthepony.mc.otm.client.screen.panels; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; @@ -8,8 +8,8 @@ import net.minecraft.client.gui.narration.NarrationElementOutput; import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.network.chat.Component; import net.minecraft.sounds.SoundEvents; -import ru.dbotthepony.mc.otm.screen.MatteryScreen; -import ru.dbotthepony.mc.otm.screen.RenderHelper; +import ru.dbotthepony.mc.otm.client.screen.MatteryScreen; +import ru.dbotthepony.mc.otm.client.screen.RenderHelper; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/GridPanel.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/GridPanel.java similarity index 92% rename from src/main/java/ru/dbotthepony/mc/otm/screen/panels/GridPanel.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/GridPanel.java index 6ffe4dc18..21907a639 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/GridPanel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/GridPanel.java @@ -1,6 +1,6 @@ -package ru.dbotthepony.mc.otm.screen.panels; +package ru.dbotthepony.mc.otm.client.screen.panels; -import ru.dbotthepony.mc.otm.screen.MatteryScreen; +import ru.dbotthepony.mc.otm.client.screen.MatteryScreen; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/MatteryWidgetPanel.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/MatteryWidgetPanel.java similarity index 84% rename from src/main/java/ru/dbotthepony/mc/otm/screen/panels/MatteryWidgetPanel.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/MatteryWidgetPanel.java index 7e999a7e4..a7e72f9f8 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/MatteryWidgetPanel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/MatteryWidgetPanel.java @@ -1,16 +1,12 @@ -package ru.dbotthepony.mc.otm.screen.panels; +package ru.dbotthepony.mc.otm.client.screen.panels; -import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; -import ru.dbotthepony.mc.otm.menu.MatteryMenu; import ru.dbotthepony.mc.otm.menu.widget.AbstractWidget; -import ru.dbotthepony.mc.otm.screen.MatteryScreen; +import ru.dbotthepony.mc.otm.client.screen.MatteryScreen; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import static org.lwjgl.opengl.GL11.GL_ALWAYS; - public class MatteryWidgetPanel extends EditablePanel { public final AbstractWidget widget; diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/MinecraftWidgetPanel.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/MinecraftWidgetPanel.java similarity index 93% rename from src/main/java/ru/dbotthepony/mc/otm/screen/panels/MinecraftWidgetPanel.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/MinecraftWidgetPanel.java index a98e2ebb1..76be19de7 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/MinecraftWidgetPanel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/MinecraftWidgetPanel.java @@ -1,12 +1,9 @@ -package ru.dbotthepony.mc.otm.screen.panels; +package ru.dbotthepony.mc.otm.client.screen.panels; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.gui.components.AbstractWidget; -import net.minecraft.client.gui.screens.Screen; -import net.minecraft.network.chat.Component; -import ru.dbotthepony.mc.otm.OverdriveThatMatters; -import ru.dbotthepony.mc.otm.screen.MatteryScreen; +import ru.dbotthepony.mc.otm.client.screen.MatteryScreen; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/ScrollBarPanel.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarPanel.java similarity index 96% rename from src/main/java/ru/dbotthepony/mc/otm/screen/panels/ScrollBarPanel.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarPanel.java index 0da88bcee..83a082d15 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/ScrollBarPanel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarPanel.java @@ -1,8 +1,8 @@ -package ru.dbotthepony.mc.otm.screen.panels; +package ru.dbotthepony.mc.otm.client.screen.panels; import com.mojang.blaze3d.vertex.PoseStack; -import ru.dbotthepony.mc.otm.screen.MatteryScreen; -import ru.dbotthepony.mc.otm.screen.RenderHelper; +import ru.dbotthepony.mc.otm.client.screen.MatteryScreen; +import ru.dbotthepony.mc.otm.client.screen.RenderHelper; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/SlotPanel.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/SlotPanel.java similarity index 88% rename from src/main/java/ru/dbotthepony/mc/otm/screen/panels/SlotPanel.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/SlotPanel.java index df82b5319..838292510 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/SlotPanel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/SlotPanel.java @@ -1,20 +1,14 @@ -package ru.dbotthepony.mc.otm.screen.panels; +package ru.dbotthepony.mc.otm.client.screen.panels; -import com.mojang.blaze3d.platform.InputConstants; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.ChatFormatting; -import net.minecraft.Util; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.inventory.ClickType; import net.minecraft.world.item.ItemStack; -import ru.dbotthepony.mc.otm.OverdriveThatMatters; import ru.dbotthepony.mc.otm.menu.slot.MatterySlot; -import ru.dbotthepony.mc.otm.screen.MatteryScreen; -import ru.dbotthepony.mc.otm.screen.RGBAColor; -import ru.dbotthepony.mc.otm.screen.RenderHelper; +import ru.dbotthepony.mc.otm.client.screen.MatteryScreen; +import ru.dbotthepony.mc.otm.client.screen.RenderHelper; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/SupplierSlotPanel.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/SupplierSlotPanel.java similarity index 88% rename from src/main/java/ru/dbotthepony/mc/otm/screen/panels/SupplierSlotPanel.java rename to src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/SupplierSlotPanel.java index d6088bbd6..e14c31b3e 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/SupplierSlotPanel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/SupplierSlotPanel.java @@ -1,7 +1,7 @@ -package ru.dbotthepony.mc.otm.screen.panels; +package ru.dbotthepony.mc.otm.client.screen.panels; import net.minecraft.world.item.ItemStack; -import ru.dbotthepony.mc.otm.screen.MatteryScreen; +import ru.dbotthepony.mc.otm.client.screen.MatteryScreen; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.java b/src/main/java/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.java index d8348e48a..eea4712c2 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.java @@ -3,10 +3,7 @@ package ru.dbotthepony.mc.otm.menu; import net.minecraft.world.SimpleContainer; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.ContainerData; -import net.minecraft.world.inventory.MenuType; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.entity.BlockEntity; -import ru.dbotthepony.mc.otm.OverdriveThatMatters; import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.block.entity.BlockEntityMatterBottler; import ru.dbotthepony.mc.otm.capability.IMatterHandler; @@ -16,9 +13,7 @@ import ru.dbotthepony.mc.otm.menu.widget.MatterLevelWidget; import ru.dbotthepony.mc.otm.menu.widget.ProgressGaugeWidget; import ru.dbotthepony.mc.otm.network.MatterBottlerSwitchPacket; import ru.dbotthepony.mc.otm.network.MatteryNetworking; -import ru.dbotthepony.mc.otm.screen.UVWindingOrder; - -import javax.annotation.Nullable; +import ru.dbotthepony.mc.otm.client.screen.UVWindingOrder; public class MatterBottlerMenu extends PoweredMatteryMenu { public MatterBottlerMenu(int p_38852_, Inventory inventory) { diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/widget/AbstractWidget.java b/src/main/java/ru/dbotthepony/mc/otm/menu/widget/AbstractWidget.java index 3b11eba46..57db02d14 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/widget/AbstractWidget.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/widget/AbstractWidget.java @@ -4,7 +4,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.network.chat.Component; import net.minecraft.world.inventory.ContainerData; import ru.dbotthepony.mc.otm.menu.MatteryMenu; -import ru.dbotthepony.mc.otm.screen.UVWindingOrder; +import ru.dbotthepony.mc.otm.client.screen.UVWindingOrder; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/widget/BatteryLevelWidget.java b/src/main/java/ru/dbotthepony/mc/otm/menu/widget/BatteryLevelWidget.java index 38793ba92..d8fdde0a9 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/widget/BatteryLevelWidget.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/widget/BatteryLevelWidget.java @@ -1,12 +1,10 @@ package ru.dbotthepony.mc.otm.menu.widget; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TranslatableComponent; import ru.dbotthepony.mc.otm.capability.IMatteryEnergyStorage; import ru.dbotthepony.mc.otm.menu.FormattingHelper; import ru.dbotthepony.mc.otm.menu.MatteryMenu; -import ru.dbotthepony.mc.otm.screen.MatteryScreen; import javax.annotation.Nullable; import java.math.BigDecimal; diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/widget/GaugeWidget.java b/src/main/java/ru/dbotthepony/mc/otm/menu/widget/GaugeWidget.java index 5ada90e00..48edb979c 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/widget/GaugeWidget.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/widget/GaugeWidget.java @@ -4,9 +4,8 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.renderer.GameRenderer; import ru.dbotthepony.mc.otm.menu.MatteryMenu; -import ru.dbotthepony.mc.otm.screen.MatteryScreen; -import ru.dbotthepony.mc.otm.screen.RenderHelper; -import ru.dbotthepony.mc.otm.screen.UVWindingOrder; +import ru.dbotthepony.mc.otm.client.screen.RenderHelper; +import ru.dbotthepony.mc.otm.client.screen.UVWindingOrder; abstract public class GaugeWidget extends AbstractWidget { public enum GaugeDirection { diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/widget/MatterLevelWidget.java b/src/main/java/ru/dbotthepony/mc/otm/menu/widget/MatterLevelWidget.java index a91ccbc75..7fe44386d 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/widget/MatterLevelWidget.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/widget/MatterLevelWidget.java @@ -1,12 +1,10 @@ package ru.dbotthepony.mc.otm.menu.widget; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TranslatableComponent; import ru.dbotthepony.mc.otm.capability.IMatterHandler; import ru.dbotthepony.mc.otm.menu.FormattingHelper; import ru.dbotthepony.mc.otm.menu.MatteryMenu; -import ru.dbotthepony.mc.otm.screen.MatteryScreen; import javax.annotation.Nullable; import java.math.BigDecimal; diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/widget/ProgressGaugeWidget.java b/src/main/java/ru/dbotthepony/mc/otm/menu/widget/ProgressGaugeWidget.java index 3eec5cd3e..b82cd122f 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/widget/ProgressGaugeWidget.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/widget/ProgressGaugeWidget.java @@ -1,14 +1,11 @@ package ru.dbotthepony.mc.otm.menu.widget; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.ChatFormatting; -import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.world.inventory.ContainerData; import ru.dbotthepony.mc.otm.menu.MatteryMenu; -import ru.dbotthepony.mc.otm.screen.MatteryScreen; import javax.annotation.Nullable; import java.util.List;