Skip to content

Commit 22d61ce

Browse files
illyrius666illyrius666
committed
Revert "v1.8.3 (#85)"
This reverts commit 955b069.
1 parent 955b069 commit 22d61ce

File tree

89 files changed

+517
-473
lines changed

Some content is hidden

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

89 files changed

+517
-473
lines changed

‎illyriarp/assets/custom/models/item/tools/chisel.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": { "layer0": "custom:item/tools/chisel" }
4+
}

‎illyriarp/assets/custom/textures/item/tools/chisel.png

796 Bytes
Loading

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

Lines changed: 2 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -355,12 +355,6 @@
355355
"\uE994": -16
356356
}
357357
},
358-
{
359-
"type": "space",
360-
"advances": {
361-
"\uE993": 16
362-
}
363-
},
364358
{
365359
"type": "bitmap",
366360
"file": "minecraft:gui/sprites/interfaces/chests/chest.png",
@@ -396,112 +390,6 @@
396390
"ascent": 34,
397391
"chars": ["\uEC05"]
398392
},
399-
{
400-
"type": "bitmap",
401-
"file": "minecraft:gui/sprites/interfaces/chests_slots/chest.png",
402-
"height": 91,
403-
"ascent": 23,
404-
"chars": ["\uED01"]
405-
},
406-
{
407-
"type": "bitmap",
408-
"file": "minecraft:gui/sprites/interfaces/chests_slots/chest_minecart.png",
409-
"height": 105,
410-
"ascent": 23,
411-
"chars": ["\uED02"]
412-
},
413-
{
414-
"type": "bitmap",
415-
"file": "minecraft:gui/sprites/interfaces/chests_slots/barrel.png",
416-
"height": 83,
417-
"ascent": 14,
418-
"chars": ["\uED03"]
419-
},
420-
{
421-
"type": "bitmap",
422-
"file": "minecraft:gui/sprites/interfaces/chests_slots/ender_chest.png",
423-
"height": 91,
424-
"ascent": 23,
425-
"chars": ["\uED04"]
426-
},
427-
{
428-
"type": "bitmap",
429-
"file": "minecraft:gui/sprites/interfaces/chests_slots/large_chest.png",
430-
"height": 158,
431-
"ascent": 34,
432-
"chars": ["\uED05"]
433-
},
434-
{
435-
"type": "bitmap",
436-
"file": "minecraft:gui/sprites/interfaces/chests/boat_oak.png",
437-
"height": 174,
438-
"ascent": 23,
439-
"chars": ["\uEB01"]
440-
},
441-
{
442-
"type": "bitmap",
443-
"file": "minecraft:gui/sprites/interfaces/chests/boat_spruce.png",
444-
"height": 174,
445-
"ascent": 23,
446-
"chars": ["\uEB02"]
447-
},
448-
{
449-
"type": "bitmap",
450-
"file": "minecraft:gui/sprites/interfaces/chests/boat_birch.png",
451-
"height": 174,
452-
"ascent": 23,
453-
"chars": ["\uEB03"]
454-
},
455-
{
456-
"type": "bitmap",
457-
"file": "minecraft:gui/sprites/interfaces/chests/boat_dark_oak.png",
458-
"height": 174,
459-
"ascent": 23,
460-
"chars": ["\uEB04"]
461-
},
462-
{
463-
"type": "bitmap",
464-
"file": "minecraft:gui/sprites/interfaces/chests/boat_acacia.png",
465-
"height": 174,
466-
"ascent": 23,
467-
"chars": ["\uEB05"]
468-
},
469-
{
470-
"type": "bitmap",
471-
"file": "minecraft:gui/sprites/interfaces/chests/boat_jungle.png",
472-
"height": 174,
473-
"ascent": 23,
474-
"chars": ["\uEB06"]
475-
},
476-
{
477-
"type": "bitmap",
478-
"file": "minecraft:gui/sprites/interfaces/chests/boat_mangrove.png",
479-
"height": 174,
480-
"ascent": 23,
481-
"chars": ["\uEB07"]
482-
},
483-
{
484-
"type": "bitmap",
485-
"file": "minecraft:gui/sprites/interfaces/chests/boat_cherry.png",
486-
"height": 174,
487-
"ascent": 23,
488-
"chars": ["\uEB08"]
489-
},
490-
{
491-
"type": "bitmap",
492-
"file": "minecraft:gui/sprites/interfaces/chests/boat_bamboo.png",
493-
"height": 174,
494-
"ascent": 23,
495-
"chars": ["\uEB09"]
496-
},
497-
{
498-
"type": "bitmap",
499-
"file": "minecraft:gui/sprites/interfaces/chests/boat_pale.png",
500-
"height": 174,
501-
"ascent": 23,
502-
"chars": ["\uEB10"]
503-
},
504-
505393
{
506394
"type": "bitmap",
507395
"file": "minecraft:gui/sprites/interfaces/hopper_minecart.png",
@@ -586,34 +474,15 @@
586474
"ascent": 27,
587475
"chars": ["\uEc21"]
588476
},
589-
{
590-
"type": "bitmap",
591-
"file": "minecraft:gui/sprites/interfaces/beacon_left.png",
592-
"height": 152,
593-
"ascent": -50,
594-
"chars": ["\uEc22"]
595-
},
596-
{
597-
"type": "bitmap",
598-
"file": "minecraft:gui/sprites/interfaces/beacon_noggin.png",
599-
"height": 24,
600-
"ascent": 0,
601-
"chars": ["\uEc23"]
602-
},
603-
{
604-
"type": "bitmap",
605-
"file": "minecraft:gui/sprites/interfaces/beacon_right.png",
606-
"height": 152,
607-
"ascent": 27,
608-
"chars": ["\uEc24"]
609-
},
477+
610478
{
611479
"type": "bitmap",
612480
"file": "minecraft:gui/sprites/interfaces/trades.png",
613481
"height": 140,
614482
"ascent": -5,
615483
"chars": ["\uEe00"]
616484
},
485+
617486
{
618487
"type": "bitmap",
619488
"file": "minecraft:gui/sprites/interfaces/villagers/base_trades.png",
@@ -641,20 +510,6 @@
641510
"height": 167,
642511
"ascent": 14,
643512
"chars": ["\uEe04"]
644-
},
645-
{
646-
"type": "bitmap",
647-
"file": "minecraft:gui/sprites/interfaces/big.png",
648-
"height": 167,
649-
"ascent": 0,
650-
"chars": ["\uEc99"]
651-
},
652-
{
653-
"type": "bitmap",
654-
"file": "minecraft:gui/sprites/interfaces/big.png",
655-
"height": 167,
656-
"ascent": -163,
657-
"chars": ["\uEc98"]
658513
}
659514
]
660515
}

