Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
reobf committed Sep 19, 2024
1 parent 76d33cf commit bb29056
Show file tree
Hide file tree
Showing 9 changed files with 404 additions and 25 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.18p25'
String versionOverride = '0.0.18p26'
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 @@ -345,8 +345,9 @@ public void fromTag(NBTTagCompound tag) {
}
}
}

if(i==0)
if(tag.getInteger("i")>0)i = tag.getInteger("i");
if(f==0)
if(tag.getInteger("f")>0)f = tag.getInteger("f");
recipeLocked = tag.getBoolean("recipeLocked");
lock = tag.getBoolean("lock");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@
import reobf.proghatches.eucrafting.AECover;
import reobf.proghatches.gt.metatileentity.util.BaseSlotPatched;
import reobf.proghatches.gt.metatileentity.util.IMultiCircuitSupport;
import reobf.proghatches.gt.metatileentity.util.IOnFillCallback;
import reobf.proghatches.gt.metatileentity.util.IProgrammingCoverBlacklisted;
import reobf.proghatches.gt.metatileentity.util.IRecipeProcessingAwareDualHatch;
import reobf.proghatches.gt.metatileentity.util.ISkipStackSizeCheck;
Expand All @@ -137,7 +138,7 @@

public class DualInputHatch extends GT_MetaTileEntity_Hatch_InputBus
implements IConfigurationCircuitSupport, IAddGregtechLogo, IAddUIWidgets, IDualInputHatch,
IProgrammingCoverBlacklisted, IRecipeProcessingAwareDualHatch,ISkipStackSizeCheck/*,IMultiCircuitSupport*/ {
IProgrammingCoverBlacklisted, IRecipeProcessingAwareDualHatch,ISkipStackSizeCheck,IOnFillCallback/*,IMultiCircuitSupport*/ {

static java.text.DecimalFormat format = new java.text.DecimalFormat("#,###");
public boolean mMultiFluid;
Expand Down Expand Up @@ -1610,7 +1611,7 @@ public void add4by4Slots(ModularWindow.Builder builder, IDrawable... background)
}

//insertion
protected static final int INSERTION = 2001;
public static final int INSERTION = 2001;
protected ModularWindow createInsertionWindow(UIBuildContext buildContext) {
int len = (int) Math.round(Math.sqrt(mInventory.length-1));
final int WIDTH = 18 * len + 6;
Expand Down
Loading

0 comments on commit bb29056

Please sign in to comment.