Added possibility to see inside inventories/tanks/batteries as peripherals.

Author: BastouP411

build.gradle

@@ -117,6 +117,7 @@ sourceSets.main.resources { srcDir 'src/generated/resources' }
 repositories {
  mavenCentral()
  maven { url 'https://squiddev.cc/maven/' }
+ maven { url 'https://modmaven.dev/' }
 }
 
 configurations {

src/main/java/fr/bastoup/bperipherals/BPeripherals.java

@@ -1,41 +1,35 @@
 package fr.bastoup.bperipherals;
 
+import dan200.computercraft.api.ComputerCraftAPI;
 import fr.bastoup.bperipherals.database.DBFactory;
+import fr.bastoup.bperipherals.peripherals.CapabilityPeripheralProvider;
 import fr.bastoup.bperipherals.registry.ClientRegistry;
 import fr.bastoup.bperipherals.registry.SharedRegistry;
-import fr.bastoup.bperipherals.util.BPeripheralsProperties;
 import fr.bastoup.bperipherals.util.Config;
+import fr.bastoup.bperipherals.common.BPeripheralsCreativeTab;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-@Mod(BPeripheralsProperties.MODID)
-public class BPeripherals
-{
+@Mod(BPeripherals.MOD_ID)
+public class BPeripherals {
+ public static final String MOD_ID = "bperipherals";
+ public static final BPeripheralsCreativeTab CREATIVE_TAB = new BPeripheralsCreativeTab();
+ public static final Logger LOGGER = LogManager.getLogger();
+ public static final DBFactory DB_FACTORY = DBFactory.getInstance();
 
- private static final Logger LOGGER = LogManager.getLogger();
- private static IEventBus MOD_EVENT_BUS = null;
- private static DBFactory dbFactory;
+ private IEventBus modEventBus;
 
  public BPeripherals() {
- MOD_EVENT_BUS = FMLJavaModLoadingContext.get().getModEventBus();
- MOD_EVENT_BUS.register(SharedRegistry.class);
- MOD_EVENT_BUS.register(ClientRegistry.class);
- MOD_EVENT_BUS.register(Config.class);
+ modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
+ modEventBus.register(SharedRegistry.class);
+ modEventBus.register(ClientRegistry.class);
+ modEventBus.register(Config.class);
 
  Config.setup();
+ ComputerCraftAPI.registerPeripheralProvider(new CapabilityPeripheralProvider());
 
- dbFactory = DBFactory.getInstance();
-
- }
-
- public static Logger getLogger() {
- return LOGGER;
- }
-
- public static DBFactory getDBFactory() {
- return dbFactory;
  }
 }

src/main/java/fr/bastoup/bperipherals/util/CreativeTab.java renamed to src/main/java/fr/bastoup/bperipherals/common/BPeripheralsCreativeTab.java

@@ -1,4 +1,4 @@
-package fr.bastoup.bperipherals.util;
+package fr.bastoup.bperipherals.common;
 
 import fr.bastoup.bperipherals.init.ModBlocks;
 import net.minecraft.world.item.CreativeModeTab;
@@ -8,8 +8,8 @@
 
 import javax.annotation.Nonnull;
 
-public class CreativeTab extends CreativeModeTab {
- public CreativeTab() {
+public class BPeripheralsCreativeTab extends CreativeModeTab {
+ public BPeripheralsCreativeTab() {
  super("bperipherals");
  }
 

src/main/java/fr/bastoup/bperipherals/util/blocks/BlockBase.java renamed to src/main/java/fr/bastoup/bperipherals/common/BlockBase.java

@@ -1,9 +1,8 @@
-package fr.bastoup.bperipherals.util.blocks;
+package fr.bastoup.bperipherals.common;
 
+import fr.bastoup.bperipherals.BPeripherals;
 import fr.bastoup.bperipherals.init.ModBlocks;
 import fr.bastoup.bperipherals.init.ModItems;
-import fr.bastoup.bperipherals.util.BPeripheralsProperties;
-import fr.bastoup.bperipherals.util.tiles.BlockEntityBase;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Material;
@@ -24,18 +23,18 @@ public class BlockBase extends Block {
 
 public BlockBase(String name, Material material) {
 super(Properties.of(material));
-setRegistryName(new ResourceLocation(BPeripheralsProperties.MODID, name));
+setRegistryName(new ResourceLocation(BPeripherals.MOD_ID, name));
 
 ModBlocks.BLOCKS.add(this);
-ModItems.ITEMS.add(new BlockItem(this, new Item.Properties().tab(BPeripheralsProperties.CREATIVE_TAB)).setRegistryName(this.getRegistryName()));
+ModItems.ITEMS.add(new BlockItem(this, new Item.Properties().tab(BPeripherals.CREATIVE_TAB)).setRegistryName(this.getRegistryName()));
 }
 
 public BlockBase(final Properties properties, String name) {
 super(properties);
 setRegistryName(name);
 
 ModBlocks.BLOCKS.add(this);
-ModItems.ITEMS.add(new BlockItem(this, new Item.Properties().tab(BPeripheralsProperties.CREATIVE_TAB)).setRegistryName(this.getRegistryName()));
+ModItems.ITEMS.add(new BlockItem(this, new Item.Properties().tab(BPeripherals.CREATIVE_TAB)).setRegistryName(this.getRegistryName()));
 }
 
 @Override

src/main/java/fr/bastoup/bperipherals/util/tiles/BlockEntityBase.java renamed to src/main/java/fr/bastoup/bperipherals/common/BlockEntityBase.java

@@ -1,4 +1,4 @@
-package fr.bastoup.bperipherals.util.tiles;
+package fr.bastoup.bperipherals.common;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.player.Player;

src/main/java/fr/bastoup/bperipherals/util/tiles/BlockEntityOrientable.java renamed to src/main/java/fr/bastoup/bperipherals/common/BlockEntityOrientable.java

@@ -1,8 +1,7 @@
-package fr.bastoup.bperipherals.util.tiles;
+package fr.bastoup.bperipherals.common;
 
 import fr.bastoup.bperipherals.util.BlockFaces;
 import fr.bastoup.bperipherals.util.Util;
-import fr.bastoup.bperipherals.util.blocks.BlockOrientable;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.core.Direction;

src/main/java/fr/bastoup/bperipherals/util/blocks/BlockOrientable.java renamed to src/main/java/fr/bastoup/bperipherals/common/BlockOrientable.java

@@ -1,4 +1,4 @@
-package fr.bastoup.bperipherals.util.blocks;
+package fr.bastoup.bperipherals.common;
 
 import fr.bastoup.bperipherals.util.Util;
 import net.minecraft.world.level.block.Block;

src/main/java/fr/bastoup/bperipherals/util/items/ItemBase.java renamed to src/main/java/fr/bastoup/bperipherals/common/ItemBase.java

@@ -1,19 +1,20 @@
-package fr.bastoup.bperipherals.util.items;
+package fr.bastoup.bperipherals.common;
 
+import fr.bastoup.bperipherals.BPeripherals;
 import fr.bastoup.bperipherals.init.ModItems;
 import fr.bastoup.bperipherals.util.BPeripheralsProperties;
 import net.minecraft.world.item.Item;
 
 public class ItemBase extends Item {
  public ItemBase(String name) {
- super(new Item.Properties().tab(BPeripheralsProperties.CREATIVE_TAB));
+ super(new Item.Properties().tab(BPeripherals.CREATIVE_TAB));
  setRegistryName(name);
 
  ModItems.ITEMS.add(this);
  }
 
  public ItemBase(String name, int stackSize) {
- super(new Item.Properties().stacksTo(stackSize).tab(BPeripheralsProperties.CREATIVE_TAB));
+ super(new Item.Properties().stacksTo(stackSize).tab(BPeripherals.CREATIVE_TAB));
  setRegistryName(name);
 
  ModItems.ITEMS.add(this);

src/main/java/fr/bastoup/bperipherals/data/BlockModelProvider.java

@@ -5,8 +5,7 @@
 import fr.bastoup.bperipherals.peripherals.database.BlockDatabase;
 import fr.bastoup.bperipherals.peripherals.magcardreader.BlockMagCardReader;
 import fr.bastoup.bperipherals.peripherals.magcardreader.BlockStateMagCardReader;
-import fr.bastoup.bperipherals.util.BPeripheralsProperties;
-import fr.bastoup.bperipherals.util.blocks.BlockPeripheral;
+import fr.bastoup.bperipherals.peripherals.BlockPeripheral;
 import net.minecraft.core.Direction;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.resources.ResourceLocation;
@@ -25,7 +24,7 @@ public class BlockModelProvider extends BlockStateProvider {
 
  public BlockModelProvider(DataGenerator generator, ExistingFileHelper existingFileHelper )
  {
- super( generator, BPeripheralsProperties.MODID, existingFileHelper );
+ super( generator, BPeripherals.MOD_ID, existingFileHelper );
  }
 
  @Override

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

@@ -1,19 +1,18 @@
 package fr.bastoup.bperipherals.init;
 
-import dan200.computercraft.shared.computer.inventory.ContainerComputer;
 import dan200.computercraft.shared.network.container.ComputerContainerData;
 import dan200.computercraft.shared.network.container.ContainerData;
+import fr.bastoup.bperipherals.BPeripherals;
 import fr.bastoup.bperipherals.peripherals.database.ContainerDatabase;
 import fr.bastoup.bperipherals.peripherals.keyboard.KeyboardContainer;
-import fr.bastoup.bperipherals.util.BPeripheralsProperties;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.common.extensions.IForgeContainerType;
 
 public class ModContainerTypes {
  public static final MenuType<ContainerDatabase> DATABASE = (MenuType<ContainerDatabase>) IForgeContainerType.create(ContainerDatabase::new)
- .setRegistryName(new ResourceLocation(BPeripheralsProperties.MODID, "database"));
+ .setRegistryName(new ResourceLocation(BPeripherals.MOD_ID, "database"));
 
  public static final MenuType<KeyboardContainer> KEYBOARD = (MenuType<KeyboardContainer>) ContainerData.toType(ComputerContainerData::new, KeyboardContainer::new)
- .setRegistryName(new ResourceLocation(BPeripheralsProperties.MODID, "keyboard"));
+ .setRegistryName(new ResourceLocation(BPeripherals.MOD_ID, "keyboard"));
 }