diff options
| author | Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> | 2024-05-22 18:05:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-22 19:05:41 +0200 |
| commit | 23494ade8145f1a70d4c533d74815b77b990314a (patch) | |
| tree | da447279d51a6bedafc1818bf22cd0e1808f0f72 /src/main/java/gtPlusPlus/nei | |
| parent | 846c0839dc25298734aa50e66ba1a72f0025f560 (diff) | |
| download | GT5-Unofficial-23494ade8145f1a70d4c533d74815b77b990314a.tar.gz GT5-Unofficial-23494ade8145f1a70d4c533d74815b77b990314a.tar.bz2 GT5-Unofficial-23494ade8145f1a70d4c533d74815b77b990314a.zip | |
Cleaning! (#881)
* Remove fluorite from sandstone references
* Remove some unused content, rogue useless configs
* Remove more junk
* Remove more
* Remove RF converter, I think this is disabled anyway? Or should be?
* Opps missed this
* Cleaning
* Remove sick blaze, I can't even get this to spawn? The spawn egg also isn't in NEI?
* Delete unused Australia textures
* Unused texture loading
* Bulk remove seemingly unused textures.
* Remove xpjuice, seemingly no use? Change the localised name of mobessence to Mob Essence. Remove EnchantingUtils, no longer needed.
* Clean
* Unused tooltips
* Remove hydrogen blob
* Spotless apply for branch Cleaning! for #881 (#882)
spotlessApply
Co-authored-by: GitHub GTNH Actions <>
* More cleaning
* Lots of unused code.
* Some reflection cleanup
* Revert "Remove sick blaze, I can't even get this to spawn? The spawn egg also isn't in NEI?"
This reverts commit d244b7dba00a9aee42b4a0596e842956acb36c5a.
* Restore random conversion recipes
* Unused texture
* Unused stuff
* Restore some missing textures
* Spotless apply for branch Cleaning! for #881 (#883)
spotlessApply
Co-authored-by: GitHub GTNH Actions <>
* Conditionally enable xpjuice recipe on OpenBlocks loaded
* Spotless apply for branch Cleaning! for #881 (#884)
spotlessApply
Co-authored-by: GitHub GTNH Actions <>
---------
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gtPlusPlus/nei')
| -rw-r--r-- | src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java | 2 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java b/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java index 01d35de155..4d5d89edb7 100644 --- a/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java +++ b/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java @@ -92,7 +92,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { if (mCachedRecipes == null || (cache = mCachedRecipes.get()) == null) { cache = GasSpargingRecipeMap.mRecipes.stream() // do not use parallel stream. This is already parallelized // by NEI - .sorted().map(temp -> { return createCachedRecipe(temp); }).collect(Collectors.toList()); + .sorted().map(temp -> createCachedRecipe(temp)).collect(Collectors.toList()); // while the NEI parallelize handlers, for each individual handler it still uses sequential execution model // so we do not need any synchronization here mCachedRecipes = new SoftReference<>(cache); diff --git a/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java b/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java index 1cec4d33e1..2c299e5071 100644 --- a/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java +++ b/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java @@ -38,7 +38,6 @@ import org.lwjgl.opengl.GL11; */ public final class NeiTextureHandler { - public static final NeiTextureHandler RECIPE = new NeiTextureHandler(16, 132, 16, 16); public static final NeiTextureHandler RECIPE_BUTTON = new NeiTextureHandler(128, 116, 24, 24); public final double minU; |