diff --git a/src/main/java/exopandora/worldhandler/WorldHandler.java b/src/main/java/exopandora/worldhandler/WorldHandler.java index 4a7a0ae..0e4ac21 100644 --- a/src/main/java/exopandora/worldhandler/WorldHandler.java +++ b/src/main/java/exopandora/worldhandler/WorldHandler.java @@ -9,7 +9,6 @@ import exopandora.worldhandler.event.KeyHandler; import exopandora.worldhandler.gui.category.Category; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.helper.CommandHelper; -import net.minecraft.client.Minecraft; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.eventbus.api.IEventBus; @@ -27,7 +26,6 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; public class WorldHandler { public static final Logger LOGGER = LogManager.getLogger(); - public static String USERNAME = null; public WorldHandler() { @@ -43,6 +41,11 @@ public class WorldHandler modEventBus.addGenericListener(Content.class, Content::register); modEventBus.addGenericListener(Category.class, Category::register); }); +// ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.CONFIGGUIFACTORY, () -> +// { +// GuiFactoryWorldHandler factory = new GuiFactoryWorldHandler(); +// return (minecraft, parentScreen) -> factory.createConfigGui(parentScreen); +// }); } @SubscribeEvent @@ -52,7 +55,6 @@ public class WorldHandler MinecraftForge.EVENT_BUS.addListener(ClientEventHandler::renderWorldLastEvent); MinecraftForge.EVENT_BUS.addListener(ClientEventHandler::clientChatEvent); - USERNAME = Minecraft.getInstance().getSession().getUsername(); ClientRegistry.registerKeyBinding(KeyHandler.KEY_WORLD_HANDLER); KeyHandler.updatePosKeys(); } diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderSpawnpoint.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderSpawnpoint.java index 37e0509..a874dc7 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderSpawnpoint.java +++ b/src/main/java/exopandora/worldhandler/builder/impl/BuilderSpawnpoint.java @@ -3,19 +3,19 @@ package exopandora.worldhandler.builder.impl; import exopandora.worldhandler.builder.CommandBuilder; import exopandora.worldhandler.builder.Syntax; import exopandora.worldhandler.builder.types.Coordinate.CoordinateType; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import exopandora.worldhandler.builder.types.CoordinateInt; import exopandora.worldhandler.builder.types.Type; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; @OnlyIn(Dist.CLIENT) public class BuilderSpawnpoint extends CommandBuilder { - public BuilderSpawnpoint(String player) + public BuilderSpawnpoint() { - this.setX(new CoordinateInt(CoordinateType.LOCAL)); - this.setY(new CoordinateInt(CoordinateType.LOCAL)); - this.setZ(new CoordinateInt(CoordinateType.LOCAL)); + this.setX(new CoordinateInt(CoordinateType.GLOBAL)); + this.setY(new CoordinateInt(CoordinateType.GLOBAL)); + this.setZ(new CoordinateInt(CoordinateType.GLOBAL)); } @Override 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 1ff472d..26b2d2c 100644 --- a/src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java +++ b/src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java @@ -12,7 +12,6 @@ import com.google.common.base.Predicates; import com.mojang.blaze3d.platform.GlStateManager; import exopandora.worldhandler.Main; -import exopandora.worldhandler.WorldHandler; import exopandora.worldhandler.builder.impl.BuilderWorldHandler; import exopandora.worldhandler.config.Config; import exopandora.worldhandler.event.KeyHandler; @@ -57,6 +56,8 @@ public class GuiWorldHandler extends Container private GuiTextFieldTooltip syntaxField; private GuiTextFieldTooltip nameField; + private static String player = Minecraft.getInstance().getSession().getUsername(); + private static final BuilderWorldHandler BUILDER_WORLD_HANDLER = new BuilderWorldHandler(); public GuiWorldHandler(Content content) throws Exception @@ -133,7 +134,7 @@ public class GuiWorldHandler extends Container this.nameField.setText(this.getPlayer()); this.nameField.setResponder(text -> { - WorldHandler.USERNAME = text; + GuiWorldHandler.player = text; this.updateNameField(); }); this.updateNameField(); @@ -282,7 +283,7 @@ public class GuiWorldHandler extends Container final int backgroundX = this.getBackgroundX(); final int backgroundY = this.getBackgroundY(); - if(WorldHandler.USERNAME.isEmpty()) + if(GuiWorldHandler.player.isEmpty()) { int width = this.font.getStringWidth(I18n.format("gui.worldhandler.generic.edit_username")) + 2; this.nameField.setWidth(width); @@ -290,12 +291,12 @@ public class GuiWorldHandler extends Container } else { - int width = this.font.getStringWidth(WorldHandler.USERNAME) + 2; + int width = this.font.getStringWidth(GuiWorldHandler.player) + 2; this.nameField.setWidth(width); this.nameField.setPosition(backgroundX + this.bgTextureWidth - this.getWatchOffset() - 7 - width, backgroundY + 6); } - this.content.onPlayerNameChanged(WorldHandler.USERNAME); + this.content.onPlayerNameChanged(GuiWorldHandler.player); } private void defaultColor() @@ -499,7 +500,7 @@ public class GuiWorldHandler extends Container //TITLE - final int maxWidth = this.bgTextureWidth - 7 - 2 - this.font.getStringWidth(WorldHandler.USERNAME) - 2 - this.getWatchOffset() - 7; + final int maxWidth = this.bgTextureWidth - 7 - 2 - this.font.getStringWidth(GuiWorldHandler.player) - 2 - this.getWatchOffset() - 7; this.font.drawString(TextFormatting.shortenString(this.content.getTitle(), maxWidth, this.font), backgroundX + 7, backgroundY + 7, Config.getSkin().getLabelColor()); //HEADLINE @@ -519,7 +520,7 @@ public class GuiWorldHandler extends Container //NAME FIELD - final String username = WorldHandler.USERNAME.isEmpty() && !this.nameField.isFocused() ? I18n.format("gui.worldhandler.generic.edit_username") : WorldHandler.USERNAME; + final String username = GuiWorldHandler.player.isEmpty() && !this.nameField.isFocused() ? I18n.format("gui.worldhandler.generic.edit_username") : GuiWorldHandler.player; this.font.drawString(username, backgroundX + 232 - this.font.getStringWidth(username), backgroundY + 7, Config.getSkin().getLabelColor()); //WATCH @@ -664,7 +665,7 @@ public class GuiWorldHandler extends Container @Override public String getPlayer() { - return WorldHandler.USERNAME; + return GuiWorldHandler.player; } @Override 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 457a845..1b13462 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPlayer.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPlayer.java @@ -2,7 +2,6 @@ package exopandora.worldhandler.gui.content.impl; import com.mojang.blaze3d.platform.GlStateManager; -import exopandora.worldhandler.WorldHandler; import exopandora.worldhandler.builder.ICommandBuilder; import exopandora.worldhandler.builder.impl.BuilderGeneric; import exopandora.worldhandler.builder.impl.BuilderMultiCommand; @@ -40,7 +39,7 @@ public class ContentPlayer extends Content private GuiTextFieldTooltip xpField; private final BuilderGeneric builderSetworldspawn = new BuilderGeneric("setworldspawn"); - private final BuilderSpawnpoint builderSpawnpoint = new BuilderSpawnpoint(WorldHandler.USERNAME); + private final BuilderSpawnpoint builderSpawnpoint = new BuilderSpawnpoint(); private final BuilderPlayer builderKill = new BuilderPlayer("kill"); private final BuilderGeneric builderClear = new BuilderGeneric("clear");