From 117d1ea461ff1395061651e4651b6ccee9f0eb30 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Mon, 16 Aug 2021 14:26:43 +0700 Subject: [PATCH] Attach extra data to jobs --- .../entity/BlockEntityMatteryPoweredWorker.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatteryPoweredWorker.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatteryPoweredWorker.java index 00c1e5928..3b546a21a 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatteryPoweredWorker.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatteryPoweredWorker.java @@ -38,11 +38,16 @@ abstract public class BlockEntityMatteryPoweredWorker extends BlockEntityMattery } } - public record MachineJob(ItemStack stack, double ticks_processing_time, BigDecimal power_consumption_multiplier) { - public MachineJob(ItemStack stack, double ticks_processing_time, BigDecimal power_consumption_multiplier) { + public record MachineJob(ItemStack stack, double ticks_processing_time, BigDecimal power_consumption_multiplier, CompoundTag data) { + public MachineJob(ItemStack stack, double ticks_processing_time, BigDecimal power_consumption_multiplier, CompoundTag data) { this.stack = stack; this.ticks_processing_time = ticks_processing_time; this.power_consumption_multiplier = power_consumption_multiplier; + this.data = data; + } + + public MachineJob(ItemStack stack, double ticks_processing_time, BigDecimal power_consumption_multiplier) { + this(stack, ticks_processing_time, power_consumption_multiplier, new CompoundTag()); } public MachineJob(ItemStack stack, double ticks_processing_time) { @@ -52,6 +57,7 @@ abstract public class BlockEntityMatteryPoweredWorker extends BlockEntityMattery public CompoundTag serializeNBT() { CompoundTag store_job = new CompoundTag(); + store_job.put("data", data); store_job.put("stack", stack.serializeNBT()); store_job.putDouble("ticks_processing_time", ticks_processing_time); store_job.putString("power_consumption_multiplier", power_consumption_multiplier.toString()); @@ -69,7 +75,7 @@ abstract public class BlockEntityMatteryPoweredWorker extends BlockEntityMattery ItemStack stack = ItemStack.of(stack_tag); if (!stack.isEmpty()) { - return new MachineJob(stack, ticks_processing_time.getAsDouble(), new BigDecimal(power_consumption_multiplier.getAsString())); + return new MachineJob(stack, ticks_processing_time.getAsDouble(), new BigDecimal(power_consumption_multiplier.getAsString()), tag.getCompound("data")); } } }