summaryrefslogtreecommitdiffstats
path: root/MCServer
diff options
context:
space:
mode:
authorMasy98 <masy@antheruscraft.de>2014-09-01 21:30:45 +0200
committerMasy98 <masy@antheruscraft.de>2014-09-01 21:30:45 +0200
commitcc9acd13b90c2dff21b6a7b7d4db57780aba0fc7 (patch)
treede161c8abb3a9fb961b794e4d4cf255102b83715 /MCServer
parentFixed spacing and light gray wool name! (diff)
parentMerge pull request #1368 from mc-server/coverityFixes (diff)
downloadcuberite-cc9acd13b90c2dff21b6a7b7d4db57780aba0fc7.tar
cuberite-cc9acd13b90c2dff21b6a7b7d4db57780aba0fc7.tar.gz
cuberite-cc9acd13b90c2dff21b6a7b7d4db57780aba0fc7.tar.bz2
cuberite-cc9acd13b90c2dff21b6a7b7d4db57780aba0fc7.tar.lz
cuberite-cc9acd13b90c2dff21b6a7b7d4db57780aba0fc7.tar.xz
cuberite-cc9acd13b90c2dff21b6a7b7d4db57780aba0fc7.tar.zst
cuberite-cc9acd13b90c2dff21b6a7b7d4db57780aba0fc7.zip
Diffstat (limited to '')
-rw-r--r--MCServer/Plugins/APIDump/APIDesc.lua2
m---------MCServer/Plugins/Core0
-rw-r--r--MCServer/crafting.txt10
-rw-r--r--MCServer/furnace.txt132
-rw-r--r--MCServer/items.ini1
5 files changed, 75 insertions, 70 deletions
diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 3e1a6e3bb..e7f9e9b18 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -2846,7 +2846,7 @@ end
MirrorBlockFaceY = { Params = "{{Globals#BlockFaces|eBlockFace}}", Return = "{{Globals#BlockFaces|eBlockFace}}", Notes = "Returns the {{Globals#BlockFaces|eBlockFace}} that corresponds to the given {{Globals#BlockFaces|eBlockFace}} after mirroring it around the Y axis (or rotating 180 degrees around it)." },
NoCaseCompare = {Params = "string, string", Return = "number", Notes = "Case-insensitive string comparison; returns 0 if the strings are the same"},
NormalizeAngleDegrees = { Params = "AngleDegrees", Return = "AngleDegrees", Notes = "Returns the angle, wrapped into the [-180, +180) range." },
- ReplaceString = {Params = "full-string, to-be-replaced-string, to-replace-string", Notes = "Replaces *each* occurence of to-be-replaced-string in full-string with to-replace-string"},
+ ReplaceString = {Params = "full-string, to-be-replaced-string, to-replace-string", Return = "string", Notes = "Replaces *each* occurence of to-be-replaced-string in full-string with to-replace-string"},
RotateBlockFaceCCW = { Params = "{{Globals#BlockFaces|eBlockFace}}", Return = "{{Globals#BlockFaces|eBlockFace}}", Notes = "Returns the {{Globals#BlockFaces|eBlockFace}} that corresponds to the given {{Globals#BlockFaces|eBlockFace}} after rotating it around the Y axis 90 degrees counter-clockwise." },
RotateBlockFaceCW = { Params = "{{Globals#BlockFaces|eBlockFace}}", Return = "{{Globals#BlockFaces|eBlockFace}}", Notes = "Returns the {{Globals#BlockFaces|eBlockFace}} that corresponds to the given {{Globals#BlockFaces|eBlockFace}} after rotating it around the Y axis 90 degrees clockwise." },
StringSplit = {Params = "string, SeperatorsString", Return = "array table of strings", Notes = "Seperates string into multiple by splitting every time any of the characters in SeperatorsString is encountered."},
diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core
-Subproject bd23915df763b182610c6163c5ff2d64a075656
+Subproject 7cc99285ae5117418f657c3b295ca71f2b75b4f
diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index 078dc3925..d471f2cac 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -88,13 +88,13 @@ JackOLantern = Pumpkin, 1:1 | Torch, 1:2
PolishedGranite, 4 = Granite, 1:1, 1:2, 2:1, 2:2
PolishedDiorite, 4 = Diorite, 1:1, 1:2, 2:1, 2:2
PolishedAndesite, 4 = Andesite, 1:1, 1:2, 2:1, 2:2
-CoarsedDirt, 4 = Dirt, 1:1, 2:2 | Gravel 1:2, 2:1
-CoarsedDirt, 4 = Gravel, 1:1, 2:2 | Dirt 1:2, 2:1
+CoarsedDirt, 4 = Dirt, 1:1, 2:2 | Gravel, 1:2, 2:1
+CoarsedDirt, 4 = Gravel, 1:1, 2:2 | Dirt, 1:2, 2:1
SlimeBlock = Slimeball, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
Prismarine = PrismarineShard, 1:1, 1:2, 2:1, 2:2
PrismarineBricks = PrismarineShard, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
DarkPrismarine = PrismarineShard, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | Inksac, 2:2
-SeaLantern = PrismarineShard, 1:1, 1:3, 3:1, 3:3, PrismarineCrystal, 1:2, 2:1, 2:2, 2:3, 3:2
+SeaLantern = PrismarineShard, 1:1, 1:3, 3:1, 3:3 | PrismarineCrystals, 1:2, 2:1, 2:2, 2:3, 3:2
RedSandstone, 4 = RedSand, 1:1, 1:2, 2:1, 2:2
ChiseledRedSandstone, 4 = RedSandstoneSlab, 1:1, 1:2
SmoothRedSandstone, 4 = RedSand, 1:1, 1:2, 2:1, 2:2
@@ -329,8 +329,8 @@ MelonSeeds = MelonSlice, *
PumpkinSeeds, 4 = Pumpkin, *
PumpkinPie = Pumpkin, * | Sugar, * | egg, *
Wheat, 9 = Haybale, *
-MushroomStew = Cooked Rabbit, 2:1 | Carrot, 1:2 | BakedPotato 2:2 | BrownMushroom 3:2 | Bowl, 2:3
-MushroomStew = Cooked Rabbit, 2:1 | Carrot, 1:2 | BakedPotato 2:2 | RedMushroom 3:2 | Bowl, 2:3
+RabbitStew = Cooked Rabbit, 2:1 | Carrot, 1:2 | BakedPotato, 2:2 | BrownMushroom, 3:2 | Bowl, 2:3
+RabbitStew = Cooked Rabbit, 2:1 | Carrot, 1:2 | BakedPotato, 2:2 | RedMushroom, 3:2 | Bowl, 2:3
diff --git a/MCServer/furnace.txt b/MCServer/furnace.txt
index 8d7577ff9..0c12a798d 100644
--- a/MCServer/furnace.txt
+++ b/MCServer/furnace.txt
@@ -10,25 +10,28 @@
# An Item is defined by an Item Type, an amount (and damage)
# The damage is optional, and if not specified it's assumed to be 0
#
-# -Cactus Green:
-# 351 : 1 ( : 2 )
-# ItemType : Amount ( : Damage )
+# Cactus Green example:
+# 351 : 2 ( , 1 )
+# ItemType : Damage ( , Amount )
+# or simple use the item name (marked in items.ini):
+# CactusGreen ( , 1 )
#
#
# **** Recipe and result ****
#
-# 4:1@200=1:1 -> Produces 1 smooth stone from 1 cobblestone in 200 ticks (10 seconds)
+# Cobble @ 200 = Stone -> Produces 1 smooth stone from 1 cobblestone in 200 ticks (10 seconds)
#
-# 4 : 1 @ 200 = 1 : 1
-# ItemType : Amount @ ticks = ItemID : Amount
+# Write in full:
+# Cobble : 0 , 1 @ 200 = 1 : 1 , 1
+# ItemType : Damage , Amount @ ticks = ItemType : Damage , Amount
#
#
# **** Fuel ****
#
# !17:1 = 300 -> 1 Wood burns for 300 ticks (15 s)
#
-# ! 17 : 1 = 300
-# Fuel ItemType : Amount = ticks
+# ! Wood , 1 = 300
+# Fuel ItemType , Amount = ticks
#
#******************************************************#
@@ -39,66 +42,67 @@
#--------------------------
# Smelting recipes
-4:1 @ 200 = 1:1 # 1 Cobblestone -> 1 Rock
-15:1 @ 200 = 265:1 # 1 Iron Ore -> 1 Iron Ingot
-14:1 @ 200 = 266:1 # 1 Gold Ore -> 1 Gold Ingot
-153:1 @ 200 = 406:1 # 1 Quartz Ore -> 1 Quartz
-12:1 @ 200 = 20:1 # 1 Sand -> 1 Glass
-319:1 @ 200 = 320:1 # 1 Raw Pork -> 1 Cooked Pork
-363:1 @ 200 = 364:1 # 1 Raw Beef -> 1 Cooked Beef (steak)
-365:1 @ 200 = 366:1 # 1 Raw Chicken -> 1 Cooked Chicken
-337:1 @ 200 = 336:1 # 1 Clay -> 1 Clay Brick
-82:1 @ 200 = 172:1 # 1 Clay Block -> 1 Hardened Clay
-87:1 @ 200 = 405:1 # 1 NetherRack -> 1 NetherBrick
-349:1 @ 200 = 350:1 # 1 Raw Fish -> 1 Cooked Fish
-349:1:1 @ 200 = 350:1:1 # 1 Raw Salmon -> 1 Cooked Salmon
-17:1 @ 200 = 263:1:1 # 1 Log -> 1 Charcoal
-81:1 @ 200 = 351:1:2 # 1 Cactus -> 1 Green Dye
-19:1:1 @ 200 = 19:1 # 1 Wet Sponge -> 1 Sponge
-98:1 @ 200 = 98:1:2 # 1 Stonebrick -> 1 Cracked Stonebrick
-411:1 @ 200 = 412:1 # 1 Raw Rabbit -> 1 Cooked Rabbit
-423:1 @ 200 = 424:1 # 1 Raw Mutton -> 1 Cooked Mutton
+Cobble = Stone
+IronOre = IronIngot
+GoldOre = GoldIngot
+NetherQuartzOre = NetherQuartz
+Sand = Glass
+Pork = CookedPork
+RawBeef = Steak
+RawChicken = CookedChicken
+Clay = Brick
+ClayBlock = HardenedClay
+TallGrass = NetherBrickItem
+RawFish = CookedFish
+Log = CharCoal
+Cactus = GreenDye
+WetSponge = Sponge
+Stonebrick = CrackedStonebrick
+RawRabbit = CookedRabbit
+RawMutton = CookedMutton
+
+
#--------------------------
# Fuels
-! 263:1 = 1600 # 1 Coal -> 80 sec
-! 263:1:1 = 1600 # 1 Charcoal -> 80 sec
-! 126:1 = 15 # 1 Halfslab -> 7.5 sec
-! 5:1 = 300 # 1 Planks -> 15 sec
-! 280:1 = 100 # 1 Stick -> 5 sec
-! 85:1 = 300 # 1 Fence -> 15 sec
-! 188:1 = 300 # 1 Spruce Fence -> 15 sec
-! 189:1 = 300 # 1 Birch Fence -> 15 sec
-! 190:1 = 300 # 1 Jungle Fence -> 15 sec
-! 191:1 = 300 # 1 Dark Oak Fence -> 15 sec
-! 192:1 = 300 # 1 Acacia Fence -> 15 sec
-! 53:1 = 300 # 1 Wooden Stairs -> 15 sec
-! 58:1 = 300 # 1 Crafting Table -> 15 sec
-! 47:1 = 300 # 1 Bookshelf -> 15 sec
-! 54:1 = 300 # 1 Chest -> 15 sec
-! 84:1 = 300 # 1 Jukebox -> 15 sec
-! 327:1 = 20000 # 1 Lava Bucket -> 1000 sec
-! 17:1 = 300 # 1 Wood -> 15 sec
-! 6:1 = 100 # 1 Sapling -> 5 sec
-! 173:1 = 16000 # 1 Coal Block -> 800 sec
-! 369:1 = 2400 # 1 Blaze Rod -> 120 sec
-! 25:1 = 300 # 1 Note Block -> 15 sec
-! 151:1 = 300 # 1 Daylight Sensor -> 15 sec
-! 107:1 = 300 # 1 Fence Gate -> 15 sec
-! 183:1 = 300 # 1 Spruce Fence Gate -> 15 sec
-! 184:1 = 300 # 1 Birch Fence Gate -> 15 sec
-! 185:1 = 300 # 1 Jungle Fence Gate -> 15 sec
-! 186:1 = 300 # 1 Dark Oak Fence Gate -> 15 sec
-! 187:1 = 300 # 1 Acacia Fence Gate -> 15 sec
-! 167:1 = 300 # 1 Trapdoor -> 15 sec
-! 146:1 = 300 # 1 Trapped Chest -> 15 sec
-! 72:1 = 300 # 1 Pressure Plate -> 15 sec
-! 270:1 = 200 # 1 Wooden Pickaxe -> 10 sec
-! 271:1 = 200 # 1 Wooden Axe -> 10 sec
-! 269:1 = 200 # 1 Wooden Shovel -> 10 sec
-! 290:1 = 200 # 1 Wooden Hoe -> 10 sec
-! 268:1 = 200 # 1 Wooden Sword -> 10 sec
+! CharCoal = 1600 # -> 80 sec
+! Coal = 1600 # -> 80 sec
+! WoodenSlab = 15 # -> 7.5 sec
+! Planks = 300 # -> 15 sec
+! Stick = 100 # -> 5 sec
+! Fence = 300 # -> 15 sec
+! SpruceFence = 300 # -> 15 sec
+! BirchFence = 300 # -> 15 sec
+! JungleFence = 300 # -> 15 sec
+! DarkOakFence = 300 # -> 15 sec
+! AcaciaFence = 300 # -> 15 sec
+! WoodStairs = 300 # -> 15 sec
+! Workbench = 300 # -> 15 sec
+! Bookshelf = 300 # -> 15 sec
+! Chest = 300 # -> 15 sec
+! Jukebox = 300 # -> 15 sec
+! Lavabucket = 20000 # -> 1000 sec
+! Log = 300 # -> 15 sec
+! Sapling = 100 # -> 5 sec
+! CoalBlock = 16000 # -> 800 sec
+! BlazeRod = 2400 # -> 120 sec
+! NoteBlock = 300 # -> 15 sec
+! DaylightSensor = 300 # -> 15 sec
+! FenceGate = 300 # -> 15 sec
+! SpruceFenceGate = 300 # -> 15 sec
+! BirchFenceGate = 300 # -> 15 sec
+! JungleFenceGate = 300 # -> 15 sec
+! DarkOakFenceGate = 300 # -> 15 sec
+! Trapdoor = 300 # -> 15 sec
+! TrappedChest = 300 # -> 15 sec
+! WoodPlate = 300 # -> 15 sec
+! WoodPickaxe = 200 # -> 10 sec
+! WoodAxe = 200 # -> 10 sec
+! WoodShovel = 200 # -> 10 sec
+! WoodHoe = 200 # -> 10 sec
+! WoodSword = 200 # -> 10 sec
+
diff --git a/MCServer/items.ini b/MCServer/items.ini
index 1a9591347..e2b1a95b6 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -411,6 +411,7 @@ darkprismarine=168:2
sealantern=169
haybale=170
carpet=171
+hardenedclay=172
redsandstone=179
chiseledredsandstone=179:1
smoothredsandstone=179:2