Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
reobf committed Aug 18, 2024
1 parent 4c85a03 commit c2b5d61
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 8 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.18p9'
String versionOverride = '0.0.18p10'
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
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,14 @@ protected void fillStacksIntoFirstSlots() {
}
boolean autoUnlock;
boolean suppressSticky;



@Override
public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {



if(!aBaseMetaTileEntity.getWorld().isRemote&&(aTick&16)!=0){
this.getBaseMetaTileEntity().setActive(
this.getProxy().isPowered()&&this.getProxy().isActive()
Expand Down Expand Up @@ -759,5 +765,18 @@ protected void updateStatus() {
}

}
@Override
public void setInventorySlotContents(int aIndex, ItemStack aStack) {
super.setInventorySlotContents(aIndex, aStack);
post();
}

@Override
public ItemStack decrStackSize(int aIndex, int aAmount) {
try{return super.decrStackSize(aIndex, aAmount);}finally{
post();}
}



}
54 changes: 51 additions & 3 deletions src/main/java/reobf/proghatches/gt/metatileentity/SuperTankME.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY;
import static gregtech.api.objects.XSTR.XSTR_INSTANCE;

import java.util.AbstractList;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashMap;
Expand Down Expand Up @@ -429,7 +430,7 @@ public boolean canTankBeEmptied() {
@Override
public FluidTankInfo[] getTankInfo(ForgeDirection side) {

return new FluidTankInfo[]{new FluidTankInfo(this.fluidTank)};
return new FluidTankInfo[]{new FluidTankInfo(this.content)};
}
@Override
public boolean canDrain(ForgeDirection side, Fluid aFluid) {
Expand All @@ -448,14 +449,61 @@ public boolean canFill(ForgeDirection side, Fluid aFluid) {
}
@Override
public int fill(FluidStack aFluid, boolean doFill) {

try{
return content.fill(aFluid, doFill);
}finally{
post();
}
}
@Override
public int fill(ForgeDirection side, FluidStack aFluid, boolean doFill) {

try{
return content.fill(aFluid, doFill);
}finally{
post();
}
}
@Override
public FluidStack getFluid() {

return content.getFluid();
}
public boolean isDrainableStackSeparate() {
return true;
}
@Override
public FluidStack getDrainableStack() {

return content.getFluid();
}
@Override
public FluidStack drain(int maxDrain, boolean doDrain) {
try{
return content.drain(maxDrain, doDrain);
}finally{
post();
}
}
@Override
public FluidStack drain(ForgeDirection side, FluidStack aFluid, boolean doDrain) {
try{
if (content.getFluid() != null && aFluid != null && content.getFluid().isFluidEqual(aFluid))
return drain(aFluid.amount, doDrain);
return null;
}finally{
post();
}

}
@Override
public FluidStack drain(ForgeDirection side, int maxDrain, boolean doDrain) {
try{
return content.drain(maxDrain, doDrain);
}finally{
post();
}
}

boolean autoUnlock;
boolean suppressSticky;

Expand Down
7 changes: 3 additions & 4 deletions src/main/java/reobf/proghatches/main/MyMod.java
Original file line number Diff line number Diff line change
Expand Up @@ -276,10 +276,9 @@ public void postInit(FMLPostInitializationEvent event) {
InterfaceTerminalRegistry.instance().register(TileFluidInterface_EU.class);
InterfaceTerminalRegistry.instance().register(PatternDualInputHatch.Inst.class);

//these are not viewable, but has to be registered to respect overridden allowsPatternOptimization()
//why not just check all machines? What can be the loss?
InterfaceTerminalRegistry.instance().register(ProgrammingCircuitProvider.class);
InterfaceTerminalRegistry.instance().register(LargeProgrammingCircuitProvider.class);

//InterfaceTerminalRegistry.instance().register(ProgrammingCircuitProvider.class);
//InterfaceTerminalRegistry.instance().register(LargeProgrammingCircuitProvider.class);



Expand Down

0 comments on commit c2b5d61

Please sign in to comment.