Move UI package into client package

robotgryphon · robotgryphon · commit 03e3e7a7d1e0 · 2021-09-29T21:54:31.000-04:00
diff --git a/src/main/java/dev/compactmods/crafting/CompactCrafting.java b/src/main/java/dev/compactmods/crafting/CompactCrafting.java
@@ -4,7 +4,7 @@
 import dev.compactmods.crafting.network.NetworkHandler;
 import dev.compactmods.crafting.recipes.components.ComponentRegistration;
 import dev.compactmods.crafting.server.ServerConfig;
-import dev.compactmods.crafting.ui.container.ContainerRegistration;
+import dev.compactmods.crafting.client.ui.container.ContainerRegistration;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.eventbus.api.IEventBus;
diff --git a/src/main/java/dev/compactmods/crafting/client/ClientPacketHandler.java b/src/main/java/dev/compactmods/crafting/client/ClientPacketHandler.java
@@ -1,27 +1,45 @@
 package dev.compactmods.crafting.client;
 
 import javax.annotation.Nullable;
+import java.util.concurrent.atomic.AtomicReference;
+import dev.compactmods.crafting.api.field.IMiniaturizationField;
 import dev.compactmods.crafting.field.MiniaturizationField;
 import dev.compactmods.crafting.field.capability.CapabilityActiveWorldFields;
