Merge pull request #550 from Einhornyordle/dev/0.8

Add Dimensional Storage mod integration

Author: SirEndii

build.gradle

@@ -314,6 +314,12 @@ dependencies {
     // Create
     compileOnly fg.deobf("com.simibubi.create:create-${minecraft_version}:${create_version}:all")
 
+    //DimStorage
+    compileOnly fg.deobf("curse.maven:dimstorage-353882:${dimstorage_version}")
+    runtimeOnly fg.deobf("curse.maven:dimstorage-353882:${dimstorage_version}")
+    compileOnly fg.deobf("curse.maven:edivadlib-638508:${edivadlib_version}")
+    runtimeOnly fg.deobf("curse.maven:edivadlib-638508:${edivadlib_version}")
+
     //Removed until fully ported
     //testImplementation fg.deobf("site.siredvin.ttoolkit:ttoolkit-${minecraft_version}:${ttoolkit_version}")
 
@@ -335,6 +341,8 @@ dependencies {
     // Testing stuff
     // JEI
     compileOnly fg.deobf("mezz.jei:jei-${jei_version}")
+    // Jade
+    implementation fg.deobf("curse.maven:jade-324717:${jade_version}")
 }
 
 

gradle.properties

@@ -24,7 +24,7 @@ ttoolkit_version=0.1.3
 cc_version=1.101.3
 curios_version=1.19.2-5.1.4.1
 minecolonies_version=1.19.2-1.1.36-BETA
-appliedenergistics_version=12.9.5
+appliedenergistics_version=12.9.8
 patchouli_version=1.19.2-77
 refinedstorage_version=1.11.7
 botania_version=1.19.2-440-FORGE
@@ -35,6 +35,7 @@ powah_version=4183078
 ae2additions_version=4646599
 kotlinforforge_version=3.12.0
 appliedmekanistics_version=4734608
+dimstorage_version=3927875
 
 # Mod dependencies which are needed for other mods
 # For minecolonies
@@ -43,5 +44,9 @@ domumornamentum_version=1.19-1.0.83-ALPHA
 blockui_version=1.19-0.0.69-ALPHA
 multipiston_version=1.19.2-1.2.21-ALPHA
 
+# For DimStorage
+edivadlib_version=3927847
+
 # Mod dependencies for testing stuff(Only used in the dev environment)
-jei_version=1.19.2-forge:11.6.0.1016
+jei_version=1.19.2-forge:11.6.0.1016
+jade_version=4914105

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/integrations/IntegrationPeripheralProvider.java

@@ -23,7 +23,7 @@
 
 public class IntegrationPeripheralProvider implements IPeripheralProvider {
 
-    private static final String[] SUPPORTED_MODS = new String[]{"botania", "create", "mekanism", "powah"};
+    private static final String[] SUPPORTED_MODS = new String[]{"botania", "create", "mekanism", "powah", "dimstorage"};
 
     private static final PriorityQueue<IPeripheralIntegration> integrations = new PriorityQueue<>(Comparator.comparingInt(IPeripheralIntegration::getPriority));
 

src/main/java/de/srendi/advancedperipherals/common/addons/dimstorage/DimChestIntegration.java

@@ -0,0 +1,55 @@
+package de.srendi.advancedperipherals.common.addons.dimstorage;
+
+import dan200.computercraft.api.lua.LuaFunction;
+import de.srendi.advancedperipherals.lib.peripherals.BlockEntityIntegrationPeripheral;
+import edivad.dimstorage.api.Frequency;
+import edivad.dimstorage.blockentities.BlockEntityDimChest;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+public class DimChestIntegration extends BlockEntityIntegrationPeripheral<BlockEntityDimChest> {
+
+    protected DimChestIntegration(BlockEntity entity) {
+        super(entity);
+    }
+
+    @NotNull
+    @Override
+    public String getType() {
+        return "dimChest";
+    }
+
+    @LuaFunction(mainThread = true)
+    public final String getOwnerUUID() {
+        UUID uuid = blockEntity.getFrequency().getOwnerUUID();
+        if (uuid == null)
+            return null;
+        return uuid.toString();
+    }
+
+    @LuaFunction(mainThread = true)
+    public final String getOwner() {
+        return blockEntity.getFrequency().getOwner();
+    }
+
+    @LuaFunction(mainThread = true)
+    public final boolean hasOwner() {
+        return blockEntity.getFrequency().hasOwner();
+    }
+
+    @LuaFunction(mainThread = true)
+    public final int getChannel() {
+        return blockEntity.getFrequency().getChannel();
+    }
+
+    @LuaFunction(mainThread = true)
+    public final boolean setChannel(int channel) {
+        Frequency fre = blockEntity.getFrequency();
+        if (fre.hasOwner()) return false;
+        fre.setChannel(channel);
+        blockEntity.setFrequency(fre);
+        return true;
+    }
+}

src/main/java/de/srendi/advancedperipherals/common/addons/dimstorage/Integration.java

@@ -0,0 +1,12 @@
+package de.srendi.advancedperipherals.common.addons.dimstorage;
+
+import de.srendi.advancedperipherals.common.addons.computercraft.integrations.IntegrationPeripheralProvider;
+import edivad.dimstorage.blockentities.BlockEntityDimChest;
+
+public class Integration implements Runnable {
+
+    @Override
+    public void run() {
+        IntegrationPeripheralProvider.registerBlockEntityIntegration(DimChestIntegration::new, BlockEntityDimChest.class);
+    }
+}