upstream/Applied-Energistics-2-Unofficial
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Applied-Energistics-2-Unofficial.git synced 2026-10-26 14:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Wireless Kit (#1551)

Browse Source
This commit is contained in:
zyf051520 authored and GitHub committed 2026-08-28 17:44:56 +07:00
1 parent b6748dcaef
commit 0053051923
3 files changed
+24 -24
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/appeng/client/gui/implementations/GuiWirelessKit.java
+12 -12
View File
@@ -768,29 +768,29 @@ public class GuiWirelessKit extends AEBaseGui implements IConfigManagerHost {
GL11.glScaled(0.45, 0.45, 0.45);
if (byColor) {
if (includeHubs) {
drawItem(scaleCorrectionX + 7, scaleCorrectionX + 2, icons.get(data.color.ordinal() + 17));
drawItem(scaleCorrectionX + 7, scaleCorrectionY + 2, icons.get(data.color.ordinal() + 17));
} else {
drawItem(scaleCorrectionX + 7, scaleCorrectionX + 2, icons.get(data.color.ordinal()));
drawItem(scaleCorrectionX + 7, scaleCorrectionY + 2, icons.get(data.color.ordinal()));
}
if (includeConnectors) {
drawItem(scaleCorrectionX, scaleCorrectionX + 14, icons.get(data.color.ordinal()));
drawItem(scaleCorrectionX + 14, scaleCorrectionX + 14, icons.get(data.color.ordinal()));
drawItem(scaleCorrectionX, scaleCorrectionY + 14, icons.get(data.color.ordinal()));
drawItem(scaleCorrectionX + 14, scaleCorrectionY + 14, icons.get(data.color.ordinal()));
} else {
drawItem(scaleCorrectionX, scaleCorrectionX + 14, icons.get(data.color.ordinal() + 17));
drawItem(scaleCorrectionX + 14, scaleCorrectionX + 14, icons.get(data.color.ordinal() + 17));
drawItem(scaleCorrectionX, scaleCorrectionY + 14, icons.get(data.color.ordinal() + 17));
drawItem(scaleCorrectionX + 14, scaleCorrectionY + 14, icons.get(data.color.ordinal() + 17));
}
} else {
if (includeHubs) {
drawItem(scaleCorrectionX + 7, scaleCorrectionX + 2, icons.get(17));
drawItem(scaleCorrectionX + 7, scaleCorrectionY + 2, icons.get(17));
} else {
drawItem(scaleCorrectionX + 7, scaleCorrectionX + 2, icons.get(0));
drawItem(scaleCorrectionX + 7, scaleCorrectionY + 2, icons.get(0));
}
if (includeConnectors) {
drawItem(scaleCorrectionX, scaleCorrectionX + 14, icons.get(1));
drawItem(scaleCorrectionX + 14, scaleCorrectionX + 14, icons.get(2));
drawItem(scaleCorrectionX, scaleCorrectionY + 14, icons.get(1));
drawItem(scaleCorrectionX + 14, scaleCorrectionY + 14, icons.get(2));
} else {
drawItem(scaleCorrectionX, scaleCorrectionX + 14, icons.get(1 + 17));
drawItem(scaleCorrectionX + 14, scaleCorrectionX + 14, icons.get(2 + 17));
drawItem(scaleCorrectionX, scaleCorrectionY + 14, icons.get(1 + 17));
drawItem(scaleCorrectionX + 14, scaleCorrectionY + 14, icons.get(2 + 17));
}
}
src/main/java/appeng/items/tools/ToolWirelessKit.java
+11 -11
View File
@@ -209,23 +209,23 @@ public class ToolWirelessKit extends AEBaseItem implements IGuiItem {
else {
lines.add(WirelessMessages.SuperNetworkList.getLocal());
final NBTTagList tagNames = stash.getTagList(WireLessToolHelper.NbtSuperNames, NBT.TAG_COMPOUND);
for (int i = 0; i < tagNames.tagCount(); i++) {
final NBTTagCompound tagName = tagNames.getCompoundTagAt(i);
final DimensionalCoord netCoord = DimensionalCoord.readFromNBT(tagName);
for (final DimensionalCoord network : dcl) {
String customName = "";
if (tagName.hasKey("networkName")) {
for (final DimensionalCoord dc : dcl) {
if (dc.equals(netCoord)) {
customName = tagName.getString("networkName");
break;
}
}
// the position sits under "network", and colour entries carry a colour name instead
for (int i = 0; i < tagNames.tagCount(); i++) {
final NBTTagCompound tagName = tagNames.getCompoundTagAt(i);
if (!tagName.hasKey("networkName")) continue;
if (!network.equals(DimensionalCoord.readFromNBT(tagName.getCompoundTag("network"))))
continue;
customName = tagName.getString("networkName");
break;
}
lines.add(
WirelessMessages.SuperNetwork
.getLocal(customName + " ", netCoord.getGuiTextShortNoDim()));
.getLocal(customName + " ", network.getGuiTextShortNoDim()));
}
}
}
src/main/resources/assets/appliedenergistics2/lang/en_US.lang
+1 -1
View File
@@ -1198,7 +1198,7 @@ item.appliedenergistics2.WirelessMessages.SuperBound=§aNetwork at %s §awas add
item.appliedenergistics2.WirelessMessages.SuperBoundFailed=§cNetwork is already in the list
item.appliedenergistics2.WirelessMessages.SuperClear=Shift + Ctrl + R-click to clear current tool mode
item.appliedenergistics2.WirelessMessages.SuperNetworkList=Network list:
item.appliedenergistics2.WirelessMessages.Network=Network %sat %s
item.appliedenergistics2.WirelessMessages.SuperNetwork=Network %sat %s
item.appliedenergistics2.WirelessMessages.SuperNetworkListEmpty=The network list is empty
item.appliedenergistics2.WirelessMessages.rowBindSuccess=§aSuccessfully connected %s §ato %s