diff --git a/assets/tinker/manuals/firstday.xml b/assets/tinker/manuals/firstday.xml
index ab7a37f3..42a7e46f 100644
--- a/assets/tinker/manuals/firstday.xml
+++ b/assets/tinker/manuals/firstday.xml
@@ -47,7 +47,7 @@ The berries can be melted down into nuggets and ingots, making them an invaluabl
Oreberries in their natural environment
-/mods/tinker/resources/manuals/oreberries.png
+tinker:manuals/oreberries.png
diff --git a/assets/tinker/manuals/smeltery.xml b/assets/tinker/manuals/smeltery.xml
index a1037e6a..4ff3b10a 100644
--- a/assets/tinker/manuals/smeltery.xml
+++ b/assets/tinker/manuals/smeltery.xml
@@ -104,7 +104,7 @@ Other liquid removal objects will work, but are frowned upon. An example picture
Figure 1a
-/mods/tinker/resources/manuals/smelterysmall.png
+tinker:manuals/smelterysmall.png
@@ -135,7 +135,7 @@ Other part casts must be created by pouring metal around existing parts, like a
Forming a Cast
-/mods/tinker/resources/manuals/casting.png
+tinker:manuals/casting.png
diff --git a/tconstruct/client/TProxyClient.java b/tconstruct/client/TProxyClient.java
index 69b3639c..931c20aa 100644
--- a/tconstruct/client/TProxyClient.java
+++ b/tconstruct/client/TProxyClient.java
@@ -647,9 +647,9 @@ public class TProxyClient extends TProxyCommon
TConstructClientRegistry.registerManualModifier("tier1free", ironpick.copy(), new ItemStack(Item.diamond), new ItemStack(Block.blockGold));
TConstructClientRegistry.registerManualModifier("tier2free", ironpick.copy(), new ItemStack(Item.netherStar));
- /*TConstructClientRegistry.registerManualSmeltery("brownstone", new ItemStack(TContent.speedBlock), new ItemStack(TContent.liquidMetalStill, 1, 3), new ItemStack(Block.gravel));
- TConstructClientRegistry.registerManualSmeltery("clearglass", new ItemStack(TContent.glass), new ItemStack(TContent.liquidMetalStill, 1, 13), null);
- TConstructClientRegistry.registerManualSmeltery("searedstone", new ItemStack(TContent.smeltery, 1, 4), new ItemStack(TContent.liquidMetalStill, 1, 14), null);*/
+ TConstructClientRegistry.registerManualSmeltery("brownstone", new ItemStack(TContent.speedBlock), new ItemStack(TContent.moltenTin, 1), new ItemStack(Block.gravel));
+ TConstructClientRegistry.registerManualSmeltery("clearglass", new ItemStack(TContent.glass), new ItemStack(TContent.moltenGlass, 1), null);
+ TConstructClientRegistry.registerManualSmeltery("searedstone", new ItemStack(TContent.smeltery, 1, 4), new ItemStack(TContent.moltenStone, 1), null);
}
diff --git a/tconstruct/client/pages/PicturePage.java b/tconstruct/client/pages/PicturePage.java
index 6bcd66d4..7a63f2c5 100644
--- a/tconstruct/client/pages/PicturePage.java
+++ b/tconstruct/client/pages/PicturePage.java
@@ -20,6 +20,8 @@ public class PicturePage extends BookPage
nodes = element.getElementsByTagName("location");
if (nodes != null)
location = nodes.item(0).getTextContent();
+
+ background = new ResourceLocation(location);
}
@Override
@@ -27,8 +29,8 @@ public class PicturePage extends BookPage
{
manual.fonts.drawSplitString(text, localWidth + 8, localHeight, 178, 0);
}
-
- private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/bookcrafting.png");
+
+ ResourceLocation background;
public void renderBackgroundLayer (int localWidth, int localHeight)
{
manual.getMC().func_110434_K().func_110577_a(background);
diff --git a/tconstruct/inventory/DrawbridgeContainer.java b/tconstruct/inventory/DrawbridgeContainer.java
index 5a93181d..14e7afe9 100644
--- a/tconstruct/inventory/DrawbridgeContainer.java
+++ b/tconstruct/inventory/DrawbridgeContainer.java
@@ -1,6 +1,7 @@
package tconstruct.inventory;
import tconstruct.blocks.logic.DrawbridgeLogic;
+import tconstruct.landmine.inventory.SlotOpaqueBlocksOnly;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
@@ -19,7 +20,7 @@ public class DrawbridgeContainer extends Container
this.logic = logic;
this.addSlotToContainer(new DrawbridgeSlot(logic, 0, 80, 36, logic));
- this.addSlotToContainer(new Slot(logic, 1, 35, 36));
+ this.addSlotToContainer(new SlotOpaqueBlocksOnly(logic, 1, 35, 36));
/* Player inventory */
for (int column = 0; column < 3; column++)
diff --git a/tconstruct/inventory/DrawbridgeSlot.java b/tconstruct/inventory/DrawbridgeSlot.java
index fbe897cf..9fa02805 100644
--- a/tconstruct/inventory/DrawbridgeSlot.java
+++ b/tconstruct/inventory/DrawbridgeSlot.java
@@ -1,12 +1,13 @@
package tconstruct.inventory;
import tconstruct.blocks.logic.DrawbridgeLogic;
+import tconstruct.landmine.inventory.SlotBlocksOnly;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
-public class DrawbridgeSlot extends Slot
+public class DrawbridgeSlot extends SlotBlocksOnly
{
DrawbridgeLogic logic;
public DrawbridgeSlot(IInventory iinventory, int par2, int par3, int par4, DrawbridgeLogic logic)
@@ -15,14 +16,20 @@ public class DrawbridgeSlot extends Slot
this.logic = logic;
}
+ @Override
public boolean isItemValid(ItemStack par1ItemStack)
{
- return !logic.hasExtended();
+ return !logic.hasExtended() && super.isItemValid(par1ItemStack);
}
-
+ @Override
public boolean canTakeStack(EntityPlayer par1EntityPlayer)
{
return !logic.hasExtended();
}
+
+ @Override
+ public int getSlotStackLimit(){
+ return inventory.getInventoryStackLimit();
+ }
}