COIL TIER is now listed on a new line in recipeviewers #1241
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
screret
requested changes
May 11, 2024
src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeTypes.java
Outdated
Show resolved
Hide resolved
src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeTypes.java
Outdated
Show resolved
Hide resolved
screret
requested changes
May 11, 2024
Comment on lines
462
to
466
| if (requiredCoil != null || requiredCoil.getMaterial() != null) { | ||
| return LocalizationUtils.format("gtceu.recipe.coil.tier", I18n.get(requiredCoil.getMaterial().getUnlocalizedName())); | ||
| } | ||
| }) | ||
| return ""; | ||
| }) |
screret
approved these changes
May 11, 2024
screret
pushed a commit
that referenced
this pull request
May 14, 2024
* COIL TIER is now listed on a new line in recipeviewers * Requested Changes * Formatting Fix
Merged
screret
pushed a commit
that referenced
this pull request
May 23, 2024
* COIL TIER is now listed on a new line in recipeviewers * Requested Changes * Formatting Fix
YoungOnionMC
added a commit
that referenced
this pull request
May 23, 2024
* Updated Dull Material Set ingot.png and ingot_secondary.png (#1238) * Updated Dull Material Set ingot.png and ingot_secondary.png * Removes Unused IngotDoubles * COIL TIER is now listed on a new line in recipeviewers (#1241) * COIL TIER is now listed on a new line in recipeviewers * Requested Changes * Formatting Fix * Refactor recipe handling (#1240) * refactor: extract recipe handling data * refactor: remove expecting rate from GTRecipe.matchRecipe * refactor: use RecipeHandlingData in matchRecipe() as well * refactor: extract most recipe handling and matching from GTRecipe * refactor: adjust visibility in RecipeHandling * refactor: deduplicate code in matchRecipe() / matchTickRecipe() * refactor: move handlerContentsInternal to RecipeHandling * refactor: remove unnecessary params from handleContentsInternal() * refactor: rename RecipeHandling to RecipeRunner * refactor: replace tuples by new ContentSlots class in RecipeRunner * refactor: replace tuples by new ContentSlots externally as well * refactor: rename cont -> content * refactor: use @UnknownNullability * refactor: cleanup, add some javadoc * refactor: reuse RecipeRunner across runs, reinit state as in handle() * Reduce memory usage of GTDynamicDataPack (#1242) * Forgot to do the Coil & Temp Change to the ABS, Whoops (#1245) * stop fluid from force breaking any pipelike (#1254) * stop fluid from force breaking any pipelike * adding the other pipes besides cable, whoops * get isActive to sync to client and fix missing overlay resource paths, in 20.1 (#1249) * get isActive to sync to client and fix missing overlay resource paths. this time in 20.1 😃 * Update WorkableOverlayModel.java * Update WorkableOverlayModel.java * Fix cryptic log warnings on launch/reload (#1244) * Move RotorEfficiency to it's own Parameter in .rotorStats() (#1258) * Move RotorEfficiency to it's own Parameter in .rotorStats() * fixed missing floats, spaces, and too many ()'s * Getters & rotorStats() argument tweaks * fixing floats and spacing * Fixest the one EXTREMELY translucent pixel on the portable_scanner.png (#1256) * misc fixes (#1246) * try to optimize machine trait capability lookup for small amounts of objects * fix hammer drop conversion crashing if the tool has no fortune enchant on it * fix `enableCleanroom` config not doing anything * extra optimization * run datagen * fix QuarkTech:tm: eating your lunchbags fixes #1233 * fix #1211 * fix #1223 * fix getOrComputeUnificationEntry being unbearably slow, fixing many a ore issue fixes #1054 fixes #991 fixes #942 * fix slots' /tick tooltip being dependent on output count instead of whatever's currently being added * fix GT armors being able to take durability damage * make all "thing-<material>" item names be "<material> thing" instead * fix ore byproduct tooltips * run datagen * shits I added a crash * Allow addons to filter GT recipes (#1251) * Allow addons to filter GT recipes * Change RECIPE_FILTERS to use a `Set` rather than a `List` * Large Gas Turbine Fixes and Rotor Holder Damage Application (#1260) * Move RotorEfficiency to it's own Parameter in .rotorStats() * fixed missing floats, spaces, and too many ()'s * Getters & rotorStats() argument tweaks * fixing floats and spacing * Turbine Fixes & Damage and Deaths * Add zh_tw translation (#1262) * Add zh_tw translation Translated from zh_cn by a script Replace some words for small differences between zh_tw and zh_cn * Update zh_tw.json * add in-world oil sprouts (#1263) * start on oil sprouts * add GUI overlay texture for in-world fluids * tweak the rarity a bit * Update for ru lang (#1269) * Translated using Weblate (Russian) Currently translated at 99.5% (5382 of 5405 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ * Translated using Weblate (Russian) Currently translated at 99.7% (5394 of 5405 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ * Translated using Weblate (Russian) Currently translated at 99.7% (5416 of 5427 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ * Translated using Weblate (Russian) Currently translated at 99.5% (5401 of 5424 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ * Translated using Weblate (Russian) Currently translated at 99.7% (5411 of 5424 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ --------- Co-authored-by: Western01 <[email protected]> * Debuff for hazardous materials (#905) * Added properties for poisonous materials and damage logic * Added more poison properties to existing materials * Implemented configurable poison effects * Added hazardous tooltip + rename poison to hazard * Config option to toggle hazards * More poison types and applied to more materials * Implemented PPE tag for armor/equipment * Added properties for poisonous materials and damage logic * Added more poison properties to existing materials * Implemented configurable poison effects * Added hazardous tooltip + rename poison to hazard * Config option to toggle hazards * More poison types and applied to more materials * Implemented PPE tag for armor/equipment * implemented PPE (hazmat suit) * removed redundant tag * removed duplicate in config? * formatting and reverted accidental mess ups * Added tag for custom PPE * Made hazmat suit textures less "flat" * fixed up the ppe tag --------- Co-authored-by: rmi <[email protected]> * added formatting to various spots that display numbers >999 (#1270) * fix lasers not saving contents (#1273) * fix lasers not saving contents and fix laser/AT lang * oops * fix parallel bugs (#1286) * fix fluid parallels fixes #1282 fixes #1222 * fix #1266 * fix #1279 * fix crash * added a energy use config option for the prospector's scanner tool (#1275) * added a config option to change the energy use of the prospector's scanners. * fixed a typo I made in the config option for the prospector energy use multiplier * HighTier MultiAmp and Substation Hatches (#1289) * fix(RecipeTypes): fix npm problem. (#1274) * fix(RecipeTypes): fix npm problem when ebf_temp higher than Highest level coil given temp * feat(ICoilType): ALL_COILS_TEMPERATURE_SORTED lazy get Prevent premature loading of ICoilType from causing `ALL_COILS_TEMPERATURE_SORTED` to be an empty list * Update ru_ru.json (#1280) Change all latin 'c' to cyrillic 'c' (jei search issues) * Remove unnecessary naming restriction. (#1284) * Fluid Pipe Jade compat (#1288) * Fluid Pipe Jade compat * fix the fluid id * 1.2.3 (#1293) * fix errors --------- Co-authored-by: Ghostipedia <[email protected]> Co-authored-by: Mikerooni <[email protected]> Co-authored-by: embeddedt <[email protected]> Co-authored-by: YoungOnion <[email protected]> Co-authored-by: ctrlaltmilk <[email protected]> Co-authored-by: IamNotBrianZ <[email protected]> Co-authored-by: marisathewitch <[email protected]> Co-authored-by: Western01 <[email protected]> Co-authored-by: Markh3tr <[email protected]> Co-authored-by: rmi <[email protected]> Co-authored-by: htmlcsjs <[email protected]> Co-authored-by: carterz30cal <[email protected]> Co-authored-by: DancingSnow <[email protected]> Co-authored-by: Igneaalis <[email protected]> Co-authored-by: NicholasBaldwinSE <[email protected]>
DimaKuzmin
pushed a commit
to DimaKuzmin/GregTech-Modern
that referenced
this pull request
Jun 1, 2024
* Updated Dull Material Set ingot.png and ingot_secondary.png (GregTechCEu#1238) * Updated Dull Material Set ingot.png and ingot_secondary.png * Removes Unused IngotDoubles * COIL TIER is now listed on a new line in recipeviewers (GregTechCEu#1241) * COIL TIER is now listed on a new line in recipeviewers * Requested Changes * Formatting Fix * Refactor recipe handling (GregTechCEu#1240) * refactor: extract recipe handling data * refactor: remove expecting rate from GTRecipe.matchRecipe * refactor: use RecipeHandlingData in matchRecipe() as well * refactor: extract most recipe handling and matching from GTRecipe * refactor: adjust visibility in RecipeHandling * refactor: deduplicate code in matchRecipe() / matchTickRecipe() * refactor: move handlerContentsInternal to RecipeHandling * refactor: remove unnecessary params from handleContentsInternal() * refactor: rename RecipeHandling to RecipeRunner * refactor: replace tuples by new ContentSlots class in RecipeRunner * refactor: replace tuples by new ContentSlots externally as well * refactor: rename cont -> content * refactor: use @UnknownNullability * refactor: cleanup, add some javadoc * refactor: reuse RecipeRunner across runs, reinit state as in handle() * Reduce memory usage of GTDynamicDataPack (GregTechCEu#1242) * Forgot to do the Coil & Temp Change to the ABS, Whoops (GregTechCEu#1245) * stop fluid from force breaking any pipelike (GregTechCEu#1254) * stop fluid from force breaking any pipelike * adding the other pipes besides cable, whoops * get isActive to sync to client and fix missing overlay resource paths, in 20.1 (GregTechCEu#1249) * get isActive to sync to client and fix missing overlay resource paths. this time in 20.1 😃 * Update WorkableOverlayModel.java * Update WorkableOverlayModel.java * Fix cryptic log warnings on launch/reload (GregTechCEu#1244) * Move RotorEfficiency to it's own Parameter in .rotorStats() (GregTechCEu#1258) * Move RotorEfficiency to it's own Parameter in .rotorStats() * fixed missing floats, spaces, and too many ()'s * Getters & rotorStats() argument tweaks * fixing floats and spacing * Fixest the one EXTREMELY translucent pixel on the portable_scanner.png (GregTechCEu#1256) * misc fixes (GregTechCEu#1246) * try to optimize machine trait capability lookup for small amounts of objects * fix hammer drop conversion crashing if the tool has no fortune enchant on it * fix `enableCleanroom` config not doing anything * extra optimization * run datagen * fix QuarkTech:tm: eating your lunchbags fixes GregTechCEu#1233 * fix GregTechCEu#1211 * fix GregTechCEu#1223 * fix getOrComputeUnificationEntry being unbearably slow, fixing many a ore issue fixes GregTechCEu#1054 fixes GregTechCEu#991 fixes GregTechCEu#942 * fix slots' /tick tooltip being dependent on output count instead of whatever's currently being added * fix GT armors being able to take durability damage * make all "thing-<material>" item names be "<material> thing" instead * fix ore byproduct tooltips * run datagen * shits I added a crash * Allow addons to filter GT recipes (GregTechCEu#1251) * Allow addons to filter GT recipes * Change RECIPE_FILTERS to use a `Set` rather than a `List` * Large Gas Turbine Fixes and Rotor Holder Damage Application (GregTechCEu#1260) * Move RotorEfficiency to it's own Parameter in .rotorStats() * fixed missing floats, spaces, and too many ()'s * Getters & rotorStats() argument tweaks * fixing floats and spacing * Turbine Fixes & Damage and Deaths * Add zh_tw translation (GregTechCEu#1262) * Add zh_tw translation Translated from zh_cn by a script Replace some words for small differences between zh_tw and zh_cn * Update zh_tw.json * add in-world oil sprouts (GregTechCEu#1263) * start on oil sprouts * add GUI overlay texture for in-world fluids * tweak the rarity a bit * Update for ru lang (GregTechCEu#1269) * Translated using Weblate (Russian) Currently translated at 99.5% (5382 of 5405 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ * Translated using Weblate (Russian) Currently translated at 99.7% (5394 of 5405 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ * Translated using Weblate (Russian) Currently translated at 99.7% (5416 of 5427 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ * Translated using Weblate (Russian) Currently translated at 99.5% (5401 of 5424 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ * Translated using Weblate (Russian) Currently translated at 99.7% (5411 of 5424 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ --------- Co-authored-by: Western01 <[email protected]> * Debuff for hazardous materials (GregTechCEu#905) * Added properties for poisonous materials and damage logic * Added more poison properties to existing materials * Implemented configurable poison effects * Added hazardous tooltip + rename poison to hazard * Config option to toggle hazards * More poison types and applied to more materials * Implemented PPE tag for armor/equipment * Added properties for poisonous materials and damage logic * Added more poison properties to existing materials * Implemented configurable poison effects * Added hazardous tooltip + rename poison to hazard * Config option to toggle hazards * More poison types and applied to more materials * Implemented PPE tag for armor/equipment * implemented PPE (hazmat suit) * removed redundant tag * removed duplicate in config? * formatting and reverted accidental mess ups * Added tag for custom PPE * Made hazmat suit textures less "flat" * fixed up the ppe tag --------- Co-authored-by: rmi <[email protected]> * added formatting to various spots that display numbers >999 (GregTechCEu#1270) * fix lasers not saving contents (GregTechCEu#1273) * fix lasers not saving contents and fix laser/AT lang * oops * fix parallel bugs (GregTechCEu#1286) * fix fluid parallels fixes GregTechCEu#1282 fixes GregTechCEu#1222 * fix GregTechCEu#1266 * fix GregTechCEu#1279 * fix crash * added a energy use config option for the prospector's scanner tool (GregTechCEu#1275) * added a config option to change the energy use of the prospector's scanners. * fixed a typo I made in the config option for the prospector energy use multiplier * HighTier MultiAmp and Substation Hatches (GregTechCEu#1289) * fix(RecipeTypes): fix npm problem. (GregTechCEu#1274) * fix(RecipeTypes): fix npm problem when ebf_temp higher than Highest level coil given temp * feat(ICoilType): ALL_COILS_TEMPERATURE_SORTED lazy get Prevent premature loading of ICoilType from causing `ALL_COILS_TEMPERATURE_SORTED` to be an empty list * Update ru_ru.json (GregTechCEu#1280) Change all latin 'c' to cyrillic 'c' (jei search issues) * Remove unnecessary naming restriction. (GregTechCEu#1284) * Fluid Pipe Jade compat (GregTechCEu#1288) * Fluid Pipe Jade compat * fix the fluid id * 1.2.3 (GregTechCEu#1293) * fix errors --------- Co-authored-by: Ghostipedia <[email protected]> Co-authored-by: Mikerooni <[email protected]> Co-authored-by: embeddedt <[email protected]> Co-authored-by: YoungOnion <[email protected]> Co-authored-by: ctrlaltmilk <[email protected]> Co-authored-by: IamNotBrianZ <[email protected]> Co-authored-by: marisathewitch <[email protected]> Co-authored-by: Western01 <[email protected]> Co-authored-by: Markh3tr <[email protected]> Co-authored-by: rmi <[email protected]> Co-authored-by: htmlcsjs <[email protected]> Co-authored-by: carterz30cal <[email protected]> Co-authored-by: DancingSnow <[email protected]> Co-authored-by: Igneaalis <[email protected]> Co-authored-by: NicholasBaldwinSE <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What
This PR moves the Coil Tier to a separate line in recipe viewers, allowing pack/mod devs to have more space for coil naming
Before :
After :