-import dev.compactmods.crafting.projector.block.FieldProjectorBlock;
-import dev.compactmods.crafting.api.field.MiniaturizationFieldSize;
+import dev.compactmods.crafting.projector.FieldProjectorBlock;
+import dev.compactmods.crafting.projector.FieldProjectorTile;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
+import net.minecraftforge.common.util.LazyOptional;
 
 public abstract class ClientPacketHandler {
 
-    public static void handleFieldActivation(BlockPos[] projectorLocations, MiniaturizationFieldSize fieldSize) {
+    public static void handleFieldActivation(IMiniaturizationField field, CompoundNBT fieldClientData) {
         Minecraft mc = Minecraft.getInstance();
         mc.submitAsync(() -> {
             ClientWorld cw = mc.level;
-            for (BlockPos proj : projectorLocations) {
+            if (cw == null)
+                return;
+
+            field.setLevel(cw);
+            field.loadClientData(fieldClientData);
+
+            AtomicReference<LazyOptional<IMiniaturizationField>> fieldLazy = new AtomicReference<>(LazyOptional.empty());
+            mc.level.getCapability(CapabilityActiveWorldFields.ACTIVE_WORLD_FIELDS)
+                    .ifPresent(fields -> {
+                        fields.registerField(field);
+                        fieldLazy.set(fields.getLazy(field.getCenter()));
+                    });
+
+            field.getProjectorPositions().forEach(proj -> {
                 if (cw.getBlockState(proj).getBlock() instanceof FieldProjectorBlock) {
-                    FieldProjectorBlock.activateProjector(cw, proj, fieldSize);
+                    FieldProjectorBlock.activateProjector(cw, proj, field.getFieldSize());
+                    ((FieldProjectorTile) cw.getBlockEntity(proj)).setField(fieldLazy.get());
                 }
-            }
+            });
+
         });
     }
 
diff --git a/src/main/java/dev/compactmods/crafting/client/ui/ScreenArea.java b/src/main/java/dev/compactmods/crafting/client/ui/ScreenArea.java
@@ -1,4 +1,4 @@
-package dev.compactmods.crafting.ui;
+package dev.compactmods.crafting.client.ui;
 
 public class ScreenArea {
 
diff --git a/src/main/java/dev/compactmods/crafting/client/ui/UiHelper.java b/src/main/java/dev/compactmods/crafting/client/ui/UiHelper.java
@@ -1,4 +1,4 @@
-package dev.compactmods.crafting.ui;
+package dev.compactmods.crafting.client.ui;
 
 public abstract class UiHelper {
 
diff --git a/src/main/java/dev/compactmods/crafting/client/ui/container/ContainerRegistration.java b/src/main/java/dev/compactmods/crafting/client/ui/container/ContainerRegistration.java
@@ -1,4 +1,4 @@
-package dev.compactmods.crafting.ui.container;
+package dev.compactmods.crafting.client.ui.container;
 
 import dev.compactmods.crafting.CompactCrafting;
 import net.minecraft.inventory.container.ContainerType;
diff --git a/src/main/java/dev/compactmods/crafting/client/ui/container/TestContainer.java b/src/main/java/dev/compactmods/crafting/client/ui/container/TestContainer.java
@@ -1,4 +1,4 @@
-package dev.compactmods.crafting.ui.container;
+package dev.compactmods.crafting.client.ui.container;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
diff --git a/src/main/java/dev/compactmods/crafting/client/ui/gui/TestScreen.java b/src/main/java/dev/compactmods/crafting/client/ui/gui/TestScreen.java
@@ -1,17 +1,17 @@
-package dev.compactmods.crafting.ui.gui;
+package dev.compactmods.crafting.client.ui.gui;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
 import dev.compactmods.crafting.CompactCrafting;
 import dev.compactmods.crafting.Registration;
-import dev.compactmods.crafting.ui.container.TestContainer;
-import dev.compactmods.crafting.ui.widget.ContainerWidgetScreen;
-import dev.compactmods.crafting.ui.widget.IWidgetScreen;
-import dev.compactmods.crafting.ui.widget.WidgetBase;
-import dev.compactmods.crafting.ui.widget.WidgetHolder;
-import dev.compactmods.crafting.ui.widget.tab.EnumTabWidgetSide;
-import dev.compactmods.crafting.ui.widget.tab.GuiTab;
-import dev.compactmods.crafting.ui.widget.tab.TabsWidget;
+import dev.compactmods.crafting.client.ui.container.TestContainer;
+import dev.compactmods.crafting.client.ui.widget.ContainerWidgetScreen;
+import dev.compactmods.crafting.client.ui.widget.IWidgetScreen;
+import dev.compactmods.crafting.client.ui.widget.WidgetBase;
+import dev.compactmods.crafting.client.ui.widget.WidgetHolder;
+import dev.compactmods.crafting.client.ui.widget.tab.EnumTabWidgetSide;
+import dev.compactmods.crafting.client.ui.widget.tab.GuiTab;
+import dev.compactmods.crafting.client.ui.widget.tab.TabsWidget;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/dev/compactmods/crafting/client/ui/widget/ContainerWidgetScreen.java b/src/main/java/dev/compactmods/crafting/client/ui/widget/ContainerWidgetScreen.java
@@ -1,4 +1,4 @@
-package dev.compactmods.crafting.ui.widget;
+package dev.compactmods.crafting.client.ui.widget;
 
 import net.minecraft.client.gui.screen.inventory.ContainerScreen;
 import net.minecraft.entity.player.PlayerInventory;
diff --git a/src/main/java/dev/compactmods/crafting/client/ui/widget/IWidgetScreen.java b/src/main/java/dev/compactmods/crafting/client/ui/widget/IWidgetScreen.java
@@ -1,4 +1,4 @@
-package dev.compactmods.crafting.ui.widget;
+package dev.compactmods.crafting.client.ui.widget;
 
 import net.minecraft.client.gui.screen.IScreen;
 import net.minecraft.util.math.vector.Vector2f;
diff --git a/src/main/java/dev/compactmods/crafting/client/ui/widget/WidgetBase.java b/src/main/java/dev/compactmods/crafting/client/ui/widget/WidgetBase.java
@@ -1,4 +1,4 @@
-package dev.compactmods.crafting.ui.widget;
+package dev.compactmods.crafting.client.ui.widget;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 import net.minecraft.client.gui.IGuiEventListener;
diff --git a/src/main/java/dev/compactmods/crafting/client/ui/widget/WidgetHolder.java b/src/main/java/dev/compactmods/crafting/client/ui/widget/WidgetHolder.java
@@ -1,8 +1,8 @@
-package dev.compactmods.crafting.ui.widget;
+package dev.compactmods.crafting.client.ui.widget;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
-import dev.compactmods.crafting.ui.widget.renderable.IWidgetPostBackgroundRenderable;
-import dev.compactmods.crafting.ui.widget.renderable.IWidgetPreBackgroundRenderable;
+import dev.compactmods.crafting.client.ui.widget.renderable.IWidgetPostBackgroundRenderable;
+import dev.compactmods.crafting.client.ui.widget.renderable.IWidgetPreBackgroundRenderable;
 import net.minecraft.client.gui.IRenderable;
 
 import java.util.ArrayList;
diff --git a/src/main/java/dev/compactmods/crafting/client/ui/widget/WidgetScreen.java b/src/main/java/dev/compactmods/crafting/client/ui/widget/WidgetScreen.java
@@ -1,4 +1,4 @@
-package dev.compactmods.crafting.ui.widget;
+package dev.compactmods.crafting.client.ui.widget;
 
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.util.text.ITextComponent;
diff --git a/src/main/java/dev/compactmods/crafting/client/ui/widget/renderable/IWidgetPostBackgroundRenderable.java b/src/main/java/dev/compactmods/crafting/client/ui/widget/renderable/IWidgetPostBackgroundRenderable.java
@@ -1,4 +1,4 @@
-package dev.compactmods.crafting.ui.widget.renderable;
+package dev.compactmods.crafting.client.ui.widget.renderable;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 
diff --git a/src/main/java/dev/compactmods/crafting/client/ui/widget/renderable/IWidgetPreBackgroundRenderable.java b/src/main/java/dev/compactmods/crafting/client/ui/widget/renderable/IWidgetPreBackgroundRenderable.java
@@ -1,4 +1,4 @@
-package dev.compactmods.crafting.ui.widget.renderable;
+package dev.compactmods.crafting.client.ui.widget.renderable;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 
diff --git a/src/main/java/dev/compactmods/crafting/client/ui/widget/tab/EnumTabWidgetSide.java b/src/main/java/dev/compactmods/crafting/client/ui/widget/tab/EnumTabWidgetSide.java
@@ -1,4 +1,4 @@
-package dev.compactmods.crafting.ui.widget.tab;
+package dev.compactmods.crafting.client.ui.widget.tab;
 
 public enum EnumTabWidgetSide {
     TOP,
diff --git a/src/main/java/dev/compactmods/crafting/client/ui/widget/tab/GuiTab.java b/src/main/java/dev/compactmods/crafting/client/ui/widget/tab/GuiTab.java
@@ -1,11 +1,11 @@
-package dev.compactmods.crafting.ui.widget.tab;
+package dev.compactmods.crafting.client.ui.widget.tab;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
 import dev.compactmods.crafting.CompactCrafting;
-import dev.compactmods.crafting.ui.UiHelper;
-import dev.compactmods.crafting.ui.widget.renderable.IWidgetPostBackgroundRenderable;
-import dev.compactmods.crafting.ui.widget.renderable.IWidgetPreBackgroundRenderable;
+import dev.compactmods.crafting.client.ui.UiHelper;
+import dev.compactmods.crafting.client.ui.widget.renderable.IWidgetPostBackgroundRenderable;
+import dev.compactmods.crafting.client.ui.widget.renderable.IWidgetPreBackgroundRenderable;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.AbstractGui;
 import net.minecraft.client.gui.FontRenderer;
diff --git a/src/main/java/dev/compactmods/crafting/client/ui/widget/tab/TabsWidget.java b/src/main/java/dev/compactmods/crafting/client/ui/widget/tab/TabsWidget.java
@@ -1,13 +1,13 @@
-package dev.compactmods.crafting.ui.widget.tab;
+package dev.compactmods.crafting.client.ui.widget.tab;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
 import dev.compactmods.crafting.CompactCrafting;
-import dev.compactmods.crafting.ui.UiHelper;
-import dev.compactmods.crafting.ui.widget.IWidgetScreen;
-import dev.compactmods.crafting.ui.widget.WidgetBase;
-import dev.compactmods.crafting.ui.widget.renderable.IWidgetPostBackgroundRenderable;
-import dev.compactmods.crafting.ui.widget.renderable.IWidgetPreBackgroundRenderable;
+import dev.compactmods.crafting.client.ui.UiHelper;
+import dev.compactmods.crafting.client.ui.widget.IWidgetScreen;
+import dev.compactmods.crafting.client.ui.widget.WidgetBase;
+import dev.compactmods.crafting.client.ui.widget.renderable.IWidgetPostBackgroundRenderable;
+import dev.compactmods.crafting.client.ui.widget.renderable.IWidgetPreBackgroundRenderable;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.AbstractGui;
 import net.minecraft.client.gui.FontRenderer;
diff --git a/src/main/java/dev/compactmods/crafting/compat/jei/JeiMiniaturizationCraftingCategory.java b/src/main/java/dev/compactmods/crafting/compat/jei/JeiMiniaturizationCraftingCategory.java
@@ -12,7 +12,7 @@
 import dev.compactmods.crafting.projector.render.CCRenderTypes;
 import dev.compactmods.crafting.recipes.MiniaturizationRecipe;
 import dev.compactmods.crafting.recipes.components.BlockComponent;
-import dev.compactmods.crafting.ui.ScreenArea;
+import dev.compactmods.crafting.client.ui.ScreenArea;
 import dev.compactmods.crafting.util.BlockSpaceUtil;
 import dev.compactmods.crafting.api.components.IRecipeBlockComponent;
 import dev.compactmods.crafting.api.components.IRecipeComponents;
diff --git a/src/main/java/dev/compactmods/crafting/items/TestItem.java b/src/main/java/dev/compactmods/crafting/items/TestItem.java
@@ -1,7 +1,7 @@
 package dev.compactmods.crafting.items;
 
 import dev.compactmods.crafting.CompactCrafting;
-import dev.compactmods.crafting.ui.container.TestContainer;
+import dev.compactmods.crafting.client.ui.container.TestContainer;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.entity.player.ServerPlayerEntity;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package dev.compactmods.crafting.ui;`
	`1`	`+package dev.compactmods.crafting.client.ui;`
`2`	`2`
`3`	`3`	`public class ScreenArea {`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package dev.compactmods.crafting.ui.container;`
	`1`	`+package dev.compactmods.crafting.client.ui.container;`
`2`	`2`
`3`	`3`	`import dev.compactmods.crafting.CompactCrafting;`
`4`	`4`	`import net.minecraft.inventory.container.ContainerType;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package dev.compactmods.crafting.ui.widget;`
	`1`	`+package dev.compactmods.crafting.client.ui.widget;`
`2`	`2`
`3`	`3`	`import net.minecraft.client.gui.screen.inventory.ContainerScreen;`
`4`	`4`	`import net.minecraft.entity.player.PlayerInventory;`