Skip to content

Commit 063f990

Browse files
EpyonProjectsBPR02misode
authored
SCUBA Gear rework (#1137)
* Initial commit * Finished initial draft * Update guidebook description to match readme * Fixed texts and unified attributes - updated helmet texture * Fix recipe test * Oh my goodness, what is this, a commit? - I should be asleep - Addressed all of the concerns Beeps had - Should have checked again at literally any point because this really was not much * Actually address all of the changes Beeps had - Before putting it onto public server * Fix Scuba advancement for all gear * Add custom armor assets (RP required) Requires PR #1215 * fix recipe tank trim * Use item_model instead of custom_model_data This will make all items appear as missing textures. It's possible to make them look like leather armor without the RP, but making the item sprites missing textures should "force" the RP to be required. This is important because without the RP the armor is invisible, so we should highly discourage that by making the item textures missing without the RP. I.e. make it basically unplayable without the RP so people don't get invisible armor * remove flippers of ostara * Swimming up with the wetsuit actually gives upward gravity instead of downward * Fix review comments * Expand note * Remove old references to scuba_helmet player head --------- Co-authored-by: BPR02 <dev@bpr02.com> Co-authored-by: Misode <misoloo64@gmail.com>
1 parent 064201e commit 063f990

File tree

77 files changed

+1356
-444
lines changed

Some content is hidden

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

77 files changed

+1356
-444
lines changed

‎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_boots_of_ostara/assets/translations.csv‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ advancement.gm4.boots_of_ostara.description,Wear the Boots of Ostara
33
advancement.gm4.boots_of_ostara.title,Green Feet
44
item.gm4.boots_of_ostara,Boots of Ostara
55
item.gm4.boots_of_ostara.lore,Brings abundance beneath you!
6-
item.gm4.flippers_of_ostara,Flippers of Ostara
76
text.gm4.guidebook.module_desc.boots_of_ostara,"A pair of boots every gardener would love to have! Boots of Ostara allow you to easily spread Grass and Moss, and they even stop the Desire Lines module from creating that pesky dirt."
87
text.gm4.guidebook.boot_of_ostara.description,Boots of Ostara can be crafted to aid in the spreading of grass and moss.\n\nThe boots can be crafted in a Custom Crafter.
98
text.gm4.guidebook.boots_of_ostara.crafting,The recipe for the Boots of Ostara is as follows:

‎gm4_boots_of_ostara/beet.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ meta:
2323
template: generated_overlay
2424
broadcast:
2525
- reference: item/boots_of_ostara
26-
- reference: item/flippers_of_ostara
2726
- item: leather_boots
2827
reference: gui/advancement/boots_of_ostara
2928
template:

‎gm4_boots_of_ostara/data/gm4_boots_of_ostara/item_modifier/boots_of_ostara.json‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -51,47 +51,5 @@
5151
"italic": true
5252
}
5353
]
54-
},
55-
{
56-
"function": "minecraft:set_components",
57-
"components": {
58-
"minecraft:custom_model_data": "gm4_scuba_gear:item/flippers"
59-
},
60-
"conditions": [
61-
{
62-
"condition": "minecraft:value_check",
63-
"value": {
64-
"type": "minecraft:score",
65-
"target": {
66-
"type": "minecraft:fixed",
67-
"name": "$boa_flippers"
68-
},
69-
"score": "gm4_crafting"
70-
},
71-
"range": 1
72-
}
73-
]
74-
},
75-
{
76-
"function": "minecraft:set_name",
77-
"name": {
78-
"translate": "item.gm4.flippers_of_ostara",
79-
"fallback": "Flippers of Ostara",
80-
"italic": false
81-
},
82-
"conditions": [
83-
{
84-
"condition": "minecraft:value_check",
85-
"value": {
86-
"type": "minecraft:score",
87-
"target": {
88-
"type": "minecraft:fixed",
89-
"name": "$boa_flippers"
90-
},
91-
"score": "gm4_crafting"
92-
},
93-
"range": 1
94-
}
95-
]
9654
}
9755
]

‎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+
}

0 commit comments

Comments
 (0)