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

Fix crafting CPU name comparision and implement ITextComponent container sync.

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-19 00:08:17 +02:00
parent 3faa3db2b6
commit f2a9d8c806
6 changed files with 116 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/container/implementations/ContainerCraftConfirm.java
+16 -11
View File
@@ -24,6 +24,7 @@ import java.util.Collections;
import java.util.concurrent.Future;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableSet;
@@ -33,6 +34,7 @@ import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.inventory.container.IContainerListener;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.world.World;
@@ -99,7 +101,7 @@ public class ContainerCraftConfirm extends AEBaseContainer {
@GuiSync(6)
public boolean noCPU = true;
@GuiSync(7)
public String myName = "";
public ITextComponent myName;
public ContainerCraftConfirm(int id, PlayerInventory ip, ITerminalHost te) {
super(TYPE, id, ip, te);
@@ -121,11 +123,12 @@ public class ContainerCraftConfirm extends AEBaseContainer {
if (this.getSelectedCpu() == -1) {
this.setCpuAvailableBytes(0);
this.setCpuCoProcessors(0);
this.setName("");
this.setName(null);
} else {
this.setName(this.cpus.get(this.getSelectedCpu()).getName().getString());
this.setCpuAvailableBytes(this.cpus.get(this.getSelectedCpu()).getSize());
this.setCpuCoProcessors(this.cpus.get(this.getSelectedCpu()).getProcessors());
CraftingCPURecord cpu = this.cpus.get(this.getSelectedCpu());
this.setName(cpu.getName());
this.setCpuAvailableBytes(cpu.getSize());
this.setCpuCoProcessors(cpu.getProcessors());
}
}
@@ -145,6 +148,7 @@ public class ContainerCraftConfirm extends AEBaseContainer {
for (final CraftingCPURecord ccr : this.cpus) {
if (ccr.getCpu() == c) {
found = true;
break;
}
}
@@ -280,11 +284,12 @@ public class ContainerCraftConfirm extends AEBaseContainer {
this.setSelectedCpu(-1);
this.setCpuAvailableBytes(0);
this.setCpuCoProcessors(0);
this.setName("");
this.setName(null);
} else if (this.getSelectedCpu() != -1) {
this.setName(this.cpus.get(this.getSelectedCpu()).getName().getString());
this.setCpuAvailableBytes(this.cpus.get(this.getSelectedCpu()).getSize());
this.setCpuCoProcessors(this.cpus.get(this.getSelectedCpu()).getProcessors());
CraftingCPURecord cpu = this.cpus.get(this.getSelectedCpu());
this.setName(cpu.getName());
this.setCpuAvailableBytes(cpu.getSize());
this.setCpuCoProcessors(cpu.getProcessors());
}
}
@@ -386,11 +391,11 @@ public class ContainerCraftConfirm extends AEBaseContainer {
this.selectedCpu = selectedCpu;
}
public String getName() {
public ITextComponent getName() {
return this.myName;
}
private void setName(@Nonnull final String myName) {
private void setName(@Nullable final ITextComponent myName) {
this.myName = myName;
}
src/main/java/appeng/container/implementations/ContainerCraftingStatus.java
+6 -5
View File
@@ -28,6 +28,7 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.text.ITextComponent;
import appeng.api.config.SecurityPermissions;
import appeng.api.networking.crafting.ICraftingCPU;
@@ -58,7 +59,7 @@ public class ContainerCraftingStatus extends ContainerCraftingCPU {
@GuiSync(6)
public boolean noCPU = true;
@GuiSync(7)
public String myName = "";
public ITextComponent myName;
public ContainerCraftingStatus(int id, final PlayerInventory ip, final ITerminalHost te) {
super(TYPE, id, ip, te);
@@ -117,9 +118,9 @@ public class ContainerCraftingStatus extends ContainerCraftingCPU {
if (this.selectedCpu >= this.cpus.size()) {
this.selectedCpu = -1;
this.myName = "";
this.myName = null;
} else if (this.selectedCpu != -1) {
this.myName = this.cpus.get(this.selectedCpu).getName().getString();
this.myName = this.cpus.get(this.selectedCpu).getName();
}
if (this.selectedCpu == -1 && this.cpus.size() > 0) {
@@ -153,10 +154,10 @@ public class ContainerCraftingStatus extends ContainerCraftingCPU {
}
if (this.selectedCpu == -1) {
this.myName = "";
this.myName = null;
this.setCPU(null);
} else {
this.myName = this.cpus.get(this.selectedCpu).getName().getString();
this.myName = this.cpus.get(this.selectedCpu).getName();
this.setCPU(this.cpus.get(this.selectedCpu).getCpu());
}
}