diff options
| author | Oliver <42757516+carelesshippo@users.noreply.github.com> | 2021-04-17 17:39:32 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-17 17:39:32 -0600 |
| commit | 59d3bf67d93d0204d0dc493508d9d9c2a24cd10b (patch) | |
| tree | 651eb8e6b6431c813e4dcfb9272a3933fabb6f1d /src/main/resources | |
| parent | 52182481737f4e8aea7f9fa6f0d14883031ca22d (diff) | |
| parent | 03b9a8dbcc1ebd5f8c39e4733a741a4092ab0a1d (diff) | |
| download | NotEnoughUpdates-59d3bf67d93d0204d0dc493508d9d9c2a24cd10b.tar.gz NotEnoughUpdates-59d3bf67d93d0204d0dc493508d9d9c2a24cd10b.tar.bz2 NotEnoughUpdates-59d3bf67d93d0204d0dc493508d9d9c2a24cd10b.zip | |
Merge pull request #1 from Moulberry/master
PRE26
Diffstat (limited to 'src/main/resources')
38 files changed, 3011 insertions, 2 deletions
diff --git a/src/main/resources/assets/notenoughupdates/capes/alexxoffi.png b/src/main/resources/assets/notenoughupdates/capes/alexxoffi.png Binary files differnew file mode 100644 index 00000000..dd81d641 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/capes/alexxoffi.png diff --git a/src/main/resources/assets/notenoughupdates/capes/alexxoffi_preview.png b/src/main/resources/assets/notenoughupdates/capes/alexxoffi_preview.png Binary files differnew file mode 100644 index 00000000..146e487f --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/capes/alexxoffi_preview.png diff --git a/src/main/resources/assets/notenoughupdates/capes/dsm.png b/src/main/resources/assets/notenoughupdates/capes/dsm.png Binary files differindex 0b691c9c..c452db0d 100644 --- a/src/main/resources/assets/notenoughupdates/capes/dsm.png +++ b/src/main/resources/assets/notenoughupdates/capes/dsm.png diff --git a/src/main/resources/assets/notenoughupdates/capes/dsm_preview.png b/src/main/resources/assets/notenoughupdates/capes/dsm_preview.png Binary files differnew file mode 100644 index 00000000..7589e2a9 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/capes/dsm_preview.png diff --git a/src/main/resources/assets/notenoughupdates/capes/furf.png b/src/main/resources/assets/notenoughupdates/capes/furf.png Binary files differindex ce9f4c19..61f1e45a 100644 --- a/src/main/resources/assets/notenoughupdates/capes/furf.png +++ b/src/main/resources/assets/notenoughupdates/capes/furf.png diff --git a/src/main/resources/assets/notenoughupdates/capes/furf_preview.png b/src/main/resources/assets/notenoughupdates/capes/furf_preview.png Binary files differindex a4ee6851..c2a2a106 100644 --- a/src/main/resources/assets/notenoughupdates/capes/furf_preview.png +++ b/src/main/resources/assets/notenoughupdates/capes/furf_preview.png diff --git a/src/main/resources/assets/notenoughupdates/capes/jakethybro.png b/src/main/resources/assets/notenoughupdates/capes/jakethybro.png Binary files differnew file mode 100644 index 00000000..3e957503 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/capes/jakethybro.png diff --git a/src/main/resources/assets/notenoughupdates/capes/jakethybro_preview.png b/src/main/resources/assets/notenoughupdates/capes/jakethybro_preview.png Binary files differnew file mode 100644 index 00000000..96483e98 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/capes/jakethybro_preview.png diff --git a/src/main/resources/assets/notenoughupdates/capes/parallax.png b/src/main/resources/assets/notenoughupdates/capes/parallax.png Binary files differnew file mode 100644 index 00000000..b7b4a027 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/capes/parallax.png diff --git a/src/main/resources/assets/notenoughupdates/capes/zera.png b/src/main/resources/assets/notenoughupdates/capes/zera.png Binary files differnew file mode 100644 index 00000000..74121976 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/capes/zera.png diff --git a/src/main/resources/assets/notenoughupdates/capes/zera_preview.png b/src/main/resources/assets/notenoughupdates/capes/zera_preview.png Binary files differnew file mode 100644 index 00000000..684cbd9e --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/capes/zera_preview.png diff --git a/src/main/resources/assets/notenoughupdates/invbuttons/editor.png b/src/main/resources/assets/notenoughupdates/invbuttons/editor.png Binary files differnew file mode 100644 index 00000000..0d58e0c9 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/invbuttons/editor.png diff --git a/src/main/resources/assets/notenoughupdates/invbuttons/expanded_inventory.png b/src/main/resources/assets/notenoughupdates/invbuttons/expanded_inventory.png Binary files differnew file mode 100644 index 00000000..d941fa6e --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/invbuttons/expanded_inventory.png diff --git a/src/main/resources/assets/notenoughupdates/invbuttons/extraicons.json b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons.json new file mode 100644 index 00000000..5a99f3f0 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons.json @@ -0,0 +1,18 @@ +{ + "baubles ring": "baubles", + "baubles gold ring": "baubles_gold", + "cross x": "cross", + "green check mark": "green_check", + "white check mark": "white_check", + "question mark help": "question", + "settings cog config": "settings", + "accessory ring": "accessory", + "accessory ring gold": "accessory_gold", + "armor chestplate": "armor", + "armor gold chestplate": "armor_gold", + "pet cat": "pet", + "pet cat gold": "pet_gold", + "skyblock menu": "skyblock_menu", + "recipe book": "recipe", + "search glass": "search" +}
\ No newline at end of file diff --git a/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/accessory.png b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/accessory.png Binary files differnew file mode 100644 index 00000000..867b00fd --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/accessory.png diff --git a/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/accessory_gold.png b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/accessory_gold.png Binary files differnew file mode 100644 index 00000000..70f8558a --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/accessory_gold.png diff --git a/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/armor.png b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/armor.png Binary files differnew file mode 100644 index 00000000..69edc534 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/armor.png diff --git a/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/armor_gold.png b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/armor_gold.png Binary files differnew file mode 100644 index 00000000..ee606367 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/armor_gold.png diff --git a/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/baubles.png b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/baubles.png Binary files differnew file mode 100644 index 00000000..9c1f5035 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/baubles.png diff --git a/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/baubles_gold.png b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/baubles_gold.png Binary files differnew file mode 100644 index 00000000..963ce85d --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/baubles_gold.png diff --git a/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/cross.png b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/cross.png Binary files differnew file mode 100644 index 00000000..6ee727a6 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/cross.png diff --git a/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/green_check.png b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/green_check.png Binary files differnew file mode 100644 index 00000000..5c5ffb45 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/green_check.png diff --git a/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/pet.png b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/pet.png Binary files differnew file mode 100644 index 00000000..9aebf1fd --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/pet.png diff --git a/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/pet_gold.png b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/pet_gold.png Binary files differnew file mode 100644 index 00000000..f86e367a --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/pet_gold.png diff --git a/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/question.png b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/question.png Binary files differnew file mode 100644 index 00000000..3f9fe254 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/question.png diff --git a/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/recipe.png b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/recipe.png Binary files differnew file mode 100644 index 00000000..4eaca5c8 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/recipe.png diff --git a/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/search.png b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/search.png Binary files differnew file mode 100644 index 00000000..70a0476e --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/search.png diff --git a/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/settings.png b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/settings.png Binary files differnew file mode 100644 index 00000000..481a0588 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/settings.png diff --git a/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/skyblock_menu.png b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/skyblock_menu.png Binary files differnew file mode 100644 index 00000000..c0f62308 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/skyblock_menu.png diff --git a/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/white_check.png b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/white_check.png Binary files differnew file mode 100644 index 00000000..d646e498 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/invbuttons/extraicons/white_check.png diff --git a/src/main/resources/assets/notenoughupdates/invbuttons/presets.json b/src/main/resources/assets/notenoughupdates/invbuttons/presets.json new file mode 100644 index 00000000..7692fc07 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/invbuttons/presets.json @@ -0,0 +1,2729 @@ +{ + "Empty":[ + { + "x":87, + "y":63, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"", + "icon":"" + }, + { + "x":108, + "y":63, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"", + "icon":"" + }, + { + "x":129, + "y":63, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"", + "icon":"" + }, + { + "x":150, + "y":63, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"", + "icon":"" + }, + { + "x":87, + "y":5, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":108, + "y":5, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":129, + "y":5, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":150, + "y":5, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":87, + "y":25, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":105, + "y":25, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":87, + "y":43, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":105, + "y":43, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":143, + "y":35, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":60, + "y":8, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"", + "icon":"" + }, + { + "x":60, + "y":60, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":26, + "y":8, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":26, + "y":60, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":2, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":22, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":42, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":62, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":-84, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":-64, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":true, + "backgroundIndex":0, + "command":"", + "icon":"" + }, + { + "x":2, + "y":-44, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":-24, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":4, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":25, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":46, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":67, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":88, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":109, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":130, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":151, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":22, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":42, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":62, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":-84, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":-64, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":-44, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":-24, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":4, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":25, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":46, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":67, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":88, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":109, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":130, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":151, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + } + ], + "Empty (Dark)":[ + { + "x":87, + "y":63, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"", + "icon":"" + }, + { + "x":108, + "y":63, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"", + "icon":"" + }, + { + "x":129, + "y":63, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"", + "icon":"" + }, + { + "x":150, + "y":63, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"", + "icon":"" + }, + { + "x":87, + "y":5, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":108, + "y":5, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":129, + "y":5, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":150, + "y":5, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":87, + "y":25, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":105, + "y":25, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":87, + "y":43, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":105, + "y":43, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":143, + "y":35, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":60, + "y":8, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"", + "icon":"" + }, + { + "x":60, + "y":60, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":26, + "y":8, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":26, + "y":60, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":2, + "y":2, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":2, + "y":22, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":2, + "y":42, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":2, + "y":62, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":2, + "y":-84, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":true, + "backgroundIndex":1, + "command":"" + }, + { + "x":2, + "y":-64, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":true, + "backgroundIndex":1, + "command":"", + "icon":"" + }, + { + "x":2, + "y":-44, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":true, + "backgroundIndex":1, + "command":"" + }, + { + "x":2, + "y":-24, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":true, + "backgroundIndex":1, + "command":"" + }, + { + "x":4, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":25, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":46, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":67, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":88, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":109, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":130, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":151, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":-19, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":-19, + "y":22, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":-19, + "y":42, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":-19, + "y":62, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":1, + "command":"" + }, + { + "x":-19, + "y":-84, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":1, + "command":"" + }, + { + "x":-19, + "y":-64, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":1, + "command":"" + }, + { + "x":-19, + "y":-44, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":1, + "command":"" + }, + { + "x":-19, + "y":-24, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":1, + "command":"" + }, + { + "x":4, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":1, + "command":"" + }, + { + "x":25, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":1, + "command":"" + }, + { + "x":46, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":1, + "command":"" + }, + { + "x":67, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":1, + "command":"" + }, + { + "x":88, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":1, + "command":"" + }, + { + "x":109, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":1, + "command":"" + }, + { + "x":130, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":1, + "command":"" + }, + { + "x":151, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":1, + "command":"" + } + ], + "Simple":[ + { + "x":87, + "y":63, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"/warp home", + "icon":"skull:c9c8881e42915a9d29bb61a16fb26d059913204d265df5b439b3d792acd56" + }, + { + "x":108, + "y":63, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"/warp hub", + "icon":"skull:d7cc6687423d0570d556ac53e0676cb563bbdd9717cd8269bdebed6f6d4e7bf8" + }, + { + "x":129, + "y":63, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"/enderchest", + "icon":"ENDER_CHEST" + }, + { + "x":150, + "y":63, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"/pets", + "icon":"extra:pet_gold" + }, + { + "x":87, + "y":5, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":108, + "y":5, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":129, + "y":5, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":150, + "y":5, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":87, + "y":25, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":105, + "y":25, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":87, + "y":43, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":105, + "y":43, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":143, + "y":35, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":60, + "y":8, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":2, + "command":"/wardrobe", + "icon":"extra:baubles_gold" + }, + { + "x":60, + "y":60, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":26, + "y":8, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":26, + "y":60, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":2, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":22, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":42, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":62, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":-84, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":-64, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":true, + "backgroundIndex":0, + "command":"", + "icon":"BONE" + }, + { + "x":2, + "y":-44, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":-24, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":4, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":25, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":46, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":67, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":88, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":109, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":130, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":151, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":22, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":42, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":62, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":-84, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":-64, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":-44, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":-24, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":4, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":25, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":46, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":67, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":88, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":109, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":130, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":151, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + } + ], + "All Warps":[ + { + "x":87, + "y":63, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"pets", + "icon":"extra:pet_gold" + }, + { + "x":108, + "y":63, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"/wardrobe", + "icon":"extra:armor" + }, + { + "x":129, + "y":63, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"/enderchest", + "icon":"ENDER_CHEST" + }, + { + "x":150, + "y":63, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"hotm", + "icon":"skull:86f06eaa3004aeed09b3d5b45d976de584e691c0e9cade133635de93d23b9edb" + }, + { + "x":87, + "y":5, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"", + "icon":"GOLD_BLOCK" + }, + { + "x":108, + "y":5, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":129, + "y":5, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":150, + "y":5, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"/pv", + "icon":"PAINTING" + }, + { + "x":87, + "y":25, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":105, + "y":25, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":87, + "y":43, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":105, + "y":43, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":143, + "y":35, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":60, + "y":8, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"", + "icon":"extra:baubles_gold" + }, + { + "x":60, + "y":60, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":26, + "y":8, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":26, + "y":60, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":2, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":false, + "backgroundIndex":0, + "command":"/ah", + "icon":"GOLD_BLOCK" + }, + { + "x":2, + "y":22, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":false, + "backgroundIndex":0, + "command":"/bz", + "icon":"GOLD_BARDING" + }, + { + "x":2, + "y":42, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":62, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":-84, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":true, + "backgroundIndex":0, + "command":"/warp home", + "icon":"skull:c9c8881e42915a9d29bb61a16fb26d059913204d265df5b439b3d792acd56" + }, + { + "x":2, + "y":-64, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":true, + "backgroundIndex":0, + "command":"/warp hub", + "icon":"skull:d7cc6687423d0570d556ac53e0676cb563bbdd9717cd8269bdebed6f6d4e7bf8" + }, + { + "x":2, + "y":-44, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":true, + "backgroundIndex":0, + "command":"/warp dungeon_hub", + "icon":"skull:9b56895b9659896ad647f58599238af532d46db9c1b0389b8bbeb70999dab33d" + }, + { + "x":2, + "y":-24, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":true, + "backgroundIndex":0, + "command":"/warp end", + "icon":"skull:7840b87d52271d2a755dedc82877e0ed3df67dcc42ea479ec146176b02779a5" + }, + { + "x":4, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":25, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":46, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":67, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":88, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":109, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":130, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":151, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":22, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":42, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":62, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":-84, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":-64, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":-44, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":-24, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":4, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"/warp barn", + "icon":"skull:4d3a6bd98ac1833c664c4909ff8d2dc62ce887bdcf3cc5b3848651ae5af6b" + }, + { + "x":25, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"/warp desert", + "icon":"skull:2116b9d8df346a25edd05f842e7a9345beaf16dca4118abf5a68c75bcaae10" + }, + { + "x":46, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"/warp gold", + "icon":"skull:73bc965d579c3c6039f0a17eb7c2e6faf538c7a5de8e60ec7a719360d0a857a9" + }, + { + "x":67, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"/warp deep", + "icon":"skull:569a1f114151b4521373f34bc14c2963a5011cdc25a6554c48c708cd96ebfc" + }, + { + "x":88, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"/warp mines", + "icon":"skull:c754318a3376f470e481dfcd6c83a59aa690ad4b4dd7577fdad1c2ef08d8aee6" + }, + { + "x":109, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"/warp park", + "icon":"skull:a221f813dacee0fef8c59f76894dbb26415478d9ddfc44c2e708a6d3b7549b" + }, + { + "x":130, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"/warp spider", + "icon":"skull:9d7e3b19ac4f3dee9c5677c135333b9d35a7f568b63d1ef4ada4b068b5a25" + }, + { + "x":151, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"/warp nether", + "icon":"skull:38957d5023c937c4c41aa2412d43410bda23cf79a9f6ab36b76fef2d7c429" + } + ], + "More Buttons":[ + { + "x":87, + "y":63, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"/sbmenu", + "icon":"SKYBLOCK_MENU" + }, + { + "x":108, + "y":63, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"enderchest", + "icon":"ENDER_CHEST" + }, + { + "x":129, + "y":63, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"pets", + "icon":"BONE" + }, + { + "x":150, + "y":63, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"effects", + "icon":"POTION" + }, + { + "x":87, + "y":5, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"/recipes", + "icon":"extra:recipe" + }, + { + "x":108, + "y":5, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"/collections", + "icon":"PAINTING" + }, + { + "x":129, + "y":5, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"/scg", + "icon":"BOOK" + }, + { + "x":150, + "y":5, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"/calendar", + "icon":"BOOK_AND_QUILL" + }, + { + "x":87, + "y":25, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"", + "icon":"CHEST" + }, + { + "x":105, + "y":25, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":87, + "y":43, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":105, + "y":43, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":143, + "y":35, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"craft", + "icon":"WORKBENCH" + }, + { + "x":60, + "y":8, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":2, + "command":"/wardrobe", + "icon":"extra:baubles_gold" + }, + { + "x":60, + "y":60, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":26, + "y":8, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":26, + "y":60, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":2, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":false, + "backgroundIndex":0, + "command":"/warp hub", + "icon":"skull:d7cc6687423d0570d556ac53e0676cb563bbdd9717cd8269bdebed6f6d4e7bf8" + }, + { + "x":2, + "y":22, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":false, + "backgroundIndex":0, + "command":"/warp home", + "icon":"skull:c9c8881e42915a9d29bb61a16fb26d059913204d265df5b439b3d792acd56" + }, + { + "x":2, + "y":42, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":62, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":-84, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":true, + "backgroundIndex":0, + "command":"", + "icon":"" + }, + { + "x":2, + "y":-64, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":true, + "backgroundIndex":0, + "command":"", + "icon":"BONE" + }, + { + "x":2, + "y":-44, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":-24, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":4, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":25, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":46, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":67, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":88, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":109, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":130, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":151, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"/ah", + "icon":"GOLD_BLOCK" + }, + { + "x":-19, + "y":22, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"/bz", + "icon":"GOLD_BARDING" + }, + { + "x":-19, + "y":42, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":62, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":-84, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":-64, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":-44, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":-24, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":4, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":25, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":46, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":67, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":88, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":109, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":130, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":151, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + } + ], + "Dungeons":[ + { + "x":87, + "y":63, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"warp dungeon_hub", + "icon":"skull:9b56895b9659896ad647f58599238af532d46db9c1b0389b8bbeb70999dab33d" + }, + { + "x":108, + "y":63, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"reparty", + "icon":"COMMAND" + }, + { + "x":129, + "y":63, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"/p FragRunBot azael_mew azael_mewh", + "icon":"GIANT_FRAGMENT_DIAMOND" + }, + { + "x":150, + "y":63, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"pets", + "icon":"extra:pet_gold" + }, + { + "x":87, + "y":5, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":108, + "y":5, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":129, + "y":5, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":150, + "y":5, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":87, + "y":25, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":105, + "y":25, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":87, + "y":43, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":105, + "y":43, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":143, + "y":35, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":60, + "y":8, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":2, + "command":"/wardrobe", + "icon":"extra:baubles_gold" + }, + { + "x":60, + "y":60, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":26, + "y":8, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":26, + "y":60, + "playerInvOnly":true, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":2, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":22, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":42, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":62, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":-84, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":-64, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":true, + "backgroundIndex":0, + "command":"", + "icon":"" + }, + { + "x":2, + "y":-44, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":2, + "y":-24, + "playerInvOnly":false, + "anchorRight":true, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":4, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":25, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":46, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":67, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":88, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":109, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":130, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":151, + "y":-19, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"" + }, + { + "x":-19, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"joindungeon catacombs 1", + "icon":"GOLD_BONZO_HEAD" + }, + { + "x":-19, + "y":22, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"joindungeon catacombs 2", + "icon":"GOLD_SCARF_HEAD" + }, + { + "x":-19, + "y":42, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"joindungeon catacombs 3", + "icon":"GOLD_PROFESSOR_HEAD" + }, + { + "x":-19, + "y":62, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":false, + "backgroundIndex":0, + "command":"joindungeon catacombs 4", + "icon":"GOLD_THORN_HEAD" + }, + { + "x":-19, + "y":-84, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"joindungeon catacombs 5", + "icon":"GOLD_LIVID_HEAD" + }, + { + "x":-19, + "y":-64, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"/joindungeon catacombs 6", + "icon":"GOLD_SADAN_HEAD" + }, + { + "x":-19, + "y":-44, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"joindungeons catacombs 7", + "icon":"GOLD_NECRON_HEAD" + }, + { + "x":-19, + "y":-24, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":4, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":25, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":46, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":67, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":88, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":109, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":130, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + }, + { + "x":151, + "y":2, + "playerInvOnly":false, + "anchorRight":false, + "anchorBottom":true, + "backgroundIndex":0, + "command":"" + } + ] +}
\ No newline at end of file diff --git a/src/main/resources/assets/notenoughupdates/search_bar.png b/src/main/resources/assets/notenoughupdates/search_bar.png Binary files differnew file mode 100644 index 00000000..c029ee85 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/search_bar.png diff --git a/src/main/resources/assets/notenoughupdates/search_bar_gold.png b/src/main/resources/assets/notenoughupdates/search_bar_gold.png Binary files differnew file mode 100644 index 00000000..481b4930 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/search_bar_gold.png diff --git a/src/main/resources/assets/notenoughupdates/shaders/capes/planets/planets.frag b/src/main/resources/assets/notenoughupdates/shaders/capes/planets/planets.frag new file mode 100644 index 00000000..2c34682a --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/shaders/capes/planets/planets.frag @@ -0,0 +1,185 @@ +#version 120 + +varying vec4 passColour; +varying vec3 passNormal; +varying vec3 passVertex; + +uniform sampler2D textureIn; +uniform int millis; +uniform int planetType; +uniform vec3 sunVec; + +vec4 permute(vec4 x){return mod(((x*34.0)+1.0)*x, 289.0);} +float permute(float x){return floor(mod(((x*34.0)+1.0)*x, 289.0));} +vec4 taylorInvSqrt(vec4 r){return 1.79284291400159 - 0.85373472095314 * r;} +float taylorInvSqrt(float r){return 1.79284291400159 - 0.85373472095314 * r;} + +vec4 grad4(float j, vec4 ip){ + const vec4 ones = vec4(1.0, 1.0, 1.0, -1.0); + vec4 p,s; + + p.xyz = floor( fract (vec3(j) * ip.xyz) * 7.0) * ip.z - 1.0; + p.w = 1.5 - dot(abs(p.xyz), ones.xyz); + s = vec4(lessThan(p, vec4(0.0))); + p.xyz = p.xyz + (s.xyz*2.0 - 1.0) * s.www; + + return p; +} + +float snoise(vec4 v){ + const vec2 C = vec2( 0.138196601125010504, // (5 - sqrt(5))/20 G4 + 0.309016994374947451); // (sqrt(5) - 1)/4 F4 +// First corner + vec4 i = floor(v + dot(v, C.yyyy) ); + vec4 x0 = v - i + dot(i, C.xxxx); + +// Other corners + +// Rank sorting originally contributed by Bill Licea-Kane, AMD (formerly ATI) + vec4 i0; + + vec3 isX = step( x0.yzw, x0.xxx ); + vec3 isYZ = step( x0.zww, x0.yyz ); +// i0.x = dot( isX, vec3( 1.0 ) ); + i0.x = isX.x + isX.y + isX.z; + i0.yzw = 1.0 - isX; + +// i0.y += dot( isYZ.xy, vec2( 1.0 ) ); + i0.y += isYZ.x + isYZ.y; + i0.zw += 1.0 - isYZ.xy; + + i0.z += isYZ.z; + i0.w += 1.0 - isYZ.z; + + // i0 now contains the unique values 0,1,2,3 in each channel + vec4 i3 = clamp( i0, 0.0, 1.0 ); + vec4 i2 = clamp( i0-1.0, 0.0, 1.0 ); + vec4 i1 = clamp( i0-2.0, 0.0, 1.0 ); + + // x0 = x0 - 0.0 + 0.0 * C + vec4 x1 = x0 - i1 + 1.0 * C.xxxx; + vec4 x2 = x0 - i2 + 2.0 * C.xxxx; + vec4 x3 = x0 - i3 + 3.0 * C.xxxx; + vec4 x4 = x0 - 1.0 + 4.0 * C.xxxx; + +// Permutations + i = mod(i, 289.0); + float j0 = permute( permute( permute( permute(i.w) + i.z) + i.y) + i.x); + vec4 j1 = permute( permute( permute( permute ( + i.w + vec4(i1.w, i2.w, i3.w, 1.0 )) + + i.z + vec4(i1.z, i2.z, i3.z, 1.0 )) + + i.y + vec4(i1.y, i2.y, i3.y, 1.0 )) + + i.x + vec4(i1.x, i2.x, i3.x, 1.0 )); +// Gradients +// ( 7*7*6 points uniformly over a cube, mapped onto a 4-octahedron.) +// 7*7*6 = 294, which is close to the ring size 17*17 = 289. + + vec4 ip = vec4(1.0/294.0, 1.0/49.0, 1.0/7.0, 0.0) ; + + vec4 p0 = grad4(j0, ip); + vec4 p1 = grad4(j1.x, ip); + vec4 p2 = grad4(j1.y, ip); + vec4 p3 = grad4(j1.z, ip); + vec4 p4 = grad4(j1.w, ip); + +// Normalise gradients + vec4 norm = taylorInvSqrt(vec4(dot(p0,p0), dot(p1,p1), dot(p2, p2), dot(p3,p3))); + p0 *= norm.x; + p1 *= norm.y; + p2 *= norm.z; + p3 *= norm.w; + p4 *= taylorInvSqrt(dot(p4,p4)); + +// Mix contributions from the five corners + vec3 m0 = max(0.6 - vec3(dot(x0,x0), dot(x1,x1), dot(x2,x2)), 0.0); + vec2 m1 = max(0.6 - vec2(dot(x3,x3), dot(x4,x4) ), 0.0); + m0 = m0 * m0; + m1 = m1 * m1; + return 49.0 * ( dot(m0*m0, vec3( dot( p0, x0 ), dot( p1, x1 ), dot( p2, x2 ))) + + dot(m1*m1, vec2( dot( p3, x3 ), dot( p4, x4 ) ) ) ) ; + +} + +vec3 interp_hsv(vec3 one, vec3 two, float amount) { + return one + (two - one) * amount; +} + +vec3 hsv2rgb(vec3 c) { + vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0); + vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www); + return c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y); +} + +vec3 ocean_deep = vec3(245.0/365.0, 82.0/100.0, 67.0/100.0); +vec3 ocean_shallow = vec3(220.0/365.0, 75.0/100.0, 67.0/100.0); +vec3 land_low = vec3(93.0/365.0, 87.0/100.0, 86.0/100.0); +vec3 land_med = vec3(135.0/365.0, 84.0/100.0, 82.0/100.0); +vec3 land_high = vec3(40.0/365.0, 52.0/100.0, 82.0/100.0); + +vec3 gray_light = vec3(31.0/365.0, 38.0/100.0, 80.0/100.0); +vec3 gray_dark = vec3(15.0/365.0, 50.0/100.0, 24.0/100.0); + +vec3 jupiter_light = vec3(31.0/365.0, 50.0/100.0, 80.0/100.0); +vec3 jupiter_dark = vec3(15.0/365.0, 70.0/100.0, 24.0/100.0); + +void main() { + if(gl_TexCoord[0].s > 0.5f || gl_TexCoord[0].t > 0.5f) { + gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0); + return; + } + vec2 uv = gl_TexCoord[0].st; + + if(planetType == 0) { + float perlin = (snoise(vec4(passVertex.x*10.0, passVertex.y*10.0, passVertex.z*10.0, millis/1000.0))+1.0)/2.0; + float perlin2 = snoise(vec4(passVertex.x*2.0, passVertex.y*2.0, passVertex.z*2.0, millis/10000.0)); + + vec3 col1 = vec3(1, 0.1+perlin*0.6, 0); + vec3 col2 = vec3(perlin2*0.7); + vec3 colF = max(col1, col2); + gl_FragColor = vec4(colF,1.0); + return; + } else if(planetType == 1) { + float perlin = (snoise(vec4(passVertex.x*2.0, passVertex.y*2.0, passVertex.z*2.0, 0.0))+1.0)/2.0; + float perlin2 = snoise(vec4(passVertex.x*1.0, passVertex.y*1.0, passVertex.z*1.0, millis/10000.0)); + + vec3 col1 = vec3(0, 0, 1); + if(perlin < 0.55) { + col1 = hsv2rgb(interp_hsv(ocean_deep, ocean_shallow, perlin*perlin/0.55/0.55)); + } else if(perlin < 0.9) { + col1 = hsv2rgb(interp_hsv(land_low, land_med, (perlin-0.55)/0.35)); + } else { + col1 = hsv2rgb(interp_hsv(land_med, land_high, (perlin-0.9)/0.1)); + } + vec3 col2 = vec3(perlin2*0.7); + vec3 colF = max(col1, col2); + + gl_FragColor = vec4(colF,1.0); + + gl_FragColor.rgb *= 1.2*max(0.35, dot(normalize(sunVec), normalize(passNormal))); + + return; + } else if(planetType == 2) { + float perlin = (snoise(vec4(passVertex.x*10.0, passVertex.y*10.0, passVertex.z*10.0, 0.0))+1.0)/2.0; + gl_FragColor = vec4(hsv2rgb(interp_hsv(gray_light, gray_dark, perlin)), 1.0); + + gl_FragColor.rgb *= 1.2*max(0.35, dot(normalize(sunVec), normalize(passNormal))); + + return; + } else if(planetType == 3) { + float perlin = (snoise(vec4(passVertex.x*0.2, passVertex.y*10.0, passVertex.z*0.2, 0.0))+1.0)/2.0; + gl_FragColor = vec4(hsv2rgb(interp_hsv(jupiter_light, jupiter_dark, perlin)), 1.0); + + gl_FragColor.rgb *= 1.2*max(0.35, dot(normalize(sunVec), normalize(passNormal))); + + return; + } else if(planetType == 4) { + float perlin = (snoise(vec4(passVertex.x*0.2, passVertex.y*10.0, passVertex.z*0.2, 0.0))+1.0)/2.0; + gl_FragColor = vec4(hsv2rgb(interp_hsv(ocean_deep, ocean_shallow, perlin)), 1.0); + + gl_FragColor.rgb *= 1.2*max(0.35, dot(normalize(sunVec), normalize(passNormal))); + + return; + } + + gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0); +}
\ No newline at end of file diff --git a/src/main/resources/assets/notenoughupdates/shaders/capes/planets/planets.vert b/src/main/resources/assets/notenoughupdates/shaders/capes/planets/planets.vert new file mode 100644 index 00000000..632a4f94 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/shaders/capes/planets/planets.vert @@ -0,0 +1,14 @@ +#version 120 + +varying vec4 passColour; +varying vec3 passNormal; +varying vec3 passVertex; + +void main() { + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; + gl_TexCoord[0] = gl_MultiTexCoord0; + + passColour = gl_Color; + passNormal = normalize(gl_Normal); + passVertex = vec3(gl_Vertex.x, gl_Vertex.y, gl_Vertex.z); +}
\ No newline at end of file diff --git a/src/main/resources/assets/notenoughupdates/shaders/capes/tunnel/tunnel.frag b/src/main/resources/assets/notenoughupdates/shaders/capes/tunnel/tunnel.frag new file mode 100644 index 00000000..fa3455ce --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/shaders/capes/tunnel/tunnel.frag @@ -0,0 +1,50 @@ +#version 120 + +varying vec4 passColour; +varying vec3 passNormal; +uniform sampler2D textureIn; + +uniform int millis; + +//Algorithm by hughsk +vec3 hsv2rgb(vec3 c) { + vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0); + vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www); + return c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y); +} + +void main() +{ + float num = 5.0; + + vec2 uv = vec2(gl_TexCoord[0].s*1024.0/300.0, gl_TexCoord[0].t*1024.0/420.0); + + float timeMod = mod(millis/1000.0/num, 1.0/num); + + if(uv.x > 1.5 || uv.y > 1) { + vec3 rgb = hsv2rgb(vec3((-1.0/num-millis/1000.0/num+timeMod)/2.0, 0.6, 0.8)) * 1.4; + gl_FragColor = vec4(rgb, 1.0); + return; + } + + float xDist = 1.0 - min(uv.x, 1.0 - uv.x)*2.0; + float yDist = 1.0 - min(uv.y, 1.0 - uv.y)*2.0; + //float a = 20.0; + //float edgeDist = 1.0 - pow(pow(xDist, a) + pow(yDist, a), 1.0/a); + float edgeDist = 1.0 - max(xDist, yDist); + + edgeDist += 0.2; + edgeDist *= edgeDist; + edgeDist -= timeMod; + + float factor = 1.0 - mod(edgeDist*num, 1.0); + factor *= factor*factor; + factor = 1.4 - factor; + factor = max(0.8, factor); + + edgeDist = floor(edgeDist*num)/num; + + vec3 rgb = hsv2rgb(vec3((edgeDist-millis/1000.0/num+timeMod)/2.0, 0.6, 0.8)); + + gl_FragColor = vec4(rgb*factor, 1.0); +} diff --git a/src/main/resources/assets/notenoughupdates/shaders/capes/tunnel/tunnel.vert b/src/main/resources/assets/notenoughupdates/shaders/capes/tunnel/tunnel.vert new file mode 100644 index 00000000..2b5c48f8 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/shaders/capes/tunnel/tunnel.vert @@ -0,0 +1,12 @@ +#version 120 + +varying vec4 passColour; +varying vec3 passNormal; + +void main() { + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; + gl_TexCoord[0] = gl_MultiTexCoord0; + + passColour = gl_Color; + passNormal = normalize(gl_Normal); +}
\ No newline at end of file diff --git a/src/main/resources/mixins.notenoughupdates.json b/src/main/resources/mixins.notenoughupdates.json index 3fc98025..f3ef20a6 100644 --- a/src/main/resources/mixins.notenoughupdates.json +++ b/src/main/resources/mixins.notenoughupdates.json @@ -21,12 +21,13 @@ "MixinContainer", "MixinWorld", "MixinPlayerControllerMP", - "MixinLayerCreeperCharge", "MixinEffectRenderer", "MixinRendererLivingEntity", "GuiEditSignAccessor", "MixinGuiScreen", "MixinTileEntitySkullRenderer", - "MixinItemCameraTransforms" + "MixinItemCameraTransforms", + "GuiContainerAccessor", + "MixinGuiInventory" ] }
\ No newline at end of file |
