Working energy detector

Checkstyle cleanup

Author: SirEndii

.gitignore

@@ -19,7 +19,7 @@ build
 
 # other
 eclipse
-runs
+runs/
 server
 
 # Files from Forge MDK

src/main/java/de/srendi/advancedperipherals/AdvancedPeripherals.java

@@ -3,7 +3,9 @@
 import dan200.computercraft.api.peripheral.PeripheralCapability;
 import de.srendi.advancedperipherals.common.addons.APAddons;
 import de.srendi.advancedperipherals.common.blocks.base.PeripheralBlockEntity;
+import de.srendi.advancedperipherals.common.blocks.blockentities.EnergyDetectorEntity;
 import de.srendi.advancedperipherals.common.configuration.APConfig;
+import de.srendi.advancedperipherals.common.setup.BlockEntityTypes;
 import de.srendi.advancedperipherals.common.setup.Registration;
 import de.srendi.advancedperipherals.network.APNetworking;
 import net.minecraft.resources.ResourceLocation;
@@ -72,6 +74,10 @@ public void registerCapabilities(RegisterCapabilitiesEvent event) {
                     entry.get(),
                     (blockEntity, side) -> ((PeripheralBlockEntity<?>) blockEntity).createFluidHandler());
         });
+        event.registerBlockEntity(
+                Capabilities.EnergyStorage.BLOCK,
+                BlockEntityTypes.ENERGY_DETECTOR.get(),
+                EnergyDetectorEntity::getEnergyStorage);
     }
 
 }

src/main/java/de/srendi/advancedperipherals/client/ClientRegistry.java

@@ -1,6 +1,5 @@
 package de.srendi.advancedperipherals.client;
 
-import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.client.turtle.RegisterTurtleModellersEvent;
 import dan200.computercraft.api.client.turtle.TurtleUpgradeModeller;
 import de.srendi.advancedperipherals.AdvancedPeripherals;
