Optimise imports and add some logging

MattiDragon · Jan 7, 2024 · 6589398 · 6589398
1 parent c71d323
commit 6589398
Show file tree

Hide file tree

Showing 23 changed files with 39 additions and 41 deletions.
diff --git a/implSrc/emi/java/io/github/mattidragon/tlaapi/impl/emi/EmiCustomWidget.java b/implSrc/emi/java/io/github/mattidragon/tlaapi/impl/emi/EmiCustomWidget.java
@@ -4,7 +4,6 @@
 import dev.emi.emi.api.widget.Widget;
 import io.github.mattidragon.tlaapi.api.gui.CustomTlaWidget;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.util.math.MatrixStack;
 
 public class EmiCustomWidget extends Widget {
     private final CustomTlaWidget widget;

diff --git a/implSrc/emi/java/io/github/mattidragon/tlaapi/impl/emi/EmiGuiBuilder.java b/implSrc/emi/java/io/github/mattidragon/tlaapi/impl/emi/EmiGuiBuilder.java
@@ -1,9 +1,12 @@
 package io.github.mattidragon.tlaapi.impl.emi;
 
 import dev.emi.emi.api.render.EmiTexture;
-import dev.emi.emi.api.widget.*;
-import io.github.mattidragon.tlaapi.api.recipe.TlaIngredient;
+import dev.emi.emi.api.widget.SlotWidget;
+import dev.emi.emi.api.widget.TextWidget;
+import dev.emi.emi.api.widget.Widget;
+import dev.emi.emi.api.widget.WidgetHolder;
 import io.github.mattidragon.tlaapi.api.gui.*;
+import io.github.mattidragon.tlaapi.api.recipe.TlaIngredient;
 import net.minecraft.text.Text;
 
 import java.util.List;

diff --git a/implSrc/emi/java/io/github/mattidragon/tlaapi/impl/emi/TlaApiEmiPlugin.java b/implSrc/emi/java/io/github/mattidragon/tlaapi/impl/emi/TlaApiEmiPlugin.java
@@ -8,10 +8,10 @@
 import dev.emi.emi.api.widget.Bounds;
 import io.github.mattidragon.tlaapi.api.StackDragHandler;
 import io.github.mattidragon.tlaapi.api.gui.TlaBounds;
+import io.github.mattidragon.tlaapi.api.plugin.PluginContext;
 import io.github.mattidragon.tlaapi.api.plugin.PluginLoader;
-import io.github.mattidragon.tlaapi.api.recipe.TlaRecipe;
 import io.github.mattidragon.tlaapi.api.recipe.TlaCategory;
-import io.github.mattidragon.tlaapi.api.plugin.PluginContext;
+import io.github.mattidragon.tlaapi.api.recipe.TlaRecipe;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
@@ -110,5 +110,10 @@ public <T extends Screen> void addExclusionZoneProvider(Class<T> clazz, Function
                 }
             });
         }
+
+        @Override
+        public String toString() {
+            return "EMI plugin handler";
+        }
     }
 }
diff --git a/implSrc/emi/java/io/github/mattidragon/tlaapi/impl/emi/TlaEmiRecipeCategory.java b/implSrc/emi/java/io/github/mattidragon/tlaapi/impl/emi/TlaEmiRecipeCategory.java
@@ -3,7 +3,6 @@
 import dev.emi.emi.api.recipe.EmiRecipe;
 import dev.emi.emi.api.recipe.EmiRecipeCategory;
 import dev.emi.emi.api.recipe.EmiRecipeSorting;
-import dev.emi.emi.api.stack.EmiStack;
 import io.github.mattidragon.tlaapi.api.recipe.TlaCategory;
 import net.minecraft.text.Text;
 

diff --git a/implSrc/rei/java/io/github/mattidragon/tlaapi/impl/rei/ReiGuiBuilder.java b/implSrc/rei/java/io/github/mattidragon/tlaapi/impl/rei/ReiGuiBuilder.java
@@ -1,7 +1,7 @@
 package io.github.mattidragon.tlaapi.impl.rei;
 
-import io.github.mattidragon.tlaapi.api.recipe.TlaIngredient;
 import io.github.mattidragon.tlaapi.api.gui.*;
+import io.github.mattidragon.tlaapi.api.recipe.TlaIngredient;
 import io.github.mattidragon.tlaapi.impl.rei.util.ReiCustomWidget;
 import io.github.mattidragon.tlaapi.impl.rei.util.TextureWidget;
 import io.github.mattidragon.tlaapi.impl.rei.util.TlaWidgets;

