diff options
| author | GDCloud <93287602+GDCloudstrike@users.noreply.github.com> | 2024-03-12 00:19:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-12 00:19:29 +0100 |
| commit | b03e63865a93ff13800da93cfa425989222b554f (patch) | |
| tree | 452cbe81a70aafd5d1aea9f2a074787cffd0c33a /src/main/resources | |
| parent | 5d8119a6ae3831c973c4b2e8efd1ca6c23d0196b (diff) | |
| download | GT5-Unofficial-b03e63865a93ff13800da93cfa425989222b554f.tar.gz GT5-Unofficial-b03e63865a93ff13800da93cfa425989222b554f.tar.bz2 GT5-Unofficial-b03e63865a93ff13800da93cfa425989222b554f.zip | |
Forge of the Gods (#225)
* Initial commit
* Graviton Modulation Casings
* It forms
* testing cursed things, will rework soon
* test better recipe check
* get rid of cursed stuff
* fix OC
* parameter shenanigans
* fuel input hatch
* redo fuel drain
* fluid output
* add blocks
* run on preload
* dependency bump
* preliminary structure works
* fix some misc things
* New class
* Fix build issue
* 1 hatch
* Cleaning up code with seperate class for structure string
* start on modules
* Spotless + Smelting Module Class + BaseModule Changes
* Remove useless import
* ...
* protected
* trying module things
* add checkRecipe, remove some redundant stuff
* Initial commit
* Graviton Modulation Casings
* It forms
* testing cursed things, will rework soon
* test better recipe check
* get rid of cursed stuff
* fix OC
* parameter shenanigans
* fuel input hatch
* redo fuel drain
* fluid output
* add blocks
* run on preload
* preliminary structure works
* fix some misc things
* New class
* 1 hatch
* start on modules
* Fix build issue
* Cleaning up code with seperate class for structure string
* Spotless + Smelting Module Class + BaseModule Changes
* Remove useless import
* protected
* trying module things
* add checkRecipe, remove some redundant stuff
* ...
* New Classes + Modules
* Recipe Maps
* fix deps
* recipe map fixes
* make modules connect
* spotless
* remove recipe functionality + misc cleanup
* parallel parameter
* remove unneeded check
* fix item to fluid conversion + remove parameter
* outputs appear now
* remove parallel param
* improve scanner info
* parameter adjustment + add onRemoval
* parameter followup
* plasma module (almost) fully works
* attempt at fixing param
* Fixes & stuff
* Recommendation fixes
* tooltip upgrade
* Spotless for clean
* plasma recipe map
* recipe adder
* first recipes
* use new recipe map
* Recipe map change stuff
* recipe map fixes
* some quick fixes
* Spotless
* fix null checks
* batch size
* add input separation
* add batch mode parameter and functionality
* spotless
* first recipe addition loops
* start on ui (add button)
* spotless
* add rendering block
* render tile
* more rendering
* summon render block
* spotless again
* greyscale
* lighter
* why is rendering a pain
* fix merge conflicts
* is this the conflict?
* spotless
* merge conflict again :pensib:
* start on upgrade gui
* more upgrade gui things
* saving
* resolve merge conflicts & crashes
* redo added blocks + add new ones + some tooltip stuff
* more tooltip stuff
* one more casing
* forgot this
* redo module processing logic
* migrate to wirelessNetworkManager
* quark gluon -> exotic
* forgot achievements
* adjust plasma module recipemap to prepare for upgrades
* migrate to nice mui gui
* some more plasma recipemap changes
* eve more plasma recipemap changes, yay
* everyone loves plasma recipemap changes
* they never end, do they
* exotic module recipes (wip)
* exotic module recipe processing (mostly works)
* prevent duplicate materials
* make input sizes random
* fix gt++ material conversions
* nbt data things
* start on magmatter mode + misc stuff
* more magmatter work
* no need for putIfAbsent + added awdr and runite
* load recipemap from nbt
* getFluidsStored -> inputFluids
* add upgrades and make them scrollable
* assign window colors to upgrades
* green background
* green background
* redo upgrade IDs and add boolean array for storing whether they are active
* implement system to restrict the order which upgrades can be bought in
* add split functionality
* switch to constants
* reset button tooltip + change texture of upgrade if active
* some cleanup + new fuel config
* button BGs, altered power switch + localisation
* fuel config window + save everything to nbt + random stuff
* new helper class + fuel calculations
* heat calculations + some molten module logic adjustments
* more calculations, fuel hatch removal, transfer values to modules, internal fuel battery
* use values in module processing
* switch to UUID
* switch to numericWidget
* fix speedbonus being infinite sometimes
* move method over to godforgeMath + very minor exotic module changes
* remove this so it actually loads
* new texture
* switch to processInitialSettings
* remove wireless energy things
* add furnace mode
* mode localisation
* remove author tag
* scala bad (switch away from scala arrays)
* nuke all star imports (& godforge recipemap)
* minor wording changes
* add mod checks
* mod check
* revert star textures
* return widget
* dont return object types
* forgot I even enabled debug, whoops
* remove unnecessary GL11 calls
---------
Co-authored-by: TheEpicGamer274 <102255081+TheEpicGamer274@users.noreply.github.com>
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com>
Diffstat (limited to 'src/main/resources')
24 files changed, 153 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GODFORGE_ENERGY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GODFORGE_ENERGY.png Binary files differnew file mode 100644 index 0000000000..ef00e4b09b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GODFORGE_ENERGY.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GODFORGE_INNER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GODFORGE_INNER.png Binary files differnew file mode 100644 index 0000000000..ee2cb09345 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GODFORGE_INNER.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GODFORGE_SUPPORT.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GODFORGE_SUPPORT.png Binary files differnew file mode 100644 index 0000000000..ea98b573e0 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GODFORGE_SUPPORT.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GODFORGE_TRIM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GODFORGE_TRIM.png Binary files differnew file mode 100644 index 0000000000..0b93539126 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GODFORGE_TRIM.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRAVITON_CASING_0.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRAVITON_CASING_0.png Binary files differnew file mode 100644 index 0000000000..1c247db84b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRAVITON_CASING_0.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRAVITON_CASING_0.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRAVITON_CASING_0.png.mcmeta new file mode 100644 index 0000000000..97596ba817 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRAVITON_CASING_0.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRAVITON_CASING_1.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRAVITON_CASING_1.png Binary files differnew file mode 100644 index 0000000000..728b89f8fc --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRAVITON_CASING_1.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRAVITON_CASING_1.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRAVITON_CASING_1.png.mcmeta new file mode 100644 index 0000000000..60af678259 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRAVITON_CASING_1.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":4 + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRAVITON_CASING_2.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRAVITON_CASING_2.png Binary files differnew file mode 100644 index 0000000000..d296edcad4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRAVITON_CASING_2.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRAVITON_CASING_2.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRAVITON_CASING_2.png.mcmeta new file mode 100644 index 0000000000..5e86a7cd5f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRAVITON_CASING_2.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":8 + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRAVITON_TOP_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRAVITON_TOP_BOTTOM.png Binary files differnew file mode 100644 index 0000000000..a21e6d941c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRAVITON_TOP_BOTTOM.png diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index 7729cc63c5..1941e3f886 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -10,6 +10,10 @@ tile.quantumGlass.name=Quantum Glass tile.quantumGlass.desc.0=Dense yet transparent tile.quantumGlass.desc.1=Glassy & Classy +tile.spatiallyTranscendentGravitationalLens.name=Spatially Transcendent Gravitational Lens Block +tile.godforgeGlass.desc.0=Gravitational lensing taken literal +tile.godforgeGlass.desc.1=GraviLens 9000! + tile.reactorSim.name=Reactor Simulator tile.reactorSim.desc.0=Fission Reaction Uncertainty Resolver 9001 tile.reactorSim.desc.1=Explodes, but not as much... @@ -864,6 +868,138 @@ achievement.gt.stabilisation_field_generator.6=Perfect Stabilisation Field Gener achievement.gt.stabilisation_field_generator.7=Tipler Stabilisation Field Generator achievement.gt.stabilisation_field_generator.8=Gallifreyan Stabilisation Field Generator +# Forge of the Gods / Godforge +fog.upgrade.confirm=Construct + +fog.upgrade.tt.0=upgrade start +fog.upgrade.tt.1=upgrade 11 +fog.upgrade.tt.2=upgrade 21 +fog.upgrade.tt.3=upgrade 22 +fog.upgrade.tt.4=upgrade 31 +fog.upgrade.tt.5=upgrade 32 +fog.upgrade.tt.6=upgrade 33 +fog.upgrade.tt.7=upgrade 41 +fog.upgrade.tt.8=upgrade 51 +fog.upgrade.tt.9=upgrade 52 +fog.upgrade.tt.10=upgrade 53 +fog.upgrade.tt.11=upgrade 61 +fog.upgrade.tt.12=upgrade 71 +fog.upgrade.tt.13=upgrade 72 +fog.upgrade.tt.14=upgrade 73 +fog.upgrade.tt.15=upgrade 74 +fog.upgrade.tt.16=upgrade 80 +fog.upgrade.tt.17=upgrade 81 +fog.upgrade.tt.18=upgrade 82 +fog.upgrade.tt.19=upgrade 83 +fog.upgrade.tt.20=upgrade 91 +fog.upgrade.tt.21=upgrade 92 +fog.upgrade.tt.22=upgrade 93 +fog.upgrade.tt.23=upgrade 101 +fog.upgrade.tt.24=upgrade 111 +fog.upgrade.tt.25=upgrade 121 +fog.upgrade.tt.26=upgrade 131 +fog.upgrade.tt.27=upgrade 141 +fog.upgrade.tt.28=upgrade 151 +fog.upgrade.tt.29=upgrade 161 +fog.upgrade.tt.30=upgrade end + +fog.upgrade.lore.0=*insert lore here* upgrade start +fog.upgrade.lore.1=*insert lore here* upgrade 11 +fog.upgrade.lore.2=*insert lore here* upgrade 21 +fog.upgrade.lore.3=*insert lore here* upgrade 22 +fog.upgrade.lore.4=*insert lore here* upgrade 31 +fog.upgrade.lore.5=*insert lore here* upgrade 32 +fog.upgrade.lore.6=*insert lore here* upgrade 33 +fog.upgrade.lore.7=*insert lore here* upgrade 41 +fog.upgrade.lore.8=*insert lore here* upgrade 51 +fog.upgrade.lore.9=*insert lore here* upgrade 52 +fog.upgrade.lore.10=*insert lore here* upgrade 53 +fog.upgrade.lore.11=*insert lore here* upgrade 61 +fog.upgrade.lore.12=*insert lore here* upgrade 71 +fog.upgrade.lore.13=*insert lore here* upgrade 72 +fog.upgrade.lore.14=*insert lore here* upgrade 73 +fog.upgrade.lore.15=*insert lore here* upgrade 74 +fog.upgrade.lore.16=*insert lore here* upgrade 80 +fog.upgrade.lore.17=*insert lore here* upgrade 81 +fog.upgrade.lore.18=*insert lore here* upgrade 82 +fog.upgrade.lore.19=*insert lore here* upgrade 83 +fog.upgrade.lore.20=*insert lore here* upgrade 91 +fog.upgrade.lore.21=*insert lore here* upgrade 92 +fog.upgrade.lore.22=*insert lore here* upgrade 93 +fog.upgrade.lore.23=*insert lore here* upgrade 101 +fog.upgrade.lore.24=*insert lore here* upgrade 111 +fog.upgrade.lore.25=*insert lore here* upgrade 121 +fog.upgrade.lore.26=*insert lore here* upgrade 131 +fog.upgrade.lore.27=*insert lore here* upgrade 141 +fog.upgrade.lore.28=*insert lore here* upgrade 151 +fog.upgrade.lore.29=*insert lore here* upgrade 161 +fog.upgrade.lore.30=*insert lore here* upgrade end + +fog.upgrade.text.0=Unlocks a recipe time reduction multiplier based on the current heat the multi is running at. This bonus is calculated via following formula: Multiplier = 1/(Heat^0.01) +fog.upgrade.text.1=*insert text here* upgrade 11 +fog.upgrade.text.2=*insert text here* upgrade 21 +fog.upgrade.text.3=*insert text here* upgrade 22 +fog.upgrade.text.4=*insert text here* upgrade 31 +fog.upgrade.text.5=*insert text here* upgrade 32 +fog.upgrade.text.6=*insert text here* upgrade 33 +fog.upgrade.text.7=*insert text here* upgrade 41 +fog.upgrade.text.8=*insert text here* upgrade 51 +fog.upgrade.text.9=*insert text here* upgrade 52 +fog.upgrade.text.10=*insert text here* upgrade 53 +fog.upgrade.text.11=*insert text here* upgrade 61 +fog.upgrade.text.12=*insert text here* upgrade 71 +fog.upgrade.text.13=*insert text here* upgrade 72 +fog.upgrade.text.14=*insert text here* upgrade 73 +fog.upgrade.text.15=*insert text here* upgrade 74 +fog.upgrade.text.16=*insert text here* upgrade 80 +fog.upgrade.text.17=*insert text here* upgrade 81 +fog.upgrade.text.18=*insert text here* upgrade 82 +fog.upgrade.text.19=*insert text here* upgrade 83 +fog.upgrade.text.20=*insert text here* upgrade 91 +fog.upgrade.text.21=*insert text here* upgrade 92 +fog.upgrade.text.22=*insert text here* upgrade 93 +fog.upgrade.text.23=*insert text here* upgrade 101 +fog.upgrade.text.24=*insert text here* upgrade 111 +fog.upgrade.text.25=*insert text here* upgrade 121 +fog.upgrade.text.26=*insert text here* upgrade 131 +fog.upgrade.text.27=*insert text here* upgrade 141 +fog.upgrade.text.28=*insert text here* upgrade 151 +fog.upgrade.text.29=*insert text here* upgrade 161 +fog.upgrade.text.30=*insert text here* upgrade end + +fog.debug.resetbutton.text=Reset +fog.debug.resetbutton.tooltip=Resets all upgrades to zero + +fog.button.fuelconfig.tooltip=Fuel Configuration Menu +fog.button.furnacemode.tooltip=Toggle Furnace Mode +fog.button.magmattermode.tooltip.01=Toggle Magmatter Mode +fog.button.magmattermode.tooltip.02=Magmatter Mode Locked, missing upgrade + + +achievement.gt.blockmachines.multimachine.em.forge_of_gods=Forge of the Gods +achievement.gt.godforgecasing.0=Singularity Reinforced Stellar Shielding Casing +achievement.gt.godforgecasing.1=Celestial Matter Guidance Casing +achievement.gt.godforgecasing.2=Boundless Gravitationally Severed Structure Casing +achievement.gt.godforgecasing.3=Transcendentally Amplified Magnetic Confinement Casing +achievement.gt.godforgecasing.4=Stellar Energy Siphon Casing +achievement.gt.godforgecasing.5=Remote Graviton Flow Modulator +achievement.gt.godforgecasing.6=Medial Graviton Flow Modulator +achievement.gt.godforgecasing.7=Central Graviton Flow Modulator + +gt.blockmachines.multimachine.FOG.parallel=Parallel +gt.blockmachines.multimachine.FOG.batch=Batch Size +gt.blockmachines.multimachine.FOG.fuelconsumption=Stellar Fuel Consumption Factor +gt.blockmachines.multimachine.FOG.fuelinfo.0=The Stellar Fuel Consumption Factor is the main determining factor in calculating the total stellar fuel consumption per second. Each fuel type has different scaling, which is as follows: +gt.blockmachines.multimachine.FOG.fuelinfo.1=Dimensionally Transcendent Residue: factor*300*1.15^factor +gt.blockmachines.multimachine.FOG.fuelinfo.2=Condensed Raw Stellar Plasma Mixture: factor*2*1.08^factor +gt.blockmachines.multimachine.FOG.fuelinfo.3=Magnetohydrodynamically Constrained Star Matter: factor/25 +gt.blockmachines.multimachine.FOG.fuelinfo.4=Upgrades can influence these formulas, the changes are listed in the respective upgrades' descriptions. +gt.blockmachines.multimachine.FOG.fueltype=Click to Select Fuel Type +gt.blockmachines.multimachine.FOG.fuelusage=Fuel Usage +gt.blockmachines.multimachine.FOG.plasmamultistep=Multi-Step plasma +gt.blockmachines.multimachine.FOG.plasmarecipetier=Fusion Tier +gt.blockmachines.multimachine.FOG.storedfuel=Stored fuel amount: + # Optical Circuits achievement.gt.metaitem.03.32155=Optical Assembly achievement.gt.metaitem.03.32156=Optical Computer @@ -989,6 +1125,8 @@ GT5U.gui.text.invalid_current_setting=§7Invalid current setting GT5U.gui.text.invalid_time_setting=§7Invalid time setting GT5U.gui.text.invalid_overdrive_setting=§7Invalid overdrive setting GT5U.gui.text.insufficient_power_no_val=§7Insufficient power +GT5U.gui.text.missing_upgrades=§7Missing upgrades +GT5U.gui.text.waiting_for_inputs=§7Waiting for inputs # RecipeMaps gt.recipe.eyeofharmony=Eye of Harmony diff --git a/src/main/resources/assets/tectech/textures/blocks/blockSpatiallyTranscendentGravitationalLens.png b/src/main/resources/assets/tectech/textures/blocks/blockSpatiallyTranscendentGravitationalLens.png Binary files differnew file mode 100644 index 0000000000..d8b0bed4ae --- /dev/null +++ b/src/main/resources/assets/tectech/textures/blocks/blockSpatiallyTranscendentGravitationalLens.png diff --git a/src/main/resources/assets/tectech/textures/gui/background/blue_glow.png b/src/main/resources/assets/tectech/textures/gui/background/blue_glow.png Binary files differnew file mode 100644 index 0000000000..8a4dc47307 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/gui/background/blue_glow.png diff --git a/src/main/resources/assets/tectech/textures/gui/background/green_glow.png b/src/main/resources/assets/tectech/textures/gui/background/green_glow.png Binary files differnew file mode 100644 index 0000000000..ff6c8ac7f5 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/gui/background/green_glow.png diff --git a/src/main/resources/assets/tectech/textures/gui/background/orange_glow.png b/src/main/resources/assets/tectech/textures/gui/background/orange_glow.png Binary files differnew file mode 100644 index 0000000000..1e3d22f8c6 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/gui/background/orange_glow.png diff --git a/src/main/resources/assets/tectech/textures/gui/background/purple_glow.png b/src/main/resources/assets/tectech/textures/gui/background/purple_glow.png Binary files differnew file mode 100644 index 0000000000..434e23ad42 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/gui/background/purple_glow.png diff --git a/src/main/resources/assets/tectech/textures/gui/background/star.png b/src/main/resources/assets/tectech/textures/gui/background/star.png Binary files differnew file mode 100644 index 0000000000..ad21ad0868 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/gui/background/star.png diff --git a/src/main/resources/assets/tectech/textures/gui/button/celestial.png b/src/main/resources/assets/tectech/textures/gui/button/celestial.png Binary files differnew file mode 100644 index 0000000000..5b9bc0688a --- /dev/null +++ b/src/main/resources/assets/tectech/textures/gui/button/celestial.png diff --git a/src/main/resources/assets/tectech/textures/gui/overlay_button/arrow_blue_up.png b/src/main/resources/assets/tectech/textures/gui/overlay_button/arrow_blue_up.png Binary files differnew file mode 100644 index 0000000000..04d5ab80bd --- /dev/null +++ b/src/main/resources/assets/tectech/textures/gui/overlay_button/arrow_blue_up.png diff --git a/src/main/resources/assets/tectech/textures/gui/picture/connector.png b/src/main/resources/assets/tectech/textures/gui/picture/connector.png Binary files differnew file mode 100644 index 0000000000..c333d0ded8 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/gui/picture/connector.png diff --git a/src/main/resources/assets/tectech/textures/gui/picture/connector_empty.png b/src/main/resources/assets/tectech/textures/gui/picture/connector_empty.png Binary files differnew file mode 100644 index 0000000000..c043180b5c --- /dev/null +++ b/src/main/resources/assets/tectech/textures/gui/picture/connector_empty.png diff --git a/src/main/resources/assets/tectech/textures/gui/picture/connector_switch.png b/src/main/resources/assets/tectech/textures/gui/picture/connector_switch.png Binary files differnew file mode 100644 index 0000000000..f72c959a52 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/gui/picture/connector_switch.png diff --git a/src/main/resources/assets/tectech/textures/gui/picture/green_selector.png b/src/main/resources/assets/tectech/textures/gui/picture/green_selector.png Binary files differnew file mode 100644 index 0000000000..daa67e29c0 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/gui/picture/green_selector.png |
