diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-03-02 22:54:24 +0100 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-03-02 22:54:24 +0100 |
| commit | e1c45045e8ae9ec0afd2c14515a13f9332094018 (patch) | |
| tree | 247dcac13d4d0432dbc4e2d83d90e0a24d89e755 /src/main/java/at/hannibal2/skyhanni/mixins | |
| parent | 9e1016af6b119fb3064687b783c9e81af2d72f88 (diff) | |
| download | skyhanni-e1c45045e8ae9ec0afd2c14515a13f9332094018.tar.gz skyhanni-e1c45045e8ae9ec0afd2c14515a13f9332094018.tar.bz2 skyhanni-e1c45045e8ae9ec0afd2c14515a13f9332094018.zip | |
Removed old, unused methods.
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/mixins')
4 files changed, 0 insertions, 339 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/AccessorGuiContainer.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/AccessorGuiContainer.java index e1e2c7c75..5fbc6dee5 100644 --- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/AccessorGuiContainer.java +++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/AccessorGuiContainer.java @@ -1,33 +1,16 @@ package at.hannibal2.skyhanni.mixins.transformers.gui; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.inventory.Slot; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; -import org.spongepowered.asm.mixin.gen.Invoker; @Mixin(GuiContainer.class) public interface AccessorGuiContainer { - @Invoker("getSlotAtPosition") - Slot doGetSlotAtPosition(int x, int y); - - @Invoker("drawSlot") - void doDrawSlot(Slot slot); - - @Invoker("isMouseOverSlot") - boolean doIsMouseOverSlot(Slot slot, int x, int y); - @Accessor("guiLeft") int getGuiLeft(); @Accessor("guiTop") int getGuiTop(); - @Accessor("xSize") - int getXSize(); - - @Accessor("ySize") - int getYSize(); - } diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiNewChat.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiNewChat.java index f21b4c948..31a915b05 100644 --- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiNewChat.java +++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiNewChat.java @@ -16,5 +16,4 @@ public class MixinGuiNewChat { if (SkyHanniMod.feature.chat.peekChat != Keyboard.KEY_NONE && Keyboard.isKeyDown(SkyHanniMod.feature.chat.peekChat)) cir.setReturnValue(true); } - } diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/inventory/GuiEditSignMixin.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/inventory/GuiEditSignMixin.java deleted file mode 100644 index 99c56d8be..000000000 --- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/inventory/GuiEditSignMixin.java +++ /dev/null @@ -1,265 +0,0 @@ -package at.hannibal2.skyhanni.mixins.transformers.gui.inventory; - -import at.hannibal2.skyhanni.sign.*; -import at.hannibal2.skyhanni.utils.LorenzUtils; -import net.minecraft.block.Block; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.gui.inventory.GuiEditSign; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.init.Blocks; -import net.minecraft.tileentity.TileEntitySign; -import net.minecraft.util.ChatComponentText; -import org.lwjgl.input.Keyboard; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.At.Shift; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import java.io.IOException; -import java.util.List; - -@Mixin(GuiEditSign.class) -public class GuiEditSignMixin extends GuiScreen implements IEditSign { - - private final GuiEditSign that = (GuiEditSign) (Object) this; - private TextInputUtil textInputUtil; - private SignSelectionList globalSelector; - - @Shadow - private int editLine; - - @Shadow - private int updateCounter; - - private static TileEntitySign getTileSign(GuiEditSign editSign) { - return LorenzSignUtils.getTileSign(editSign); - } - - @Inject(method = "initGui()V", at = @At("RETURN")) - private void initGui(CallbackInfo info) { - // this.textInputUtil = new TextInputUtil(this.fontRendererObj, () -> ((IModifiedSign) this.that.tileSign).getText(this.editLine).getUnformattedText(), text -> ((IModifiedSign) this.that.tileSign).setText(this.editLine, new ChatComponentText(text)), 90); - this.textInputUtil = new TextInputUtil(this.fontRendererObj, () -> ((IModifiedSign) getTileSign(this.that)).getText(this.editLine).getUnformattedText(), text -> ((IModifiedSign) getTileSign(this.that)).setText(this.editLine, new ChatComponentText(text)), 90); - - if (LorenzUtils.INSTANCE.getInSkyBlock() && SkyBlockcatiaConfig.enableSignSelectionList) { - List<SignSelectionList.Entry> list = null; - String title = null; - - if (this.isAuctionStartBidSign()) { - list = SignSelectionList.AUCTION_STARTING_BID_PRICES; - title = "Select price"; - } - if (this.isAuctionPrice()) { - list = SignSelectionList.AUCTION_BID_PRICES; - title = "Select bid price"; - } - if (this.isAuctionQuery()) { - list = SignSelectionList.AUCTION_QUERIES; - title = "Select query"; - } - if (this.isBankWithdraw()) { - list = SignSelectionList.BANK_WITHDRAW; - title = "Select withdraw"; - } - if (this.isBankDeposit()) { - list = SignSelectionList.BANK_DEPOSIT; - title = "Select deposit"; - } - if (this.isBazaarOrder()) { - list = SignSelectionList.BAZAAR_ORDER; - title = "Select bazaar order"; - } - if (this.isBazaarPrice()) { - list = SignSelectionList.BAZAAR_PRICE; - title = "Select bazaar price"; - } - if (list != null && title != null) { - this.globalSelector = new SignSelectionList(this.mc, this.width + 200, this.height, 64, this.height - 64, list, title); - } - } - } - - @Inject(method = "onGuiClosed()V", cancellable = true, at = @At("HEAD")) - private void onGuiClosed(CallbackInfo info) { - if (SkyBlockcatiaConfig.enableSignSelectionList) { - Keyboard.enableRepeatEvents(false); - - if (LorenzUtils.INSTANCE.getInSkyBlock()) { - // String text = this.that.tileSign.signText[0].getUnformattedText(); - String text = getTileSign(this.that).signText[0].getUnformattedText(); - // if (!StringUtils.isNullOrEmpty(text)) - // { - // if (NumberUtils.isNumericWithKM(text) && (!SkyBlockcatiaSettings.INSTANCE.auctionBidConfirm && this.isAuctionPrice() || this.isAuctionStartBidSign() || this.isBazaarPrice() || this.isBankWithdraw() || this.isBankDeposit())) - // { - // this.globalSelector.add(text); - // } - // else if (NumberUtils.isNumeric(text) && this.isBazaarOrder()) - // { - // this.globalSelector.add(text); - // } - // else if (this.isAuctionQuery()) - // { - // this.globalSelector.add(text); - // } - // } - } - // if (!(SkyBlockcatiaSettings.INSTANCE.auctionBidConfirm && this.isAuctionPrice())) { - //// SignSelectionList.processSignData(this.that.tileSign); - // SignSelectionList.processSignData(getTileSign(this.that)); - // } - info.cancel(); - } - } - - @Inject(method = "actionPerformed(Lnet/minecraft/client/gui/GuiButton;)V", cancellable = true, at = @At(value = "INVOKE", target = "net/minecraft/tileentity/TileEntitySign.markDirty()V", shift = Shift.AFTER)) - private void actionPerformed(GuiButton button, CallbackInfo info) throws IOException { - // if (SkyBlockcatiaSettings.INSTANCE.auctionBidConfirm) - // { - // String text = this.that.tileSign.signText[0].getUnformattedText(); - // - // if (!StringUtils.isNullOrEmpty(text) && NumberUtils.isNumeric(text) && this.isAuctionPrice()) - // { - // int price = Integer.parseInt(text); - // - // if (price >= SkyBlockcatiaSettings.INSTANCE.auctionBidConfirmValue) - // { - // this.mc.displayGuiScreen(new GuiYesNo(this, LangUtils.translate("message.bid_confirm_title"), LangUtils.translate("message.bid_confirm"), 201)); - // info.cancel(); - // } - // else - // { - // this.that.tileSign.markDirty(); - // SignSelectionList.processSignData(this.that.tileSign); - // this.globalSelector.add(text); - // } - // } - // } - } - - @Inject(method = "keyTyped(CI)V", cancellable = true, at = @At("HEAD")) - private void keyTyped(char typedChar, int keyCode, CallbackInfo info) throws IOException { - if (SkyBlockcatiaConfig.enableOverwriteSignEditing) { - this.textInputUtil.insert(typedChar); - this.keyPressed(keyCode); - info.cancel(); - } - } - - @Inject(method = "drawScreen(IIF)V", cancellable = true, at = @At("HEAD")) - private void drawScreenPre(int mouseX, int mouseY, float partialTicks, CallbackInfo info) { - if (SkyBlockcatiaConfig.enableOverwriteSignEditing) { - this.drawDefaultBackground(); - // this.drawCenteredString(this.fontRendererObj, LangUtils.translate("sign.edit"), this.width / 2, 40, 16777215); - this.drawCenteredString(this.fontRendererObj, "Sign Edit", this.width / 2, 40, 16777215); - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - GlStateManager.pushMatrix(); - GlStateManager.translate(this.width / 2d, 0.0F, 50.0F); - float f = 93.75F; - GlStateManager.scale(-f, -f, -f); - GlStateManager.rotate(180.0F, 0.0F, 1.0F, 0.0F); - // Block block = this.that.tileSign.getBlockType(); - Block block = getTileSign(this.that).getBlockType(); - - if (block == Blocks.standing_sign) { - // float f1 = this.that.tileSign.getBlockMetadata() * 360 / 16.0F; - float f1 = getTileSign(this.that).getBlockMetadata() * 360 / 16.0F; - GlStateManager.rotate(f1, 0.0F, 1.0F, 0.0F); - GlStateManager.translate(0.0F, -1.0625F, 0.0F); - } else { - // int i = this.that.tileSign.getBlockMetadata(); - int i = getTileSign(this.that).getBlockMetadata(); - float f2 = 0.0F; - - if (i == 2) { - f2 = 180.0F; - } - - if (i == 4) { - f2 = 90.0F; - } - - if (i == 5) { - f2 = -90.0F; - } - GlStateManager.rotate(f2, 0.0F, 1.0F, 0.0F); - GlStateManager.translate(0.0F, -1.0625F, 0.0F); - } - // ((IModifiedSign) this.that.tileSign).setSelectionState(this.editLine, this.textInputUtil.getSelectionStart(), this.textInputUtil.getSelectionEnd(), this.updateCounter / 6 % 2 == 0); - ((IModifiedSign) getTileSign(this.that)).setSelectionState(this.editLine, this.textInputUtil.getSelectionStart(), this.textInputUtil.getSelectionEnd(), this.updateCounter / 6 % 2 == 0); - // TileEntityRendererDispatcher.instance.renderTileEntityAt(this.that.tileSign, -0.5D, -0.75D, -0.5D, 0.0F); - TileEntityRendererDispatcher.instance.renderTileEntityAt(getTileSign(this.that), -0.5D, -0.75D, -0.5D, 0.0F); - // ((IModifiedSign) this.that.tileSign).resetSelectionState(); - ((IModifiedSign) getTileSign(this.that)).resetSelectionState(); - GlStateManager.popMatrix(); - super.drawScreen(mouseX, mouseY, partialTicks); - - if (LorenzUtils.INSTANCE.getInSkyBlock() && SkyBlockcatiaConfig.enableSignSelectionList && this.globalSelector != null) { - this.globalSelector.drawScreen(mouseX, mouseY, partialTicks); - } - info.cancel(); - } - } - - @Inject(method = "drawScreen(IIF)V", cancellable = true, at = @At("RETURN")) - private void drawScreenPost(int mouseX, int mouseY, float partialTicks, CallbackInfo info) { - if (!SkyBlockcatiaConfig.enableOverwriteSignEditing && LorenzUtils.INSTANCE.getInSkyBlock() && SkyBlockcatiaConfig.enableSignSelectionList && this.globalSelector != null) { - this.globalSelector.drawScreen(mouseX, mouseY, partialTicks); - } - } - - @Override - public TextInputUtil getTextInputUtil() { - return this.textInputUtil; - } - - @Override - public SignSelectionList getSignSelectionList() { - return this.globalSelector; - } - - private boolean keyPressed(int keyCode) { - if (keyCode == Keyboard.KEY_UP) { - this.editLine = this.editLine - 1 & 3; - this.textInputUtil.moveCaretToEnd(); - return true; - } else if (keyCode != Keyboard.KEY_DOWN && keyCode != Keyboard.KEY_RETURN && keyCode != Keyboard.KEY_NUMPADENTER) { - return this.textInputUtil.handleSpecialKey(keyCode); - } else { - this.editLine = this.editLine + 1 & 3; - this.textInputUtil.moveCaretToEnd(); - return true; - } - } - - private boolean isAuctionStartBidSign() { - // return this.that.tileSign.signText[2].getUnformattedText().equals("Your auction") && this.that.tileSign.signText[3].getUnformattedText().equals("starting bid"); - return getTileSign(this.that).signText[2].getUnformattedText().equals("Your auction") && getTileSign(this.that).signText[3].getUnformattedText().equals("starting bid"); - } - - private boolean isAuctionPrice() { - return getTileSign(this.that).signText[2].getUnformattedText().equals("auction bid") && getTileSign(this.that).signText[3].getUnformattedText().equals("amount"); - } - - private boolean isBazaarPrice() { - return getTileSign(this.that).signText[2].getUnformattedText().equals("Enter price") && getTileSign(this.that).signText[3].getUnformattedText().equals("big nerd"); - } - - private boolean isAuctionQuery() { - return getTileSign(this.that).signText[3].getUnformattedText().equals("Enter query"); - } - - private boolean isBankWithdraw() { - return getTileSign(this.that).signText[2].getUnformattedText().equals("Enter the amount") && getTileSign(this.that).signText[3].getUnformattedText().equals("to withdraw"); - } - - private boolean isBankDeposit() { - return getTileSign(this.that).signText[2].getUnformattedText().equals("Enter the amount") && getTileSign(this.that).signText[3].getUnformattedText().equals("to deposit"); - } - - private boolean isBazaarOrder() { - return getTileSign(this.that).signText[2].getUnformattedText().equals("Enter amount") && getTileSign(this.that).signText[3].getUnformattedText().equals("to order"); - } -} diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/tileentity/TileEntitySignMixin.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/tileentity/TileEntitySignMixin.java deleted file mode 100644 index 9b7ca99f0..000000000 --- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/tileentity/TileEntitySignMixin.java +++ /dev/null @@ -1,56 +0,0 @@ -package at.hannibal2.skyhanni.mixins.transformers.tileentity; - -import at.hannibal2.skyhanni.sign.IModifiedSign; -import net.minecraft.tileentity.TileEntitySign; -import net.minecraft.util.IChatComponent; -import org.spongepowered.asm.mixin.Mixin; - -@Mixin(TileEntitySign.class) -public class TileEntitySignMixin implements IModifiedSign { - - private final TileEntitySign that = (TileEntitySign) (Object) this; - private int selectionStart = -1; - private int selectionEnd = -1; - private boolean caretVisible; - - @Override - public IChatComponent getText(int line) { - return this.that.signText[line]; - } - - @Override - public void setText(int line, IChatComponent component) { - this.that.signText[line] = component; - } - - @Override - public void setSelectionState(int currentRow, int selectionStart, int selectionEnd, boolean caretVisible) { - this.that.lineBeingEdited = currentRow; - this.selectionStart = selectionStart; - this.selectionEnd = selectionEnd; - this.caretVisible = caretVisible; - } - - @Override - public void resetSelectionState() { - this.that.lineBeingEdited = -1; - this.selectionStart = -1; - this.selectionEnd = -1; - this.caretVisible = false; - } - - @Override - public boolean getCaretVisible() { - return this.caretVisible; - } - - @Override - public int getSelectionStart() { - return this.selectionStart; - } - - @Override - public int getSelectionEnd() { - return this.selectionEnd; - } -} |
