DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Move screen package to client package

Browse Source
This commit is contained in:
DBotThePony 2021-08-30 10:50:09 +07:00
parent b304a5f12a
commit af828c1296
Signed by: DBot
GPG Key ID: DCC23B5715498507
39 changed files with 68 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/ru/dbotthepony/mc/otm/Registry.java
View File

@ -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;

17
src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearch.java
View File

@ -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<CompoundTag> {
public final AndroidResearchType<?> type;

2
src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearchBuilder.java
View File

@ -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;

6
src/main/java/ru/dbotthepony/mc/otm/screen/AndroidStationScreen.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/AndroidStationScreen.java
View File

@ -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.*;

14
src/main/java/ru/dbotthepony/mc/otm/screen/BatteryBankScreen.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/BatteryBankScreen.java
View File

@ -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<BatteryBankMenu> implements MatteryScreen.IMatteryScreenGaugeGetter, MatteryScreen.IMatteryScreenGridBased {

7
src/main/java/ru/dbotthepony/mc/otm/screen/DriveViewerScreen.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/DriveViewerScreen.java
View File

@ -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;

5
src/main/java/ru/dbotthepony/mc/otm/screen/MatterBottlerScreen.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterBottlerScreen.java
View File

@ -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;

6
src/main/java/ru/dbotthepony/mc/otm/screen/MatterCapacitorBankScreen.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterCapacitorBankScreen.java
View File

@ -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<MatterCapacitorBankMenu> implements MatteryScreen.IMatteryScreenGaugeGetter, MatteryScreen.IMatteryScreenGridBased {

7
src/main/java/ru/dbotthepony/mc/otm/screen/MatterDecomposerScreen.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterDecomposerScreen.java
View File

@ -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<MatterDecomposerMenu> implements MatteryScreen.IMatteryScreenGaugeGetter, MatteryScreen.IMatteryScreenBatteryGetter, MatteryScreen.IMatteryScreenGridBased {

4
src/main/java/ru/dbotthepony/mc/otm/screen/MatterPanelScreen.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterPanelScreen.java
View File

@ -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;

6
src/main/java/ru/dbotthepony/mc/otm/screen/MatterReplicatorScreen.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterReplicatorScreen.java
View File

@ -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<MatterReplicatorMenu> implements MatteryScreen.IMatteryScreenGaugeGetter, MatteryScreen.IMatteryScreenBatteryGetter, MatteryScreen.IMatteryScreenGridBased {

6
src/main/java/ru/dbotthepony/mc/otm/screen/MatterScannerScreen.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterScannerScreen.java
View File

@ -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<MatterScannerMenu> implements MatteryScreen.IMatteryScreenGaugeGetter, MatteryScreen.IMatteryScreenBatteryGetter, MatteryScreen.IMatteryScreenGridBased {

8
src/main/java/ru/dbotthepony/mc/otm/screen/MatteryScreen.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/MatteryScreen.java
View File

@ -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;

5
src/main/java/ru/dbotthepony/mc/otm/screen/PatternStorageScreen.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/PatternStorageScreen.java
View File

@ -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<PatternStorageMenu> implements MatteryScreen.IMatteryScreenGaugeGetter, MatteryScreen.IMatteryScreenGridBased {

2
src/main/java/ru/dbotthepony/mc/otm/screen/RGBAColor.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/RGBAColor.java
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.screen;
package ru.dbotthepony.mc.otm.client.screen;
import com.mojang.blaze3d.systems.RenderSystem;

3
src/main/java/ru/dbotthepony/mc/otm/screen/RenderHelper.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/RenderHelper.java
View File

@ -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

2
src/main/java/ru/dbotthepony/mc/otm/screen/SkinElement.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/SkinElement.java
View File

@ -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;

2
src/main/java/ru/dbotthepony/mc/otm/screen/UVCoords.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/UVCoords.java
View File

@ -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) {
}

2
src/main/java/ru/dbotthepony/mc/otm/screen/UVWindingOrder.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/UVWindingOrder.java
View File

@ -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

12
src/main/java/ru/dbotthepony/mc/otm/screen/panels/AbstractSlotPanel.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/AbstractSlotPanel.java
View File

@ -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;

4
src/main/java/ru/dbotthepony/mc/otm/screen/panels/ButtonPanel.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/ButtonPanel.java
View File

@ -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;

2
src/main/java/ru/dbotthepony/mc/otm/screen/panels/Dock.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/Dock.java
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.screen.panels;
package ru.dbotthepony.mc.otm.client.screen.panels;
public enum Dock {
NONE,

4
src/main/java/ru/dbotthepony/mc/otm/screen/panels/DraggableCanvasPanel.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/DraggableCanvasPanel.java
View File

@ -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;

5
src/main/java/ru/dbotthepony/mc/otm/screen/panels/EditBoxPanel.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/EditBoxPanel.java
View File

@ -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;

8
src/main/java/ru/dbotthepony/mc/otm/screen/panels/EditablePanel.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/EditablePanel.java
View File

@ -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;

5
src/main/java/ru/dbotthepony/mc/otm/screen/panels/FlexGridPanel.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/FlexGridPanel.java
View File

@ -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;

6
src/main/java/ru/dbotthepony/mc/otm/screen/panels/FramePanel.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/FramePanel.java
View File

@ -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;

4
src/main/java/ru/dbotthepony/mc/otm/screen/panels/GridPanel.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/GridPanel.java
View File

@ -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;

8
src/main/java/ru/dbotthepony/mc/otm/screen/panels/MatteryWidgetPanel.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/MatteryWidgetPanel.java
View File

@ -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;

7
src/main/java/ru/dbotthepony/mc/otm/screen/panels/MinecraftWidgetPanel.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/MinecraftWidgetPanel.java
View File

@ -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;

6
src/main/java/ru/dbotthepony/mc/otm/screen/panels/ScrollBarPanel.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarPanel.java
View File

@ -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;

12
src/main/java/ru/dbotthepony/mc/otm/screen/panels/SlotPanel.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/SlotPanel.java
View File

@ -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;

4
src/main/java/ru/dbotthepony/mc/otm/screen/panels/SupplierSlotPanel.java → src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/SupplierSlotPanel.java
View File

@ -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;

7
src/main/java/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.java
View File

@ -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) {

2
src/main/java/ru/dbotthepony/mc/otm/menu/widget/AbstractWidget.java
View File

@ -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;

2
src/main/java/ru/dbotthepony/mc/otm/menu/widget/BatteryLevelWidget.java
View File

@ -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;

5
src/main/java/ru/dbotthepony/mc/otm/menu/widget/GaugeWidget.java
View File

@ -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 {

2
src/main/java/ru/dbotthepony/mc/otm/menu/widget/MatterLevelWidget.java
View File

@ -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;

3
src/main/java/ru/dbotthepony/mc/otm/menu/widget/ProgressGaugeWidget.java
View File

@ -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;