PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-01 03:26:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Post-Port fixes

Browse source
This commit is contained in:
Sollace 2022-12-19 07:50:37 +00:00
parent 002b33081e
commit 026c9ce152
6 changed files with 8 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/com/minelittlepony/unicopia/advancement/UCriteria.java
View file

@ -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 extends Criterion<?>> T register(T obj) {
return MixinCriteria.register(obj);
}
static void bootstrap() { }
}

1
src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/EquippedSpellSlot.java
View file

@ -56,7 +56,6 @@ public class EquippedSpellSlot extends Button {
}
if (isHovered()) {
HandledScreen.drawSlotHighlight(matrices, getX(), getY(), 0);
this.onPress();
}
}

22
src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/IngredientTree.java
View file

@ -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,
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<Text> lines = tooltip.getLines();
if (!lines.isEmpty()) {
parent.renderTooltip(matrices, tooltip.getLines(), mouseX + getStyle().toolTipX, mouseY + getStyle().toolTipY);
}
});
}
entry.render(matrices, getX(), getY(), tickDelta);
}
}

2
src/main/java/com/minelittlepony/unicopia/mixin/MixinBoatEntity.java
View file

@ -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;

15
src/main/java/com/minelittlepony/unicopia/mixin/MixinCriteria.java
View file

@ -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;
}
}

1
src/main/resources/unicopia.mixin.json
View file

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