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

Make widgets static

Browse Source
This commit is contained in:
Marcel Konrad
2020-10-16 15:05:00 +02:00
parent ac357fbc68
commit f1b2c3ac5f
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,17 +33,17 @@ import net.minecraftforge.api.distmarker.OnlyIn;
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
public class GuiWorldHandler extends Container public class GuiWorldHandler extends Container
{ {
private final Content content; private static String player = Minecraft.getInstance().getSession().getUsername();
private final List<IContainerWidget> widgets = Util.make(Lists.newArrayList(), widgets -> private final static List<IContainerWidget> WIDGETS = Util.make(Lists.newArrayList(), widgets ->
{ {
widgets.add(new TabRenderer()); widgets.add(new WidgetTabRenderer());
widgets.add(new WidgetWatch()); widgets.add(new WidgetWatch());
widgets.add(new WidgetNameField()); widgets.add(new WidgetNameField());
widgets.add(new WidgetCommandSyntax()); widgets.add(new WidgetCommandSyntax());
widgets.add(new WidgetShortcuts()); widgets.add(new WidgetShortcuts());
}); });
private static String player = Minecraft.getInstance().getSession().getUsername(); private final Content content;
public GuiWorldHandler(Content content) throws Exception public GuiWorldHandler(Content content) throws Exception
{ {
@@ -73,7 +73,7 @@ public class GuiWorldHandler extends Container
menu.initGui(this); menu.initGui(this);
} }
for(IContainerWidget widget : this.widgets) for(IContainerWidget widget : WIDGETS)
{ {
if(widget.isEnabled()) if(widget.isEnabled())
{ {
@@ -98,7 +98,7 @@ public class GuiWorldHandler extends Container
int x = this.getContentX(); int x = this.getContentX();
int y = this.getContentY(); int y = this.getContentY();
for(IContainerWidget widget : this.widgets) for(IContainerWidget widget : WIDGETS)
{ {
if(widget.isEnabled()) if(widget.isEnabled())
{ {
@@ -125,7 +125,7 @@ public class GuiWorldHandler extends Container
menu.tick(); menu.tick();
} }
for(IContainerWidget widget : this.widgets) for(IContainerWidget widget : WIDGETS)
{ {
if(widget.isEnabled()) if(widget.isEnabled())
{ {
@@ -175,7 +175,7 @@ public class GuiWorldHandler extends Container
int x = this.getContentX(); int x = this.getContentX();
int y = this.getContentY(); int y = this.getContentY();
for(IContainerWidget widget : this.widgets) for(IContainerWidget widget : WIDGETS)
{ {
if(widget.isEnabled() && EnumLayer.BACKGROUND == widget.getLayer()) if(widget.isEnabled() && EnumLayer.BACKGROUND == widget.getLayer())
{ {
@@ -198,7 +198,7 @@ public class GuiWorldHandler extends Container
menu.draw(matrix, mouseX, mouseY, partialTicks); menu.draw(matrix, mouseX, mouseY, partialTicks);
} }
for(IContainerWidget widget : this.widgets) for(IContainerWidget widget : WIDGETS)
{ {
if(widget.isEnabled() && EnumLayer.FOREGROUND == widget.getLayer()) if(widget.isEnabled() && EnumLayer.FOREGROUND == widget.getLayer())
{ {
@@ -234,7 +234,7 @@ public class GuiWorldHandler extends Container
@Override @Override
public void mouseMoved(double xPos, double mouseY) public void mouseMoved(double xPos, double mouseY)
{ {
for(IContainerWidget widget : this.widgets) for(IContainerWidget widget : WIDGETS)
{ {
if(widget.isEnabled()) if(widget.isEnabled())
{ {
@@ -248,7 +248,7 @@ public class GuiWorldHandler extends Container
@Override @Override
public boolean mouseClicked(double mouseX, double mouseY, int keyCode) public boolean mouseClicked(double mouseX, double mouseY, int keyCode)
{ {
for(IContainerWidget widget : this.widgets) for(IContainerWidget widget : WIDGETS)
{ {
if(widget.isEnabled() && widget.mouseClicked(mouseX, mouseY, keyCode)) if(widget.isEnabled() && widget.mouseClicked(mouseX, mouseY, keyCode))
{ {
@@ -267,7 +267,7 @@ public class GuiWorldHandler extends Container
@Override @Override
public boolean mouseReleased(double mouseX, double mouseY, int keyCode) public boolean mouseReleased(double mouseX, double mouseY, int keyCode)
{ {
for(IContainerWidget widget : this.widgets) for(IContainerWidget widget : WIDGETS)
{ {
if(widget.isEnabled() && widget.mouseReleased(mouseX, mouseY, keyCode)) if(widget.isEnabled() && widget.mouseReleased(mouseX, mouseY, keyCode))
{ {
@@ -286,7 +286,7 @@ public class GuiWorldHandler extends Container
@Override @Override
public boolean mouseDragged(double mouseX, double mouseY, int keyCode, double deltaX, double deltaY) public boolean mouseDragged(double mouseX, double mouseY, int keyCode, double deltaX, double deltaY)
{ {
for(IContainerWidget widget : this.widgets) for(IContainerWidget widget : WIDGETS)
{ {
if(widget.isEnabled() && widget.mouseDragged(mouseX, mouseY, keyCode, deltaX, deltaY)) if(widget.isEnabled() && widget.mouseDragged(mouseX, mouseY, keyCode, deltaX, deltaY))
{ {
@@ -305,7 +305,7 @@ public class GuiWorldHandler extends Container
@Override @Override
public boolean mouseScrolled(double mouseX, double mouseY, double distance) public boolean mouseScrolled(double mouseX, double mouseY, double distance)
{ {
for(IContainerWidget widget : this.widgets) for(IContainerWidget widget : WIDGETS)
{ {
if(widget.isEnabled() && widget.mouseScrolled(mouseX, mouseY, distance)) if(widget.isEnabled() && widget.mouseScrolled(mouseX, mouseY, distance))
{ {
@@ -337,7 +337,7 @@ public class GuiWorldHandler extends Container
return true; return true;
} }
for(IContainerWidget widget : this.widgets) for(IContainerWidget widget : WIDGETS)
{ {
if(widget.isEnabled() && widget.keyPressed(keyCode, scanCode, modifiers)) if(widget.isEnabled() && widget.keyPressed(keyCode, scanCode, modifiers))
{ {
@@ -356,7 +356,7 @@ public class GuiWorldHandler extends Container
@Override @Override
public boolean keyReleased(int keyCode, int scanCode, int modifiers) public boolean keyReleased(int keyCode, int scanCode, int modifiers)
{ {
for(IContainerWidget widget : this.widgets) for(IContainerWidget widget : WIDGETS)
{ {
if(widget.isEnabled() && widget.keyReleased(keyCode, scanCode, modifiers)) if(widget.isEnabled() && widget.keyReleased(keyCode, scanCode, modifiers))
{ {
@@ -375,7 +375,7 @@ public class GuiWorldHandler extends Container
@Override @Override
public boolean charTyped(char charTyped, int keyCode) public boolean charTyped(char charTyped, int keyCode)
{ {
for(IContainerWidget widget : this.widgets) for(IContainerWidget widget : WIDGETS)
{ {
if(widget.isEnabled() && widget.charTyped(charTyped, keyCode)) if(widget.isEnabled() && widget.charTyped(charTyped, keyCode))
{ {
@@ -394,7 +394,7 @@ public class GuiWorldHandler extends Container
@Override @Override
public boolean changeFocus(boolean focus) public boolean changeFocus(boolean focus)
{ {
for(IContainerWidget widget : this.widgets) for(IContainerWidget widget : WIDGETS)
{ {
if(widget.isEnabled() && widget.changeFocus(focus)) if(widget.isEnabled() && widget.changeFocus(focus))
{ {
@@ -413,7 +413,7 @@ public class GuiWorldHandler extends Container
@Override @Override
public boolean isMouseOver(double mouseX, double mouseY) public boolean isMouseOver(double mouseX, double mouseY)
{ {
for(IContainerWidget widget : this.widgets) for(IContainerWidget widget : WIDGETS)
{ {
if(widget.isEnabled() && widget.isMouseOver(mouseX, mouseY)) if(widget.isEnabled() && widget.isMouseOver(mouseX, mouseY))
{ {