Skip to content

Commit b274753

Browse files
illyrius666illyrius666
authored
v1.7.8 (#75)
+ updated Shrimp's Immersive Interfaces to v0.5
1 parent 3983d67 commit b274753

File tree

83 files changed

+589
-57
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+589
-57
lines changed

‎.github/workflows/ci_cd.yml

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -58,34 +58,3 @@ jobs:
5858
generate_release_notes: true
5959
prerelease: ${{ contains(github.event.head_commit.message, '.pre') }}
6060
tag_name: ${{ steps.get_version.outputs.VERSION }}
61-
62-
# update_server_properties:
63-
# name: Update Server Properties
64-
# runs-on: [ubuntu-latest]
65-
# needs: [release]
66-
# steps:
67-
# - id: install_ssh_client
68-
# name: Install SSH Client
69-
# run: sudo apt-get install -y openssh-client
70-
71-
# - id: update_server_properties
72-
# name: Update server.properties
73-
# env:
74-
# SFTP_SERVER: ${{ secrets.SFTP_SERVER }}
75-
# SFTP_USERNAME: ${{ secrets.SFTP_USERNAME }}
76-
# SFTP_PASSWORD: ${{ secrets.SFTP_PASSWORD }}
77-
# VERSION: ${{ needs.release.outputs.VERSION }}
78-
# SHA1: ${{ needs.release.outputs.SHA1 }}
79-
# run: |
80-
# echo "Updating server.properties with new values..."
81-
# mkdir -p ~/.ssh
82-
# ssh-keyscan -p 2222 $SFTP_SERVER >> ~/.ssh/known_hosts
83-
# sftp -P 2222 $SFTP_USERNAME@$SFTP_SERVER <<EOF
84-
# get /server.properties server.properties
85-
# bye
86-
# EOF
87-
# sed -i "s|resource-pack=.*|resource-pack=https://github.com/${{ github.repository }}/releases/download/${{ needs.release.outputs.VERSION }}/IllyriaRP_${{ needs.release.outputs.VERSION }}.zip|" server.properties
88-
# sed -i "s|resource-pack-sha1=.*|resource-pack-sha1=${{ needs.release.outputs.SHA1 }}|" server.properties
89-
# sftp -P 2222 $SFTP_USERNAME@$SFTP_SERVER <<EOF
90-
# put server.properties /server.properties
91-
# bye

‎illyriarp/assets/minecraft/font/default.json

Lines changed: 41 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -357,175 +357,191 @@
357357
},
358358
{
359359
"type": "bitmap",
360-
"file": "minecraft:gui/container/chests/chest.png",
360+
"file": "minecraft:gui/sprites/interfaces/chests/chest.png",
361361
"height": 91,
362362
"ascent": 23,
363363
"chars": ["\uEC01"]
364364
},
365365
{
366366
"type": "bitmap",
367-
"file": "minecraft:gui/container/chests/chest_minecart.png",
367+
"file": "minecraft:gui/sprites/interfaces/chests/chest_minecart.png",
368368
"height": 105,
369369
"ascent": 23,
370370
"chars": ["\uEC02"]
371371
},
372372
{
373373
"type": "bitmap",
374-
"file": "minecraft:gui/container/chests/barrel.png",
374+
"file": "minecraft:gui/sprites/interfaces/chests/barrel.png",
375375
"height": 83,
376376
"ascent": 14,
377377
"chars": ["\uEC03"]
378378
},
379379
{
380380
"type": "bitmap",
381-
"file": "minecraft:gui/container/chests/ender_chest.png",
381+
"file": "minecraft:gui/sprites/interfaces/chests/ender_chest.png",
382382
"height": 91,
383383
"ascent": 23,
384384
"chars": ["\uEC04"]
385385
},
386386
{
387387
"type": "bitmap",
388-
"file": "minecraft:gui/container/chests/large_chest.png",
388+
"file": "minecraft:gui/sprites/interfaces/chests/large_chest.png",
389389
"height": 158,
390390
"ascent": 34,
391391
"chars": ["\uEC05"]
392392
},
393393
{
394394
"type": "bitmap",
395-
"file": "minecraft:gui/container/chests_slots/chest.png",
395+
"file": "minecraft:gui/sprites/interfaces/chests_slots/chest.png",
396396
"height": 91,
397397
"ascent": 23,
398398
"chars": ["\uED01"]
399399
},
400400
{
401401
"type": "bitmap",
402-
"file": "minecraft:gui/container/chests_slots/chest_minecart.png",
402+
"file": "minecraft:gui/sprites/interfaces/chests_slots/chest_minecart.png",
403403
"height": 105,
404404
"ascent": 23,
405405
"chars": ["\uED02"]
406406
},
407407
{
408408
"type": "bitmap",
409-
"file": "minecraft:gui/container/chests_slots/barrel.png",
409+
"file": "minecraft:gui/sprites/interfaces/chests_slots/barrel.png",
410410
"height": 83,
411411
"ascent": 14,
412412
"chars": ["\uED03"]
413413
},
414414
{
415415
"type": "bitmap",
416-
"file": "minecraft:gui/container/chests_slots/ender_chest.png",
416+
"file": "minecraft:gui/sprites/interfaces/chests_slots/ender_chest.png",
417417
"height": 91,
418418
"ascent": 23,
419419
"chars": ["\uED04"]
420420
},
421421
{
422422
"type": "bitmap",
423-
"file": "minecraft:gui/container/chests_slots/large_chest.png",
423+
"file": "minecraft:gui/sprites/interfaces/chests_slots/large_chest.png",
424424
"height": 158,
425425
"ascent": 34,
426426
"chars": ["\uED05"]
427427
},
428428
{
429429
"type": "bitmap",
430-
"file": "minecraft:gui/container/hopper_minecart.png",
430+
"file": "minecraft:gui/sprites/interfaces/hopper_minecart.png",
431431
"height": 68,
432432
"ascent": 14,
433433
"chars": ["\uEC10"]
434434
},
435435
{
436436
"type": "bitmap",
437-
"file": "minecraft:gui/container/enchanting_table_corner.png",
437+
"file": "minecraft:gui/sprites/interfaces/enchanting_table_corner.png",
438438
"height": 125,
439439
"ascent": 14,
440440
"chars": ["\uEc11"]
441441
},
442442
{
443443
"type": "bitmap",
444-
"file": "minecraft:gui/container/furnace_hat.png",
444+
"file": "minecraft:gui/sprites/interfaces/furnace_hat.png",
445445
"height": 18,
446446
"ascent": 18,
447447
"chars": ["\uEc12"]
448448
},
449449
{
450450
"type": "bitmap",
451-
"file": "minecraft:gui/container/smoker_hat.png",
451+
"file": "minecraft:gui/sprites/interfaces/smoker_hat.png",
452452
"height": 18,
453453
"ascent": 18,
454454
"chars": ["\uEc13"]
455455
},
456456
{
457457
"type": "bitmap",
458-
"file": "minecraft:gui/container/crafter_hatncorner.png",
458+
"file": "minecraft:gui/sprites/interfaces/crafter_hatncorner.png",
459459
"height": 80,
460460
"ascent": 25,
461461
"chars": ["\uEc14"]
462462
},
463463
{
464464
"type": "bitmap",
465-
"file": "minecraft:gui/container/smithing_corner.png",
465+
"file": "minecraft:gui/sprites/interfaces/smithing_corner.png",
466466
"height": 125,
467467
"ascent": 22,
468468
"chars": ["\uEc15"]
469469
},
470470
{
471471
"type": "bitmap",
472-
"file": "minecraft:gui/container/loom_hat.png",
472+
"file": "minecraft:gui/sprites/interfaces/loom_hat.png",
473473
"height": 99,
474474
"ascent": 30,
475475
"chars": ["\uEc16"]
476476
},
477477
{
478478
"type": "bitmap",
479-
"file": "minecraft:gui/container/brewing_guide.png",
479+
"file": "minecraft:gui/sprites/interfaces/brewing_guide.png",
480480
"height": 166,
481481
"ascent": 13,
482482
"chars": ["\uEc17"]
483483
},
484484
{
485485
"type": "bitmap",
486-
"file": "minecraft:gui/container/blast_furnace_hat.png",
486+
"file": "minecraft:gui/sprites/interfaces/blast_furnace_hat.png",
487487
"height": 35,
488488
"ascent": 35,
489489
"chars": ["\uEc18"]
490490
},
491491
{
492492
"type": "bitmap",
493-
"file": "minecraft:gui/container/dispenser_block.png",
493+
"file": "minecraft:gui/sprites/interfaces/dispenser_block.png",
494494
"height": 112,
495495
"ascent": 45,
496496
"chars": ["\uEc19"]
497497
},
498498
{
499499
"type": "bitmap",
500-
"file": "minecraft:gui/container/dropper_block.png",
500+
"file": "minecraft:gui/sprites/interfaces/dropper_block.png",
501501
"height": 112,
502502
"ascent": 45,
503503
"chars": ["\uEc20"]
504504
},
505505
{
506506
"type": "bitmap",
507-
"file": "minecraft:gui/container/villagers/base_trades.png",
507+
"file": "minecraft:gui/sprites/interfaces/cartography_lantern.png",
508+
"height": 32,
509+
"ascent": 27,
510+
"chars": ["\uEc21"]
511+
},
512+
513+
{
514+
"type": "bitmap",
515+
"file": "minecraft:gui/sprites/interfaces/trades.png",
516+
"height": 140,
517+
"ascent": -5,
518+
"chars": ["\uEe00"]
519+
},
520+
521+
{
522+
"type": "bitmap",
523+
"file": "minecraft:gui/sprites/interfaces/villagers/base_trades.png",
508524
"height": 166,
509525
"ascent": 13,
510526
"chars": ["\uEe01"]
511527
},
512528
{
513529
"type": "bitmap",
514-
"file": "minecraft:gui/container/villagers/base_counter.png",
530+
"file": "minecraft:gui/sprites/interfaces/villagers/base_counter.png",
515531
"height": 166,
516532
"ascent": 13,
517533
"chars": ["\uEe02"]
518534
},
519535
{
520536
"type": "bitmap",
521-
"file": "minecraft:gui/container/villagers/libr_trades.png",
537+
"file": "minecraft:gui/sprites/interfaces/villagers/libr_trades.png",
522538
"height": 167,
523539
"ascent": 14,
524540
"chars": ["\uEe03"]
525541
},
526542
{
527543
"type": "bitmap",
528-
"file": "minecraft:gui/container/villagers/libr_counter.png",
544+
"file": "minecraft:gui/sprites/interfaces/villagers/libr_counter.png",
529545
"height": 167,
530546
"ascent": 14,
531547
"chars": ["\uEe04"]

‎illyriarp/assets/minecraft/polytone/gui_modifiers/anvil.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"target_type": "menu_id",
3+
"target": "anvil",
4+
"title_y_offset": -2000,
5+
"label_y_offset": -2000
6+
}

