MrSphay/WorldHandler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Move username field from WorldHandler to GuiWorldHandler

Browse Source
This commit is contained in:
Marcel Konrad
2019-10-19 20:07:18 +02:00
parent 3a7474ff23
commit 8d73d122f2
4 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/exopandora/worldhandler/WorldHandler.java
View File

@@ -9,7 +9,6 @@ import exopandora.worldhandler.event.KeyHandler;
import exopandora.worldhandler.gui.category.Category; import exopandora.worldhandler.gui.category.Category;
import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Content;
import exopandora.worldhandler.helper.CommandHelper; import exopandora.worldhandler.helper.CommandHelper;
import net.minecraft.client.Minecraft;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.eventbus.api.IEventBus;
@@ -27,7 +26,6 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
public class WorldHandler public class WorldHandler
{ {
public static final Logger LOGGER = LogManager.getLogger(); public static final Logger LOGGER = LogManager.getLogger();
public static String USERNAME = null;
public WorldHandler() public WorldHandler()
{ {
@@ -43,6 +41,11 @@ public class WorldHandler
modEventBus.addGenericListener(Content.class, Content::register); modEventBus.addGenericListener(Content.class, Content::register);
modEventBus.addGenericListener(Category.class, Category::register); modEventBus.addGenericListener(Category.class, Category::register);
}); });
// ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.CONFIGGUIFACTORY, () ->
// {
// GuiFactoryWorldHandler factory = new GuiFactoryWorldHandler();
// return (minecraft, parentScreen) -> factory.createConfigGui(parentScreen);
// });
} }
@SubscribeEvent @SubscribeEvent
@@ -52,7 +55,6 @@ public class WorldHandler
MinecraftForge.EVENT_BUS.addListener(ClientEventHandler::renderWorldLastEvent); MinecraftForge.EVENT_BUS.addListener(ClientEventHandler::renderWorldLastEvent);
MinecraftForge.EVENT_BUS.addListener(ClientEventHandler::clientChatEvent); MinecraftForge.EVENT_BUS.addListener(ClientEventHandler::clientChatEvent);
USERNAME = Minecraft.getInstance().getSession().getUsername();
ClientRegistry.registerKeyBinding(KeyHandler.KEY_WORLD_HANDLER); ClientRegistry.registerKeyBinding(KeyHandler.KEY_WORLD_HANDLER);
KeyHandler.updatePosKeys(); KeyHandler.updatePosKeys();
} }

12
src/main/java/exopandora/worldhandler/builder/impl/BuilderSpawnpoint.java
View File

