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

Updated mappings to 20200723-1.16.1 (#4514)

Browse Source 
* Limit to 1 gradle worker
This commit is contained in:
yueh
2020-07-28 18:33:28 +02:00
committed by GitHub
parent 307a6817d4
commit b3b7547325
35 changed files with 98 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/gui/AEBaseMEScreen.java
+2 -3
View File
@@ -63,7 +63,7 @@ public abstract class AEBaseMEScreen<T extends AEBaseContainer> extends AEBaseSc
final String formattedAmount = NumberFormat.getNumberInstance(Locale.US)
.format(myStack.getStackSize());
currentToolTip
.add(ButtonToolTips.ItemsStored.text(formattedAmount).func_240699_a_(TextFormatting.GRAY));
.add(ButtonToolTips.ItemsStored.text(formattedAmount).mergeStyle(TextFormatting.GRAY));
}
if (myStack.getCountRequestable() > 0) {
@@ -77,8 +77,7 @@ public abstract class AEBaseMEScreen<T extends AEBaseContainer> extends AEBaseSc
return;
} else if (stack.getCount() > bigNumber) {
final String formattedAmount = NumberFormat.getNumberInstance(Locale.US).format(stack.getCount());
currentToolTip
.add(ButtonToolTips.ItemsStored.text(formattedAmount).func_240699_a_(TextFormatting.GRAY));
currentToolTip.add(ButtonToolTips.ItemsStored.text(formattedAmount).mergeStyle(TextFormatting.GRAY));
this.renderToolTip(matrixStack, currentToolTip, x, y, this.font);
src/main/java/appeng/client/gui/AEBaseScreen.java
+9 -13
View File
@@ -211,7 +211,7 @@ public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerS
List<ITextComponent> styledLines = new ArrayList<>(lines.size());
for (int i = 0; i < lines.size(); i++) {
Style style = (i == 0) ? TOOLTIP_HEADER : TOOLTIP_BODY;
styledLines.add(lines.get(i).deepCopy().func_240700_a_(s -> style));
styledLines.add(lines.get(i).deepCopy().modifyStyle(s -> style));
}
this.renderTooltip(matrices, styledLines, x, y);
@@ -219,7 +219,7 @@ public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerS
}
@Override
protected final void func_230451_b_(MatrixStack matrixStack, final int x, final int y) {
protected final void drawGuiContainerForegroundLayer(MatrixStack matrixStack, final int x, final int y) {
final int ox = this.guiLeft; // (width - xSize) / 2;
final int oy = this.guiTop; // (height - ySize) / 2;
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
@@ -234,7 +234,8 @@ public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerS
public abstract void drawFG(MatrixStack matrixStack, int offsetX, int offsetY, int mouseX, int mouseY);
@Override
protected final void func_230450_a_(MatrixStack matrixStack, final float f, final int x, final int y) {
protected final void drawGuiContainerBackgroundLayer(MatrixStack matrixStack, 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;
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
@@ -544,11 +545,6 @@ public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerS
return false;
}
@Override
public void removed() {
super.removed();
}
protected Slot getSlot(final int mouseX, final int mouseY) {
final List<Slot> slots = this.getInventorySlots();
for (final Slot slot : slots) {
@@ -630,7 +626,7 @@ public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerS
* hackery...
*/
@Override
public void func_238746_a_(MatrixStack matrices, Slot s) {
public void moveItems(MatrixStack matrices, Slot s) {
if (s instanceof SlotME) {
try {
@@ -639,7 +635,7 @@ public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerS
}
// Annoying but easier than trying to splice into render item
super.func_238746_a_(matrices, new Size1Slot((SlotME) s));
super.moveItems(matrices, new Size1Slot((SlotME) s));
this.stackSizeRenderer.renderStackSize(this.font, ((SlotME) s).getAEStack(), s.xPos, s.yPos);
@@ -755,9 +751,9 @@ public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerS
if (s instanceof AppEngSlot) {
((AppEngSlot) s).setDisplay(true);
super.func_238746_a_(matrices, s);
super.moveItems(matrices, s);
} else {
super.func_238746_a_(matrices, s);
super.moveItems(matrices, s);
}
return;
@@ -766,7 +762,7 @@ public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerS
}
}
// do the usual for non-ME Slots.
super.func_238746_a_(matrices, s);
super.moveItems(matrices, s);
}
protected boolean isPowered() {
src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java
+2 -2
View File
@@ -314,8 +314,8 @@ public class MEMonitorableScreen<T extends MEMonitorableContainer> extends AEBas
}
@Override
public void removed() {
super.removed();
public void onClose() {
super.onClose();
getMinecraft().keyboardListener.enableRepeatEvents(false);
memoryText = this.searchField.getText();
}
src/main/java/appeng/client/gui/widgets/ProgressBar.java
+2 -2
View File
@@ -87,8 +87,8 @@ public class ProgressBar extends Widget implements ITooltip {
}
ITextComponent result = this.titleName != null ? this.titleName : new StringTextComponent("");
return result.deepCopy().func_240702_b_("\n").func_240702_b_(this.source.getCurrentProgress() + " ")
.func_230529_a_(GuiText.Of.text().deepCopy().func_240702_b_(" " + this.source.getMaxProgress()));
return result.deepCopy().appendString("\n").appendString(this.source.getCurrentProgress() + " ")
.append(GuiText.Of.text().deepCopy().appendString(" " + this.source.getMaxProgress()));
}
@Override