mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 03:49:29 +00:00
Merge branch 'master' into experimental
This commit is contained in:
commit
2a275c424e
4 files changed
+12
-11
No files matched your search
@@ -96,12 +96,9 @@ public class DryingRack extends InventoryBlock
|
||||
}
|
||||
else
|
||||
{
|
||||
if (logic.isStackInSlot(0))
|
||||
{
|
||||
ItemStack decrStack = logic.decrStackSize(0, 1);
|
||||
if (decrStack != null)
|
||||
addItemToInventory(player, world, x, y, z, decrStack);
|
||||
}
|
||||
ItemStack decrStack = logic.decrStackSize(0, 1);
|
||||
if (decrStack != null)
|
||||
addItemToInventory(player, world, x, y, z, decrStack);
|
||||
}
|
||||
|
||||
world.markBlockForUpdate(x, y, z);
|
||||
@@ -111,7 +108,11 @@ public class DryingRack extends InventoryBlock
|
||||
|
||||
public void addItemToInventory (EntityPlayer player, World world, int x, int y, int z, ItemStack stack)
|
||||
{
|
||||
AbilityHelper.spawnItemAtPlayer(player, stack);
|
||||
if(!player.inventory.addItemStackToInventory(stack))
|
||||
{
|
||||
// drop the rest as an item
|
||||
AbilityHelper.spawnItemAtPlayer(player, stack);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -922,7 +922,7 @@ public class TinkerSmeltery
|
||||
Smeltery.addDictionaryMelting("oreNether" + fluidTypeName, ft, 75, ((int) TConstruct.ingotLiquidValue * (int) PHConstruct.ingotsPerOre * 2));
|
||||
|
||||
// Blocks
|
||||
Smeltery.addDictionaryMelting("block" + fluidTypeName, ft, 100, TConstruct.blockLiquidValue);
|
||||
Smeltery.addDictionaryMelting("block" + fluidTypeName, ft, 100, TConstruct.ingotLiquidValue*2);
|
||||
|
||||
if (ft.isToolpart)
|
||||
{
|
||||
@@ -1073,7 +1073,7 @@ public class TinkerSmeltery
|
||||
basinCasting.addCastingRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 8), new FluidStack(TinkerSmeltery.moltenAlumiteFluid, TConstruct.blockLiquidValue), null, true, 100); // alumite
|
||||
basinCasting.addCastingRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 9), new FluidStack(TinkerSmeltery.moltenSteelFluid, TConstruct.blockLiquidValue), null, true, 100); // steel
|
||||
}
|
||||
basinCasting.addCastingRecipe(new ItemStack(Blocks.obsidian), new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.oreLiquidValue), null, true, 100);// obsidian
|
||||
basinCasting.addCastingRecipe(new ItemStack(Blocks.obsidian), new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.ingotLiquidValue*2), null, true, 100);// obsidian
|
||||
basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.clearGlass, 1, 0), new FluidStack(TinkerSmeltery.moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME), null, true, 100); // glass
|
||||
basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.smeltery, 1, 4), new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.ingotLiquidValue), null, true, 100); // seared
|
||||
// stone
|
||||
|
||||
@@ -308,7 +308,7 @@ public abstract class CastingBlockLogic extends InventoryLogic implements IFluid
|
||||
if(isStackInSlot(1))
|
||||
slot = 1;
|
||||
|
||||
// Additional Info: Only 1 item can only be put into the casting block usually, however recipies
|
||||
// Additional Info: Only 1 item can only be put into the casting block usually, however recipes
|
||||
// can have multiple blocks as output (compressed gravel -> brownstone for example)
|
||||
// we therefore spill the whole contents on extraction
|
||||
|
||||
|
||||
@@ -418,7 +418,7 @@ public class ToolProxyClient extends ToolProxyCommon
|
||||
final ToolCore[] tier2Tools = {hammer, lumberaxe, excavator, scythe, cleaver, battleaxe};
|
||||
|
||||
// repair
|
||||
addToolButton(0, 3, 0, new int[] { 0, 1, 2, 13 }, new int[] { 13, 13, 13, 13 }, "gui.toolforge1", "gui.toolforge2");
|
||||
addToolButton(0, 3, 0, new int[] { 0, 1, 2, 13 }, new int[] { 13, 13, 13, 13 }, StatCollector.translateToLocal("gui.toolforge1"), "gui.toolforge2");
|
||||
|
||||
// tier 1 tools
|
||||
for (int i = 0; i < tier1Tools.length; i++)
|
||||
|
||||
Reference in new issue
Block a user