diff --git a/src/js/net/minecraft/client/inventory/Inventory.js b/src/js/net/minecraft/client/inventory/Inventory.js index 01ddc24..9bf9b5d 100644 --- a/src/js/net/minecraft/client/inventory/Inventory.js +++ b/src/js/net/minecraft/client/inventory/Inventory.js @@ -8,10 +8,11 @@ export default class Inventory { this.items[0] = 1; this.items[1] = 2; this.items[2] = 3; - this.items[3] = 17; - this.items[4] = 18; - this.items[5] = 12; - this.items[6] = 50; + this.items[3] = 5; + this.items[4] = 17; + this.items[5] = 18; + this.items[6] = 12; + this.items[7] = 50; } setItemInSelectedSlot(typeId) { diff --git a/src/js/net/minecraft/client/world/block/BlockRegistry.js b/src/js/net/minecraft/client/world/block/BlockRegistry.js index c19297c..6cd4089 100644 --- a/src/js/net/minecraft/client/world/block/BlockRegistry.js +++ b/src/js/net/minecraft/client/world/block/BlockRegistry.js @@ -1,13 +1,14 @@ -import BlockLog from "./BlockLog.js"; -import BlockStone from "./BlockStone.js"; -import BlockGrass from "./BlockGrass.js"; -import BlockDirt from "./BlockDirt.js"; -import BlockLeave from "./BlockLeave.js"; -import BlockWater from "./BlockWater.js"; -import BlockSand from "./BlockSand.js"; -import BlockTorch from "./BlockTorch.js"; +import BlockLog from "./type/BlockLog.js"; +import BlockStone from "./type/BlockStone.js"; +import BlockGrass from "./type/BlockGrass.js"; +import BlockDirt from "./type/BlockDirt.js"; +import BlockLeave from "./type/BlockLeave.js"; +import BlockWater from "./type/BlockWater.js"; +import BlockSand from "./type/BlockSand.js"; +import BlockTorch from "./type/BlockTorch.js"; import Sound from "./sound/Sound.js"; import Block from "./Block.js"; +import BlockWood from "./type/BlockWood.js"; export class BlockRegistry { @@ -24,6 +25,7 @@ export class BlockRegistry { Block.STONE = new BlockStone(1, 0); Block.GRASS = new BlockGrass(2, 1); Block.DIRT = new BlockDirt(3, 2); + Block.WOOD = new BlockWood(5, 10); Block.LOG = new BlockLog(17, 4); Block.LEAVE = new BlockLeave(18, 6); Block.WATER = new BlockWater(9, 7); diff --git a/src/js/net/minecraft/client/world/block/BlockDirt.js b/src/js/net/minecraft/client/world/block/type/BlockDirt.js similarity index 84% rename from src/js/net/minecraft/client/world/block/BlockDirt.js rename to src/js/net/minecraft/client/world/block/type/BlockDirt.js index 7c56ae9..ecefd54 100644 --- a/src/js/net/minecraft/client/world/block/BlockDirt.js +++ b/src/js/net/minecraft/client/world/block/type/BlockDirt.js @@ -1,4 +1,4 @@ -import Block from "./Block.js"; +import Block from "../Block.js"; export default class BlockDirt extends Block { diff --git a/src/js/net/minecraft/client/world/block/BlockGrass.js b/src/js/net/minecraft/client/world/block/type/BlockGrass.js similarity index 83% rename from src/js/net/minecraft/client/world/block/BlockGrass.js rename to src/js/net/minecraft/client/world/block/type/BlockGrass.js index cf51c46..7e59dbb 100644 --- a/src/js/net/minecraft/client/world/block/BlockGrass.js +++ b/src/js/net/minecraft/client/world/block/type/BlockGrass.js @@ -1,5 +1,5 @@ -import Block from "./Block.js"; -import EnumBlockFace from "../../../util/EnumBlockFace.js"; +import Block from "../Block.js"; +import EnumBlockFace from "../../../../util/EnumBlockFace.js"; export default class BlockGrass extends Block { diff --git a/src/js/net/minecraft/client/world/block/BlockLeave.js b/src/js/net/minecraft/client/world/block/type/BlockLeave.js similarity index 87% rename from src/js/net/minecraft/client/world/block/BlockLeave.js rename to src/js/net/minecraft/client/world/block/type/BlockLeave.js index 256cd1b..3be1dac 100644 --- a/src/js/net/minecraft/client/world/block/BlockLeave.js +++ b/src/js/net/minecraft/client/world/block/type/BlockLeave.js @@ -1,4 +1,4 @@ -import Block from "./Block.js"; +import Block from "../Block.js"; export default class BlockLeave extends Block { diff --git a/src/js/net/minecraft/client/world/block/BlockLog.js b/src/js/net/minecraft/client/world/block/type/BlockLog.js similarity index 89% rename from src/js/net/minecraft/client/world/block/BlockLog.js rename to src/js/net/minecraft/client/world/block/type/BlockLog.js index eb5b2ec..fcfdfd7 100644 --- a/src/js/net/minecraft/client/world/block/BlockLog.js +++ b/src/js/net/minecraft/client/world/block/type/BlockLog.js @@ -1,4 +1,4 @@ -import Block from "./Block.js"; +import Block from "../Block.js"; export default class BlockLog extends Block { diff --git a/src/js/net/minecraft/client/world/block/BlockSand.js b/src/js/net/minecraft/client/world/block/type/BlockSand.js similarity index 84% rename from src/js/net/minecraft/client/world/block/BlockSand.js rename to src/js/net/minecraft/client/world/block/type/BlockSand.js index 9f045dd..d8636d4 100644 --- a/src/js/net/minecraft/client/world/block/BlockSand.js +++ b/src/js/net/minecraft/client/world/block/type/BlockSand.js @@ -1,4 +1,4 @@ -import Block from "./Block.js"; +import Block from "../Block.js"; export default class BlockSand extends Block { diff --git a/src/js/net/minecraft/client/world/block/BlockStone.js b/src/js/net/minecraft/client/world/block/type/BlockStone.js similarity index 79% rename from src/js/net/minecraft/client/world/block/BlockStone.js rename to src/js/net/minecraft/client/world/block/type/BlockStone.js index 2e3cee5..b36cc04 100644 --- a/src/js/net/minecraft/client/world/block/BlockStone.js +++ b/src/js/net/minecraft/client/world/block/type/BlockStone.js @@ -1,4 +1,4 @@ -import Block from "./Block.js"; +import Block from "../Block.js"; export default class BlockStone extends Block { diff --git a/src/js/net/minecraft/client/world/block/BlockTorch.js b/src/js/net/minecraft/client/world/block/type/BlockTorch.js similarity index 91% rename from src/js/net/minecraft/client/world/block/BlockTorch.js rename to src/js/net/minecraft/client/world/block/type/BlockTorch.js index b1abfca..830e0d2 100644 --- a/src/js/net/minecraft/client/world/block/BlockTorch.js +++ b/src/js/net/minecraft/client/world/block/type/BlockTorch.js @@ -1,7 +1,7 @@ -import BoundingBox from "../../../util/BoundingBox.js"; -import Block from "./Block.js"; -import EnumBlockFace from "../../../util/EnumBlockFace.js"; -import BlockRenderType from "../../../util/BlockRenderType.js"; +import BoundingBox from "../../../../util/BoundingBox.js"; +import Block from "../Block.js"; +import EnumBlockFace from "../../../../util/EnumBlockFace.js"; +import BlockRenderType from "../../../../util/BlockRenderType.js"; export default class BlockTorch extends Block { diff --git a/src/js/net/minecraft/client/world/block/BlockWater.js b/src/js/net/minecraft/client/world/block/type/BlockWater.js similarity index 95% rename from src/js/net/minecraft/client/world/block/BlockWater.js rename to src/js/net/minecraft/client/world/block/type/BlockWater.js index a95ea49..a7f27b9 100644 --- a/src/js/net/minecraft/client/world/block/BlockWater.js +++ b/src/js/net/minecraft/client/world/block/type/BlockWater.js @@ -1,4 +1,4 @@ -import Block from "./Block.js"; +import Block from "../Block.js"; export default class BlockWater extends Block { diff --git a/src/js/net/minecraft/client/world/block/type/BlockWood.js b/src/js/net/minecraft/client/world/block/type/BlockWood.js new file mode 100644 index 0000000..e4a0e2a --- /dev/null +++ b/src/js/net/minecraft/client/world/block/type/BlockWood.js @@ -0,0 +1,9 @@ +import Block from "../Block.js"; + +export default class BlockWood extends Block { + + constructor(id, textureSlotId) { + super(id, textureSlotId); + } + +} \ No newline at end of file diff --git a/src/resources/terrain/terrain.png b/src/resources/terrain/terrain.png index 23f3947..f2aea4d 100644 Binary files a/src/resources/terrain/terrain.png and b/src/resources/terrain/terrain.png differ