diff --git a/src/main/java/net/montoyo/wd/client/gui/GuiRedstoneCtrl.java b/src/main/java/net/montoyo/wd/client/gui/GuiRedstoneCtrl.java index 6d82dfc..8c3b8a3 100644 --- a/src/main/java/net/montoyo/wd/client/gui/GuiRedstoneCtrl.java +++ b/src/main/java/net/montoyo/wd/client/gui/GuiRedstoneCtrl.java @@ -4,16 +4,16 @@ package net.montoyo.wd.client.gui; +import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; import net.montoyo.mcef.api.API; -import net.montoyo.wd.client.ClientProxy; import net.montoyo.wd.WebDisplays; +import net.montoyo.wd.client.ClientProxy; import net.montoyo.wd.client.gui.controls.Button; import net.montoyo.wd.client.gui.controls.TextField; import net.montoyo.wd.client.gui.loading.FillControl; +import net.montoyo.wd.net.Messages; import net.montoyo.wd.net.server.SMessageRedstoneCtrl; import net.montoyo.wd.utilities.BlockSide; import net.montoyo.wd.utilities.Util; @@ -37,10 +37,7 @@ public class GuiRedstoneCtrl extends WDScreen { @FillControl private Button btnOk; - public GuiRedstoneCtrl() { - } - - public GuiRedstoneCtrl(ResourceLocation d, Vector3i p, String r, String f) { + public GuiRedstoneCtrl(Component component, ResourceLocation d, Vector3i p, String r, String f) { super(component); dimension = d; pos = p; @@ -49,8 +46,8 @@ public class GuiRedstoneCtrl extends WDScreen { } @Override - public void initGui() { - super.initGui(); + public void init() { + super.init(); loadFrom(new ResourceLocation("webdisplays", "gui/redstonectrl.json")); tfRisingEdge.setText(risingEdgeURL); tfFallingEdge.setText(fallingEdgeURL); @@ -63,10 +60,10 @@ public class GuiRedstoneCtrl extends WDScreen { String rising = mcef.punycode(Util.addProtocol(tfRisingEdge.getText())); String falling = mcef.punycode(Util.addProtocol(tfFallingEdge.getText())); - WebDisplays.NET_HANDLER.sendToServer(new SMessageRedstoneCtrl(dimension, pos, rising, falling)); + Messages.INSTANCE.sendToServer(new SMessageRedstoneCtrl(dimension, pos, rising, falling)); } - mc.displayGuiScreen(null); + minecraft.setScreen(null); } @Override diff --git a/src/main/java/net/montoyo/wd/client/gui/GuiScreenConfig.java b/src/main/java/net/montoyo/wd/client/gui/GuiScreenConfig.java index 473b925..f695467 100644 --- a/src/main/java/net/montoyo/wd/client/gui/GuiScreenConfig.java +++ b/src/main/java/net/montoyo/wd/client/gui/GuiScreenConfig.java @@ -6,15 +6,21 @@ package net.montoyo.wd.client.gui; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.resources.I18n; +import net.minecraft.client.resources.language.I18n; +import net.minecraft.core.BlockPos; import net.minecraft.item.ItemStack; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.item.ItemStack; import net.montoyo.wd.WebDisplays; import net.montoyo.wd.client.gui.controls.*; import net.montoyo.wd.client.gui.loading.FillControl; import net.montoyo.wd.core.ScreenRights; import net.montoyo.wd.entity.TileEntityScreen; import net.montoyo.wd.item.WDItem; +import net.montoyo.wd.net.Messages; import net.montoyo.wd.net.server.SMessageScreenCtrl; import net.montoyo.wd.utilities.*; @@ -115,7 +121,8 @@ public class GuiScreenConfig extends WDScreen { private CheckBox[] friendBoxes; private CheckBox[] otherBoxes; - public GuiScreenConfig(TileEntityScreen tes, BlockSide side, NameUUIDPair[] friends, int fr, int or) { + public GuiScreenConfig(Component component, TileEntityScreen tes, BlockSide side, NameUUIDPair[] friends, int fr, int or) { + super(component); this.tes = tes; this.side = side; this.friends = friends; @@ -124,8 +131,8 @@ public class GuiScreenConfig extends WDScreen { } @Override - public void initGui() { - super.initGui(); + public void init() { + super.init(); loadFrom(new ResourceLocation("webdisplays", "gui/screencfg.json")); friendBoxes = new CheckBox[] { boxFResolution, boxFUpgrades, boxFOthers, boxFFriends, boxFClick, boxFSetUrl }; @@ -169,11 +176,11 @@ public class GuiScreenConfig extends WDScreen { updateMyRights(); updateRotationStr(); - mc.getSoundHandler().playSound(PositionedSoundRecord.getRecord(WebDisplays.INSTANCE.soundScreenCfg, 1.0f, 1.0f)); + minecraft.getSoundManager().play(PositionedSoundRecord.getRecord(WebDisplays.INSTANCE.soundScreenCfg, 1.0f, 1.0f)); } private void updateRotationStr() { - btnChangeRot.setLabel(I18n.format("webdisplays.gui.screencfg.rot" + rotation.getAngleAsInt())); + btnChangeRot.setLabel(I18n.get("webdisplays.gui.screencfg.rot" + rotation.getAngleAsInt())); } private void addFriend(String name) { @@ -197,7 +204,7 @@ public class GuiScreenConfig extends WDScreen { throw new NumberFormatException(); //I'm lazy if(x != scr.resolution.x || y != scr.resolution.y) - WebDisplays.NET_HANDLER.sendToServer(SMessageScreenCtrl.vec2(tes, side, SMessageScreenCtrl.CTRL_SET_RESOLUTION, new Vector2i(x, y))); + Messages.INSTANCE.sendToServer(SMessageScreenCtrl.vec2(tes, side, SMessageScreenCtrl.CTRL_SET_RESOLUTION, new Vector2i(x, y))); } catch(NumberFormatException ex) { //Roll back tfResX.setText("" + scr.resolution.x); @@ -215,7 +222,7 @@ public class GuiScreenConfig extends WDScreen { clickSetRes(); else if(ev.getSource() == btnChangeRot) { Rotation[] rots = Rotation.values(); - WebDisplays.NET_HANDLER.sendToServer(new SMessageScreenCtrl(tes, side, rots[(rotation.ordinal() + 1) % rots.length])); + Messages.INSTANCE.sendToServer(new SMessageScreenCtrl(tes, side, rots[(rotation.ordinal() + 1) % rots.length])); } } @@ -278,7 +285,7 @@ public class GuiScreenConfig extends WDScreen { @GuiSubscribe public void onRemovePlayer(List.EntryClick ev) { if(ev.getSource() == lstFriends) - WebDisplays.NET_HANDLER.sendToServer(new SMessageScreenCtrl(tes, side, (NameUUIDPair) ev.getUserdata(), true)); + Messages.INSTANCE.sendToServer(new SMessageScreenCtrl(tes, side, (NameUUIDPair) ev.getUserdata(), true)); } @GuiSubscribe @@ -309,12 +316,12 @@ public class GuiScreenConfig extends WDScreen { cbLockRatio.setChecked(false); } } else if(ev.getSource() == cbAutoVolume) - WebDisplays.NET_HANDLER.sendToServer(SMessageScreenCtrl.autoVol(tes, side, ev.isChecked())); + Messages.INSTANCE.sendToServer(SMessageScreenCtrl.autoVol(tes, side, ev.isChecked())); } @GuiSubscribe public void onRemoveUpgrade(UpgradeGroup.ClickEvent ev) { - WebDisplays.NET_HANDLER.sendToServer(new SMessageScreenCtrl(tes, side, ev.getMouseOverStack())); + Messages.INSTANCE.sendToServer(new SMessageScreenCtrl(tes, side, ev.getMouseOverStack())); } public boolean isFriendCheckbox(CheckBox cb) { @@ -335,7 +342,7 @@ public class GuiScreenConfig extends WDScreen { if(adding) { if(!hasFriend(pairs[0])) - WebDisplays.NET_HANDLER.sendToServer(new SMessageScreenCtrl(tes, side, pairs[0], false)); + Messages.INSTANCE.sendToServer(new SMessageScreenCtrl(tes, side, pairs[0], false)); tfFriend.setDisabled(false); tfFriend.clear(); @@ -424,12 +431,12 @@ public class GuiScreenConfig extends WDScreen { @Override protected void sync() { - WebDisplays.NET_HANDLER.sendToServer(new SMessageScreenCtrl(tes, side, friendRights, otherRights)); + Messages.INSTANCE.sendToServer(new SMessageScreenCtrl(tes, side, friendRights, otherRights)); Log.info("Sent sync packet"); } public void updateMyRights() { - NameUUIDPair me = new NameUUIDPair(mc.player.getGameProfile()); + NameUUIDPair me = new NameUUIDPair(minecraft.player.getGameProfile()); int myRights; boolean clientIsOwner = false; @@ -483,7 +490,7 @@ public class GuiScreenConfig extends WDScreen { @Override public boolean isForBlock(BlockPos bp, BlockSide side) { - return bp.equals(tes.getPos()) && side == this.side; + return bp.equals(tes.getBlockPos()) && side == this.side; } @Nullable diff --git a/src/main/java/net/montoyo/wd/client/gui/GuiSetURL2.java b/src/main/java/net/montoyo/wd/client/gui/GuiSetURL2.java index 0fa337f..45f6e08 100644 --- a/src/main/java/net/montoyo/wd/client/gui/GuiSetURL2.java +++ b/src/main/java/net/montoyo/wd/client/gui/GuiSetURL2.java @@ -5,15 +5,19 @@ package net.montoyo.wd.client.gui; import net.minecraft.item.ItemStack; +import net.minecraft.resources.ResourceLocation; import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.item.ItemStack; import net.montoyo.wd.WebDisplays; import net.montoyo.wd.client.ClientProxy; import net.montoyo.wd.client.gui.controls.Button; import net.montoyo.wd.client.gui.controls.TextField; import net.montoyo.wd.client.gui.loading.FillControl; import net.montoyo.wd.entity.TileEntityScreen; +import net.montoyo.wd.net.Messages; import net.montoyo.wd.net.server.SMessagePadCtrl; import net.montoyo.wd.net.server.SMessageScreenCtrl; import net.montoyo.wd.utilities.BlockSide; @@ -48,6 +52,7 @@ public class GuiSetURL2 extends WDScreen { private Button btnOk; public GuiSetURL2(TileEntityScreen tes, BlockSide side, String url, Vector3i rl) { + super(); tileEntity = tes; screenSide = side; remoteLocation = rl; @@ -61,8 +66,8 @@ public class GuiSetURL2 extends WDScreen { } @Override - public void initGui() { - super.initGui(); + public void init() { + super.init(); loadFrom(new ResourceLocation("webdisplays", "gui/seturl.json")); tfURL.setText(screenURL); } @@ -75,14 +80,14 @@ public class GuiSetURL2 extends WDScreen { @GuiSubscribe public void onButtonClicked(Button.ClickEvent ev) { if(ev.getSource() == btnCancel) - mc.displayGuiScreen(null); + minecraft.setScreen(null); else if(ev.getSource() == btnOk) validate(tfURL.getText()); else if(ev.getSource() == btnShutDown) { if(isPad) - WebDisplays.NET_HANDLER.sendToServer(new SMessagePadCtrl("")); + Messages.INSTANCE.sendToServer(new SMessagePadCtrl("")); - mc.displayGuiScreen(null); + minecraft.setScreen(null); } } @@ -97,17 +102,17 @@ public class GuiSetURL2 extends WDScreen { url = ((ClientProxy) WebDisplays.PROXY).getMCEF().punycode(url); if(isPad) { - WebDisplays.NET_HANDLER.sendToServer(new SMessagePadCtrl(url)); - ItemStack held = mc.player.getHeldItem(EnumHand.MAIN_HAND); + Messages.INSTANCE.sendToServer(new SMessagePadCtrl(url)); + ItemStack held = minecraft.player.getItemInHand(InteractionHand.MAIN_HAND); - if(held.getItem() == WebDisplays.INSTANCE.itemMinePad && held.getTagCompound() != null && held.getTagCompound().hasKey("PadID")) { - ClientProxy.PadData pd = ((ClientProxy) WebDisplays.PROXY).getPadByID(held.getTagCompound().getInteger("PadID")); + if(held.getItem() == WebDisplays.INSTANCE.itemMinePad && held.getTag() != null && held.getTag().contains("PadID")) { + ClientProxy.PadData pd = ((ClientProxy) WebDisplays.PROXY).getPadByID(held.getTag().getInt("PadID")); if(pd != null && pd.view != null) pd.view.loadURL(WebDisplays.applyBlacklist(url)); } } else - WebDisplays.NET_HANDLER.sendToServer(SMessageScreenCtrl.setURL(tileEntity, screenSide, url, remoteLocation)); + Messages.INSTANCE.sendToServer(SMessageScreenCtrl.setURL(tileEntity, screenSide, url, remoteLocation)); } mc.displayGuiScreen(null); diff --git a/src/main/java/net/montoyo/wd/client/gui/WDScreen.java b/src/main/java/net/montoyo/wd/client/gui/WDScreen.java index fe758e3..24ee190 100644 --- a/src/main/java/net/montoyo/wd/client/gui/WDScreen.java +++ b/src/main/java/net/montoyo/wd/client/gui/WDScreen.java @@ -21,6 +21,7 @@ import net.montoyo.wd.client.gui.controls.Event; import net.montoyo.wd.client.gui.loading.FillControl; import net.montoyo.wd.client.gui.loading.GuiLoader; import net.montoyo.wd.client.gui.loading.JsonOWrapper; +import net.montoyo.wd.net.Messages; import net.montoyo.wd.net.server.SMessageACQuery; import net.montoyo.wd.utilities.BlockSide; import net.montoyo.wd.utilities.Bounds; @@ -330,7 +331,7 @@ public abstract class WDScreen extends Screen { } protected void requestAutocomplete(String beginning, boolean matchExact) { - WebDisplays.NET_HANDLER.sendToServer(new SMessageACQuery(beginning, matchExact)); + Messages.INSTANCE.sendToServer(new SMessageACQuery(beginning, matchExact)); } public void onAutocompleteResult(NameUUIDPair pairs[]) { diff --git a/src/main/java/net/montoyo/wd/client/gui/controls/UpgradeGroup.java b/src/main/java/net/montoyo/wd/client/gui/controls/UpgradeGroup.java index 9b4bbcb..d5304ca 100644 --- a/src/main/java/net/montoyo/wd/client/gui/controls/UpgradeGroup.java +++ b/src/main/java/net/montoyo/wd/client/gui/controls/UpgradeGroup.java @@ -5,8 +5,8 @@ package net.montoyo.wd.client.gui.controls; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderItem; -import net.minecraft.item.ItemStack; +import net.minecraft.client.renderer.entity.ItemRenderer; +import net.minecraft.world.item.ItemStack; import net.montoyo.wd.client.gui.loading.JsonOWrapper; import java.util.ArrayList; @@ -18,7 +18,7 @@ public class UpgradeGroup extends BasicControl { private ArrayList upgrades; private ItemStack overStack; private ItemStack clickStack; - private final RenderItem renderItem = Minecraft.getMinecraft().getRenderItem(); + private final ItemRenderer renderItem = Minecraft.getInstance().getItemRenderer(); public UpgradeGroup() { parent.requirePostDraw(this); @@ -33,8 +33,8 @@ public class UpgradeGroup extends BasicControl { if(is == overStack && !disabled) fillRect(x, y, 16, 16, 0x80FF0000); - renderItem.renderItemAndEffectIntoGUI(mc.player, is, x, y); - renderItem.renderItemOverlayIntoGUI(font, is, x, y, null); + renderItem.renderAndDecorateItem(mc.player, is, x, y, 0); + renderItem.renderAndDecorateItem(is, font.lineHeight, x, y); //TODO is lineHeight right? x += 18; } }