Skip to content

Fix access protection issue in netherite tools + lamprenderer issues #4579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gustovafing merged 3 commits into from
Feb 8, 2026
Merged

Fix access protection issue in netherite tools + lamprenderer issues #4579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49e2757
Fix access protection issue in netherite tools
jurrejelle Feb 8, 2026
835ab30
Spotless + fix lamp issue
jurrejelle Feb 8, 2026
bf8c8d0
lazy getter
jurrejelle Feb 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/gregtechceu/gtceu/api/item/LampBlockItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public void initializeClient(Consumer<IClientItemExtensions> consumer) {

@Override
public BlockEntityWithoutLevelRenderer getCustomRenderer() {
return LampItemRenderer.INSTANCE;
return LampItemRenderer.getInstance();
}
});
}
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/com/gregtechceu/gtceu/client/renderer/block/LampItemRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/com/gregtechceu/gtceu/data/recipe/VanillaRecipeHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
Expand Down Expand Up @@ -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);
}

Expand Down