Skip to content

Commit

Permalink
Fix backport issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Pyrofab committed Jun 15, 2024
1 parent ab24ae3 commit d753584
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ fpa = "0.2-SNAPSHOT"
mcAnnotations = "1.0"
modmenu = "7.2.2"
rei = "12.0.684"
jei = "xGApC30U" # 17.3.0.52
jei = "YJUbK8W6" # 15.3.0.6

[libraries]
cca-base = { module = "dev.onyxstudios.cardinal-components-api:cardinal-components-base", version.ref = "cca" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import net.minecraft.entity.LivingEntity;
import net.minecraft.world.World;
import org.jetbrains.annotations.Nullable;
import org.joml.Matrix4f;
import org.joml.Quaternionf;
import org.joml.Vector3f;
import org.ladysnake.blabber.api.client.illustration.DialogueIllustrationRenderer;
Expand Down Expand Up @@ -79,8 +80,8 @@ public static void drawEntity(DrawContext context, int x1, int y1, int x2, int y
float g = (float)(x1 + x2) / 2.0F;
float h = (float)(y1 + y2) / 2.0F;
context.enableScissor(x1, y1, x2, y2);
float i = (float)Math.atan((double)((g - mouseX) / 40.0F));
float j = (float)Math.atan((double)((h - mouseY) / 40.0F));
float i = (float)Math.atan((g - mouseX) / 40.0F);
float j = (float)Math.atan((h - mouseY) / 40.0F);
Quaternionf quaternionf = (new Quaternionf()).rotateZ(3.1415927F);
Quaternionf quaternionf2 = (new Quaternionf()).rotateX(j * 20.0F * 0.017453292F);
quaternionf.mul(quaternionf2);
Expand Down Expand Up @@ -108,8 +109,8 @@ public static void drawEntity(DrawContext context, int x1, int y1, int x2, int y

public static void drawEntity(DrawContext context, float x, float y, float size, Vector3f vector3f, Quaternionf quaternionf, @Nullable Quaternionf quaternionf2, LivingEntity entity) {
context.getMatrices().push();
context.getMatrices().translate((double)x, (double)y, 50.0);
context.getMatrices().scale(size, size, -size);
context.getMatrices().translate(x, y, 50.0);
context.getMatrices().multiplyPositionMatrix((new Matrix4f()).scaling(size, size, -size));
context.getMatrices().translate(vector3f.x, vector3f.y, vector3f.z);
context.getMatrices().multiply(quaternionf);
DiffuseLighting.method_34742();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.network.PacketByteBuf;
import net.minecraft.util.dynamic.Codecs;
import org.jetbrains.annotations.ApiStatus;
import org.ladysnake.blabber.impl.common.serialization.FailingOptionalFieldCodec;

import java.util.Optional;

@ApiStatus.Experimental
public record DefaultLayoutParams(Optional<Margins> mainTextMargins) implements DialogueLayout.Params {
public static final DefaultLayoutParams DEFAULT = new DefaultLayoutParams(Optional.empty());
public static final Codec<DefaultLayoutParams> CODEC = RecordCodecBuilder.create(instance -> instance.group(
Codecs.createStrictOptionalFieldCodec(Margins.CODEC, "main_text_margins").forGetter(DefaultLayoutParams::mainTextMargins)
FailingOptionalFieldCodec.of(Margins.CODEC, "main_text_margins").forGetter(DefaultLayoutParams::mainTextMargins)
).apply(instance, DefaultLayoutParams::new));

public DefaultLayoutParams(PacketByteBuf buf) {
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/org/ladysnake/blabber/api/layout/Margins.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.network.PacketByteBuf;
import net.minecraft.util.dynamic.Codecs;
import org.ladysnake.blabber.impl.common.serialization.FailingOptionalFieldCodec;

public record Margins(int top, int right, int bottom, int left) {
public static final Codec<Margins> CODEC = RecordCodecBuilder.create(instance -> instance.group(
Codecs.createStrictOptionalFieldCodec(Codec.INT, "top", 0).forGetter(Margins::top),
Codecs.createStrictOptionalFieldCodec(Codec.INT, "right", 0).forGetter(Margins::right),
Codecs.createStrictOptionalFieldCodec(Codec.INT, "bottom", 0).forGetter(Margins::bottom),
Codecs.createStrictOptionalFieldCodec(Codec.INT, "left", 0).forGetter(Margins::left)
FailingOptionalFieldCodec.of(Codec.INT, "top", 0).forGetter(Margins::top),
FailingOptionalFieldCodec.of(Codec.INT, "right", 0).forGetter(Margins::right),
FailingOptionalFieldCodec.of(Codec.INT, "bottom", 0).forGetter(Margins::bottom),
FailingOptionalFieldCodec.of(Codec.INT, "left", 0).forGetter(Margins::left)
).apply(instance, Margins::new));
public static final Margins NONE = new Margins(0, 0, 0, 0);

Expand Down

0 comments on commit d753584

Please sign in to comment.