From ef37bd39d26c13ec2406be714329464a4343e5db Mon Sep 17 00:00:00 2001 From: Marcel Konrad Date: Tue, 12 Nov 2019 18:35:05 +0100 Subject: [PATCH] Simplify project package structure --- .../worldhandler/usercontent/example/example.js | 2 +- .../java/exopandora/worldhandler/WorldHandler.java | 4 ++-- .../builder/component/impl/ComponentSummon.java | 2 +- .../builder/impl/BuilderAdvancement.java | 2 +- .../worldhandler/builder/impl/BuilderClone.java | 2 +- .../worldhandler/builder/impl/BuilderData.java | 2 +- .../builder/impl/BuilderDoubleBlockPos.java | 2 +- .../builder/impl/BuilderExperience.java | 2 +- .../worldhandler/builder/impl/BuilderFill.java | 4 ++-- .../worldhandler/builder/impl/BuilderGive.java | 2 +- .../worldhandler/builder/impl/BuilderRecipe.java | 2 +- .../builder/impl/BuilderScoreboardObjectives.java | 2 +- .../worldhandler/builder/impl/BuilderTrigger.java | 2 +- .../exopandora/worldhandler/command/CommandWH.java | 6 +++--- .../worldhandler/command/CommandWorldHandler.java | 4 ++-- .../worldhandler/event/ClientEventHandler.java | 4 ++-- .../exopandora/worldhandler/event/KeyHandler.java | 4 ++-- .../worldhandler/gui/button/GuiButtonBase.java | 4 ++-- .../worldhandler/gui/button/GuiButtonIcon.java | 2 +- .../worldhandler/gui/button/GuiButtonList.java | 2 +- .../worldhandler/gui/button/GuiSlider.java | 2 +- .../{logic => button}/LogicSliderAttribute.java | 2 +- .../gui/{logic => button}/LogicSliderSimple.java | 2 +- .../worldhandler/gui/category/Category.java | 2 +- .../gui/container/impl/GuiWorldHandler.java | 4 ++-- .../worldhandler/gui/content/Content.java | 2 +- .../gui/content/impl/ContentAdvancements.java | 10 +++++----- .../gui/content/impl/ContentButcher.java | 4 ++-- .../gui/content/impl/ContentButcherSettings.java | 4 ++-- .../gui/content/impl/ContentChangeWorld.java | 2 +- .../gui/content/impl/ContentContainers.java | 6 +++--- .../gui/content/impl/ContentContinue.java | 4 ++-- .../gui/content/impl/ContentCustomItem.java | 12 ++++++------ .../gui/content/impl/ContentEditBlocks.java | 10 +++++----- .../gui/content/impl/ContentEnchantment.java | 8 ++++---- .../gui/content/impl/ContentExperience.java | 6 +++--- .../gui/content/impl/ContentGamerules.java | 6 +++--- .../worldhandler/gui/content/impl/ContentMain.java | 2 +- .../gui/content/impl/ContentMultiplayer.java | 4 ++-- .../gui/content/impl/ContentNoteEditor.java | 6 +++--- .../gui/content/impl/ContentPlayer.java | 2 +- .../gui/content/impl/ContentPotions.java | 8 ++++---- .../gui/content/impl/ContentRecipes.java | 6 +++--- .../gui/content/impl/ContentScoreboard.java | 2 +- .../content/impl/ContentScoreboardObjectives.java | 14 +++++++------- .../gui/content/impl/ContentScoreboardPlayers.java | 6 +++--- .../gui/content/impl/ContentScoreboardTeams.java | 10 +++++----- .../gui/content/impl/ContentSettings.java | 4 ++-- .../gui/content/impl/ContentSignEditor.java | 8 ++++---- .../gui/content/impl/ContentSummon.java | 10 +++++----- .../gui/content/impl/ContentWorldInfo.java | 2 +- .../impl/ILogicButtonList.java} | 5 +++-- .../gui/{logic => menu/impl}/ILogicColorMenu.java | 3 ++- .../gui/{logic => menu/impl}/ILogicMapped.java | 3 ++- .../gui/{logic => menu/impl}/ILogicPageList.java | 2 +- .../worldhandler/gui/menu/impl/MenuButtonList.java | 10 ++++------ .../worldhandler/gui/menu/impl/MenuColorField.java | 2 -- .../worldhandler/gui/menu/impl/MenuPageList.java | 1 - .../usercontent/UsercontentLoader.java | 2 +- .../usercontent/factory/ActionHandlerFactory.java | 4 ++-- .../usercontent/factory/ButtonFactory.java | 2 +- .../usercontent/factory/MenuFactory.java | 2 +- .../usercontent/factory/WidgetFactory.java | 2 +- .../{helper => util}/ActionHelper.java | 3 +-- .../{helper => util}/AdvancementHelper.java | 2 +- .../worldhandler/{helper => util}/BlockHelper.java | 2 +- .../{helper => util}/CommandHelper.java | 2 +- .../worldhandler/{helper => util}/EnumHelper.java | 2 +- .../worldhandler/{gui/logic => util}/ILogic.java | 2 +- .../worldhandler/{helper => util}/Node.java | 2 +- .../{helper => util}/RegistryHelper.java | 2 +- .../{helper => util}/ResourceHelper.java | 2 +- .../{helper => util}/ScoreboardHelper.java | 2 +- .../exopandora/worldhandler/util/UtilRender.java | 1 - 74 files changed, 141 insertions(+), 145 deletions(-) rename src/main/java/exopandora/worldhandler/gui/{logic => button}/LogicSliderAttribute.java (93%) rename src/main/java/exopandora/worldhandler/gui/{logic => button}/LogicSliderSimple.java (95%) rename src/main/java/exopandora/worldhandler/gui/{logic/ILogicClickList.java => menu/impl/ILogicButtonList.java} (75%) rename src/main/java/exopandora/worldhandler/gui/{logic => menu/impl}/ILogicColorMenu.java (79%) rename src/main/java/exopandora/worldhandler/gui/{logic => menu/impl}/ILogicMapped.java (84%) rename src/main/java/exopandora/worldhandler/gui/{logic => menu/impl}/ILogicPageList.java (90%) rename src/main/java/exopandora/worldhandler/{helper => util}/ActionHelper.java (98%) rename src/main/java/exopandora/worldhandler/{helper => util}/AdvancementHelper.java (98%) rename src/main/java/exopandora/worldhandler/{helper => util}/BlockHelper.java (99%) rename src/main/java/exopandora/worldhandler/{helper => util}/CommandHelper.java (97%) rename src/main/java/exopandora/worldhandler/{helper => util}/EnumHelper.java (90%) rename src/main/java/exopandora/worldhandler/{gui/logic => util}/ILogic.java (79%) rename src/main/java/exopandora/worldhandler/{helper => util}/Node.java (99%) rename src/main/java/exopandora/worldhandler/{helper => util}/RegistryHelper.java (98%) rename src/main/java/exopandora/worldhandler/{helper => util}/ResourceHelper.java (98%) rename src/main/java/exopandora/worldhandler/{helper => util}/ScoreboardHelper.java (98%) diff --git a/run/config/worldhandler/usercontent/example/example.js b/run/config/worldhandler/usercontent/example/example.js index df37718..e995177 100644 --- a/run/config/worldhandler/usercontent/example/example.js +++ b/run/config/worldhandler/usercontent/example/example.js @@ -1,4 +1,4 @@ -var ActionHelper = Java.type('exopandora.worldhandler.helper.ActionHelper'); +var ActionHelper = Java.type('exopandora.worldhandler.util.ActionHelper'); var visible = true; var enabled = true; diff --git a/src/main/java/exopandora/worldhandler/WorldHandler.java b/src/main/java/exopandora/worldhandler/WorldHandler.java index c24e212..096e57d 100644 --- a/src/main/java/exopandora/worldhandler/WorldHandler.java +++ b/src/main/java/exopandora/worldhandler/WorldHandler.java @@ -10,9 +10,9 @@ import exopandora.worldhandler.event.ClientEventHandler; import exopandora.worldhandler.event.KeyHandler; import exopandora.worldhandler.gui.category.Category; import exopandora.worldhandler.gui.content.Content; -import exopandora.worldhandler.helper.AdvancementHelper; -import exopandora.worldhandler.helper.CommandHelper; import exopandora.worldhandler.usercontent.UsercontentLoader; +import exopandora.worldhandler.util.AdvancementHelper; +import exopandora.worldhandler.util.CommandHelper; import net.minecraft.client.Minecraft; import net.minecraft.resources.SimpleReloadableResourceManager; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentSummon.java b/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentSummon.java index 52cf250..10f526d 100644 --- a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentSummon.java +++ b/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentSummon.java @@ -7,7 +7,7 @@ import javax.annotation.Nullable; import org.apache.commons.lang3.StringUtils; import exopandora.worldhandler.builder.component.IBuilderComponent; -import exopandora.worldhandler.helper.ResourceHelper; +import exopandora.worldhandler.util.ResourceHelper; import net.minecraft.client.resources.I18n; import net.minecraft.entity.EntityType; import net.minecraft.nbt.ByteNBT; diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderAdvancement.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderAdvancement.java index 1830b69..bf55bdc 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderAdvancement.java +++ b/src/main/java/exopandora/worldhandler/builder/impl/BuilderAdvancement.java @@ -5,7 +5,7 @@ import javax.annotation.Nullable; import exopandora.worldhandler.builder.CommandBuilder; import exopandora.worldhandler.builder.CommandSyntax; import exopandora.worldhandler.builder.types.ArgumentType; -import exopandora.worldhandler.helper.EnumHelper; +import exopandora.worldhandler.util.EnumHelper; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderClone.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderClone.java index ee4cde8..0d4cccf 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderClone.java +++ b/src/main/java/exopandora/worldhandler/builder/impl/BuilderClone.java @@ -4,9 +4,9 @@ import javax.annotation.Nullable; import exopandora.worldhandler.builder.CommandSyntax; import exopandora.worldhandler.builder.types.Coordinate.CoordinateType; +import exopandora.worldhandler.util.EnumHelper; import exopandora.worldhandler.builder.types.CoordinateInt; import exopandora.worldhandler.builder.types.ArgumentType; -import exopandora.worldhandler.helper.EnumHelper; import net.minecraft.util.math.BlockPos; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderData.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderData.java index 64b12ae..e71df2b 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderData.java +++ b/src/main/java/exopandora/worldhandler/builder/impl/BuilderData.java @@ -6,8 +6,8 @@ import javax.annotation.Nullable; import exopandora.worldhandler.builder.CommandSyntax; import exopandora.worldhandler.builder.types.CoordinateInt; import exopandora.worldhandler.builder.types.TargetSelector; +import exopandora.worldhandler.util.EnumHelper; import exopandora.worldhandler.builder.types.ArgumentType; -import exopandora.worldhandler.helper.EnumHelper; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderDoubleBlockPos.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderDoubleBlockPos.java index 3ee296b..76bcf58 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderDoubleBlockPos.java +++ b/src/main/java/exopandora/worldhandler/builder/impl/BuilderDoubleBlockPos.java @@ -2,7 +2,7 @@ package exopandora.worldhandler.builder.impl; import exopandora.worldhandler.builder.CommandBuilder; import exopandora.worldhandler.builder.types.CoordinateInt; -import exopandora.worldhandler.helper.BlockHelper; +import exopandora.worldhandler.util.BlockHelper; import net.minecraft.util.math.BlockPos; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderExperience.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderExperience.java index f479aab..cbf8a8a 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderExperience.java +++ b/src/main/java/exopandora/worldhandler/builder/impl/BuilderExperience.java @@ -5,7 +5,7 @@ import javax.annotation.Nullable; import exopandora.worldhandler.builder.CommandBuilder; import exopandora.worldhandler.builder.CommandSyntax; import exopandora.worldhandler.builder.types.ArgumentType; -import exopandora.worldhandler.helper.EnumHelper; +import exopandora.worldhandler.util.EnumHelper; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderFill.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderFill.java index 4fe089c..e8d30cf 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderFill.java +++ b/src/main/java/exopandora/worldhandler/builder/impl/BuilderFill.java @@ -5,9 +5,9 @@ import javax.annotation.Nullable; import exopandora.worldhandler.builder.CommandSyntax; import exopandora.worldhandler.builder.types.BlockResourceLocation; import exopandora.worldhandler.builder.types.CoordinateInt; +import exopandora.worldhandler.util.BlockHelper; +import exopandora.worldhandler.util.EnumHelper; import exopandora.worldhandler.builder.types.ArgumentType; -import exopandora.worldhandler.helper.BlockHelper; -import exopandora.worldhandler.helper.EnumHelper; import net.minecraft.util.math.BlockPos; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderGive.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderGive.java index cd7e50b..2ca950b 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderGive.java +++ b/src/main/java/exopandora/worldhandler/builder/impl/BuilderGive.java @@ -5,8 +5,8 @@ import javax.annotation.Nullable; import exopandora.worldhandler.builder.CommandBuilderNBT; import exopandora.worldhandler.builder.CommandSyntax; import exopandora.worldhandler.builder.types.ItemResourceLocation; +import exopandora.worldhandler.util.ResourceHelper; import exopandora.worldhandler.builder.types.ArgumentType; -import exopandora.worldhandler.helper.ResourceHelper; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderRecipe.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderRecipe.java index c64ee93..26dc95b 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderRecipe.java +++ b/src/main/java/exopandora/worldhandler/builder/impl/BuilderRecipe.java @@ -5,7 +5,7 @@ import javax.annotation.Nullable; import exopandora.worldhandler.builder.CommandBuilder; import exopandora.worldhandler.builder.CommandSyntax; import exopandora.worldhandler.builder.types.ArgumentType; -import exopandora.worldhandler.helper.EnumHelper; +import exopandora.worldhandler.util.EnumHelper; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderScoreboardObjectives.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderScoreboardObjectives.java index d5d3174..01028e5 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderScoreboardObjectives.java +++ b/src/main/java/exopandora/worldhandler/builder/impl/BuilderScoreboardObjectives.java @@ -4,8 +4,8 @@ import javax.annotation.Nullable; import exopandora.worldhandler.builder.CommandSyntax; import exopandora.worldhandler.builder.types.GreedyString; +import exopandora.worldhandler.util.EnumHelper; import exopandora.worldhandler.builder.types.ArgumentType; -import exopandora.worldhandler.helper.EnumHelper; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderTrigger.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderTrigger.java index b4aaa62..e0fa20a 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderTrigger.java +++ b/src/main/java/exopandora/worldhandler/builder/impl/BuilderTrigger.java @@ -3,7 +3,7 @@ package exopandora.worldhandler.builder.impl; import exopandora.worldhandler.builder.CommandBuilder; import exopandora.worldhandler.builder.CommandSyntax; import exopandora.worldhandler.builder.types.ArgumentType; -import exopandora.worldhandler.helper.EnumHelper; +import exopandora.worldhandler.util.EnumHelper; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/exopandora/worldhandler/command/CommandWH.java b/src/main/java/exopandora/worldhandler/command/CommandWH.java index 78d2db6..fad7970 100644 --- a/src/main/java/exopandora/worldhandler/command/CommandWH.java +++ b/src/main/java/exopandora/worldhandler/command/CommandWH.java @@ -14,9 +14,9 @@ import exopandora.worldhandler.builder.impl.BuilderClone; import exopandora.worldhandler.builder.impl.BuilderClone.EnumMask; import exopandora.worldhandler.builder.impl.BuilderFill; import exopandora.worldhandler.builder.types.BlockResourceLocation; -import exopandora.worldhandler.helper.BlockHelper; -import exopandora.worldhandler.helper.CommandHelper; -import exopandora.worldhandler.helper.EnumHelper; +import exopandora.worldhandler.util.BlockHelper; +import exopandora.worldhandler.util.CommandHelper; +import exopandora.worldhandler.util.EnumHelper; import net.minecraft.command.CommandSource; import net.minecraft.command.Commands; import net.minecraft.command.arguments.BlockPredicateArgument; diff --git a/src/main/java/exopandora/worldhandler/command/CommandWorldHandler.java b/src/main/java/exopandora/worldhandler/command/CommandWorldHandler.java index 4d7a8da..b10e73f 100644 --- a/src/main/java/exopandora/worldhandler/command/CommandWorldHandler.java +++ b/src/main/java/exopandora/worldhandler/command/CommandWorldHandler.java @@ -6,8 +6,8 @@ import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.exceptions.CommandSyntaxException; import exopandora.worldhandler.Main; -import exopandora.worldhandler.helper.ActionHelper; -import exopandora.worldhandler.helper.CommandHelper; +import exopandora.worldhandler.util.ActionHelper; +import exopandora.worldhandler.util.CommandHelper; import net.minecraft.client.Minecraft; import net.minecraft.command.CommandSource; import net.minecraft.command.Commands; diff --git a/src/main/java/exopandora/worldhandler/event/ClientEventHandler.java b/src/main/java/exopandora/worldhandler/event/ClientEventHandler.java index 78db4ac..710faec 100644 --- a/src/main/java/exopandora/worldhandler/event/ClientEventHandler.java +++ b/src/main/java/exopandora/worldhandler/event/ClientEventHandler.java @@ -7,8 +7,8 @@ import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; import exopandora.worldhandler.config.Config; -import exopandora.worldhandler.helper.BlockHelper; -import exopandora.worldhandler.helper.CommandHelper; +import exopandora.worldhandler.util.BlockHelper; +import exopandora.worldhandler.util.CommandHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/exopandora/worldhandler/event/KeyHandler.java b/src/main/java/exopandora/worldhandler/event/KeyHandler.java index 3cedadb..f1e9e1c 100644 --- a/src/main/java/exopandora/worldhandler/event/KeyHandler.java +++ b/src/main/java/exopandora/worldhandler/event/KeyHandler.java @@ -5,8 +5,8 @@ import org.lwjgl.glfw.GLFW; import exopandora.worldhandler.Main; import exopandora.worldhandler.config.Config; -import exopandora.worldhandler.helper.ActionHelper; -import exopandora.worldhandler.helper.BlockHelper; +import exopandora.worldhandler.util.ActionHelper; +import exopandora.worldhandler.util.BlockHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.settings.KeyBinding; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/exopandora/worldhandler/gui/button/GuiButtonBase.java b/src/main/java/exopandora/worldhandler/gui/button/GuiButtonBase.java index 8633443..4091990 100644 --- a/src/main/java/exopandora/worldhandler/gui/button/GuiButtonBase.java +++ b/src/main/java/exopandora/worldhandler/gui/button/GuiButtonBase.java @@ -3,9 +3,9 @@ package exopandora.worldhandler.gui.button; import com.mojang.blaze3d.platform.GlStateManager; import exopandora.worldhandler.config.Config; -import exopandora.worldhandler.helper.ActionHelper; -import exopandora.worldhandler.helper.ResourceHelper; import exopandora.worldhandler.util.ActionHandler; +import exopandora.worldhandler.util.ActionHelper; +import exopandora.worldhandler.util.ResourceHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.widget.button.Button; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/exopandora/worldhandler/gui/button/GuiButtonIcon.java b/src/main/java/exopandora/worldhandler/gui/button/GuiButtonIcon.java index 7e7d14e..5b53b91 100644 --- a/src/main/java/exopandora/worldhandler/gui/button/GuiButtonIcon.java +++ b/src/main/java/exopandora/worldhandler/gui/button/GuiButtonIcon.java @@ -2,8 +2,8 @@ package exopandora.worldhandler.gui.button; import com.mojang.blaze3d.platform.GlStateManager; -import exopandora.worldhandler.helper.ResourceHelper; import exopandora.worldhandler.util.ActionHandler; +import exopandora.worldhandler.util.ResourceHelper; import net.minecraft.client.Minecraft; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/exopandora/worldhandler/gui/button/GuiButtonList.java b/src/main/java/exopandora/worldhandler/gui/button/GuiButtonList.java index 3ef43b2..4c11c7d 100644 --- a/src/main/java/exopandora/worldhandler/gui/button/GuiButtonList.java +++ b/src/main/java/exopandora/worldhandler/gui/button/GuiButtonList.java @@ -3,7 +3,7 @@ package exopandora.worldhandler.gui.button; import java.util.List; import exopandora.worldhandler.gui.container.Container; -import exopandora.worldhandler.gui.logic.ILogicMapped; +import exopandora.worldhandler.gui.menu.impl.ILogicMapped; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.screen.Screen; diff --git a/src/main/java/exopandora/worldhandler/gui/button/GuiSlider.java b/src/main/java/exopandora/worldhandler/gui/button/GuiSlider.java index 4259101..72676ac 100644 --- a/src/main/java/exopandora/worldhandler/gui/button/GuiSlider.java +++ b/src/main/java/exopandora/worldhandler/gui/button/GuiSlider.java @@ -6,7 +6,7 @@ import com.mojang.blaze3d.platform.GlStateManager; import exopandora.worldhandler.config.Config; import exopandora.worldhandler.gui.container.Container; -import exopandora.worldhandler.gui.logic.ILogic; +import exopandora.worldhandler.util.ILogic; import exopandora.worldhandler.util.TextFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/exopandora/worldhandler/gui/logic/LogicSliderAttribute.java b/src/main/java/exopandora/worldhandler/gui/button/LogicSliderAttribute.java similarity index 93% rename from src/main/java/exopandora/worldhandler/gui/logic/LogicSliderAttribute.java rename to src/main/java/exopandora/worldhandler/gui/button/LogicSliderAttribute.java index b4f936e..367572b 100644 --- a/src/main/java/exopandora/worldhandler/gui/logic/LogicSliderAttribute.java +++ b/src/main/java/exopandora/worldhandler/gui/button/LogicSliderAttribute.java @@ -1,4 +1,4 @@ -package exopandora.worldhandler.gui.logic; +package exopandora.worldhandler.gui.button; import java.util.function.Consumer; diff --git a/src/main/java/exopandora/worldhandler/gui/logic/LogicSliderSimple.java b/src/main/java/exopandora/worldhandler/gui/button/LogicSliderSimple.java similarity index 95% rename from src/main/java/exopandora/worldhandler/gui/logic/LogicSliderSimple.java rename to src/main/java/exopandora/worldhandler/gui/button/LogicSliderSimple.java index 0a7847e..f81feb8 100644 --- a/src/main/java/exopandora/worldhandler/gui/logic/LogicSliderSimple.java +++ b/src/main/java/exopandora/worldhandler/gui/button/LogicSliderSimple.java @@ -1,4 +1,4 @@ -package exopandora.worldhandler.gui.logic; +package exopandora.worldhandler.gui.button; import java.util.function.Consumer; diff --git a/src/main/java/exopandora/worldhandler/gui/category/Category.java b/src/main/java/exopandora/worldhandler/gui/category/Category.java index 9bd62ca..533a82d 100644 --- a/src/main/java/exopandora/worldhandler/gui/category/Category.java +++ b/src/main/java/exopandora/worldhandler/gui/category/Category.java @@ -10,10 +10,10 @@ import com.google.common.collect.Lists; import exopandora.worldhandler.Main; import exopandora.worldhandler.gui.content.Content; -import exopandora.worldhandler.helper.RegistryHelper; import exopandora.worldhandler.usercontent.UsercontentConfig; import exopandora.worldhandler.usercontent.UsercontentLoader; import exopandora.worldhandler.usercontent.model.JsonTab; +import exopandora.worldhandler.util.RegistryHelper; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java b/src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java index cb97ea4..2e1c4d7 100644 --- a/src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java +++ b/src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java @@ -24,8 +24,8 @@ import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.IContent; import exopandora.worldhandler.gui.menu.IMenu; -import exopandora.worldhandler.helper.ActionHelper; -import exopandora.worldhandler.helper.ResourceHelper; +import exopandora.worldhandler.util.ActionHelper; +import exopandora.worldhandler.util.ResourceHelper; import exopandora.worldhandler.util.TextFormatting; import exopandora.worldhandler.util.UtilRender; import net.minecraft.client.Minecraft; diff --git a/src/main/java/exopandora/worldhandler/gui/content/Content.java b/src/main/java/exopandora/worldhandler/gui/content/Content.java index e13a929..3f74b32 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/Content.java +++ b/src/main/java/exopandora/worldhandler/gui/content/Content.java @@ -30,9 +30,9 @@ import exopandora.worldhandler.gui.content.impl.ContentSignEditor; import exopandora.worldhandler.gui.content.impl.ContentSummon; import exopandora.worldhandler.gui.content.impl.ContentUsercontent; import exopandora.worldhandler.gui.content.impl.ContentWorldInfo; -import exopandora.worldhandler.helper.RegistryHelper; import exopandora.worldhandler.usercontent.UsercontentConfig; import exopandora.worldhandler.usercontent.UsercontentLoader; +import exopandora.worldhandler.util.RegistryHelper; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentAdvancements.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentAdvancements.java index 9077d71..82b0dd7 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentAdvancements.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentAdvancements.java @@ -17,13 +17,13 @@ import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.container.impl.GuiWorldHandler; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.gui.logic.ILogicMapped; -import exopandora.worldhandler.gui.logic.ILogicPageList; +import exopandora.worldhandler.gui.menu.impl.ILogicMapped; +import exopandora.worldhandler.gui.menu.impl.ILogicPageList; import exopandora.worldhandler.gui.menu.impl.MenuPageList; -import exopandora.worldhandler.helper.ActionHelper; -import exopandora.worldhandler.helper.AdvancementHelper; -import exopandora.worldhandler.helper.CommandHelper; import exopandora.worldhandler.util.ActionHandler; +import exopandora.worldhandler.util.ActionHelper; +import exopandora.worldhandler.util.AdvancementHelper; +import exopandora.worldhandler.util.CommandHelper; import net.minecraft.advancements.Advancement; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcher.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcher.java index 598f817..9fd24aa 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcher.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcher.java @@ -8,8 +8,8 @@ import exopandora.worldhandler.gui.button.GuiTextFieldTooltip; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.container.impl.GuiWorldHandler; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.helper.ActionHelper; -import exopandora.worldhandler.helper.CommandHelper; +import exopandora.worldhandler.util.ActionHelper; +import exopandora.worldhandler.util.CommandHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcherSettings.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcherSettings.java index e946b58..7fbff11 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcherSettings.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcherSettings.java @@ -7,10 +7,10 @@ import exopandora.worldhandler.config.Config; import exopandora.worldhandler.gui.button.GuiButtonBase; import exopandora.worldhandler.gui.button.GuiButtonTooltip; import exopandora.worldhandler.gui.container.Container; -import exopandora.worldhandler.gui.logic.ILogicPageList; +import exopandora.worldhandler.gui.menu.impl.ILogicPageList; import exopandora.worldhandler.gui.menu.impl.MenuPageList; -import exopandora.worldhandler.helper.ActionHelper; import exopandora.worldhandler.util.ActionHandler; +import exopandora.worldhandler.util.ActionHelper; import net.minecraft.client.resources.I18n; import net.minecraft.entity.EntityType; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentChangeWorld.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentChangeWorld.java index 300c1d6..d0c7251 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentChangeWorld.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentChangeWorld.java @@ -2,7 +2,7 @@ package exopandora.worldhandler.gui.content.impl; import exopandora.worldhandler.gui.button.GuiButtonBase; import exopandora.worldhandler.gui.container.Container; -import exopandora.worldhandler.helper.ActionHelper; +import exopandora.worldhandler.util.ActionHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.ConnectingScreen; import net.minecraft.client.gui.screen.MainMenuScreen; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentContainers.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentContainers.java index 18bb88d..3da6d0f 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentContainers.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentContainers.java @@ -12,9 +12,9 @@ import exopandora.worldhandler.gui.category.Category; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.helper.ActionHelper; -import exopandora.worldhandler.helper.BlockHelper; -import exopandora.worldhandler.helper.CommandHelper; +import exopandora.worldhandler.util.ActionHelper; +import exopandora.worldhandler.util.BlockHelper; +import exopandora.worldhandler.util.CommandHelper; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentContinue.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentContinue.java index 9f46141..b137e5b 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentContinue.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentContinue.java @@ -6,8 +6,8 @@ import exopandora.worldhandler.gui.button.GuiButtonBase; import exopandora.worldhandler.gui.button.GuiTextFieldTooltip; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.container.impl.GuiWorldHandler; -import exopandora.worldhandler.helper.ActionHelper; -import exopandora.worldhandler.helper.CommandHelper; +import exopandora.worldhandler.util.ActionHelper; +import exopandora.worldhandler.util.CommandHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentCustomItem.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentCustomItem.java index 1e911c9..2033d8d 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentCustomItem.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentCustomItem.java @@ -15,20 +15,20 @@ import exopandora.worldhandler.config.Config; import exopandora.worldhandler.gui.button.GuiButtonBase; import exopandora.worldhandler.gui.button.GuiSlider; import exopandora.worldhandler.gui.button.GuiTextFieldTooltip; +import exopandora.worldhandler.gui.button.LogicSliderAttribute; +import exopandora.worldhandler.gui.button.LogicSliderSimple; import exopandora.worldhandler.gui.category.Categories; import exopandora.worldhandler.gui.category.Category; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.gui.logic.ILogicPageList; -import exopandora.worldhandler.gui.logic.LogicSliderAttribute; -import exopandora.worldhandler.gui.logic.LogicSliderSimple; +import exopandora.worldhandler.gui.menu.impl.ILogicPageList; import exopandora.worldhandler.gui.menu.impl.MenuColorField; import exopandora.worldhandler.gui.menu.impl.MenuPageList; -import exopandora.worldhandler.helper.ActionHelper; -import exopandora.worldhandler.helper.CommandHelper; -import exopandora.worldhandler.helper.ResourceHelper; import exopandora.worldhandler.util.ActionHandler; +import exopandora.worldhandler.util.ActionHelper; +import exopandora.worldhandler.util.CommandHelper; +import exopandora.worldhandler.util.ResourceHelper; import net.minecraft.client.resources.I18n; import net.minecraft.enchantment.Enchantment; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentEditBlocks.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentEditBlocks.java index 3ec50de..f2e79d6 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentEditBlocks.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentEditBlocks.java @@ -20,11 +20,11 @@ import exopandora.worldhandler.gui.category.Category; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.gui.logic.ILogicMapped; -import exopandora.worldhandler.helper.ActionHelper; -import exopandora.worldhandler.helper.BlockHelper; -import exopandora.worldhandler.helper.CommandHelper; -import exopandora.worldhandler.helper.ResourceHelper; +import exopandora.worldhandler.gui.menu.impl.ILogicMapped; +import exopandora.worldhandler.util.ActionHelper; +import exopandora.worldhandler.util.BlockHelper; +import exopandora.worldhandler.util.CommandHelper; +import exopandora.worldhandler.util.ResourceHelper; import net.minecraft.client.resources.I18n; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentEnchantment.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentEnchantment.java index 5048306..f0a1a7f 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentEnchantment.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentEnchantment.java @@ -7,17 +7,17 @@ import exopandora.worldhandler.builder.impl.BuilderEnchantment; import exopandora.worldhandler.gui.button.GuiButtonBase; import exopandora.worldhandler.gui.button.GuiButtonTooltip; import exopandora.worldhandler.gui.button.GuiSlider; +import exopandora.worldhandler.gui.button.LogicSliderSimple; import exopandora.worldhandler.gui.category.Categories; import exopandora.worldhandler.gui.category.Category; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.gui.logic.ILogicPageList; -import exopandora.worldhandler.gui.logic.LogicSliderSimple; +import exopandora.worldhandler.gui.menu.impl.ILogicPageList; import exopandora.worldhandler.gui.menu.impl.MenuPageList; -import exopandora.worldhandler.helper.ActionHelper; -import exopandora.worldhandler.helper.CommandHelper; import exopandora.worldhandler.util.ActionHandler; +import exopandora.worldhandler.util.ActionHelper; +import exopandora.worldhandler.util.CommandHelper; import net.minecraft.client.resources.I18n; import net.minecraft.enchantment.Enchantment; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentExperience.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentExperience.java index 65dbf73..b401e7d 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentExperience.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentExperience.java @@ -6,14 +6,14 @@ import exopandora.worldhandler.config.Config; import exopandora.worldhandler.gui.button.GuiButtonBase; import exopandora.worldhandler.gui.button.GuiButtonTooltip; import exopandora.worldhandler.gui.button.GuiSlider; +import exopandora.worldhandler.gui.button.LogicSliderSimple; import exopandora.worldhandler.gui.category.Categories; import exopandora.worldhandler.gui.category.Category; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.gui.logic.LogicSliderSimple; -import exopandora.worldhandler.helper.ActionHelper; -import exopandora.worldhandler.helper.CommandHelper; +import exopandora.worldhandler.util.ActionHelper; +import exopandora.worldhandler.util.CommandHelper; import net.minecraft.client.resources.I18n; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentGamerules.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentGamerules.java index bad9cb6..c8fbe78 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentGamerules.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentGamerules.java @@ -18,11 +18,11 @@ import exopandora.worldhandler.gui.category.Category; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.gui.logic.ILogicPageList; +import exopandora.worldhandler.gui.menu.impl.ILogicPageList; import exopandora.worldhandler.gui.menu.impl.MenuPageList; -import exopandora.worldhandler.helper.ActionHelper; -import exopandora.worldhandler.helper.CommandHelper; import exopandora.worldhandler.util.ActionHandler; +import exopandora.worldhandler.util.ActionHelper; +import exopandora.worldhandler.util.CommandHelper; import net.minecraft.client.resources.I18n; import net.minecraft.world.GameRules; import net.minecraft.world.GameRules.IRuleEntryVisitor; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentMain.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentMain.java index d398875..d9b7e6d 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentMain.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentMain.java @@ -11,7 +11,7 @@ import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.container.impl.GuiWorldHandler; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.helper.ActionHelper; +import exopandora.worldhandler.util.ActionHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.ResourcePacksScreen; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentMultiplayer.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentMultiplayer.java index 13c8382..acf890b 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentMultiplayer.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentMultiplayer.java @@ -20,8 +20,8 @@ import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.container.impl.GuiWorldHandler; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.helper.ActionHelper; -import exopandora.worldhandler.helper.CommandHelper; +import exopandora.worldhandler.util.ActionHelper; +import exopandora.worldhandler.util.CommandHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentNoteEditor.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentNoteEditor.java index 2851373..aefb343 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentNoteEditor.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentNoteEditor.java @@ -15,9 +15,9 @@ import exopandora.worldhandler.gui.category.Category; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.helper.ActionHelper; -import exopandora.worldhandler.helper.BlockHelper; -import exopandora.worldhandler.helper.CommandHelper; +import exopandora.worldhandler.util.ActionHelper; +import exopandora.worldhandler.util.BlockHelper; +import exopandora.worldhandler.util.CommandHelper; import net.minecraft.block.Blocks; import net.minecraft.block.NoteBlock; import net.minecraft.client.Minecraft; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPlayer.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPlayer.java index d03fbcc..cf3193b 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPlayer.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPlayer.java @@ -15,7 +15,7 @@ import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.container.impl.GuiWorldHandler; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.helper.ActionHelper; +import exopandora.worldhandler.util.ActionHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.inventory.InventoryScreen; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPotions.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPotions.java index 6aafa3d..c70b53b 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPotions.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPotions.java @@ -10,13 +10,13 @@ import exopandora.worldhandler.config.Config; import exopandora.worldhandler.gui.button.GuiButtonBase; import exopandora.worldhandler.gui.button.GuiButtonTooltip; import exopandora.worldhandler.gui.button.GuiSlider; +import exopandora.worldhandler.gui.button.LogicSliderSimple; import exopandora.worldhandler.gui.container.Container; -import exopandora.worldhandler.gui.logic.ILogicPageList; -import exopandora.worldhandler.gui.logic.LogicSliderSimple; +import exopandora.worldhandler.gui.menu.impl.ILogicPageList; import exopandora.worldhandler.gui.menu.impl.MenuPageList; -import exopandora.worldhandler.helper.ActionHelper; -import exopandora.worldhandler.helper.CommandHelper; import exopandora.worldhandler.util.ActionHandler; +import exopandora.worldhandler.util.ActionHelper; +import exopandora.worldhandler.util.CommandHelper; import net.minecraft.client.resources.I18n; import net.minecraft.item.Items; import net.minecraft.potion.Effect; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentRecipes.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentRecipes.java index fedcf75..b07cee5 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentRecipes.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentRecipes.java @@ -13,11 +13,11 @@ import exopandora.worldhandler.gui.category.Category; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.gui.logic.ILogicPageList; +import exopandora.worldhandler.gui.menu.impl.ILogicPageList; import exopandora.worldhandler.gui.menu.impl.MenuPageList; -import exopandora.worldhandler.helper.ActionHelper; -import exopandora.worldhandler.helper.CommandHelper; import exopandora.worldhandler.util.ActionHandler; +import exopandora.worldhandler.util.ActionHelper; +import exopandora.worldhandler.util.CommandHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboard.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboard.java index a20a0d6..0e5c170 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboard.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboard.java @@ -3,7 +3,7 @@ package exopandora.worldhandler.gui.content.impl; import exopandora.worldhandler.gui.category.Categories; import exopandora.worldhandler.gui.category.Category; import exopandora.worldhandler.gui.content.Content; -import exopandora.worldhandler.helper.ScoreboardHelper; +import exopandora.worldhandler.util.ScoreboardHelper; import net.minecraft.client.resources.I18n; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardObjectives.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardObjectives.java index 194f2bd..63ac168 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardObjectives.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardObjectives.java @@ -15,11 +15,11 @@ import exopandora.worldhandler.gui.button.GuiTextFieldTooltip; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.gui.logic.ILogicClickList; +import exopandora.worldhandler.gui.menu.impl.ILogicButtonList; import exopandora.worldhandler.gui.menu.impl.MenuButtonList; -import exopandora.worldhandler.helper.ActionHelper; -import exopandora.worldhandler.helper.CommandHelper; -import exopandora.worldhandler.helper.RegistryHelper; +import exopandora.worldhandler.util.ActionHelper; +import exopandora.worldhandler.util.CommandHelper; +import exopandora.worldhandler.util.RegistryHelper; import net.minecraft.client.resources.I18n; import net.minecraft.stats.StatType; import net.minecraft.stats.Stats; @@ -59,7 +59,7 @@ public class ContentScoreboardObjectives extends ContentScoreboard if(Page.CREATE.equals(this.page)) { - MenuButtonList objectives = new MenuButtonList(x + 118, y + 24, HELPER.getObjectives(), 2, new ILogicClickList() + MenuButtonList objectives = new MenuButtonList(x + 118, y + 24, HELPER.getObjectives(), 2, new ILogicButtonList() { @Override public String translate(String key, int depth) @@ -118,7 +118,7 @@ public class ContentScoreboardObjectives extends ContentScoreboard return String.join(":", keys); } - return ILogicClickList.super.buildEventKey(keys, depth); + return ILogicButtonList.super.buildEventKey(keys, depth); } @Override @@ -160,7 +160,7 @@ public class ContentScoreboardObjectives extends ContentScoreboard } else if(Page.DISPLAY.equals(this.page) || Page.UNDISPLAY.equals(this.page)) { - MenuButtonList slots = new MenuButtonList(x + 118, y + 24 - this.page.getShift(), HELPER.getSlots(), 2, new ILogicClickList() + MenuButtonList slots = new MenuButtonList(x + 118, y + 24 - this.page.getShift(), HELPER.getSlots(), 2, new ILogicButtonList() { @Override public String translate(String key, int depth) diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardPlayers.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardPlayers.java index 03bfa65..d415f1a 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardPlayers.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardPlayers.java @@ -13,12 +13,12 @@ import exopandora.worldhandler.gui.button.GuiButtonBase; import exopandora.worldhandler.gui.button.GuiButtonTooltip; import exopandora.worldhandler.gui.button.GuiSlider; import exopandora.worldhandler.gui.button.GuiTextFieldTooltip; +import exopandora.worldhandler.gui.button.LogicSliderSimple; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.gui.logic.LogicSliderSimple; -import exopandora.worldhandler.helper.ActionHelper; -import exopandora.worldhandler.helper.CommandHelper; +import exopandora.worldhandler.util.ActionHelper; +import exopandora.worldhandler.util.CommandHelper; import net.minecraft.client.resources.I18n; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardTeams.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardTeams.java index 5985676..db3aa63 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardTeams.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardTeams.java @@ -13,10 +13,10 @@ import exopandora.worldhandler.gui.button.GuiTextFieldTooltip; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.gui.logic.ILogicClickList; +import exopandora.worldhandler.gui.menu.impl.ILogicButtonList; import exopandora.worldhandler.gui.menu.impl.MenuButtonList; -import exopandora.worldhandler.helper.ActionHelper; -import exopandora.worldhandler.helper.CommandHelper; +import exopandora.worldhandler.util.ActionHelper; +import exopandora.worldhandler.util.CommandHelper; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.api.distmarker.Dist; @@ -53,7 +53,7 @@ public class ContentScoreboardTeams extends ContentScoreboard if(Page.OPTION.equals(this.page)) { - MenuButtonList options = new MenuButtonList(x + 118, y + 24, HELPER.getOptions(), 2, new ILogicClickList() + MenuButtonList options = new MenuButtonList(x + 118, y + 24, HELPER.getOptions(), 2, new ILogicButtonList() { @Override public String translate(String key, int depth) @@ -78,7 +78,7 @@ public class ContentScoreboardTeams extends ContentScoreboard @Override public String buildEventKey(List keys, int depth) { - return ILogicClickList.super.buildTranslationKey(keys, depth); + return ILogicButtonList.super.buildTranslationKey(keys, depth); } @Override diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSettings.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSettings.java index ce626d0..8583734 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSettings.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSettings.java @@ -12,10 +12,10 @@ import exopandora.worldhandler.gui.button.GuiTextFieldTooltip; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.impl.ContentSettings.Setting.BooleanSetting; import exopandora.worldhandler.gui.content.impl.ContentSettings.Setting.IntegerSetting; -import exopandora.worldhandler.gui.logic.ILogicPageList; +import exopandora.worldhandler.gui.menu.impl.ILogicPageList; import exopandora.worldhandler.gui.menu.impl.MenuPageList; -import exopandora.worldhandler.helper.ActionHelper; import exopandora.worldhandler.util.ActionHandler; +import exopandora.worldhandler.util.ActionHelper; import net.minecraft.client.resources.I18n; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSignEditor.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSignEditor.java index 7b3a83f..2b9d974 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSignEditor.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSignEditor.java @@ -15,11 +15,11 @@ import exopandora.worldhandler.gui.category.Category; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.gui.logic.ILogicColorMenu; +import exopandora.worldhandler.gui.menu.impl.ILogicColorMenu; import exopandora.worldhandler.gui.menu.impl.MenuColorField; -import exopandora.worldhandler.helper.ActionHelper; -import exopandora.worldhandler.helper.BlockHelper; -import exopandora.worldhandler.helper.CommandHelper; +import exopandora.worldhandler.util.ActionHelper; +import exopandora.worldhandler.util.BlockHelper; +import exopandora.worldhandler.util.CommandHelper; import net.minecraft.block.AbstractSignBlock; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSummon.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSummon.java index 4c562b8..7239b6c 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSummon.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSummon.java @@ -17,18 +17,18 @@ import exopandora.worldhandler.gui.button.GuiButtonBase; import exopandora.worldhandler.gui.button.GuiButtonItem; import exopandora.worldhandler.gui.button.GuiSlider; import exopandora.worldhandler.gui.button.GuiTextFieldTooltip; +import exopandora.worldhandler.gui.button.LogicSliderAttribute; +import exopandora.worldhandler.gui.button.LogicSliderSimple; import exopandora.worldhandler.gui.category.Categories; import exopandora.worldhandler.gui.category.Category; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.gui.logic.ILogicPageList; -import exopandora.worldhandler.gui.logic.LogicSliderAttribute; -import exopandora.worldhandler.gui.logic.LogicSliderSimple; +import exopandora.worldhandler.gui.menu.impl.ILogicPageList; import exopandora.worldhandler.gui.menu.impl.MenuPageList; -import exopandora.worldhandler.helper.ActionHelper; -import exopandora.worldhandler.helper.CommandHelper; import exopandora.worldhandler.util.ActionHandler; +import exopandora.worldhandler.util.ActionHelper; +import exopandora.worldhandler.util.CommandHelper; import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentWorldInfo.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentWorldInfo.java index 8a8dea5..40af9f6 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentWorldInfo.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentWorldInfo.java @@ -9,7 +9,7 @@ import exopandora.worldhandler.gui.category.Category; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.helper.ActionHelper; +import exopandora.worldhandler.util.ActionHelper; import exopandora.worldhandler.util.TextFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/exopandora/worldhandler/gui/logic/ILogicClickList.java b/src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicButtonList.java similarity index 75% rename from src/main/java/exopandora/worldhandler/gui/logic/ILogicClickList.java rename to src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicButtonList.java index e9a7856..15de129 100644 --- a/src/main/java/exopandora/worldhandler/gui/logic/ILogicClickList.java +++ b/src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicButtonList.java @@ -1,12 +1,13 @@ -package exopandora.worldhandler.gui.logic; +package exopandora.worldhandler.gui.menu.impl; import java.util.List; +import exopandora.worldhandler.util.ILogic; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @OnlyIn(Dist.CLIENT) -public interface ILogicClickList extends ILogic +public interface ILogicButtonList extends ILogic { String translate(String key, int depth); diff --git a/src/main/java/exopandora/worldhandler/gui/logic/ILogicColorMenu.java b/src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicColorMenu.java similarity index 79% rename from src/main/java/exopandora/worldhandler/gui/logic/ILogicColorMenu.java rename to src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicColorMenu.java index 59ac1d8..2ffbd67 100644 --- a/src/main/java/exopandora/worldhandler/gui/logic/ILogicColorMenu.java +++ b/src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicColorMenu.java @@ -1,5 +1,6 @@ -package exopandora.worldhandler.gui.logic; +package exopandora.worldhandler.gui.menu.impl; +import exopandora.worldhandler.util.ILogic; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/exopandora/worldhandler/gui/logic/ILogicMapped.java b/src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicMapped.java similarity index 84% rename from src/main/java/exopandora/worldhandler/gui/logic/ILogicMapped.java rename to src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicMapped.java index 78e06ec..f0612c8 100644 --- a/src/main/java/exopandora/worldhandler/gui/logic/ILogicMapped.java +++ b/src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicMapped.java @@ -1,5 +1,6 @@ -package exopandora.worldhandler.gui.logic; +package exopandora.worldhandler.gui.menu.impl; +import exopandora.worldhandler.util.ILogic; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/exopandora/worldhandler/gui/logic/ILogicPageList.java b/src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicPageList.java similarity index 90% rename from src/main/java/exopandora/worldhandler/gui/logic/ILogicPageList.java rename to src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicPageList.java index f0e0ace..5dc8a48 100644 --- a/src/main/java/exopandora/worldhandler/gui/logic/ILogicPageList.java +++ b/src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicPageList.java @@ -1,4 +1,4 @@ -package exopandora.worldhandler.gui.logic; +package exopandora.worldhandler.gui.menu.impl; import exopandora.worldhandler.gui.button.GuiButtonBase; import exopandora.worldhandler.util.ActionHandler; diff --git a/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuButtonList.java b/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuButtonList.java index ceaf7d8..bec1134 100644 --- a/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuButtonList.java +++ b/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuButtonList.java @@ -11,10 +11,8 @@ import exopandora.worldhandler.gui.button.GuiButtonBase; import exopandora.worldhandler.gui.button.GuiButtonList; import exopandora.worldhandler.gui.button.GuiButtonList.Persistence; import exopandora.worldhandler.gui.container.Container; -import exopandora.worldhandler.gui.logic.ILogicClickList; -import exopandora.worldhandler.gui.logic.ILogicMapped; import exopandora.worldhandler.gui.menu.Menu; -import exopandora.worldhandler.helper.Node; +import exopandora.worldhandler.util.Node; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -22,17 +20,17 @@ import net.minecraftforge.api.distmarker.OnlyIn; public class MenuButtonList extends Menu { private final List items; - private final ILogicClickList logic; + private final ILogicButtonList logic; private final MenuButtonList parent; private final int depth; private final int maxDepth; - public MenuButtonList(int x, int y, List list, int maxDepth, ILogicClickList logic) + public MenuButtonList(int x, int y, List list, int maxDepth, ILogicButtonList logic) { this(x, y, list, maxDepth, logic, null); } - private MenuButtonList(int x, int y, List list, int maxDepth, ILogicClickList logic, MenuButtonList parent) + private MenuButtonList(int x, int y, List list, int maxDepth, ILogicButtonList logic, MenuButtonList parent) { super(x, y); this.items = list; diff --git a/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuColorField.java b/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuColorField.java index ed442df..2e440bc 100644 --- a/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuColorField.java +++ b/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuColorField.java @@ -7,8 +7,6 @@ import exopandora.worldhandler.gui.button.GuiButtonBase; import exopandora.worldhandler.gui.button.GuiButtonList; import exopandora.worldhandler.gui.button.GuiTextFieldTooltip; import exopandora.worldhandler.gui.container.Container; -import exopandora.worldhandler.gui.logic.ILogicColorMenu; -import exopandora.worldhandler.gui.logic.ILogicMapped; import exopandora.worldhandler.gui.menu.Menu; import exopandora.worldhandler.util.MutableStringTextComponent; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuPageList.java b/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuPageList.java index 86128af..b9ff440 100644 --- a/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuPageList.java +++ b/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuPageList.java @@ -6,7 +6,6 @@ import java.util.Objects; import exopandora.worldhandler.config.Config; import exopandora.worldhandler.gui.button.GuiButtonBase; import exopandora.worldhandler.gui.container.Container; -import exopandora.worldhandler.gui.logic.ILogicPageList; import exopandora.worldhandler.gui.menu.Menu; import exopandora.worldhandler.util.TextFormatting; import net.minecraft.client.Minecraft; diff --git a/src/main/java/exopandora/worldhandler/usercontent/UsercontentLoader.java b/src/main/java/exopandora/worldhandler/usercontent/UsercontentLoader.java index 8c39506..7afc458 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/UsercontentLoader.java +++ b/src/main/java/exopandora/worldhandler/usercontent/UsercontentLoader.java @@ -108,7 +108,7 @@ public class UsercontentLoader private static final List ALLOWED_CLASSES = Arrays.asList ( - "exopandora.worldhandler.helper.ActionHelper" + "exopandora.worldhandler.util.ActionHelper" ); private static ScriptEngine buildScriptEngine() diff --git a/src/main/java/exopandora/worldhandler/usercontent/factory/ActionHandlerFactory.java b/src/main/java/exopandora/worldhandler/usercontent/factory/ActionHandlerFactory.java index 4261b6c..c7f6a8d 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/factory/ActionHandlerFactory.java +++ b/src/main/java/exopandora/worldhandler/usercontent/factory/ActionHandlerFactory.java @@ -8,13 +8,13 @@ import javax.annotation.Nullable; import exopandora.worldhandler.builder.impl.BuilderUsercontent; import exopandora.worldhandler.gui.content.Content; -import exopandora.worldhandler.helper.ActionHelper; -import exopandora.worldhandler.helper.CommandHelper; import exopandora.worldhandler.usercontent.ScriptEngineAdapter; import exopandora.worldhandler.usercontent.UsercontentAPI; import exopandora.worldhandler.usercontent.VisibleObject; import exopandora.worldhandler.usercontent.model.Action; import exopandora.worldhandler.util.ActionHandler; +import exopandora.worldhandler.util.ActionHelper; +import exopandora.worldhandler.util.CommandHelper; import net.minecraft.client.Minecraft; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/exopandora/worldhandler/usercontent/factory/ButtonFactory.java b/src/main/java/exopandora/worldhandler/usercontent/factory/ButtonFactory.java index cb4039a..b647f21 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/factory/ButtonFactory.java +++ b/src/main/java/exopandora/worldhandler/usercontent/factory/ButtonFactory.java @@ -12,9 +12,9 @@ import exopandora.worldhandler.gui.button.GuiButtonList; import exopandora.worldhandler.gui.button.GuiButtonTooltip; import exopandora.worldhandler.gui.button.GuiSlider; import exopandora.worldhandler.gui.button.GuiTextFieldTooltip; +import exopandora.worldhandler.gui.button.LogicSliderSimple; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; -import exopandora.worldhandler.gui.logic.LogicSliderSimple; import exopandora.worldhandler.usercontent.UsercontentAPI; import exopandora.worldhandler.usercontent.model.JsonItem; import exopandora.worldhandler.util.TextFormatting; diff --git a/src/main/java/exopandora/worldhandler/usercontent/factory/MenuFactory.java b/src/main/java/exopandora/worldhandler/usercontent/factory/MenuFactory.java index c46a9e1..d38811e 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/factory/MenuFactory.java +++ b/src/main/java/exopandora/worldhandler/usercontent/factory/MenuFactory.java @@ -6,8 +6,8 @@ import exopandora.worldhandler.gui.button.GuiButtonBase; import exopandora.worldhandler.gui.button.GuiButtonTooltip; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; -import exopandora.worldhandler.gui.logic.ILogicPageList; import exopandora.worldhandler.gui.menu.Menu; +import exopandora.worldhandler.gui.menu.impl.ILogicPageList; import exopandora.worldhandler.gui.menu.impl.MenuPageList; import exopandora.worldhandler.usercontent.UsercontentAPI; import exopandora.worldhandler.usercontent.model.JsonMenu; diff --git a/src/main/java/exopandora/worldhandler/usercontent/factory/WidgetFactory.java b/src/main/java/exopandora/worldhandler/usercontent/factory/WidgetFactory.java index 49a7b7a..ae396e7 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/factory/WidgetFactory.java +++ b/src/main/java/exopandora/worldhandler/usercontent/factory/WidgetFactory.java @@ -2,7 +2,7 @@ package exopandora.worldhandler.usercontent.factory; import exopandora.worldhandler.WorldHandler; import exopandora.worldhandler.gui.content.Content; -import exopandora.worldhandler.gui.logic.ILogicMapped; +import exopandora.worldhandler.gui.menu.impl.ILogicMapped; import exopandora.worldhandler.usercontent.UsercontentAPI; import exopandora.worldhandler.usercontent.model.JsonItem; import exopandora.worldhandler.usercontent.model.JsonWidget; diff --git a/src/main/java/exopandora/worldhandler/helper/ActionHelper.java b/src/main/java/exopandora/worldhandler/util/ActionHelper.java similarity index 98% rename from src/main/java/exopandora/worldhandler/helper/ActionHelper.java rename to src/main/java/exopandora/worldhandler/util/ActionHelper.java index 419a533..1c9caf8 100644 --- a/src/main/java/exopandora/worldhandler/helper/ActionHelper.java +++ b/src/main/java/exopandora/worldhandler/util/ActionHelper.java @@ -1,4 +1,4 @@ -package exopandora.worldhandler.helper; +package exopandora.worldhandler.util; import exopandora.worldhandler.Main; import exopandora.worldhandler.WorldHandler; @@ -15,7 +15,6 @@ import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; import exopandora.worldhandler.gui.content.impl.ContentChild; import exopandora.worldhandler.gui.content.impl.ContentContinue; -import exopandora.worldhandler.util.ActionHandler; import net.minecraft.block.AbstractSignBlock; import net.minecraft.block.NoteBlock; import net.minecraft.client.Minecraft; diff --git a/src/main/java/exopandora/worldhandler/helper/AdvancementHelper.java b/src/main/java/exopandora/worldhandler/util/AdvancementHelper.java similarity index 98% rename from src/main/java/exopandora/worldhandler/helper/AdvancementHelper.java rename to src/main/java/exopandora/worldhandler/util/AdvancementHelper.java index c30b713..ed13952 100644 --- a/src/main/java/exopandora/worldhandler/helper/AdvancementHelper.java +++ b/src/main/java/exopandora/worldhandler/util/AdvancementHelper.java @@ -1,4 +1,4 @@ -package exopandora.worldhandler.helper; +package exopandora.worldhandler.util; import java.util.Collection; import java.util.concurrent.CompletableFuture; diff --git a/src/main/java/exopandora/worldhandler/helper/BlockHelper.java b/src/main/java/exopandora/worldhandler/util/BlockHelper.java similarity index 99% rename from src/main/java/exopandora/worldhandler/helper/BlockHelper.java rename to src/main/java/exopandora/worldhandler/util/BlockHelper.java index f42051b..4397244 100644 --- a/src/main/java/exopandora/worldhandler/helper/BlockHelper.java +++ b/src/main/java/exopandora/worldhandler/util/BlockHelper.java @@ -1,4 +1,4 @@ -package exopandora.worldhandler.helper; +package exopandora.worldhandler.util; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/exopandora/worldhandler/helper/CommandHelper.java b/src/main/java/exopandora/worldhandler/util/CommandHelper.java similarity index 97% rename from src/main/java/exopandora/worldhandler/helper/CommandHelper.java rename to src/main/java/exopandora/worldhandler/util/CommandHelper.java index f6ca3ba..0f0bcee 100644 --- a/src/main/java/exopandora/worldhandler/helper/CommandHelper.java +++ b/src/main/java/exopandora/worldhandler/util/CommandHelper.java @@ -1,4 +1,4 @@ -package exopandora.worldhandler.helper; +package exopandora.worldhandler.util; import com.mojang.brigadier.CommandDispatcher; diff --git a/src/main/java/exopandora/worldhandler/helper/EnumHelper.java b/src/main/java/exopandora/worldhandler/util/EnumHelper.java similarity index 90% rename from src/main/java/exopandora/worldhandler/helper/EnumHelper.java rename to src/main/java/exopandora/worldhandler/util/EnumHelper.java index 074f545..61eb156 100644 --- a/src/main/java/exopandora/worldhandler/helper/EnumHelper.java +++ b/src/main/java/exopandora/worldhandler/util/EnumHelper.java @@ -1,4 +1,4 @@ -package exopandora.worldhandler.helper; +package exopandora.worldhandler.util; import javax.annotation.Nullable; diff --git a/src/main/java/exopandora/worldhandler/gui/logic/ILogic.java b/src/main/java/exopandora/worldhandler/util/ILogic.java similarity index 79% rename from src/main/java/exopandora/worldhandler/gui/logic/ILogic.java rename to src/main/java/exopandora/worldhandler/util/ILogic.java index 621567c..7fd673c 100644 --- a/src/main/java/exopandora/worldhandler/gui/logic/ILogic.java +++ b/src/main/java/exopandora/worldhandler/util/ILogic.java @@ -1,4 +1,4 @@ -package exopandora.worldhandler.gui.logic; +package exopandora.worldhandler.util; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/exopandora/worldhandler/helper/Node.java b/src/main/java/exopandora/worldhandler/util/Node.java similarity index 99% rename from src/main/java/exopandora/worldhandler/helper/Node.java rename to src/main/java/exopandora/worldhandler/util/Node.java index 848947c..4348e71 100644 --- a/src/main/java/exopandora/worldhandler/helper/Node.java +++ b/src/main/java/exopandora/worldhandler/util/Node.java @@ -1,4 +1,4 @@ -package exopandora.worldhandler.helper; +package exopandora.worldhandler.util; import java.io.FileOutputStream; import java.io.IOException; diff --git a/src/main/java/exopandora/worldhandler/helper/RegistryHelper.java b/src/main/java/exopandora/worldhandler/util/RegistryHelper.java similarity index 98% rename from src/main/java/exopandora/worldhandler/helper/RegistryHelper.java rename to src/main/java/exopandora/worldhandler/util/RegistryHelper.java index f8c8360..e3a57df 100644 --- a/src/main/java/exopandora/worldhandler/helper/RegistryHelper.java +++ b/src/main/java/exopandora/worldhandler/util/RegistryHelper.java @@ -1,4 +1,4 @@ -package exopandora.worldhandler.helper; +package exopandora.worldhandler.util; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/exopandora/worldhandler/helper/ResourceHelper.java b/src/main/java/exopandora/worldhandler/util/ResourceHelper.java similarity index 98% rename from src/main/java/exopandora/worldhandler/helper/ResourceHelper.java rename to src/main/java/exopandora/worldhandler/util/ResourceHelper.java index f6803c7..274b4a1 100644 --- a/src/main/java/exopandora/worldhandler/helper/ResourceHelper.java +++ b/src/main/java/exopandora/worldhandler/util/ResourceHelper.java @@ -1,4 +1,4 @@ -package exopandora.worldhandler.helper; +package exopandora.worldhandler.util; import javax.annotation.Nullable; diff --git a/src/main/java/exopandora/worldhandler/helper/ScoreboardHelper.java b/src/main/java/exopandora/worldhandler/util/ScoreboardHelper.java similarity index 98% rename from src/main/java/exopandora/worldhandler/helper/ScoreboardHelper.java rename to src/main/java/exopandora/worldhandler/util/ScoreboardHelper.java index a3beaed..3bf8969 100644 --- a/src/main/java/exopandora/worldhandler/helper/ScoreboardHelper.java +++ b/src/main/java/exopandora/worldhandler/util/ScoreboardHelper.java @@ -1,4 +1,4 @@ -package exopandora.worldhandler.helper; +package exopandora.worldhandler.util; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/exopandora/worldhandler/util/UtilRender.java b/src/main/java/exopandora/worldhandler/util/UtilRender.java index b9cbf56..f642434 100644 --- a/src/main/java/exopandora/worldhandler/util/UtilRender.java +++ b/src/main/java/exopandora/worldhandler/util/UtilRender.java @@ -3,7 +3,6 @@ package exopandora.worldhandler.util; import com.mojang.blaze3d.platform.GlStateManager; import exopandora.worldhandler.config.Config; -import exopandora.worldhandler.helper.ResourceHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.Screen; import net.minecraftforge.api.distmarker.Dist;