diff --git a/src/main/java/reobf/proghatches/ae/ItemPartStockingExportBus.java b/src/main/java/reobf/proghatches/ae/ItemPartStockingExportBus.java index 5dcdb69..927085e 100644 --- a/src/main/java/reobf/proghatches/ae/ItemPartStockingExportBus.java +++ b/src/main/java/reobf/proghatches/ae/ItemPartStockingExportBus.java @@ -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; diff --git a/src/main/java/reobf/proghatches/gt/metatileentity/BufferedDualInputHatch.java b/src/main/java/reobf/proghatches/gt/metatileentity/BufferedDualInputHatch.java index cc40463..0beeb48 100644 --- a/src/main/java/reobf/proghatches/gt/metatileentity/BufferedDualInputHatch.java +++ b/src/main/java/reobf/proghatches/gt/metatileentity/BufferedDualInputHatch.java @@ -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; @@ -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(); @@ -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(); } @@ -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; }) @@ -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; diff --git a/src/main/java/reobf/proghatches/gt/metatileentity/StockingDualInputHatchME.java b/src/main/java/reobf/proghatches/gt/metatileentity/StockingDualInputHatchME.java index 5de99e8..47ec4d8 100644 --- a/src/main/java/reobf/proghatches/gt/metatileentity/StockingDualInputHatchME.java +++ b/src/main/java/reobf/proghatches/gt/metatileentity/StockingDualInputHatchME.java @@ -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) { diff --git a/src/main/java/reobf/proghatches/oc/BlockCardReader.java b/src/main/java/reobf/proghatches/oc/BlockCardReader.java index 0e67669..90ebaa4 100644 --- a/src/main/java/reobf/proghatches/oc/BlockCardReader.java +++ b/src/main/java/reobf/proghatches/oc/BlockCardReader.java @@ -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(); diff --git a/src/main/java/reobf/proghatches/oc/TileWirelessPeripheralStation.java b/src/main/java/reobf/proghatches/oc/TileWirelessPeripheralStation.java index bb2f906..642091c 100644 --- a/src/main/java/reobf/proghatches/oc/TileWirelessPeripheralStation.java +++ b/src/main/java/reobf/proghatches/oc/TileWirelessPeripheralStation.java @@ -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; } diff --git a/src/main/resources/assets/proghatches/textures/blocks/BlockSpatialPylon_dim.png b/src/main/resources/assets/proghatches/textures/blocks/BlockSpatialPylon_dim.png deleted file mode 100644 index 6afaf0d..0000000 Binary files a/src/main/resources/assets/proghatches/textures/blocks/BlockSpatialPylon_dim.png and /dev/null differ diff --git a/src/main/resources/assets/proghatches/textures/blocks/cardreader.png b/src/main/resources/assets/proghatches/textures/blocks/cardreader.png new file mode 100644 index 0000000..1d1e6b6 Binary files /dev/null and b/src/main/resources/assets/proghatches/textures/blocks/cardreader.png differ diff --git a/src/main/resources/assets/proghatches/textures/blocks/eu.png b/src/main/resources/assets/proghatches/textures/blocks/eu.png deleted file mode 100644 index 8cb2e29..0000000 Binary files a/src/main/resources/assets/proghatches/textures/blocks/eu.png and /dev/null differ diff --git a/src/main/resources/assets/proghatches/textures/blocks/eu_back.png b/src/main/resources/assets/proghatches/textures/blocks/eu_back.png deleted file mode 100644 index e391794..0000000 Binary files a/src/main/resources/assets/proghatches/textures/blocks/eu_back.png and /dev/null differ diff --git a/src/main/resources/assets/proghatches/textures/blocks/eu_back.png0 b/src/main/resources/assets/proghatches/textures/blocks/eu_back.png0 deleted file mode 100644 index 409a4b8..0000000 Binary files a/src/main/resources/assets/proghatches/textures/blocks/eu_back.png0 and /dev/null differ diff --git a/src/main/resources/assets/proghatches/textures/blocks/eu_back2.png b/src/main/resources/assets/proghatches/textures/blocks/eu_back2.png deleted file mode 100644 index 1743c5a..0000000 Binary files a/src/main/resources/assets/proghatches/textures/blocks/eu_back2.png and /dev/null differ diff --git a/src/main/resources/assets/proghatches/textures/blocks/eu_back3.png b/src/main/resources/assets/proghatches/textures/blocks/eu_back3.png deleted file mode 100644 index 29277d4..0000000 Binary files a/src/main/resources/assets/proghatches/textures/blocks/eu_back3.png and /dev/null differ diff --git a/src/main/resources/assets/proghatches/textures/blocks/eu_interface.png b/src/main/resources/assets/proghatches/textures/blocks/eu_interface.png deleted file mode 100644 index db0d520..0000000 Binary files a/src/main/resources/assets/proghatches/textures/blocks/eu_interface.png and /dev/null differ diff --git a/src/main/resources/assets/proghatches/textures/blocks/eu_interface_a.png b/src/main/resources/assets/proghatches/textures/blocks/eu_interface_a.png deleted file mode 100644 index 7643d93..0000000 Binary files a/src/main/resources/assets/proghatches/textures/blocks/eu_interface_a.png and /dev/null differ diff --git a/src/main/resources/assets/proghatches/textures/blocks/eu_interface_arrow.png b/src/main/resources/assets/proghatches/textures/blocks/eu_interface_arrow.png deleted file mode 100644 index 28e6a65..0000000 Binary files a/src/main/resources/assets/proghatches/textures/blocks/eu_interface_arrow.png and /dev/null differ diff --git a/src/main/resources/assets/proghatches/textures/blocks/export_fluid_part.png b/src/main/resources/assets/proghatches/textures/blocks/export_fluid_part.png new file mode 100644 index 0000000..d87f0f8 Binary files /dev/null and b/src/main/resources/assets/proghatches/textures/blocks/export_fluid_part.png differ diff --git a/src/main/resources/assets/proghatches/textures/blocks/export_item_part.png b/src/main/resources/assets/proghatches/textures/blocks/export_item_part.png new file mode 100644 index 0000000..20b1f61 Binary files /dev/null and b/src/main/resources/assets/proghatches/textures/blocks/export_item_part.png differ diff --git a/src/main/resources/assets/proghatches/textures/blocks/pstation_on.png b/src/main/resources/assets/proghatches/textures/blocks/pstation_on.png new file mode 100644 index 0000000..1d1e6b6 Binary files /dev/null and b/src/main/resources/assets/proghatches/textures/blocks/pstation_on.png differ diff --git a/src/main/resources/assets/proghatches/textures/items/dyn.png b/src/main/resources/assets/proghatches/textures/items/dyn.png deleted file mode 100644 index ce4137d..0000000 Binary files a/src/main/resources/assets/proghatches/textures/items/dyn.png and /dev/null differ diff --git a/src/main/resources/assets/proghatches/textures/items/dyn.png.mcmeta b/src/main/resources/assets/proghatches/textures/items/dyn.png.mcmeta deleted file mode 100644 index d3d6297..0000000 --- a/src/main/resources/assets/proghatches/textures/items/dyn.png.mcmeta +++ /dev/null @@ -1,4 +0,0 @@ -{ - "animation": { - "frametime": 2 } -} diff --git a/src/main/resources/assets/proghatches/textures/items/eu.png b/src/main/resources/assets/proghatches/textures/items/eu.png deleted file mode 100644 index a33fda7..0000000 Binary files a/src/main/resources/assets/proghatches/textures/items/eu.png and /dev/null differ diff --git a/src/main/resources/assets/proghatches/textures/items/eu_bound.png b/src/main/resources/assets/proghatches/textures/items/eu_bound.png deleted file mode 100644 index 89d6f4e..0000000 Binary files a/src/main/resources/assets/proghatches/textures/items/eu_bound.png and /dev/null differ