‎illyriarp/assets/minecraft/polytone/gui_modifiers/blast_furnace.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"target_type": "menu_id",
3+
"target": "blast_furnace",
4+
"title_y_offset": -2000,
5+
"label_y_offset": -2000,
6+
"sprites": [
7+
{
8+
"x": 10,
9+
"y": -105,
10+
"z": -500,
11+
"width": 86,
12+
"height": 35,
13+
"texture": "minecraft:interfaces/blast_furnace_hat"
14+
}
15+
]
16+
}

‎illyriarp/assets/minecraft/polytone/gui_modifiers/brewing_stand.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"target_type": "menu_id",
3+
"target": "brewing_stand",
4+
"title_y_offset": -2000,
5+
"label_y_offset": -2000,
6+
"sprites": [
7+
{
8+
"x": -221,
9+
"y": -83,
10+
"z": -500,
11+
"width": 133,
12+
"height": 166,
13+
"texture": "minecraft:interfaces/brewing_guide"
14+
}
15+
]
16+
}

‎illyriarp/assets/minecraft/polytone/gui_modifiers/cartography_table.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"target_type": "menu_id",
3+
"target": "cartography_table",
4+
"title_y_offset": -2000,
5+
"label_y_offset": -2000,
6+
"sprites": [
7+
{
8+
"x": -61,
9+
"y": -99,
10+
"z": -500,
11+
"width": 36,
12+
"height": 32,
13+
"texture": "minecraft:interfaces/cartography_lantern"
14+
}
15+
]
16+
}

