Quick dirty tweaks

Bump version to 0.1.0a

Author: Flamarine

gradle.properties

@@ -16,7 +16,7 @@ loom.platform=forge
     yarn_mappings=1.18.2+build.4
 
 # Mod Properties
-    mod_version=0.1.0
+    mod_version=0.1.0a
     maven_group=io.github.dovecotmc
     archives_base_name=LeadBeyond
     mod_id=lead_beyond

src/main/java/io/github/dovecotmc/leadbeyond/LeadBeyondClient.java

@@ -3,9 +3,6 @@
 import io.github.dovecotmc.leadbeyond.common.reg.BlockReg;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.RenderLayers;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 
 public class LeadBeyondClient {

src/main/java/io/github/dovecotmc/leadbeyond/common/block/TurnstileBlock.java

@@ -4,6 +4,7 @@
 import com.simibubi.create.content.contraptions.wrench.WrenchItem;
 import io.github.dovecotmc.leadbeyond.common.item.CardItem;
 import io.github.dovecotmc.leadbeyond.common.item.TicketItem;
+import io.github.dovecotmc.leadbeyond.common.item.Ticketable;
 import io.github.dovecotmc.leadbeyond.common.reg.BlockEntityReg;
 import io.github.dovecotmc.leadbeyond.common.reg.SoundReg;
 import net.minecraft.block.*;
@@ -83,6 +84,7 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt
                     NbtCompound nbt = stack.getOrCreateSubNbt("ticketInfo");
                     if (!nbt.getBoolean("used")) {
                         nbt.putBoolean("used", true);
+                        stack.getOrCreateSubNbt("stationInfo").putBoolean("enteredStation", true);
                         turnstile.setTimer(60);
                         world.playSound(null, pos, SoundReg.BEEP_TURNSTILE.get(), SoundCategory.BLOCKS, 1f, 1f);
                         return ActionResult.SUCCESS;
@@ -91,15 +93,22 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt
                     NbtCompound nbt = stack.getOrCreateSubNbt("cardInfo");
                     if (nbt.getLong("money") >= 100) {
                         nbt.putLong("money", nbt.getLong("money") - 100);
+                        stack.getOrCreateSubNbt("stationInfo").putBoolean("enteredStation", true);
                         turnstile.setTimer(60);
                         world.playSound(null, pos, SoundReg.BEEP_TURNSTILE.get(), SoundCategory.BLOCKS, 1f, 1f);
                         return ActionResult.SUCCESS;
                     }
                 }
-            } else if (!(stack.getItem() instanceof WrenchItem)) {
-                turnstile.setTimer(60);
-                world.playSound(null, pos, SoundReg.BEEP_TURNSTILE.get(), SoundCategory.BLOCKS, 1f, 1f);
-                return ActionResult.SUCCESS;
+            } else {
+                if (stack.getItem() instanceof Ticketable) {
+                    NbtCompound nbt = stack.getOrCreateSubNbt("stationInfo");
+                    if (nbt.getBoolean("enteredStation")) {
+                        turnstile.setTimer(60);
+                        nbt.putBoolean("enteredStation", false);
+                        world.playSound(null, pos, SoundReg.BEEP_TURNSTILE.get(), SoundCategory.BLOCKS, 1f, 1f);
+                        return ActionResult.SUCCESS;
+                    }
+                }
             }
         }
         return super.onUse(state, world, pos, player, hand, hit);

src/main/java/io/github/dovecotmc/leadbeyond/common/item/CardItem.java

@@ -19,7 +19,8 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
-public class CardItem extends Item {
+public class CardItem extends Item
+        implements Ticketable {
     public CardItem(Settings settings) {
         super(settings);
     }
@@ -28,6 +29,7 @@ public CardItem(Settings settings) {
     public ItemStack getDefaultStack() {
         ItemStack stack = super.getDefaultStack();
         stack.getOrCreateSubNbt("cardInfo").putLong("money", 0);
+        stack.getOrCreateSubNbt("stationInfo").putBoolean("enteredStation", false);
         return stack;
     }
 

src/main/java/io/github/dovecotmc/leadbeyond/common/item/TicketItem.java

@@ -19,7 +19,8 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
-public class TicketItem extends Item {
+public class TicketItem extends Item
+        implements Ticketable {
     public TicketItem(Settings settings) {
         super(settings);
     }
@@ -28,6 +29,7 @@ public TicketItem(Settings settings) {
     public ItemStack getDefaultStack() {
         ItemStack stack = super.getDefaultStack();
         stack.getOrCreateSubNbt("ticketInfo").putBoolean("used", false);
+        stack.getOrCreateSubNbt("stationInfo").putBoolean("enteredStation", false);
         return stack;
     }
 

src/main/java/io/github/dovecotmc/leadbeyond/common/item/Ticketable.java

@@ -0,0 +1,4 @@
+package io.github.dovecotmc.leadbeyond.common.item;
+
+public interface Ticketable {
+}