Post-Port fixes

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.Criteria;
-
-import net.minecraft.advancement.criterion.Criterion;
 
 public interface UCriteria {
-    CustomEventCriterion CUSTOM_EVENT = register(new CustomEventCriterion());
+    CustomEventCriterion CUSTOM_EVENT = Criteria.register(new CustomEventCriterion());
-    RaceChangeCriterion PLAYER_CHANGE_RACE = register(new RaceChangeCriterion());
+    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 extends Criterion<?>> T register(T obj) {
-        return MixinCriteria.register(obj);
-    }
-
     static void bootstrap() { }
 }

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();
         }
     }
 

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<IngredientTree.Entry> 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,
+                    getX() - MinecraftClient.getInstance().textRenderer.getWidth(label) / 2 - 3,
-                    y + 4,
+                    getY() + 4,
                     0
             );
-            entry.render(matrices, x, y, tickDelta);
+            entry.render(matrices, getX(), getY(), tickDelta);
-        }
-
-        @Override
-        public void renderToolTip(MatrixStack matrices, Screen parent, int mouseX, int mouseY) {
-            if (visible) {
-                getStyle().getTooltip().ifPresent(tooltip -> {
-                    List<Text> lines = tooltip.getLines();
-                    if (!lines.isEmpty()) {
-                        parent.renderTooltip(matrices, tooltip.getLines(), mouseX + getStyle().toolTipX, mouseY + getStyle().toolTipY);
-                    }
-                });
-            }
         }
     }
 

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<Fluid> redirectFluidTag() {
         return isLavaAffine() ? FluidTags.LAVA : FluidTags.WATER;

src/main/java/com/minelittlepony/unicopia/mixin/MixinCriteria.java

@@ -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 extends Criterion<?>> T register(T object) {
-        return null;
-    }
-}

src/main/resources/unicopia.mixin.json

@@ -10,7 +10,6 @@
     "MixinBlockItem",
     "MixinBoatEntity",
     "MixinBrain",
-    "MixinCriteria",
     "MixinDamageSource",
     "MixinEntity",
     "MixinFallingBlock",