diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index b1f192b..e1e71a2 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -20,10 +20,20 @@ jobs: - name: Login to GiteaDockerRepo run: | docker login --username "${{ secrets.DOCKERHUB_USERNAME }}" --password "${{ secrets.DOCKERHUB_TOKEN }}" ${{ vars.currect_gitea_url }} - - name: Build latest archlinux Docker image and push to GiteaRepo + - name: Build latest Docker image and push to GiteaRepo run: | pwd ls docker build --network=host -t nebulabeat-mc:latest --no-cache . docker image tag nebulabeat-mc:latest ${{ vars.currect_gitea_url }}/vtbhelper/nebulabeat-mc:latest - docker image push ${{ vars.currect_gitea_url }}/vtbhelper/nebulabeat-mc:latest + docker image push ${{ vars.currect_gitea_url }}/vtbhelper/nebulabeat-mc:latest + - name: compress datapack + run: | + mkdir bin/ + zip -r bin/trinkets-fixed.zip extra/trinkets-fixed + - name: release datapack + uses: akkuman/gitea-release-action@v1 + with: + files: |- + bin/** + api_key: '${{ secrets.ACCESS_TOKEN }}' diff --git a/Dockerfile b/Dockerfile index 490f33b..5cb3d31 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,6 @@ RUN rm installer.jar \ && echo "eula=true" > eula.txt COPY server.properties server.properties COPY package/overrides/mods /app/mods -COPY ops.json ops.json RUN rm /app/mods/*AllMusic_Client*.jar RUN rm /app/mods/chattools*.jar VOLUME [ "/app/world" ] diff --git a/extra/trinkets-fixed/data/trinkets/slots/chest/back.json b/extra/trinkets-fixed/data/trinkets/slots/chest/back.json new file mode 100644 index 0000000..2396d1f --- /dev/null +++ b/extra/trinkets-fixed/data/trinkets/slots/chest/back.json @@ -0,0 +1,6 @@ +{ + "icon": "trinkets:gui/slots/back", + "order": -512, + "validator_predicates": ["trinkets:tag"], + "amount": 3 +} diff --git a/extra/trinkets-fixed/data/trinkets/slots/chest/cape.json b/extra/trinkets-fixed/data/trinkets/slots/chest/cape.json new file mode 100644 index 0000000..ffb7289 --- /dev/null +++ b/extra/trinkets-fixed/data/trinkets/slots/chest/cape.json @@ -0,0 +1,5 @@ +{ + "icon": "trinkets:gui/slots/cape", + "order": -256, + "validator_predicates": ["trinkets:tag"] +} \ No newline at end of file diff --git a/extra/trinkets-fixed/data/trinkets/slots/chest/group.json b/extra/trinkets-fixed/data/trinkets/slots/chest/group.json new file mode 100644 index 0000000..bff9bc2 --- /dev/null +++ b/extra/trinkets-fixed/data/trinkets/slots/chest/group.json @@ -0,0 +1,3 @@ +{ + "slot_id": 6 +} \ No newline at end of file diff --git a/extra/trinkets-fixed/data/trinkets/slots/chest/necklace.json b/extra/trinkets-fixed/data/trinkets/slots/chest/necklace.json new file mode 100644 index 0000000..13de383 --- /dev/null +++ b/extra/trinkets-fixed/data/trinkets/slots/chest/necklace.json @@ -0,0 +1,6 @@ +{ + "icon": "trinkets:gui/slots/necklace", + "order": -1024, + "validator_predicates": ["trinkets:tag"], + "amount": 3 +} diff --git a/extra/trinkets-fixed/data/trinkets/slots/feet/aglet.json b/extra/trinkets-fixed/data/trinkets/slots/feet/aglet.json new file mode 100644 index 0000000..ef3a0d1 --- /dev/null +++ b/extra/trinkets-fixed/data/trinkets/slots/feet/aglet.json @@ -0,0 +1,5 @@ +{ + "icon": "trinkets:gui/slots/aglet", + "order": -1024, + "validator_predicates": ["trinkets:tag"] +} \ No newline at end of file diff --git a/extra/trinkets-fixed/data/trinkets/slots/feet/group.json b/extra/trinkets-fixed/data/trinkets/slots/feet/group.json new file mode 100644 index 0000000..8406549 --- /dev/null +++ b/extra/trinkets-fixed/data/trinkets/slots/feet/group.json @@ -0,0 +1,3 @@ +{ + "slot_id": 8 +} \ No newline at end of file diff --git a/extra/trinkets-fixed/data/trinkets/slots/feet/shoes.json b/extra/trinkets-fixed/data/trinkets/slots/feet/shoes.json new file mode 100644 index 0000000..595c546 --- /dev/null +++ b/extra/trinkets-fixed/data/trinkets/slots/feet/shoes.json @@ -0,0 +1,5 @@ +{ + "icon": "trinkets:gui/slots/shoes", + "order": -512, + "validator_predicates": ["trinkets:tag"] +} \ No newline at end of file diff --git a/extra/trinkets-fixed/data/trinkets/slots/hand/glove.json b/extra/trinkets-fixed/data/trinkets/slots/hand/glove.json new file mode 100644 index 0000000..0be05ac --- /dev/null +++ b/extra/trinkets-fixed/data/trinkets/slots/hand/glove.json @@ -0,0 +1,5 @@ +{ + "icon": "trinkets:gui/slots/glove", + "order": -1024, + "validator_predicates": ["trinkets:tag"] +} \ No newline at end of file diff --git a/extra/trinkets-fixed/data/trinkets/slots/hand/group.json b/extra/trinkets-fixed/data/trinkets/slots/hand/group.json new file mode 100644 index 0000000..a0ec351 --- /dev/null +++ b/extra/trinkets-fixed/data/trinkets/slots/hand/group.json @@ -0,0 +1,3 @@ +{ + "order": -1024 +} \ No newline at end of file diff --git a/extra/trinkets-fixed/data/trinkets/slots/hand/ring.json b/extra/trinkets-fixed/data/trinkets/slots/hand/ring.json new file mode 100644 index 0000000..a147962 --- /dev/null +++ b/extra/trinkets-fixed/data/trinkets/slots/hand/ring.json @@ -0,0 +1,6 @@ +{ + "icon": "trinkets:gui/slots/ring", + "order": -512, + "validator_predicates": ["trinkets:tag"], + "amount": 3 +} diff --git a/extra/trinkets-fixed/data/trinkets/slots/head/face.json b/extra/trinkets-fixed/data/trinkets/slots/head/face.json new file mode 100644 index 0000000..9e0035a --- /dev/null +++ b/extra/trinkets-fixed/data/trinkets/slots/head/face.json @@ -0,0 +1,5 @@ +{ + "icon": "trinkets:gui/slots/face", + "order": -1024, + "validator_predicates": ["trinkets:tag"] +} \ No newline at end of file diff --git a/extra/trinkets-fixed/data/trinkets/slots/head/group.json b/extra/trinkets-fixed/data/trinkets/slots/head/group.json new file mode 100644 index 0000000..7d875e6 --- /dev/null +++ b/extra/trinkets-fixed/data/trinkets/slots/head/group.json @@ -0,0 +1,3 @@ +{ + "slot_id": 5 +} \ No newline at end of file diff --git a/extra/trinkets-fixed/data/trinkets/slots/head/hat.json b/extra/trinkets-fixed/data/trinkets/slots/head/hat.json new file mode 100644 index 0000000..714274c --- /dev/null +++ b/extra/trinkets-fixed/data/trinkets/slots/head/hat.json @@ -0,0 +1,5 @@ +{ + "icon": "trinkets:gui/slots/hat", + "order": -512, + "validator_predicates": ["trinkets:tag"] +} diff --git a/extra/trinkets-fixed/data/trinkets/slots/legs/belt.json b/extra/trinkets-fixed/data/trinkets/slots/legs/belt.json new file mode 100644 index 0000000..4e01b7e --- /dev/null +++ b/extra/trinkets-fixed/data/trinkets/slots/legs/belt.json @@ -0,0 +1,5 @@ +{ + "icon": "trinkets:gui/slots/belt", + "order": -1024, + "validator_predicates": ["trinkets:tag"] +} \ No newline at end of file diff --git a/extra/trinkets-fixed/data/trinkets/slots/legs/group.json b/extra/trinkets-fixed/data/trinkets/slots/legs/group.json new file mode 100644 index 0000000..9156267 --- /dev/null +++ b/extra/trinkets-fixed/data/trinkets/slots/legs/group.json @@ -0,0 +1,3 @@ +{ + "slot_id": 7 +} \ No newline at end of file diff --git a/extra/trinkets-fixed/data/trinkets/slots/offhand/glove.json b/extra/trinkets-fixed/data/trinkets/slots/offhand/glove.json new file mode 100644 index 0000000..fb29bd7 --- /dev/null +++ b/extra/trinkets-fixed/data/trinkets/slots/offhand/glove.json @@ -0,0 +1,5 @@ +{ + "icon": "trinkets:gui/slots/glove_mirrored", + "order": -512, + "validator_predicates": ["trinkets:tag"] +} \ No newline at end of file diff --git a/extra/trinkets-fixed/data/trinkets/slots/offhand/group.json b/extra/trinkets-fixed/data/trinkets/slots/offhand/group.json new file mode 100644 index 0000000..f645bc5 --- /dev/null +++ b/extra/trinkets-fixed/data/trinkets/slots/offhand/group.json @@ -0,0 +1,3 @@ +{ + "slot_id": 45 +} \ No newline at end of file diff --git a/extra/trinkets-fixed/data/trinkets/slots/offhand/ring.json b/extra/trinkets-fixed/data/trinkets/slots/offhand/ring.json new file mode 100644 index 0000000..d8131ab --- /dev/null +++ b/extra/trinkets-fixed/data/trinkets/slots/offhand/ring.json @@ -0,0 +1,5 @@ +{ + "icon": "trinkets:gui/slots/ring", + "order": -1024, + "validator_predicates": ["trinkets:tag"] +} \ No newline at end of file diff --git a/extra/trinkets-fixed/pack.mcmeta b/extra/trinkets-fixed/pack.mcmeta new file mode 100644 index 0000000..7df97d4 --- /dev/null +++ b/extra/trinkets-fixed/pack.mcmeta @@ -0,0 +1,6 @@ +{ +"pack" : { +"pack_format": 15, +"description": "饰品栏添加" +} +} diff --git a/ops.json b/ops.json deleted file mode 100644 index cb278df..0000000 --- a/ops.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "uuid": "681ec534-db63-302e-a4b1-03682b275ddd", - "name": "azw", - "level": 4, - "bypassesPlayerLimit": false -} \ No newline at end of file