v0.1.1.1

Author: Beecube31

dependencies.gradle

@@ -29,7 +29,5 @@ dependencies {
     implementation rfg.deobf("curse.maven:gregtechceu-557242:4951281")
     implementation rfg.deobf("curse.maven:actually-additions-228404:3117927")
     implementation rfg.deobf("curse.maven:codechicken-lib-1-8-242818:2779848")
-    implementation rfg.deobf("curse.maven:mekanism-energistics-1027681:5408319")
-    implementation rfg.deobf("curse.maven:mekanism-ce-399904:5351260")
     implementation fileTree('lib')
 }

src/main/java/dev/beecube31/crazyae2/common/helpers/PatternTransformWrapper.java

@@ -2,8 +2,6 @@
 
 import appeng.api.AEApi;
 import appeng.api.config.*;
-import appeng.api.definitions.ITileDefinition;
-import appeng.api.implementations.IPowerChannelState;
 import appeng.api.implementations.IUpgradeableHost;
 import appeng.api.networking.GridFlags;
 import appeng.api.networking.IGridNode;
@@ -22,11 +20,9 @@
 import appeng.api.util.AEPartLocation;
 import appeng.api.util.DimensionalCoord;
 import appeng.api.util.IConfigManager;
-import appeng.core.AELog;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.MachineSource;
 import appeng.parts.automation.BlockUpgradeInventory;
-import appeng.parts.automation.DefinitionUpgradeInventory;
 import appeng.parts.automation.UpgradeInventory;
 import appeng.tile.grid.AENetworkTile;
 import appeng.tile.inventory.AppEngInternalInventory;
@@ -49,12 +45,10 @@
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
-import org.apache.logging.log4j.Level;
 import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nullable;
 import java.io.IOException;
-import java.util.EnumSet;
 import java.util.List;
 
 public class TileBigCrystalCharger extends AENetworkTile implements IConfigManagerHost, IUpgradeableHost, IAEAppEngInventory, IGridTickable {
@@ -250,7 +244,7 @@ public TickRateModulation tickingRequest(@NotNull IGridNode iGridNode, int i) {
                                 continue;
                             }
 
-                            int amt = Math.min(itemsLeft, 64 - this.outputInv.getStackInSlot(j).getCount());
+                            int amt = Math.min(Math.min(itemsLeft, 64 - this.outputInv.getStackInSlot(j).getCount()), this.inputInv.getStackInSlot(j).getCount());
                             this.outputInv.insertItem(j, AEApi.instance().definitions().materials().certusQuartzCrystalCharged().maybeStack(amt).orElse(ItemStack.EMPTY), false);
                             this.inputInv.extractItem(j, amt, false);
                             itemsLeft -= amt;
@@ -367,9 +361,8 @@ public boolean hasCapability(Capability<?> capability, @Nullable EnumFacing faci
     @Override
     @SuppressWarnings("unchecked")
     public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
-        T result = (T) this.inputInv;
-        if (result != null) {
-            return result;
+        if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
+            return (T) this.inputInv;
         }
         return super.getCapability(capability, facing);
     }

src/main/java/dev/beecube31/crazyae2/common/tile/networking/TileBigCrystalCharger.java

@@ -16,14 +16,19 @@
 import appeng.util.Platform;
 import appeng.util.inv.IAEAppEngInventory;
 import appeng.util.inv.InvOperation;
+import appeng.util.inv.WrapperChainedItemHandler;
 import dev.beecube31.crazyae2.core.CrazyAE;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 
+import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.*;
 
@@ -37,6 +42,8 @@ public class TileCraftingUnitsCombiner extends TileCraftingTile implements IConf
     private final AppEngInternalInventory storageInv = new
             AppEngInternalInventory(this, 12, 64);
 
+    private final IItemHandler combinedInv = new WrapperChainedItemHandler(this.acceleratorsInv, this.storageInv);
+
     private long storageAmt = 0;
     private int acceleratorAmt = 0;
 
@@ -333,4 +340,18 @@ public int getInstalledUpgrades(Upgrades upgrades) {
     public IConfigManager getConfigManager() {
         return null;
     }
+
+    @Override
+    public boolean hasCapability(Capability<?> capability, @Nullable EnumFacing facing) {
+        return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
+        if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
+            return (T) this.combinedInv;
+        }
+        return super.getCapability(capability, facing);
+    }
 }

src/main/java/dev/beecube31/crazyae2/common/tile/networking/TileCraftingUnitsCombiner.java

@@ -3,6 +3,6 @@
 public class ModVersion {
 
     public static String get() {
-        return "v0.1.1";
+        return "v0.1.1.1";
     }
 }

src/main/java/dev/beecube31/crazyae2/core/ModVersion.java

@@ -4,7 +4,6 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.text.TextComponentBase;
 import net.minecraft.util.text.TextComponentString;
-import net.minecraft.util.text.TextFormatting;
 import net.minecraft.util.text.event.ClickEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.FMLCommonHandler;

src/main/java/dev/beecube31/crazyae2/core/UpdateChecker.java

@@ -1,2 +1,2 @@
-version:0.1.1
+version:0.1.1.1
 link:https://www.curseforge.com/minecraft/mc-mods/crazyae/files/all?showAlphaFiles=show