From 0f90593a9a03a6f110ec73ddd0a74272308b7ccd Mon Sep 17 00:00:00 2001 From: Sollace Date: Sat, 10 Sep 2022 22:13:56 +0200 Subject: [PATCH] Move spellbook gui related code to the correct package --- .../com/minelittlepony/unicopia/client/UnicopiaClient.java | 2 ++ .../{container => client/gui}/ParagraphWrappingVisitor.java | 6 +++--- .../{container => client/gui/spellbook}/DynamicContent.java | 6 +++--- .../{container => client/gui/spellbook}/IngredientTree.java | 2 +- .../{container => client/gui/spellbook}/PageElement.java | 5 +++-- .../gui/spellbook}/SpellbookChapterList.java | 2 +- .../gui/spellbook}/SpellbookChapterLoader.java | 4 ++-- .../gui/spellbook}/SpellbookCraftingPageContent.java | 3 ++- .../gui/spellbook}/SpellbookProfilePageContent.java | 3 ++- .../gui/spellbook}/SpellbookScreen.java | 6 ++++-- .../gui/spellbook}/SpellbookTabBar.java | 6 +++--- .../gui/spellbook}/SpellbookTraitDexPageContent.java | 4 ++-- 12 files changed, 28 insertions(+), 21 deletions(-) rename src/main/java/com/minelittlepony/unicopia/{container => client/gui}/ParagraphWrappingVisitor.java (93%) rename src/main/java/com/minelittlepony/unicopia/{container => client/gui/spellbook}/DynamicContent.java (96%) rename src/main/java/com/minelittlepony/unicopia/{container => client/gui/spellbook}/IngredientTree.java (99%) rename src/main/java/com/minelittlepony/unicopia/{container => client/gui/spellbook}/PageElement.java (96%) rename src/main/java/com/minelittlepony/unicopia/{container => client/gui/spellbook}/SpellbookChapterList.java (98%) rename src/main/java/com/minelittlepony/unicopia/{container => client/gui/spellbook}/SpellbookChapterLoader.java (95%) rename src/main/java/com/minelittlepony/unicopia/{container => client/gui/spellbook}/SpellbookCraftingPageContent.java (97%) rename src/main/java/com/minelittlepony/unicopia/{container => client/gui/spellbook}/SpellbookProfilePageContent.java (97%) rename src/main/java/com/minelittlepony/unicopia/{container => client/gui/spellbook}/SpellbookScreen.java (97%) rename src/main/java/com/minelittlepony/unicopia/{container => client/gui/spellbook}/SpellbookTabBar.java (90%) rename src/main/java/com/minelittlepony/unicopia/{container => client/gui/spellbook}/SpellbookTraitDexPageContent.java (98%) diff --git a/src/main/java/com/minelittlepony/unicopia/client/UnicopiaClient.java b/src/main/java/com/minelittlepony/unicopia/client/UnicopiaClient.java index 61e9a004..abc5678c 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/UnicopiaClient.java +++ b/src/main/java/com/minelittlepony/unicopia/client/UnicopiaClient.java @@ -10,6 +10,8 @@ import com.minelittlepony.unicopia.Race; import com.minelittlepony.unicopia.Unicopia; import com.minelittlepony.unicopia.client.gui.LanSettingsScreen; 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.container.*; import com.minelittlepony.unicopia.entity.player.PlayerCamera; diff --git a/src/main/java/com/minelittlepony/unicopia/container/ParagraphWrappingVisitor.java b/src/main/java/com/minelittlepony/unicopia/client/gui/ParagraphWrappingVisitor.java similarity index 93% rename from src/main/java/com/minelittlepony/unicopia/container/ParagraphWrappingVisitor.java rename to src/main/java/com/minelittlepony/unicopia/client/gui/ParagraphWrappingVisitor.java index 27414a37..9051dbf5 100644 --- a/src/main/java/com/minelittlepony/unicopia/container/ParagraphWrappingVisitor.java +++ b/src/main/java/com/minelittlepony/unicopia/client/gui/ParagraphWrappingVisitor.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.container; +package com.minelittlepony.unicopia.client.gui; import java.util.*; import java.util.function.BiConsumer; @@ -10,7 +10,7 @@ import net.minecraft.client.font.TextRenderer; import net.minecraft.text.*; import net.minecraft.text.StringVisitable.StyledVisitor; -class ParagraphWrappingVisitor implements StyledVisitor { +public class ParagraphWrappingVisitor implements StyledVisitor { private int line = 0; private int pageWidth; @@ -24,7 +24,7 @@ class ParagraphWrappingVisitor implements StyledVisitor { private final Int2IntFunction widthSupplier; private final BiConsumer lineConsumer; - ParagraphWrappingVisitor(Int2IntFunction widthSupplier, BiConsumer lineConsumer) { + public ParagraphWrappingVisitor(Int2IntFunction widthSupplier, BiConsumer lineConsumer) { this.widthSupplier = widthSupplier; this.lineConsumer = lineConsumer; pageWidth = widthSupplier.applyAsInt((line) * font.fontHeight); diff --git a/src/main/java/com/minelittlepony/unicopia/container/DynamicContent.java b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/DynamicContent.java similarity index 96% rename from src/main/java/com/minelittlepony/unicopia/container/DynamicContent.java rename to src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/DynamicContent.java index 57b92d97..27f06868 100644 --- a/src/main/java/com/minelittlepony/unicopia/container/DynamicContent.java +++ b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/DynamicContent.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.container; +package com.minelittlepony.unicopia.client.gui.spellbook; import java.util.*; @@ -6,8 +6,8 @@ import com.google.gson.*; import com.minelittlepony.common.client.gui.IViewRoot; import com.minelittlepony.common.client.gui.dimension.Bounds; import com.minelittlepony.unicopia.client.gui.DrawableUtil; -import com.minelittlepony.unicopia.container.SpellbookChapterList.Content; -import com.minelittlepony.unicopia.container.SpellbookChapterList.Drawable; +import com.minelittlepony.unicopia.client.gui.spellbook.SpellbookChapterList.Content; +import com.minelittlepony.unicopia.client.gui.spellbook.SpellbookChapterList.Drawable; import com.minelittlepony.unicopia.entity.player.Pony; import net.minecraft.client.MinecraftClient; import net.minecraft.client.util.math.MatrixStack; diff --git a/src/main/java/com/minelittlepony/unicopia/container/IngredientTree.java b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/IngredientTree.java similarity index 99% rename from src/main/java/com/minelittlepony/unicopia/container/IngredientTree.java rename to src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/IngredientTree.java index 2b8d50d2..0af857d5 100644 --- a/src/main/java/com/minelittlepony/unicopia/container/IngredientTree.java +++ b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/IngredientTree.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.container; +package com.minelittlepony.unicopia.client.gui.spellbook; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/minelittlepony/unicopia/container/PageElement.java b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/PageElement.java similarity index 96% rename from src/main/java/com/minelittlepony/unicopia/container/PageElement.java rename to src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/PageElement.java index a006f1cb..57964bfc 100644 --- a/src/main/java/com/minelittlepony/unicopia/container/PageElement.java +++ b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/PageElement.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.container; +package com.minelittlepony.unicopia.client.gui.spellbook; import java.util.ArrayList; 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.unicopia.ability.magic.spell.crafting.IngredientWithSpell; 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.mojang.blaze3d.systems.RenderSystem; diff --git a/src/main/java/com/minelittlepony/unicopia/container/SpellbookChapterList.java b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookChapterList.java similarity index 98% rename from src/main/java/com/minelittlepony/unicopia/container/SpellbookChapterList.java rename to src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookChapterList.java index 54037fbe..71abaf26 100644 --- a/src/main/java/com/minelittlepony/unicopia/container/SpellbookChapterList.java +++ b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookChapterList.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.container; +package com.minelittlepony.unicopia.client.gui.spellbook; import java.util.*; import java.util.function.Consumer; diff --git a/src/main/java/com/minelittlepony/unicopia/container/SpellbookChapterLoader.java b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookChapterLoader.java similarity index 95% rename from src/main/java/com/minelittlepony/unicopia/container/SpellbookChapterLoader.java rename to src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookChapterLoader.java index 19d6458b..aa932184 100644 --- a/src/main/java/com/minelittlepony/unicopia/container/SpellbookChapterLoader.java +++ b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookChapterLoader.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.container; +package com.minelittlepony.unicopia.client.gui.spellbook; import java.util.*; import java.util.concurrent.*; @@ -8,7 +8,7 @@ import org.slf4j.Logger; import com.google.gson.*; 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.mojang.logging.LogUtils; diff --git a/src/main/java/com/minelittlepony/unicopia/container/SpellbookCraftingPageContent.java b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookCraftingPageContent.java similarity index 97% rename from src/main/java/com/minelittlepony/unicopia/container/SpellbookCraftingPageContent.java rename to src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookCraftingPageContent.java index 7aee5349..c2b3de79 100644 --- a/src/main/java/com/minelittlepony/unicopia/container/SpellbookCraftingPageContent.java +++ b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookCraftingPageContent.java @@ -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.ScrollContainer; import com.minelittlepony.common.client.gui.element.Label; import com.minelittlepony.unicopia.ability.magic.spell.crafting.SpellbookRecipe; import com.minelittlepony.unicopia.client.gui.DrawableUtil; +import com.minelittlepony.unicopia.container.SpellbookPage; import com.minelittlepony.unicopia.item.URecipes; import com.mojang.blaze3d.systems.RenderSystem; diff --git a/src/main/java/com/minelittlepony/unicopia/container/SpellbookProfilePageContent.java b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookProfilePageContent.java similarity index 97% rename from src/main/java/com/minelittlepony/unicopia/container/SpellbookProfilePageContent.java rename to src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookProfilePageContent.java index 26b72be8..5965a9d4 100644 --- a/src/main/java/com/minelittlepony/unicopia/container/SpellbookProfilePageContent.java +++ b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookProfilePageContent.java @@ -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.dimension.Bounds; import com.minelittlepony.unicopia.Unicopia; import com.minelittlepony.unicopia.client.gui.DrawableUtil; +import com.minelittlepony.unicopia.container.SpellbookPage; import com.minelittlepony.unicopia.entity.player.*; import com.mojang.blaze3d.systems.RenderSystem; diff --git a/src/main/java/com/minelittlepony/unicopia/container/SpellbookScreen.java b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookScreen.java similarity index 97% rename from src/main/java/com/minelittlepony/unicopia/container/SpellbookScreen.java rename to src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookScreen.java index 6796acd0..69fd85b9 100644 --- a/src/main/java/com/minelittlepony/unicopia/container/SpellbookScreen.java +++ b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookScreen.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.container; +package com.minelittlepony.unicopia.client.gui.spellbook; import java.util.Optional; 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.sprite.TextureSprite; 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.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; diff --git a/src/main/java/com/minelittlepony/unicopia/container/SpellbookTabBar.java b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookTabBar.java similarity index 90% rename from src/main/java/com/minelittlepony/unicopia/container/SpellbookTabBar.java rename to src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookTabBar.java index 78670771..cd98517d 100644 --- a/src/main/java/com/minelittlepony/unicopia/container/SpellbookTabBar.java +++ b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookTabBar.java @@ -1,11 +1,11 @@ -package com.minelittlepony.unicopia.container; +package com.minelittlepony.unicopia.client.gui.spellbook; import java.util.*; import java.util.stream.Stream; import com.minelittlepony.common.client.gui.dimension.Bounds; -import com.minelittlepony.unicopia.container.SpellbookChapterList.Chapter; -import com.minelittlepony.unicopia.container.SpellbookChapterList.TabSide; +import com.minelittlepony.unicopia.client.gui.spellbook.SpellbookChapterList.Chapter; +import com.minelittlepony.unicopia.client.gui.spellbook.SpellbookChapterList.TabSide; import net.minecraft.util.Identifier; diff --git a/src/main/java/com/minelittlepony/unicopia/container/SpellbookTraitDexPageContent.java b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookTraitDexPageContent.java similarity index 98% rename from src/main/java/com/minelittlepony/unicopia/container/SpellbookTraitDexPageContent.java rename to src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookTraitDexPageContent.java index a22b7ead..01bda5b3 100644 --- a/src/main/java/com/minelittlepony/unicopia/container/SpellbookTraitDexPageContent.java +++ b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookTraitDexPageContent.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.container; +package com.minelittlepony.unicopia.client.gui.spellbook; import java.util.Comparator; 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.sprite.TextureSprite; 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.mojang.blaze3d.systems.RenderSystem;