Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Better craft support #101

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions data/crafting.txt
Original file line number Diff line number Diff line change
Expand Up @@ -177,39 +177,39 @@ CraftingTable = WoodPlanks^-1, 1:1, 1:2, 2:1, 2:2
##
#
## Axes:
#DiamondAxe = Stick, 2:2, 2:3 | Diamond, 2:1, 1:1, 1:2
#DiamondAxe = Stick, 2:2, 2:3 | Diamond, 2:1, 3:1, 3:2
#GoldenAxe = Stick, 2:2, 2:3 | GoldIngot, 2:1, 1:1, 1:2
#GoldenAxe = Stick, 2:2, 2:3 | GoldIngot, 2:1, 3:1, 3:2
#IronAxe = Stick, 2:2, 2:3 | IronIngot, 2:1, 1:1, 1:2
#IronAxe = Stick, 2:2, 2:3 | IronIngot, 2:1, 3:1, 3:2
#StoneAxe = Stick, 2:2, 2:3 | Cobblestone, 2:1, 1:1, 1:2
#StoneAxe = Stick, 2:2, 2:3 | Cobblestone, 2:1, 3:1, 3:2
#WoodenAxe = Stick, 2:2, 2:3 | Planks^-1, 2:1, 1:1, 1:2
#WoodenAxe = Stick, 2:2, 2:3 | Planks^-1, 2:1, 3:1, 3:2
DiamondAxe = Stick, 2:2, 2:3 | Diamond, 2:1, 1:1, 1:2
DiamondAxe = Stick, 2:2, 2:3 | Diamond, 2:1, 3:1, 3:2
GoldenAxe = Stick, 2:2, 2:3 | GoldIngot, 2:1, 1:1, 1:2
GoldenAxe = Stick, 2:2, 2:3 | GoldIngot, 2:1, 3:1, 3:2
IronAxe = Stick, 2:2, 2:3 | IronIngot, 2:1, 1:1, 1:2
IronAxe = Stick, 2:2, 2:3 | IronIngot, 2:1, 3:1, 3:2
StoneAxe = Stick, 2:2, 2:3 | Cobblestone, 2:1, 1:1, 1:2
StoneAxe = Stick, 2:2, 2:3 | Cobblestone, 2:1, 3:1, 3:2
WoodenAxe = Stick, 2:2, 2:3 | WoodPlanks^-1, 2:1, 1:1, 1:2
WoodenAxe = Stick, 2:2, 2:3 | WoodPlanks^-1, 2:1, 3:1, 3:2
#
## Pickaxes:
#DiamondPickaxe = Stick, 2:2, 2:3 | Diamond, 1:1, 2:1, 3:1
#GoldenPickaxe = Stick, 2:2, 2:3 | GoldIngot, 1:1, 2:1, 3:1
#IronPickaxe = Stick, 2:2, 2:3 | IronIngot, 1:1, 2:1, 3:1
#StonePickaxe = Stick, 2:2, 2:3 | Cobblestone, 1:1, 2:1, 3:1
#WoodenPickaxe = Stick, 2:2, 2:3 | Planks^-1, 1:1, 2:1, 3:1
DiamondPickaxe = Stick, 2:2, 2:3 | Diamond, 1:1, 2:1, 3:1
GoldenPickaxe = Stick, 2:2, 2:3 | GoldIngot, 1:1, 2:1, 3:1
IronPickaxe = Stick, 2:2, 2:3 | IronIngot, 1:1, 2:1, 3:1
StonePickaxe = Stick, 2:2, 2:3 | Cobblestone, 1:1, 2:1, 3:1
WoodenPickaxe = Stick, 2:2, 2:3 | WoodPlanks^-1, 1:1, 2:1, 3:1
#
## Shovels:
#DiamondShovel = Stick, 2:2, 2:3 | Diamond, 2:1
#GoldenShovel = Stick, 2:2, 2:3 | GoldIngot, 2:1
#IronShovel = Stick, 2:2, 2:3 | IronIngot, 2:1
#StoneShovel = Stick, 2:2, 2:3 | Cobblestone, 2:1
#WoodenShovel = Stick, 2:2, 2:3 | Planks^-1, 2:1
DiamondShovel = Stick, 2:2, 2:3 | Diamond, 2:1
GoldenShovel = Stick, 2:2, 2:3 | GoldIngot, 2:1
IronShovel = Stick, 2:2, 2:3 | IronIngot, 2:1
StoneShovel = Stick, 2:2, 2:3 | Cobblestone, 2:1
WoodenShovel = Stick, 2:2, 2:3 | WoodPlanks^-1, 2:1
#
## Hoes:
#DiamondHoe = Stick, 2:2, 2:3 | Diamond, 2:1, *:1
#GoldenHoe = Stick, 2:2, 2:3 | GoldIngot, 2:1, *:1
#IronHoe = Stick, 2:2, 2:3 | IronIngot, 2:1, *:1
#StoneHoe = Stick, 2:2, 2:3 | Cobblestone, 2:1, *:1
#WoodenHoe = Stick, 2:2, 2:3 | Planks^-1, 2:1, *:1
DiamondHoe = Stick, 2:2, 2:3 | Diamond, 2:1, *:1
GoldenHoe = Stick, 2:2, 2:3 | GoldIngot, 2:1, *:1
IronHoe = Stick, 2:2, 2:3 | IronIngot, 2:1, *:1
StoneHoe = Stick, 2:2, 2:3 | Cobblestone, 2:1, *:1
WoodenHoe = Stick, 2:2, 2:3 | WoodPlanks^-1, 2:1, *:1
#
#Bucket = IronIngot, 1:1, 2:2, 3:1
Bucket = IronIngot, 1:1, 2:2, 3:1
#Compass = IronIngot, 2:1, 1:2, 3:2, 2:3 | RedstoneDust, 2:2
#EmptyMap = Paper, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | Compass, 2:2
#FireCharge, 3 = BlazePowder, * | Coal, * | Gunpowder, *
Expand Down Expand Up @@ -248,10 +248,10 @@ CraftingTable = WoodPlanks^-1, 1:1, 1:2, 2:1, 2:2
##
#
## Helmets:
#DiamondHelmet = Diamond, 1:1, 2:1, 3:1, 1:2, 3:2
#GoldenHelmet = GoldIngot, 1:1, 2:1, 3:1, 1:2, 3:2
#IronHelmet = IronIngot, 1:1, 2:1, 3:1, 1:2, 3:2
#LeatherHelmet = Leather, 1:1, 2:1, 3:1, 1:2, 3:2
DiamondHelmet = Diamond, 1:1, 2:1, 3:1, 1:2, 3:2
GoldenHelmet = GoldIngot, 1:1, 2:1, 3:1, 1:2, 3:2
IronHelmet = IronIngot, 1:1, 2:1, 3:1, 1:2, 3:2
LeatherCap = Leather, 1:1, 2:1, 3:1, 1:2, 3:2
#
## Chestplates:
#DiamondChestplate = Diamond, 1:1, 3:1, 1:2, 2:2, 3:2, 1:3, 2:3, 3:3
Expand Down
177 changes: 177 additions & 0 deletions data/dropblock.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
#********************#
# Drop Block Mapping #
#********************#
#
#
#******************************************************#
# Basic Notation Help
#******************************************************#
#
#
#Block DroppedBlock Hardness Tool Hand Wooden Stone Iron Diamand Golden Shears Sword
Barrier = -, Infinity, -, Infinity, -, -, -, -, -, -, -
Bedrock = -, Infinity, -, Infinity, -, -, -, -, -, -, -
CommandBlock = -, Infinity, -, Infinity, -, -, -, -, -, -, -
EndPortal = -, Infinity, -, Infinity, -, -, -, -, -, -, -
EndPortalFrame = -, Infinity, -, Infinity, -, -, -, -, -, -, -
Portal = -, Infinity, -, Infinity, -, -, -, -, -, -, -
Lava = -, 100, -, Infinity, -, -, -, -, -, -, -
StructureBlock = -, Infinity, -, Infinity, -, -, -, -, -, -, -
StructureVoid = -, 0, -, 0.05, -, -, -, -, -, -, -
Water = -, 100, -, Infinity, -, -, -, -, -, -, -
Obsidian = Obsidian, 50, DiamondPickaxe, 250, 125, 62.5, 41.7, 9.4, 20.85, -, -
EnderChest = Obsidian, 22.5, WoodenPickaxe, 112.5, 16.9, 8.45, 5.65, 4.25, 2.85, -, -
Anvil = Anvil, 5, WoodenPickaxe, 25, 3.75, 1.9, 1.25, 0.95, 0.65, -, -
BlockOfCoal = BlockOfCoal, 5, WoodenPickaxe, 25, 3.75, 1.9, 1.25, 0.95, 0.65, -, -
BlockOfDiamond = BlockOfDiamond, 5, IronPickaxe, 25, 12.5, 6.25, 1.25, 0.95, 2.1, -, -
BlockOfEmerald = BlockOfEmerald, 5, IronPickaxe, 25, 12.5, 6.25, 1.25, 0.95, 2.1, -, -
BlockOfIron = BlockOfIron, 5, StonePickaxe, 25, 12.5, 1.9, 1.25, 0.95, 2.1, -, -
BlockOfRedstone = BlockOfRedstone, 5, WoodenPickaxe, 25, 3.75, 1.9, 1.25, 0.95, 0.65, -, -
EnchantmentTable = EnchantmentTable, 5, WoodenPickaxe, 25, 3.75, 1.9, 1.25, 0.95, 0.65, -, -
IronBars = IronBars, 5, WoodenPickaxe, 25, 3.75, 1.9, 1.25, 0.95, 0.65, -, -
IronDoor = IronDoor, 5, WoodenPickaxe, 25, 3.75, 1.9, 1.25, 0.95, 0.65, -, -
IronTrapdoor = IronTrapdoor, , WoodenPickaxe5, 25, 3.75, 1.9, 1.25, 0.95, 0.65, -, -
MonsterSpawner = -, 5, WoodenPickaxe, 25, 3.75, 1.9, 1.25, 0.95, 0.65, -, -
* Cobweb = -, 4, -, 20, -, -, -, -, -, 0.4, 0.4
Dispenser = Dispenser, 3.5, WoodenPickaxe, 17.5, 2.65, 1.35, 0.9, 0.7, 0.45, -, -
Dropper = Dropper, 3.5, WoodenPickaxe, 17.5, 2.65, 1.35, 0.9, 0.7, 0.45, -, -
Furnace = Furnace, 3.5, WoodenPickaxe, 17.5, 2.65, 1.35, 0.9, 0.7, 0.45, -, -
Beacon = Beacon, 3, -, 4.5, -, -, -, -, -, -, -
BlockOfGold = BlockOfGold, 3, IronPickaxe, 15, 7.5, 3.75, 0.75, 0.6, 1.25, -, -
CoalOre = CoalOre, 3, WoodenPickaxe, 15, 2.25, 1.15, 0.75, 0.6, 0.4, -, -
DragonEgg = DragonEgg, 3, -, 4.5, -, -, -, -, -, -, -
DiamondOre = DiamondOre, 3, IronPickaxe, 15, 7.5, 3.75, 0.75, 0.6, 1.25, -, -
EmeraldOre = EmeraldOre, 3, IronPickaxe, 15, 7.5, 3.75, 0.75, 0.6, 1.25, -, -
EndStone = EndStone, 3, WoodenPickaxe, 15, 2.25, 1.15, 0.75, 0.6, 0.4, -, -
GoldOre = GoldOre, 3, IronPickaxe, 15, 7.5, 3.75, 0.75, 0.6, 1.25, -, -
Hopper = Hopper, 3, WoodenPickaxe, 15, 2.25, 1.15, 0.75, 0.6, 0.4, -, -
IronOre = IronOre, 3, StonePickaxe, 15, 7.5, 1.15, 0.75, 0.6, 1.25, -, -
LapisLazuliBlock = LapisLazuliBlock, 3, StonePickaxe, 15, 7.5, 1.15, 0.75, 0.6, 1.25, -, -
LapisLazuliOre = LapisLazuliOre, 3, StonePickaxe, 15, 7.5, 1.15, 0.75, 0.6, 1.25, -, -
NetherQuartzOre = NetherQuartzOre, 3, WoodenPickaxe, 15, 2.25, 1.15, 0.75, 0.6, 0.4, -, -
RedstoneOre = RedstoneOre, 3, IronPickaxe, 15, 7.5, 3.75, 0.75, 0.6, 1.25, -, -
WoodenTrapdoor = Trapdoor, 3, Axe, 4.5, 2.25, 1.15, 0.75, 0.6, 0.4, -, -
* WoodenDoor = -, 3, Axe, 4.5, 2.25, 1.15, 0.75, 0.6, 0.4, -, -
Chest = Chest, 2.5, Axe, 3.75, 1.9, 0.95, 0.65, 0.5, 0.35, -, -
TrappedChest = TrappedChest, 2.5, Axe, 3.75, 1.9, 0.95, 0.65, 0.5, 0.35, -, -
CraftingTable = CraftingTable, 2.5, Axe, 3.75, 1.9, 0.95, 0.65, 0.5, 0.35, -, -
BoneBlock = BoneBlock, 2, WoodenPickaxe, 10, 1.5, 0.75, 0.5, 0.4, 0.25, -, -
BrickStairs = BrickStairs, 2, WoodenPickaxe, 10, 1.5, 0.75, 0.5, 0.4, 0.25, -, -
Bricks = Bricks, 2, WoodenPickaxe, 10, 1.5, 0.75, 0.5, 0.4, 0.25, -, -
Cauldron = Cauldron, 2, WoodenPickaxe, 10, 1.5, 0.75, 0.5, 0.4, 0.25, -, -
Cobblestone = Cobblestone, 2, WoodenPickaxe, 10, 1.5, 0.75, 0.5, 0.4, 0.25, -, -
CobblestoneStairs = CobblestoneStairs, 2, WoodenPickaxe, 10, 1.5, 0.75, 0.5, 0.4, 0.25, -, -
CobblestoneWall = CobblestoneWall, 2, WoodenPickaxe, 10, 1.5, 0.75, 0.5, 0.4, 0.25, -, -
* Fence = -, 2, Axe, 3, 1.5, 0.75, 0.5, 0.4, 0.25, -, -
FenceGate = FenceGate, 2, Axe, 3, 1.5, 0.75, 0.5, 0.4, 0.25, -, -
Jukebox = Jukebox, 2, Axe, 3, 1.5, 0.75, 0.5, 0.4, 0.25, -, -
MossStone = MossStone, 2, WoodenPickaxe, 10, 1.5, 0.75, 0.5, 0.4, 0.25, -, -
NetherBrick = NetherBrick, 2, WoodenPickaxe, 10, 1.5, 0.75, 0.5, 0.4, 0.25, -, -
RedNetherBrick = RedNetherBrick, 2, WoodenPickaxe, 10, 1.5, 0.75, 0.5, 0.4, 0.25, -, -
NetherBrickFence = NetherBrickFence, 2, WoodenPickaxe, 10, 1.5, 0.75, 0.5, 0.4, 0.25, -, -
NetherBrickStairs = NetherBrickStairs, 2, WoodenPickaxe, 10, 1.5, 0.75, 0.5, 0.4, 0.25, -, -
* StoneSlab = StoneSlab, 2, WoodenPickaxe, 10, 1.5, 0.75, 0.5, 0.4, 0.25, -, -
Wood = Wood, 2, Axe, 3, 1.5, 0.75, 0.5, 0.4, 0.25, -, -
WoodPlanks = WoodPlanks, 2, Axe, 3, 1.5, 0.75, 0.5, 0.4, 0.25, -, -
* WoodenSlabs = WoodenSlab, 2, Axe, 3, 1.5, 0.75, 0.5, 0.4, 0.25, -, -
* WoodenStairs = OakWoodStairs, 2, Axe, 3, 1.5, 0.75, 0.5, 0.4, 0.25, -, -
Concrete = Concrete, 1.8, Pickaxe, 2.7, 1.35, 0.7, 0.45, 0.35, 0.25, -, -
* Andesite = -, 1.5, WoodenPickaxe, 7.5, 1.15, 0.6, 0.4, 0.3, 0.2, -, -
* Bookshelf = -, 1.5, Axe, 2.25, 1.15, 0.6, 0.4, 0.3, 0.2, -, -
DarkPrismarine = Prismarine, 1.5, WoodenPickaxe, 7.5, 1.15, 0.6, 0.4, 0.3, 0.2, -, -
* Diorite = -, 1.5, WoodenPickaxe, 7.5, 1.15, 0.6, 0.4, 0.3, 0.2, -, -
* Granite = -, 1.5, WoodenPickaxe, 7.5, 1.15, 0.6, 0.4, 0.3, 0.2, -, -
Prismarine = Prismarine, 1.5, WoodenPickaxe, 7.5, 1.15, 0.6, 0.4, 0.3, 0.2, -, -
PrismarineBricks = Prismarine, 1.5, WoodenPickaxe, 7.5, 1.15, 0.6, 0.4, 0.3, 0.2, -, -
Stone = Cobblestone, 1.5, WoodenPickaxe, 7.5, 1.15, 0.6, 0.4, 0.3, 0.2, -, -
StoneBrick = StoneBricks, 1.5, WoodenPickaxe, 7.5, 1.15, 0.6, 0.4, 0.3, 0.2, -, -
StoneBrickStairs = StoneBrickStairs, 1.5, WoodenPickaxe, 7.5, 1.15, 0.6, 0.4, 0.3, 0.2, -, -
* GlazedTerracotta = -, 1.4, Pickaxe, 2.1, 1.05, 0.55, 0.35, 0.3, 0.2, -, -
* Terracotta = -, 1.25, WoodenPickaxe, 6.25, 0.95, 0.5, 0.35, 0.25, 0.2, -, -
* Banner = -, 1, Axe, 1.5, 0.75, 0.4, 0.25, 0.2, 0.15, -, -
JackLantern = JackLantern, 1, Axe, 1.5, 0.75, 0.4, 0.25, 0.2, 0.15, -, 1
Melon = Melon, 1, Axe, 1.5, 0.75, 0.4, 0.25, 0.2, 0.15, -, 1
MobHead = MobHead, 1, -, 1.5, -, -, -, -, -, -, -
NetherWartBlock = NetherWartBlock, 1, -, 1.5, -, -, -, -, -, -, -
Pumpkin = Pumpkin, 1, Axe, 1.5, 0.75, 0.4, 0.25, 0.2, 0.15, -, 1
Sign = StandingSign, 1, Axe, 1.5, 0.75, 0.4, 0.25, 0.2, 0.15, -, -
BlockOfQuartz = BlockOfQuartz, 0.8, WoodenPickaxe, 4, 0.65, 0.35, 0.2, 0.2, 0.1, -, -
NoteBlock = NoteBlock, 0.8, Axe, 1.25, 0.65, 0.35, 0.2, 0.2, 0.1, -, -
QuartzStairs = QuartzStairs, 0.8, WoodenPickaxe, 4, 0.65, 0.35, 0.2, 0.2, 0.1, -, -
RedSandstone = RedSandstone, 0.8, WoodenPickaxe, 4, 0.65, 0.35, 0.2, 0.2, 0.1, -, -
RedSandstoneStairs = RedSandstoneStairs, 0.8, WoodenPickaxe, 4, 0.65, 0.35, 0.2, 0.2, 0.1, -, -
Sandstone = Sandstone, 0.8, WoodenPickaxe, 4, 0.65, 0.35, 0.2, 0.2, 0.1, -, -
SandstoneStairs = SandstoneStairs, 0.8, WoodenPickaxe, 4, 0.65, 0.35, 0.2, 0.2, 0.1, -, -
Wool = Wool, 0.8, -, 1.25, -, -, -, -, -, 0.25, -
* MonsterEgg = -, 0.75, -, 1.15, -, -, -, -, -, -, -
Rails = Rail, 0.7, Pickaxe, 1.05, 0.55, 0.3, 0.2, 0.15, 0.1, -, -
Clay = Clay, 0.6, Shovel, 0.9, 0.45, 0.25, 0.15, 0.15, 0.1, -, -
Farmland = Dirt, 0.6, Shovel, 0.9, 0.45, 0.25, 0.15, 0.15, 0.1, -, -
GrassBlock = Dirt, 0.6, Shovel, 0.9, 0.45, 0.25, 0.15, 0.15, 0.1, -, -
* Gravel = Gravel, 0.6, Shovel, 0.9, 0.45, 0.25, 0.15, 0.15, 0.1, -, -
Mycelium = Dirt, 0.6, Shovel, 0.9, 0.45, 0.25, 0.15, 0.15, 0.1, -, -
LilyPad = LilyPad, 0, -, 0.05, -, -, -, -, -, -, -
Sponge = Sponge, 0.6, -, 0.9, -, -, -, -, -, -, -
WetSponge = Sponge, 0.6, -, 0.9, -, -, -, -, -, -, -
BrewingStand = BrewingStand, 0.5, WoodenPickaxe, 2.5, 0.4, 0.2, 0.15, 0.1, 0.1, -, -
* Button = -, 0.5, -, 0.75, -, -, -, -, -, -, -
Cake = -, 0.5, -, 0.75, -, -, -, -, -, -, -
CoarseDirt = Dirt, 0.5, Shovel, 0.75, 0.4, 0.2, 0.15, 0.1, 0.1, -, -
ConcretePowder = ConcretePowder, 0.5, Shovel, 0.75, 0.4, 0.2, 0.15, 0.1, 0.1, -, -
Dirt = Dirt, 0.5, Shovel, 0.75, 0.4, 0.2, 0.15, 0.1, 0.1, -, -
FrostedIce = -, 0.5, -, 2.5, -, -, -, -, -, -, -
HayBale = HayBale, 0.5, -, 0.75, -, -, -, -, -, -, -
Ice = -, 0.5, Pickaxe, 0.75, 0.4, 0.2, 0.15, 0.1, 0.1, -, -
Lever = Lever, 0.5, -, 0.75, -, -, -, -, -, -, -
MagmaBlock = MagmaBlock, 0.5, WoodenPickaxe, 2.5, 0.4, 0.2, 0.15, 0.1, 0.1, -, -
PackedIce = -, 0.5, Pickaxe, 0.75, 0.4, 0.2, 0.15, 0.1, 0.1, -, -
FrostedIce = -, 0.5, Pickaxe, 0.75, 0.4, 0.2, 0.15, 0.1, 0.1, -, -
Piston = Piston, 0.5, -, 0.75, -, -, -, -, -, -, -
Sand = Sand, 0.5, Shovel, 0.75, 0.4, 0.2, 0.15, 0.1, 0.1, -, -
SoulSand = SoulSand, 0.5, Shovel, 0.75, 0.4, 0.2, 0.15, 0.1, 0.1, -, -
StonePressurePlate = StonePressurePlate, 0.5, WoodenPickaxe, 2.5, 0.4, 0.2, 0.15, 0.1, 0.1, -, -
* WeightedPressurePlate = -, 0.5, WoodenPickaxe, 2.5, 0.4, 0.2, 0.15, 0.1, 0.1, -, -
WoodenPressurePlate = WoodenPressurePlate, 0.5, Axe, 0.75, 0.4, 0.2, 0.15, 0.1, 0.1, -, -
Cactus = Cactus, 0.4, -, 0.65, -, -, -, -, -, -, -
Ladder = Ladder, 0.4, Axe, 0.65, 0.35, 0.2, 0.1, 0.1, 0.05, -, -
Netherrack = Netherrack, 0.4, WoodenPickaxe, 2, 0.35, 0.2, 0.1, 0.1, 0.05, -, -
Glass = -, 0.3, -, 0.45, -, -, -, -, -, -, -
GlassPane = -, 0.3, -, 0.45, -, -, -, -, -, -, -
Glowstone = Glowstone, 0.3, -, 0.45, -, -, -, -, -, -, -
RedstoneLamp = RedstoneLampInactive, 0.3, -, 0.45, -, -, -, -, -, -, -
* SeaLantern = Prismarine, 0.3, -, 0.45, -, -, -, -, -, -, -
StainedGlass = -, 0.3, -, 0.45, -, -, -, -, -, -, -
StainedGlassPane = -, 0.3, -, 0.45, -, -, -, -, -, -, -
Bed = Bed, 0.2, -, 0.35, -, -, -, -, -, -, -
Cocoa = Cocoa, 0.2, Axe, 0.35, 0.2, 0.1, 0.05, 0.05, 0.05, -, 0.2
DaylightSensor = DaylightSensor, 0.2, Axe, 0.35, 0.2, 0.1, 0.05, 0.05, 0.05, -, -
* HugeMushrooms = -, 0.2, Axe, 0.35, 0.2, 0.1, 0.05, 0.05, 0.05, -, -
* Leaves = -, 0.2, -, 0.35, -, -, -, -, -, 0.05, 0.2
Snow = Snow, 0.2, WoodenShovel, 1, 0.2, 0.1, 0.05, 0.05, 0.05, -, -
Vines = Vines, 0.2, Axe, 0.35, 0.2, 0.1, 0.05, 0.05, 0.05, 0.35, 0.2
Carpet = Carpet, 0.1, -, 0.2, -, -, -, -, -, -, -
SnowLayer = Snow, 0.1, WoodenShovel, 0.5, 0.1, 0.05, 0.05, 0.05, 0.05, -, -
Air = -, 0, -, Infinity, -, -, -, -, -, -, -
* Carrots = Carrot, 0, -, 0.05, -, -, -, -, -, -, -
* DeadBush = -, 0, -, 0.05, -, -, -, -, -, 0.05, -
Fire = -, 0, -, 0.05, -, -, -, -, -, -, -
FlowerPot = FlowerPot, 0, -, 0.05, -, -, -, -, -, -, -
* Flowers = -, 0, -, 0.05, -, -, -, -, -, -, -
* Grass = -, 0, -, 0.05, -, -, -, -, -, 0.05, -
* MelonStem = -, 0, -, 0.05, -, -, -, -, -, -, -
* Mushrooms = -, 0, -, 0.05, -, -, -, -, -, -, -
* NetherWart = -, 0, -, 0.05, -, -, -, -, -, -, -
* Potatoes = Potato, 0, -, 0.05, -, -, -, -, -, -, -
* PumpkinStem = -, 0, -, 0.05, -, -, -, -, -, -, -
RedstoneComparator = RedstoneComparator, 0, -, 0.05, -, -, -, -, -, -, -
RedstoneRepeater = RedstoneRepeaterInactive, 0, -, 0.05, -, -, -, -, -, -, -
RedstoneTorch = RedstoneTorchInactive, 0, -, 0.05, -, -, -, -, -, -, -
* RedstoneWire = -, 0, -, 0.05, -, -, -, -, -, -, -
Saplings = Sapling, 0, -, 0.05, -, -, -, -, -, -, -
SlimeBlock = SlimeBlock, 0, -, 0.05, -, -, -, -, -, -, -
SugarCane = SugarCane, 0, -, 0.05, -, -, -, -, -, -, -
Tnt = TNT, 0, -, 0.05, -, -, -, -, -, -, -
Torch = Torch, 0, -, 0.05, -, -, -, -, -, -, -
* Tripwire = -, 0, -, 0.05, -, -, -, -, -, -, -
TripwireHook = TripwireHook, 0, -, 0.05, -, -, -, -, -, -, -
* Wheat = -, 0, -, 0.05, -, -, -, -, -, -, -
10 changes: 5 additions & 5 deletions data/furnace.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,16 @@
#ChainmailLeggings = IronNugget
#Chicken = CookedChicken
#ChorusFruit = PoppedChorusFruit
#Clay = Brick
Clay = Brick
#ClayBlock = HardenedClay
#CoalOre = Coal
CoalOre = Coal
#Cobblestone = Stone
#CrackedStonebrick = Stonebrick
#CyanTerracotta = CyanGlazedTerracotta
#DiamondOre = Diamond
#EmeraldOre = Emerald
#Fish = CookedFish
#GoldOre = GoldIngot
GoldOre = GoldIngot
#GoldAxe = GoldNugget
#GoldBoots = GoldNugget
#GoldChestplate = GoldNugget
Expand All @@ -75,7 +75,7 @@
#GoldSword = GoldNugget
#GrayTerracotta = GrayGlazedTerracotta
#GreenTerracotta = GreenGlazedTerracotta
#IronOre = IronIngot
IronOre = IronIngot
#IronAxe = IronNugget
#IronBoots = IronNugget
#IronChestplate = IronNugget
Expand Down Expand Up @@ -105,7 +105,7 @@ Wood2^-1 = Coal^Charcoal
#RedTerracotta = RedGlazedTerracotta
#RedstoneOre = Redstone
#Salmon = CookedSalmon
#Sand = Glass
Sand = Glass
#StoneBrick = CrackedStoneBricks
#WetSponge = Sponge
#WhiteTerracotta = WhiteGlazedTerracotta
Expand Down
51 changes: 7 additions & 44 deletions src/Common/Engine/Component.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,9 @@ namespace MineCase.Engine
{
internal interface IComponentIntern
{
#if ECS_SERVER
Task
#else
void
#endif
Attach(DependencyObject dependencyObject, ServiceProviderType serviceProvider);
void Attach(DependencyObject dependencyObject, ServiceProviderType serviceProvider);

#if ECS_SERVER
Task
#else
void
#endif
Detach();
void Detach();

int GetMessageOrder(object message);
}
Expand Down Expand Up @@ -58,61 +48,34 @@ public Component(string name)
Name = name;
}

