implement hotbar

This commit is contained in:
LabyStudio
2022-02-04 12:26:02 +01:00
parent 0cf779936e
commit c2262a43ff
9 changed files with 111 additions and 8 deletions
+13
View File
@@ -3,6 +3,7 @@ window.GameWindow = class {
constructor(minecraft, canvasWrapperId) {
this.minecraft = minecraft;
this.canvasWrapperId = canvasWrapperId;
this.renderer = null;
this.mouseMotionX = 0;
this.mouseMotionY = 0;
@@ -46,6 +47,12 @@ window.GameWindow = class {
}
}, false);
// Mouse scroll
document.addEventListener('wheel', function (event) {
let delta = Math.sign(event.deltaY);
minecraft.onMouseScroll(delta);
}, false);
// Keyboard interaction with screen
window.addEventListener('keydown', function (event) {
if (!(minecraft.currentScreen === null)) {
@@ -59,6 +66,8 @@ window.GameWindow = class {
} else if (event.code === 'Escape') {
event.preventDefault();
minecraft.displayScreen(new GuiIngameMenu());
} else {
minecraft.onKeyPressed(event.code);
}
});
@@ -105,6 +114,10 @@ window.GameWindow = class {
this.width = this.width / this.scaleFactor;
this.height = this.height / this.scaleFactor;
if (!(this.renderer === null)) {
this.renderer.webRenderer.setPixelRatio(/*this.minecraft.currentScreen === null ? 1 :*/ 1 / this.scaleFactor);
}
}
onResize() {
+21 -5
View File
@@ -32,7 +32,7 @@ window.Minecraft = class {
// Create player
this.player = new Player(this, this.world);
this.pickedBlock = 1;
this.inventory = new Inventory();
// Initialize
this.init();
@@ -112,12 +112,13 @@ window.Minecraft = class {
// Switch screen
this.currentScreen = screen;
// Update window size
this.window.updateWindowSize();
// Initialize new screen
if (screen === null) {
this.worldRenderer.webRenderer.setPixelRatio(1);
this.window.requestFocus();
} else {
this.worldRenderer.webRenderer.setPixelRatio(1 / this.window.scaleFactor);
screen.setup(this, this.window.width, this.window.height);
}
}
@@ -142,6 +143,14 @@ window.Minecraft = class {
}
}
onKeyPressed(button) {
for (let i = 1; i <= 9; i++) {
if (button === 'Digit' + i) {
this.inventory.selectedSlotIndex = i - 1;
}
}
}
onMouseClicked(button) {
if (this.window.mouseLocked) {
let hitResult = this.player.rayTrace(5, this.timer.partialTicks);
@@ -158,7 +167,7 @@ window.Minecraft = class {
if (hitResult != null) {
let typeId = this.world.getBlockAt(hitResult.x, hitResult.y, hitResult.z);
if (typeId !== 0) {
this.pickedBlock = typeId;
this.inventory.setItemInSelectedSlot(typeId);
}
}
}
@@ -174,11 +183,18 @@ window.Minecraft = class {
// Don't place blocks if the player is standing there
if (!placedBoundingBox.intersects(this.player.boundingBox)) {
this.world.setBlockAt(x, y, z, this.pickedBlock);
let typeId = this.inventory.getItemInSelectedSlot();
if (typeId !== 0) {
this.world.setBlockAt(x, y, z, typeId);
}
}
}
}
}
}
onMouseScroll(delta) {
this.inventory.shiftSelectedSlot(delta);
}
}
+18
View File
@@ -39,6 +39,24 @@ window.Gui = class {
stack.restore();
}
renderBlock(stack, texture, block, x, y) {
stack.save();
stack.translate(x + 3, y + 3);
this.renderBlockFace(stack, texture, block, EnumBlockFace.NORTH);
stack.restore();
}
renderBlockFace(stack, texture, block, face) {
// UV Mapping
let textureIndex = block.getTextureForFace(face);
let minU = (textureIndex % 16) / 16.0;
let minV = Math.floor(textureIndex / 16) / 16.0;
stack.save();
this.drawSprite(stack, texture, minU * 256, minV, 16, 16, 0, 0, 16, 16)
stack.restore();
}
static drawSprite(stack, texture, spriteX, spriteY, spriteWidth, spriteHeight, x, y, width, height, alpha = 1.0) {
stack.save();
stack.globalAlpha = alpha;
@@ -6,12 +6,16 @@ window.IngameOverlay = class extends Gui {
this.window = window;
this.textureCrosshair = Gui.loadTexture("icons.png");
this.textureHotbar = Gui.loadTexture("gui.png");
this.textureTerrain = Gui.loadTexture("terrain.png");
}
render(stack, mouseX, mouseY, partialTicks) {
if (this.minecraft.hasInGameFocus()) {
this.renderCrosshair(stack, this.window.width / 2, this.window.height / 2)
}
this.renderHotbar(stack, this.window.width / 2 - 100, this.window.height - 22);
}
renderCrosshair(stack, x, y) {
@@ -19,4 +23,29 @@ window.IngameOverlay = class extends Gui {
this.drawSprite(stack, this.textureCrosshair, 0, 0, 15, 15, x - size / 2, y - size / 2, size, size, 0.6);
}
renderHotbar(stack, x, y) {
this.drawSprite(stack, this.textureHotbar, 0, 0, 200, 22, x, y, 200, 22)
this.drawSprite(
stack,
this.textureHotbar,
0, 22,
24, 24,
x + this.minecraft.inventory.selectedSlotIndex * 20, y - 1,
24, 24
)
for (let i = 0; i < 9; i++) {
let typeId = this.minecraft.inventory.getItemInSlot(i);
if (typeId !== 0) {
this.renderBlock(
stack,
this.textureTerrain, Block.getById(typeId),
x + i * 20,
y
);
}
}
}
}
@@ -18,7 +18,7 @@ window.GuiIngameMenu = class extends GuiScreen {
this.drawRect(stack, 0, 0, this.width, this.height, 'black', 0.6);
// Title
this.drawCenteredString(stack, "Game paused", this.width / 2, 50);
this.drawCenteredString(stack, "Game menu", this.width / 2, 50);
super.drawScreen(stack, mouseX, mouseY, partialTicks);
}
@@ -15,7 +15,7 @@ window.GuiButton = class extends Gui {
render(stack, mouseX, mouseY, partialTicks) {
let mouseOver = this.isMouseOver(mouseX, mouseY);
this.drawSprite(stack, GuiButton.textureGui, 0, mouseOver ? 40 : 20, 200, 20, this.x, this.y, this.width, this.height);
this.drawSprite(stack, GuiButton.textureGui, 0, 66 + (mouseOver ? 20 : 0), 200, 20, this.x, this.y, this.width, this.height);
this.drawCenteredString(stack, this.string, this.x + this.width / 2, this.y + this.height / 2 - 5);
}
@@ -0,0 +1,27 @@
window.Inventory = class {
constructor() {
this.selectedSlotIndex = 0;
this.items = [];
}
setItemInSelectedSlot(typeId) {
this.items[this.selectedSlotIndex] = typeId;
}
getItemInSelectedSlot() {
return this.getItemInSlot(this.selectedSlotIndex);
}
shiftSelectedSlot(offset) {
if (this.selectedSlotIndex + offset < 0) {
this.selectedSlotIndex = 9 + (this.selectedSlotIndex + offset);
} else {
this.selectedSlotIndex = (this.selectedSlotIndex + offset) % 9;
}
}
getItemInSlot(slot) {
return this.items.hasOwnProperty(slot) ? this.items[slot] : 0;
}
}
@@ -135,5 +135,4 @@ window.BlockRenderer = class {
// Calculate the average light level of all surrounding blocks
return totalBlocks === 0 ? 0 : totalLightLevel / totalBlocks;
}
}
+1
View File
@@ -83,6 +83,7 @@ loadScripts([
"src/js/net/minecraft/client/world/generator/noise/NoiseGeneratorCombined.js",
"src/js/net/minecraft/client/world/generator/WorldGenerator.js",
"src/js/net/minecraft/client/entity/Player.js",
"src/js/net/minecraft/client/inventory/Inventory.js",
"src/js/net/minecraft/client/Minecraft.js",
"src/js/net/minecraft/client/render/FontRenderer.js",
"src/js/net/minecraft/client/render/Tessellator.js",