Clean up a bunch of unused variables and classes

Author: robotgryphon

core-api/src/main/java/dev/compactmods/machines/api/CompactMachines.java

@@ -36,6 +36,7 @@
 import java.util.ServiceLoader;
 import java.util.UUID;
 
+@SuppressWarnings("unused")
 public class CompactMachines {
 	public final static String MOD_ID = "compactmachines";
 
@@ -100,7 +101,7 @@ private static <T, TP extends ServerServiceProvider<T>> T serverProvidedService(
 	 * @param <T>
 	 */
 	private static <T> T cmService(Class<T> serviceClass, String packagePrefix) {
-		final var loader = ServiceLoader.load(serviceClass);
+		final var loader = ServiceLoader.load(serviceClass, serviceClass.getClassLoader());
 		logger.debug("Attempting to find implementation for {}...", serviceClass.getName());
 
 		for(var s : loader) {

core-api/src/main/java/dev/compactmods/machines/api/attachment/CMDataAttachments.java

@@ -5,8 +5,6 @@
 import dev.compactmods.machines.api.CompactMachines;
 import dev.compactmods.machines.api.machine.MachineColor;
 import dev.compactmods.machines.api.room.history.RoomEntryPoint;
-import dev.compactmods.machines.api.room.upgrade.RoomUpgradeInstance;
-import dev.compactmods.machines.api.room.upgrade.component.RoomUpgradeComponentList;
 import dev.compactmods.machines.api.room.upgrade.inventory.RoomUpgradeInventory;
 import net.minecraft.Util;
 import net.minecraft.core.BlockPos;
@@ -18,7 +16,6 @@
 import net.neoforged.neoforge.registries.DeferredRegister;
 import net.neoforged.neoforge.registries.NeoForgeRegistries;
 
-import java.util.List;
 import java.util.UUID;
 import java.util.function.Supplier;
 
@@ -39,11 +36,6 @@ public interface CMDataAttachments {
             .serialize(GlobalPos.CODEC, Predicates.alwaysFalse())
             .build());
 
-    Supplier<AttachmentType<RoomUpgradeComponentList>> PERMANENT_UPGRADES = ATTACHMENT_TYPES.register("permanent_upgrades", () -> AttachmentType
-            .builder(() -> new RoomUpgradeComponentList(List.of()))
-            .serialize(RoomUpgradeComponentList.CODEC)
-            .build());
-
     Supplier<AttachmentType<String>> CURRENT_ROOM_CODE = ATTACHMENT_TYPES.register("current_room_code", () -> AttachmentType
             .<String>builder(() -> null)
             .serialize(Codec.STRING)
@@ -59,10 +51,6 @@ public interface CMDataAttachments {
             .serialize(MachineColor.CODEC)
             .build());
 
-    Supplier<AttachmentType<RoomUpgradeInstance>> UPGRADE_INSTANCE = ATTACHMENT_TYPES.register("room_upgrade_instance", () -> AttachmentType
-            .<RoomUpgradeInstance>builder(() -> null)
-            .build());
-
     static void prepare() {
     }
 

core-api/src/main/java/dev/compactmods/machines/api/dimension/CompactDimension.java

@@ -1,22 +1,15 @@
 package dev.compactmods.machines.api.dimension;
 
 import dev.compactmods.machines.api.CompactMachines;
-import net.minecraft.core.HolderLookup;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.util.datafix.DataFixers;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.dimension.DimensionType;
-import net.minecraft.world.level.storage.DimensionDataStorage;
-import net.minecraft.world.level.storage.LevelResource;
-import net.minecraft.world.level.storage.LevelStorageSource;
 import org.jetbrains.annotations.NotNull;
 
-import java.nio.file.Path;
-
 public abstract class CompactDimension {
     public static final ResourceKey<Level> LEVEL_KEY = ResourceKey
             .create(Registries.DIMENSION, CompactMachines.modRL("compact_world"));
@@ -35,21 +28,6 @@ public static ServerLevel forServer(MinecraftServer server) throws MissingDimens
         return level;
     }
 
-    public static Path getDataDirectory(@NotNull MinecraftServer server) {
-        return DimensionType.getStorageFolder(CompactDimension.LEVEL_KEY, server.getWorldPath(LevelResource.ROOT));
-    }
-
-    public static Path getDataDirectory(@NotNull LevelStorageSource.LevelDirectory levelDir) {
-        return DimensionType.getStorageFolder(CompactDimension.LEVEL_KEY, levelDir.path());
-    }
-
-    @NotNull
-    public static DimensionDataStorage getDataStorage(@NotNull LevelStorageSource.LevelDirectory levelDir, HolderLookup.Provider holderLookup) {
-        final var dimPath = DimensionType.getStorageFolder(CompactDimension.LEVEL_KEY, levelDir.path());
-        final var fixer = DataFixers.getDataFixer();
-        return new DimensionDataStorage(dimPath.resolve("data").toFile(), fixer, holderLookup);
-    }
-
     public static boolean isLevelCompact(Level level) {
         return isLevelCompact(level.dimension());
     }

core-api/src/main/java/dev/compactmods/machines/api/dimension/MissingDimensionException.java

@@ -5,7 +5,4 @@ public MissingDimensionException() {
         super("Could not find compact machine dimension. This is likely a bug; please report it.");
     }
 
-    public MissingDimensionException(String msg) {
-        super(msg);
-    }
 }

core-api/src/main/java/dev/compactmods/machines/api/location/GlobalPosWithRotation.java

@@ -30,10 +30,6 @@ public GlobalPosWithRotation(GlobalPos pos, Vec2 rotation) {
         this(pos.dimension(), Vec3.atBottomCenterOf(pos.pos()), rotation);
     }
 
-    public GlobalPosWithRotation(ResourceKey<Level> dimension, BlockPos position, Vec2 rotation) {
-        this(dimension, Vec3.atBottomCenterOf(position), rotation);
-    }
-
     public static GlobalPosWithRotation fromPlayer(Player player) {
         return new GlobalPosWithRotation(player.level().dimension(), player.position(), new Vec2(player.xRotO, player.yRotO));
     }

neoforge-datagen/src/main/java/dev/compactmods/machines/datagen/DataGeneration.java

@@ -2,24 +2,16 @@
 
 import dev.compactmods.machines.api.CompactMachines;
 import dev.compactmods.machines.datagen.base.BaseDatapack;
-import dev.compactmods.machines.datagen.base.DatapackRegisteredStuff;
-import dev.compactmods.machines.datagen.base.loot.BlockLootGenerator;
-import dev.compactmods.machines.datagen.basic_room_templates.BasicRoomTemplateRecipeGenerator;
 import dev.compactmods.machines.datagen.basic_room_templates.BasicRoomTemplatesDatapack;
 import dev.compactmods.machines.feature.CMFeatureFlags;
 import net.minecraft.data.DataGenerator;
-import net.minecraft.data.loot.LootTableProvider;
 import net.minecraft.data.metadata.PackMetadataGenerator;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.flag.FeatureFlagSet;
-import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.neoforge.data.event.GatherDataEvent;
 
-import java.util.Collections;
-import java.util.List;
-
 @EventBusSubscriber(modid = CompactMachines.MOD_ID)
 public class DataGeneration {
 

neoforge-datagen/src/main/java/dev/compactmods/machines/datagen/base/tags/PointOfInterestTagGenerator.java

@@ -19,7 +19,6 @@ public PointOfInterestTagGenerator(PackOutput packOut, CompletableFuture<HolderL
 
     @Override
     protected void addTags(HolderLookup.@NotNull Provider provider) {
-        TagAppender<PoiType> builder = tag(PoiTypeTags.ACQUIRABLE_JOB_SITE);
-//        builder.add(Villagers.TINKERER_WORKBENCH_KEY);
+        //        builder.add(Villagers.TINKERER_WORKBENCH_KEY);
     }
 }

neoforge-main/src/main/java/dev/compactmods/machines/CommonConfig.java

@@ -34,18 +34,13 @@ public class CompactMachinesCommon {
     public static final int BRAND_MACHINE_COLOR = FastColor.ARGB32.color(255, 248, 246, 76);
 
     @SuppressWarnings("unused")
-    public CompactMachinesCommon(IEventBus modBus, ModContainer modContainer) {
-        initConfigs(modContainer);
+    public CompactMachinesCommon(IEventBus modBus) {
         prepare();
         registerEvents(modBus);
 
         CMRegistries.setup(modBus);
     }
 
-    private static void initConfigs(ModContainer modContainer) {
-        modContainer.registerConfig(ModConfig.Type.COMMON, CommonConfig.CONFIG);
-    }
-
     private static void prepare() {
         Machines.prepare();
         Shrinking.prepare();

neoforge-main/src/main/java/dev/compactmods/machines/CompactMachinesCommon.java

@@ -1,12 +1,10 @@
 package dev.compactmods.machines.client.render;
 
 import com.mojang.authlib.GameProfile;
-import net.minecraft.Util;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 
 public class CMPlayerFaceRenderer {
-    public static final GameProfile EMPTY_PROFILE = new GameProfile(Util.NIL_UUID, "Empty Player");
 
     public static void render(GameProfile profile, GuiGraphics graphics, int x, int y, int size) {
         final var skins = Minecraft.getInstance().getSkinManager();