diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/LampBlockItem.java b/src/main/java/com/gregtechceu/gtceu/api/item/LampBlockItem.java
index d07587b9b57..edb5174a25a 100644
--- a/src/main/java/com/gregtechceu/gtceu/api/item/LampBlockItem.java
+++ b/src/main/java/com/gregtechceu/gtceu/api/item/LampBlockItem.java
@@ -77,7 +77,7 @@ public void initializeClient(Consumer<IClientItemExtensions> consumer) {
 
             @Override
             public BlockEntityWithoutLevelRenderer getCustomRenderer() {
-                return LampItemRenderer.INSTANCE;
+                return LampItemRenderer.getInstance();
             }
         });
     }
diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/block/LampItemRenderer.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/block/LampItemRenderer.java
index aed2072c637..853f9a3e361 100644
--- a/src/main/java/com/gregtechceu/gtceu/client/renderer/block/LampItemRenderer.java
+++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/block/LampItemRenderer.java
@@ -22,7 +22,14 @@
  */
 public class LampItemRenderer extends BlockEntityWithoutLevelRenderer {
 
-    public static final LampItemRenderer INSTANCE = new LampItemRenderer();
+    private static LampItemRenderer INSTANCE = null;
+
+    public static LampItemRenderer getInstance() {
+        if (INSTANCE == null) {
+            INSTANCE = new LampItemRenderer();
+        }
+        return INSTANCE;
+    }
 
     protected final ItemRenderer itemRenderer;
     protected final BlockRenderDispatcher blockRenderer;
diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/VanillaRecipeHelper.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/VanillaRecipeHelper.java
index f2035827169..e9d7013bf87 100644
--- a/src/main/java/com/gregtechceu/gtceu/data/recipe/VanillaRecipeHelper.java
+++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/VanillaRecipeHelper.java
@@ -14,6 +14,7 @@
 import com.gregtechceu.gtceu.api.item.tool.ToolHelper;
 import com.gregtechceu.gtceu.data.recipe.builder.*;
 
+import net.minecraft.advancements.critereon.InventoryChangeTrigger;
 import net.minecraft.data.recipes.FinishedRecipe;
 import net.minecraft.data.recipes.RecipeCategory;
 import net.minecraft.data.recipes.SmithingTransformRecipeBuilder;
@@ -33,8 +34,6 @@
 
 import java.util.function.Consumer;
 
-import static com.tterrag.registrate.providers.RegistrateRecipeProvider.has;
-
 public class VanillaRecipeHelper {
 
     public static void addSmeltingRecipe(Consumer<FinishedRecipe> provider, @NotNull String regName, TagKey<Item> input,
@@ -631,7 +630,7 @@ public static void addSmithingTransformRecipe(Consumer<FinishedRecipe> provider,
                                                   @NotNull RecipeCategory category) {
         SmithingTransformRecipeBuilder
                 .smithing(Ingredient.of(template), Ingredient.of(baseInput), Ingredient.of(addition), category, result)
-                .unlocks(String.format("has_%s", baseInput), has(baseInput))
+                .unlocks(String.format("has_%s", baseInput), InventoryChangeTrigger.TriggerInstance.hasItems(baseInput))
                 .save(provider, regName);
     }