#if ECS_SERVER
Task
#else
void
#endif
IComponentIntern.Attach(DependencyObject dependencyObject, ServiceProviderType serviceProvider)
void IComponentIntern.Attach(DependencyObject dependencyObject, ServiceProviderType serviceProvider)
{
AttachedObject = dependencyObject;
ServiceProvider = serviceProvider;
AttatchPartial(dependencyObject, serviceProvider);
#if ECS_SERVER
return
#endif
OnAttached();
}

partial void AttatchPartial(DependencyObject dependencyObject, ServiceProviderType serviceProvider);

#if ECS_SERVER
Task
#else
void
#endif
IComponentIntern.Detach()
void IComponentIntern.Detach()
{
AttachedObject = null;
#if ECS_SERVER
return
#endif
OnDetached();
AttachedObject = null;
}

/// <summary>
/// 组件被附加到实体时
/// </summary>
protected virtual

#if ECS_SERVER
Task
#else
void
#endif
OnAttached()
protected virtual void OnAttached()
{
#if ECS_SERVER
return Task.CompletedTask;
#endif
}

/// <summary>
/// 组件从实体卸载时
/// </summary>
protected virtual Task OnDetached()
protected virtual void OnDetached()
{
return Task.CompletedTask;
}

/// <summary>
Expand Down
Loading