diff options
author | Glease <4586901+Glease@users.noreply.github.com> | 2022-09-07 01:34:35 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-06 19:34:35 +0200 |
commit | 74b5ef849dea6d9a05e47f0294ccc689069f6f2c (patch) | |
tree | a5528e41ce2b810b82cf99a5acc2c712145b9b59 /src/main/java/gregtech/api/enums | |
parent | 7caea6daefcbffbc102741ed09daac9d6439824d (diff) | |
download | GT5-Unofficial-74b5ef849dea6d9a05e47f0294ccc689069f6f2c.tar.gz GT5-Unofficial-74b5ef849dea6d9a05e47f0294ccc689069f6f2c.tar.bz2 GT5-Unofficial-74b5ef849dea6d9a05e47f0294ccc689069f6f2c.zip |
Fix overly large sprites being used causing some users FPS lag (#1347)
* fix sprite abuse
* Spotless apply for branch fix/sprite-abuse for #1347 (#1348)
Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
* convert gaia spirit
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/api/enums')
-rw-r--r-- | src/main/java/gregtech/api/enums/Materials.java | 12 | ||||
-rw-r--r-- | src/main/java/gregtech/api/enums/MaterialsBotania.java | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index fc254b55cf..6d32aec6e6 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -17,6 +17,8 @@ import gregtech.api.objects.MaterialStack; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.render.items.GT_GeneratedMaterial_Renderer; +import gregtech.common.render.items.GaiaSpiritRenderer; +import gregtech.common.render.items.TranscendentMetalRenderer; import gregtech.loaders.materialprocessing.ProcessingConfig; import gregtech.loaders.materialprocessing.ProcessingModSupport; import java.util.*; @@ -884,7 +886,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials DimensionallyTranscendentResidue = new Materials( 589, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 0, 0, 0, 1, "DimensionallyTranscendentResidue" , "Dimensionally Transcendent Residue" , -1, -1, 25, 1, false, true, 1, 1, 1, Dyes.dyeBlack); public static Materials SpaceTime = new Materials( 588, new TextureSet("spacetime", true) , 320.0F, 4*2621440, 25, 1|2|64|128, 255, 255, 255, 0, "SpaceTime" , "SpaceTime" , -1, -1, 0, 0, false, true, 2, 1, 1, Dyes._NULL , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))); - public static Materials TranscendentMetal = new Materials( 581, new TextureSet("transcendentmetal", true) , 290.0F, 3*2621440, 22, 1|2|64|128, 50, 50, 50,255, "TranscendentMetal" , "Transcendent Metal" , -1, -1, 0, 3000, true, true, 200, 1000, 1000, Dyes.dyeBlack , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); + public static Materials TranscendentMetal = new Materials( 581, TextureSet.SET_METALLIC , 290.0F, 3*2621440, 22, 1|2|64|128, 50, 50, 50,0, "TranscendentMetal" , "Transcendent Metal" , -1, -1, 0, 3000, true, true, 200, 1000, 1000, Dyes.dyeBlack , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); // spotless:on @@ -2472,6 +2474,14 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { fillGeneratedMaterialsMap(); } + /** + * Init rendering properties. Will be called at pre init by GT client proxy. + */ + public static void initClient() { + TranscendentMetal.renderer = new TranscendentMetalRenderer(); + MaterialsBotania.GaiaSpirit.renderer = new GaiaSpiritRenderer(); + } + private static void fillGeneratedMaterialsMap() { for (Materials aMaterial : MATERIALS_ARRAY) { if (aMaterial.mMetaItemSubID >= 0) { diff --git a/src/main/java/gregtech/api/enums/MaterialsBotania.java b/src/main/java/gregtech/api/enums/MaterialsBotania.java index f1ddb7e5d8..334940d47a 100644 --- a/src/main/java/gregtech/api/enums/MaterialsBotania.java +++ b/src/main/java/gregtech/api/enums/MaterialsBotania.java @@ -76,7 +76,7 @@ public class MaterialsBotania { .constructMaterial(); public static Materials GaiaSpirit = new Materials( 205, - new TextureSet("GaiaSpirit", true), + TextureSet.SET_METALLIC, 32.0F, 850000, 12, |