Formatting

Technici4n · Jan 28, 2024 · ae5f014 · ae5f014
1 parent ac3f431
commit ae5f014
Show file tree

Hide file tree

Showing 88 changed files with 905 additions and 311 deletions.
diff --git a/src/main/java/dev/technici4n/moderndynamics/MdProxy.java b/src/main/java/dev/technici4n/moderndynamics/MdProxy.java
@@ -18,20 +18,18 @@
  */
 package dev.technici4n.moderndynamics;
 
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.resources.ResourceLocation;
 import net.neoforged.fml.loading.FMLLoader;
 
 public class MdProxy {
     public static final MdProxy INSTANCE = switch (FMLLoader.getDist()) {
-        case DEDICATED_SERVER-> new MdProxy();
-        case CLIENT -> {
-            try {
-                yield (MdProxy) Class.forName("dev.technici4n.moderndynamics.client.ClientProxy").getConstructor().newInstance();
-            } catch (Exception exception) {
-                throw new RuntimeException("Failed to instantiate Modern Dynamics client proxy.", exception);
-            }
+    case DEDICATED_SERVER -> new MdProxy();
+    case CLIENT -> {
+        try {
+            yield (MdProxy) Class.forName("dev.technici4n.moderndynamics.client.ClientProxy").getConstructor().newInstance();
+        } catch (Exception exception) {
+            throw new RuntimeException("Failed to instantiate Modern Dynamics client proxy.", exception);
         }
+    }
     };
 
     public boolean isShiftDown() {

diff --git a/src/main/java/dev/technici4n/moderndynamics/ModernDynamics.java b/src/main/java/dev/technici4n/moderndynamics/ModernDynamics.java
@@ -20,16 +20,15 @@
 
 import dev.technici4n.moderndynamics.attachment.upgrade.AttachmentUpgradesLoader;
 import dev.technici4n.moderndynamics.client.ModernDynamicsClient;
-import dev.technici4n.moderndynamics.network.item.SimulatedInsertionTargets;
-import dev.technici4n.moderndynamics.packets.MdPackets;
 import dev.technici4n.moderndynamics.init.MdAttachments;
 import dev.technici4n.moderndynamics.init.MdBlockEntities;
 import dev.technici4n.moderndynamics.init.MdBlocks;
 import dev.technici4n.moderndynamics.init.MdItems;
 import dev.technici4n.moderndynamics.init.MdMenus;
 import dev.technici4n.moderndynamics.network.NetworkManager;
 import dev.technici4n.moderndynamics.network.TickHelper;
-import dev.technici4n.moderndynamics.packets.SetAttachmentUpgrades;
+import dev.technici4n.moderndynamics.network.item.SimulatedInsertionTargets;
+import dev.technici4n.moderndynamics.packets.MdPackets;
 import dev.technici4n.moderndynamics.util.MdId;
 import dev.technici4n.moderndynamics.util.MdItemGroup;
 import dev.technici4n.moderndynamics.util.WrenchHelper;

diff --git a/src/main/java/dev/technici4n/moderndynamics/attachment/attached/AttachedAttachment.java b/src/main/java/dev/technici4n/moderndynamics/attachment/attached/AttachedAttachment.java
@@ -23,13 +23,11 @@
 import dev.technici4n.moderndynamics.attachment.IoAttachmentType;
 import dev.technici4n.moderndynamics.model.AttachmentModelData;
 import dev.technici4n.moderndynamics.pipe.PipeBlockEntity;
-import java.util.List;
-
 import dev.technici4n.moderndynamics.util.ExtendedMenuProvider;
+import java.util.List;
 import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
-import net.minecraft.world.MenuProvider;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.MustBeInvokedByOverriders;

diff --git a/src/main/java/dev/technici4n/moderndynamics/attachment/attached/FluidAttachedIo.java b/src/main/java/dev/technici4n/moderndynamics/attachment/attached/FluidAttachedIo.java
@@ -22,8 +22,6 @@
 import dev.technici4n.moderndynamics.attachment.IoAttachmentItem;
 import dev.technici4n.moderndynamics.gui.menu.AttachmentMenuType;
 import dev.technici4n.moderndynamics.gui.menu.FluidAttachedIoMenu;
-import dev.technici4n.moderndynamics.gui.menu.ItemAttachedIoMenu;
-import dev.technici4n.moderndynamics.init.MdMenus;
 import dev.technici4n.moderndynamics.pipe.PipeBlockEntity;
 import dev.technici4n.moderndynamics.util.ExtendedMenuProvider;
 import dev.technici4n.moderndynamics.util.FluidVariant;
@@ -33,11 +31,9 @@
 import net.minecraft.nbt.ListTag;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.chat.Component;
-import net.minecraft.world.MenuProvider;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.neoforged.neoforge.fluids.FluidStack;
 import org.jetbrains.annotations.Nullable;
 
 // TODO: also allow nbt filtering

diff --git a/src/main/java/dev/technici4n/moderndynamics/attachment/attached/FluidCachedFilter.java b/src/main/java/dev/technici4n/moderndynamics/attachment/attached/FluidCachedFilter.java
@@ -19,11 +19,10 @@
 package dev.technici4n.moderndynamics.attachment.attached;
 
 import dev.technici4n.moderndynamics.attachment.settings.FilterInversionMode;
+import dev.technici4n.moderndynamics.util.FluidVariant;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import dev.technici4n.moderndynamics.util.FluidVariant;
-import net.neoforged.neoforge.fluids.FluidStack;
 
 public class FluidCachedFilter {
     private final Set<FluidVariant> listedVariants;

diff --git a/src/main/java/dev/technici4n/moderndynamics/attachment/attached/ItemAttachedIo.java b/src/main/java/dev/technici4n/moderndynamics/attachment/attached/ItemAttachedIo.java
@@ -32,14 +32,13 @@
 import dev.technici4n.moderndynamics.model.AttachmentModelData;
 import dev.technici4n.moderndynamics.pipe.PipeBlockEntity;
 import dev.technici4n.moderndynamics.util.DropHelper;
+import dev.technici4n.moderndynamics.util.ExtendedMenuProvider;
+import dev.technici4n.moderndynamics.util.ItemVariant;
+import dev.technici4n.moderndynamics.util.TransferUtil;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-
-import dev.technici4n.moderndynamics.util.ExtendedMenuProvider;
-import dev.technici4n.moderndynamics.util.ItemVariant;
-import dev.technici4n.moderndynamics.util.TransferUtil;
 import net.minecraft.core.Direction;
 import net.minecraft.core.NonNullList;
 import net.minecraft.nbt.CompoundTag;
@@ -398,7 +397,6 @@ public int moveStuffedToStorage(IItemHandler targetStorage, int maxAmount) {
             }
         }
 
-
         return totalMoved;
     }
 }
diff --git a/src/main/java/dev/technici4n/moderndynamics/attachment/attached/ItemCachedFilter.java b/src/main/java/dev/technici4n/moderndynamics/attachment/attached/ItemCachedFilter.java
@@ -22,13 +22,13 @@
 import dev.technici4n.moderndynamics.attachment.settings.FilterInversionMode;
 import dev.technici4n.moderndynamics.attachment.settings.FilterModMode;
 import dev.technici4n.moderndynamics.attachment.settings.FilterNbtMode;
+import dev.technici4n.moderndynamics.util.FluidVariant;
+import dev.technici4n.moderndynamics.util.ItemVariant;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Set;
-import dev.technici4n.moderndynamics.util.FluidVariant;
-import dev.technici4n.moderndynamics.util.ItemVariant;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.item.Item;

diff --git a/src/main/java/dev/technici4n/moderndynamics/attachment/upgrade/AttachmentUpgradesLoader.java b/src/main/java/dev/technici4n/moderndynamics/attachment/upgrade/AttachmentUpgradesLoader.java
@@ -34,7 +34,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.WeakHashMap;
-
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.server.packs.resources.SimplePreparableReloadListener;
 import net.minecraft.util.GsonHelper;
@@ -111,7 +110,7 @@ public static void setup() {
         NeoForge.EVENT_BUS.addListener(OnDatapackSyncEvent.class, e -> {
             var server = ServerLifecycleHooks.getCurrentServer();
             var player = e.getPlayer();
-            if (player != null){
+            if (player != null) {
                 LoadedUpgrades.trySet(LOADED_UPGRADES.remove(server.getResourceManager()));
                 LoadedUpgrades.syncToClient(player);
             } else {

diff --git a/src/main/java/dev/technici4n/moderndynamics/attachment/upgrade/LoadedUpgrades.java b/src/main/java/dev/technici4n/moderndynamics/attachment/upgrade/LoadedUpgrades.java
@@ -18,13 +18,12 @@
  */
 package dev.technici4n.moderndynamics.attachment.upgrade;
 
+import dev.technici4n.moderndynamics.packets.SetAttachmentUpgrades;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
-
-import dev.technici4n.moderndynamics.packets.SetAttachmentUpgrades;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.item.Item;

diff --git a/src/main/java/dev/technici4n/moderndynamics/attachment/upgrade/UpgradeTypeBuilder.java b/src/main/java/dev/technici4n/moderndynamics/attachment/upgrade/UpgradeTypeBuilder.java
@@ -19,15 +19,12 @@
 package dev.technici4n.moderndynamics.attachment.upgrade;
 
 import com.google.gson.JsonObject;
+import com.mojang.serialization.JsonOps;
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
-import java.util.List;
-
-import com.mojang.serialization.JsonOps;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.ItemLike;
-import net.neoforged.neoforge.common.conditions.AndCondition;
 import net.neoforged.neoforge.common.conditions.ICondition;
 import net.neoforged.neoforge.common.conditions.ModLoadedCondition;
 

diff --git a/src/main/java/dev/technici4n/moderndynamics/client/ModernDynamicsClient.java b/src/main/java/dev/technici4n/moderndynamics/client/ModernDynamicsClient.java
@@ -31,7 +31,6 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.blockentity.BlockEntityRenderers;
 import net.minecraft.world.phys.HitResult;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.neoforge.client.event.EntityRenderersEvent;

diff --git a/src/main/java/dev/technici4n/moderndynamics/client/ber/FluidPipeRendering.java b/src/main/java/dev/technici4n/moderndynamics/client/ber/FluidPipeRendering.java
@@ -26,14 +26,11 @@
 import dev.technici4n.moderndynamics.thirdparty.fabric.QuadEmitter;
 import dev.technici4n.moderndynamics.util.FluidRenderUtil;
 import dev.technici4n.moderndynamics.util.FluidVariant;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.texture.OverlayTexture;
 import net.minecraft.core.Direction;
-import net.minecraft.world.inventory.InventoryMenu;
 import net.neoforged.neoforge.client.extensions.common.IClientFluidTypeExtensions;
-import net.neoforged.neoforge.fluids.FluidType;
 
 public class FluidPipeRendering {
     private static final float PIPE_W = 6.0F / 16.0F;

diff --git a/src/main/java/dev/technici4n/moderndynamics/client/compat/emi/DragDropHandler.java b/src/main/java/dev/technici4n/moderndynamics/client/compat/emi/DragDropHandler.java
@@ -25,10 +25,10 @@
 import dev.technici4n.moderndynamics.client.screen.ItemAttachedIoScreen;
 import dev.technici4n.moderndynamics.gui.menu.FluidConfigSlot;
 import dev.technici4n.moderndynamics.gui.menu.ItemConfigSlot;
-import java.util.ArrayList;
-import java.util.List;
 import dev.technici4n.moderndynamics.util.FluidVariant;
 import dev.technici4n.moderndynamics.util.ItemVariant;
+import java.util.ArrayList;
+import java.util.List;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.renderer.Rect2i;

diff --git a/src/main/java/dev/technici4n/moderndynamics/client/compat/emi/MdEmiPlugin.java b/src/main/java/dev/technici4n/moderndynamics/client/compat/emi/MdEmiPlugin.java
@@ -28,9 +28,8 @@
 import dev.technici4n.moderndynamics.client.screen.AttachedIoScreen;
 import dev.technici4n.moderndynamics.gui.menu.FluidConfigSlot;
 import dev.technici4n.moderndynamics.init.MdItems;
-import net.neoforged.neoforge.fluids.FluidType;
-
 import java.util.List;
+import net.neoforged.neoforge.fluids.FluidType;
 
 public class MdEmiPlugin implements EmiPlugin {
     @Override

diff --git a/src/main/java/dev/technici4n/moderndynamics/client/compat/jei/GhostIngredientHandler.java b/src/main/java/dev/technici4n/moderndynamics/client/compat/jei/GhostIngredientHandler.java
@@ -23,12 +23,12 @@
 import dev.technici4n.moderndynamics.client.screen.ItemAttachedIoScreen;
 import dev.technici4n.moderndynamics.gui.menu.FluidConfigSlot;
 import dev.technici4n.moderndynamics.gui.menu.ItemConfigSlot;
+import dev.technici4n.moderndynamics.util.FluidVariant;
+import dev.technici4n.moderndynamics.util.ItemVariant;
 import java.util.ArrayList;
 import java.util.List;
 import mezz.jei.api.gui.handlers.IGhostIngredientHandler;
 import mezz.jei.api.ingredients.ITypedIngredient;
-import dev.technici4n.moderndynamics.util.FluidVariant;
-import dev.technici4n.moderndynamics.util.ItemVariant;
 import net.minecraft.client.renderer.Rect2i;
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;

diff --git a/src/main/java/dev/technici4n/moderndynamics/client/compat/rei/MdReiPlugin.java b/src/main/java/dev/technici4n/moderndynamics/client/compat/rei/MdReiPlugin.java
@@ -27,6 +27,8 @@
 import dev.technici4n.moderndynamics.gui.menu.FluidConfigSlot;
 import dev.technici4n.moderndynamics.gui.menu.ItemConfigSlot;
 import dev.technici4n.moderndynamics.init.MdItems;
+import dev.technici4n.moderndynamics.util.FluidVariant;
+import dev.technici4n.moderndynamics.util.ItemVariant;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
@@ -41,8 +43,6 @@
 import me.shedaniel.rei.api.client.registry.screen.ExclusionZones;
 import me.shedaniel.rei.api.client.registry.screen.ScreenRegistry;
 import me.shedaniel.rei.api.common.util.EntryStacks;
-import dev.technici4n.moderndynamics.util.FluidVariant;
-import dev.technici4n.moderndynamics.util.ItemVariant;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;

diff --git a/src/main/java/dev/technici4n/moderndynamics/client/model/BuiltInModelHooks.java b/src/main/java/dev/technici4n/moderndynamics/client/model/BuiltInModelHooks.java
@@ -1,14 +1,31 @@
+/*
+ * Modern Dynamics
+ * Copyright (C) 2021 shartte & Technici4n
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
 package dev.technici4n.moderndynamics.client.model;
 
 import dev.technici4n.moderndynamics.util.MdId;
+import java.util.HashMap;
+import java.util.Map;
 import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * Replicates how Fabric allows custom built-in models to be registered on Forge.
  */

diff --git a/src/main/java/dev/technici4n/moderndynamics/client/model/MdModelLoader.java b/src/main/java/dev/technici4n/moderndynamics/client/model/MdModelLoader.java
@@ -21,6 +21,10 @@
 import dev.technici4n.moderndynamics.attachment.RenderedAttachment;
 import dev.technici4n.moderndynamics.init.MdBlocks;
 import dev.technici4n.moderndynamics.util.MdId;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.function.Function;
 import net.minecraft.client.renderer.block.BlockModelShaper;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.resources.model.BakedModel;
@@ -33,19 +37,15 @@
 import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.function.Function;
-
 /**
  * Allows us to load our custom jsons.
  */
 public final class MdModelLoader {
     public static void init(IEventBus modEvents) {
         modEvents.addListener(FMLClientSetupEvent.class, evt -> {
             for (var pipe : MdBlocks.ALL_PIPES) {
-                BuiltInModelHooks.addBuiltInModel(MdId.of("item/" + pipe.id), new DelegatingUnbakedModel(BlockModelShaper.stateToModelLocation(pipe.defaultBlockState())));
+                BuiltInModelHooks.addBuiltInModel(MdId.of("item/" + pipe.id),
+                        new DelegatingUnbakedModel(BlockModelShaper.stateToModelLocation(pipe.defaultBlockState())));
 
                 var model = new PipeUnbakedModel(pipe.id, pipe.isTransparent());
                 for (var state : pipe.getStateDefinition().getPossibleStates()) {
@@ -60,8 +60,7 @@ public static void init(IEventBus modEvents) {
             }
             BuiltInModelHooks.addBuiltInModel(
                     AttachmentsUnbakedModel.ID,
-                    new AttachmentsUnbakedModel(modelMap)
-            );
+                    new AttachmentsUnbakedModel(modelMap));
         });
     }
 }

diff --git a/src/main/java/dev/technici4n/moderndynamics/client/model/PipeBakedModel.java b/src/main/java/dev/technici4n/moderndynamics/client/model/PipeBakedModel.java
@@ -24,16 +24,14 @@
 import dev.technici4n.moderndynamics.attachment.attached.AttachedAttachment;
 import dev.technici4n.moderndynamics.client.GeometryHelper;
 import dev.technici4n.moderndynamics.model.PipeModelData;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Consumer;
-
 import dev.technici4n.moderndynamics.thirdparty.fabric.Mesh;
 import dev.technici4n.moderndynamics.thirdparty.fabric.MeshBuilderImpl;
 import dev.technici4n.moderndynamics.thirdparty.fabric.ModelHelper;
 import dev.technici4n.moderndynamics.thirdparty.fabric.MutableQuadView;
 import dev.technici4n.moderndynamics.thirdparty.fabric.QuadEmitter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.renderer.block.model.ItemOverrides;
@@ -42,7 +40,6 @@
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.core.Direction;
 import net.minecraft.util.RandomSource;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
 import net.neoforged.neoforge.client.ChunkRenderTypeSet;
 import net.neoforged.neoforge.client.model.data.ModelData;
@@ -153,7 +150,8 @@ public List<BakedQuad> getQuads(@Nullable BlockState pState, @Nullable Direction
     }
 
     @Override
-    public @NotNull List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, @NotNull RandomSource rand, @NotNull ModelData data, @Nullable RenderType renderType) {
+    public @NotNull List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, @NotNull RandomSource rand,
+            @NotNull ModelData data, @Nullable RenderType renderType) {
         var pipeData = data.get(PipeModelData.PIPE_DATA);
         if (pipeData == null) {
             pipeData = PipeModelData.DEFAULT;