Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
reobf committed Feb 20, 2025
1 parent 620af69 commit 0f69d42
Show file tree
Hide file tree
Showing 22 changed files with 28 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int
@Override
public void registerIcons(IIconRegister _iconRegister) {

itemIcon = _iconRegister.registerIcon("proghatches:proxy_item_part");
alt = _iconRegister.registerIcon("proghatches:proxy_fluid_part");
alt2 = _iconRegister.registerIcon("proghatches:proxy_item_adv_part");
itemIcon = _iconRegister.registerIcon("proghatches:export_item_part");
alt = _iconRegister.registerIcon("proghatches:export_fluid_part");
alt2 = _iconRegister.registerIcon("proghatches:export_item_part");
}

IIcon alt;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ public ItemStack[] getItemInputs() {

@Override
public FluidStack[] getFluidInputs() {
FluidStack[] condensed = asFluidStack.apply(mStoredFluidInternal, shared.getFluid());
FluidStack[] condensed = asFluidStack.apply(flat(mStoredFluidInternal), shared.getFluid());
// if(!trunOffEnsure){condensed=ensureIntMax(condensed);}

return condensed;
Expand Down Expand Up @@ -2272,7 +2272,7 @@ public CheckRecipeResult endRecipeProcessingImpl(MTEMultiBlockBase controller) {

@Override
public void onBlockDestroyed() {
/* IGregTechTileEntity te = this.getBaseMetaTileEntity();
IGregTechTileEntity te = this.getBaseMetaTileEntity();
World aWorld = te.getWorld();
int aX = te.getXCoord();
short aY = te.getYCoord();
Expand All @@ -2285,21 +2285,16 @@ public void onBlockDestroyed() {
aX + XSTR_INSTANCE.nextFloat() * 0.8F + 0.1F,
aY + XSTR_INSTANCE.nextFloat() * 0.8F + 0.1F,
aZ + XSTR_INSTANCE.nextFloat() * 0.8F + 0.1F,
new ItemStack(tItem.getItem(), tItem.stackSize, tItem.getItemDamage()));
if (tItem.hasTagCompound()) {
tItemEntity.getEntityItem()
.setTagCompound(
(NBTTagCompound) tItem.getTagCompound()
.copy());
}
tItem.getStack());

tItemEntity.motionX = (XSTR_INSTANCE.nextGaussian() * 0.05D);
tItemEntity.motionY = (XSTR_INSTANCE.nextGaussian() * 0.25D);
tItemEntity.motionZ = (XSTR_INSTANCE.nextGaussian() * 0.05D);
aWorld.spawnEntityInWorld(tItemEntity);
tItem.stackSize = 0;
tItem.stackSize(0);
inv.mStoredItemInternal[i] = null;
}
}*/
}
super.onBlockDestroyed();
}

Expand Down Expand Up @@ -2616,7 +2611,7 @@ protected ModularWindow createWindowEx(final EntityPlayer player) {
.addTooltip(StatCollector.translateToLocal("programmable_hatches.gt.cmmode.5"))
.addTooltip(StatCollector.translateToLocal("programmable_hatches.gt.cmmode.6")));

builder.widget(new CycleButtonWidget().setToggle(() -> merge, (s) -> {
/*builder.widget(new CycleButtonWidget().setToggle(() -> merge, (s) -> {
merge = s;
})
Expand All @@ -2628,7 +2623,7 @@ protected ModularWindow createWindowEx(final EntityPlayer player) {
.addTooltip(StatCollector.translateToLocal("programmable_hatches.gt.merge.0"))
.addTooltip(StatCollector.translateToLocal("programmable_hatches.gt.merge.1"))
);
);*/
if (isInfBuffer() || shared.infbufUpgrades > 0)
builder.widget(new CycleButtonWidget().setToggle(() -> autoAppend, (s) -> {
autoAppend = s;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public int getCircuitSlotY() {
}

private boolean autoPullItemList;
private long minAutoPullStackSize;
private long minAutoPullStackSize=1;
private int interval = 1;

public ItemStack updateInformationSlot(int aIndex, ItemStack aStack) {
Expand Down
11 changes: 9 additions & 2 deletions src/main/java/reobf/proghatches/oc/BlockCardReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,21 @@ public TileEntity createNewTileEntity(World worldIn, int meta) {

@SideOnly(Side.CLIENT)
IIcon icon;


@Override
@SideOnly(Side.CLIENT)
protected String getTextureName() {
return this.textureName = "proghatches:cardreader";
}


/* @SideOnly(Side.CLIENT)
@Override
public IIcon getIcon(int side, int meta) {
if (icon != null) return icon;
Block b = GameRegistry.findBlock("OpenComputers", "raid");
return icon = b.getIcon(ForgeDirection.UP.ordinal(), 0);
}
}*/

Random field_149955_b = new Random();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,17 +144,22 @@ public static class Block extends net.minecraft.block.BlockContainer {
public void registerBlockIcons(IIconRegister reg) {
super.registerBlockIcons(reg);
a = reg.registerIcon("proghatches:pstation");
d = reg.registerIcon("proghatches:pstation_on");
b = reg.registerIcon("proghatches:pstation_0");
c = reg.registerIcon("proghatches:pstation_1");
}

IIcon a, b, c;

IIcon d;
@Override
@SideOnly(value = Side.CLIENT)
public IIcon getIcon(int side, int meta) {
if (side <= 1) return a;// top bottom
if (meta == 0) return b;
if (meta == 0) {
if(side == 1)return d;
return b;

}
else return c;
}

Expand Down
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.

0 comments on commit 0f69d42

Please sign in to comment.