From 53240bd42f08d839b233a3b75cb59aabb4648fb9 Mon Sep 17 00:00:00 2001
From: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Mon, 3 Apr 2023 21:42:29 +0100
Subject: [PATCH] Corrected Bogey InteractionResult To Pass

---
 .../java/com/simibubi/create/AllBogeyStyles.java  | 15 ---------------
 .../logistics/trains/AbstractBogeyBlock.java      | 13 +++++++++----
 .../trains/track/StandardBogeyBlock.java          |  9 +--------
 3 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/simibubi/create/AllBogeyStyles.java b/src/main/java/com/simibubi/create/AllBogeyStyles.java
index c521b7a88..be789fdd7 100644
--- a/src/main/java/com/simibubi/create/AllBogeyStyles.java
+++ b/src/main/java/com/simibubi/create/AllBogeyStyles.java
@@ -20,21 +20,6 @@ public class AllBogeyStyles {
 			.renderer(new StandardBogeyRenderer())
 			.register();
 
-	/*
-	public static final RegistryEntry<BogeyStyle> TEST = REGISTRATE
-			.bogeyStyle("test", new BogeyStyle())
-			.block(BogeySizes.LARGE, AllBlocks.LARGE_BOGEY)
-			.renderer(new TestBogeyRenderer())
-			.register();
-
-	public static final RegistryEntry<BogeyStyle> TEST_TWO = REGISTRATE
-			.bogeyStyle("test_two", new BogeyStyle())
-			.block(BogeySizes.SMALL, AllBlocks.SMALL_BOGEY)
-			.renderer(new TestBogeyRenderer())
-			.register();
-
-	 */
-
 	public static void register() {
 		LOGGER.info("Registered bogey styles from " + Create.ID);
 		AllRegistries.DEFERRED_BOGEY_REGISTRY.register(FMLJavaModLoadingContext.get().getModEventBus());
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/AbstractBogeyBlock.java b/src/main/java/com/simibubi/create/content/logistics/trains/AbstractBogeyBlock.java
index fe2f182c4..83d223d64 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/AbstractBogeyBlock.java
+++ b/src/main/java/com/simibubi/create/content/logistics/trains/AbstractBogeyBlock.java
@@ -59,10 +59,13 @@ import org.jetbrains.annotations.NotNull;
 public abstract class AbstractBogeyBlock extends Block implements ITE<StandardBogeyTileEntity>, ProperWaterloggedBlock, ISpecialBlockItemRequirement, IWrenchable {
 	public static final EnumProperty<Direction.Axis> AXIS = BlockStateProperties.HORIZONTAL_AXIS;
 	static final List<ResourceLocation> BOGEYS = new ArrayList<>();
+	public BogeySizes.BogeySize size;
 
-	public AbstractBogeyBlock(Properties pProperties) {
+
+	public AbstractBogeyBlock(Properties pProperties, BogeySizes.BogeySize size) {
 		super(pProperties);
 		registerDefaultState(defaultBlockState().setValue(WATERLOGGED, false));
+		this.size = size;
 	}
 
 	public static void register(ResourceLocation block) {
@@ -118,7 +121,9 @@ public abstract class AbstractBogeyBlock extends Block implements ITE<StandardBo
 		renderer.render(sbte.getBogeyData(), wheelAngle, ms, light, vb, getSize());
 	}
 
-	public abstract BogeySizes.BogeySize getSize();
+	public BogeySizes.BogeySize getSize() {
+		return this.size;
+	};
 
 	public Direction getBogeyUpDirection() {
 		return Direction.UP;
@@ -139,7 +144,7 @@ public abstract class AbstractBogeyBlock extends Block implements ITE<StandardBo
 	public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand,
 								 BlockHitResult hit) {
 		if (level.isClientSide)
-			return InteractionResult.CONSUME;
+			return InteractionResult.PASS;
 		ItemStack stack = player.getItemInHand(hand);
 
 		if (!player.isShiftKeyDown() && stack.is(AllItems.WRENCH.get()) && !player.getCooldowns().isOnCooldown(stack.getItem())
@@ -147,7 +152,7 @@ public abstract class AbstractBogeyBlock extends Block implements ITE<StandardBo
 			Collection<BogeyStyle> styles = AllRegistries.BOGEY_REGISTRY.get().getValues();
 
 			if (styles.size() <= 1)
-				return InteractionResult.SUCCESS;
+				return InteractionResult.PASS;
 
 			BlockEntity be = level.getBlockEntity(pos);
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/StandardBogeyBlock.java b/src/main/java/com/simibubi/create/content/logistics/trains/track/StandardBogeyBlock.java
index 07042b275..f569f093d 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/StandardBogeyBlock.java
+++ b/src/main/java/com/simibubi/create/content/logistics/trains/track/StandardBogeyBlock.java
@@ -19,11 +19,9 @@ import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.phys.Vec3;
 
 public class StandardBogeyBlock extends AbstractBogeyBlock implements ITE<StandardBogeyTileEntity>, ProperWaterloggedBlock, ISpecialBlockItemRequirement {
-	private final BogeySizes.BogeySize size;
 
 	public StandardBogeyBlock(Properties props, BogeySizes.BogeySize size) {
-		super(props);
-		this.size = size;
+		super(props, size);
 		registerDefaultState(defaultBlockState().setValue(WATERLOGGED, false));
 	}
 
@@ -42,11 +40,6 @@ public class StandardBogeyBlock extends AbstractBogeyBlock implements ITE<Standa
 		return new Vec3(0, 7 / 32f, 1);
 	}
 
-	@Override
-	public BogeySizes.BogeySize getSize() {
-		return size;
-	}
-
 	@Override
 	public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter level, BlockPos pos,
 		Player player) {