Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Fixed textures in correct place...

Browse source
This commit is contained in:
Technus 2016-09-07 00:54:07 +02:00
parent 8f8a0e5ff3
commit d02b7925f5
2 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/main/java/gregtech/api/enums/Textures.java
View file

@ -12,6 +12,8 @@ import net.minecraft.util.ResourceLocation;
import static gregtech.api.enums.GT_Values.RES_PATH_BLOCK; import static gregtech.api.enums.GT_Values.RES_PATH_BLOCK;
import static gregtech.api.enums.GT_Values.RES_PATH_ITEM; import static gregtech.api.enums.GT_Values.RES_PATH_ITEM;
//TODO IMPLEMENT TEXTURES for new tiers
public class Textures { public class Textures {
public enum BlockIcons implements IIconContainer, Runnable { public enum BlockIcons implements IIconContainer, Runnable {
VOID // The Empty Texture VOID // The Empty Texture
@ -244,7 +246,7 @@ public class Textures {
LARGETURBINE_TU_ACTIVE6, LARGETURBINE_TU_ACTIVE6,
LARGETURBINE_TU_ACTIVE7, LARGETURBINE_TU_ACTIVE7,
LARGETURBINE_TU_ACTIVE8, LARGETURBINE_TU_ACTIVE8,
LARGETURBINE_TU_ACTIVE9 LARGETURBINE_TU_ACTIVE9,
}, },
CONNECTED_HULLS = new IIconContainer[]{ CONNECTED_HULLS = new IIconContainer[]{
CONCRETE_DARK_STONE, CONCRETE_DARK_STONE,
@ -471,6 +473,12 @@ public class Textures {
new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[]{240, 240, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[]{240, 240, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[]{240, 240, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[]{240, 240, 245, 0}),
}, },
OVERLAYS_ENERGY_OUT = new ITexture[]{ OVERLAYS_ENERGY_OUT = new ITexture[]{
new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[]{220, 220, 220, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[]{220, 220, 220, 0}),
@ -483,6 +491,12 @@ public class Textures {
new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[]{240, 240, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[]{240, 240, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[]{240, 240, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[]{240, 240, 245, 0}),
}, },
OVERLAYS_ENERGY_IN_MULTI = new ITexture[]{ OVERLAYS_ENERGY_IN_MULTI = new ITexture[]{
new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[]{220, 220, 220, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[]{220, 220, 220, 0}),
@ -495,6 +509,12 @@ public class Textures {
new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[]{240, 240, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[]{240, 240, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[]{240, 240, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[]{240, 240, 245, 0}),
}, },
OVERLAYS_ENERGY_OUT_MULTI = new ITexture[]{ OVERLAYS_ENERGY_OUT_MULTI = new ITexture[]{
new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[]{220, 220, 220, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[]{220, 220, 220, 0}),
@ -507,6 +527,12 @@ public class Textures {
new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[]{240, 240, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[]{240, 240, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[]{240, 240, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[]{240, 240, 245, 0}),
new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[]{240, 240, 245, 0}),
}, },
LOCKERS = new ITexture[]{ LOCKERS = new ITexture[]{
new GT_RenderedTexture(OVERLAY_LOCKER_000), new GT_RenderedTexture(OVERLAY_LOCKER_000),
@ -523,6 +549,8 @@ public class Textures {
new GT_RenderedTexture(OVERLAY_LOCKER_011), new GT_RenderedTexture(OVERLAY_LOCKER_011),
new GT_RenderedTexture(OVERLAY_LOCKER_012), new GT_RenderedTexture(OVERLAY_LOCKER_012),
new GT_RenderedTexture(OVERLAY_LOCKER_013), new GT_RenderedTexture(OVERLAY_LOCKER_013),
new GT_RenderedTexture(OVERLAY_LOCKER_013),
new GT_RenderedTexture(OVERLAY_LOCKER_013),
}, },
CASING_BLOCKS = new ITexture[128], CASING_BLOCKS = new ITexture[128],
MACHINE_CASINGS[] = new ITexture[16][17]; MACHINE_CASINGS[] = new ITexture[16][17];

2
src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java
View file

@ -26,7 +26,7 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity
@Override @Override
public ITexture[][][] getTextureSet(ITexture[] aTextures) { public ITexture[][][] getTextureSet(ITexture[] aTextures) {
ITexture[][][] rTextures = new ITexture[16][17][]; ITexture[][][] rTextures = new ITexture[10][17][];
for (byte i = -1; i < 16; i++) { for (byte i = -1; i < 16; i++) {
rTextures[0][i + 1] = getFront(i); rTextures[0][i + 1] = getFront(i);
rTextures[1][i + 1] = getBack(i); rTextures[1][i + 1] = getBack(i);