Compare commits
No commits in common. "2049a056495e7278fe9f95421c96cb4d75c3a790" and "816ead946d6943d3031c7fa1ef16a97ab1a1e768" have entirely different histories.
2049a05649
...
816ead946d
@ -325,8 +325,6 @@ public class ResourceManager {
|
|||||||
public static final ResourceLocation pheo_fire_door_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/fire_door.png");
|
public static final ResourceLocation pheo_fire_door_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/fire_door.png");
|
||||||
public static final ResourceLocation pheo_fire_door_black_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/fire_door_black.png");
|
public static final ResourceLocation pheo_fire_door_black_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/fire_door_black.png");
|
||||||
public static final ResourceLocation pheo_fire_door_orange_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/fire_door_orange.png");
|
public static final ResourceLocation pheo_fire_door_orange_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/fire_door_orange.png");
|
||||||
public static final ResourceLocation pheo_fire_door_yellow_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/fire_door_yellow.png");
|
|
||||||
public static final ResourceLocation pheo_fire_door_trefoil_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/fire_door_trefoil.png");
|
|
||||||
public static IModelCustomNamed pheo_fire_door = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/pheodoors/fire_door.obj")).asVBO();
|
public static IModelCustomNamed pheo_fire_door = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/pheodoors/fire_door.obj")).asVBO();
|
||||||
public static final ResourceLocation pheo_airlock_door_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/airlock_door.png");
|
public static final ResourceLocation pheo_airlock_door_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/airlock_door.png");
|
||||||
public static final ResourceLocation pheo_airlock_door_clean_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/airlock_door_clean.png");
|
public static final ResourceLocation pheo_airlock_door_clean_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/airlock_door_clean.png");
|
||||||
@ -336,14 +334,11 @@ public class ResourceManager {
|
|||||||
public static IModelCustomNamed pheo_blast_door = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/pheodoors/blast_door.obj")).asVBO();
|
public static IModelCustomNamed pheo_blast_door = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/pheodoors/blast_door.obj")).asVBO();
|
||||||
public static final ResourceLocation pheo_containment_door_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/containment_door.png");
|
public static final ResourceLocation pheo_containment_door_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/containment_door.png");
|
||||||
public static final ResourceLocation pheo_containment_door_trefoil_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/containment_door_trefoil.png");
|
public static final ResourceLocation pheo_containment_door_trefoil_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/containment_door_trefoil.png");
|
||||||
public static final ResourceLocation pheo_containment_door_trefoil_yellow_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/containment_door_trefoil_yellow.png");
|
|
||||||
public static IModelCustomNamed pheo_containment_door = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/pheodoors/containment_door.obj")).asVBO();
|
public static IModelCustomNamed pheo_containment_door = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/pheodoors/containment_door.obj")).asVBO();
|
||||||
public static final ResourceLocation pheo_seal_door_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/seal_door.png");
|
public static final ResourceLocation pheo_seal_door_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/seal_door.png");
|
||||||
public static IModelCustomNamed pheo_seal_door = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/pheodoors/seal_door.obj")).asVBO();
|
public static IModelCustomNamed pheo_seal_door = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/pheodoors/seal_door.obj")).asVBO();
|
||||||
public static final ResourceLocation pheo_secure_door_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/secure_door.png");
|
public static final ResourceLocation pheo_secure_door_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/secure_door.png");
|
||||||
public static final ResourceLocation pheo_secure_door_grey_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/secure_door_grey.png");
|
public static final ResourceLocation pheo_secure_door_grey_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/secure_door_grey.png");
|
||||||
public static final ResourceLocation pheo_secure_door_black_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/secure_door_black.png");
|
|
||||||
public static final ResourceLocation pheo_secure_door_yellow_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/secure_door_yellow.png");
|
|
||||||
public static IModelCustomNamed pheo_secure_door = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/pheodoors/secure_door.obj")).asVBO();
|
public static IModelCustomNamed pheo_secure_door = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/pheodoors/secure_door.obj")).asVBO();
|
||||||
public static final ResourceLocation pheo_sliding_door_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/sliding_door.png");
|
public static final ResourceLocation pheo_sliding_door_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pheodoors/sliding_door.png");
|
||||||
public static IModelCustomNamed pheo_sliding_door = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/pheodoors/sliding_door.obj")).asVBO();
|
public static IModelCustomNamed pheo_sliding_door = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/pheodoors/sliding_door.obj")).asVBO();
|
||||||
|
|||||||
@ -179,13 +179,11 @@ public abstract class DoorDecl {
|
|||||||
ResourceManager.pheo_fire_door_tex,
|
ResourceManager.pheo_fire_door_tex,
|
||||||
ResourceManager.pheo_fire_door_black_tex,
|
ResourceManager.pheo_fire_door_black_tex,
|
||||||
ResourceManager.pheo_fire_door_orange_tex,
|
ResourceManager.pheo_fire_door_orange_tex,
|
||||||
ResourceManager.pheo_fire_door_yellow_tex,
|
|
||||||
ResourceManager.pheo_fire_door_trefoil_tex
|
|
||||||
};
|
};
|
||||||
return skins;
|
return skins;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getSkinCount() { return 5; }
|
public int getSkinCount() { return 3; }
|
||||||
|
|
||||||
@Override public int timeToOpen() { return 160; }
|
@Override public int timeToOpen() { return 160; }
|
||||||
@Override public int[][] getDoorOpenRanges() { return new int[][] { { -1, 0, 0, 3, 4, 1 } }; }
|
@Override public int[][] getDoorOpenRanges() { return new int[][] { { -1, 0, 0, 3, 4, 1 } }; }
|
||||||
@ -313,14 +311,12 @@ public abstract class DoorDecl {
|
|||||||
@Override public ResourceLocation[] getSEDNASkins() {
|
@Override public ResourceLocation[] getSEDNASkins() {
|
||||||
if(skins == null) skins = new ResourceLocation[] {
|
if(skins == null) skins = new ResourceLocation[] {
|
||||||
ResourceManager.pheo_secure_door_tex,
|
ResourceManager.pheo_secure_door_tex,
|
||||||
ResourceManager.pheo_secure_door_grey_tex,
|
ResourceManager.pheo_secure_door_grey_tex
|
||||||
ResourceManager.pheo_secure_door_black_tex,
|
|
||||||
ResourceManager.pheo_secure_door_yellow_tex
|
|
||||||
};
|
};
|
||||||
return skins;
|
return skins;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getSkinCount() { return 4; }
|
public int getSkinCount() { return 2; }
|
||||||
};
|
};
|
||||||
|
|
||||||
public static final DoorDecl ROUND_AIRLOCK_DOOR = new DoorDecl() {
|
public static final DoorDecl ROUND_AIRLOCK_DOOR = new DoorDecl() {
|
||||||
@ -427,13 +423,12 @@ public abstract class DoorDecl {
|
|||||||
@SideOnly(Side.CLIENT) @Override public ResourceLocation[] getSEDNASkins() {
|
@SideOnly(Side.CLIENT) @Override public ResourceLocation[] getSEDNASkins() {
|
||||||
if(skins == null) skins = new ResourceLocation[] {
|
if(skins == null) skins = new ResourceLocation[] {
|
||||||
ResourceManager.pheo_containment_door_tex,
|
ResourceManager.pheo_containment_door_tex,
|
||||||
ResourceManager.pheo_containment_door_trefoil_tex,
|
ResourceManager.pheo_containment_door_trefoil_tex
|
||||||
ResourceManager.pheo_containment_door_trefoil_yellow_tex
|
|
||||||
};
|
};
|
||||||
return skins;
|
return skins;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override public int getSkinCount() { return 3; }
|
@Override public int getSkinCount() { return 2; }
|
||||||
|
|
||||||
@Override public int timeToOpen() { return 160; };
|
@Override public int timeToOpen() { return 160; };
|
||||||
@Override public int[][] getDoorOpenRanges() { return new int[][] { { -1, 0, 0, 3, 3, 1 } }; }
|
@Override public int[][] getDoorOpenRanges() { return new int[][] { { -1, 0, 0, 3, 3, 1 } }; }
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 497 B After Width: | Height: | Size: 303 B |
|
Before Width: | Height: | Size: 491 B After Width: | Height: | Size: 300 B |
|
Before Width: | Height: | Size: 490 B After Width: | Height: | Size: 330 B |
|
Before Width: | Height: | Size: 479 B After Width: | Height: | Size: 299 B |
|
Before Width: | Height: | Size: 514 B After Width: | Height: | Size: 297 B |
|
Before Width: | Height: | Size: 9.8 KiB |
|
Before Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 27 KiB |