From 25014342c9f0647b1e1246514234290ba5156110 Mon Sep 17 00:00:00 2001 From: Quarris Date: Tue, 28 Dec 2021 17:30:19 +0000 Subject: [PATCH] Create Impl --- .../mm/block/tile/RotationMachinePortBlockEntity.java | 10 ---------- .../mods/mm/data/MachineProcessRecipe.java | 5 ++++- .../mods/mm/ports/storage/RotationPortStorage.java | 1 + version.properties | 4 ++-- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/ticticboooom/mods/mm/block/tile/RotationMachinePortBlockEntity.java b/src/main/java/com/ticticboooom/mods/mm/block/tile/RotationMachinePortBlockEntity.java index 82b0448..a819c6e 100644 --- a/src/main/java/com/ticticboooom/mods/mm/block/tile/RotationMachinePortBlockEntity.java +++ b/src/main/java/com/ticticboooom/mods/mm/block/tile/RotationMachinePortBlockEntity.java @@ -54,16 +54,6 @@ public class RotationMachinePortBlockEntity extends KineticTileEntity implements super.tick(); this.storage.tick(this); - /*if (this.world.isRemote) { - return; - } - - if (storage instanceof RotationPortStorage) { - RotationPortStorage storage = (RotationPortStorage) this.storage; - if (input) { - storage.setSpeed(Math.abs(getSpeed())); - } - }*/ if (!world.isRemote()) { PacketHandler.INSTANCE.send(PacketDistributor.ALL.noArg(), new TileClientUpdatePacket.Data(pos, write(new CompoundNBT()))); } diff --git a/src/main/java/com/ticticboooom/mods/mm/data/MachineProcessRecipe.java b/src/main/java/com/ticticboooom/mods/mm/data/MachineProcessRecipe.java index f761eb7..dffd6d5 100644 --- a/src/main/java/com/ticticboooom/mods/mm/data/MachineProcessRecipe.java +++ b/src/main/java/com/ticticboooom/mods/mm/data/MachineProcessRecipe.java @@ -154,6 +154,7 @@ public class MachineProcessRecipe implements IRecipe { boolean canTick = true; + // Every tick index = 0; for (PortState input : inputs) { if (input.isConsumePerTick()) { @@ -175,7 +176,9 @@ public class MachineProcessRecipe implements IRecipe { } } - if (canTick) { + if (!canTick) { + this.onInterrupted(inputPorts, outputPorts); + } else { for (PortState input : inputs) { if (inputRolls.get(index) < input.getChance()) { if (input.isConsumePerTick()) { diff --git a/src/main/java/com/ticticboooom/mods/mm/ports/storage/RotationPortStorage.java b/src/main/java/com/ticticboooom/mods/mm/ports/storage/RotationPortStorage.java index 2a5178e..069a271 100644 --- a/src/main/java/com/ticticboooom/mods/mm/ports/storage/RotationPortStorage.java +++ b/src/main/java/com/ticticboooom/mods/mm/ports/storage/RotationPortStorage.java @@ -25,6 +25,7 @@ public class RotationPortStorage extends PortStorage { public static final Codec CODEC = RecordCodecBuilder.create(x -> x.group( Codec.INT.fieldOf("stress").forGetter(z -> z.stress) ).apply(x, RotationPortStorage::new)); + @Getter @Setter private float speed; diff --git a/version.properties b/version.properties index 810cb60..5e54974 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -#Sun Dec 12 21:28:07 GMT 2021 -VERSION_CODE=883 +#Tue Dec 28 16:25:35 GMT 2021 +VERSION_CODE=884