diff --git a/implSrc/rei/java/io/github/mattidragon/tlaapi/impl/rei/TlaApiReiPlugin.java b/implSrc/rei/java/io/github/mattidragon/tlaapi/impl/rei/TlaApiReiPlugin.java
@@ -117,6 +117,11 @@ public <T extends Screen> void addExclusionZoneProvider(Class<T> clazz, Function
         exclusionZoneProviders.add(new TlaExclusionZoneProvider<>(clazz, provider));
     }
 
+    @Override
+    public String toString() {
+        return "REI plugin handler";
+    }
+
     private record RecipeGenerator<T extends Recipe<?>>(RecipeType<T> type, Function<RecipeEntry<T>, TlaRecipe> generator) {}
 
     @SuppressWarnings("unchecked")

diff --git a/implSrc/rei/java/io/github/mattidragon/tlaapi/impl/rei/TlaDisplayCategory.java b/implSrc/rei/java/io/github/mattidragon/tlaapi/impl/rei/TlaDisplayCategory.java
@@ -6,7 +6,6 @@
 import me.shedaniel.rei.api.client.gui.widgets.Widget;
 import me.shedaniel.rei.api.client.registry.display.DisplayCategory;
 import me.shedaniel.rei.api.common.category.CategoryIdentifier;
-import me.shedaniel.rei.api.common.util.EntryStacks;
 import net.minecraft.text.Text;
 
 import java.util.List;

