Fixed thing not working
This commit is contained in:
@@ -104,7 +104,9 @@ public class GuiCraftingMonitor extends GuiBase {
|
|||||||
itemSelectedY = y;
|
itemSelectedY = y;
|
||||||
}
|
}
|
||||||
|
|
||||||
x += 16F / (float) task.getDepth();
|
if (task.getDepth() > 0) {
|
||||||
|
x += 16F - ((float) (task.getChildren() - task.getDepth()) / (float) task.getChildren() * 16F);
|
||||||
|
}
|
||||||
|
|
||||||
drawItem(x + 2, y + 1, task.getOutput());
|
drawItem(x + 2, y + 1, task.getOutput());
|
||||||
|
|
||||||
|
|||||||
@@ -10,17 +10,19 @@ public class ClientCraftingTask {
|
|||||||
private int id;
|
private int id;
|
||||||
private String status;
|
private String status;
|
||||||
private int depth;
|
private int depth;
|
||||||
|
private int children;
|
||||||
private int progress;
|
private int progress;
|
||||||
|
|
||||||
// Used server-side while sending
|
// Used server-side while sending
|
||||||
private List<ItemStack> outputs;
|
private List<ItemStack> outputs;
|
||||||
private ClientCraftingTask child;
|
private ClientCraftingTask child;
|
||||||
|
|
||||||
public ClientCraftingTask(ItemStack output, int id, String status, int depth, int progress) {
|
public ClientCraftingTask(ItemStack output, int id, String status, int depth, int children, int progress) {
|
||||||
this.output = output;
|
this.output = output;
|
||||||
this.id = id;
|
this.id = id;
|
||||||
this.status = status;
|
this.status = status;
|
||||||
this.depth = depth;
|
this.depth = depth;
|
||||||
|
this.children = children;
|
||||||
this.progress = progress;
|
this.progress = progress;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,6 +57,10 @@ public class ClientCraftingTask {
|
|||||||
return depth;
|
return depth;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int getChildren() {
|
||||||
|
return children;
|
||||||
|
}
|
||||||
|
|
||||||
public int getProgress() {
|
public int getProgress() {
|
||||||
return progress;
|
return progress;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,13 +52,25 @@ public final class RefinedStorageSerializers {
|
|||||||
buf.writeInt(tasks.size());
|
buf.writeInt(tasks.size());
|
||||||
|
|
||||||
for (ClientCraftingTask task : tasks) {
|
for (ClientCraftingTask task : tasks) {
|
||||||
writeTask(buf, task);
|
int children = 0;
|
||||||
|
|
||||||
|
ClientCraftingTask child = task.getChild();
|
||||||
|
|
||||||
|
while (child != null) {
|
||||||
|
children++;
|
||||||
|
|
||||||
|
child = child.getChild();
|
||||||
|
}
|
||||||
|
|
||||||
|
writeTask(buf, task, children);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void writeTask(PacketBuffer buf, ClientCraftingTask task) {
|
private void writeTask(PacketBuffer buf, ClientCraftingTask task, int children) {
|
||||||
ByteBufUtils.writeUTF8String(buf, task.getStatus());
|
ByteBufUtils.writeUTF8String(buf, task.getStatus());
|
||||||
|
|
||||||
|
buf.writeInt(children);
|
||||||
|
|
||||||
buf.writeInt(task.getProgress());
|
buf.writeInt(task.getProgress());
|
||||||
|
|
||||||
buf.writeInt(task.getOutputs().size());
|
buf.writeInt(task.getOutputs().size());
|
||||||
@@ -70,7 +82,7 @@ public final class RefinedStorageSerializers {
|
|||||||
buf.writeBoolean(task.getChild() != null);
|
buf.writeBoolean(task.getChild() != null);
|
||||||
|
|
||||||
if (task.getChild() != null) {
|
if (task.getChild() != null) {
|
||||||
writeTask(buf, task.getChild());
|
writeTask(buf, task.getChild(), children);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -90,12 +102,14 @@ public final class RefinedStorageSerializers {
|
|||||||
private void readTask(PacketBuffer buf, int i, int depth, List<ClientCraftingTask> tasks) {
|
private void readTask(PacketBuffer buf, int i, int depth, List<ClientCraftingTask> tasks) {
|
||||||
String status = ByteBufUtils.readUTF8String(buf);
|
String status = ByteBufUtils.readUTF8String(buf);
|
||||||
|
|
||||||
|
int children = buf.readInt();
|
||||||
|
|
||||||
int progress = buf.readInt();
|
int progress = buf.readInt();
|
||||||
|
|
||||||
int outputs = buf.readInt();
|
int outputs = buf.readInt();
|
||||||
|
|
||||||
for (int j = 0; j < outputs; ++j) {
|
for (int j = 0; j < outputs; ++j) {
|
||||||
tasks.add(new ClientCraftingTask(ByteBufUtils.readItemStack(buf), i, status, depth, progress));
|
tasks.add(new ClientCraftingTask(ByteBufUtils.readItemStack(buf), i, status, depth, children, progress));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (buf.readBoolean()) {
|
if (buf.readBoolean()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user