diff --git a/src/main/java/appeng/core/api/definitions/ApiItems.java b/src/main/java/appeng/core/api/definitions/ApiItems.java index b62f8a4e0..dc7890bf5 100644 --- a/src/main/java/appeng/core/api/definitions/ApiItems.java +++ b/src/main/java/appeng/core/api/definitions/ApiItems.java @@ -141,12 +141,12 @@ public final class ApiItems implements IItems { private final AEColoredItemDefinition coloredLumenPaintBall; // unsupported dev tools - private IItemDefinition toolEraser; - private IItemDefinition toolMeteoritePlacer; - private IItemDefinition toolDebugCard; - private IItemDefinition toolReplicatorCard; + private final IItemDefinition toolEraser; + private final IItemDefinition toolMeteoritePlacer; + private final IItemDefinition toolDebugCard; + private final IItemDefinition toolReplicatorCard; - private IItemDefinition dummyFluidItem; + private final IItemDefinition dummyFluidItem; public ApiItems(FeatureFactory registry, ApiMaterials materials) { FeatureFactory certusTools = registry.features(AEFeature.CERTUS_QUARTZ_TOOLS); diff --git a/src/main/java/appeng/items/misc/CrystalSeedRendering.java b/src/main/java/appeng/items/misc/CrystalSeedRendering.java index d053ee802..0978457af 100644 --- a/src/main/java/appeng/items/misc/CrystalSeedRendering.java +++ b/src/main/java/appeng/items/misc/CrystalSeedRendering.java @@ -1,12 +1,12 @@ package appeng.items.misc; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry; import net.minecraft.item.Item; -import net.minecraft.item.ItemModelsProperties; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import appeng.bootstrap.components.IClientSetupComponent; +import appeng.core.AppEng; /** * Exposes a predicate "growth", which is used in the item model to @@ -20,10 +20,10 @@ public class CrystalSeedRendering implements IClientSetupComponent { } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void setup() { // Expose the growth of the seed to the model system - ItemModelsProperties.func_239418_a_(item, new ResourceLocation("appliedenergistics2:growth"), + FabricModelPredicateProviderRegistry.register(item, AppEng.makeId("growth"), (is, w, p) -> CrystalSeedItem.getGrowthTicks(is) / (float) CrystalSeedItem.GROWTH_TICKS_REQUIRED); } }