diff --git a/implSrc/rei/java/io/github/mattidragon/tlaapi/impl/rei/util/AnimatedTextureWidget.java b/implSrc/rei/java/io/github/mattidragon/tlaapi/impl/rei/util/AnimatedTextureWidget.java
@@ -32,7 +32,7 @@ public final class AnimatedTextureWidget extends WidgetWithBounds {
     private final int textureHeight;
     private final boolean horizontal, endToStart, fullToEmpty;
 
-    public AnimatedTextureWidget(Rectangle bounds, double animationDuration, Identifier darkTexture, Identifier lightTexture, int u, int v, int regionWidth, int regionHeight, int textureWidth, int textureHeight, boolean horizontal, boolean endToStart, boolean fullToEmpty) {
+    private AnimatedTextureWidget(Rectangle bounds, double animationDuration, Identifier darkTexture, Identifier lightTexture, int u, int v, int regionWidth, int regionHeight, int textureWidth, int textureHeight, boolean horizontal, boolean endToStart, boolean fullToEmpty) {
         this.bounds = new Rectangle(Objects.requireNonNull(bounds));
         this.animationDuration = animationDuration;
         this.darkTexture = darkTexture;
@@ -47,10 +47,6 @@ public AnimatedTextureWidget(Rectangle bounds, double animationDuration, Identif
         this.endToStart = endToStart;
         this.fullToEmpty = fullToEmpty;
     }
-
-    public AnimatedTextureWidget(Identifier darkTexture, Identifier lightTexture, int x, int y, int width, int height, int u, int v, int textureHeight, int textureWidth, boolean horizontal, boolean endToStart, boolean fullToEmpty, double animationDuration) {
-        this(new Rectangle(x, y, width, height), animationDuration, darkTexture, lightTexture, u, v, width, height, textureWidth, textureHeight, horizontal, endToStart, fullToEmpty);
-    }
 
     @Override
     public Rectangle getBounds() {

diff --git a/implSrc/rei/java/io/github/mattidragon/tlaapi/impl/rei/util/ReiCustomWidget.java b/implSrc/rei/java/io/github/mattidragon/tlaapi/impl/rei/util/ReiCustomWidget.java
@@ -5,7 +5,6 @@
 import me.shedaniel.rei.api.client.gui.widgets.WidgetWithBounds;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.Element;
-import net.minecraft.client.util.math.MatrixStack;
 
 import java.util.List;
 

diff --git a/implSrc/rei/java/io/github/mattidragon/tlaapi/impl/rei/util/TextureWidget.java b/implSrc/rei/java/io/github/mattidragon/tlaapi/impl/rei/util/TextureWidget.java
@@ -6,7 +6,6 @@
 import me.shedaniel.clothconfig2.api.animator.ValueAnimator;
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.client.REIRuntime;
-import me.shedaniel.rei.api.client.gui.Renderer;
 import me.shedaniel.rei.api.client.gui.widgets.WidgetWithBounds;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.Element;

diff --git a/src/client/java/io/github/mattidragon/tlaapi/api/StackDragHandler.java b/src/client/java/io/github/mattidragon/tlaapi/api/StackDragHandler.java
@@ -1,15 +1,11 @@
 package io.github.mattidragon.tlaapi.api;
 
 import io.github.mattidragon.tlaapi.api.gui.TlaBounds;
-import io.github.mattidragon.tlaapi.api.recipe.TlaIngredient;
 import io.github.mattidragon.tlaapi.api.recipe.TlaStack;
-import it.unimi.dsi.fastutil.objects.Object2BooleanFunction;
 import net.minecraft.client.gui.screen.Screen;
 
 import java.util.Collection;
-import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.stream.Stream;
 
 /**
  * A handler for dragging ghost stacks onto a screen.

diff --git a/src/client/java/io/github/mattidragon/tlaapi/api/plugin/PluginContext.java b/src/client/java/io/github/mattidragon/tlaapi/api/plugin/PluginContext.java
@@ -13,7 +13,6 @@
 
 import java.util.List;
 import java.util.function.Function;
-import java.util.function.Predicate;
 
 /**
  * The main way plugins interact with the API.

diff --git a/src/client/java/io/github/mattidragon/tlaapi/api/plugin/PluginLoader.java b/src/client/java/io/github/mattidragon/tlaapi/api/plugin/PluginLoader.java
@@ -1,7 +1,7 @@
 package io.github.mattidragon.tlaapi.api.plugin;
 
-import io.github.mattidragon.tlaapi.impl.TlaApi;
 import io.github.mattidragon.tlaapi.impl.ImplementationOnly;
+import io.github.mattidragon.tlaapi.impl.TlaApi;
 
 /**
  * Provides implementations with the ability to load plugins.

diff --git a/src/client/java/io/github/mattidragon/tlaapi/api/plugin/TlaApiPlugin.java b/src/client/java/io/github/mattidragon/tlaapi/api/plugin/TlaApiPlugin.java
@@ -1,8 +1,6 @@
 package io.github.mattidragon.tlaapi.api.plugin;
 
 import io.github.mattidragon.tlaapi.impl.PluginOnly;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 
 /**
  * This interface serves as the entrypoint for all plugins to the TLA API.

diff --git a/src/client/java/io/github/mattidragon/tlaapi/api/recipe/TlaCategory.java b/src/client/java/io/github/mattidragon/tlaapi/api/recipe/TlaCategory.java
@@ -1,7 +1,6 @@
 package io.github.mattidragon.tlaapi.api.recipe;
 
 import io.github.mattidragon.tlaapi.impl.PluginsExtend;
-import net.minecraft.item.ItemStack;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;

diff --git a/src/client/java/io/github/mattidragon/tlaapi/api/recipe/TlaIngredient.java b/src/client/java/io/github/mattidragon/tlaapi/api/recipe/TlaIngredient.java
@@ -9,7 +9,10 @@
 import net.minecraft.registry.entry.RegistryEntryList;
 import net.minecraft.registry.tag.TagKey;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
 import java.util.stream.Stream;
 
 /**

diff --git a/src/client/java/io/github/mattidragon/tlaapi/impl/TlaApi.java b/src/client/java/io/github/mattidragon/tlaapi/impl/TlaApi.java
@@ -2,15 +2,22 @@
 
 import io.github.mattidragon.tlaapi.api.plugin.PluginContext;
 import io.github.mattidragon.tlaapi.api.plugin.TlaApiPlugin;
-import net.fabricmc.api.ModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class TlaApi {
-    public static final Logger LOGGER = LoggerFactory.getLogger("tla-api");
+    public static final Logger LOGGER = LoggerFactory.getLogger("TLA Api");
 
 	public static void loadPlugins(PluginContext implementation) {
-		FabricLoader.getInstance().getEntrypoints("tla-api", TlaApiPlugin.class).forEach(entrypoint -> entrypoint.register(implementation));
-	}
+		var entrypoints = FabricLoader.getInstance().getEntrypoints("tla-api", TlaApiPlugin.class);
+		LOGGER.info("Loading {} plugins for {}", entrypoints.size(), implementation);
+        for (var entrypoint : entrypoints) {
+		 	try {
+				entrypoint.register(implementation);
+			} catch (RuntimeException e) {
+				 throw new RuntimeException("Error while handling tla api plugin " + entrypoint, e);
+			}
+        }
+    }
 }
diff --git a/src/testmod/java/io/github/mattidragon/tlaapi/testmod/TestCategory.java b/src/testmod/java/io/github/mattidragon/tlaapi/testmod/TestCategory.java
@@ -3,7 +3,6 @@
 import io.github.mattidragon.tlaapi.api.gui.TextureConfig;
 import io.github.mattidragon.tlaapi.api.recipe.CategoryIcon;
 import io.github.mattidragon.tlaapi.api.recipe.TlaCategory;
-import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;

diff --git a/src/testmod/java/io/github/mattidragon/tlaapi/testmod/TestCustomDisplay.java b/src/testmod/java/io/github/mattidragon/tlaapi/testmod/TestCustomDisplay.java
@@ -1,10 +1,10 @@
 package io.github.mattidragon.tlaapi.testmod;
 
+import io.github.mattidragon.tlaapi.api.gui.GuiBuilder;
 import io.github.mattidragon.tlaapi.api.recipe.TlaCategory;
 import io.github.mattidragon.tlaapi.api.recipe.TlaIngredient;
 import io.github.mattidragon.tlaapi.api.recipe.TlaRecipe;
 import io.github.mattidragon.tlaapi.api.recipe.TlaStack;
-import io.github.mattidragon.tlaapi.api.gui.GuiBuilder;
 import net.minecraft.item.Items;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;

diff --git a/src/testmod/java/io/github/mattidragon/tlaapi/testmod/TestDisplay.java b/src/testmod/java/io/github/mattidragon/tlaapi/testmod/TestDisplay.java
@@ -1,11 +1,11 @@
 package io.github.mattidragon.tlaapi.testmod;
 
+import io.github.mattidragon.tlaapi.api.gui.GuiBuilder;
+import io.github.mattidragon.tlaapi.api.gui.TextureConfig;
 import io.github.mattidragon.tlaapi.api.recipe.TlaCategory;
 import io.github.mattidragon.tlaapi.api.recipe.TlaIngredient;
 import io.github.mattidragon.tlaapi.api.recipe.TlaRecipe;
 import io.github.mattidragon.tlaapi.api.recipe.TlaStack;
-import io.github.mattidragon.tlaapi.api.gui.GuiBuilder;
-import io.github.mattidragon.tlaapi.api.gui.TextureConfig;
 import io.github.mattidragon.tlaapi.testmod.content.TestRecipe;
 import net.minecraft.recipe.RecipeEntry;
 import net.minecraft.text.Text;

diff --git a/src/testmod/java/io/github/mattidragon/tlaapi/testmod/TestTextDisplay.java b/src/testmod/java/io/github/mattidragon/tlaapi/testmod/TestTextDisplay.java
@@ -1,10 +1,10 @@
 package io.github.mattidragon.tlaapi.testmod;
 
+import io.github.mattidragon.tlaapi.api.gui.GuiBuilder;
 import io.github.mattidragon.tlaapi.api.recipe.TlaCategory;
 import io.github.mattidragon.tlaapi.api.recipe.TlaIngredient;
 import io.github.mattidragon.tlaapi.api.recipe.TlaRecipe;
 import io.github.mattidragon.tlaapi.api.recipe.TlaStack;
-import io.github.mattidragon.tlaapi.api.gui.GuiBuilder;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;

diff --git a/src/testmod/java/io/github/mattidragon/tlaapi/testmod/content/TestMod.java b/src/testmod/java/io/github/mattidragon/tlaapi/testmod/content/TestMod.java
@@ -14,7 +14,6 @@
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.text.Text;
-import org.jetbrains.annotations.Nullable;
 
 public class TestMod implements ModInitializer {
     public static final RecipeType<TestRecipe> RECIPE_TYPE = RecipeType.register("testmod:test_recipe");

diff --git a/src/testmod/java/io/github/mattidragon/tlaapi/testmod/content/TestScreen.java b/src/testmod/java/io/github/mattidragon/tlaapi/testmod/content/TestScreen.java
@@ -2,7 +2,6 @@
 
 import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.Items;
@@ -15,11 +14,6 @@ public TestScreen(TestScreenHandler handler, PlayerInventory playerInventory, Te
         super(handler, playerInventory, title);
     }
 
-    @Override
-    protected void init() {
-        super.init();
-    }
-
     @Override
     public void render(DrawContext context, int mouseX, int mouseY, float delta) {
         context.fill(x, y, x + backgroundWidth, y + backgroundHeight, 0xffffffff);