Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
reobf committed Jul 23, 2024
1 parent ede15c7 commit dac5ea0
Show file tree
Hide file tree
Showing 19 changed files with 793 additions and 68 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ catch (Exception ignored) {

// Pulls version first from the VERSION env and then git tag
String identifiedVersion = null
String versionOverride = '0.0.17p12'
String versionOverride = '0.0.17p13'
try {
// Produce a version based on the tag, or for branches something like 0.2.2-configurable-maven-and-extras.38+43090270b6-dirty
if (versionOverride == null) {
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/reobf/proghatches/eucrafting/AECover.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@
import appeng.api.networking.IGridConnection;
import appeng.api.networking.IGridHost;
import appeng.api.networking.IGridNode;
import appeng.api.networking.security.IActionHost;
import appeng.api.networking.ticking.ITickManager;
import appeng.api.util.AECableType;
import appeng.api.util.DimensionalCoord;
import appeng.api.util.IReadOnlyCollection;
import appeng.helpers.IInterfaceHost;
import appeng.me.GridAccessException;
import appeng.me.GridConnection;
import appeng.me.GridNode;
Expand Down Expand Up @@ -77,6 +79,7 @@ public AECover(Class<?> c) {
Class<?> clazz;

public static class DummyData implements Data {
public IInterfaceHost getInterfaceOrNull(){return null;};
public void setTag(NBTTagCompound tagCompound) {
}

Expand Down Expand Up @@ -205,6 +208,7 @@ public TileEntity fakeTile() {
}

public static interface Data extends ISerializableObject, IGridProxyable {
IInterfaceHost getInterfaceOrNull();
default boolean hasModularGUI(){return false;}
default String tagName(){
NBTTagCompound tag = getTag();
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/reobf/proghatches/eucrafting/BridgingData.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import appeng.api.util.DimensionalCoord;
import appeng.api.util.IReadOnlyCollection;
import appeng.api.util.WorldCoord;
import appeng.helpers.IInterfaceHost;
import appeng.me.GridConnection;
import appeng.me.helpers.AENetworkProxy;
import gregtech.api.interfaces.tileentity.ICoverable;
Expand All @@ -19,6 +20,7 @@
import reobf.proghatches.main.MyMod;

public class BridgingData implements Data {
public IInterfaceHost getInterfaceOrNull(){return null;};
public interface TriConsumer<a, b, c> {
public void accept(a aa, b bb, c cc);

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/reobf/proghatches/eucrafting/InterfaceData.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import appeng.api.util.DimensionalCoord;
import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigurableObject;
import appeng.api.util.IInterfaceViewable;
import appeng.helpers.DualityInterface;
import appeng.helpers.ICustomNameObject;
import appeng.helpers.IInterfaceHost;
Expand Down Expand Up @@ -62,6 +63,8 @@ public class InterfaceData implements Data, IInterfaceHost, IGridTickable, IUpgr
IConfigurableObject, IPriorityHost,
IActualSideProvider
{

public IInterfaceHost getInterfaceOrNull(){return this;};
public void setTag(NBTTagCompound tagCompound) {

tag = tagCompound;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public class InterfaceP2PData implements AECover.IMemoryCardSensitive, Data, IIn
public void setTag(NBTTagCompound tagCompound) {
tag = tagCompound;
}

public IInterfaceHost getInterfaceOrNull(){return duality;};
public NBTTagCompound getTag() {
return tag;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public class InterfaceP2PEUData implements AECover.IMemoryCardSensitive, Data, I
public void setTag(NBTTagCompound tagCompound) {
tag = tagCompound;
}

public IInterfaceHost getInterfaceOrNull(){return duality;};
public NBTTagCompound getTag() {
return tag;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public class InterfaceP2PNoFluidData implements AECover.IMemoryCardSensitive, Da
public void setTag(NBTTagCompound tagCompound) {
tag = tagCompound;
}

public IInterfaceHost getInterfaceOrNull(){return duality;};
public NBTTagCompound getTag() {
return tag;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -984,4 +984,5 @@ public ForgeDirection getLazerDir() {
public List<ILazer> getLazerP2POuts() {
return null;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -560,8 +560,8 @@ public boolean recordRecipeOrClassify(ListeningFluidTank[] fin, ItemStack[] iin)

@Override
public ItemStack[] getItemInputs() {
ItemStack[] condensed = filterStack.apply(mStoredItemInternal);
//System.out.print(Arrays.toString(condensed));
/*ItemStack[] condensed = filterStack.apply(mStoredItemInternal);
ItemStack additional = getStackInSlot(getCircuitSlot());
if (additional == null)
return condensed;
Expand All @@ -571,12 +571,19 @@ public ItemStack[] getItemInputs() {
bruh[before_size] = additional;
System.arraycopy(condensed, 0, bruh, 0, before_size);
return bruh;
*/

ItemStack[] condensed = filterStack.apply(mStoredItemInternal,shared.getItems());

return condensed;


}

@Override
public FluidStack[] getFluidInputs() {

return asFluidStack.apply(mStoredFluidInternal);
return asFluidStack.apply(mStoredFluidInternal,shared.getFluid());
}

}
Expand Down
Loading

0 comments on commit dac5ea0

Please sign in to comment.