From b8d1ecf8b9b6348304392d09e4490d473dbb120d Mon Sep 17 00:00:00 2001 From: BlueWeabo Date: Sun, 26 Feb 2023 13:16:07 +0200 Subject: Add a completely new system for late/endgame content (#1754) * basic work * typo fixes * make an enum folder * location enums * space project manager * implement the space project teams * commands * move things around and new things * upgrade work * requirement work * if possible use an upgrades values * cleanup * more helpers in command * fix AOOBE * fix world saved data * builder for requirements * add command autocomplete * fix command npe * mark world saved data dirty * switch to saving to json string. this is fine * fix npe * fix files not saving correctly. serialization * spotless * part 1 of fixing json saving * working json file saving * rename fields * full implementation of SP_Upgrade * fixes * cleanup * texture prep * documentation part 1 * documentation part 2 and rework of json saving * fix the missed conversions * set texture when copying * more interface usage and fixes * rework saving. * Added rudimentary NEI handler for projects * Revert "Added rudimentary NEI handler for projects" This reverts commit 6d8210e25b27fee7dc1865d1afa91708a8d9b875. * address NPEs * some textures * higher quality textures, put in the moon as a temp texture * add a check to create a team if one smt weird happens * command work * add ability to localize the space bodies * Added disabled button and toggle button * Added possibility to not render the original stacksize of item stacks in NEI * Added NEI handler * Fixes item count on tooltip always rendering as 1 * Fix refactor * 5 new body textures * fix misspelled texture name --------- Co-authored-by: minecraft7771 --- .../assets/gregtech/textures/solarsystem/Ariel.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Arrokoth.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Callisto.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Ceres.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Deimos.png | Bin 0 -> 381 bytes .../assets/gregtech/textures/solarsystem/Enceladus.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Europa.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Ganymede.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Hyperion.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Iapetus.png | Bin 0 -> 483 bytes .../resources/assets/gregtech/textures/solarsystem/Io.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Jupiter.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/KuiperBelt.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/MakeMake.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Mars.png | Bin 0 -> 444 bytes .../assets/gregtech/textures/solarsystem/Mercury.png | Bin 0 -> 570 bytes .../assets/gregtech/textures/solarsystem/Mimas.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Miranda.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Moon.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Neptune.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Nereid.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Oberon.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Overworld.png | Bin 0 -> 612 bytes .../assets/gregtech/textures/solarsystem/Phobos.png | Bin 0 -> 492 bytes .../assets/gregtech/textures/solarsystem/Phoebe.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Pluto.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Proteus.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Rhea.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Saturn.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Sol.png | Bin 0 -> 639 bytes .../assets/gregtech/textures/solarsystem/Tethys.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Titan.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Titania.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Triton.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Umbriel.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Uranus.png | Bin 0 -> 483 bytes .../assets/gregtech/textures/solarsystem/Venus.png | Bin 0 -> 648 bytes 37 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Ariel.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Arrokoth.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Callisto.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Ceres.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Deimos.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Enceladus.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Europa.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Ganymede.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Hyperion.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Iapetus.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Io.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Jupiter.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/KuiperBelt.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/MakeMake.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Mars.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Mercury.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Mimas.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Miranda.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Moon.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Neptune.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Nereid.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Oberon.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Overworld.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Phobos.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Phoebe.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Pluto.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Proteus.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Rhea.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Saturn.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Sol.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Tethys.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Titan.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Titania.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Triton.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Umbriel.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Uranus.png create mode 100644 src/main/resources/assets/gregtech/textures/solarsystem/Venus.png (limited to 'src/main/resources/assets/gregtech/textures/solarsystem') diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Ariel.png b/src/main/resources/assets/gregtech/textures/solarsystem/Ariel.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Ariel.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Arrokoth.png b/src/main/resources/assets/gregtech/textures/solarsystem/Arrokoth.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Arrokoth.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Callisto.png b/src/main/resources/assets/gregtech/textures/solarsystem/Callisto.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Callisto.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Ceres.png b/src/main/resources/assets/gregtech/textures/solarsystem/Ceres.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Ceres.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Deimos.png b/src/main/resources/assets/gregtech/textures/solarsystem/Deimos.png new file mode 100644 index 0000000000..65bd8e318b Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Deimos.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Enceladus.png b/src/main/resources/assets/gregtech/textures/solarsystem/Enceladus.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Enceladus.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Europa.png b/src/main/resources/assets/gregtech/textures/solarsystem/Europa.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Europa.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Ganymede.png b/src/main/resources/assets/gregtech/textures/solarsystem/Ganymede.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Ganymede.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Hyperion.png b/src/main/resources/assets/gregtech/textures/solarsystem/Hyperion.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Hyperion.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Iapetus.png b/src/main/resources/assets/gregtech/textures/solarsystem/Iapetus.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Iapetus.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Io.png b/src/main/resources/assets/gregtech/textures/solarsystem/Io.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Io.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Jupiter.png b/src/main/resources/assets/gregtech/textures/solarsystem/Jupiter.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Jupiter.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/KuiperBelt.png b/src/main/resources/assets/gregtech/textures/solarsystem/KuiperBelt.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/KuiperBelt.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/MakeMake.png b/src/main/resources/assets/gregtech/textures/solarsystem/MakeMake.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/MakeMake.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Mars.png b/src/main/resources/assets/gregtech/textures/solarsystem/Mars.png new file mode 100644 index 0000000000..8a329cfc0c Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Mars.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Mercury.png b/src/main/resources/assets/gregtech/textures/solarsystem/Mercury.png new file mode 100644 index 0000000000..c9dbcfe54c Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Mercury.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Mimas.png b/src/main/resources/assets/gregtech/textures/solarsystem/Mimas.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Mimas.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Miranda.png b/src/main/resources/assets/gregtech/textures/solarsystem/Miranda.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Miranda.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Moon.png b/src/main/resources/assets/gregtech/textures/solarsystem/Moon.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Moon.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Neptune.png b/src/main/resources/assets/gregtech/textures/solarsystem/Neptune.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Neptune.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Nereid.png b/src/main/resources/assets/gregtech/textures/solarsystem/Nereid.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Nereid.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Oberon.png b/src/main/resources/assets/gregtech/textures/solarsystem/Oberon.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Oberon.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Overworld.png b/src/main/resources/assets/gregtech/textures/solarsystem/Overworld.png new file mode 100644 index 0000000000..5f02e84a39 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Overworld.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Phobos.png b/src/main/resources/assets/gregtech/textures/solarsystem/Phobos.png new file mode 100644 index 0000000000..27425a829c Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Phobos.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Phoebe.png b/src/main/resources/assets/gregtech/textures/solarsystem/Phoebe.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Phoebe.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Pluto.png b/src/main/resources/assets/gregtech/textures/solarsystem/Pluto.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Pluto.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Proteus.png b/src/main/resources/assets/gregtech/textures/solarsystem/Proteus.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Proteus.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Rhea.png b/src/main/resources/assets/gregtech/textures/solarsystem/Rhea.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Rhea.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Saturn.png b/src/main/resources/assets/gregtech/textures/solarsystem/Saturn.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Saturn.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Sol.png b/src/main/resources/assets/gregtech/textures/solarsystem/Sol.png new file mode 100644 index 0000000000..791713e47a Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Sol.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Tethys.png b/src/main/resources/assets/gregtech/textures/solarsystem/Tethys.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Tethys.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Titan.png b/src/main/resources/assets/gregtech/textures/solarsystem/Titan.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Titan.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Titania.png b/src/main/resources/assets/gregtech/textures/solarsystem/Titania.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Titania.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Triton.png b/src/main/resources/assets/gregtech/textures/solarsystem/Triton.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Triton.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Umbriel.png b/src/main/resources/assets/gregtech/textures/solarsystem/Umbriel.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Umbriel.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Uranus.png b/src/main/resources/assets/gregtech/textures/solarsystem/Uranus.png new file mode 100644 index 0000000000..08a5655183 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Uranus.png differ diff --git a/src/main/resources/assets/gregtech/textures/solarsystem/Venus.png b/src/main/resources/assets/gregtech/textures/solarsystem/Venus.png new file mode 100644 index 0000000000..d96fce6dc2 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/solarsystem/Venus.png differ -- cgit