diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2015-11-01 14:09:18 +0100 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2015-11-01 14:09:18 +0100 |
| commit | 40324b05f97ddf994e96e5a90481c7671e2f05d7 (patch) | |
| tree | cf4d7c053acafd1c854c876426b205de4e6289ff | |
| parent | cc89e15b5bc712608f5591f0b69feaa7ca427be7 (diff) | |
| download | GT5-Unofficial-40324b05f97ddf994e96e5a90481c7671e2f05d7.tar.gz GT5-Unofficial-40324b05f97ddf994e96e5a90481c7671e2f05d7.tar.bz2 GT5-Unofficial-40324b05f97ddf994e96e5a90481c7671e2f05d7.zip | |
Fixed ItemFiler OpenGL error.
| -rw-r--r-- | src/main/java/gregtech/common/gui/GT_Container_Filter.java | 4 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/gui/GT_Container_Filter.java b/src/main/java/gregtech/common/gui/GT_Container_Filter.java index 8239f8a96a..2c2e4e8c13 100644 --- a/src/main/java/gregtech/common/gui/GT_Container_Filter.java +++ b/src/main/java/gregtech/common/gui/GT_Container_Filter.java @@ -3,6 +3,7 @@ package gregtech.common.gui; import gregtech.api.gui.GT_ContainerMetaTile_Machine;
import gregtech.api.gui.GT_Slot_Holo;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_Utility;
import gregtech.common.tileentities.automation.GT_MetaTileEntity_Filter;
import net.minecraft.entity.player.EntityPlayer;
@@ -60,7 +61,8 @@ public class GT_Container_Filter if (aMouseclick == 0) {
tSlot.putStack(null);
} else if (tStack != null) {
- tStack.setItemDamage(32767);
+ tStack = GT_Utility.copyAmountAndMetaData(tStack.stackSize, 32767, tStack);
+ if(GT_Utility.isStackInvalid(tStack)){tStack=null;}
}
} else {
tSlot.putStack(GT_Utility.copyAmount(1L, new Object[]{tStack}));
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index a89a29a6b3..002912afc4 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -95,7 +95,6 @@ public class GT_MachineRecipeLoader GT_Values.RA.addMixerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 1L), null, null, null, GT_ModHandler.getDistilledWater(1000), FluidRegistry.getFluidStack("ic2coolant", 1000), null, 256, 48); ItemStack[] tItems = {ItemList.Crop_Drop_Bauxite.get(1, new Object[0]), - ItemList.Crop_Drop_Bauxite.get(1, new Object[0]), ItemList.Crop_Drop_Ilmenite.get(1, new Object[0]), ItemList.Crop_Drop_Pitchblende.get(1, new Object[0]), ItemList.Crop_Drop_Uraninite.get(1, new Object[0]), |