aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/common/blocks
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2018-05-13 01:46:31 +1000
committerGitHub <noreply@github.com>2018-05-13 01:46:31 +1000
commit4d15336cfb84a61d7609d75c683f21ea084f47bb (patch)
tree1e3e837486ab8843bd97951d3f0cfdf2f69dc0d5 /src/Java/gtPlusPlus/xmod/gregtech/common/blocks
parent3ce52cc43f1b41ec0b4f9486afc188bd4d11c055 (diff)
downloadGT5-Unofficial-4d15336cfb84a61d7609d75c683f21ea084f47bb.tar.gz
GT5-Unofficial-4d15336cfb84a61d7609d75c683f21ea084f47bb.tar.bz2
GT5-Unofficial-4d15336cfb84a61d7609d75c683f21ea084f47bb.zip
Codeenvy (#273)
+ Added recipes for all Advanced Multis. + Added new casings for Advanced EBF. + Added Turbine Animations. + Added recipe for the Air Intake Hatch. + Added new textures for the Adv. Vac. Freezer and casings. % Gave old Adv. Vac. Freezer texture to Adv. EBF. % Swapped recipe materials for Adv. Vac. and EBF. + Added a book for Power Storage Solutions. + Added book for the FFPP. - Removed some useless Meta Tiles. (This removes advanced Mixer recipes, but not the tiles themselves.) $ Fixed issue with AIC tooltip. $ Fixed some chemical processing recipes. #266 $ Fixed Large Auto-Assembler Name. $ Possible fix for #239. $ Other Bug Fixes. $ Fixed Old School Circuits breaking Integrated Circuit Recipes. % Made all FFPP recipes require/produces 1/10th of the original fluid amounts. #268 % Made Adv. EBF. Use new casing textures. % Streamlined Old School Circuit function call locations to a single handler. % Cleaned up ASM Logging.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/blocks')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java3
3 files changed, 8 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
index c38d2ff6bf..aaf4f9f1a6 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
@@ -56,7 +56,7 @@ extends GregtechMetaCasingBlocksAbstract {
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Vanadium Redox Power Cell (MAX)");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Supply Depot Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Advanced Cryogenic Casing");
- GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Placeholder");
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Volcanus Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Placeholder");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Placeholder");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "Placeholder");
@@ -72,7 +72,7 @@ extends GregtechMetaCasingBlocksAbstract {
GregtechItemList.Casing_Vanadium_Redox_MAX.set(new ItemStack(this, 1, 8));
GregtechItemList.Casing_AmazonWarehouse.set(new ItemStack(this, 1, 9));
GregtechItemList.Casing_AdvancedVacuum.set(new ItemStack(this, 1, 10));
- //GregtechItemList.Casing_ThermalContainment.set(new ItemStack(this, 1, 11));
+ GregtechItemList.Casing_Adv_BlastFurnace.set(new ItemStack(this, 1, 11));
//GregtechItemList.Casing_Autocrafter.set(new ItemStack(this, 1, 12));
//GregtechItemList.Casing_CuttingFactoryFrame.set(new ItemStack(this, 1, 13));
//GregtechItemList.Casing_TeslaTower.set(new ItemStack(this, 1, 14));
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
index a8d363ca0c..85654523fe 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
@@ -2,8 +2,6 @@ package gtPlusPlus.xmod.gregtech.common.blocks.textures;
import net.minecraft.util.IIcon;
-import gregtech.api.enums.Textures;
-
public class CasingTextureHandler3 {
public static IIcon getIcon(final int aSide, final int aMeta) { //Texture ID's. case 0 == ID[57]
@@ -40,9 +38,11 @@ public class CasingTextureHandler3 {
//Amazon Warehouse Casing
return TexturesGtBlock.TEXTURE_CASING_AMAZON.getIcon();
case 10:
+ //Adv. Vac. Freezer
return TexturesGtBlock.TEXTURE_CASING_ADVANCED_CRYOGENIC.getIcon();
case 11:
- return TexturesGtBlock._PlaceHolder.getIcon();
+ //Adv. EBF
+ return TexturesGtBlock.TEXTURE_CASING_ADVANCED_VOLCNUS.getIcon();
case 12:
return TexturesGtBlock._PlaceHolder.getIcon();
case 13:
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
index 4a8f3131b9..fd46c6d0eb 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
@@ -209,6 +209,7 @@ public class TexturesGtBlock {
public static final CustomIcon TEXTURE_CASING_AMAZON = new CustomIcon("TileEntities/CASING_AMAZON");
public static final CustomIcon TEXTURE_CASING_ADVANCED_CRYOGENIC = new CustomIcon("TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC");
+ public static final CustomIcon TEXTURE_CASING_ADVANCED_VOLCNUS = new CustomIcon("TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS");
//Overlays
//Fan Textures
@@ -218,6 +219,8 @@ public class TexturesGtBlock {
public static final CustomIcon Overlay_Machine_Vent_Fast = Internal_Overlay_Machine_Vent_Fast;
private static final CustomIcon Internal_Overlay_Machine_Vent_Adv = new CustomIcon("TileEntities/adv_machine_vent_rotating");
public static final CustomIcon Overlay_Machine_Vent_Adv = Internal_Overlay_Machine_Vent_Adv;
+ private static final CustomIcon Internal_Overlay_Machine_Turbine_Active = new CustomIcon("TileEntities/STEAM_TURBINE_SIDE_ACTIVE");
+ public static final CustomIcon Overlay_Machine_Turbine_Active = Internal_Overlay_Machine_Turbine_Active;
//Grate Texture
public static final CustomIcon OVERLAY_GRATE_A = new CustomIcon("metro/OVERLAY_GRATE_A");
//Speaker Texture