Skip to content

Commit 7053b14

Browse files
misodemisode
committed
Merge branch 'master' into update-26.1
2 parents 971c84a + 486720b commit 7053b14

62 files changed

Lines changed: 1127 additions & 351 deletions

Some content is hidden

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

‎gm4/modeldata_registry.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,6 @@
717717
"gm4_animi_shamir:shamir/animi": 124
718718
},
719719
"golden_chestplate": {
720-
"gm4_scuba_gear:item/scuba_tank": 1,
721720
"gm4_zauber_cauldrons:item/zauber_armor/health_boost": 2,
722721
"gm4_zauber_cauldrons:item/zauber_armor/attack_boost": 3,
723722
"gm4_zauber_cauldrons:item/zauber_armor/speed_boost": 4,
@@ -1027,9 +1026,7 @@
10271026
},
10281027
"leather_boots": {
10291028
"gm4_boots_of_ostara:item/boots_of_ostara": 1,
1030-
"gm4_scuba_gear:item/flippers": 2,
10311029
"gm4_boots_of_ostara:gui/advancement/boots_of_ostara": 3,
1032-
"gm4_boots_of_ostara:item/flippers_of_ostara": 4,
10331030
"gm4_boots_of_ostara:guidebook_icon/boots_of_ostara": 5,
10341031
"gm4_weighted_armour:shamir/helious": 103,
10351032
"gm4_metallurgy:shamir/defuse": 106,
@@ -1349,7 +1346,6 @@
13491346
"gm4_heart_canisters:gui/advancement/heart_canisters_max": 6,
13501347
"gm4_heart_canisters:item/heart_canister_tier_1": 7,
13511348
"gm4_heart_canisters:item/heart_canister_tier_2": 8,
1352-
"gm4_scuba_gear:item/scuba_helmet": 9,
13531349
"gm4_heart_canisters:guidebook_icon/heart_canisters": 10,
13541350
"gm4_zauber_cauldrons:item/crystal/speed": 12,
13551351
"gm4_zauber_cauldrons:item/crystal/regeneration": 13,
@@ -1375,7 +1371,6 @@
13751371
"gm4_tnt_landmines:item/tnt_landmine_crafting_table": 45,
13761372
"gm4_tnt_landmines:item/tnt_landmine_netherrack": 46,
13771373
"gm4_tnt_landmines:item/tnt_landmine_invisible": 47,
1378-
"gm4_scuba_gear:gui/advancement/scuba_gear": 48,
13791374
"gm4_metallurgy:gui/advancement/metallurgy_blast_ore": 49,
13801375
"gm4_metallurgy:gui/advancement/metallurgy_cast": 50,
13811376
"gm4_relocators:gui/advancement/relocators": 51,

‎gm4/skin_cache.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -706,13 +706,13 @@
706706
},
707707
"gm4_scuba_gear:scuba_helmet": {
708708
"uuid": [
709-
-68336571,
710-
19415274,
711-
-1818733955,
712-
-1859858872
709+
-1411342862,
710+
-1228846809,
711+
-1234065086,
712+
1387403600
713713
],
714-
"value": "ewogICJ0aW1lc3RhbXAiIDogMTYyODUzNDg1MTY2MCwKICAicHJvZmlsZUlkIiA6ICJmMGIzYmRkMjEwNDg0Y2VlYjZhNTQyYmZiOGEyNTdiMiIsCiAgInByb2ZpbGVOYW1lIiA6ICJBbm9uaW1ZVFQiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDExZTAyOTJlZTgzZDUwZTQzM2MxNTkxNzE5OGZhNDRjYjZkMTMyODhiNmFhNjZmYmUzY2QxZTZkZjY1OGRhNCIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9",
715-
"hash": "9b2ea1635d53878417688b505a8875422100d314",
714+
"value": "eyd0ZXh0dXJlcyc6IHsnU0tJTic6IHsndXJsJzogJ2h0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZWY2YWVlYzM2ZjQ2MmRlYjUzOTc0NWFhMzY4MThiNmQ0NGIwYzk1OGViNTY4NTJlYTAyZTM0YzMzZmRiZGZmMCd9fX0=",
715+
"hash": "4a257159fd9d30ceff7484d393efe9ed2e399abf",
716716
"parent_module": "gm4_scuba_gear"
717717
},
718718
"gm4_smelteries:smeltery": {

‎gm4_scuba_gear/README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
Ease ocean exploration with craftable scuba gear!<!--$pmc:headerSize-->
44

55
### Features
6-
- Adds Flippers which allow players to swim faster in Water.
7-
- Adds the SCUBA Tank and Helmet which gives 4 minutes of conduit power when submerged.
8-
- When worn on land, the player is given a slowness debuff.
6+
- Adds the Wetsuit and Flippers which aids players in underwater movement.
7+
- When wearing Flippers on land, players are given a slowness debuff.
8+
- Adds the SCUBA Tank which adds 4 minutes of submerged air time.
9+
- Adds the SCUBA Helmet which hastens underwater mining.

‎gm4_scuba_gear/assets/gm4_scuba_gear/equipment/scuba.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"layers": {
3+
"humanoid": [
4+
{
5+
"texture": "gm4_scuba_gear:scuba"
6+
},
7+
{
8+
"dyeable": {
9+
"color_when_undyed": 2321353
10+
},
11+
"texture": "gm4_scuba_gear:scuba_overlay"
12+
}
13+
],
14+
"humanoid_leggings": [
15+
{
16+
"texture": "gm4_scuba_gear:scuba"
17+
},
18+
{
19+
"dyeable": {
20+
"color_when_undyed": 2321353
21+
},
22+
"texture": "gm4_scuba_gear:scuba_overlay"
23+
}
24+
]
25+
}
26+
}

‎gm4_scuba_gear/assets/gm4_scuba_gear/items/flippers.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"model": {
3+
"type": "minecraft:model",
4+
"model": "gm4_scuba_gear:item/flippers",
5+
"tints": [
6+
{
7+
"type": "minecraft:dye",
8+
"default": -14455863
9+
}
10+
]
11+
}
12+
}

‎gm4_scuba_gear/assets/gm4_scuba_gear/items/scuba_helmet.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"model": {
3+
"type": "minecraft:model",
4+
"model": "gm4_scuba_gear:item/scuba_helmet"
5+
}
6+
}

‎gm4_scuba_gear/assets/gm4_scuba_gear/items/scuba_tank.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"model": {
3+
"type": "minecraft:model",
4+
"model": "gm4_scuba_gear:item/scuba_tank"
5+
}
6+
}

‎gm4_scuba_gear/assets/gm4_scuba_gear/items/wetsuit.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"model": {
3+
"type": "minecraft:model",
4+
"model": "gm4_scuba_gear:item/wetsuit",
5+
"tints": [
6+
{
7+
"type": "minecraft:dye",
8+
"default": -14455863
9+
}
10+
]
11+
}
12+
}

‎gm4_scuba_gear/assets/gm4_scuba_gear/models/item/flippers.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "gm4_scuba_gear:item/flippers",
5+
"layer1": "gm4_scuba_gear:item/flippers_overlay"
6+
}
7+
}

‎gm4_scuba_gear/assets/gm4_scuba_gear/models/item/scuba_helmet.json‎

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

0 commit comments

Comments
 (0)