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

move Line mode from Advanced mode (#1398)

Browse Source 
Co-authored-by: UltraProdigy <187078471+UltraProdigy@users.noreply.github.com>
This commit is contained in:
lc-1337andUltraProdigy authored and GitHub committed 2026-06-27 04:06:35 +00:00
1 parent 975011e5ec
commit c79b6cc8c7
6 files changed
+54 -55
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/appeng/api/config/AdvancedWirelessToolMode.java
+1 -5
View File
@@ -6,17 +6,13 @@ import appeng.core.localization.WirelessMessages;
public enum AdvancedWirelessToolMode implements Localization {
Queueing,
Binding,
QueueingLine,
BindingLine;
Binding;
@Override
public String getUnlocalized() {
return switch (this) {
case Binding -> WirelessMessages.AdvancedBinding.getUnlocalized();
case Queueing -> WirelessMessages.AdvancedQueueing.getUnlocalized();
case BindingLine -> WirelessMessages.AdvancedBindingLine.getUnlocalized();
case QueueingLine -> WirelessMessages.AdvancedQueueingLine.getUnlocalized();
};
}
}
src/main/java/appeng/api/config/WirelessToolMode.java
+2
View File
@@ -7,6 +7,7 @@ public enum WirelessToolMode implements Localization {
Simple,
Advanced,
AdvancedLine,
Super;
@Override
@@ -14,6 +15,7 @@ public enum WirelessToolMode implements Localization {
return switch (this) {
case Simple -> WirelessMessages.Simple.getUnlocalized();
case Advanced -> WirelessMessages.Advanced.getUnlocalized();
case AdvancedLine -> WirelessMessages.AdvancedLine.getUnlocalized();
case Super -> WirelessMessages.Super.getUnlocalized();
};
}
src/main/java/appeng/core/localization/WirelessMessages.java
+1
View File
@@ -48,6 +48,7 @@ public enum WirelessMessages implements Localization {
AdvancedBindingEmpty,
AdvancedBindingNotEmpty,
AdvancedLine,
AdvancedQueueingLine,
AdvancedBindingLine,
AdvancedQueueingLineNotEmpty,
src/main/java/appeng/helpers/WireLessToolHelper.java
+6 -7
View File
@@ -87,6 +87,7 @@ public class WireLessToolHelper {
is.setTagCompound(new NBTTagCompound());
clearNBT(is, WirelessToolMode.Simple, null);
clearNBT(is, WirelessToolMode.Advanced, null);
clearNBT(is, WirelessToolMode.AdvancedLine, null);
clearNBT(is, WirelessToolMode.Super, null);
}
@@ -94,8 +95,8 @@ public class WireLessToolHelper {
final NBTTagCompound tag = is.getTagCompound();
switch (mode) {
case Simple -> tag.setTag(NbtSimple, new NBTTagCompound());
case Advanced -> {
tag.setTag(NbtAdvanced, new NBTTagCompound());
case Advanced -> tag.setTag(NbtAdvanced, new NBTTagCompound());
case AdvancedLine -> {
tag.setTag(NbtAdvancedLineQueue, new NBTTagCompound());
tag.setTag(NbtAdvancedLineBinding, new NBTTagCompound());
}
@@ -505,17 +506,15 @@ public class WireLessToolHelper {
return success;
}
public static boolean bindAdvanced(TileWirelessBase target, ItemStack tool, World w, EntityPlayer p) {
public static boolean bindAdvanced(TileWirelessBase target, ItemStack tool, World w, EntityPlayer p, boolean line) {
if (!securityCheck(target, new PlayerSource(p, null))) return false;
AdvancedWirelessToolMode mod = (AdvancedWirelessToolMode) getConfigManager(tool)
.getSetting(Settings.ADVANCED_WIRELESS_TOOL_MODE);
return switch (mod) {
case Queueing -> addToQueue(target, tool, p);
case Binding -> bindFromQueue(target, tool, w, p);
case QueueingLine -> addToQueueLine(target, tool, p);
case BindingLine -> bindFromQueueLine(target, tool, w, p);
case Queueing -> line ? addToQueueLine(target, tool, p) : addToQueue(target, tool, p);
case Binding -> line ? bindFromQueueLine(target, tool, w, p) : bindFromQueue(target, tool, w, p);
};
}
src/main/java/appeng/items/tools/ToolWirelessKit.java
+43 -43
View File
@@ -69,7 +69,7 @@ public class ToolWirelessKit extends AEBaseItem implements IGuiItem {
return is;
}
if (p.isSneaking() && mode == WirelessToolMode.Advanced) {
if (p.isSneaking() && (mode == WirelessToolMode.Advanced || mode == WirelessToolMode.AdvancedLine)) {
WireLessToolHelper.nextConnectMode(cm, p);
return is;
}
@@ -97,7 +97,8 @@ public class ToolWirelessKit extends AEBaseItem implements IGuiItem {
return switch (mode) {
case Simple -> WireLessToolHelper.bindSimple(target, is, w, p);
case Advanced -> WireLessToolHelper.bindAdvanced(target, is, w, p);
case Advanced -> WireLessToolHelper.bindAdvanced(target, is, w, p, false);
case AdvancedLine -> WireLessToolHelper.bindAdvanced(target, is, w, p, true);
default -> false;
};
}
@@ -141,66 +142,65 @@ public class ToolWirelessKit extends AEBaseItem implements IGuiItem {
lines.add(WirelessMessages.SimpleBound.getLocal());
}
}
case Advanced -> {
case Advanced, AdvancedLine -> {
final AdvancedWirelessToolMode mode = (AdvancedWirelessToolMode) cm
.getSetting(Settings.ADVANCED_WIRELESS_TOOL_MODE);
lines.add(WirelessMessages.AdvancedActivated.getLocal(mode.getLocal()));
switch (mode) {
case Queueing, Binding -> {
final List<DimensionalCoord> dcl = DimensionalCoord
.readAsListFromNBT(tag.getCompoundTag(WireLessToolHelper.NbtAdvanced));
if (dcl.isEmpty()) {
if (mode == AdvancedWirelessToolMode.Queueing)
lines.add(WirelessMessages.AdvancedQueueEmpty.getLocal());
else lines.add(WirelessMessages.AdvancedBindingEmpty.getLocal());
} else {
if (GuiScreen.isShiftKeyDown()) {
if (mode == AdvancedWirelessToolMode.Queueing)
lines.add(WirelessMessages.AdvancedQueueNotEmpty.getLocal());
else lines.add(WirelessMessages.AdvancedBindingNotEmpty.getLocal());
dcl.forEach(dc -> lines.add(dc.getGuiTextShort()));
return;
} else lines.add(WirelessMessages.AdvancedNext.getLocal(dcl.get(0).getGuiTextShortNoDim()));
}
if (currentMode == WirelessToolMode.Advanced) {
final List<DimensionalCoord> dcl = DimensionalCoord
.readAsListFromNBT(tag.getCompoundTag(WireLessToolHelper.NbtAdvanced));
if (dcl.isEmpty()) {
if (mode == AdvancedWirelessToolMode.Queueing)
lines.add(WirelessMessages.AdvancedQueueingHubQol.getLocal());
else lines.add(WirelessMessages.AdvancedBindingHubQol.getLocal());
lines.add(WirelessMessages.AdvancedQueueEmpty.getLocal());
else lines.add(WirelessMessages.AdvancedBindingEmpty.getLocal());
} else {
if (GuiScreen.isShiftKeyDown()) {
if (mode == AdvancedWirelessToolMode.Queueing)
lines.add(WirelessMessages.AdvancedQueueNotEmpty.getLocal());
else lines.add(WirelessMessages.AdvancedBindingNotEmpty.getLocal());
dcl.forEach(dc -> lines.add(dc.getGuiTextShort()));
return;
} else lines.add(WirelessMessages.AdvancedNext.getLocal(dcl.get(0).getGuiTextShortNoDim()));
}
case QueueingLine, BindingLine -> {
final NBTTagCompound line;
if (mode == AdvancedWirelessToolMode.QueueingLine)
line = tag.getCompoundTag(WireLessToolHelper.NbtAdvancedLineQueue);
else line = tag.getCompoundTag(WireLessToolHelper.NbtAdvancedLineBinding);
if (mode == AdvancedWirelessToolMode.Queueing)
lines.add(WirelessMessages.AdvancedQueueingHubQol.getLocal());
else lines.add(WirelessMessages.AdvancedBindingHubQol.getLocal());
} else {
final NBTTagCompound line;
if (mode == AdvancedWirelessToolMode.Queueing)
line = tag.getCompoundTag(WireLessToolHelper.NbtAdvancedLineQueue);
else line = tag.getCompoundTag(WireLessToolHelper.NbtAdvancedLineBinding);
if (!line.hasKey(WireLessToolHelper.NbtAdvanced1StPoint))
lines.add(WirelessMessages.AdvancedLineEmpty1st.getLocal());
if (!line.hasKey(WireLessToolHelper.NbtAdvanced1StPoint))
lines.add(WirelessMessages.AdvancedLineEmpty1st.getLocal());
else {
lines.add(
WirelessMessages.AdvancedLine1st.getLocal(
DimensionalCoord
.readFromNBT(
line.getCompoundTag(WireLessToolHelper.NbtAdvanced1StPoint))
.getGuiTextShort()));
if (!line.hasKey(WireLessToolHelper.NbtAdvanced2ndPoint))
lines.add(WirelessMessages.AdvancedLineEmpty2nd.getLocal());
else {
lines.add(
WirelessMessages.AdvancedLine1st.getLocal(
WirelessMessages.AdvancedLine2nd.getLocal(
DimensionalCoord
.readFromNBT(
line.getCompoundTag(WireLessToolHelper.NbtAdvanced1StPoint))
line.getCompoundTag(WireLessToolHelper.NbtAdvanced2ndPoint))
.getGuiTextShort()));
if (!line.hasKey(WireLessToolHelper.NbtAdvanced2ndPoint))
lines.add(WirelessMessages.AdvancedLineEmpty2nd.getLocal());
else {
lines.add(
WirelessMessages.AdvancedLine2nd.getLocal(
DimensionalCoord.readFromNBT(
line.getCompoundTag(WireLessToolHelper.NbtAdvanced2ndPoint))
.getGuiTextShort()));
lines.add(WirelessMessages.AdvancedQueueingLineNotEmpty.getLocal());
}
lines.add(WirelessMessages.AdvancedQueueingLineNotEmpty.getLocal());
}
}
}
lines.add(WirelessMessages.AdvancedHowToggle.getLocal(EnumChatFormatting.ITALIC));
}
case Super -> {
final NBTTagCompound stash = tag.getCompoundTag(WireLessToolHelper.NbtSuper);
final List<DimensionalCoord> dcl = DimensionalCoord
src/main/resources/assets/appliedenergistics2/lang/en_US.lang
+1
View File
@@ -1138,6 +1138,7 @@ item.appliedenergistics2.WirelessMessages.SimpleBound=§aBound to %s
item.appliedenergistics2.WirelessMessages.SimpleBounded=Click another Wireless Connector to connect
item.appliedenergistics2.WirelessMessages.Advanced=§eAdvanced
item.appliedenergistics2.WirelessMessages.AdvancedLine=§eAdvanced Line
item.appliedenergistics2.WirelessMessages.AdvancedActivated=%s §aactivated
item.appliedenergistics2.WirelessMessages.AdvancedNext=§9Next connector in queue: %s
item.appliedenergistics2.WirelessMessages.AdvancedHowToggle=Sneak + R-click to toggle advanced modes