From 4ed1a043315ec0e0815e9f24b1fd3e849a68b6ea Mon Sep 17 00:00:00 2001 From: p455w0rd Date: Mon, 2 May 2016 00:11:04 -0400 Subject: [PATCH] fixed #3 and #9, implemented #8 --- .../gui/GuiWirelessCraftingTerminal.java | 159 ++++++++++++------ .../ContainerWirelessCraftingTerminal.java | 63 ++----- .../core/sync/packets/PacketConfigSync.java | 8 +- .../handlers/ConfigHandler.java | 23 ++- .../handlers/LocaleHandler.java | 2 +- .../implementation/WCTInteractionHelper.java | 5 +- .../items/ItemWirelessCraftingTerminal.java | 16 +- .../proxy/CommonProxy.java | 15 +- .../reference/Reference.java | 3 +- src/resources/assets/ae2wct/lang/de_DE.lang | 1 + src/resources/assets/ae2wct/lang/en_US.lang | 1 + .../assets/ae2wct/textures/gui/crafting.png | Bin 21034 -> 20867 bytes src/resources/mcmod.info | 2 +- 13 files changed, 168 insertions(+), 130 deletions(-) diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java index e4ea714..6be45ea 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java @@ -69,6 +69,7 @@ import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotCraftingM import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotCraftingTerm; import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotDisabled; import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotFake; +import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotFakeCraftingMatrix; import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotInaccessible; import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotOutput; import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotTrash; @@ -89,7 +90,7 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo private float xSize_lo; private float ySize_lo; - public static int tick = 0, GUI_HEIGHT = 240, GUI_WIDTH = 198, AE_ROW_HEIGHT = 18, AE_NUM_ROWS = 3, + public static int tick = 0, GUI_HEIGHT = 240, GUI_WIDTH = 198, AE_ROW_HEIGHT = 18, AE_NUM_ROWS = 0, GUI_UPPER_HEIGHT = 35, GUI_SEARCH_ROW = 35, SEARCH_X = 81, SEARCH_Y = 6, SEARCH_WIDTH = 88, SEARCH_HEIGHT = 10, SEARCH_MAXCHARS = 15, GUI_LOWER_HEIGHT, AE_TOTAL_ROWS_HEIGHT, BUTTON_SEARCH_MODE_POS_X = -18, BUTTON_SEARCH_MODE_POS_Y = 68, BUTTON_SIZE = 16, NEI_EXTRA_SPACE = 30, @@ -131,10 +132,19 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo private boolean isNEIEnabled; private boolean wasTextboxFocused = false; private int screenResTicks = 0; + private int reservedSpace = 0; + private int maxRows = Integer.MAX_VALUE; + private int standardSize; + private final int lowerTextureOffset = 0; + private int rows = 0; public GuiWirelessCraftingTerminal(Container container) { super(container); GuiWirelessCraftingTerminal.INSTANCE = this; + this.xSize = GUI_WIDTH; + this.ySize = GUI_HEIGHT; + this.standardSize = this.xSize; + this.setReservedSpace(73); this.containerWCT = (ContainerWirelessCraftingTerminal) container; this.scrollBar = new GuiScrollbar(); this.subGui = switchingGuis; @@ -144,21 +154,23 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo this.configSrc = ((IConfigurableObject) this.inventorySlots).getConfigManager(); this.devicePowered = containerWCT.isPowered(); ((ContainerWirelessCraftingTerminal) this.inventorySlots).setGui(this); - this.isNEIEnabled = IntegrationRegistry.INSTANCE.isEnabled(IntegrationType.NEI); } public void postUpdate(final List list) { for (final IAEItemStack is : list) { this.repo.postUpdate(is); } - this.repo.updateView(); this.setScrollBar(); } private void setScrollBar() { - this.getScrollBar().setTop(18).setLeft(174).setHeight((AE_NUM_ROWS + 3) * 18 - 2); - this.getScrollBar().setRange(0, (this.repo.size() + this.perRow - 1) / this.perRow - (AE_NUM_ROWS + 3), Math.max(1, (AE_NUM_ROWS + 3) / 6)); + this.getScrollBar().setTop( 18 ).setLeft( 174 ).setHeight( this.rows * 18 - 2 ); + this.getScrollBar().setRange( 0, ( this.repo.size() + this.perRow - 1 ) / this.perRow - this.rows, Math.max( 1, this.rows / 6 ) ); + } + + protected void setScrollBar(final GuiScrollbar myScrollBar) { + this.scrollBar = myScrollBar; } @SuppressWarnings("rawtypes") @@ -255,6 +267,24 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo return this.subGui; } + int getReservedSpace() { + return this.reservedSpace; + } + + void setReservedSpace(final int reservedSpace) { + this.reservedSpace = reservedSpace; + } + + public int getStandardSize() + { + return this.standardSize; + } + + void setStandardSize( final int standardSize ) + { + this.standardSize = standardSize; + } + /** * Initializes the GUI */ @@ -262,13 +292,39 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo @Override public void initGui() { Keyboard.enableRepeatEvents(true); + this.maxRows = this.getMaxRows(); + this.isNEIEnabled = IntegrationRegistry.INSTANCE.isEnabled(IntegrationType.NEI); + int top = isNEIEnabled ? 22 : 0; + final int magicNumber = 114 + 1; + final int extraSpace = this.height - magicNumber - 0 - top - this.reservedSpace; + this.rows = (int) Math.floor(extraSpace / 18); + if (this.rows > this.maxRows) { + top += (this.rows - this.maxRows) * 18 / 2; + this.rows = this.maxRows; + } + + if (isNEIEnabled) { + this.rows--; + } + + if (this.rows < 3) { + this.rows = 3; + } + this.getMeSlots().clear(); - for (int y = 0; y < AE_NUM_ROWS + 3; y++) { + for (int y = 0; y < this.rows; y++) { for (int x = 0; x < this.perRow; x++) { this.getMeSlots().add(new InternalSlotME(this.repo, x + y * this.perRow, this.offsetX + x * 18, 18 + y * 18)); } } + this.xSize = this.standardSize; super.initGui(); + + this.ySize = magicNumber + this.rows * 18 + this.reservedSpace; + final int unusedSpace = this.height - this.ySize; + this.guiTop = (int) Math.floor(unusedSpace / (unusedSpace < 0 ? 3.8f : 2.0f)); + int offset = this.guiTop + 8; + final List slots = this.getInventorySlots(); final Iterator i = slots.iterator(); while (i.hasNext()) { @@ -280,11 +336,10 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo for (final InternalSlotME me : this.meSlots) { slots.add(new SlotME(me)); } - int offset = this.guiTop + 8; this.buttonList.clear(); - this.buttonList.add(this.clearBtn = new GuiImgButton(this.guiLeft + 134, GuiWirelessCraftingTerminal.GUI_HEIGHT - GuiWirelessCraftingTerminal.GUI_LOWER_HEIGHT + 46, Settings.ACTIONS, ActionItems.STASH)); - this.buttonList.add(this.trashBtn = new GuiTrashButton(this.guiLeft + 98, GuiWirelessCraftingTerminal.GUI_HEIGHT - GuiWirelessCraftingTerminal.GUI_LOWER_HEIGHT + 103)); + this.buttonList.add(this.clearBtn = new GuiImgButton(this.guiLeft + 134, this.guiTop + this.ySize - 160, Settings.ACTIONS, ActionItems.STASH)); + this.buttonList.add(this.trashBtn = new GuiTrashButton(this.guiLeft + 98, this.guiTop + this.ySize - 104)); this.clearBtn.setHalfSize(true); if (this.customSortOrder) { this.buttonList.add(this.SortByBox = new GuiImgButton(this.guiLeft - 18, offset, Settings.SORT_BY, this.configSrc.getSetting(Settings.SORT_BY))); @@ -314,7 +369,7 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo final Enum setting = AEConfig.instance.settings.getSetting(Settings.SEARCH_MODE); this.searchField.setFocused(SearchBoxMode.AUTOSEARCH == setting || SearchBoxMode.NEI_AUTOSEARCH == setting); - if (this.isSubGui() || this.init) { + if (this.isSubGui()) { if (this.isSubGui()) { this.searchField.setText(memoryText); this.repo.setSearchString(memoryText); @@ -322,6 +377,25 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo this.repo.updateView(); this.setScrollBar(); } + + craftingGridOffsetX = Integer.MAX_VALUE; + craftingGridOffsetY = Integer.MAX_VALUE; + + for (final Object s : this.inventorySlots.inventorySlots) { + if (s instanceof AppEngSlot) { + if (((Slot) s).xDisplayPosition < 197) { + this.repositionSlot((AppEngSlot) s); + } + } + + if (s instanceof SlotCraftingMatrix || s instanceof SlotFakeCraftingMatrix) { + final Slot g = (Slot) s; + if (g.xDisplayPosition > 0 && g.yDisplayPosition > 0) { + craftingGridOffsetX = Math.min(craftingGridOffsetX, g.xDisplayPosition); + craftingGridOffsetY = Math.min(craftingGridOffsetY, g.yDisplayPosition); + } + } + } } @SuppressWarnings("unchecked") @@ -329,6 +403,14 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo return this.inventorySlots.inventorySlots; } + int getMaxRows() { + return Integer.MAX_VALUE; + } + + protected void repositionSlot(final AppEngSlot s) { + s.yDisplayPosition = s.getY() + this.ySize - 78 - 5; + } + /** * Called every tick. It is used in this instance to detect screen size * changes to automatically update the gui height. @@ -342,7 +424,6 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo public void updateScreen() { this.devicePowered = containerWCT.isPowered(); this.repo.setPower(devicePowered); - //this.repo.setPower( true ); super.updateScreen(); if (this.init) { @@ -370,7 +451,6 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo this.wasTextboxFocused = false; this.wasResized = false; } - containerWCT.updateSlots(slotYOffset); this.reInit = false; tick = 0; } @@ -382,26 +462,6 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo if (!this.mc.thePlayer.isEntityAlive() || this.mc.thePlayer.isDead) { this.mc.thePlayer.closeScreen(); } - else { - // this block of variables is used to automatically - // reposition the slots in the container - GUI_HEIGHT = this.mc.displayHeight / 2; - AE_NUM_ROWS = Math.max(0, ((GUI_HEIGHT) - 240) / AE_ROW_HEIGHT); - if (isNEIEnabled && AE_NUM_ROWS >= 2) { - AE_NUM_ROWS -= 2; - GUI_HEIGHT -= AE_ROW_HEIGHT * 2 + 5; - this.clearBtn.yPosition = AE_TOTAL_ROWS_HEIGHT + GUI_SEARCH_ROW + GUI_UPPER_HEIGHT + 32; - this.trashBtn.yPosition = AE_TOTAL_ROWS_HEIGHT + GUI_SEARCH_ROW + GUI_UPPER_HEIGHT + 89; - } - else { - this.clearBtn.yPosition = AE_TOTAL_ROWS_HEIGHT + GUI_SEARCH_ROW + GUI_UPPER_HEIGHT + 13; - this.trashBtn.yPosition = AE_TOTAL_ROWS_HEIGHT + GUI_SEARCH_ROW + GUI_UPPER_HEIGHT + 68; - } - AE_TOTAL_ROWS_HEIGHT = AE_NUM_ROWS * AE_ROW_HEIGHT; - GUI_LOWER_HEIGHT = GUI_HEIGHT - AE_TOTAL_ROWS_HEIGHT - GUI_UPPER_HEIGHT; - slotYOffset = AE_TOTAL_ROWS_HEIGHT; - craftingGridOffsetY = slotYOffset + 83; - } } /** @@ -427,8 +487,6 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo super.drawScreen(mouseX, mouseY, btn); this.xSize_lo = (float) mouseX; this.ySize_lo = (float) mouseY; - this.xSize = GUI_WIDTH; - this.ySize = GUI_HEIGHT; final boolean hasClicked = Mouse.isButtonDown(0); if (hasClicked && this.scrollBar != null) { @@ -542,6 +600,7 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo /** * Draw GUI Labels and item tooltips */ + @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { final int ox = this.guiLeft; // (width - xSize) / 2; final int oy = this.guiTop; // (height - ySize) / 2; @@ -556,7 +615,7 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) { String s = LocaleHandler.WirelessTermLabel.getLocal(); this.mc.fontRenderer.drawString(s, 7, 5, 4210752); - this.mc.fontRenderer.drawString(I18n.format("container.inventory"), 7, AE_TOTAL_ROWS_HEIGHT + GUI_SEARCH_ROW + GUI_UPPER_HEIGHT + 3, 4210752); + this.mc.fontRenderer.drawString(I18n.format("container.inventory"), 7, this.ySize - 172 + 3, 4210752); if (this.searchField != null) { this.searchField.drawTextBox(); } @@ -565,6 +624,7 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo /** * Draw and piece together the background texture */ + @Override protected void drawGuiContainerBackgroundLayer(final float f, final int x, final int y) { final int ox = this.guiLeft; // (width - xSize) / 2; final int oy = this.guiTop; // (height - ySize) / 2; @@ -592,22 +652,24 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo } } - public void drawBG(int ox, int oy, int x, int y) { + public void drawBG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) { this.bindTexture(bgTexturePath); + final int x_width = 199; - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, GUI_WIDTH, GUI_UPPER_HEIGHT); - - for (int i = 0; i <= AE_NUM_ROWS; ++i) { - int yPos = this.guiTop + GUI_UPPER_HEIGHT + (i * AE_ROW_HEIGHT); - // Draw the texture - this.drawTexturedModalRect(this.guiLeft, yPos, 0, GUI_SEARCH_ROW, GUI_WIDTH, AE_ROW_HEIGHT); + this.drawTexturedModalRect( offsetX, offsetY, 0, 0, x_width, 18 ); + + for( int x = 0; x < this.rows; x++ ) + { + this.drawTexturedModalRect( offsetX, offsetY + 18 + x * 18, 0, 18, x_width, 18 ); } + + this.drawTexturedModalRect( offsetX, offsetY + 16 + this.rows * 18 + this.lowerTextureOffset, 0, 106 - 18 - 18, x_width, 99 + this.reservedSpace - this.lowerTextureOffset ); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + GUI_UPPER_HEIGHT + AE_TOTAL_ROWS_HEIGHT, 0, AE_ROW_HEIGHT + 17, GUI_WIDTH, GUI_LOWER_HEIGHT); if (Reference.WCT_BOOSTER_ENABLED) { - this.drawTexturedModalRect(this.guiLeft + 132, this.guiTop + GUI_UPPER_HEIGHT + AE_TOTAL_ROWS_HEIGHT + 102, 237, 237, 19, 19); + this.drawTexturedModalRect(this.guiLeft + 132, (this.guiTop + this.rows * 18) + 83, 237, 237, 19, 19); } - GuiInventory.func_147046_a(this.guiLeft + 51, this.guiTop + GUI_UPPER_HEIGHT + AE_TOTAL_ROWS_HEIGHT + 112, 32, (float) (this.guiLeft + 51) - this.xSize_lo, (float) (this.guiTop + 95 + (AE_NUM_ROWS * AE_ROW_HEIGHT)) - this.ySize_lo, this.mc.thePlayer); + GuiInventory.func_147046_a(this.guiLeft + 51, (this.guiTop + this.rows * 18) + 94, 32, (float) (this.guiLeft + 51) - this.xSize_lo, (float) ((this.guiTop + this.rows * 18) + 50) - this.ySize_lo, this.mc.thePlayer); + } @SuppressWarnings("rawtypes") @@ -872,7 +934,8 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo @Override public void onGuiClosed() { super.onGuiClosed(); - this.subGui = true; // in case the gui is reopened later ( i'm looking at you NEI ) + this.subGui = true; // in case the gui is reopened later ( i'm looking + // at you NEI ) Keyboard.enableRepeatEvents(false); if (this.searchField.getText() != null) { memoryText = this.searchField.getText(); @@ -1127,10 +1190,6 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo return this.scrollBar; } - protected void setScrollBar(final GuiScrollbar myScrollBar) { - this.scrollBar = myScrollBar; - } - protected List getMeSlots() { return this.meSlots; } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java index 7aaed39..989a157 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java @@ -121,14 +121,10 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon public ItemStack craftItem; private World worldObj; private EntityPlayer player; - @SuppressWarnings("unused") private static final int HOTBAR_START = 1, HOTBAR_END = HOTBAR_START + 8, INV_START = HOTBAR_END + 1, INV_END = INV_START + 26, ARMOR_START = INV_END + 1, ARMOR_END = ARMOR_START + 3, CRAFT_GRID_START = ARMOR_END + 1, CRAFT_GRID_END = CRAFT_GRID_START + 8, CRAFT_RESULT = CRAFT_GRID_END + 1, - BOOSTER_INDEX = 0, MAGNET_INDEX = CRAFT_RESULT + 1, TRASH_INDEX = MAGNET_INDEX + 1; - private int BOOSTER_Y_OFFSET = 139, HOTBAR_Y_OFFSET = 217, INV_Y_OFFSET = 159, ARMOR_Y_OFFSET = 83, - CRAFTMATRIX_Y_OFFSET = 83, CRAFTING_Y_OFFSET = 100, MAGNET_Y_OFFSET = BOOSTER_Y_OFFSET, - TRASH_Y_OFFSET = MAGNET_Y_OFFSET; + BOOSTER_INDEX = 0, MAGNET_INDEX = CRAFT_RESULT + 1; public static int CRAFTING_SLOT_X_POS = 80, CRAFTING_SLOT_Y_POS = 83; private SlotBooster boosterSlot; private SlotMagnet magnetSlot; @@ -139,8 +135,7 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon private SlotCraftingMatrix[] craftMatrixSlot; private SlotCraftingTerm craftingSlot; public SlotTrash trashSlot; - @SuppressWarnings("unused") - private int firstCraftingSlotNumber = -1, lastCraftingSlotNumber = -1, craftingSlotNumber = -1; + private int firstCraftingSlotNumber = -1, lastCraftingSlotNumber = -1; private final WirelessTerminalGuiObject obj; private boolean isContainerValid = true; @@ -224,7 +219,7 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon } if (Reference.WCT_BOOSTER_ENABLED) { - boosterSlot = new SlotBooster(this.boosterInventory, 0, 134, BOOSTER_Y_OFFSET); + boosterSlot = new SlotBooster(this.boosterInventory, 0, 134, -20); this.addSlotToContainer(boosterSlot); } else { @@ -234,7 +229,7 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon // Add hotbar slots for (int i = 0; i < 9; ++i) { - hotbarSlot[i] = new SlotPlayerHotBar(this.inventoryPlayer, i, i * 18 + 8, HOTBAR_Y_OFFSET); + hotbarSlot[i] = new SlotPlayerHotBar(this.inventoryPlayer, i, i * 18 + 8, 58); this.addSlotToContainer(hotbarSlot[i]); } @@ -243,7 +238,7 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon // Add player inventory slots for (int i = 0; i < 3; ++i) { for (int j = 0; j < 9; ++j) { - inventorySlot[k] = new SlotPlayerInv(this.inventoryPlayer, j + i * 9 + 9, j * 18 + 8, INV_Y_OFFSET + i * 18); + inventorySlot[k] = new SlotPlayerInv(this.inventoryPlayer, j + i * 9 + 9, j * 18 + 8, 0 + i * 18); this.addSlotToContainer(inventorySlot[k]); k++; } @@ -251,14 +246,14 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon // Add armor slots for (int i = 0; i < 4; ++i) { - armorSlot[i] = new SlotArmor(this.player, this.inventoryPlayer, 39 - i, (int) 8.5, ARMOR_Y_OFFSET + i * 18, i); + armorSlot[i] = new SlotArmor(this.player, this.inventoryPlayer, 39 - i, (int) 8.5, (i * 18) - 76, i); this.addSlotToContainer(armorSlot[i]); } k = 0; // Add crafting grid slots for (int i = 0; i < 3; ++i) { for (int j = 0; j < 3; ++j) { - craftMatrixSlot[k] = new SlotCraftingMatrix(this, this.craftingGrid, j + i * 3, 80 + j * 18, CRAFTMATRIX_Y_OFFSET + i * 18); + craftMatrixSlot[k] = new SlotCraftingMatrix(this, this.craftingGrid, j + i * 3, 80 + j * 18, (i * 18) - 76); this.addSlotToContainer(craftMatrixSlot[k]); if (k == 0) { this.firstCraftingSlotNumber = craftMatrixSlot[k].slotNumber; @@ -268,15 +263,14 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon } this.lastCraftingSlotNumber = craftMatrixSlot[8].slotNumber; - craftingSlot = new SlotCraftingTerm(this.getPlayerInv().player, this.mySrc, this.getPowerSource(), this.obj, this.craftingGrid, this.craftingGrid, this.output, 174, CRAFTING_Y_OFFSET, this); - this.craftingSlotNumber = this.lastCraftingSlotNumber + 1; + craftingSlot = new SlotCraftingTerm(this.getPlayerInv().player, this.mySrc, this.getPowerSource(), this.obj, this.craftingGrid, this.craftingGrid, this.output, 174, -58, this); // Add crafting result slot this.addSlotToContainer(craftingSlot); - magnetSlot = new SlotMagnet(this.magnetInventory, 152, MAGNET_Y_OFFSET); + magnetSlot = new SlotMagnet(this.magnetInventory, 152, -20); this.addSlotToContainer(magnetSlot); - trashSlot = new SlotTrash(this.trashInventory, 80, TRASH_Y_OFFSET, player); + trashSlot = new SlotTrash(this.trashInventory, 80, -20, player); trashSlot.setContainer(this); this.addSlotToContainer(trashSlot); @@ -685,43 +679,6 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon return null; } - public void updateSlots(int yOffset) { - int i, j, index = 0; - - this.getSlot(index).yDisplayPosition = BOOSTER_Y_OFFSET + yOffset; - - for (i = 0; i < 9; ++i) { - index++; - this.getSlot(index).yDisplayPosition = HOTBAR_Y_OFFSET + yOffset; - } - - for (i = 0; i < 3; ++i) { - for (j = 0; j < 9; ++j) { - index++; - this.getSlot(index).yDisplayPosition = INV_Y_OFFSET + yOffset + (18 * i); - } - } - - for (i = 0; i < 4; ++i) { - index++; - this.getSlot(index).yDisplayPosition = ARMOR_Y_OFFSET + yOffset + (18 * i); - } - - Reference.WCT_CRAFTMATRIX_Y_OFFSET = CRAFTMATRIX_Y_OFFSET + yOffset; - for (i = 0; i < 3; ++i) { - for (j = 0; j < 3; ++j) { - index++; - this.getSlot(index).yDisplayPosition = (CRAFTMATRIX_Y_OFFSET + yOffset) + (18 * i); - } - } - index++; - this.getSlot(index).yDisplayPosition = CRAFTING_Y_OFFSET + yOffset; - index++; - this.getSlot(index).yDisplayPosition = MAGNET_Y_OFFSET + yOffset; - index++; - this.getSlot(index).yDisplayPosition = TRASH_Y_OFFSET + yOffset; - } - private WirelessTerminalGuiObject getGuiObject(final ItemStack it, final EntityPlayer player, final World w, final int x, final int y, final int z) { if (it != null) { final IWirelessCraftingTermHandler wh = (IWirelessCraftingTermHandler) AEApi.instance().registries().wireless().getWirelessTerminalHandler(it); diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java index 1e253b9..7bd7c48 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java @@ -10,26 +10,29 @@ import net.p455w0rd.wirelesscraftingterminal.reference.Reference; public class PacketConfigSync extends WCTPacket { - int wirelessTermMaxPower; + int wirelessTermMaxPower, boosterDropChance; boolean easyMode, boosterEnabled; public PacketConfigSync(final ByteBuf stream) { this.wirelessTermMaxPower = stream.readInt(); this.easyMode = stream.readBoolean(); this.boosterEnabled = stream.readBoolean(); + this.boosterDropChance = stream.readInt(); } // api - public PacketConfigSync(int power, boolean mode, boolean booster) { + public PacketConfigSync(int power, boolean mode, boolean booster, int dropChance) { this.wirelessTermMaxPower = power; this.easyMode = mode; this.boosterEnabled = booster; + this.boosterDropChance = dropChance; final ByteBuf data = Unpooled.buffer(); data.writeInt(this.getPacketID()); data.writeInt(this.wirelessTermMaxPower); data.writeBoolean(this.easyMode); data.writeBoolean(this.boosterEnabled); + data.writeInt(this.boosterDropChance); this.configureWrite(data); } @@ -43,6 +46,7 @@ public class PacketConfigSync extends WCTPacket { Reference.WCT_MAX_POWER = this.wirelessTermMaxPower; Reference.WCT_EASYMODE_ENABLED = this.easyMode; Reference.WCT_BOOSTER_ENABLED = this.boosterEnabled; + Reference.WCT_BOOSTER_DROPCHANCE = this.boosterDropChance; ConfigHandler.removeBooster(); ConfigHandler.removeBoosterIcon(); ConfigHandler.reloadRecipes(); diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java index ae03d3e..3a3c685 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java @@ -23,9 +23,10 @@ public class ConfigHandler { public static boolean enableInfinityBooster; public static boolean enableEasyMode; public static int ae2wctMaxPower = Reference.WCT_MAX_POWER; + public static int boosterDropChance = Reference.WCT_BOOSTER_DROPCHANCE; private static boolean doSave; public static boolean firstLoad = true; - private static int pwrInCfgFile; + private static int pwrInCfgFile, boosterDropInCfgFile; public static void init(File configFile) { if (config == null) { @@ -46,6 +47,7 @@ public class ConfigHandler { String pwrDesc = LocaleHandler.MaxPowerDesc.getLocal() + " [default: 1600000, min: 800000, max:6400000]"; String boosterDesc = LocaleHandler.InfinityBoosterCfgDesc.getLocal(); String easyModeDesc = LocaleHandler.EasyModeDesc.getLocal(); + String boosterDropDesc = LocaleHandler.BoosterDropChance.getLocal(); enableInfinityBooster = config.getBoolean("enableInfinityBooster", Configuration.CATEGORY_GENERAL, true, boosterDesc); enableEasyMode = config.getBoolean("enableEasyMode", Configuration.CATEGORY_GENERAL, false, easyModeDesc); /* @@ -70,10 +72,29 @@ public class ConfigHandler { pwrCfgKey.comment = pwrDesc; doSave = true; } + + Property boosterDropKey = config.get(Configuration.CATEGORY_GENERAL, "boosterDropChance", Reference.WCT_BOOSTER_DROPCHANCE); + boosterDropKey.comment = boosterDropDesc; + boosterDropKey.setDefaultValue(Reference.WCT_BOOSTER_DROPCHANCE); + + boosterDropInCfgFile = boosterDropKey.getInt(); + boosterDropChance = boosterDropInCfgFile; + if (boosterDropInCfgFile > 100) { + boosterDropChance = 100; + boosterDropKey.setValue(boosterDropChance); + boosterDropKey.comment = boosterDropDesc; + doSave = true; + } else if (boosterDropInCfgFile < 1) { + boosterDropChance = 1; + boosterDropKey.setValue(boosterDropChance); + boosterDropKey.comment = boosterDropDesc; + doSave = true; + } Reference.WCT_BOOSTER_ENABLED = enableInfinityBooster; Reference.WCT_EASYMODE_ENABLED = enableEasyMode; Reference.WCT_MAX_POWER = ae2wctMaxPower; + Reference.WCT_BOOSTER_DROPCHANCE = boosterDropChance; if (config.hasChanged() || doSave) { config.save(); diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/LocaleHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/LocaleHandler.java index 7f172a9..8eccb16 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/LocaleHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/LocaleHandler.java @@ -9,7 +9,7 @@ public enum LocaleHandler { MagnetDesc, MagnetDesc2, PressShift, OnlyWorks, LinkStatus, Installed, NotInstalled, Active, Inactive, Status, EmptyTrash, EmptyTrashDesc, MagnetFilterTitle, NoNetworkPower("chatmessages.ae2wct"), FilterMode, Whitelisting, Blacklisting, MagnetMode1("chatmessages.ae2wct"), MagnetMode2("chatmessages.ae2wct"), MagnetMode3("chatmessages.ae2wct"), - MagnetActiveDesc1, MagnetActiveDesc2; + MagnetActiveDesc1, MagnetActiveDesc2, BoosterDropChance("config.ae2wct"); private final String root; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTInteractionHelper.java b/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTInteractionHelper.java index 6fb25f2..82c65f7 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTInteractionHelper.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTInteractionHelper.java @@ -4,7 +4,10 @@ import java.util.ArrayList; import appeng.api.implementations.tiles.IWirelessAccessPoint; import appeng.core.localization.PlayerMessages; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.FakePlayer; import net.p455w0rd.wirelesscraftingterminal.api.IWCTInteractionHelper; @@ -19,7 +22,7 @@ public class WCTInteractionHelper implements IWCTInteractionHelper { @Override public void openWirelessCraftingTerminalGui(final EntityPlayer player) { - if ((player == null) || (player instanceof FakePlayer) || player.worldObj.isRemote) { + if ((player == null) || (player instanceof FakePlayer) || (player instanceof EntityPlayerMP) || FMLCommonHandler.instance().getSide() == Side.SERVER) { return; } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java index 4417ed0..f3946de 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java @@ -19,7 +19,6 @@ import appeng.util.ConfigManager; import appeng.util.IConfigManagerHost; import appeng.util.Platform; import cofh.api.energy.IEnergyContainerItem; -import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -34,10 +33,8 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.p455w0rd.wirelesscraftingterminal.api.IWirelessCraftingTermHandler; -import net.p455w0rd.wirelesscraftingterminal.client.gui.GuiWirelessCraftingTerminal; +import net.p455w0rd.wirelesscraftingterminal.api.WCTApi; import net.p455w0rd.wirelesscraftingterminal.common.utils.RandomUtils; -import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; -import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketOpenGui; import net.p455w0rd.wirelesscraftingterminal.handlers.LocaleHandler; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; import net.p455w0rd.wirelesscraftingterminal.integration.IntegrationType; @@ -116,16 +113,7 @@ public class ItemWirelessCraftingTerminal extends AEBasePoweredItem implements I public ItemStack onItemRightClick(final ItemStack itemStack, final World world, final EntityPlayer player) { if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { // Open the gui - ItemStack is = RandomUtils.getWirelessTerm(player.inventory); - if (is == null) { - return itemStack; - } - ItemWirelessCraftingTerminal wirelessTerm = (ItemWirelessCraftingTerminal) is.getItem(); - if (wirelessTerm != null) { - if (!FMLClientHandler.instance().isGUIOpen(GuiWirelessCraftingTerminal.class)) { - NetworkHandler.instance.sendToServer(new PacketOpenGui(Reference.GUI_WCT)); - } - } + WCTApi.instance().interact().openWirelessCraftingTerminalGui(player); } return itemStack; } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java b/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java index c4082af..52f8703 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java @@ -138,7 +138,7 @@ public class CommonProxy { */ } else { - final PacketConfigSync p = new PacketConfigSync(Reference.WCT_MAX_POWER, Reference.WCT_EASYMODE_ENABLED, Reference.WCT_BOOSTER_ENABLED); + final PacketConfigSync p = new PacketConfigSync(Reference.WCT_MAX_POWER, Reference.WCT_EASYMODE_ENABLED, Reference.WCT_BOOSTER_ENABLED, Reference.WCT_BOOSTER_DROPCHANCE); NetworkHandler.instance.sendTo((WCTPacket) p, (EntityPlayerMP) e.player); } } @@ -146,12 +146,15 @@ public class CommonProxy { @SubscribeEvent public void onMobDrop(LivingDropsEvent event) { if (!Reference.WCT_EASYMODE_ENABLED && Reference.WCT_BOOSTER_ENABLED) { - if (event.entity instanceof EntityWither || event.entity instanceof EntityDragon) { - ItemStack stack = new ItemStack(ItemEnum.BOOSTER_CARD.getItem()); - EntityItem drop = new EntityItem(event.entity.worldObj, event.entity.posX, event.entity.posY, event.entity.posZ, stack); + ItemStack stack = new ItemStack(ItemEnum.BOOSTER_CARD.getItem()); + EntityItem drop = new EntityItem(event.entity.worldObj, event.entity.posX, event.entity.posY, event.entity.posZ, stack); + if (event.entity instanceof EntityDragon) { + event.drops.add(drop); + } + if (event.entity instanceof EntityWither) { Random rand = new Random(); - int n = rand.nextInt(50) + 1; - if (n == 25) { + int n = rand.nextInt(); + if (n <= Reference.WCT_BOOSTER_DROPCHANCE) { event.drops.add(drop); } } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java b/src/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java index 7e55d02..0b6a866 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java @@ -2,7 +2,7 @@ package net.p455w0rd.wirelesscraftingterminal.reference; public class Reference { public static final String MODID = "ae2wct"; - public static final String VERSION = "1.7.10-rv3-1.3b"; + public static final String VERSION = "1.7.10-rv3-1.4b"; public static final String NAME = "AE2 Wireless Crafting Terminal"; public static final String SERVER_PROXY_CLASS = "net.p455w0rd.wirelesscraftingterminal.proxy.CommonProxy"; public static final String CLIENT_PROXY_CLASS = "net.p455w0rd.wirelesscraftingterminal.proxy.ClientProxy"; @@ -13,6 +13,7 @@ public class Reference { public static boolean WCT_BOOSTER_ENABLED = true; public static boolean WCT_EASYMODE_ENABLED = false; public static int WCT_CRAFTMATRIX_Y_OFFSET = 100; + public static int WCT_BOOSTER_DROPCHANCE = 50; // Gui IDs private static int ae2wctGuiIndex = 0; diff --git a/src/resources/assets/ae2wct/lang/de_DE.lang b/src/resources/assets/ae2wct/lang/de_DE.lang index b96cad7..0780988 100644 --- a/src/resources/assets/ae2wct/lang/de_DE.lang +++ b/src/resources/assets/ae2wct/lang/de_DE.lang @@ -36,6 +36,7 @@ gui.labels.ae2wct.WirelessTermLabel=Drahtloskonsole config.ae2wct.MaxPowerDesc=In der Drahtloskonsole maximal speicherbare Energie in AE config.ae2wct.InfinityBoosterCfgDesc=Erlaube das unendliche Drahtlosverstärkerupgrade config.ae2wct.EasyModeDesc=Aktiviere den "Einfachen Modus" (Einfachere Rezepte + Rezept für unendlichen Drahtlosverstärker) +config.ae2wct.BoosterDropChance=Chance that Wither will drop Infinity Booster Card (in %-100=always drop) //Achievements achievement.wctAchievement=Digitales Fertigen über WLAN diff --git a/src/resources/assets/ae2wct/lang/en_US.lang b/src/resources/assets/ae2wct/lang/en_US.lang index e0159c5..522a59f 100644 --- a/src/resources/assets/ae2wct/lang/en_US.lang +++ b/src/resources/assets/ae2wct/lang/en_US.lang @@ -36,6 +36,7 @@ gui.labels.ae2wct.WirelessTermLabel=Wireless Term config.ae2wct.MaxPowerDesc=Maximum Power in AE units the wireless terminal can hold config.ae2wct.InfinityBoosterCfgDesc=Enable Infinite Range Booster Upgrade config.ae2wct.EasyModeDesc=Enable Easy Mode (Easier Recipes+Infinity Booster Recipe) +config.ae2wct.BoosterDropChance=Chance that Wither will drop Infinity Booster Card (in %-100=always drop) //Achievements achievement.wctAchievement=Digital Crafting Over WiFi diff --git a/src/resources/assets/ae2wct/textures/gui/crafting.png b/src/resources/assets/ae2wct/textures/gui/crafting.png index 6ed6c4beed57e596d48d15d8072e5d9d0b71e199..e1dd789c51c8ae16569152911f6f09761eeb8637 100644 GIT binary patch delta 1715 zcma)6c~p~k7JXm%AR!f#$T9+=P;_VvO8|io1OkJNq%9HxNJTJ!fK|4#C}n8^QA9?_Sw0 zL{yH{t!wEy+0g9+9UPhV4oteUn25Um8M*6^cH(wBI@uq0p*y?SL_0-A+AtjUIoL3c z#~ioWM|X}n?h+MgA48A1%fJ_r{;!|n1tZ3vS;S8$y$#zhI-pa1Q(EFej;%na-q*(~ zFnx4xoSQJpG0>T~QT1)K=R4cxtHCI@(<3DRLu8)ZYJRhl)Z%yHy%U$>>$2}1x)|s* zc!!z(X;;)5qw*LhH)Qea4(mOAf$5qhf%B%W^ID3n>Kw~p^TsQmwEa8p%d=7(;YXFq z%=m2Gcmj_@4GOx(p}MMfEE||9rV>Af|45W^*Z=#nB`4hnl2iys;9PRq?yH+C;v|0q zuJE%IEB;$|mDcgjrdm0Wf5Jo3_QADj9Ysca!aB*ixVLfaf5Tk$bLPL#=R9|{m5)5J z3x?jG8b&@y$;-_6*=JKx z;&%T%7Az+2j^irxXEs)*bBxWFTGhY|Nvda-IQ&s424;#C{-y#z0H+`eG2TJS!Lsij zeG)jHpKuz@r4CWLsqljqpl~*HgS`?-pkJr~^QkF}wW7$w1!{o5TfDjXU@W+B|8<-T=M`VQ$J42c4t{e8 z2yj3Kj2(Sliok0H6zwKwZeK4=iS@+6yW4OTMSX%V&k2Fw_)BxNCVhV%5jmvwHfkH! zG}d^eCZMmSD4+p^5oIq|BI6Eu5yAVTwW3LhPd0IIC!ot$i$#8#Q0n)+3|$jw8?Q|( zzHzTOp?`Q}bxVz3XG(+s85lxq-9{KL?d~4Dc|s~<2YSgJ-geuuRmTg=Q8Ew^6ubcu zk|%T@>vr?3YO1t?fnX>yhx{HQHnP5?T9w^f@(Kg>QTQv?w0IXHd~gL6Q*7Wb4&lvm zjto%peeuFVR?{@0^OlzMl5Vx-fa-Gpup3SgL4xgLM98b_X=t(l!buN_n+*jPMozam z5tf0jX$uMpy0{SOPlI>eHC3{iij9+B_i(!cfPOMez*CoIzGYPTyMV&jdR@X_IMm=b z06CeY;Dx;5WU-}Vtr?v76KP~9`(WbE88p`y52{ds{85?pSmmgwf0ZC4uR;9bgS_x> zOm`t5+4wnrV?6XM1oq@`VDyQy0=xP1c4c6Tf;`E|*iWC8<+J z=U2R0P%!k9*Vs{Q9}j6sRDFoG$6;h?O1}AOj@+#&?>JZ#i$hr?{MwVG=8T1h9hU_6 z=8jn#9WGv5S}pC5#Se;_4ObCWhHX@KR@)=b5QJQin1-+x3|SKO9097aV=0K%PGamx z2xlGuI^~hGcfa~&qWDLS7rej7zml~_`pKR7#m^_O=8`S_InQ+rz|!-F*$2;Kqyp70 zx(06mVW(xTWquYNFIK~{Eq$-no2J9FKv7aEk=0MzJt>0i7BtgI$I~~pfhL@7otb`k zfajm~^x+Hoi2fm@b%t17$Xt2&u?e=goij?3vAfLTf;$l2f9)m)cESan_gisQO03J92@dGIvD z9xYIoXQrZ`DXow*ztM)OTNo>ttnS(!x@Y-urgT->YQF+-vo9YpQ=xS(aXUd(lXJ s@*idwpW>1&30RUeYM-af$R-#25unrTN{-xYqyYAO5BT}idh>IC1=}mfp#T5? delta 1948 zcma)6d0bQ36~6EBFqw=(_z6lCBoq-c2oi`anSdcWMkJC9FhV7Q7&f)Sh{RB!N6i|rDszp#y9FavcvO^3gtARnW?exFi|L(o#e&>AmeCLbFgNpN^ z3Z=>hs;LFVjbcNyw53^?V+6$Ze^08oNE5uBYH49@Yw71}>QABgn%YpPex^Q_R+grG zs=xK>m6eYz)uze@m#Y4MMPhF^*%1Dl7waNCtkk|_f#B3V_hCr~%|tj4$9)cNVJ{~7 z4h8knG}m#b^{b|g@ME>^$96R_W?#j%nY6tOsv{-;;vjy}bm+3pm8b(bDu{8)Y>Qu0 zr>5!A=C|&IuC)1!jo46_9r@4dXY#zk{>&F`SEk79$Jyh2(&e34#GaUqc!cW-8A_+Em$7jNff-QnHE{i3}ge5Dh z1;`R)i%E>JoedA&1fH6E z@#L$TO#GHzU8%|_JtjVPye`G%5~U@5AWG;pajyPbGo&uk&Kdf|v#sGnaCTO-`NeBM z($PL3IEvTj1%V@w^s&*(3MMRkKJ7sO2dx*7XKQ?@Wobza7`)VrH z6?CVgZD?(Ew-D7?DK~sZ9`(6QX?etyEP%F}Zd)C-SHqp+?>4-gnW>6D<3jI&Fn#Vu zk$Kh+CT^|?l-_iJGMS{SsmhWXA`xhwN^nZ!6u7$T4+b$}rC%;7?f-nEm)Caz0lxOb zdd;RnhcP^|acg+Gj1^S-Wk}7D@6NX7+kwF6+tqQ`7LFFh#h-Z`2!1^oTlX01A1WO`Qc!+ovP1^THLyH%`*f$F@{-p@pIceA`A86z(sw^34 znfj}O#B$_#kHFPSn|k8w<0haKv9~4{EQSzJA_I^R|J^Me`^Cyi9AhK)a}x(w3Z$bb zKy^yNkW3SG+%X;@pWe}^1@0mc+MW!gzp}uwX#-%spaC*IBshpz5-1e8G6uRdMrgXx zg)|VtKBgOOZ*5;AMDA__+!q9pR&l@bhCT>%JEZ=a2vQt7`obq6DI072)Kk-hJT1`d zynH=pu)Z&dZ^9=7<0DhTF>StO@;V^_%&uu!qH6`ciX-dY_fcI_snZLU?>9da325-Q z0x*IPJz7@Zopu-prJRO)`Ze&yYM}o{?_}l9-cyrz0wNK{#wD=V{lM;By@|;H-D4ka zEs~S(;?dXYA-K6<4u>O;3cl^N)d=D)H#O4#=3eqtEdN^Sy)--NiPw*vS@nhx8HDJvpr)G3x6M6h>Q~GbMa*-*J*+{y$PkSkkU1|q_Sh> zJWL8G_~-EO@Qwk+yt_z0<+^7W7;%gFK9nGBGubYS0mdmmCMw9;5s;KHc)B*c?oA+} z*tuTtlD%6-W|Wml#|mej(wq$@AZh+kLwjKHh3&II;sXQhwv!H3Lc|2BhgrI5Mi+=K zBDum(rm7p={U>JjgCxeP#$$=h9)Xg=%Pv}kM)3I$Uw^a#jKnt7j|oLw0u%!6O@lytT~H6#VjWHd5iBJ#>ZjI2hFQfzFAS1+UZXh`-U|y={mEum zJzS7_MdP#6ah20z`V2&(~<#~S9FSo)=U0wv;*q`>tcgd=!-t(pL z@$sp7vgrrO5Wh!Y?{-!5+{)R@FmHRIL)?Yu2=Y6(MX?C>7nm6vM>3B6d5|mN>86V| Y0IAu+GcrfO1*^;P8|Qsx%wy+&1DyFbe*gdg diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info index 156bfac..04c5aa5 100644 --- a/src/resources/mcmod.info +++ b/src/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "ae2wct", "name": "AE2 Wireless Crafting Terminal", "description": "Adds a wireless version of the AE2 Crafting Terminal", - "version": "1.7.10-rv3-1.3b", + "version": "1.7.10-rv3-1.4b", "mcversion": "1.7.10", "url": "http://p455w0rd.net/", "updateUrl": "",