Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix #2753, BuildCraft 7.0.13

Browse source
This commit is contained in:
asiekierka 2015-06-30 11:55:23 +02:00
parent 50bb76812c
commit 7a65972538
12 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
buildcraft_resources/assets/buildcraftsilicon/textures/gui/packager.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 535 B

After

Width:  |  Height:  |  Size: 517 B

3
buildcraft_resources/changelog/7.0.13
View file

@ -5,7 +5,10 @@ Improvements:
Bugs fixed: Bugs fixed:
* [#2852] Diamond fluid pipes not sorting into unfiltered slots (asie)
* [#2850] Random ArrayIndexOutOfBoundException (asie - not a true fix, it will however give you a console warning if this is caught again; it's very rare) * [#2850] Random ArrayIndexOutOfBoundException (asie - not a true fix, it will however give you a console warning if this is caught again; it's very rare)
* [#2849] Graphical Glitch on Assembly Table when using Texture Packs (asie) * [#2849] Graphical Glitch on Assembly Table when using Texture Packs (asie)
* [#2842] Various fixes to robot state saving (hea3ven)
* [#2835] Robot helmet overlay rendering incorrectly (hea3ven) * [#2835] Robot helmet overlay rendering incorrectly (hea3ven)
* [#2753] Remove unused slot from Packager (asie)
* Crashes in item pipe packet sending (asie) * Crashes in item pipe packet sending (asie)

2
buildcraft_resources/versions.txt
View file

@ -1,3 +1,3 @@
1.6.4:BuildCraft:4.2.2 1.6.4:BuildCraft:4.2.2
1.7.2:BuildCraft:6.0.16 1.7.2:BuildCraft:6.0.16
1.7.10:BuildCraft:7.0.12 1.7.10:BuildCraft:7.0.13

1
common/buildcraft/builders/BlockConstructionMarker.java
View file

@ -10,7 +10,6 @@ package buildcraft.builders;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;

3
common/buildcraft/core/blueprints/BptBuilderBlueprint.java
View file

@ -19,9 +19,6 @@ import java.util.List;
import java.util.ListIterator; import java.util.ListIterator;
import java.util.Map.Entry; import java.util.Map.Entry;
import com.google.common.collect.HashMultiset;
import com.google.common.collect.Multiset;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item; import net.minecraft.item.Item;

2
common/buildcraft/core/builders/BuildingSlotMapIterator.java
View file

@ -14,8 +14,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import com.google.common.collect.Multiset;
import net.minecraft.world.WorldSettings; import net.minecraft.world.WorldSettings;
public class BuildingSlotMapIterator { public class BuildingSlotMapIterator {

7
common/buildcraft/core/lib/gui/AdvancedSlot.java
View file

@ -90,15 +90,15 @@ public abstract class AdvancedSlot {
mc.renderEngine.bindTexture(getTexture()); mc.renderEngine.bindTexture(getTexture());
//System.out.printf("Drawing advanced sprite %s (%d,%d) at %d %d\n", getIcon().getIconName(), getIcon().getOriginX(),getIcon().getOriginY(),cornerX + x, cornerY + y); //System.out.printf("Drawing advanced sprite %s (%d,%d) at %d %d\n", getIcon().getIconName(), getIcon().getOriginX(),getIcon().getOriginY(),cornerX + x, cornerY + y);
GL11.glPushAttrib(GL11.GL_LIGHTING_BIT | GL11.GL_COLOR_BUFFER_BIT);
GL11.glDisable(GL11.GL_LIGHTING); // Make sure that render states are reset, an ItemStack can derp them up. GL11.glDisable(GL11.GL_LIGHTING); // Make sure that render states are reset, an ItemStack can derp them up.
GL11.glEnable(GL11.GL_ALPHA_TEST); GL11.glEnable(GL11.GL_ALPHA_TEST);
GL11.glEnable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_BLEND);
gui.drawTexturedModelRectFromIcon(cornerX + x, cornerY + y, getIcon(), 16, 16); gui.drawTexturedModelRectFromIcon(cornerX + x, cornerY + y, getIcon(), 16, 16);
GL11.glEnable(GL11.GL_LIGHTING); GL11.glPopAttrib();
GL11.glDisable(GL11.GL_ALPHA_TEST);
GL11.glDisable(GL11.GL_BLEND);
} }
} }
@ -108,6 +108,7 @@ public abstract class AdvancedSlot {
int cornerY = (gui.height - gui.getYSize()) / 2; int cornerY = (gui.height - gui.getYSize()) / 2;
gui.drawStack(item, cornerX + x, cornerY + y); gui.drawStack(item, cornerX + x, cornerY + y);
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
} }
public void selected () { public void selected () {

1
common/buildcraft/core/lib/render/SubIcon.java
View file

@ -1,6 +1,5 @@
package buildcraft.core.lib.render; package buildcraft.core.lib.render;
import net.minecraft.client.Minecraft;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
public class SubIcon implements IIcon { public class SubIcon implements IIcon {

1
common/buildcraft/robotics/RobotRegistry.java
View file

@ -14,7 +14,6 @@ import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;

1
common/buildcraft/silicon/TilePackager.java
View file

@ -1,7 +1,6 @@
package buildcraft.silicon; package buildcraft.silicon;
import java.util.EnumMap; import java.util.EnumMap;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;

2
common/buildcraft/silicon/gui/ContainerPackager.java
View file

@ -42,7 +42,7 @@ public class ContainerPackager extends BuildCraftContainer {
} }
} }
addSlotToContainer(new Slot(tile, 10, 108, 31)); // addSlotToContainer(new Slot(tile, 10, 108, 31));
addSlotToContainer(new SlotOutput(tile, 11, 123, 59)); addSlotToContainer(new SlotOutput(tile, 11, 123, 59));

1
common/buildcraft/transport/PipeTransportFluids.java
View file

@ -5,7 +5,6 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.google.common.collect.EnumMultiset; import com.google.common.collect.EnumMultiset;
import com.google.common.collect.HashMultiset;
import com.google.common.collect.Multiset; import com.google.common.collect.Multiset;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;