Modifiend how peripherals work (state on and state off)

Author: BastouP411

src/main/java/fr/bastoup/bperipherals/database/DBFactory.java

@@ -4,7 +4,7 @@
 import fr.bastoup.bperipherals.beans.QueryResult;
 import fr.bastoup.bperipherals.beans.SQLResult;
 import fr.bastoup.bperipherals.beans.UpdateResult;
-import fr.bastoup.bperipherals.peripherals.PeripheralDatabase;
+import fr.bastoup.bperipherals.peripherals.database.PeripheralDatabase;
 
 import java.sql.*;
 

src/main/java/fr/bastoup/bperipherals/init/ModBlocks.java

@@ -1,8 +1,9 @@
 package fr.bastoup.bperipherals.init;
 
-import fr.bastoup.bperipherals.blocks.BlockCryptographicAccelerator;
-import fr.bastoup.bperipherals.blocks.BlockDatabase;
-import fr.bastoup.bperipherals.blocks.BlockFEMeter;
+import fr.bastoup.bperipherals.peripherals.cryprographicaccelerator.BlockCryptographicAccelerator;
+import fr.bastoup.bperipherals.peripherals.database.BlockDatabase;
+import fr.bastoup.bperipherals.peripherals.femeter.BlockFEMeter;
+import fr.bastoup.bperipherals.peripherals.magcardreader.BlockMagCardReader;
 import net.minecraft.block.Block;
 
 import java.util.ArrayList;
@@ -14,4 +15,5 @@ public class ModBlocks {
  public static final Block FE_METER = new BlockFEMeter();
  public static final Block DATABASE = new BlockDatabase();
  public static final Block CRYPTOGRAPHIC_ACCELERATOR = new BlockCryptographicAccelerator();
+ public static final Block MAG_CARD_READER = new BlockMagCardReader();
 }

src/main/java/fr/bastoup/bperipherals/init/ModContainerTypes.java

@@ -1,6 +1,6 @@
 package fr.bastoup.bperipherals.init;
 
-import fr.bastoup.bperipherals.containers.ContainerDatabase;
+import fr.bastoup.bperipherals.peripherals.database.ContainerDatabase;
 import fr.bastoup.bperipherals.util.BPeripheralsProperties;
 import net.minecraft.inventory.container.ContainerType;
 import net.minecraft.util.ResourceLocation;

src/main/java/fr/bastoup/bperipherals/init/ModItems.java

@@ -1,6 +1,6 @@
 package fr.bastoup.bperipherals.init;
 
-import fr.bastoup.bperipherals.items.ItemBase;
+import fr.bastoup.bperipherals.util.items.ItemBase;
 import net.minecraft.item.Item;
 
 import java.util.ArrayList;

src/main/java/fr/bastoup/bperipherals/init/ModTileTypes.java

@@ -1,9 +1,9 @@
 package fr.bastoup.bperipherals.init;
 
-import dan200.computercraft.api.lua.ILuaAPIFactory;
-import fr.bastoup.bperipherals.tileentities.TileCryptographicAccelerator;
-import fr.bastoup.bperipherals.tileentities.TileDatabase;
-import fr.bastoup.bperipherals.tileentities.TileFEMeter;
+import fr.bastoup.bperipherals.peripherals.cryprographicaccelerator.TileCryptographicAccelerator;
+import fr.bastoup.bperipherals.peripherals.database.TileDatabase;
+import fr.bastoup.bperipherals.peripherals.femeter.TileFEMeter;
+import fr.bastoup.bperipherals.peripherals.magcardreader.TileMagCardReader;
 import fr.bastoup.bperipherals.util.BPeripheralsProperties;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.ResourceLocation;
@@ -16,4 +16,7 @@ public class ModTileTypes {
  .build(null).setRegistryName(new ResourceLocation(BPeripheralsProperties.MODID, "database"));
  public static final TileEntityType<TileCryptographicAccelerator> CRYPTOGRAPHIC_ACCELERATOR = (TileEntityType<TileCryptographicAccelerator>) TileEntityType.Builder.create(TileCryptographicAccelerator::new, ModBlocks.CRYPTOGRAPHIC_ACCELERATOR)
  .build(null).setRegistryName(new ResourceLocation(BPeripheralsProperties.MODID, "cryptographic_accelerator"));
+ public static final TileEntityType<TileMagCardReader> MAG_CARD_READER = (TileEntityType<TileMagCardReader>) TileEntityType.Builder.create(TileMagCardReader::new, ModBlocks.MAG_CARD_READER)
+ .build(null).setRegistryName(new ResourceLocation(BPeripheralsProperties.MODID, "mag_card_reader"));
+
 }

src/main/java/fr/bastoup/bperipherals/blocks/BlockCryptographicAccelerator.java renamed to src/main/java/fr/bastoup/bperipherals/peripherals/cryprographicaccelerator/BlockCryptographicAccelerator.java

@@ -1,20 +1,18 @@
-package fr.bastoup.bperipherals.blocks;
+package fr.bastoup.bperipherals.peripherals.cryprographicaccelerator;
 
 import fr.bastoup.bperipherals.init.ModTileTypes;
+import fr.bastoup.bperipherals.util.blocks.BlockPeripheral;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.material.Material;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.Direction;
 import net.minecraft.world.IBlockReader;
 
 import javax.annotation.Nullable;
 
