1
0

Block and recipe update by STR_Warrior.

Adds missing fuels
Adds missing furnace recipes (FS #304)
Fixes some recipes (FS #305)
Adds current 1.5 weekly snapshot blocks and items.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1215 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft 2013-02-15 15:26:33 +00:00
parent 34b3c13404
commit 666a718db1
4 changed files with 56 additions and 6 deletions

View File

@ -48,6 +48,7 @@ Stick, 4 = Planks, 2:2, 2:3
Torch, 4 = Stick, 1:2 | Coal, 1:1 Torch, 4 = Stick, 1:2 | Coal, 1:1
Workbench = Planks, 1:1, 1:2, 2:1, 2:2 Workbench = Planks, 1:1, 1:2, 2:1, 2:2
Chest = Planks, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 Chest = Planks, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3
TrappedChest = TripWireHook, 1:1 | Chest, 2:1
EnderChest = EyeOfEnder, 2:2 | Obsidian, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 EnderChest = EyeOfEnder, 2:2 | Obsidian, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3
Furnace = Cobblestone, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 Furnace = Cobblestone, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3
@ -63,6 +64,9 @@ GoldBlock = GoldIngot, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
DiamondBlock = Diamond, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3 DiamondBlock = Diamond, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
LapisBlock = LapisLazuli, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3 LapisBlock = LapisLazuli, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
EmeraldBlock = Emerald, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3 EmeraldBlock = Emerald, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
RedstoneBlock = RedstoneDust, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
QuartzBlock = NetherQuartz, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
NetherBrick = netherbrickitem, 1:1, 1:2, 2:1, 2:2
Glowstone = GlowstoneDust, 1:1, 1:2, 2:1, 2:2 Glowstone = GlowstoneDust, 1:1, 1:2, 2:1, 2:2
Wool = String, 1:1, 1:2, 2:1, 2:2 Wool = String, 1:1, 1:2, 2:1, 2:2
TNT = Gunpowder, 1:1, 3:1, 2:2, 1:3, 3:3 | Sand, 2:1, 1:2, 3:2, 2:3 TNT = Gunpowder, 1:1, 3:1, 2:2, 1:3, 3:3 | Sand, 2:1, 1:2, 3:2, 2:3
@ -75,6 +79,7 @@ CobblestoneSlab, 6 = Cobblestone, 1:1, 2:1, 3:1
BrickSlab, 6 = BrickBlock, 1:1, 2:1, 3:1 BrickSlab, 6 = BrickBlock, 1:1, 2:1, 3:1
StonebrickSlab, 6 = StoneBrick, 1:1, 2:1, 3:1 StonebrickSlab, 6 = StoneBrick, 1:1, 2:1, 3:1
NetherbrickSlab, 6 = NetherBrick, 1:1, 2:1, 3:1 NetherbrickSlab, 6 = NetherBrick, 1:1, 2:1, 3:1
snow, 6 = SnowBlock, 1:1, 2:1, 3:1
# Stairs: # Stairs:
WoodStairs, 4 = Planks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3 WoodStairs, 4 = Planks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
@ -86,8 +91,7 @@ BrickStairs, 4 = BrickBlock, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
SandstoneStairs, 4 = Sandstone, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3 SandstoneStairs, 4 = Sandstone, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
SandstoneStairs, 4 = Sandstone, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3 SandstoneStairs, 4 = Sandstone, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
NetherBrickStairs, 4 = NetherBrick, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3 NetherBrickStairs, 4 = NetherBrick, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
NetherBrickStairs, 4 = NetherBrick, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3 quartzstairs, 4 = Quartzblock, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
SnowBlock = SnowBall, 1:1, 1:2, 2:1, 2:2 SnowBlock = SnowBall, 1:1, 1:2, 2:1, 2:2
ClayBlock = Clay, 1:1, 1:2, 2:1, 2:2 ClayBlock = Clay, 1:1, 1:2, 2:1, 2:2
BrickBlock = Brick, 1:1, 1:2, 2:1, 2:2 BrickBlock = Brick, 1:1, 1:2, 2:1, 2:2
@ -215,6 +219,8 @@ CarrotOnAStick = FishingRod, 1:2 | Carrot, 2:3
Minecart = IronIngot, 1:1, 3:1, 1:2, 2:2, 3:2 Minecart = IronIngot, 1:1, 3:1, 1:2, 2:2, 3:2
PoweredMinecart = Minecart, * | Furnace, * PoweredMinecart = Minecart, * | Furnace, *
StorageMinecart = Minecart, * | Chest, * StorageMinecart = Minecart, * | Chest, *
TNTMinecart = Minecart, * | TNT, *
hopperminecart = Minecart, * | Hopper, *
Rails, 16 = IronIngot, 1:1, 3:1, 1:2, 3:2, 1:3, 3:3 | Stick, 2:2 Rails, 16 = IronIngot, 1:1, 3:1, 1:2, 3:2, 1:3, 3:3 | Stick, 2:2
PoweredRail, 6 = GoldIngot, 1:1, 3:1, 1:2, 3:2, 1:3, 3:3 | Stick, 2:2 | RedstoneDust, 2:3 PoweredRail, 6 = GoldIngot, 1:1, 3:1, 1:2, 3:2, 1:3, 3:3 | Stick, 2:2 | RedstoneDust, 2:3
DetectorRail, 6 = IronIngot, 1:1, 3:1, 1:2, 3:2, 1:3, 3:3 | StonePlate, 2:2 | RedstoneDust, 2:3 DetectorRail, 6 = IronIngot, 1:1, 3:1, 1:2, 3:2, 1:3, 3:3 | StonePlate, 2:2 | RedstoneDust, 2:3
@ -239,7 +245,11 @@ Lever = Cobblestone, 1:2 | Stick, 1:1
NoteBlock = Planks, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | RedstoneDust, 2:2 NoteBlock = Planks, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | RedstoneDust, 2:2
Jukebox = Planks, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | Diamond, 2:2 Jukebox = Planks, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | Diamond, 2:2
Dispenser = Cobblestone, 1:1, 1:2, 1:3, 2:1, 3:1, 3:2, 3:3 | RedstoneDust, 2:3 | Bow, 2:2 Dispenser = Cobblestone, 1:1, 1:2, 1:3, 2:1, 3:1, 3:2, 3:3 | RedstoneDust, 2:3 | Bow, 2:2
Dropper = Cobblestone, 1:1, 2:1, 3:1, 1:2, 1:3, 3:2, 3:3 | Hopper, 2:2 | RedstoneDust, 2:3
Repeater = Stone, 1:2, 2:2, 3:2 | RedstoneTorchOn, 1:1, 3:1 | RedstoneDust, 2:1 Repeater = Stone, 1:2, 2:2, 3:2 | RedstoneTorchOn, 1:1, 3:1 | RedstoneDust, 2:1
Comparator = RedstoneTorchOn, 2:1, 1:2, 3:2 | NetherQuartz, 2:2 | Stone, 1:3, 2:3, 3:3
DaylightSensor = Glass, 1:1, 2:1, 3:1 | NetherQuartz, 1:2, 2:2, 3:2 | Woodslab, 1:3, 2:3, 3:3
Hopper = Ironbars, 1:1, 3:1, 1:2, 3:2, 2:3 | Chest, 2:2
Piston = Planks, 1:1, 2:1, 3:1 | RedstoneDust, 2:2 | Cobblestone, 1:2, 3:2, 1:3, 2:3, 3:3 Piston = Planks, 1:1, 2:1, 3:1 | RedstoneDust, 2:2 | Cobblestone, 1:2, 3:2, 1:3, 2:3, 3:3
StickyPiston = Piston, * | SlimeBall, * StickyPiston = Piston, * | SlimeBall, *
RedstoneLamp = RedstoneDust, 2:1, 1:2, 3:2, 2:3 | Glowstone, 2:2 RedstoneLamp = RedstoneDust, 2:1, 1:2, 3:2, 2:3 | Glowstone, 2:2
@ -252,7 +262,7 @@ tripwirehook, 2 = planks, 2:3 | stick, 2:2 | ironbar, 2:1
#******************************************************# #******************************************************#
# Food # Food
# #
Bowl = Planks, 1:1, 2:2, 3:1 Bowl, 4 = Planks, 1:1, 2:2, 3:1
MushroomStew = Bowl, * | BrownMushroom, * | RedMushroom, * MushroomStew = Bowl, * | BrownMushroom, * | RedMushroom, *
Bread = Wheat, 1:1, 2:1, 3:1 Bread = Wheat, 1:1, 2:1, 3:1
Sugar = Sugarcane, * Sugar = Sugarcane, *

View File

@ -41,9 +41,13 @@
4:1 @10000=1:1 #-> 1 Cobblestone -> 1 Rock 4:1 @10000=1:1 #-> 1 Cobblestone -> 1 Rock
15:1 @10000=265:1 #-> 1 Iron Ore -> 1 Iron Ingot 15:1 @10000=265:1 #-> 1 Iron Ore -> 1 Iron Ingot
14:1 @10000=266:1 #-> 1 Gold Ore -> 1 Gold Ingot 14:1 @10000=266:1 #-> 1 Gold Ore -> 1 Gold Ingot
153:1 @10000=406:1 #-> 1 Quartz Ore -> 1 Quartz
12:1 @10000=20:1 #-> 1 Sand -> 1 Glass 12:1 @10000=20:1 #-> 1 Sand -> 1 Glass
319:1@10000=320:1 #-> 1 Raw Pork -> 1 Cooked Pork 319:1@10000=320:1 #-> 1 Raw Pork -> 1 Cooked Pork
363:1@10000=364:1 #-> 1 Raw Beef -> 1 Cooked Beef (steak)
365:1@10000=366:1 #-> 1 Raw Chicken -> 1 Cooked Chicken
337:1@10000=336:1 #-> 1 Clay -> 1 Clay Brick 337:1@10000=336:1 #-> 1 Clay -> 1 Clay Brick
87:1@10000=405:1 #-> 1 NetherRack -> 1 NetherBrick
349:1@10000=350:1 #-> 1 Raw Fish -> 1 Cooked Fish 349:1@10000=350:1 #-> 1 Raw Fish -> 1 Cooked Fish
17:1 @10000=263:1 #-> 1 Wood -> 1 Charcoal 17:1 @10000=263:1 #-> 1 Wood -> 1 Charcoal
81:1 @10000=351:1:2 #-> 1 Cactus -> 1 Dye 81:1 @10000=351:1:2 #-> 1 Cactus -> 1 Dye
@ -52,6 +56,7 @@
# Burn baby! Buuurn! # Burn baby! Buuurn!
!263:1 = 80000 #-> 1 Charcoal -> 80 sec !263:1 = 80000 #-> 1 Charcoal -> 80 sec
!42:126:1 = 7500 #-> 1 halfslab -> 7.5 seconds
!5:1 = 15000 #-> 1 Planks -> 15 sec !5:1 = 15000 #-> 1 Planks -> 15 sec
!280:1 = 5000 #-> 1 Stick -> 5 sec !280:1 = 5000 #-> 1 Stick -> 5 sec
!85:1 = 15000 #-> 1 Fence -> 15 sec !85:1 = 15000 #-> 1 Fence -> 15 sec
@ -61,4 +66,5 @@
!54:1 = 15000 #-> 1 Chest -> 15 sec !54:1 = 15000 #-> 1 Chest -> 15 sec
!84:1 = 15000 #-> 1 Jukebox -> 15 sec !84:1 = 15000 #-> 1 Jukebox -> 15 sec
!327:1 = 1000000 #-> 1 Lava Bucket -> 1000 sec !327:1 = 1000000 #-> 1 Lava Bucket -> 1000 sec
!17:1 = 15000 #-> 1 Wood -> 15 sec !17:1 = 15000 #-> 1 Wood -> 15 sec
!6:1 = 5000 #-> 1 Sapling -> 5 sec

View File

@ -263,6 +263,20 @@ humanhead=144:3
stevehead=144:3 stevehead=144:3
creeperhead=144:4 creeperhead=144:4
anvil=145 anvil=145
trappedchest=146
lightweightedpressureplate=147
heavyweightedpressureplate=148
inactivecomparator=149
activecomparator=150
daylightsensor=151
redstoneblock=152
netherquartzore=153
hopper=154
quartzblock=155
quartzstairs=156
activatorrail=157
dropper=158
ironshovel=256 ironshovel=256
ironspade=256 ironspade=256
ironpickaxe=257 ironpickaxe=257
@ -485,7 +499,6 @@ firecharge=385
bookandquill=386 bookandquill=386
writtenbook=387 writtenbook=387
emerald=388 emerald=388
itemframe=389 itemframe=389
flowerpot=390 flowerpot=390
carrot=391 carrot=391
@ -505,6 +518,11 @@ pumpkinpie=400
fireworkrocket=401 fireworkrocket=401
fireworkstar=402 fireworkstar=402
enchantedbook=403 enchantedbook=403
comparator=404
netherbrickitem=405
netherquartz=406
tntminecart=407
hopperminecart=408
goldrecord=2256 goldrecord=2256
greenrecord=2257 greenrecord=2257

View File

@ -162,6 +162,19 @@ enum ENUM_BLOCK_ID
E_BLOCK_POTATOES = 142, E_BLOCK_POTATOES = 142,
E_BLOCK_WOODEN_BUTTON = 143, E_BLOCK_WOODEN_BUTTON = 143,
E_BLOCK_HEAD = 144, E_BLOCK_HEAD = 144,
E_BLOCK_TRAPPED_CHEST = 146,
E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE = 147,
E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE = 148,
E_BLOCK_INACTIVE_COMPARATOR = 149,
E_BLOCK_ACTIVE_COMPARATOR = 150,
E_BLOCK_DAYLIGHT_SENSOR = 151,
E_BLOCK_BLOCK_OF_REDSTONE = 152,
E_BLOCK_NETHER_QUARTZ_ORE = 153,
E_BLOCK_HOPPER = 154,
E_BLOCK_QUARTZ_BLOCK = 155,
E_BLOCK_ACTIVATOR_RAIL = 157,
// Keep these two as the last values, without a number - they will get their correct number assigned automagically by C++ // Keep these two as the last values, without a number - they will get their correct number assigned automagically by C++
// IsValidBlock() depends on this // IsValidBlock() depends on this
@ -453,6 +466,9 @@ enum ENUM_ITEM_ID
E_ITEM_FIREWORK_ROCKET = 401, E_ITEM_FIREWORK_ROCKET = 401,
E_ITEM_FIREWORK_STAR = 402, E_ITEM_FIREWORK_STAR = 402,
E_ITEM_ENCHANTED_BOOK = 403, E_ITEM_ENCHANTED_BOOK = 403,
E_ITEM_COMPARATOR = 404,
E_ITEM_NETHER_BRICK = 405,
E_ITEM_NETHER_QUARTZ = 406,
// Keep these two as the last values of the consecutive list, without a number - they will get their correct number assigned automagically by C++ // Keep these two as the last values of the consecutive list, without a number - they will get their correct number assigned automagically by C++
// IsValidItem() depends on this! // IsValidItem() depends on this!
@ -686,7 +702,7 @@ enum
E_ENTITY_TYPE_IRON_GOLEM = 99, E_ENTITY_TYPE_IRON_GOLEM = 99,
E_ENTITY_TYPE_VILLAGER = 120, E_ENTITY_TYPE_VILLAGER = 120,
} ; } ;
// tolua_end //tolua_end