From dda0f8bb1ed2211b2df492d7bd53751e47de305f Mon Sep 17 00:00:00 2001 From: GDCloud <93287602+GDCloudstrike@users.noreply.github.com> Date: Sun, 1 Sep 2024 19:59:32 +0200 Subject: Godforge continuation (#2950) * fix wrong offset * improve item insertion window * finish upgrade material functionality * add tooltip to material button * add rhugnor gear * half serious upgrade costs (will definitely change) * fix stocking hatch not working for fuel supply * add information window * add heat formula info * add autobuild hint dot info * add phonon related items and fluids * first iteration of glitchy material renderer * tweak renderer overlay opacity * add new material * add phononic seed crystal and six-phased copper block * add recipes for phonon transfer medium chain * add solenoid block replacement * add creon * decouple smelting module structure * spotless weirdness * add most casing recipes and late loading method (for the special singularities) * add new singularity recipes * more recipes * add glow * generate more dragonblood parts * add upgrade costs * fix upgrade tree window scrollable weirdness * forgor glow texture * add last upgrade text + a random comma * re-add phonon medium abs recipe * add six-phased copper nanite recipe * fix button overlay being off by 1 pixel * fix merge mishaps * forgot to adjust debug buttons * fix stocking bus fuel insertion and fuel int overflow * add graviton shard ejection * minor structure oopsie * ejection button registration * ejection button tooltip * add graviton shard item * eject the right item + save ejection status to nbt * fix input bus amount npe * change rendering block offset * adapt eoh rendering to allow changing the star's size * initial rendering changes (make the blue star render) * change seed crystal recipes * another small seed crystal change * adjust item renderer * add tooltips * circuit oredict fix * tooltips, upgrade names, some experimental ui changes and small fixes * author * make star bigger * fix recipes * remove unnecessary tooltips * spotless * recipe adjustments * make magneto resonatic block craftable * change magneto resonatic gem autoclave times + spotless * add structurecheck button to modules * more recipe adjustments * fix extra material crash * more recipe adjustments * lower eternal singularity amounts * display recipetimes <1 sec properly * try to fix hasShiftDown crash * adjust plasma module recipes * swap placeholder names * implement rings disappearing/reappearing for renderer * utility for structure strings * buff plasma module parallel * fix itemlist * Spotless apply for branch godforge for #2950 (#3013) spotlessApply Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: Martin Robertz Co-authored-by: boubou19 Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../blocks/fluids/fluid.phononcrystalsolution.png | Bin 0 -> 1733 bytes .../fluids/fluid.phononcrystalsolution.png.mcmeta | 5 +++++ .../textures/blocks/fluids/fluid.phononmedium.png | Bin 0 -> 14885 bytes .../blocks/fluids/fluid.phononmedium.png.mcmeta | 5 +++++ .../textures/blocks/iconsets/BLOCK_SIXPHASEDCOPPER.png | Bin 0 -> 1129 bytes .../blocks/iconsets/BLOCK_SIXPHASEDCOPPER.png.mcmeta | 1 + .../blocks/iconsets/GODFORGE_CONTROLLER_GLOW.png | Bin 0 -> 366 bytes .../blocks/iconsets/GODFORGE_CONTROLLER_GLOW.png.mcmeta | 5 +++++ .../textures/blocks/iconsets/PHONON_CONDUIT.png | Bin 0 -> 9581 bytes .../textures/blocks/iconsets/PHONON_CONDUIT.png.mcmeta | 5 +++++ .../gregtech/textures/items/gt.metaitem.03/759.png | Bin 0 -> 1264 bytes .../gregtech/textures/items/gt.metaitem.03/760.png | Bin 0 -> 7176 bytes .../textures/items/gt.metaitem.03/760.png.mcmeta | 1 + .../gregtech/textures/items/gt.metaitem.03/761.png | Bin 0 -> 709 bytes .../textures/items/gt.metaitem.03/761.png.mcmeta | 1 + .../items/materialicons/CUSTOM/GravitonShard/gem.png | Bin 0 -> 1146 bytes .../materialicons/CUSTOM/GravitonShard/gem.png.mcmeta | 1 + .../materialicons/CUSTOM/GravitonShard/gem_OVERLAY.png | Bin 0 -> 141 bytes 18 files changed, 24 insertions(+) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.phononcrystalsolution.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.phononcrystalsolution.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.phononmedium.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.phononmedium.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SIXPHASEDCOPPER.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SIXPHASEDCOPPER.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/GODFORGE_CONTROLLER_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/GODFORGE_CONTROLLER_GLOW.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/PHONON_CONDUIT.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/PHONON_CONDUIT.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/759.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/760.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/760.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/761.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/761.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/GravitonShard/gem.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/GravitonShard/gem.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/GravitonShard/gem_OVERLAY.png (limited to 'src/main/resources/assets/gregtech/textures') diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.phononcrystalsolution.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.phononcrystalsolution.png new file mode 100644 index 0000000000..35edc97700 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.phononcrystalsolution.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.phononcrystalsolution.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.phononcrystalsolution.png.mcmeta new file mode 100644 index 0000000000..8e55e43baf --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.phononcrystalsolution.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.phononmedium.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.phononmedium.png new file mode 100644 index 0000000000..44aec7f5f2 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.phononmedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.phononmedium.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.phononmedium.png.mcmeta new file mode 100644 index 0000000000..0645f48c62 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.phononmedium.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SIXPHASEDCOPPER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SIXPHASEDCOPPER.png new file mode 100644 index 0000000000..d4c9ac279a Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SIXPHASEDCOPPER.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SIXPHASEDCOPPER.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SIXPHASEDCOPPER.png.mcmeta new file mode 100644 index 0000000000..1a89bc6ae4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SIXPHASEDCOPPER.png.mcmeta @@ -0,0 +1 @@ +{ "animation": { "frametime": 1, "frames": [ 0, 1, 0, 1, 0, { "index": 2, "time": 75 } ] } } \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GODFORGE_CONTROLLER_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GODFORGE_CONTROLLER_GLOW.png new file mode 100644 index 0000000000..5eab133d58 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GODFORGE_CONTROLLER_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GODFORGE_CONTROLLER_GLOW.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GODFORGE_CONTROLLER_GLOW.png.mcmeta new file mode 100644 index 0000000000..7ab8340b0c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GODFORGE_CONTROLLER_GLOW.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":16 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/PHONON_CONDUIT.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/PHONON_CONDUIT.png new file mode 100644 index 0000000000..d1f964aeb5 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/PHONON_CONDUIT.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/PHONON_CONDUIT.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/PHONON_CONDUIT.png.mcmeta new file mode 100644 index 0000000000..0abd1dd96d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/PHONON_CONDUIT.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/759.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/759.png new file mode 100644 index 0000000000..304bbac41d Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/759.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/760.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/760.png new file mode 100644 index 0000000000..b3e1f2220c Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/760.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/760.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/760.png.mcmeta new file mode 100644 index 0000000000..a668e18a77 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/760.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 2}} diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/761.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/761.png new file mode 100644 index 0000000000..1e74ae5e0f Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/761.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/761.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/761.png.mcmeta new file mode 100644 index 0000000000..d3ca55b4b9 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/761.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/GravitonShard/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/GravitonShard/gem.png new file mode 100644 index 0000000000..95ade3cd21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/GravitonShard/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/GravitonShard/gem.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/GravitonShard/gem.png.mcmeta new file mode 100644 index 0000000000..ed13b2b055 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/GravitonShard/gem.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 5}} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/GravitonShard/gem_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/GravitonShard/gem_OVERLAY.png new file mode 100644 index 0000000000..3f0d6efcac Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/GravitonShard/gem_OVERLAY.png differ -- cgit