-public class BlockCryptographicAccelerator extends BlockOrientable{
+public class BlockCryptographicAccelerator extends BlockPeripheral {
 
  public BlockCryptographicAccelerator() {
  super(Properties.create(Material.ROCK).hardnessAndResistance(2.0F), "cryptographic_accelerator");
-
- setDefaultState(this.getDefaultState().with(FACING, Direction.NORTH));
  }
 
  @Override

src/main/java/fr/bastoup/bperipherals/peripherals/PeripheralCryptographicAccelerator.java renamed to src/main/java/fr/bastoup/bperipherals/peripherals/cryprographicaccelerator/PeripheralCryptographicAccelerator.java

@@ -1,13 +1,10 @@
-package fr.bastoup.bperipherals.peripherals;
+package fr.bastoup.bperipherals.peripherals.cryprographicaccelerator;
 
-import dan200.computercraft.api.lua.IArguments;
 import dan200.computercraft.api.lua.LuaException;
 import dan200.computercraft.api.lua.LuaFunction;
-import dan200.computercraft.api.peripheral.IComputerAccess;
 import dan200.computercraft.api.peripheral.IPeripheral;
-import fr.bastoup.bperipherals.tileentities.TileCryptographicAccelerator;
 import fr.bastoup.bperipherals.util.Util;
-import org.squiddev.cobalt.LuaString;
+import fr.bastoup.bperipherals.util.peripherals.BPeripheral;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -26,14 +23,13 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class PeripheralCryptographicAccelerator implements IPeripheral {
+public class PeripheralCryptographicAccelerator extends BPeripheral {
 
  public static final String TYPE = "cryptographic_accelerator";
 
- private final TileCryptographicAccelerator tile;
 
  public PeripheralCryptographicAccelerator(TileCryptographicAccelerator tile) {
- this.tile = tile;
+ super(tile);
  }
 
  @Nonnull
@@ -42,22 +38,6 @@ public String getType() {
  return TYPE;
  }
 
- @Override
- public void attach(@Nonnull IComputerAccess computer) {
-
- }
-
- @Override
- public void detach(@Nonnull IComputerAccess computer) {
-
- }
-
- @Nullable
- @Override
- public Object getTarget() {
- return tile;
- }
-
  @Override
  public boolean equals(@Nullable IPeripheral other) {
  return other instanceof PeripheralCryptographicAccelerator && ((TileCryptographicAccelerator) other.getTarget()).getWorld().equals(tile.getWorld()) &&

src/main/java/fr/bastoup/bperipherals/peripherals/cryprographicaccelerator/TileCryptographicAccelerator.java

@@ -0,0 +1,11 @@
+package fr.bastoup.bperipherals.peripherals.cryprographicaccelerator;
+
+import fr.bastoup.bperipherals.init.ModTileTypes;
+import fr.bastoup.bperipherals.util.tiles.TilePeripheral;
+
+public class TileCryptographicAccelerator extends TilePeripheral {
+ public TileCryptographicAccelerator() {
+ super(ModTileTypes.CRYPTOGRAPHIC_ACCELERATOR);
+ this.setPeripheral(new PeripheralCryptographicAccelerator(this));
+ }
+}

src/main/java/fr/bastoup/bperipherals/blocks/BlockDatabase.java renamed to src/main/java/fr/bastoup/bperipherals/peripherals/database/BlockDatabase.java

@@ -1,8 +1,8 @@
-package fr.bastoup.bperipherals.blocks;
+package fr.bastoup.bperipherals.peripherals.database;
 
 import fr.bastoup.bperipherals.init.ModTileTypes;
-import fr.bastoup.bperipherals.tileentities.TileDatabase;
 import fr.bastoup.bperipherals.util.BPeripheralsProperties;
+import fr.bastoup.bperipherals.util.blocks.BlockPeripheral;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.material.Material;
@@ -26,7 +26,7 @@
 @Mod.EventBusSubscriber(
  modid = BPeripheralsProperties.MODID
 )
-public class BlockDatabase extends BlockOrientable {
+public class BlockDatabase extends BlockPeripheral {
 
  public static final BooleanProperty DISK_INSERTED = BooleanProperty.create("disk");
 

src/main/java/fr/bastoup/bperipherals/containers/ContainerDatabase.java renamed to src/main/java/fr/bastoup/bperipherals/peripherals/database/ContainerDatabase.java

@@ -1,6 +1,5 @@
-package fr.bastoup.bperipherals.containers;
+package fr.bastoup.bperipherals.peripherals.database;
 
-import fr.bastoup.bperipherals.capabilites.DatabaseInventory;
 import fr.bastoup.bperipherals.init.ModContainerTypes;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
@@ -14,9 +13,9 @@
 
 public class ContainerDatabase extends Container {
 
- private final DatabaseInventory inventory;
+ private final InventoryDatabase inventory;
 
- public ContainerDatabase(int id, PlayerInventory player, DatabaseInventory inventory) {
+ public ContainerDatabase(int id, PlayerInventory player, InventoryDatabase inventory) {
  super(ModContainerTypes.DATABASE, id);
  this.inventory = inventory;
  this.addSlot(new SlotItemHandler(inventory, 0, 80, 35));
@@ -34,7 +33,7 @@ public ContainerDatabase(int id, PlayerInventory player, DatabaseInventory inven
  }
 
  public ContainerDatabase(int i, PlayerInventory inventory, PacketBuffer buffer) {
- this(i, inventory, new DatabaseInventory(null));
+ this(i, inventory, new InventoryDatabase(null));
  }
 
  public boolean canInteractWith(@Nonnull PlayerEntity player) {