From 7edfed25308d2aedaaf9cce5431151e46d01a5b0 Mon Sep 17 00:00:00 2001
From: ferriarnus <61201275+ferriarnus@users.noreply.github.com>
Date: Wed, 2 Aug 2023 14:06:12 +0200
Subject: [PATCH 1/2] Fix range and Powered Spawner

---
 .../blockentity/PoweredSpawnerBlockEntity.java       |  2 ++
 .../common/blockentity/base/MachineBlockEntity.java  |  8 ++++++--
 .../enderio/machines/common/init/MachineBlocks.java  | 12 +++++-------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/machines/java/com/enderio/machines/common/blockentity/PoweredSpawnerBlockEntity.java b/src/machines/java/com/enderio/machines/common/blockentity/PoweredSpawnerBlockEntity.java
index 16cf2d023..57d189218 100644
--- a/src/machines/java/com/enderio/machines/common/blockentity/PoweredSpawnerBlockEntity.java
+++ b/src/machines/java/com/enderio/machines/common/blockentity/PoweredSpawnerBlockEntity.java
@@ -54,6 +54,8 @@ public PoweredSpawnerBlockEntity(BlockEntityType type, BlockPos worldPosition, B
         }));
         addDataSlot(new EnumNetworkDataSlot<>(SpawnerBlockedReason.class, this::getReason, this::setReason));
 
+        range = 4;
+
         taskHost = new MachineTaskHost(this, this::hasEnergy) {
             @Override
             protected @Nullable IMachineTask getNewTask() {
diff --git a/src/machines/java/com/enderio/machines/common/blockentity/base/MachineBlockEntity.java b/src/machines/java/com/enderio/machines/common/blockentity/base/MachineBlockEntity.java
index 426d9cc3e..91b50e5d1 100644
--- a/src/machines/java/com/enderio/machines/common/blockentity/base/MachineBlockEntity.java
+++ b/src/machines/java/com/enderio/machines/common/blockentity/base/MachineBlockEntity.java
@@ -273,13 +273,17 @@ public void setRange(int range) {
 
     public void decreaseRange() {
         if (this.range > 0) {
-            this.range--;
+            if (level != null && level.isClientSide()) {
+                clientUpdateSlot(rangeDataSlot, range - 1);
+            } else this.range--;
         }
     }
 
     public void increaseRange() {
         if (this.range < getMaxRange()) {
-            this.range++;
+            if (level != null && level.isClientSide()) {
+                clientUpdateSlot(rangeDataSlot, range + 1);
+            } else this.range++;
         }
     }
 
diff --git a/src/machines/java/com/enderio/machines/common/init/MachineBlocks.java b/src/machines/java/com/enderio/machines/common/init/MachineBlocks.java
index d2fc06f41..54c359861 100644
--- a/src/machines/java/com/enderio/machines/common/init/MachineBlocks.java
+++ b/src/machines/java/com/enderio/machines/common/init/MachineBlocks.java
@@ -29,13 +29,7 @@
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.properties.BlockStateProperties;
-import net.minecraftforge.client.model.generators.BlockModelBuilder;
-import net.minecraftforge.client.model.generators.ConfiguredModel;
-import net.minecraftforge.client.model.generators.ModelFile;
 import net.minecraftforge.client.model.generators.loaders.CompositeModelBuilder;
-import net.minecraftforge.common.util.TransformationHelper;
-import org.joml.Vector3f;
 
 import java.util.HashMap;
 import java.util.Locale;
@@ -129,8 +123,12 @@ public class MachineBlocks {
         .lang("Soul Binder")
         .register();
 
-    public static final BlockEntry<ProgressMachineBlock> POWERED_SPAWNER = progressMachine("powered_spawner", () -> MachineBlockEntities.POWERED_SPAWNER)
+    public static final BlockEntry<ProgressMachineBlock> POWERED_SPAWNER = REGISTRATE
+        .block("powered_spawner", properties -> new ProgressMachineBlock(properties, MachineBlockEntities.POWERED_SPAWNER))
         .loot((l,t) -> MachinesLootTable.copyNBTSingleCap(l, t, "EntityStorage"))
+        .properties(props -> props.strength(2.5f, 8))
+        .blockstate(MachineModelUtil::progressMachineBlock)
+        .tag(BlockTags.MINEABLE_WITH_PICKAXE)
         .item(PoweredSpawnerItem::new)
         .tab(EIOCreativeTabs.MACHINES)
         .build()

From 58c064e6c7aa558e9e6b0ab1b9458d6b490d21d3 Mon Sep 17 00:00:00 2001
From: ferriarnus <61201275+ferriarnus@users.noreply.github.com>
Date: Wed, 2 Aug 2023 14:37:01 +0200
Subject: [PATCH 2/2] Update MachineBlocks.java

---
 .../java/com/enderio/machines/common/init/MachineBlocks.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/machines/java/com/enderio/machines/common/init/MachineBlocks.java b/src/machines/java/com/enderio/machines/common/init/MachineBlocks.java
index 54c359861..b463763ca 100644
--- a/src/machines/java/com/enderio/machines/common/init/MachineBlocks.java
+++ b/src/machines/java/com/enderio/machines/common/init/MachineBlocks.java
@@ -128,7 +128,7 @@ public class MachineBlocks {
         .loot((l,t) -> MachinesLootTable.copyNBTSingleCap(l, t, "EntityStorage"))
         .properties(props -> props.strength(2.5f, 8))
         .blockstate(MachineModelUtil::progressMachineBlock)
-        .tag(BlockTags.MINEABLE_WITH_PICKAXE)
+        .tag(BlockTags.NEEDS_IRON_TOOL, BlockTags.MINEABLE_WITH_PICKAXE)
         .item(PoweredSpawnerItem::new)
         .tab(EIOCreativeTabs.MACHINES)
         .build()