diff --git a/platform/textile/src/plugin/java/mcp/mobius/waila/plugin/textile/WailaPluginTextile.java b/platform/textile/src/plugin/java/mcp/mobius/waila/plugin/textile/WailaPluginTextile.java index da67c2f5b..0b725ed5f 100644 --- a/platform/textile/src/plugin/java/mcp/mobius/waila/plugin/textile/WailaPluginTextile.java +++ b/platform/textile/src/plugin/java/mcp/mobius/waila/plugin/textile/WailaPluginTextile.java @@ -12,7 +12,6 @@ import net.fabricmc.fabric.api.tag.convention.v1.ConventionalItemTags; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; -import net.minecraft.tags.ItemTags; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.DoublePlantBlock; @@ -31,31 +30,31 @@ public void register(IRegistrar registrar) { registrar.addToolType(new ResourceLocation("pickaxe"), IToolType.builder() .lowestTierItem(Items.WOODEN_PICKAXE) .blockTag(BlockTags.MINEABLE_WITH_PICKAXE) - .itemTag(ItemTags.PICKAXES) + .itemTag(ConventionalItemTags.PICKAXES) .build()); registrar.addToolType(new ResourceLocation("shovel"), IToolType.builder() .lowestTierItem(Items.WOODEN_SHOVEL) .blockTag(BlockTags.MINEABLE_WITH_SHOVEL) - .itemTag(ItemTags.SHOVELS) + .itemTag(ConventionalItemTags.SHOVELS) .build()); registrar.addToolType(new ResourceLocation("axe"), IToolType.builder() .lowestTierItem(Items.WOODEN_AXE) .blockTag(BlockTags.MINEABLE_WITH_AXE) - .itemTag(ItemTags.AXES) + .itemTag(ConventionalItemTags.AXES) .build()); registrar.addToolType(new ResourceLocation("hoe"), IToolType.builder() .lowestTierItem(Items.WOODEN_HOE) .blockTag(BlockTags.MINEABLE_WITH_HOE) - .itemTag(ItemTags.HOES) + .itemTag(ConventionalItemTags.HOES) .build()); registrar.addToolType(new ResourceLocation("sword"), IToolType.builder() .lowestTierItem(Items.WOODEN_SWORD) .blockTag(FabricMineableTags.SWORD_MINEABLE) - .itemTag(ItemTags.SWORDS) + .itemTag(ConventionalItemTags.SWORDS) .build()); registrar.addToolType(new ResourceLocation("shears"), IToolType.builder() diff --git a/src/api/java/mcp/mobius/waila/api/__internal__/IApiService.java b/src/api/java/mcp/mobius/waila/api/__internal__/IApiService.java index 11bdb9676..7355bc0db 100644 --- a/src/api/java/mcp/mobius/waila/api/__internal__/IApiService.java +++ b/src/api/java/mcp/mobius/waila/api/__internal__/IApiService.java @@ -27,6 +27,7 @@ import net.minecraft.world.item.Tier; import net.minecraft.world.level.block.Block; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.Nullable; /** @hidden */ @ApiStatus.Internal diff --git a/src/main/java/mcp/mobius/waila/service/ApiService.java b/src/main/java/mcp/mobius/waila/service/ApiService.java index 963f3cc92..4f2743814 100644 --- a/src/main/java/mcp/mobius/waila/service/ApiService.java +++ b/src/main/java/mcp/mobius/waila/service/ApiService.java @@ -189,7 +189,7 @@ public IInstanceRegistry createInstanceRegistry(boolean reversed) { var vanilla = List.of(Tiers.values()); var custom = new LinkedHashSet(); - for (var item : BuiltInRegistries.ITEM) { + for (var item : Registry.ITEM) { if (item instanceof TieredItem tiered && !(tiered.getTier() instanceof Tiers)) { custom.add(tiered.getTier()); } diff --git a/src/mixin/java/mcp/mobius/waila/mixin/ShearableBlocksMixin.java b/src/mixin/java/mcp/mobius/waila/mixin/ShearableBlocksMixin.java index 724ec7878..723f92de6 100644 --- a/src/mixin/java/mcp/mobius/waila/mixin/ShearableBlocksMixin.java +++ b/src/mixin/java/mcp/mobius/waila/mixin/ShearableBlocksMixin.java @@ -1,7 +1,6 @@ package mcp.mobius.waila.mixin; import mcp.mobius.waila.mixed.IShearable; -import net.minecraft.world.level.block.CherryLeavesBlock; import net.minecraft.world.level.block.DeadBushBlock; import net.minecraft.world.level.block.LeavesBlock; import net.minecraft.world.level.block.MangroveLeavesBlock; @@ -13,7 +12,6 @@ @Mixin({ - CherryLeavesBlock.class, DeadBushBlock.class, LeavesBlock.class, MangroveLeavesBlock.class, diff --git a/src/pluginHarvest/java/mcp/mobius/waila/plugin/harvest/component/ToolComponent.java b/src/pluginHarvest/java/mcp/mobius/waila/plugin/harvest/component/ToolComponent.java index ba92ee199..3d4108697 100644 --- a/src/pluginHarvest/java/mcp/mobius/waila/plugin/harvest/component/ToolComponent.java +++ b/src/pluginHarvest/java/mcp/mobius/waila/plugin/harvest/component/ToolComponent.java @@ -1,15 +1,18 @@ package mcp.mobius.waila.plugin.harvest.component; +import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.PoseStack; import mcp.mobius.waila.api.ITooltipComponent; import mcp.mobius.waila.api.WailaConstants; import mcp.mobius.waila.api.__internal__.ApiSide; -import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiComponent; import net.minecraft.client.renderer.entity.ItemRenderer; import net.minecraft.world.item.ItemStack; import org.jetbrains.annotations.Nullable; @ApiSide.ClientOnly -public class ToolComponent implements ITooltipComponent { +public class ToolComponent extends GuiComponent implements ITooltipComponent { private final @Nullable ItemStack icon; @@ -45,25 +48,27 @@ public int getHeight() { } @Override - public void render(GuiGraphics ctx, int x, int y, float delta) { + public void render(PoseStack matrices, int x, int y, float delta) { this.x = x; } - public void actuallyRender(GuiGraphics ctx, int y) { + public void actuallyRender(PoseStack matrices, int y) { if (icon != null) { - ctx.pose().pushPose(); - ctx.pose().translate(-2, -2, 0); - ctx.pose().scale(0.85f, 0.85f, 1f); - ctx.pose().translate(x / 0.85f, y / 0.85f, 0); - ctx.renderItem(icon, 0, 0); - ctx.pose().popPose(); + var itemMatrices = RenderSystem.getModelViewStack(); + itemMatrices.pushPose(); + itemMatrices.translate(-2, -2, 0); + itemMatrices.scale(0.85f, 0.85f, 1f); + itemMatrices.translate(x / 0.85f, y / 0.85f, 0); + Minecraft.getInstance().getItemRenderer().renderGuiItem(icon, 0, 0); + itemMatrices.popPose(); } if (v0 == -1) return; - ctx.pose().pushPose(); - ctx.pose().translate(0, 0, ItemRenderer.ITEM_COUNT_BLIT_OFFSET); - ctx.blit(WailaConstants.COMPONENT_TEXTURE, x + xo, y + 3, 122, v0, 7, 7); - ctx.pose().popPose(); + matrices.pushPose(); + matrices.translate(0, 0, ItemRenderer.ITEM_COUNT_BLIT_OFFSET); + RenderSystem.setShaderTexture(0, WailaConstants.COMPONENT_TEXTURE); + blit(matrices, x + xo, y + 3, 122, v0, 7, 7); + matrices.popPose(); } } diff --git a/src/pluginHarvest/java/mcp/mobius/waila/plugin/harvest/provider/HarvestProvider.java b/src/pluginHarvest/java/mcp/mobius/waila/plugin/harvest/provider/HarvestProvider.java index d8a9a500b..b1d7e3915 100644 --- a/src/pluginHarvest/java/mcp/mobius/waila/plugin/harvest/provider/HarvestProvider.java +++ b/src/pluginHarvest/java/mcp/mobius/waila/plugin/harvest/provider/HarvestProvider.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Map; +import com.mojang.blaze3d.vertex.PoseStack; import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap; import mcp.mobius.waila.api.IBlockAccessor; import mcp.mobius.waila.api.IBlockComponentProvider; @@ -21,7 +22,6 @@ import mcp.mobius.waila.plugin.harvest.tool.ToolTier; import mcp.mobius.waila.plugin.harvest.tool.ToolType; import net.minecraft.ChatFormatting; -import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; @@ -164,11 +164,11 @@ public void onHandleTooltip(ITooltip tooltip, ICommonAccessor accessor, IPluginC } @Override - public void onAfterTooltipRender(GuiGraphics ctx, Rectangle rect, ICommonAccessor accessor, IPluginConfig config) { + public void onAfterTooltipRender(PoseStack matrices, Rectangle rect, ICommonAccessor accessor, IPluginConfig config) { if (!renderComponents) return; for (var component : toolComponents) { - component.actuallyRender(ctx, rect.y + rect.height - 13); + component.actuallyRender(matrices, rect.y + rect.height - 13); } } diff --git a/src/pluginHarvest/java/mcp/mobius/waila/plugin/harvest/tool/ToolType.java b/src/pluginHarvest/java/mcp/mobius/waila/plugin/harvest/tool/ToolType.java index 6465555e3..2fc68bce5 100644 --- a/src/pluginHarvest/java/mcp/mobius/waila/plugin/harvest/tool/ToolType.java +++ b/src/pluginHarvest/java/mcp/mobius/waila/plugin/harvest/tool/ToolType.java @@ -10,8 +10,7 @@ import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap; import mcp.mobius.waila.api.IToolType; import mcp.mobius.waila.buildconst.Tl; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.core.registries.Registries; +import net.minecraft.core.Registry; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; @@ -36,7 +35,7 @@ public class ToolType implements IToolType, IToolType.Builder0, IToolType.Builde var tiers = ToolTier.all(); var map = new Reference2ObjectOpenHashMap(); - for (var item : BuiltInRegistries.ITEM) { + for (var item : Registry.ITEM) { var stack = item.getDefaultInstance(); if (itemPredicate.test(stack)) { for (var tier : tiers) { @@ -98,7 +97,7 @@ public Builder2 blockTag(TagKey tag) { @Override public Builder2 blockTag(ResourceLocation tag) { - return blockTag(TagKey.create(Registries.BLOCK, tag)); + return blockTag(TagKey.create(Registry.BLOCK_REGISTRY, tag)); } @Override @@ -115,7 +114,7 @@ public Builder3 itemTag(TagKey tag) { @Override public Builder3 itemTag(ResourceLocation tag) { - return itemTag(TagKey.create(Registries.ITEM, tag)); + return itemTag(TagKey.create(Registry.ITEM_REGISTRY, tag)); } @Override