PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-24 05:47:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add support for inserting itemstacks into chapters

Browse source
This commit is contained in:
Sollace 2022-09-06 11:38:48 +02:00
parent 7adc49e951
commit 4b474e55af
1 changed files with 33 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/main/java/com/minelittlepony/unicopia/container/PageElement.java
View file

@ -7,6 +7,7 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.minelittlepony.common.client.gui.IViewRoot; import com.minelittlepony.common.client.gui.IViewRoot;
import com.minelittlepony.common.client.gui.dimension.Bounds; import com.minelittlepony.common.client.gui.dimension.Bounds;
import com.minelittlepony.unicopia.ability.magic.spell.crafting.IngredientWithSpell;
import com.minelittlepony.unicopia.ability.magic.spell.crafting.SpellbookRecipe; import com.minelittlepony.unicopia.ability.magic.spell.crafting.SpellbookRecipe;
import com.minelittlepony.unicopia.container.SpellbookChapterList.Drawable; import com.minelittlepony.unicopia.container.SpellbookChapterList.Drawable;
import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.entity.player.Pony;
@ -21,9 +22,16 @@ import net.minecraft.text.Text;
import net.minecraft.util.*; import net.minecraft.util.*;
interface PageElement extends Drawable { interface PageElement extends Drawable {
@Override
default void draw(MatrixStack matrices, int mouseX, int mouseY, IViewRoot container) {
}
Bounds bounds(); Bounds bounds();
Flow flow(); default Flow flow() {
return Flow.NONE;
}
default boolean isInline() { default boolean isInline() {
return flow() == Flow.NONE; return flow() == Flow.NONE;
@ -44,21 +52,30 @@ interface PageElement extends Drawable {
if (el.has("texture")) { if (el.has("texture")) {
return new Image( return new Image(
new Identifier(JsonHelper.getString(el, "texture")), new Identifier(JsonHelper.getString(el, "texture")),
new Bounds( boundsFromJson(el),
JsonHelper.getInt(el, "y", 0),
JsonHelper.getInt(el, "x", 0),
JsonHelper.getInt(el, "width", 0),
JsonHelper.getInt(el, "height", 0)
),
Flow.valueOf(JsonHelper.getString(el, "flow", "RIGHT")) Flow.valueOf(JsonHelper.getString(el, "flow", "RIGHT"))
); );
} }
if (el.has("recipe")) { if (el.has("recipe")) {
return new Recipe(page, new Identifier(JsonHelper.getString(el, "recipe")), new Bounds(0, 0, 0, 0)); return new Recipe(page, new Identifier(JsonHelper.getString(el, "recipe")), new Bounds(0, 0, 0, 0));
} }
if (el.has("item")) {
return new Stack(page, IngredientWithSpell.fromJson(el.get("item")), boundsFromJson(el));
}
return new TextBlock(page, Text.Serializer.fromJson(element)); return new TextBlock(page, Text.Serializer.fromJson(element));
} }
private static Bounds boundsFromJson(JsonObject el) {
return new Bounds(
JsonHelper.getInt(el, "y", 0),
JsonHelper.getInt(el, "x", 0),
JsonHelper.getInt(el, "width", 0),
JsonHelper.getInt(el, "height", 0)
);
}
record Image( record Image(
Identifier texture, Identifier texture,
Bounds bounds, Bounds bounds,
@ -101,7 +118,7 @@ interface PageElement extends Drawable {
boolean needsMoreXp = page.getLevel() < 0 || Pony.of(MinecraftClient.getInstance().player).getLevel().get() < page.getLevel(); boolean needsMoreXp = page.getLevel() < 0 || Pony.of(MinecraftClient.getInstance().player).getLevel().get() < page.getLevel();
matrices.push(); matrices.push();
wrappedText.forEach(line -> { wrappedText.forEach(line -> {
font.draw(matrices, needsMoreXp ? line.text().copy().formatted(Formatting.OBFUSCATED) : line.text(), line.x(), 0, 0); font.draw(matrices, needsMoreXp ? line.text().copy().formatted(Formatting.OBFUSCATED) : line.text().copy(), line.x(), 0, 0);
matrices.translate(0, font.fontHeight, 0); matrices.translate(0, font.fontHeight, 0);
}); });
matrices.pop(); matrices.pop();
@ -121,11 +138,6 @@ interface PageElement extends Drawable {
} }
record Recipe (DynamicContent.Page page, Identifier id, Bounds bounds) implements PageElement { record Recipe (DynamicContent.Page page, Identifier id, Bounds bounds) implements PageElement {
@Override
public void draw(MatrixStack matrices, int mouseX, int mouseY, IViewRoot container) {
}
@Override @Override
public void compile(int y, IViewRoot container) { public void compile(int y, IViewRoot container) {
if (container instanceof SpellbookScreen book) { if (container instanceof SpellbookScreen book) {
@ -142,10 +154,16 @@ interface PageElement extends Drawable {
} }
}); });
} }
}
record Stack (DynamicContent.Page page, IngredientWithSpell ingredient, Bounds bounds) implements PageElement {
@Override @Override
public Flow flow() { public void compile(int y, IViewRoot container) {
return Flow.NONE; IngredientTree tree = new IngredientTree(
bounds().left + page().getBounds().left,
bounds().top + page().getBounds().top + y + 10, 30, 20);
tree.input(ingredient.getMatchingStacks());
bounds.height = tree.build(container) - 10;
} }
} }