@@ -3,19 +3,19 @@ package exopandora.worldhandler.builder.impl;
import exopandora.worldhandler.builder.CommandBuilder; import exopandora.worldhandler.builder.CommandBuilder;
import exopandora.worldhandler.builder.Syntax; import exopandora.worldhandler.builder.Syntax;
import exopandora.worldhandler.builder.types.Coordinate.CoordinateType; 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.CoordinateInt;
import exopandora.worldhandler.builder.types.Type; import exopandora.worldhandler.builder.types.Type;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
public class BuilderSpawnpoint extends CommandBuilder public class BuilderSpawnpoint extends CommandBuilder
{ {
public BuilderSpawnpoint(String player) public BuilderSpawnpoint()
{ {
this.setX(new CoordinateInt(CoordinateType.LOCAL)); this.setX(new CoordinateInt(CoordinateType.GLOBAL));
this.setY(new CoordinateInt(CoordinateType.LOCAL)); this.setY(new CoordinateInt(CoordinateType.GLOBAL));
this.setZ(new CoordinateInt(CoordinateType.LOCAL)); this.setZ(new CoordinateInt(CoordinateType.GLOBAL));
} }
@Override @Override

17
src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java
View File

@@ -12,7 +12,6 @@ import com.google.common.base.Predicates;
import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.platform.GlStateManager;
import exopandora.worldhandler.Main; import exopandora.worldhandler.Main;
import exopandora.worldhandler.WorldHandler;
import exopandora.worldhandler.builder.impl.BuilderWorldHandler; import exopandora.worldhandler.builder.impl.BuilderWorldHandler;
import exopandora.worldhandler.config.Config; import exopandora.worldhandler.config.Config;
import exopandora.worldhandler.event.KeyHandler; import exopandora.worldhandler.event.KeyHandler;
@@ -57,6 +56,8 @@ public class GuiWorldHandler extends Container
private GuiTextFieldTooltip syntaxField; private GuiTextFieldTooltip syntaxField;
private GuiTextFieldTooltip nameField; private GuiTextFieldTooltip nameField;
private static String player = Minecraft.getInstance().getSession().getUsername();
private static final BuilderWorldHandler BUILDER_WORLD_HANDLER = new BuilderWorldHandler(); private static final BuilderWorldHandler BUILDER_WORLD_HANDLER = new BuilderWorldHandler();
public GuiWorldHandler(Content content) throws Exception public GuiWorldHandler(Content content) throws Exception
@@ -133,7 +134,7 @@ public class GuiWorldHandler extends Container
this.nameField.setText(this.getPlayer()); this.nameField.setText(this.getPlayer());
this.nameField.setResponder(text -> this.nameField.setResponder(text ->
{ {
WorldHandler.USERNAME = text; GuiWorldHandler.player = text;
this.updateNameField(); this.updateNameField();
}); });
this.updateNameField(); this.updateNameField();
@@ -282,7 +283,7 @@ public class GuiWorldHandler extends Container
final int backgroundX = this.getBackgroundX(); final int backgroundX = this.getBackgroundX();
final int backgroundY = this.getBackgroundY(); 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; int width = this.font.getStringWidth(I18n.format("gui.worldhandler.generic.edit_username")) + 2;
this.nameField.setWidth(width); this.nameField.setWidth(width);
@@ -290,12 +291,12 @@ public class GuiWorldHandler extends Container
} }
else else
{ {
int width = this.font.getStringWidth(WorldHandler.USERNAME) + 2; int width = this.font.getStringWidth(GuiWorldHandler.player) + 2;
this.nameField.setWidth(width); this.nameField.setWidth(width);
this.nameField.setPosition(backgroundX + this.bgTextureWidth - this.getWatchOffset() - 7 - width, backgroundY + 6); 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() private void defaultColor()
@@ -499,7 +500,7 @@ public class GuiWorldHandler extends Container
//TITLE //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()); this.font.drawString(TextFormatting.shortenString(this.content.getTitle(), maxWidth, this.font), backgroundX + 7, backgroundY + 7, Config.getSkin().getLabelColor());
//HEADLINE //HEADLINE
@@ -519,7 +520,7 @@ public class GuiWorldHandler extends Container
//NAME FIELD //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()); this.font.drawString(username, backgroundX + 232 - this.font.getStringWidth(username), backgroundY + 7, Config.getSkin().getLabelColor());
//WATCH //WATCH
@@ -664,7 +665,7 @@ public class GuiWorldHandler extends Container
@Override @Override
public String getPlayer() public String getPlayer()
{ {
return WorldHandler.USERNAME; return GuiWorldHandler.player;
} }
@Override @Override

3
src/main/java/exopandora/worldhandler/gui/content/impl/ContentPlayer.java
View File

@@ -2,7 +2,6 @@ package exopandora.worldhandler.gui.content.impl;
import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.platform.GlStateManager;
import exopandora.worldhandler.WorldHandler;
import exopandora.worldhandler.builder.ICommandBuilder; import exopandora.worldhandler.builder.ICommandBuilder;
import exopandora.worldhandler.builder.impl.BuilderGeneric; import exopandora.worldhandler.builder.impl.BuilderGeneric;
import exopandora.worldhandler.builder.impl.BuilderMultiCommand; import exopandora.worldhandler.builder.impl.BuilderMultiCommand;
@@ -40,7 +39,7 @@ public class ContentPlayer extends Content
private GuiTextFieldTooltip xpField; private GuiTextFieldTooltip xpField;
private final BuilderGeneric builderSetworldspawn = new BuilderGeneric("setworldspawn"); 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 BuilderPlayer builderKill = new BuilderPlayer("kill");
private final BuilderGeneric builderClear = new BuilderGeneric("clear"); private final BuilderGeneric builderClear = new BuilderGeneric("clear");