Tunak tunak tunak tun

Author: BastouP411

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

@@ -7,7 +7,8 @@
 import java.util.List;
 
 public class ModItems {
- public static final List<Item> ITEMS = new ArrayList<Item>();
+ public static final List<Item> ITEMS = new ArrayList<>();
 
  public static final Item DATABASE_DISK = new ItemBase("database_disk", 1);
+ public static final Item MAG_CARD = new ItemBase("mag_card", 1);
 }

src/main/java/fr/bastoup/bperipherals/peripherals/database/TileDatabase.java

@@ -1,5 +1,6 @@
 package fr.bastoup.bperipherals.peripherals.database;
 
+import dan200.computercraft.api.peripheral.IComputerAccess;
 import fr.bastoup.bperipherals.init.ModItems;
 import fr.bastoup.bperipherals.init.ModTileTypes;
 import fr.bastoup.bperipherals.util.Util;
@@ -40,7 +41,7 @@ public class TileDatabase extends TilePeripheral implements INamedContainerProvi
 private final LazyOptional<InventoryDatabase> holderInv = LazyOptional.of(() -> databaseInventory);
 
 private boolean lastDiskState = false;
-private int lastSize = 0;
+private final int lastSize = 0;
 private ITextComponent customName;
 
 public TileDatabase() {
@@ -130,18 +131,22 @@ public CompoundNBT write(CompoundNBT nbt) {
 public void tick() {
 if (isDiskInserted() && !lastDiskState) {
 this.getWorld().setBlockState(this.getPos(), this.getBlockState().with(BlockDatabase.DISK_INSERTED, true));
+
+synchronized (computers) {
+for (IComputerAccess c : computers) {
+c.queueEvent("database_attached", c.getAttachmentName(), getDatabaseId(), getDatabaseName());
+}
+}
 } else if (!isDiskInserted() && lastDiskState) {
 this.getWorld().setBlockState(this.getPos(), this.getBlockState().with(BlockDatabase.DISK_INSERTED, false));
-}
-lastDiskState = isDiskInserted();
 
-synchronized (computers) {
-if(computers.size() != lastSize) {
-lastSize = computers.size();
-System.out.println("Connected: " + lastSize);
+synchronized (computers) {
+for (IComputerAccess c : computers) {
+c.queueEvent("database_detached", c.getAttachmentName());
+}
 }
 }
-
+lastDiskState = isDiskInserted();
 }
 
 @Nullable

src/main/java/fr/bastoup/bperipherals/util/tiles/TilePeripheral.java

@@ -9,6 +9,7 @@
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.LazyOptional;
 
+import javax.annotation.Nonnull;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -31,19 +32,18 @@ public void addComputer(IComputerAccess computer) {
  synchronized (computers) {
  computers.add(computer);
  update();
- System.out.println("tic " + computers.size());
  }
  }
 
  public void removeComputer(IComputerAccess computer) {
  synchronized (computers) {
  computers.remove(computer);
  update();
- System.out.println("tac " + computers.size());
  }
  }
 
  @Override
+ @Nonnull
  public <T> LazyOptional<T> getCapability(Capability<T> capability, Direction facing) {
  if (capability.equals(Capabilities.CAPABILITY_PERIPHERAL)) {
  return holderPeripheral.cast();
@@ -52,7 +52,7 @@ public <T> LazyOptional<T> getCapability(Capability<T> capability, Direction fac
  }
 
  public void update() {
- if (computers.isEmpty()) {
+ if (computers.isEmpty() && this.getWorld().getBlockState(this.getPos()).hasProperty(BlockPeripheral.SWITCHED_ON)) {
  this.getWorld().setBlockState(this.getPos(), this.getBlockState().with(BlockPeripheral.SWITCHED_ON, false));
  } else {
  this.getWorld().setBlockState(this.getPos(), this.getBlockState().with(BlockPeripheral.SWITCHED_ON, true));

src/main/resources/assets/bperipherals/models/item/mag_card.json

@@ -0,0 +1,6 @@
+{
+ "parent": "item/generated",
+ "textures": {
+ "layer0": "bperipherals:items/mag_card/mag_card"
+ }
+}

src/main/resources/assets/bperipherals/textures/blocks/cryptographic_accelerator/cryptographic_accelerator_off.png

@@ -0,0 +1,6 @@
+{
+ "animation": {
+ "interpolate": true,
+ "frametime": 5
+ }
+}