@@ -33,7 +32,7 @@ public static void registerModels(ModelEvent.RegisterAdditional event) {
     public static void onClientSetup(FMLClientSetupEvent event) {
         MenuScreens.register(ContainerTypes.INVENTORY_MANAGER_CONTAINER.get(), InventoryManagerScreen::new);
     }
-    
+
     @SubscribeEvent
     public static void onUpgradeModeller(RegisterTurtleModellersEvent event) {
         event.register(CCRegistration.CHUNKY_TURTLE.get(), TurtleUpgradeModeller.flatItem());
@@ -47,17 +46,11 @@ public static void onUpgradeModeller(RegisterTurtleModellersEvent event) {
         event.register(CCRegistration.OP_WEAK_TURTLE.get(), new MetaTurtleUpgradeModeller<>());
         event.register(CCRegistration.HUSBANDRY_TURTLE.get(), new MetaTurtleUpgradeModeller<>());
         event.register(CCRegistration.END_TURTLE.get(), new MetaTurtleUpgradeModeller<>());
-        event.register(CCRegistration.WEAK_TURTLE.get(), new MetaTurtleUpgradeModeller<>());    
+        event.register(CCRegistration.WEAK_TURTLE.get(), new MetaTurtleUpgradeModeller<>());
     }
 
     @SubscribeEvent
     public static void onClientSetup(RegisterKeyMappingsEvent event) {
         KeyBindings.register(event);
     }
-
-    //TODO change the icon of the curio icon
-    /*@SubscribeEvent
-    public static void onTextureStitching(TextureStitchEvent.Pre event) {
-        event.addSprite(new ResourceLocation(AdvancedPeripherals.MOD_ID, "item/empty_glasses_slot"));
-    }*/
 }

src/main/java/de/srendi/advancedperipherals/common/addons/APAddons.java

@@ -18,7 +18,7 @@ public class APAddons {
     public static boolean curiosLoaded;
     public static boolean refinedStorageLoaded;
     public static boolean appMekLoaded;
-    public static boolean patchouliLoaded  ;
+    public static boolean patchouliLoaded;
 
     private APAddons() {
     }

src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/AppEngApi.java

@@ -6,13 +6,19 @@
 import appeng.api.networking.crafting.ICraftingCPU;
 import appeng.api.networking.crafting.ICraftingService;
 import appeng.api.networking.storage.IStorageService;
-import appeng.api.stacks.*;
+import appeng.api.stacks.AEFluidKey;
+import appeng.api.stacks.AEItemKey;
+import appeng.api.stacks.AEKey;
+import appeng.api.stacks.AEKeyType;
+import appeng.api.stacks.GenericStack;
+import appeng.api.stacks.KeyCounter;
 import appeng.api.storage.AEKeyFilter;
 import appeng.api.storage.IStorageProvider;
 import appeng.api.storage.MEStorage;
 import appeng.api.storage.cells.IBasicCellItem;
 import appeng.blockentity.storage.DriveBlockEntity;
 import appeng.parts.storagebus.StorageBusPart;
+import dan200.computercraft.shared.util.NBTUtil;
 import de.srendi.advancedperipherals.AdvancedPeripherals;
 import de.srendi.advancedperipherals.common.addons.APAddons;
 import de.srendi.advancedperipherals.common.util.LuaConverter;
@@ -25,15 +31,20 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.entity.BlockEntity;
 import net.neoforged.neoforge.capabilities.Capabilities;
 import net.neoforged.neoforge.fluids.FluidStack;
 import net.neoforged.neoforge.fluids.capability.IFluidHandler;
 import net.neoforged.neoforge.items.IItemHandler;
 import org.apache.logging.log4j.Level;
 import org.jetbrains.annotations.Nullable;
-import dan200.computercraft.shared.util.NBTUtil;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public class AppEngApi {
 

src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/CraftJob.java

@@ -2,7 +2,11 @@
 
 import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridNode;
-import appeng.api.networking.crafting.*;
+import appeng.api.networking.crafting.CalculationStrategy;
+import appeng.api.networking.crafting.ICraftingCPU;
+import appeng.api.networking.crafting.ICraftingPlan;
+import appeng.api.networking.crafting.ICraftingService;
+import appeng.api.networking.crafting.ICraftingSimulationRequester;
 import appeng.api.networking.security.IActionSource;
 import appeng.api.stacks.AEKey;
 import dan200.computercraft.api.lua.ILuaCallback;

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/integrations/IntegrationPeripheralProvider.java

@@ -1,17 +1,12 @@
 package de.srendi.advancedperipherals.common.addons.computercraft.integrations;
 
 import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.api.peripheral.IPeripheral;
 import de.srendi.advancedperipherals.AdvancedPeripherals;
 import de.srendi.advancedperipherals.common.util.Platform;
 import de.srendi.advancedperipherals.lib.integrations.IPeripheralIntegration;
 import de.srendi.advancedperipherals.lib.peripherals.BlockEntityIntegrationPeripheral;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.NoteBlock;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.Comparator;
 import java.util.Optional;
@@ -93,9 +88,9 @@ public static void load() {
     @Override
     public LazyOptional<IPeripheral> getPeripheral(@NotNull Level level, @NotNull BlockPos blockPos, @NotNull Direction direction) {
         for (IPeripheralIntegration integration : integrations) {
-            if (integration.isSuitable(level, blockPos, direction))
-                return LazyOptional.of(() -> integration.buildPeripheral(level, blockPos, direction));
-        }
-        return LazyOptional.empty();
-    }*/
+//            if (integration.isSuitable(level, blockPos, direction))
+//                return LazyOptional.of(() -> integration.buildPeripheral(level, blockPos, direction));
+//        }
+//        return LazyOptional.empty();
+//    }*/
 }

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/ChatBoxPeripheral.java

@@ -21,7 +21,6 @@
 import de.srendi.advancedperipherals.common.util.StringUtil;
 import de.srendi.advancedperipherals.lib.peripherals.BasePeripheral;
 import de.srendi.advancedperipherals.lib.peripherals.IPeripheralFunction;
-import de.srendi.advancedperipherals.network.APNetworking;
 import de.srendi.advancedperipherals.network.toclient.ToastToClientPacket;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/EnvironmentDetectorPeripheral.java

@@ -38,7 +38,14 @@
 import net.neoforged.neoforge.server.ServerLifecycleHooks;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.function.Function;
 
 import static de.srendi.advancedperipherals.common.addons.computercraft.operations.SphereOperation.SCAN_ENTITIES;

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/PlayerDetectorPeripheral.java

@@ -23,7 +23,11 @@
 import net.minecraft.world.level.Level;
 import net.neoforged.neoforge.server.ServerLifecycleHooks;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class PlayerDetectorPeripheral extends BasePeripheral<IPeripheralOwner> {