diff --git a/src/main/java/com/minelittlepony/unicopia/advancement/UCriteria.java b/src/main/java/com/minelittlepony/unicopia/advancement/UCriteria.java index 9acf55c9..7b51695c 100644 --- a/src/main/java/com/minelittlepony/unicopia/advancement/UCriteria.java +++ b/src/main/java/com/minelittlepony/unicopia/advancement/UCriteria.java @@ -1,12 +1,10 @@ package com.minelittlepony.unicopia.advancement; -import com.minelittlepony.unicopia.mixin.MixinCriteria; - -import net.minecraft.advancement.criterion.Criterion; +import net.minecraft.advancement.criterion.Criteria; public interface UCriteria { - CustomEventCriterion CUSTOM_EVENT = register(new CustomEventCriterion()); - RaceChangeCriterion PLAYER_CHANGE_RACE = register(new RaceChangeCriterion()); + CustomEventCriterion CUSTOM_EVENT = Criteria.register(new CustomEventCriterion()); + RaceChangeCriterion PLAYER_CHANGE_RACE = Criteria.register(new RaceChangeCriterion()); CustomEventCriterion.Trigger LOOK_INTO_SUN = CUSTOM_EVENT.createTrigger("look_into_sun"); CustomEventCriterion.Trigger WEAR_SHADES = CUSTOM_EVENT.createTrigger("wear_shades"); @@ -21,9 +19,5 @@ public interface UCriteria { CustomEventCriterion.Trigger RECEIVE_OATS = CUSTOM_EVENT.createTrigger("receive_oats"); CustomEventCriterion.Trigger BREAK_WINDOW = CUSTOM_EVENT.createTrigger("break_window"); - private static > T register(T obj) { - return MixinCriteria.register(obj); - } - static void bootstrap() { } } diff --git a/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/EquippedSpellSlot.java b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/EquippedSpellSlot.java index c947ef03..a0a228f7 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/EquippedSpellSlot.java +++ b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/EquippedSpellSlot.java @@ -56,7 +56,6 @@ public class EquippedSpellSlot extends Button { } if (isHovered()) { HandledScreen.drawSlotHighlight(matrices, getX(), getY(), 0); - this.onPress(); } } diff --git a/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/IngredientTree.java b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/IngredientTree.java index 60fc9cc1..279c3a4d 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/IngredientTree.java +++ b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/IngredientTree.java @@ -15,7 +15,6 @@ import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.item.TooltipContext; import net.minecraft.client.render.*; import net.minecraft.client.render.item.ItemRenderer; @@ -23,7 +22,6 @@ import net.minecraft.client.render.model.json.ModelTransformation; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.item.ItemStack; import net.minecraft.screen.PlayerScreenHandler; -import net.minecraft.text.Text; class IngredientTree implements SpellbookRecipe.CraftingTreeBuilder { private final List entries = new ArrayList<>(); @@ -134,29 +132,17 @@ class IngredientTree implements SpellbookRecipe.CraftingTreeBuilder { RenderSystem.setShaderTexture(0, SpellbookScreen.SLOT); RenderSystem.enableBlend(); - drawTexture(matrices, x - 8, y - 10, 0, 0, 32, 32, 32, 32); + drawTexture(matrices, getX() - 8, getY() - 10, 0, 0, 32, 32, 32, 32); RenderSystem.disableBlend(); RenderSystem.setShaderColor(1, 1, 1, 1); MinecraftClient.getInstance().textRenderer.draw(matrices, label, - x - MinecraftClient.getInstance().textRenderer.getWidth(label) / 2 - 3, - y + 4, + getX() - MinecraftClient.getInstance().textRenderer.getWidth(label) / 2 - 3, + getY() + 4, 0 ); - entry.render(matrices, x, y, tickDelta); - } - - @Override - public void renderToolTip(MatrixStack matrices, Screen parent, int mouseX, int mouseY) { - if (visible) { - getStyle().getTooltip().ifPresent(tooltip -> { - List lines = tooltip.getLines(); - if (!lines.isEmpty()) { - parent.renderTooltip(matrices, tooltip.getLines(), mouseX + getStyle().toolTipX, mouseY + getStyle().toolTipY); - } - }); - } + entry.render(matrices, getX(), getY(), tickDelta); } } diff --git a/src/main/java/com/minelittlepony/unicopia/mixin/MixinBoatEntity.java b/src/main/java/com/minelittlepony/unicopia/mixin/MixinBoatEntity.java index c1880bd5..392cf967 100644 --- a/src/main/java/com/minelittlepony/unicopia/mixin/MixinBoatEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/mixin/MixinBoatEntity.java @@ -31,7 +31,7 @@ abstract class MixinBoatEntity extends Entity implements LavaAffine { "fall", "canAddPassenger" }, - at = @At(value = "FIELD", target = "net/minecraft/tag/FluidTags.WATER:Lnet/minecraft/registry/tag/TagKey;", opcode = Opcodes.GETSTATIC) + at = @At(value = "FIELD", target = "net/minecraft/registry/tag/FluidTags.WATER:Lnet/minecraft/registry/tag/TagKey;", opcode = Opcodes.GETSTATIC) ) private TagKey redirectFluidTag() { return isLavaAffine() ? FluidTags.LAVA : FluidTags.WATER; diff --git a/src/main/java/com/minelittlepony/unicopia/mixin/MixinCriteria.java b/src/main/java/com/minelittlepony/unicopia/mixin/MixinCriteria.java deleted file mode 100644 index 33fdb976..00000000 --- a/src/main/java/com/minelittlepony/unicopia/mixin/MixinCriteria.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.minelittlepony.unicopia.mixin; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; - -import net.minecraft.advancement.criterion.Criteria; -import net.minecraft.advancement.criterion.Criterion; - -@Mixin(Criteria.class) -public interface MixinCriteria { - @Invoker("register") - static > T register(T object) { - return null; - } -} diff --git a/src/main/resources/unicopia.mixin.json b/src/main/resources/unicopia.mixin.json index f8cfe9bd..4852c64c 100644 --- a/src/main/resources/unicopia.mixin.json +++ b/src/main/resources/unicopia.mixin.json @@ -10,7 +10,6 @@ "MixinBlockItem", "MixinBoatEntity", "MixinBrain", - "MixinCriteria", "MixinDamageSource", "MixinEntity", "MixinFallingBlock",