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

Move spellbook gui related code to the correct package

Browse source
This commit is contained in:
Sollace 2022-09-10 22:13:56 +02:00
parent bfe5f2e3b9
commit 0f90593a9a
12 changed files with 28 additions and 21 deletions

2
src/main/java/com/minelittlepony/unicopia/client/UnicopiaClient.java
View file

@ -10,6 +10,8 @@ import com.minelittlepony.unicopia.Race;
import com.minelittlepony.unicopia.Unicopia; import com.minelittlepony.unicopia.Unicopia;
import com.minelittlepony.unicopia.client.gui.LanSettingsScreen; import com.minelittlepony.unicopia.client.gui.LanSettingsScreen;
import com.minelittlepony.unicopia.client.gui.UHud; import com.minelittlepony.unicopia.client.gui.UHud;
import com.minelittlepony.unicopia.client.gui.spellbook.SpellbookChapterLoader;
import com.minelittlepony.unicopia.client.gui.spellbook.SpellbookScreen;
import com.minelittlepony.unicopia.client.minelittlepony.MineLPConnector; import com.minelittlepony.unicopia.client.minelittlepony.MineLPConnector;
import com.minelittlepony.unicopia.container.*; import com.minelittlepony.unicopia.container.*;
import com.minelittlepony.unicopia.entity.player.PlayerCamera; import com.minelittlepony.unicopia.entity.player.PlayerCamera;