‎illyriarp/assets/minecraft/lang/en_us.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,20 @@
4040

4141
"entity.minecraft.chest_minecart": "§f\uE999\uE999\uE998\uEd02",
4242
"entity.minecraft.hopper_minecart": "§f\uE999\uE999\uE999\uE997\uEc10",
43+
"entity.minecraft.villager.armorer": "§f\uEe01\uE995\uEe02",
44+
"entity.minecraft.villager.butcher": "§f\uEe01\uE995\uEe02",
45+
"entity.minecraft.villager.cartographer": "§f\uEe01\uE995\uEe02",
46+
"entity.minecraft.villager.cleric": "§f\uEe01\uE995\uEe02",
47+
"entity.minecraft.villager.farmer": "§f\uEe01\uE995\uEe02",
48+
"entity.minecraft.villager.fisherman": "§f\uEe01\uE995\uEe02",
49+
"entity.minecraft.villager.fletcher": "§f\uEe01\uE995\uEe02",
50+
"entity.minecraft.villager.leatherworker": "§f\uEe01\uE995\uEe02",
51+
"entity.minecraft.villager.librarian": "§f\uEe03\uE995\uEe04",
52+
"entity.minecraft.villager.mason": "§f\uEe01\uE995\uEe02",
53+
"entity.minecraft.villager.shepherd": "§f\uEe01\uE995\uEe02",
4354
"entity.minecraft.villager.template": "§f\uEe01\uE995\uEe02",
44-
"entity.minecraft.villager.armorer": "§f\uE994\uE994\uE994\uE994\uE994\uE996\uE995\uEe01\uE995\uEe02",
45-
"entity.minecraft.villager.butcher": "§f\uE994\uE994\uE994\uE994\uE994\uE996\uE995\uEe01\uE995\uEe02",
46-
"entity.minecraft.villager.cartographer": "§f\uE994\uE994\uE994\uE994\uE994\uE996\uE995\uEe01\uE995\uEe02",
47-
"entity.minecraft.villager.cleric": "§f\uE994\uE994\uE994\uE994\uE994\uE996\uE995\uEe01\uE995\uEe02",
48-
"entity.minecraft.villager.farmer": "§f\uE994\uE994\uE994\uE994\uE994\uE996\uE995\uEe01\uE995\uEe02",
49-
"entity.minecraft.villager.fisherman": "§f\uE994\uE994\uE994\uE994\uE994\uE996\uE995\uEe01\uE995\uEe02",
50-
"entity.minecraft.villager.fletcher": "§f\uE994\uE994\uE994\uE994\uE994\uE996\uE995\uEe01\uE995\uEe02",
51-
"entity.minecraft.villager.leatherworker": "§f\uE994\uE994\uE994\uE994\uE994\uE996\uE995\uEe01\uE995\uEe02",
52-
"entity.minecraft.villager.librarian": "§f\uE994\uE994\uE994\uE994\uE994\uE996\uE995\uEe03\uE995\uEe04",
53-
"entity.minecraft.villager.mason": "§f\uE994\uE994\uE994\uE994\uE994\uE996\uE995\uEe01\uE995\uEe02",
54-
"entity.minecraft.villager.shepherd": "§f\uE994\uE994\uE994\uE994\uE994\uE996\uE995\uEe01\uE995\uEe02",
55-
"entity.minecraft.villager.toolsmith": "§f\uE994\uE994\uE994\uE994\uE994\uE996\uE995\uEe01\uE995\uEe02",
56-
"entity.minecraft.villager.weaponsmith": "§f\uE994\uE994\uE994\uE994\uE994\uE996\uE995\uEe01\uE995\uEe02",
55+
"entity.minecraft.villager.toolsmith": "§f\uEe01\uE995\uEe02",
56+
"entity.minecraft.villager.weaponsmith": "§f\uEe01\uE995\uEe02",
5757
"entity.minecraft.wandering_trader": "§f\uE994\uE994\uE994\uE994\uE994\uE995\uE995\uE995\uE995\uE999\uE999\uE998\uEe01\uE995\uEe02",
5858

5959
"container.barrel": "§f\uE999\uEd03",

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

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

‎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: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +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": "textures/interfaces/brewing_guide.png"
14-
}
15-
]
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+
]
1616
}

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +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": "textures/interfaces/cartography_lantern.png"
14-
}
15-
]
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+
]
1616
}

‎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: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +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": "textures/interfaces/chests/barrel.png"
14-
}
15-
]
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+
]
1616
}

0 commit comments

Comments
 (0)