Merge pull request #411 from ferriarnus/rangefixes

Team-EnderIO · Aug 2, 2023 · 3802fd6 · 3802fd6
2 parents 258bcd6 + 58c064e
commit 3802fd6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 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
@@ -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
@@ -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
@@ -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.NEEDS_IRON_TOOL, BlockTags.MINEABLE_WITH_PICKAXE)
         .item(PoweredSpawnerItem::new)
         .tab(EIOCreativeTabs.MACHINES)
         .build()