trafficlunar/blockmatic
1
0
Fork 0
mirror of https://github.com/trafficlunar/blockmatic.git synced 2026-06-28 14:44:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: update data to 1.21.4

Browse source
This commit is contained in:
trafficlunar 2024-12-27 20:29:19 +00:00
parent a5bea3b585
commit e4719200d3
19 changed files with 3281 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/canvas/Blocks.tsx
View file

@ -5,6 +5,7 @@ import * as PIXI from "pixi.js";
import { useApp } from "@pixi/react";
import { CompositeTilemap, settings } from "@pixi/tilemap";
import { getBlockData } from "@/utils/getBlockData";
import { findBlockFromRgb } from "@/utils/findBlockFromRgb";
interface Props {
@ -17,16 +18,19 @@ interface Props {
imageDimensions: Dimension;
coords: Position;
scale: number;
version: number;
setLoading: React.Dispatch<React.SetStateAction<boolean>>;
}
// Lifts 16,000 tiles limit
settings.use32bitIndex = true;
function Blocks({ blocks, setBlocks, missingTexture, textures, solidTextures, image, imageDimensions, coords, scale, setLoading }: Props) {
function Blocks({ blocks, setBlocks, missingTexture, textures, solidTextures, image, imageDimensions, coords, scale, version, setLoading }: Props) {
const app = useApp();
const tilemapRef = useRef<CompositeTilemap>();
const blockData = getBlockData(version);
const tileBlocks = () => {
if (!tilemapRef.current) return;
const tilemap = tilemapRef.current;
@ -80,7 +84,7 @@ function Blocks({ blocks, setBlocks, missingTexture, textures, solidTextures, im
const newBlocks: Block[] = [];
for (let i = 0; i < imageData.data.length; i += 4) {
const block = findBlockFromRgb(imageData.data[i], imageData.data[i + 1], imageData.data[i + 2], imageData.data[i + 3]);
const block = findBlockFromRgb(blockData, imageData.data[i], imageData.data[i + 1], imageData.data[i + 2], imageData.data[i + 3]);
const x = Math.floor((i / 4) % imageData.width);
const y = Math.floor(i / 4 / imageData.width);

3
src/components/canvas/Canvas.tsx
View file

@ -25,7 +25,7 @@ import welcomeBlocksData from "@/data/welcome.json";
PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST;
function Canvas() {
const { stageSize, canvasSize, blocks, coords, scale, setStageSize, setBlocks, setCoords, setScale } = useContext(CanvasContext);
const { stageSize, canvasSize, blocks, coords, scale, version, setStageSize, setBlocks, setCoords, setScale } = useContext(CanvasContext);
const { image, imageDimensions } = useContext(ImageContext);
const { setLoading } = useContext(LoadingContext);
const { settings } = useContext(SettingsContext);
@ -301,6 +301,7 @@ function Canvas() {
imageDimensions={imageDimensions}
coords={coords}
scale={scale}
version={version}
setLoading={setLoading}
/>

2
src/components/canvas/information/Cursor.tsx
View file

@ -1,7 +1,7 @@
import { CanvasContext } from "@/context/Canvas";
import { useContext, useEffect, useState } from "react";
import _blockData from "@/data/blocks/programmer-art/data.json";
import _blockData from "@/data/blocks/data.json";
const blockData: BlockData = _blockData;
interface Props {