diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/gui/packager.png b/buildcraft_resources/assets/buildcraftsilicon/textures/gui/packager.png index 7a088f9d..5a4302e5 100644 Binary files a/buildcraft_resources/assets/buildcraftsilicon/textures/gui/packager.png and b/buildcraft_resources/assets/buildcraftsilicon/textures/gui/packager.png differ diff --git a/buildcraft_resources/changelog/7.0.13 b/buildcraft_resources/changelog/7.0.13 index 350a1f51..72219a65 100644 --- a/buildcraft_resources/changelog/7.0.13 +++ b/buildcraft_resources/changelog/7.0.13 @@ -5,7 +5,10 @@ Improvements: 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) * [#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) +* [#2753] Remove unused slot from Packager (asie) * Crashes in item pipe packet sending (asie) diff --git a/buildcraft_resources/versions.txt b/buildcraft_resources/versions.txt index d9e61615..d04682a1 100755 --- a/buildcraft_resources/versions.txt +++ b/buildcraft_resources/versions.txt @@ -1,3 +1,3 @@ 1.6.4:BuildCraft:4.2.2 1.7.2:BuildCraft:6.0.16 -1.7.10:BuildCraft:7.0.12 +1.7.10:BuildCraft:7.0.13 diff --git a/common/buildcraft/builders/BlockConstructionMarker.java b/common/buildcraft/builders/BlockConstructionMarker.java index b2dc74f5..d3bfb3c5 100755 --- a/common/buildcraft/builders/BlockConstructionMarker.java +++ b/common/buildcraft/builders/BlockConstructionMarker.java @@ -10,7 +10,6 @@ package buildcraft.builders; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java index 76f6005d..c94befc7 100644 --- a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java +++ b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java @@ -19,9 +19,6 @@ import java.util.List; import java.util.ListIterator; 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.inventory.IInventory; import net.minecraft.item.Item; diff --git a/common/buildcraft/core/builders/BuildingSlotMapIterator.java b/common/buildcraft/core/builders/BuildingSlotMapIterator.java index 9514e752..8f1659fd 100755 --- a/common/buildcraft/core/builders/BuildingSlotMapIterator.java +++ b/common/buildcraft/core/builders/BuildingSlotMapIterator.java @@ -14,8 +14,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.google.common.collect.Multiset; - import net.minecraft.world.WorldSettings; public class BuildingSlotMapIterator { diff --git a/common/buildcraft/core/lib/gui/AdvancedSlot.java b/common/buildcraft/core/lib/gui/AdvancedSlot.java index f833547d..ac929e80 100755 --- a/common/buildcraft/core/lib/gui/AdvancedSlot.java +++ b/common/buildcraft/core/lib/gui/AdvancedSlot.java @@ -90,15 +90,15 @@ public abstract class AdvancedSlot { 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); + 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.glEnable(GL11.GL_ALPHA_TEST); GL11.glEnable(GL11.GL_BLEND); gui.drawTexturedModelRectFromIcon(cornerX + x, cornerY + y, getIcon(), 16, 16); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glDisable(GL11.GL_BLEND); + GL11.glPopAttrib(); } } @@ -108,6 +108,7 @@ public abstract class AdvancedSlot { int cornerY = (gui.height - gui.getYSize()) / 2; gui.drawStack(item, cornerX + x, cornerY + y); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); } public void selected () { diff --git a/common/buildcraft/core/lib/render/SubIcon.java b/common/buildcraft/core/lib/render/SubIcon.java index e76f82d4..7cdaf8eb 100644 --- a/common/buildcraft/core/lib/render/SubIcon.java +++ b/common/buildcraft/core/lib/render/SubIcon.java @@ -1,6 +1,5 @@ package buildcraft.core.lib.render; -import net.minecraft.client.Minecraft; import net.minecraft.util.IIcon; public class SubIcon implements IIcon { diff --git a/common/buildcraft/robotics/RobotRegistry.java b/common/buildcraft/robotics/RobotRegistry.java index 4498790f..99461d52 100755 --- a/common/buildcraft/robotics/RobotRegistry.java +++ b/common/buildcraft/robotics/RobotRegistry.java @@ -14,7 +14,6 @@ import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import java.util.Set; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/common/buildcraft/silicon/TilePackager.java b/common/buildcraft/silicon/TilePackager.java index 462bf315..ad686019 100644 --- a/common/buildcraft/silicon/TilePackager.java +++ b/common/buildcraft/silicon/TilePackager.java @@ -1,7 +1,6 @@ package buildcraft.silicon; import java.util.EnumMap; -import java.util.HashMap; import java.util.Map; import io.netty.buffer.ByteBuf; diff --git a/common/buildcraft/silicon/gui/ContainerPackager.java b/common/buildcraft/silicon/gui/ContainerPackager.java index 6c4da9ac..5ab2f414 100644 --- a/common/buildcraft/silicon/gui/ContainerPackager.java +++ b/common/buildcraft/silicon/gui/ContainerPackager.java @@ -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)); diff --git a/common/buildcraft/transport/PipeTransportFluids.java b/common/buildcraft/transport/PipeTransportFluids.java index 52c335bd..29366912 100644 --- a/common/buildcraft/transport/PipeTransportFluids.java +++ b/common/buildcraft/transport/PipeTransportFluids.java @@ -5,7 +5,6 @@ import java.util.HashMap; import java.util.Map; import com.google.common.collect.EnumMultiset; -import com.google.common.collect.HashMultiset; import com.google.common.collect.Multiset; import net.minecraft.nbt.NBTTagCompound;