diff --git a/.github/workflows/optimize.yml b/.github/workflows/optimize.yml new file mode 100644 index 0000000..bd880f8 --- /dev/null +++ b/.github/workflows/optimize.yml @@ -0,0 +1,15 @@ +name: Optimize resource pack +on: [push] +jobs: + packsquash: + name: Optimize resource pack + runs-on: ubuntu-latest + steps: + - name: Clone repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 # A non-shallow repository clone is required + - name: Run PackSquash + uses: ComunidadAylas/PackSquash-action@v4 + with: + packsquash_version: latest # Uses the latest PackSquash release supported by the action \ No newline at end of file diff --git a/.github/workflows/upload.yml b/.github/workflows/upload.yml new file mode 100644 index 0000000..f29b246 --- /dev/null +++ b/.github/workflows/upload.yml @@ -0,0 +1,56 @@ +name: 'Upload Resource Pack' +on: + workflow_dispatch: + inputs: + resource_pack_url: + description: 'Resource Pack URL' + required: true + default: '' + resource_pack_hash: + description: 'Resource Pack Hash' + required: true + default: '' + +jobs: + upload: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Install SSH client and sshpass + run: sudo apt-get update && sudo apt-get install -y openssh-client sshpass + + - name: Download server.properties + env: + SSH_USERNAME: ${{ secrets.SSH_USERNAME }} + SSH_DOMAIN: ${{ secrets.SSH_DOMAIN }} + SSH_PORT: ${{ secrets.SSH_PORT }} + SSH_PASSWORD: ${{ secrets.SSH_PASSWORD }} + run: | + sshpass -p $SSH_PASSWORD sftp -o StrictHostKeyChecking=no -P $SSH_PORT $SSH_USERNAME@$SSH_DOMAIN << EOF + get server.properties server.properties + bye + EOF + + - name: Update server.properties + env: + RESOURCE_PACK_URL: ${{ github.event.inputs.resource_pack_url }} + RESOURCE_PACK_HASH: ${{ github.event.inputs.resource_pack_hash }} + run: | + sed -i "s|^resource-pack=.*|resource-pack=${RESOURCE_PACK_URL}|" server.properties + sed -i "s|^resource-pack-sha1=.*|resource-pack-sha1=${RESOURCE_PACK_HASH}|" server.properties + + - name: Upload server.properties + env: + SSH_USERNAME: ${{ secrets.SSH_USERNAME }} + SSH_DOMAIN: ${{ secrets.SSH_DOMAIN }} + SSH_PORT: ${{ secrets.SSH_PORT }} + SSH_PASSWORD: ${{ secrets.SSH_PASSWORD }} + run: | + sshpass -p $SSH_PASSWORD sftp -o StrictHostKeyChecking=no -P $SSH_PORT $SSH_USERNAME@$SSH_DOMAIN << EOF + put server.properties server.properties + bye + EOF \ No newline at end of file diff --git a/assets/cmbminigames/models/cosmetic/shark.json b/assets/cmbminigames/models/cosmetic/shark.json new file mode 100644 index 0000000..d3afa78 --- /dev/null +++ b/assets/cmbminigames/models/cosmetic/shark.json @@ -0,0 +1,497 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "3": "cmbminigames:block/cosmetic/shark/texture" + }, + "elements": [ + { + "from": [5.7, 9.8, 4.3], + "to": [9.7, 13.3, 12.8], + "rotation": {"angle": 0, "axis": "y", "origin": [6.7, 4.9, 10.1]}, + "faces": { + "north": {"uv": [2, 3.375, 2.5, 3.75], "texture": "#3"}, + "east": {"uv": [5.625, 7, 6.625, 7.375], "texture": "#3"}, + "west": {"uv": [6.625, 7, 7.625, 7.375], "texture": "#3"}, + "down": {"uv": [3, 6.375, 2.5, 7.375], "texture": "#3"} + } + }, + { + "from": [6.2, 9.5, 3.4], + "to": [9.2, 14.2, 13.3], + "rotation": {"angle": 0, "axis": "y", "origin": [6.7, 4.9, 11.1]}, + "faces": { + "north": {"uv": [2.5, 7.375, 2.875, 8], "texture": "#3"}, + "east": {"uv": [6.125, 2, 7.375, 2.625], "texture": "#3"}, + "south": {"uv": [7.375, 2.5, 7.75, 3.125], "texture": "#3"}, + "west": {"uv": [6.125, 2.625, 7.375, 3.25], "texture": "#3"}, + "up": {"uv": [5.625, 7.75, 5.25, 6.5], "texture": "#3"}, + "down": {"uv": [7.25, 4.125, 6.875, 5.375], "texture": "#3"} + } + }, + { + "from": [6.6, 8.3, 3.3], + "to": [8.7, 15.1, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [6.7, 4.9, 11.1]}, + "faces": { + "north": {"uv": [1.375, 7.25, 1.625, 8.125], "texture": "#3"}, + "east": {"uv": [4.5, 5.625, 5.875, 6.5], "texture": "#3"}, + "south": {"uv": [0.25, 7.5, 0.5, 8.375], "texture": "#3"}, + "west": {"uv": [5.75, 3.25, 7.125, 4.125], "texture": "#3"}, + "up": {"uv": [2.5, 8.375, 2.25, 7], "texture": "#3"}, + "down": {"uv": [0.25, 7.25, 0, 8.625], "texture": "#3"} + } + }, + { + "from": [7, 7.1, 3.6], + "to": [8.2, 15.4, 14.7], + "rotation": {"angle": 0, "axis": "y", "origin": [6.7, 4.9, 11.1]}, + "faces": { + "north": {"uv": [3, 7.75, 3.125, 8.75], "texture": "#3"}, + "east": {"uv": [4.625, 1.375, 6, 2.375], "texture": "#3"}, + "south": {"uv": [3.125, 7.75, 3.25, 8.75], "texture": "#3"}, + "west": {"uv": [4.5, 4.625, 5.875, 5.625], "texture": "#3"}, + "up": {"uv": [4.5, 8.875, 4.375, 7.5], "texture": "#3"}, + "down": {"uv": [1.75, 7.625, 1.625, 9], "texture": "#3"} + } + }, + { + "from": [7.1, 14.85, 4.45], + "to": [8.1, 19.15, 14.65], + "rotation": {"angle": -22.5, "axis": "x", "origin": [7.6, 15.25, 13.4]}, + "faces": { + "north": {"uv": [5.75, 4.125, 5.875, 4.625], "texture": "#3"}, + "east": {"uv": [4, 6.5, 5.25, 7], "texture": "#3"}, + "south": {"uv": [5.625, 6.5, 5.75, 7], "texture": "#3"}, + "west": {"uv": [6.875, 0, 8.125, 0.5], "texture": "#3"}, + "up": {"uv": [1.875, 8.875, 1.75, 7.625], "texture": "#3"}, + "down": {"uv": [2, 7.625, 1.875, 8.875], "texture": "#3"} + } + }, + { + "from": [7.3, 10.8664, 5.9887], + "to": [7.9, 16.2664, 16.0887], + "rotation": {"angle": -45, "axis": "x", "origin": [7.6, 14.1664, 11.0387]}, + "faces": { + "east": {"uv": [1.25, 6.375, 2.5, 7], "texture": "#3"}, + "west": {"uv": [5.875, 6.375, 7.125, 7], "texture": "#3"} + } + }, + { + "from": [7.1, 11.54213, 14.31296], + "to": [8.1, 17.54213, 16.31296], + "rotation": {"angle": 22.5, "axis": "x", "origin": [7.6, 14.84213, 11.26296]}, + "faces": { + "north": {"uv": [2.5, 8, 2.625, 8.75], "texture": "#3"}, + "east": {"uv": [3.5, 7.5, 3.75, 8.25], "texture": "#3"}, + "south": {"uv": [2.625, 8, 2.75, 8.75], "texture": "#3"}, + "west": {"uv": [3.75, 7.5, 4, 8.25], "texture": "#3"}, + "up": {"uv": [3.5, 5, 3.375, 4.75], "texture": "#3"} + } + }, + { + "from": [7.2, 15.4, 13], + "to": [8, 19.3, 17], + "rotation": {"angle": 0, "axis": "y", "origin": [7.6, 18.3, 14.1]}, + "faces": { + "east": {"uv": [4, 5.875, 4.5, 6.375], "texture": "#3"}, + "south": {"uv": [1.5, 8.125, 1.625, 8.625], "texture": "#3"}, + "west": {"uv": [3, 7.25, 3.5, 7.75], "texture": "#3"}, + "up": {"uv": [6.375, 8.625, 6.25, 8.125], "texture": "#3"}, + "down": {"uv": [6.5, 8.125, 6.375, 8.625], "texture": "#3"} + } + }, + { + "from": [3.6, 6.2, 3.1], + "to": [11.6, 8.3, 12.2], + "rotation": {"angle": 0, "axis": "y", "origin": [6.6, 12.1, 5.1]}, + "faces": { + "north": {"uv": [3.5, 7.25, 4.5, 7.5], "texture": "#3"}, + "south": {"uv": [7.25, 4, 8.25, 4.25], "texture": "#3"}, + "up": {"uv": [6.875, 1.125, 5.875, 0], "texture": "#3"} + } + }, + { + "from": [2.6, 12.8, 2.6], + "to": [12.6, 13.8, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [6.6, 12.1, 5.1]}, + "faces": { + "north": {"uv": [7.75, 2.5, 9, 2.625], "texture": "#3"}, + "east": {"uv": [7.625, 7, 9, 7.125], "texture": "#3"}, + "south": {"uv": [7.75, 2.625, 9, 2.75], "texture": "#3"}, + "west": {"uv": [7.125, 7.625, 8.5, 7.75], "texture": "#3"}, + "up": {"uv": [5.75, 4.625, 4.5, 3.25], "texture": "#3"} + } + }, + { + "from": [2.6, 6.8, 12.7], + "to": [12.6, 13.6, 14.1], + "rotation": {"angle": 0, "axis": "y", "origin": [6.6, 12.1, 5.1]}, + "faces": { + "north": {"uv": [6, 1.125, 7.25, 2], "texture": "#3"}, + "east": {"uv": [3.25, 7.75, 3.375, 8.625], "texture": "#3"}, + "south": {"uv": [0, 6.125, 1.25, 7], "texture": "#3"}, + "west": {"uv": [3.375, 7.75, 3.5, 8.625], "texture": "#3"}, + "up": {"uv": [9, 2.875, 7.75, 2.75], "texture": "#3"}, + "down": {"uv": [9, 2.875, 7.75, 3], "texture": "#3"} + } + }, + { + "from": [2.4, 6.8, 2.5], + "to": [3.5, 13.6, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [6.6, 12.1, 5.1]}, + "faces": { + "north": {"uv": [0.75, 7.875, 0.875, 8.75], "texture": "#3"}, + "east": {"uv": [4.625, 2.375, 6.125, 3.25], "texture": "#3"}, + "south": {"uv": [0.875, 7.875, 1, 8.75], "texture": "#3"}, + "west": {"uv": [3, 5, 4.5, 5.875], "texture": "#3"}, + "up": {"uv": [1.375, 9, 1.25, 7.5], "texture": "#3"}, + "down": {"uv": [4.125, 7.5, 4, 9], "texture": "#3"} + } + }, + { + "from": [11.7, 6.8, 2.5], + "to": [12.8, 13.6, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [6.6, 12.1, 5.1]}, + "faces": { + "north": {"uv": [1, 7.875, 1.125, 8.75], "texture": "#3"}, + "east": {"uv": [0, 5.25, 1.5, 6.125], "texture": "#3"}, + "south": {"uv": [1.125, 7.875, 1.25, 8.75], "texture": "#3"}, + "west": {"uv": [1.5, 5.5, 3, 6.375], "texture": "#3"}, + "up": {"uv": [4.25, 9, 4.125, 7.5], "texture": "#3"}, + "down": {"uv": [4.375, 7.5, 4.25, 9], "texture": "#3"} + } + }, + { + "from": [3.6, 12.1, 3.1], + "to": [11.6, 14.1, 12.2], + "rotation": {"angle": 0, "axis": "y", "origin": [6.6, 12.1, 5.1]}, + "faces": { + "north": {"uv": [7.25, 4.25, 8.25, 4.5], "texture": "#3"}, + "east": {"uv": [7.125, 3.75, 8.25, 4], "texture": "#3"}, + "south": {"uv": [7.25, 4.5, 8.25, 4.75], "texture": "#3"}, + "west": {"uv": [7.125, 6.375, 8.25, 6.625], "texture": "#3"}, + "up": {"uv": [6.875, 5.25, 5.875, 4.125], "texture": "#3"} + } + }, + { + "from": [3.6, 5.3, -0.3], + "to": [11.6, 7.4, 13.8], + "rotation": {"angle": 0, "axis": "y", "origin": [6.6, 11.2, 5.1]}, + "faces": { + "north": {"uv": [7.25, 4.75, 8.25, 5], "texture": "#3"}, + "east": {"uv": [6.875, 5.375, 8.625, 5.625], "texture": "#3"}, + "south": {"uv": [7.25, 5, 8.25, 5.25], "texture": "#3"}, + "west": {"uv": [6.875, 5.625, 8.625, 5.875], "texture": "#3"}, + "down": {"uv": [3, 3.75, 2, 5.5], "texture": "#3"} + } + }, + { + "from": [2.6, 6.2, -0.7], + "to": [12.6, 7.4, 13.9], + "rotation": {"angle": 0, "axis": "y", "origin": [6.6, 11.2, 5.1]}, + "faces": { + "north": {"uv": [7.75, 3, 9, 3.125], "texture": "#3"}, + "east": {"uv": [7.125, 6.875, 9, 7], "texture": "#3"}, + "south": {"uv": [4.625, 7.75, 5.875, 7.875], "texture": "#3"}, + "west": {"uv": [7.25, 5.25, 9.125, 5.375], "texture": "#3"}, + "up": {"uv": [1.25, 1.875, 0, 0], "texture": "#3"}, + "down": {"uv": [2.5, 0, 1.25, 1.875], "texture": "#3"} + } + }, + { + "from": [3.6, 6.8, -1], + "to": [11.6, 8, 13.8], + "rotation": {"angle": 0, "axis": "y", "origin": [6.6, 11.2, 5.1]}, + "faces": { + "up": {"uv": [3.5, 1.875, 2.5, 0], "texture": "#3"} + } + }, + { + "from": [4.9, 11.2, -2], + "to": [10.3, 13, 2.9], + "rotation": {"angle": 0, "axis": "y", "origin": [6.6, 10.8, -3.9]}, + "faces": { + "north": {"uv": [5.875, 7.75, 6.5, 8], "texture": "#3"}, + "east": {"uv": [6.5, 7.75, 7.125, 8], "texture": "#3"}, + "south": {"uv": [7.125, 7.75, 7.75, 8], "texture": "#3"}, + "west": {"uv": [7.75, 7.75, 8.375, 8], "texture": "#3"}, + "up": {"uv": [2.25, 7.625, 1.625, 7], "texture": "#3"}, + "down": {"uv": [5.25, 7, 4.625, 7.625], "texture": "#3"} + } + }, + { + "from": [5.9, 10.9, -2.5], + "to": [9.3, 12.7, -0.5], + "rotation": {"angle": 0, "axis": "y", "origin": [6.6, 10.8, -3.9]}, + "faces": { + "north": {"uv": [3, 4.75, 3.375, 5], "texture": "#3"}, + "east": {"uv": [1.25, 6.125, 1.5, 6.375], "texture": "#3"}, + "south": {"uv": [1.5, 5.25, 1.875, 5.5], "texture": "#3"}, + "west": {"uv": [6.5, 8.125, 6.75, 8.375], "texture": "#3"}, + "up": {"uv": [5.875, 8.375, 5.5, 8.125], "texture": "#3"}, + "down": {"uv": [6.25, 8.125, 5.875, 8.375], "texture": "#3"} + } + }, + { + "from": [3.2, 11.5, 0.8], + "to": [12.3, 13.6, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [6.6, 12.1, 5.1]}, + "faces": { + "north": {"uv": [7.125, 6.625, 8.25, 6.875], "texture": "#3"}, + "east": {"uv": [0, 7, 1.625, 7.25], "texture": "#3"}, + "west": {"uv": [3, 7, 4.625, 7.25], "texture": "#3"}, + "up": {"uv": [4.625, 1.625, 3.5, 0], "texture": "#3"}, + "down": {"uv": [4.625, 1.625, 3.5, 3.25], "texture": "#3"} + } + }, + { + "from": [3.7, 11.3, -0.8], + "to": [11.5, 13.3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [6.6, 12.1, 5.1]}, + "faces": { + "north": {"uv": [7.375, 2, 8.375, 2.25], "texture": "#3"}, + "east": {"uv": [6.875, 0.5, 8.75, 0.75], "texture": "#3"}, + "west": {"uv": [6.875, 0.75, 8.75, 1], "texture": "#3"}, + "up": {"uv": [1, 5.25, 0, 3.375], "texture": "#3"}, + "down": {"uv": [2, 3.375, 1, 5.25], "texture": "#3"} + } + }, + { + "from": [11.4, 6.9, -0.6], + "to": [12.5, 8.3, 13.8], + "rotation": {"angle": 0, "axis": "y", "origin": [6.6, 11.2, 5.1]}, + "faces": { + "north": {"uv": [6, 2.25, 6.125, 2.375], "texture": "#3"}, + "east": {"uv": [5.625, 7.5, 7.375, 7.625], "texture": "#3"}, + "west": {"uv": [7.375, 7.5, 9.125, 7.625], "texture": "#3"}, + "up": {"uv": [4.625, 9, 4.5, 7.25], "texture": "#3"} + } + }, + { + "from": [2.7, 6.3, -0.6], + "to": [3.8, 8.3, 13.8], + "rotation": {"angle": 0, "axis": "y", "origin": [6.6, 11.2, 5.1]}, + "faces": { + "north": {"uv": [5.875, 1.125, 6, 1.375], "texture": "#3"}, + "east": {"uv": [6.875, 5.875, 8.625, 6.125], "texture": "#3"}, + "west": {"uv": [6.875, 6.125, 8.625, 6.375], "texture": "#3"}, + "up": {"uv": [0.625, 9.25, 0.5, 7.5], "texture": "#3"} + } + }, + { + "from": [2.8, 7.4, 0.8], + "to": [3.7, 8.9, 2.3], + "rotation": {"angle": -45, "axis": "x", "origin": [3.15, 8.15, 1.55]}, + "faces": { + "east": {"uv": [4, 6.375, 4.25, 6.5], "texture": "#3"}, + "south": {"uv": [5.125, 7.625, 5.25, 7.75], "texture": "#3"}, + "west": {"uv": [4.25, 6.375, 4.5, 6.5], "texture": "#3"}, + "up": {"uv": [8.375, 3.75, 8.25, 3.5], "texture": "#3"} + } + }, + { + "from": [2.8, 7.4, -0.4], + "to": [3.7, 8.4, 0.4], + "rotation": {"angle": -45, "axis": "x", "origin": [3.15, 8.15, -0.35]}, + "faces": { + "east": {"uv": [5.375, 8.25, 5.5, 8.375], "texture": "#3"}, + "south": {"uv": [8.375, 1.25, 8.5, 1.375], "texture": "#3"}, + "west": {"uv": [8.375, 1.375, 8.5, 1.5], "texture": "#3"}, + "up": {"uv": [8.5, 1.625, 8.375, 1.5], "texture": "#3"} + } + }, + { + "from": [11.5, 7.4, -0.4], + "to": [12.4, 8.4, 0.4], + "rotation": {"angle": -45, "axis": "x", "origin": [11.85, 8.15, -0.35]}, + "faces": { + "east": {"uv": [8.375, 1.875, 8.5, 2], "texture": "#3"}, + "south": {"uv": [8.375, 2, 8.5, 2.125], "texture": "#3"}, + "west": {"uv": [8.375, 2.125, 8.5, 2.25], "texture": "#3"}, + "up": {"uv": [2.375, 8.5, 2.25, 8.375], "texture": "#3"} + } + }, + { + "from": [11.5, 7.4, 0.8], + "to": [12.4, 8.9, 2.3], + "rotation": {"angle": -45, "axis": "x", "origin": [11.85, 8.15, 1.55]}, + "faces": { + "east": {"uv": [6.875, 1, 7.125, 1.125], "texture": "#3"}, + "south": {"uv": [8.375, 2.375, 8.5, 2.5], "texture": "#3"}, + "west": {"uv": [4.625, 7.625, 4.875, 7.75], "texture": "#3"}, + "up": {"uv": [8.375, 4, 8.25, 3.75], "texture": "#3"} + } + }, + { + "from": [3.2, 6.7, -1.2], + "to": [12, 8.2, 0.3], + "rotation": {"angle": 0, "axis": "y", "origin": [6.6, 11.2, 5.1]}, + "faces": { + "south": {"uv": [4.625, 8, 5.75, 8.125], "texture": "#3"}, + "up": {"uv": [8.375, 1.25, 7.25, 1], "texture": "#3"} + } + }, + { + "from": [3.1, 6.7, -1.8], + "to": [12.1, 8.4, -0.4], + "rotation": {"angle": 0, "axis": "y", "origin": [6.6, 11.2, 5.1]}, + "faces": { + "north": {"uv": [7.25, 1.5, 8.375, 1.75], "texture": "#3"}, + "east": {"uv": [8.25, 4.125, 8.375, 4.375], "texture": "#3"}, + "south": {"uv": [7.25, 1.75, 8.375, 2], "texture": "#3"}, + "west": {"uv": [8.25, 4.375, 8.375, 4.625], "texture": "#3"}, + "up": {"uv": [6.875, 8.125, 5.75, 8], "texture": "#3"}, + "down": {"uv": [8, 8, 6.875, 8.125], "texture": "#3"} + } + }, + { + "from": [3.6, 7.3, -1.7], + "to": [5.5, 9.2, -0.6], + "rotation": {"angle": -45, "axis": "z", "origin": [4.75, 8.05, -1.35]}, + "faces": { + "north": {"uv": [6.75, 8.125, 7, 8.375], "texture": "#3"}, + "south": {"uv": [7, 8.125, 7.25, 8.375], "texture": "#3"}, + "west": {"uv": [8.25, 4.625, 8.375, 4.875], "texture": "#3"}, + "up": {"uv": [5, 8.375, 4.75, 8.25], "texture": "#3"} + } + }, + { + "from": [9.4, 7.3, -1.7], + "to": [11.3, 9.2, -0.6], + "rotation": {"angle": -45, "axis": "z", "origin": [10.55, 8.05, -1.35]}, + "faces": { + "north": {"uv": [7.25, 8.125, 7.5, 8.375], "texture": "#3"}, + "south": {"uv": [7.5, 8.125, 7.75, 8.375], "texture": "#3"}, + "west": {"uv": [8.25, 5, 8.375, 5.25], "texture": "#3"}, + "up": {"uv": [5.375, 8.375, 5.125, 8.25], "texture": "#3"} + } + }, + { + "from": [6.55, 7.92071, -1.57574], + "to": [7.75, 9.02071, -0.67574], + "rotation": {"angle": -45, "axis": "z", "origin": [6.85, 8.72071, -1.12574]}, + "faces": { + "north": {"uv": [8.375, 3.5, 8.5, 3.625], "texture": "#3"}, + "south": {"uv": [8.375, 3.75, 8.5, 3.875], "texture": "#3"}, + "west": {"uv": [8.375, 3.875, 8.5, 4], "texture": "#3"}, + "up": {"uv": [8.5, 4.25, 8.375, 4.125], "texture": "#3"} + } + }, + { + "from": [8.05, 7.92071, -1.57574], + "to": [9.25, 9.02071, -0.67574], + "rotation": {"angle": -45, "axis": "z", "origin": [8.35, 8.72071, -1.12574]}, + "faces": { + "north": {"uv": [8.375, 4.375, 8.5, 4.5], "texture": "#3"}, + "south": {"uv": [8.375, 4.625, 8.5, 4.75], "texture": "#3"}, + "west": {"uv": [4.75, 8.375, 4.875, 8.5], "texture": "#3"}, + "up": {"uv": [8.5, 4.875, 8.375, 4.75], "texture": "#3"} + } + }, + { + "from": [10.23536, 10.7818, 1.27426], + "to": [11.13536, 11.8818, 2.47426], + "rotation": {"angle": 45, "axis": "x", "origin": [10.68536, 11.3318, 1.87426]}, + "faces": { + "east": {"uv": [5.125, 8.375, 5.25, 8.5], "texture": "#3"}, + "south": {"uv": [8.375, 5.125, 8.5, 5.25], "texture": "#3"}, + "west": {"uv": [5.25, 8.375, 5.375, 8.5], "texture": "#3"}, + "up": {"uv": [5.5, 8.5, 5.375, 8.375], "texture": "#3"}, + "down": {"uv": [5.625, 8.375, 5.5, 8.5], "texture": "#3"} + } + }, + { + "from": [3.1, 11.7, -0.2], + "to": [5.1, 13.1, 1.8], + "rotation": {"angle": 0, "axis": "y", "origin": [3.1, 11.2, -0.2]}, + "faces": { + "north": {"uv": [8.25, 6.5, 8.5, 6.625], "texture": "#3"}, + "south": {"uv": [8.25, 6.75, 8.5, 6.875], "texture": "#3"}, + "west": {"uv": [8.25, 8.125, 8.5, 8.25], "texture": "#3"}, + "up": {"uv": [8, 8.375, 7.75, 8.125], "texture": "#3"}, + "down": {"uv": [8.25, 8.125, 8, 8.375], "texture": "#3"} + } + }, + { + "from": [10.4, 11.7, -0.2], + "to": [12.4, 13.1, 1.8], + "rotation": {"angle": 0, "axis": "y", "origin": [10.4, 11.2, -0.2]}, + "faces": { + "north": {"uv": [8.25, 8.25, 8.5, 8.375], "texture": "#3"}, + "east": {"uv": [0.25, 8.375, 0.5, 8.5], "texture": "#3"}, + "south": {"uv": [8.375, 1, 8.625, 1.125], "texture": "#3"}, + "up": {"uv": [8.5, 3.5, 8.25, 3.25], "texture": "#3"}, + "down": {"uv": [3.75, 8.25, 3.5, 8.5], "texture": "#3"} + } + }, + { + "from": [10.23536, 10.7818, -0.42574], + "to": [11.13536, 11.8818, 0.77426], + "rotation": {"angle": 45, "axis": "x", "origin": [10.68536, 11.3318, 0.17426]}, + "faces": { + "east": {"uv": [5.75, 8.375, 5.875, 8.5], "texture": "#3"}, + "south": {"uv": [5.875, 8.375, 6, 8.5], "texture": "#3"}, + "west": {"uv": [6, 8.375, 6.125, 8.5], "texture": "#3"}, + "up": {"uv": [6.25, 8.5, 6.125, 8.375], "texture": "#3"}, + "down": {"uv": [6.625, 8.375, 6.5, 8.5], "texture": "#3"} + } + }, + { + "from": [3.93536, 10.7818, 1.27426], + "to": [4.83536, 11.8818, 2.47426], + "rotation": {"angle": 45, "axis": "x", "origin": [4.38536, 11.3318, 1.87426]}, + "faces": { + "east": {"uv": [6.75, 8.375, 6.875, 8.5], "texture": "#3"}, + "south": {"uv": [6.875, 8.375, 7, 8.5], "texture": "#3"}, + "west": {"uv": [7, 8.375, 7.125, 8.5], "texture": "#3"}, + "up": {"uv": [7.25, 8.5, 7.125, 8.375], "texture": "#3"}, + "down": {"uv": [7.375, 8.375, 7.25, 8.5], "texture": "#3"} + } + }, + { + "from": [3.93536, 10.7818, -0.42574], + "to": [4.83536, 11.8818, 0.77426], + "rotation": {"angle": 45, "axis": "x", "origin": [4.38536, 11.3318, 0.17426]}, + "faces": { + "east": {"uv": [7.5, 8.375, 7.625, 8.5], "texture": "#3"}, + "south": {"uv": [7.625, 8.375, 7.75, 8.5], "texture": "#3"}, + "west": {"uv": [7.75, 8.375, 7.875, 8.5], "texture": "#3"}, + "up": {"uv": [8.5, 7.875, 8.375, 7.75], "texture": "#3"}, + "down": {"uv": [8, 8.375, 7.875, 8.5], "texture": "#3"} + } + }, + { + "from": [4.1, 6.7, -2.1], + "to": [11.1, 8, -1.8], + "rotation": {"angle": 0, "axis": "y", "origin": [6.6, 11.2, 5.1]}, + "faces": { + "north": {"uv": [8.125, 0.125, 9, 0.25], "texture": "#3"}, + "east": {"uv": [8.375, 7.875, 8.5, 8], "texture": "#3"}, + "west": {"uv": [8, 8.375, 8.125, 8.5], "texture": "#3"}, + "up": {"uv": [9, 0.5, 8.125, 0.375], "texture": "#3"}, + "down": {"uv": [5.5, 8.125, 4.625, 8.25], "texture": "#3"} + } + } + ], + "gui_light": "front", + "display": { + "gui": { + "rotation": [13, 153, 0], + "translation": [0, -3.5, 0], + "scale": [0.9, 0.9, 0.9] + }, + "head": { + "translation": [0.5, -4, 1], + "scale": [1.73242, 1.97461, 1.54102] + } + }, + "groups": [ + { + "name": "group", + "origin": [6.6, 11.2, 5.1], + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39] + } + ] +} \ No newline at end of file diff --git a/assets/cmbminigames/models/cosmetic/sink.json b/assets/cmbminigames/models/cosmetic/sink.json new file mode 100644 index 0000000..5ec3681 --- /dev/null +++ b/assets/cmbminigames/models/cosmetic/sink.json @@ -0,0 +1,220 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "cmbminigames:block/cosmetic/sink/water/water1", + "1": "cmbminigames:block/cosmetic/sink/water/water2", + "2": "cmbminigames:block/cosmetic/sink/water/water3", + "3": "cmbminigames:block/cosmetic/sink/water/water4", + "4": "cmbminigames:block/cosmetic/sink/base/short_side_base", + "5": "cmbminigames:block/cosmetic/sink/base/long_side_base", + "6": "cmbminigames:block/cosmetic/sink/faucet/faucet_base", + "7": "cmbminigames:block/cosmetic/sink/faucet/faucet_stem", + "8": "cmbminigames:block/cosmetic/sink/faucet/faucet_exit", + "9": "cmbminigames:block/cosmetic/sink/animation_frame", + "particle": "cmbminigames:block/cosmetic/sink/water/water1" + }, + "elements": [ + { + "from": [2, 9, 2], + "to": [14, 10, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 12]}, + "faces": { + "north": {"uv": [6, 0, 12, 1], "texture": "#1"}, + "east": {"uv": [6, 1, 12, 2], "texture": "#1"}, + "south": {"uv": [6, 2, 12, 3], "texture": "#1"}, + "west": {"uv": [6, 3, 12, 4], "texture": "#1"}, + "up": {"uv": [6, 6, 0, 0], "texture": "#1"}, + "down": {"uv": [6, 6, 0, 12], "texture": "#1"} + } + }, + { + "from": [2, 8, 2], + "to": [14, 10, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 12]}, + "faces": { + "north": {"uv": [6, 0, 12, 1], "texture": "#2"}, + "east": {"uv": [6, 1, 12, 2], "texture": "#2"}, + "south": {"uv": [6, 2, 12, 3], "texture": "#2"}, + "west": {"uv": [6, 3, 12, 4], "texture": "#2"}, + "up": {"uv": [6, 6, 0, 0], "texture": "#2"}, + "down": {"uv": [6, 6, 0, 12], "texture": "#2"} + } + }, + { + "from": [2, 7, 2], + "to": [14, 9, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 7, 12]}, + "faces": { + "north": {"uv": [6, 0, 12, 1], "texture": "#3"}, + "east": {"uv": [6, 1, 12, 2], "texture": "#3"}, + "south": {"uv": [6, 2, 12, 3], "texture": "#3"}, + "west": {"uv": [6, 3, 12, 4], "texture": "#3"}, + "up": {"uv": [6, 6, 0, 0], "texture": "#3"}, + "down": {"uv": [6, 6, 0, 12], "texture": "#3"} + } + }, + { + "from": [2, 10, 2], + "to": [14, 11, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 9, 12]}, + "faces": { + "north": {"uv": [6, 0, 12, 1], "texture": "#0"}, + "east": {"uv": [6, 1, 12, 2], "texture": "#0"}, + "south": {"uv": [6, 2, 12, 3], "texture": "#0"}, + "west": {"uv": [6, 3, 12, 4], "texture": "#0"}, + "up": {"uv": [6, 6, 0, 0], "texture": "#0"}, + "down": {"uv": [6, 6, 0, 12], "texture": "#0"} + } + }, + { + "from": [0, 0, 14], + "to": [16, 13, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [11.5, 1, 11.5]}, + "faces": { + "north": {"uv": [0, 0, 8, 6.5], "texture": "#5"}, + "east": {"uv": [8, 2, 9, 8.5], "texture": "#5"}, + "south": {"uv": [0, 6.5, 8, 13], "texture": "#5"}, + "west": {"uv": [8, 8.5, 9, 15], "texture": "#5"}, + "up": {"uv": [16, 1, 8, 0], "texture": "#5"}, + "down": {"uv": [16, 1, 8, 2], "texture": "#5"} + } + }, + { + "from": [14, 0, 2], + "to": [16, 13, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11.5, 1, 11.5]}, + "faces": { + "north": {"uv": [0, 6.5, 1, 13], "texture": "#4"}, + "east": {"uv": [0, 0, 6, 6.5], "texture": "#4"}, + "south": {"uv": [1, 6.5, 2, 13], "texture": "#4"}, + "west": {"uv": [6, 0, 12, 6.5], "texture": "#4"}, + "up": {"uv": [3, 12.5, 2, 6.5], "texture": "#4"}, + "down": {"uv": [4, 6.5, 3, 12.5], "texture": "#4"} + } + }, + { + "from": [0, 0, 0], + "to": [16, 13, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [11.5, 1, -2.5]}, + "faces": { + "north": {"uv": [0, 0, 8, 6.5], "texture": "#5"}, + "east": {"uv": [8, 2, 9, 8.5], "texture": "#5"}, + "south": {"uv": [0, 6.5, 8, 13], "texture": "#5"}, + "west": {"uv": [8, 8.5, 9, 15], "texture": "#5"}, + "up": {"uv": [16, 1, 8, 0], "texture": "#5"}, + "down": {"uv": [16, 1, 8, 2], "texture": "#5"} + } + }, + { + "from": [0, 0, 2], + "to": [2, 13, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [-2.5, 1, 11.5]}, + "faces": { + "north": {"uv": [0, 6.5, 1, 13], "texture": "#4"}, + "east": {"uv": [0, 0, 6, 6.5], "texture": "#4"}, + "south": {"uv": [1, 6.5, 2, 13], "texture": "#4"}, + "west": {"uv": [6, 0, 12, 6.5], "texture": "#4"}, + "up": {"uv": [3, 12.5, 2, 6.5], "texture": "#4"}, + "down": {"uv": [4, 6.5, 3, 12.5], "texture": "#4"} + } + }, + { + "from": [0, 13, 7], + "to": [2, 13.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 13, 7]}, + "faces": { + "north": {"uv": [2, 0, 4, 1], "texture": "#6"}, + "east": {"uv": [2, 1, 4, 2], "texture": "#6"}, + "south": {"uv": [2, 2, 4, 3], "texture": "#6"}, + "west": {"uv": [2, 3, 4, 4], "texture": "#6"}, + "up": {"uv": [2, 2, 0, 0], "texture": "#6"}, + "down": {"uv": [2, 2, 0, 4], "texture": "#6"} + } + }, + { + "from": [0.25, 13, 7.25], + "to": [1.75, 19.5, 8.75], + "rotation": {"angle": 0, "axis": "y", "origin": [0.25, 13, 7.25]}, + "faces": { + "north": {"uv": [0, 0, 2, 7], "texture": "#7"}, + "east": {"uv": [2, 0, 4, 7], "texture": "#7"}, + "south": {"uv": [4, 0, 6, 7], "texture": "#7"}, + "west": {"uv": [6, 0, 8, 7], "texture": "#7"}, + "up": {"uv": [2, 9, 0, 7], "texture": "#7"}, + "down": {"uv": [4, 7, 2, 9], "texture": "#7"} + } + }, + { + "from": [0.25, 19.5, 7.25], + "to": [5.75, 20.5, 8.75], + "rotation": {"angle": 0, "axis": "y", "origin": [0.25, 13, 7.25]}, + "faces": { + "north": {"uv": [0, 0, 5.5, 1], "texture": "#7"}, + "east": {"uv": [0, 0, 1.5, 1], "texture": "#7"}, + "south": {"uv": [0, 0, 5.5, 1], "texture": "#7"}, + "west": {"uv": [0, 0, 1.5, 1], "texture": "#7"}, + "up": {"uv": [0, 0, 5.5, 1.5], "texture": "#7"}, + "down": {"uv": [0, 0, 5.5, 1.5], "texture": "#7"} + } + }, + { + "from": [4.35, 18.5, 7.35], + "to": [5.65, 19.5, 8.65], + "rotation": {"angle": 0, "axis": "y", "origin": [0.25, 13, 7.25]}, + "faces": { + "north": {"uv": [4, 0, 7, 2], "texture": "#8"}, + "east": {"uv": [4, 2, 7, 4], "texture": "#8"}, + "south": {"uv": [4, 4, 7, 6], "texture": "#8"}, + "west": {"uv": [4, 6, 7, 8], "texture": "#8"}, + "up": {"uv": [3, 3, 0, 0], "texture": "#8"}, + "down": {"uv": [3, 4, 0, 7], "texture": "#8"} + } + }, + { + "name": "AnimationFace", + "from": [4, 6, 5], + "to": [6, 19, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 17, 7]}, + "faces": { + "north": {"uv": [6, 0, 7, 6.5], "texture": "#9"}, + "east": {"uv": [0, 0, 3, 6.5], "texture": "#9"}, + "south": {"uv": [0, 6.5, 1, 13], "texture": "#9"}, + "west": {"uv": [3, 0, 6, 6.5], "texture": "#9"}, + "up": {"uv": [2, 9.5, 1, 6.5], "texture": "#9"}, + "down": {"uv": [3, 6.5, 2, 9.5], "texture": "#9"} + } + } + ], + "display": { + "gui": { + "rotation": [0, -26, 9], + "scale": [0.5, 0.5, 0.5] + }, + "head": { + "rotation": [0, 90, 0], + "translation": [0, 10.5, 0] + } + }, + "groups": [ + { + "name": "Water", + "origin": [2, 9, 12], + "color": 0, + "children": [0, 1, 2, 3] + }, + { + "name": "Base", + "origin": [-2.5, 1, 11.5], + "color": 0, + "children": [4, 5, 6, 7] + }, + { + "name": "Faucet", + "origin": [7, 5.5, 7], + "color": 0, + "children": [8, 9, 10, 11] + }, + 12 + ] +} \ No newline at end of file diff --git a/assets/cmbminigames/models/cosmetic/swords/generic_sword.json b/assets/cmbminigames/models/cosmetic/swords/generic_sword.json new file mode 100644 index 0000000..0590efd --- /dev/null +++ b/assets/cmbminigames/models/cosmetic/swords/generic_sword.json @@ -0,0 +1,109 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "cmbminigames:block/cosmetic/swords/generic/texture", + "particle": "cmbminigames:block/cosmetic/swords/generic/texture" + }, + "elements": [ + { + "from": [7, 0, 7], + "to": [9, 2, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 7]}, + "faces": { + "north": {"uv": [7, 5, 8, 6], "texture": "#0", "tintindex": 0}, + "east": {"uv": [7, 6, 8, 7], "texture": "#0", "tintindex": 0}, + "south": {"uv": [7, 7, 8, 8], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 8, 1, 9], "texture": "#0", "tintindex": 0}, + "up": {"uv": [9, 1, 8, 0], "texture": "#0", "tintindex": 0}, + "down": {"uv": [2, 8, 1, 9], "texture": "#0", "tintindex": 0} + } + }, + { + "from": [7.5, 1, 7.5], + "to": [8.5, 7, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 7]}, + "faces": { + "north": {"uv": [6, 2, 6.5, 5.5], "texture": "#0"}, + "east": {"uv": [6, 5.5, 6.5, 9], "texture": "#0"}, + "south": {"uv": [6.5, 2, 7, 5.5], "texture": "#0"}, + "west": {"uv": [6.5, 5.5, 7, 9], "texture": "#0"}, + "up": {"uv": [9.5, 0.5, 9, 0], "texture": "#0"}, + "down": {"uv": [9.5, 0.5, 9, 1], "texture": "#0"} + } + }, + { + "from": [7, 6, 5], + "to": [9, 8, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 6, 7]}, + "faces": { + "north": {"uv": [8, 1, 9, 2], "texture": "#0"}, + "east": {"uv": [5, 0, 8, 1], "texture": "#0", "tintindex": 0}, + "south": {"uv": [2, 8, 3, 9], "texture": "#0"}, + "west": {"uv": [5, 1, 8, 2], "texture": "#0", "tintindex": 0}, + "up": {"uv": [6, 5, 5, 2], "texture": "#0", "tintindex": 0}, + "down": {"uv": [6, 5, 5, 8], "texture": "#0", "tintindex": 0} + } + }, + { + "from": [7, 7.5, 3.25], + "to": [9, 9.5, 5.25], + "rotation": {"angle": 22.5, "axis": "x", "origin": [7, 7.5, 1.25]}, + "faces": { + "north": {"uv": [8, 2, 9, 3], "texture": "#0", "tintindex": 0}, + "east": {"uv": [3, 8, 4, 9], "texture": "#0", "tintindex": 0}, + "south": {"uv": [8, 3, 9, 4], "texture": "#0"}, + "west": {"uv": [4, 8, 5, 9], "texture": "#0", "tintindex": 0}, + "up": {"uv": [9, 5, 8, 4], "texture": "#0", "tintindex": 0}, + "down": {"uv": [6, 8, 5, 9], "texture": "#0", "tintindex": 0} + } + }, + { + "from": [7, 5.65, 11.05], + "to": [9, 7.65, 13.05], + "rotation": {"angle": -22.5, "axis": "x", "origin": [7, 5.65, 10.05]}, + "faces": { + "north": {"uv": [8, 5, 9, 6], "texture": "#0"}, + "east": {"uv": [8, 6, 9, 7], "texture": "#0", "tintindex": 0}, + "south": {"uv": [7, 8, 8, 9], "texture": "#0", "tintindex": 0}, + "west": {"uv": [8, 7, 9, 8], "texture": "#0", "tintindex": 0}, + "up": {"uv": [9, 9, 8, 8], "texture": "#0", "tintindex": 0}, + "down": {"uv": [1, 9, 0, 10], "texture": "#0", "tintindex": 0} + } + }, + { + "from": [7.45, 7, 6.5], + "to": [8.45, 23, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [7.45, 7, 6.5]}, + "faces": { + "north": {"uv": [3, 0, 3.75, 8], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 1.5, 8], "texture": "#0", "tintindex": 0}, + "south": {"uv": [4, 0, 4.75, 8], "texture": "#0", "tintindex": 0}, + "west": {"uv": [1.5, 0, 3, 8], "texture": "#0", "tintindex": 0}, + "up": {"uv": [7.75, 3.5, 7, 2], "texture": "#0"}, + "down": {"uv": [7.75, 3.5, 7, 5], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 2.25, 0] + }, + "thirdperson_lefthand": { + "translation": [0, 2.5, 0] + }, + "firstperson_righthand": { + "translation": [1, 2, 0], + "scale": [0.7, 0.7, 0.7] + }, + "firstperson_lefthand": { + "translation": [0, 2.5, 0], + "scale": [0.7, 0.7, 0.7] + }, + "gui": { + "rotation": [90, 46.5, -90], + "translation": [-1.25, -1.75, 0], + "scale": [0.7, 0.7, 0.7] + } + } +} \ No newline at end of file diff --git a/assets/cmbminigames/textures/block/cosmetic/shark/texture.png b/assets/cmbminigames/textures/block/cosmetic/shark/texture.png new file mode 100644 index 0000000..968253b Binary files /dev/null and b/assets/cmbminigames/textures/block/cosmetic/shark/texture.png differ diff --git a/assets/cmbminigames/textures/block/cosmetic/sink/animation_frame.png b/assets/cmbminigames/textures/block/cosmetic/sink/animation_frame.png new file mode 100644 index 0000000..34b5db6 Binary files /dev/null and b/assets/cmbminigames/textures/block/cosmetic/sink/animation_frame.png differ diff --git a/assets/cmbminigames/textures/block/cosmetic/sink/animation_frame.png.mcmeta b/assets/cmbminigames/textures/block/cosmetic/sink/animation_frame.png.mcmeta new file mode 100644 index 0000000..78df88c --- /dev/null +++ b/assets/cmbminigames/textures/block/cosmetic/sink/animation_frame.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/assets/cmbminigames/textures/block/cosmetic/sink/base/long_side_base.png b/assets/cmbminigames/textures/block/cosmetic/sink/base/long_side_base.png new file mode 100644 index 0000000..6c72dd7 Binary files /dev/null and b/assets/cmbminigames/textures/block/cosmetic/sink/base/long_side_base.png differ diff --git a/assets/cmbminigames/textures/block/cosmetic/sink/base/short_side_base.png b/assets/cmbminigames/textures/block/cosmetic/sink/base/short_side_base.png new file mode 100644 index 0000000..941052c Binary files /dev/null and b/assets/cmbminigames/textures/block/cosmetic/sink/base/short_side_base.png differ diff --git a/assets/cmbminigames/textures/block/cosmetic/sink/faucet/faucet_base.png b/assets/cmbminigames/textures/block/cosmetic/sink/faucet/faucet_base.png new file mode 100644 index 0000000..5040f79 Binary files /dev/null and b/assets/cmbminigames/textures/block/cosmetic/sink/faucet/faucet_base.png differ diff --git a/assets/cmbminigames/textures/block/cosmetic/sink/faucet/faucet_exit.png b/assets/cmbminigames/textures/block/cosmetic/sink/faucet/faucet_exit.png new file mode 100644 index 0000000..c5d1517 Binary files /dev/null and b/assets/cmbminigames/textures/block/cosmetic/sink/faucet/faucet_exit.png differ diff --git a/assets/cmbminigames/textures/block/cosmetic/sink/faucet/faucet_stem.png b/assets/cmbminigames/textures/block/cosmetic/sink/faucet/faucet_stem.png new file mode 100644 index 0000000..369bf21 Binary files /dev/null and b/assets/cmbminigames/textures/block/cosmetic/sink/faucet/faucet_stem.png differ diff --git a/assets/cmbminigames/textures/block/cosmetic/sink/water/water1.png b/assets/cmbminigames/textures/block/cosmetic/sink/water/water1.png new file mode 100644 index 0000000..c6ed01a Binary files /dev/null and b/assets/cmbminigames/textures/block/cosmetic/sink/water/water1.png differ diff --git a/assets/cmbminigames/textures/block/cosmetic/sink/water/water2.png b/assets/cmbminigames/textures/block/cosmetic/sink/water/water2.png new file mode 100644 index 0000000..17c9814 Binary files /dev/null and b/assets/cmbminigames/textures/block/cosmetic/sink/water/water2.png differ diff --git a/assets/cmbminigames/textures/block/cosmetic/sink/water/water3.png b/assets/cmbminigames/textures/block/cosmetic/sink/water/water3.png new file mode 100644 index 0000000..75634ba Binary files /dev/null and b/assets/cmbminigames/textures/block/cosmetic/sink/water/water3.png differ diff --git a/assets/cmbminigames/textures/block/cosmetic/sink/water/water4.png b/assets/cmbminigames/textures/block/cosmetic/sink/water/water4.png new file mode 100644 index 0000000..37f8199 Binary files /dev/null and b/assets/cmbminigames/textures/block/cosmetic/sink/water/water4.png differ diff --git a/assets/cmbminigames/textures/block/cosmetic/swords/generic/texture.png b/assets/cmbminigames/textures/block/cosmetic/swords/generic/texture.png new file mode 100644 index 0000000..ce36cfb Binary files /dev/null and b/assets/cmbminigames/textures/block/cosmetic/swords/generic/texture.png differ diff --git a/assets/minecraft/models/item/diamond_sword.json b/assets/minecraft/models/item/diamond_sword.json new file mode 100644 index 0000000..b372e0c --- /dev/null +++ b/assets/minecraft/models/item/diamond_sword.json @@ -0,0 +1,14 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/diamond_sword" + }, + "overrides": [ + { + "predicate": { + "custom_model_data": 1 + }, + "model": "cmbminigames:cosmetic/swords/generic_sword" + } + ] +} \ No newline at end of file diff --git a/assets/minecraft/models/item/leather_horse_armor.json b/assets/minecraft/models/item/leather_horse_armor.json index e534cfd..ce78b01 100644 --- a/assets/minecraft/models/item/leather_horse_armor.json +++ b/assets/minecraft/models/item/leather_horse_armor.json @@ -33,6 +33,18 @@ "custom_model_data": 5 }, "model": "cmbminigames:cosmetic/gd_head" + }, + { + "predicate": { + "custom_model_data": 6 + }, + "model": "cmbminigames:cosmetic/sink" + }, + { + "predicate": { + "custom_model_data": 7 + }, + "model": "cmbminigames:cosmetic/shark" } ] } \ No newline at end of file