Skip to content

Commit 5718d53

Browse files
authored
Fix access protection issue in netherite tools + lamprenderer issues (#4579)
1 parent 0125ba5 commit 5718d53

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

src/main/java/com/gregtechceu/gtceu/api/item/LampBlockItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void initializeClient(Consumer<IClientItemExtensions> consumer) {
7777

7878
@Override
7979
public BlockEntityWithoutLevelRenderer getCustomRenderer() {
80-
return LampItemRenderer.INSTANCE;
80+
return LampItemRenderer.getInstance();
8181
}
8282
});
8383
}

src/main/java/com/gregtechceu/gtceu/client/renderer/block/LampItemRenderer.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,14 @@
2222
*/
2323
public class LampItemRenderer extends BlockEntityWithoutLevelRenderer {
2424

25-
public static final LampItemRenderer INSTANCE = new LampItemRenderer();
25+
private static LampItemRenderer INSTANCE = null;
26+
27+
public static LampItemRenderer getInstance() {
28+
if (INSTANCE == null) {
29+
INSTANCE = new LampItemRenderer();
30+
}
31+
return INSTANCE;
32+
}
2633

2734
protected final ItemRenderer itemRenderer;
2835
protected final BlockRenderDispatcher blockRenderer;

src/main/java/com/gregtechceu/gtceu/data/recipe/VanillaRecipeHelper.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import com.gregtechceu.gtceu.api.item.tool.ToolHelper;
1515
import com.gregtechceu.gtceu.data.recipe.builder.*;
1616

17+
import net.minecraft.advancements.critereon.InventoryChangeTrigger;
1718
import net.minecraft.data.recipes.FinishedRecipe;
1819
import net.minecraft.data.recipes.RecipeCategory;
1920
import net.minecraft.data.recipes.SmithingTransformRecipeBuilder;
@@ -33,8 +34,6 @@
3334

3435
import java.util.function.Consumer;
3536

36-
import static com.tterrag.registrate.providers.RegistrateRecipeProvider.has;
37-
3837
public class VanillaRecipeHelper {
3938

4039
public static void addSmeltingRecipe(Consumer<FinishedRecipe> provider, @NotNull String regName, TagKey<Item> input,
@@ -631,7 +630,7 @@ public static void addSmithingTransformRecipe(Consumer<FinishedRecipe> provider,
631630
@NotNull RecipeCategory category) {
632631
SmithingTransformRecipeBuilder
633632
.smithing(Ingredient.of(template), Ingredient.of(baseInput), Ingredient.of(addition), category, result)
634-
.unlocks(String.format("has_%s", baseInput), has(baseInput))
633+
.unlocks(String.format("has_%s", baseInput), InventoryChangeTrigger.TriggerInstance.hasItems(baseInput))
635634
.save(provider, regName);
636635
}
637636

0 commit comments

Comments
 (0)