‎illyriarp/assets/minecraft/polytone/gui_modifiers/chests/TEXT_chest.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"target_type": "screen_title",
3+
"target": "container.chestno",
4+
"title_y_offset": -2000,
5+
"label_y_offset": -2000,
6+
"texts": [
7+
{
8+
"x": -92,
9+
"y": -94,
10+
"z": -500,
11+
"text": "\uEC01"
12+
}
13+
]
14+
}

‎illyriarp/assets/minecraft/polytone/gui_modifiers/chests/barrel.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"target_type": "screen_title",
3+
"target": "container.barrel",
4+
"title_y_offset": -2000,
5+
"label_y_offset": -2000,
6+
"sprites": [
7+
{
8+
"x": -87,
9+
"y": -85,
10+
"z": -500,
11+
"width": 176,
12+
"height": 83,
13+
"texture": "minecraft:interfaces/chests/barrel"
14+
}
15+
]
16+
}

‎illyriarp/assets/minecraft/polytone/gui_modifiers/chests/boat_acacia.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"target_type": "screen_title",
3+
"target": "item.minecraft.acacia_chest_boat",
4+
"title_y_offset": -2000,
5+
"label_y_offset": -2000,
6+
"sprites": [
7+
{
8+
"x": -125,
9+
"y": -94,
10+
"z": -500,
11+
"width": 250,
12+
"height": 174,
13+
"texture": "minecraft:interfaces/chests/boat_acacia"
14+
}
15+
]
16+
}

‎illyriarp/assets/minecraft/polytone/gui_modifiers/chests/boat_bamboo.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"target_type": "screen_title",
3+
"target": "item.minecraft.bamboo_chest_raft",
4+
"title_y_offset": -2000,
5+
"label_y_offset": -2000,
6+
"sprites": [
7+
{
8+
"x": -125,
9+
"y": -94,
10+
"z": -500,
11+
"width": 250,
12+
"height": 174,
13+
"texture": "minecraft:interfaces/chests/boat_bamboo"
14+
}
15+
]
16+
}

0 commit comments

Comments
 (0)