Skip to content

Turn IMappedRegistryAccess into an accessor mixin #5037

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

Open
jurrejelle wants to merge 3 commits into
base: 1.21
Choose a base branch
from
Open

Turn IMappedRegistryAccess into an accessor mixin #5037

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
d57e1e3
Remove generic from IMappedRegistryAccess
jurrejelle Jun 30, 2026
bbedd3a
remove generic from injected interfaces
jurrejelle Jun 30, 2026
7c3e37f
Turn it into an accessor
jurrejelle Jun 30, 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
3 changes: 0 additions & 3 deletions injected_interfaces/interfaces.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{
"net/minecraft/core/MappedRegistry": [
"com/gregtechceu/gtceu/core/IMappedRegistryAccess<T>"
],
"net/minecraft/client/renderer/block/model/BakedQuad": [
"com/gregtechceu/gtceu/core/util/extensions/BakedQuadExt"
],
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/IMaterialRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.gregtechceu.gtceu.api.data.chemical.material;

import com.gregtechceu.gtceu.GTCEu;
import com.gregtechceu.gtceu.core.IMappedRegistryAccess;
import com.gregtechceu.gtceu.core.mixins.MappedRegistryAccessor;

import net.minecraft.resources.ResourceLocation;

Expand Down Expand Up @@ -83,7 +83,7 @@ default Material getMaterial(String name) {
/**
*
* @return {@code true} if this registry is frozen, {@code false} otherwise
* @see IMappedRegistryAccess#gtceu$isFrozen()
* @see MappedRegistryAccessor#isFrozen()
*/
boolean isFrozen();
}
3 changes: 2 additions & 1 deletion ...main/java/com/gregtechceu/gtceu/api/data/chemical/material/registry/MaterialRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.gregtechceu.gtceu.api.data.chemical.material.IMaterialRegistry;
import com.gregtechceu.gtceu.api.data.chemical.material.Material;
import com.gregtechceu.gtceu.common.data.GTMaterials;
import com.gregtechceu.gtceu.core.mixins.MappedRegistryAccessor;

import net.minecraft.core.Holder;
import net.minecraft.core.MappedRegistry;
Expand Down Expand Up @@ -110,7 +111,7 @@ public Material getDefaultFallback() {

@Override
public boolean isFrozen() {
return this.gtceu$isFrozen();
return ((MappedRegistryAccessor) (Object) this).isFrozen();
}

public void close() {
Expand Down
72 changes: 0 additions & 72 deletions src/main/java/com/gregtechceu/gtceu/core/IMappedRegistryAccess.java
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions src/main/java/com/gregtechceu/gtceu/core/mixins/MappedRegistryAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.gregtechceu.gtceu.core.mixins;

import net.minecraft.core.MappedRegistry;

import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;

@Mixin(MappedRegistry.class)
public interface MappedRegistryAccessor {

@Accessor
boolean isFrozen();
}
81 changes: 0 additions & 81 deletions src/main/java/com/gregtechceu/gtceu/core/mixins/MappedRegistryMixin.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/resources/gtceu.mixins.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"LevelMixin",
"LootPoolAccessor",
"MapColorAccessor",
"MappedRegistryMixin",
"MappedRegistryAccessor",
"OreConfigurationMixin",
"OreVeinifierMixin",
"PotionBrewingAccessor",
Expand Down
Loading