diff options
| author | Mary <33456283+FourIsTheNumber@users.noreply.github.com> | 2024-08-08 01:27:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-08 12:27:47 +0700 |
| commit | 12d227f59ed34f8362b307628b3965d48c3456a4 (patch) | |
| tree | 5245475c8835718dce18136c5d3afd9c4423974e /src | |
| parent | 97be8a4e1eb8c7ac3f637ea4c89ff94ddc8e37c9 (diff) | |
| download | GT5-Unofficial-12d227f59ed34f8362b307628b3965d48c3456a4.tar.gz GT5-Unofficial-12d227f59ed34f8362b307628b3965d48c3456a4.tar.bz2 GT5-Unofficial-12d227f59ed34f8362b307628b3965d48c3456a4.zip | |
Fix solenoid page assignment (#2846)
* Fix solenoid page assignment
* Forgot to declare the page itself
* Accidentally dropped the override tag
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gregtech/api/enums/Textures.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_Cyclotron_Coils.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index 300f2281ae..049fd97361 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -1739,6 +1739,7 @@ public class Textures { * by Default pages are null * page 0: 0-63 GT casing 1-4, 64-127 GT++ * page 1: 0-15 GT casing 5, 22-26 GS dyson swarm, 48-57 GT casing 8, 63 EMT, 80-95 GT reinforced blocks, 96 casing 2 meta 6, 97 error casing + * page 2: 0-15 solenoid coils * page 8: 0-111 TecTech, 112-127 GT casing 6 * page 12: 0-127 GlodBlock * page 16: 0-15 GT glass 1, 16-31 GT casing 9, 32-47 GT glass 2, 48-63 GT casing 10, 64-79 GT casing 11 @@ -1761,6 +1762,7 @@ public class Textures { casingTexturePages[0] = new ITexture[128]; // adds some known pages, modders also can do it... GT_Utility.addTexturePage((byte) 1); + GT_Utility.addTexturePage((byte) 2); GT_Utility.addTexturePage((byte) 8); GT_Utility.addTexturePage((byte) 16); setCasingTextureForId(ERROR_TEXTURE_INDEX, ERROR_RENDERING[0]); diff --git a/src/main/java/gregtech/common/blocks/GT_Cyclotron_Coils.java b/src/main/java/gregtech/common/blocks/GT_Cyclotron_Coils.java index 75b3670895..d918060298 100644 --- a/src/main/java/gregtech/common/blocks/GT_Cyclotron_Coils.java +++ b/src/main/java/gregtech/common/blocks/GT_Cyclotron_Coils.java @@ -38,9 +38,9 @@ public class GT_Cyclotron_Coils extends GT_Block_Casings_Abstract { ItemList.Superconducting_Magnet_Solenoid_UMV.set(new ItemStack(this, 1, 10)); } - @Override // Magic numbers... + @Override public int getTextureIndex(int aMeta) { - return 208 + aMeta; + return (2 << 7) | (aMeta); } @Override |