separate more internal classes out into the Common subproject

Forge/src/main/java/mezz/jei/config/Constants.java → Common/src/main/java/mezz/jei/common/Constants.java

@@ -1,4 +1,4 @@
-package mezz.jei.config;
+package mezz.jei.common;
 
 import mezz.jei.api.recipe.RecipeType;
 import net.minecraft.resources.ResourceLocation;

Common/src/main/java/mezz/jei/common/color/ColorNamer.java

@@ -1,7 +1,9 @@
 package mezz.jei.common.color;
 
+import com.google.common.base.Preconditions;
 import org.jetbrains.annotations.Nullable;
 
+import java.awt.*;
 import java.util.Comparator;
 import java.util.Map;
 import java.util.stream.Stream;
@@ -10,9 +12,21 @@
 import com.google.common.collect.ImmutableMap;
 
 public class ColorNamer {
+	@Nullable
+	private static ColorNamer INSTANCE = null;
+
+	public static ColorNamer getInstance() {
+		Preconditions.checkState(INSTANCE != null, "Color Namer has not been created yet.");
+		return INSTANCE;
+	}
+
+	public static void create(ImmutableMap<Integer, String> colorNames) {
+		INSTANCE = new ColorNamer(colorNames);
+	}
+
 	private final ImmutableMap<Integer, String> colorNames;
 
-	public ColorNamer(ImmutableMap<Integer, String> colorNames) {
+	private ColorNamer(ImmutableMap<Integer, String> colorNames) {
 		this.colorNames = colorNames;
 	}
 

Forge/src/main/java/mezz/jei/config/IEditModeConfig.java → Common/src/main/java/mezz/jei/common/config/IEditModeConfig.java

@@ -1,9 +1,9 @@
-package mezz.jei.config;
+package mezz.jei.common.config;
 
 import mezz.jei.api.ingredients.IIngredientHelper;
 import mezz.jei.api.ingredients.ITypedIngredient;
+import mezz.jei.common.ingredients.IngredientFilter;
 import mezz.jei.core.config.IngredientBlacklistType;
-import mezz.jei.ingredients.IngredientFilter;
 
 public interface IEditModeConfig {
 	<V> boolean isIngredientOnConfigBlacklist(ITypedIngredient<V> ingredient, IIngredientHelper<V> ingredientHelper);

Forge/src/main/java/mezz/jei/config/IIngredientFilterConfig.java → Common/src/main/java/mezz/jei/common/config/IIngredientFilterConfig.java

@@ -1,4 +1,4 @@
-package mezz.jei.config;
+package mezz.jei.common.config;
 
 import mezz.jei.core.search.SearchMode;
 

Common/src/main/java/mezz/jei/common/config/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package mezz.jei.common.config;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

Forge/src/main/java/mezz/jei/gui/HoverChecker.java → Common/src/main/java/mezz/jei/common/gui/HoverChecker.java

@@ -1,4 +1,4 @@
-package mezz.jei.gui;
+package mezz.jei.common.gui;
 
 import mezz.jei.common.util.ImmutableRect2i;
 import net.minecraft.client.gui.components.Button;

Forge/src/main/java/mezz/jei/gui/TooltipRenderer.java → Common/src/main/java/mezz/jei/common/gui/TooltipRenderer.java

@@ -1,7 +1,9 @@
-package mezz.jei.gui;
+package mezz.jei.common.gui;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import mezz.jei.api.ingredients.IIngredientRenderer;
+import mezz.jei.common.platform.IPlatformRenderHelper;
+import mezz.jei.common.platform.Services;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.screens.Screen;
@@ -37,6 +39,7 @@ private static void drawHoveringText(PoseStack poseStack, List<Component> textLi
 		}
 
 		Optional<TooltipComponent> tooltipImage = itemStack.getTooltipImage();
-		screen.renderTooltip(poseStack, textLines, tooltipImage, x, y, font, itemStack);
+		IPlatformRenderHelper renderHelper = Services.PLATFORM.getRenderHelper();
+		renderHelper.renderTooltip(screen, poseStack, textLines, tooltipImage, x, y, font, itemStack);
 	}
 }

Forge/src/main/java/mezz/jei/gui/elements/DrawableAnimated.java → Common/src/main/java/mezz/jei/common/gui/elements/DrawableAnimated.java

@@ -1,10 +1,10 @@
-package mezz.jei.gui.elements;
+package mezz.jei.common.gui.elements;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import mezz.jei.api.gui.ITickTimer;
 import mezz.jei.api.gui.drawable.IDrawableAnimated;
 import mezz.jei.api.gui.drawable.IDrawableStatic;
-import mezz.jei.gui.TickTimer;
+import mezz.jei.common.util.TickTimer;
 
 public class DrawableAnimated implements IDrawableAnimated {
 	private final IDrawableStatic drawable;

Forge/src/main/java/mezz/jei/gui/elements/DrawableBlank.java → Common/src/main/java/mezz/jei/common/gui/elements/DrawableBlank.java

@@ -1,4 +1,4 @@
-package mezz.jei.gui.elements;
+package mezz.jei.common.gui.elements;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import mezz.jei.api.gui.drawable.IDrawableAnimated;

Forge/src/main/java/mezz/jei/gui/elements/DrawableBuilder.java → Common/src/main/java/mezz/jei/common/gui/elements/DrawableBuilder.java

@@ -1,4 +1,4 @@
-package mezz.jei.gui.elements;
+package mezz.jei.common.gui.elements;
 
 import net.minecraft.resources.ResourceLocation;
 

Forge/src/main/java/mezz/jei/gui/elements/DrawableIngredient.java → Common/src/main/java/mezz/jei/common/gui/elements/DrawableIngredient.java

@@ -1,4 +1,4 @@
-package mezz.jei.gui.elements;
+package mezz.jei.common.gui.elements;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.systems.RenderSystem;

Forge/src/main/java/mezz/jei/gui/elements/DrawableNineSliceTexture.java → Common/src/main/java/mezz/jei/common/gui/elements/DrawableNineSliceTexture.java

@@ -1,4 +1,4 @@
-package mezz.jei.gui.elements;
+package mezz.jei.common.gui.elements;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.BufferBuilder;
@@ -7,8 +7,8 @@
 import com.mojang.blaze3d.vertex.Tesselator;
 import com.mojang.blaze3d.vertex.VertexFormat;
 import com.mojang.math.Matrix4f;
-import mezz.jei.config.Constants;
-import mezz.jei.gui.textures.JeiSpriteUploader;
+import mezz.jei.common.Constants;
+import mezz.jei.common.gui.textures.JeiSpriteUploader;
 import mezz.jei.common.util.ImmutableRect2i;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;

Forge/src/main/java/mezz/jei/gui/elements/DrawableResource.java → Common/src/main/java/mezz/jei/common/gui/elements/DrawableResource.java

@@ -1,4 +1,4 @@
-package mezz.jei.gui.elements;
+package mezz.jei.common.gui.elements;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;

Forge/src/main/java/mezz/jei/gui/elements/DrawableSprite.java → Common/src/main/java/mezz/jei/common/gui/elements/DrawableSprite.java

@@ -1,18 +1,19 @@
-package mezz.jei.gui.elements;
+package mezz.jei.common.gui.elements;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexFormat;
 import com.mojang.blaze3d.vertex.BufferBuilder;
 import com.mojang.blaze3d.vertex.Tesselator;
+import mezz.jei.common.Constants;
+import mezz.jei.common.gui.textures.JeiSpriteUploader;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import net.minecraft.resources.ResourceLocation;
 
 import mezz.jei.api.gui.drawable.IDrawableStatic;
-import mezz.jei.config.Constants;
-import mezz.jei.gui.textures.JeiSpriteUploader;
+
 import com.mojang.math.Matrix4f;
 
 public class DrawableSprite implements IDrawableStatic {

Forge/src/main/java/mezz/jei/gui/elements/GuiIconButton.java → Common/src/main/java/mezz/jei/common/gui/elements/GuiIconButton.java

@@ -1,13 +1,12 @@
-package mezz.jei.gui.elements;
+package mezz.jei.common.gui.elements;
 
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
-import mezz.jei.Internal;
 import mezz.jei.api.gui.drawable.IDrawable;
-import mezz.jei.gui.textures.Textures;
-import mezz.jei.input.UserInput;
-import mezz.jei.input.mouse.IUserInputHandler;
+import mezz.jei.common.gui.textures.Textures;
+import mezz.jei.common.input.IUserInputHandler;
+import mezz.jei.common.input.UserInput;
 import mezz.jei.common.util.ImmutableRect2i;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.Button;
@@ -21,10 +20,12 @@
  */
 public class GuiIconButton extends Button {
 	private final IDrawable icon;
+	private final Textures textures;
 
-	public GuiIconButton(IDrawable icon, OnPress pressable) {
+	public GuiIconButton(IDrawable icon, OnPress pressable, Textures textures) {
 		super(0, 0, 0, 0, TextComponent.EMPTY, pressable);
 		this.icon = icon;
+		this.textures = textures;
 	}
 
 	public void updateBounds(ImmutableRect2i area) {
@@ -34,6 +35,10 @@ public void updateBounds(ImmutableRect2i area) {
 		this.height = area.getHeight();
 	}
 
+	public void setHeight(int value) {
+		this.height = value;
+	}
+
 	@Override
 	public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) {
 		if (this.visible) {
@@ -42,22 +47,15 @@ public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTic
 			RenderSystem.enableBlend();
 			RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
 			RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
-			Textures textures = Internal.getTextures();
 			Minecraft minecraft = Minecraft.getInstance();
 			DrawableNineSliceTexture texture = textures.getButtonForState(this.active, hovered);
 			texture.draw(poseStack, this.x, this.y, this.width, this.height);
 			this.renderBg(poseStack, minecraft, mouseX, mouseY);
-
-			int color = 14737632;
-			if (packedFGColor != 0) {
-				color = packedFGColor;
-			} else if (!this.active) {
-				color = 10526880;
+			int color = 0xFFE0E0E0;
+			if (!this.active) {
+				color = 0xFFA0A0A0;
 			} else if (hovered) {
-				color = 16777120;
-			}
-			if ((color & -67108864) == 0) {
-				color |= -16777216;
+				color = 0xFFFFFFA0;
 			}
 
 			float red = (color >> 16 & 255) / 255.0F;

Forge/src/main/java/mezz/jei/gui/elements/GuiIconButtonSmall.java → Common/src/main/java/mezz/jei/common/gui/elements/GuiIconButtonSmall.java

@@ -1,25 +1,25 @@
-package mezz.jei.gui.elements;
+package mezz.jei.common.gui.elements;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import mezz.jei.api.gui.drawable.IDrawable;
+import mezz.jei.common.gui.textures.Textures;
 import mezz.jei.common.util.ImmutableRect2i;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.Button;
-
-import mezz.jei.Internal;
-import mezz.jei.api.gui.drawable.IDrawable;
-import mezz.jei.gui.textures.Textures;
 import net.minecraft.network.chat.TextComponent;
 
 /**
  * A small gui button that has an {@link IDrawable} instead of a string label.
  */
 public class GuiIconButtonSmall extends Button {
 	private final IDrawable icon;
+	private final Textures textures;
 
-	public GuiIconButtonSmall(int x, int y, int widthIn, int heightIn, IDrawable icon, Button.OnPress pressable) {
+	public GuiIconButtonSmall(int x, int y, int widthIn, int heightIn, IDrawable icon, Button.OnPress pressable, Textures textures) {
 		super(x, y, widthIn, heightIn, TextComponent.EMPTY, pressable);
 		this.icon = icon;
+		this.textures = textures;
 	}
 
 	public ImmutableRect2i getArea() {
@@ -32,21 +32,15 @@ public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTic
 			Minecraft minecraft = Minecraft.getInstance();
 			RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
 			boolean hovered = isMouseOver(mouseX, mouseY);
-			Textures textures = Internal.getTextures();
 			DrawableNineSliceTexture texture = textures.getButtonForState(this.active, hovered);
 			texture.draw(poseStack, this.x, this.y, this.width, this.height);
 			this.renderBg(poseStack, minecraft, mouseX, mouseY);
 
-			int color = 14737632;
-			if (packedFGColor != 0) {
-				color = packedFGColor;
-			} else if (!this.active) {
-				color = 10526880;
+			int color = 0xFFE0E0E0;
+			if (!this.active) {
+				color = 0xFFA0A0A0;
 			} else if (hovered) {
-				color = 16777120;
-			}
-			if ((color & -67108864) == 0) {
-				color |= -16777216;
+				color = 0xFFFFFFA0;
 			}
 
 			float red = (color >> 16 & 255) / 255.0F;

Forge/src/main/java/mezz/jei/gui/elements/GuiIconToggleButton.java → Common/src/main/java/mezz/jei/common/gui/elements/GuiIconToggleButton.java

@@ -1,11 +1,12 @@
-package mezz.jei.gui.elements;
+package mezz.jei.common.gui.elements;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import mezz.jei.api.gui.drawable.IDrawable;
-import mezz.jei.gui.HoverChecker;
-import mezz.jei.gui.TooltipRenderer;
-import mezz.jei.input.UserInput;
-import mezz.jei.input.mouse.IUserInputHandler;
+import mezz.jei.common.gui.HoverChecker;
+import mezz.jei.common.gui.TooltipRenderer;
+import mezz.jei.common.gui.textures.Textures;
+import mezz.jei.common.input.IUserInputHandler;
+import mezz.jei.common.input.UserInput;
 import mezz.jei.common.util.ImmutableRect2i;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
@@ -20,11 +21,10 @@ public abstract class GuiIconToggleButton {
 	private final GuiIconButton button;
 	private final HoverChecker hoverChecker;
 
-	public GuiIconToggleButton(IDrawable offIcon, IDrawable onIcon) {
+	public GuiIconToggleButton(IDrawable offIcon, IDrawable onIcon, Textures textures) {
 		this.offIcon = offIcon;
 		this.onIcon = onIcon;
-		this.button = new GuiIconButton(new DrawableBlank(0, 0), b -> {
-		});
+		this.button = new GuiIconButton(new DrawableBlank(0, 0), b -> {}, textures);
 		this.hoverChecker = new HoverChecker();
 		this.hoverChecker.updateBounds(this.button);
 	}

Forge/src/main/java/mezz/jei/gui/elements/HighResolutionDrawable.java → Common/src/main/java/mezz/jei/common/gui/elements/HighResolutionDrawable.java

@@ -1,4 +1,4 @@
-package mezz.jei.gui.elements;
+package mezz.jei.common.gui.elements;
 
 import com.google.common.base.Preconditions;
 import com.mojang.blaze3d.vertex.PoseStack;

Forge/src/main/java/mezz/jei/gui/elements/OffsetDrawable.java → Common/src/main/java/mezz/jei/common/gui/elements/OffsetDrawable.java

@@ -1,4 +1,4 @@
-package mezz.jei.gui.elements;
+package mezz.jei.common.gui.elements;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import mezz.jei.api.gui.drawable.IDrawable;

Forge/src/main/java/mezz/jei/gui/textures/package-info.java → Common/src/main/java/mezz/jei/common/gui/elements/package-info.java

@@ -1,6 +1,6 @@
 @ParametersAreNonnullByDefault
 @FieldsAndMethodsAreNonnullByDefault
-package mezz.jei.gui.textures;
+package mezz.jei.common.gui.elements;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 

Forge/src/main/java/mezz/jei/gui/ingredients/CycleTimer.java → Common/src/main/java/mezz/jei/common/gui/ingredients/CycleTimer.java

@@ -1,4 +1,4 @@
-package mezz.jei.gui.ingredients;
+package mezz.jei.common.gui.ingredients;
 
 import mezz.jei.api.ingredients.ITypedIngredient;
 import net.minecraft.client.gui.screens.Screen;

Forge/src/main/java/mezz/jei/gui/ingredients/IListElement.java → Common/src/main/java/mezz/jei/common/gui/ingredients/IListElement.java

@@ -1,4 +1,4 @@
-package mezz.jei.gui.ingredients;
+package mezz.jei.common.gui.ingredients;
 
 import mezz.jei.api.ingredients.ITypedIngredient;
 

Common/src/main/java/mezz/jei/common/gui/ingredients/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package mezz.jei.common.gui.ingredients;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

Forge/src/main/java/mezz/jei/gui/overlay/IFilterTextSource.java → Common/src/main/java/mezz/jei/common/gui/overlay/IFilterTextSource.java

@@ -1,4 +1,4 @@
-package mezz.jei.gui.overlay;
+package mezz.jei.common.gui.overlay;
 
 public interface IFilterTextSource {
 	String getFilterText();

Forge/src/main/java/mezz/jei/gui/overlay/IIngredientGridSource.java → Common/src/main/java/mezz/jei/common/gui/overlay/IIngredientGridSource.java

@@ -1,4 +1,4 @@
-package mezz.jei.gui.overlay;
+package mezz.jei.common.gui.overlay;
 
 import mezz.jei.api.ingredients.ITypedIngredient;
 import org.jetbrains.annotations.Unmodifiable;

Common/src/main/java/mezz/jei/common/gui/overlay/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package mezz.jei.common.gui.overlay;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

Common/src/main/java/mezz/jei/common/gui/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package mezz.jei.common.gui;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;