fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added HWYLA

Browse Source
This commit is contained in:
Sebastian Hartte
2020-07-05 16:50:39 +02:00
parent 1478e4c378
commit 9220ca0048
97 changed files with 2123 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/contents/CellConfig.java
+1 -1
View File
@@ -34,7 +34,7 @@ public class CellConfig extends AppEngInternalInventory {
}
@Override
protected void onContentsChanged(FixedItemInvView inv, int slot, ItemStack previous, ItemStack current) {
protected void onContentsChanged(int slot, ItemStack previous, ItemStack current) {
this.writeToNBT(this.is.getOrCreateTag(), "list");
}
}
src/main/java/appeng/items/contents/CellUpgrades.java
+1 -1
View File
@@ -33,7 +33,7 @@ public final class CellUpgrades extends StackUpgradeInventory {
}
@Override
protected void onContentsChanged(FixedItemInvView inv, int slot, ItemStack previous, ItemStack current) {
protected void onContentsChanged(int slot, ItemStack previous, ItemStack current) {
this.writeToNBT(this.is.getOrCreateTag(), "upgrades");
}
}
src/main/java/appeng/items/misc/EncodedPatternItem.java
+13 -14
View File
@@ -43,7 +43,6 @@ import appeng.api.AEApi;
import appeng.api.implementations.ICraftingPatternItem;
import appeng.api.networking.crafting.ICraftingPatternDetails;
import appeng.api.storage.data.IAEItemStack;
import appeng.core.AppEng;
import appeng.core.localization.GuiText;
import appeng.helpers.InvalidPatternHelper;
import appeng.helpers.PatternHelper;
@@ -104,15 +103,15 @@ public class EncodedPatternItem extends AEBaseItem implements ICraftingPatternIt
return;
}
stack.setCustomName(GuiText.InvalidPattern.textComponent().copy().formatted(Formatting.RED));
stack.setCustomName(GuiText.InvalidPattern.text().copy().formatted(Formatting.RED));
InvalidPatternHelper invalid = new InvalidPatternHelper(stack);
final Text label = (invalid.isCraftable() ? GuiText.Crafts.textComponent()
: GuiText.Creates.textComponent()).copy().append(": ");
final Text and = new LiteralText(" ").append(GuiText.And.textComponent())
final Text label = (invalid.isCraftable() ? GuiText.Crafts.text()
: GuiText.Creates.text()).copy().append(": ");
final Text and = new LiteralText(" ").append(GuiText.And.text())
.append(" ");
final Text with = GuiText.With.textComponent().copy().append(": ");
final Text with = GuiText.With.text().copy().append(": ");
boolean first = true;
for (final InvalidPatternHelper.PatternIngredient output : invalid.getOutputs()) {
@@ -127,9 +126,9 @@ public class EncodedPatternItem extends AEBaseItem implements ICraftingPatternIt
}
if (invalid.isCraftable()) {
final MutableText substitutionLabel = GuiText.Substitute.textComponent().copy().append(" ");
final Text canSubstitute = invalid.canSubstitute() ? GuiText.Yes.textComponent()
: GuiText.No.textComponent();
final MutableText substitutionLabel = GuiText.Substitute.text().copy().append(" ");
final Text canSubstitute = invalid.canSubstitute() ? GuiText.Yes.text()
: GuiText.No.text();
lines.add(substitutionLabel.append(canSubstitute));
}
@@ -147,11 +146,11 @@ public class EncodedPatternItem extends AEBaseItem implements ICraftingPatternIt
final IAEItemStack[] in = details.getCondensedInputs();
final IAEItemStack[] out = details.getCondensedOutputs();
final Text label = (isCrafting ? GuiText.Crafts.textComponent() : GuiText.Creates.textComponent())
final Text label = (isCrafting ? GuiText.Crafts.text() : GuiText.Creates.text())
.copy().append(": ");
final Text and = new LiteralText(" ").append(GuiText.And.textComponent())
final Text and = new LiteralText(" ").append(GuiText.And.text())
.append(" ");
final Text with = GuiText.With.textComponent().copy().append(": ");
final Text with = GuiText.With.text().copy().append(": ");
boolean first = true;
for (final IAEItemStack anOut : out) {
@@ -176,8 +175,8 @@ public class EncodedPatternItem extends AEBaseItem implements ICraftingPatternIt
}
if (isCrafting) {
final MutableText substitutionLabel = GuiText.Substitute.textComponent().copy().append(" ");
final Text canSubstitute = substitute ? GuiText.Yes.textComponent() : GuiText.No.textComponent();
final MutableText substitutionLabel = GuiText.Substitute.text().copy().append(" ");
final Text canSubstitute = substitute ? GuiText.Yes.text() : GuiText.No.text();
lines.add(substitutionLabel.append(canSubstitute));
}
src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java
+1 -1
View File
@@ -197,7 +197,7 @@ public class ColorApplicatorItem extends AEBasePoweredItem
@Override
public Text getName(final ItemStack is) {
Text extra = GuiText.Empty.textComponent();
Text extra = GuiText.Empty.text();
final AEColor selected = this.getActiveColor(is);
src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java
+2 -2
View File
@@ -67,9 +67,9 @@ public class WirelessTerminalItem extends AEBasePoweredItem implements IWireless
final String encKey = tag.getString("encryptionKey");
if (encKey == null || encKey.isEmpty()) {
lines.add(GuiText.Unlinked.textComponent());
lines.add(GuiText.Unlinked.text());
} else {
lines.add(GuiText.Linked.textComponent());
lines.add(GuiText.Linked.text());
}
}
} else {
src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java
+1 -1
View File
@@ -66,7 +66,7 @@ public abstract class AEBasePoweredItem extends AEBaseItem implements IAEItemPow
final double percent = internalCurrentPower / internalMaxPower;
lines.add(GuiText.StoredEnergy.textComponent().copy()
lines.add(GuiText.StoredEnergy.text().copy()
.append(':' + MessageFormat.format(" {0,number,#} ", internalCurrentPower))
.append(new TranslatableText(PowerUnits.AE.unlocalizedName))
.append(" - " + MessageFormat.format(" {0,number,#.##%} ", percent)));