diff --git a/src/main/java/com/hbm/entity/item/EntityMovingConveyorObject.java b/src/main/java/com/hbm/entity/item/EntityMovingConveyorObject.java index 228c8230a..b13accbae 100644 --- a/src/main/java/com/hbm/entity/item/EntityMovingConveyorObject.java +++ b/src/main/java/com/hbm/entity/item/EntityMovingConveyorObject.java @@ -1,5 +1,7 @@ package com.hbm.entity.item; +import com.hbm.blocks.network.BlockConveyorDouble; +import com.hbm.blocks.network.BlockConveyorTriple; import com.hbm.lib.Library; import com.hbm.util.fauxpointtwelve.BlockPos; @@ -148,7 +150,11 @@ public abstract class EntityMovingConveyorObject extends Entity { public abstract boolean onLeaveConveyor(); public double getMoveSpeed() { - return 0.0625D; + double speed = 0.0625D; // this worked first try + Block b = worldObj.getBlock((int) Math.floor(posX), (int) Math.floor(posY), (int) Math.floor(posZ)); + if (b.getClass().equals(BlockConveyorDouble.class)) return speed * 2; + else if (b.getClass().equals(BlockConveyorTriple.class)) return speed * 2.75; + else return speed; } @SideOnly(Side.CLIENT) diff --git a/src/main/resources/assets/hbm/textures/blocks/conveyor_double.png b/src/main/resources/assets/hbm/textures/blocks/conveyor_double.png index aa49e18c8..6d773232d 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/conveyor_double.png and b/src/main/resources/assets/hbm/textures/blocks/conveyor_double.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/conveyor_double_curve_left.png b/src/main/resources/assets/hbm/textures/blocks/conveyor_double_curve_left.png index f5f4c4a8c..fe59acfe2 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/conveyor_double_curve_left.png and b/src/main/resources/assets/hbm/textures/blocks/conveyor_double_curve_left.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/conveyor_double_curve_right.png b/src/main/resources/assets/hbm/textures/blocks/conveyor_double_curve_right.png index fafd8b190..2ea981a71 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/conveyor_double_curve_right.png and b/src/main/resources/assets/hbm/textures/blocks/conveyor_double_curve_right.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/conveyor_triple.png b/src/main/resources/assets/hbm/textures/blocks/conveyor_triple.png index cb948832b..e7556a856 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/conveyor_triple.png and b/src/main/resources/assets/hbm/textures/blocks/conveyor_triple.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/conveyor_triple_curve_left.png b/src/main/resources/assets/hbm/textures/blocks/conveyor_triple_curve_left.png index f6411e3c5..ab4fda3be 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/conveyor_triple_curve_left.png and b/src/main/resources/assets/hbm/textures/blocks/conveyor_triple_curve_left.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/conveyor_triple_curve_right.png b/src/main/resources/assets/hbm/textures/blocks/conveyor_triple_curve_right.png index 4c32e96e5..785054901 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/conveyor_triple_curve_right.png and b/src/main/resources/assets/hbm/textures/blocks/conveyor_triple_curve_right.png differ