From b17fde34a7fc8f70776d663c859a2fb7af8726c6 Mon Sep 17 00:00:00 2001 From: IThundxr Date: Mon, 2 Sep 2024 18:06:06 -0400 Subject: [PATCH] post merge fixes --- .../create/foundation/data/recipe/CrushingRecipeGen.java | 4 +--- .../create/infrastructure/gui/OpenCreateMenuButton.java | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java index b5fe567c1e..53b10d111f 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java @@ -22,11 +22,9 @@ import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder; import com.simibubi.create.foundation.utility.Lang; -import me.alphamode.forgetags.Tags; -import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; +import io.github.fabricators_of_create.porting_lib.tags.Tags; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.resource.conditions.v1.DefaultResourceConditions; -import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.ItemTags; diff --git a/src/main/java/com/simibubi/create/infrastructure/gui/OpenCreateMenuButton.java b/src/main/java/com/simibubi/create/infrastructure/gui/OpenCreateMenuButton.java index 076c178d9c..de4e289a37 100644 --- a/src/main/java/com/simibubi/create/infrastructure/gui/OpenCreateMenuButton.java +++ b/src/main/java/com/simibubi/create/infrastructure/gui/OpenCreateMenuButton.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.stream.Collectors; -import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.AllItems; import com.simibubi.create.foundation.gui.ScreenOpener; import com.simibubi.create.foundation.utility.Components; @@ -12,6 +11,8 @@ import net.fabricmc.fabric.api.client.screen.v1.Screens; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.screens.PauseScreen;