6
src/main/java/com/minelittlepony/unicopia/container/ParagraphWrappingVisitor.java → src/main/java/com/minelittlepony/unicopia/client/gui/ParagraphWrappingVisitor.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia.container; package com.minelittlepony.unicopia.client.gui;
import java.util.*; import java.util.*;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
@ -10,7 +10,7 @@ import net.minecraft.client.font.TextRenderer;
import net.minecraft.text.*; import net.minecraft.text.*;
import net.minecraft.text.StringVisitable.StyledVisitor; import net.minecraft.text.StringVisitable.StyledVisitor;
class ParagraphWrappingVisitor implements StyledVisitor<Object> { public class ParagraphWrappingVisitor implements StyledVisitor<Object> {
private int line = 0; private int line = 0;
private int pageWidth; private int pageWidth;
@ -24,7 +24,7 @@ class ParagraphWrappingVisitor implements StyledVisitor<Object> {
private final Int2IntFunction widthSupplier; private final Int2IntFunction widthSupplier;
private final BiConsumer<Text, Integer> lineConsumer; private final BiConsumer<Text, Integer> lineConsumer;
ParagraphWrappingVisitor(Int2IntFunction widthSupplier, BiConsumer<Text, Integer> lineConsumer) { public ParagraphWrappingVisitor(Int2IntFunction widthSupplier, BiConsumer<Text, Integer> lineConsumer) {
this.widthSupplier = widthSupplier; this.widthSupplier = widthSupplier;
this.lineConsumer = lineConsumer; this.lineConsumer = lineConsumer;
pageWidth = widthSupplier.applyAsInt((line) * font.fontHeight); pageWidth = widthSupplier.applyAsInt((line) * font.fontHeight);

6
src/main/java/com/minelittlepony/unicopia/container/DynamicContent.java → src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/DynamicContent.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia.container; package com.minelittlepony.unicopia.client.gui.spellbook;
import java.util.*; import java.util.*;
@ -6,8 +6,8 @@ import com.google.gson.*;
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.client.gui.DrawableUtil; import com.minelittlepony.unicopia.client.gui.DrawableUtil;
import com.minelittlepony.unicopia.container.SpellbookChapterList.Content; import com.minelittlepony.unicopia.client.gui.spellbook.SpellbookChapterList.Content;
import com.minelittlepony.unicopia.container.SpellbookChapterList.Drawable; import com.minelittlepony.unicopia.client.gui.spellbook.SpellbookChapterList.Drawable;
import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.entity.player.Pony;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;

2
src/main/java/com/minelittlepony/unicopia/container/IngredientTree.java → src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/IngredientTree.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia.container; package com.minelittlepony.unicopia.client.gui.spellbook;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

5
src/main/java/com/minelittlepony/unicopia/container/PageElement.java → src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/PageElement.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia.container; package com.minelittlepony.unicopia.client.gui.spellbook;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -9,7 +9,8 @@ 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.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.client.gui.ParagraphWrappingVisitor;
import com.minelittlepony.unicopia.client.gui.spellbook.SpellbookChapterList.Drawable;
import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.entity.player.Pony;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;

2
src/main/java/com/minelittlepony/unicopia/container/SpellbookChapterList.java → src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookChapterList.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia.container; package com.minelittlepony.unicopia.client.gui.spellbook;
import java.util.*; import java.util.*;
import java.util.function.Consumer; import java.util.function.Consumer;

4
src/main/java/com/minelittlepony/unicopia/container/SpellbookChapterLoader.java → src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookChapterLoader.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia.container; package com.minelittlepony.unicopia.client.gui.spellbook;
import java.util.*; import java.util.*;
import java.util.concurrent.*; import java.util.concurrent.*;
@ -8,7 +8,7 @@ import org.slf4j.Logger;
import com.google.gson.*; import com.google.gson.*;
import com.minelittlepony.unicopia.Unicopia; import com.minelittlepony.unicopia.Unicopia;
import com.minelittlepony.unicopia.container.SpellbookChapterList.*; import com.minelittlepony.unicopia.client.gui.spellbook.SpellbookChapterList.*;
import com.minelittlepony.unicopia.util.Resources; import com.minelittlepony.unicopia.util.Resources;
import com.mojang.logging.LogUtils; import com.mojang.logging.LogUtils;

3
src/main/java/com/minelittlepony/unicopia/container/SpellbookCraftingPageContent.java → src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookCraftingPageContent.java
View file

@ -1,10 +1,11 @@
package com.minelittlepony.unicopia.container; package com.minelittlepony.unicopia.client.gui.spellbook;
import com.minelittlepony.common.client.gui.IViewRoot; import com.minelittlepony.common.client.gui.IViewRoot;
import com.minelittlepony.common.client.gui.ScrollContainer; import com.minelittlepony.common.client.gui.ScrollContainer;
import com.minelittlepony.common.client.gui.element.Label; import com.minelittlepony.common.client.gui.element.Label;
import com.minelittlepony.unicopia.ability.magic.spell.crafting.SpellbookRecipe; import com.minelittlepony.unicopia.ability.magic.spell.crafting.SpellbookRecipe;
import com.minelittlepony.unicopia.client.gui.DrawableUtil; import com.minelittlepony.unicopia.client.gui.DrawableUtil;
import com.minelittlepony.unicopia.container.SpellbookPage;
import com.minelittlepony.unicopia.item.URecipes; import com.minelittlepony.unicopia.item.URecipes;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;

3
src/main/java/com/minelittlepony/unicopia/container/SpellbookProfilePageContent.java → src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookProfilePageContent.java
View file

@ -1,9 +1,10 @@
package com.minelittlepony.unicopia.container; package com.minelittlepony.unicopia.client.gui.spellbook;
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.Unicopia; import com.minelittlepony.unicopia.Unicopia;
import com.minelittlepony.unicopia.client.gui.DrawableUtil; import com.minelittlepony.unicopia.client.gui.DrawableUtil;
import com.minelittlepony.unicopia.container.SpellbookPage;
import com.minelittlepony.unicopia.entity.player.*; import com.minelittlepony.unicopia.entity.player.*;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;

6
src/main/java/com/minelittlepony/unicopia/container/SpellbookScreen.java → src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookScreen.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia.container; package com.minelittlepony.unicopia.client.gui.spellbook;
import java.util.Optional; import java.util.Optional;
import java.util.function.IntConsumer; import java.util.function.IntConsumer;
@ -9,7 +9,9 @@ import com.minelittlepony.common.client.gui.dimension.Bounds;
import com.minelittlepony.common.client.gui.element.Button; import com.minelittlepony.common.client.gui.element.Button;
import com.minelittlepony.common.client.gui.sprite.TextureSprite; import com.minelittlepony.common.client.gui.sprite.TextureSprite;
import com.minelittlepony.unicopia.Unicopia; import com.minelittlepony.unicopia.Unicopia;
import com.minelittlepony.unicopia.container.SpellbookChapterList.*; import com.minelittlepony.unicopia.client.gui.spellbook.SpellbookChapterList.*;
import com.minelittlepony.unicopia.container.SpellbookPage;
import com.minelittlepony.unicopia.container.SpellbookScreenHandler;
import com.minelittlepony.unicopia.container.SpellbookScreenHandler.*; import com.minelittlepony.unicopia.container.SpellbookScreenHandler.*;
import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;

6
src/main/java/com/minelittlepony/unicopia/container/SpellbookTabBar.java → src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookTabBar.java
View file

@ -1,11 +1,11 @@
package com.minelittlepony.unicopia.container; package com.minelittlepony.unicopia.client.gui.spellbook;
import java.util.*; import java.util.*;
import java.util.stream.Stream; import java.util.stream.Stream;
import com.minelittlepony.common.client.gui.dimension.Bounds; import com.minelittlepony.common.client.gui.dimension.Bounds;
import com.minelittlepony.unicopia.container.SpellbookChapterList.Chapter; import com.minelittlepony.unicopia.client.gui.spellbook.SpellbookChapterList.Chapter;
import com.minelittlepony.unicopia.container.SpellbookChapterList.TabSide; import com.minelittlepony.unicopia.client.gui.spellbook.SpellbookChapterList.TabSide;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;

4
src/main/java/com/minelittlepony/unicopia/container/SpellbookTraitDexPageContent.java → src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookTraitDexPageContent.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia.container; package com.minelittlepony.unicopia.client.gui.spellbook;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
@ -9,7 +9,7 @@ import com.minelittlepony.common.client.gui.element.Button;
import com.minelittlepony.common.client.gui.element.Label; import com.minelittlepony.common.client.gui.element.Label;
import com.minelittlepony.common.client.gui.sprite.TextureSprite; import com.minelittlepony.common.client.gui.sprite.TextureSprite;
import com.minelittlepony.unicopia.ability.magic.spell.trait.*; import com.minelittlepony.unicopia.ability.magic.spell.trait.*;
import com.minelittlepony.unicopia.container.SpellbookScreen.ImageButton; import com.minelittlepony.unicopia.client.gui.spellbook.SpellbookScreen.ImageButton;
import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.entity.player.Pony;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;