aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/common/blocks
diff options
context:
space:
mode:
authorJordan Byrne <draknyte1@hotmail.com>2018-02-04 23:55:17 +1000
committerJordan Byrne <draknyte1@hotmail.com>2018-02-04 23:55:17 +1000
commit50787529e12663685e9d0657c2e136ff4ae9ff7f (patch)
tree283049c442e144eb1a2e43b6ec6cdcacf89851cf /src/Java/gtPlusPlus/xmod/gregtech/common/blocks
parentc2b4614d54c732c075847e3e8e9e577a18bdceb2 (diff)
downloadGT5-Unofficial-50787529e12663685e9d0657c2e136ff4ae9ff7f.tar.gz
GT5-Unofficial-50787529e12663685e9d0657c2e136ff4ae9ff7f.tar.bz2
GT5-Unofficial-50787529e12663685e9d0657c2e136ff4ae9ff7f.zip
$ Finished the Fishing Pond.
$ Made the Fishing Pond cache reflection data from WeightedRandomFishable objects. $ Fixed the Fish Pond not outputting correct stack sizes. (They were all 0)
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/blocks')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java32
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java39
2 files changed, 35 insertions, 36 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
index 7a9be5788c..37f7f2cb16 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
@@ -21,21 +21,21 @@ extends GregtechMetaCasingBlocksAbstract {
TAE.registerTextures(new GT_CopiedBlockTexture(this, 6, i));
}
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Aquatic Casing");
- GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Hastelloy-N Sealant Block");
- GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Hastelloy-X Structural Block");
- GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Incoloy-DS Fluid Containment Block");
- GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Wash Plant Casing");
- GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Industrial Sieve Casing");
- GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Large Sieve Grate");
- GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Vanadium Redox Power Cell");
- GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Sub-Station External Casing");
- GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Cyclotron Coil");
- GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Cyclotron Outer Casing");
- GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Thermal Containment Casing");
- GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Autocrafter Frame");
- GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Cutting Factory Frame");
- GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "Tesla Containment Casing");
- GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Casing "); //Tree Farmer Textures
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Placeholder");
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Placeholder");
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Placeholder");
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Placeholder");
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Placeholder");
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Placeholder");
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Placeholder");;
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Placeholder");
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Placeholder");
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Placeholder");
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Placeholder");
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Placeholder");
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Placeholder");
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "Placeholder");
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Placeholder");
GregtechItemList.Casing_FishPond.set(new ItemStack(this, 1, 0));
//GregtechItemList.Casing_Refinery_External.set(new ItemStack(this, 1, 1));
//GregtechItemList.Casing_Refinery_Structural.set(new ItemStack(this, 1, 2));
@@ -56,6 +56,6 @@ extends GregtechMetaCasingBlocksAbstract {
@Override
public IIcon getIcon(final int aSide, final int aMeta) {
- return CasingTextureHandler2.getIcon(aSide, aMeta);
+ return CasingTextureHandler3.getIcon(aSide, aMeta);
}
}
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 4e9d2c7e51..1bd59724fb 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
@@ -9,60 +9,59 @@ public class CasingTextureHandler3 {
if ((aMeta >= 0) && (aMeta < 16)) {
switch (aMeta) {
//Centrifuge
- case 0:
- return TexturesGtBlock.TEXTURE_METAL_PANEL_B.getIcon();
+ case 0:
+ return TexturesGtBlock.TEXTURE_METAL_PANEL_B.getIcon();
//Coke Oven Frame
case 1:
- return TexturesGtBlock.Casing_Material_HastelloyX.getIcon();
+ return TexturesGtBlock._PlaceHolder.getIcon();
//Coke Oven Casing Tier 1
case 2:
- return TexturesGtBlock.Casing_Material_HastelloyN.getIcon();
+ return TexturesGtBlock._PlaceHolder.getIcon();
//Coke Oven Casing Tier 2
case 3:
- return TexturesGtBlock.Casing_Material_Fluid_IncoloyDS.getIcon();
+ return TexturesGtBlock._PlaceHolder.getIcon();
//Material Press Casings
case 4:
- return TexturesGtBlock.Casing_Material_Grisium.getIcon();
+ return TexturesGtBlock._PlaceHolder.getIcon();
//Sifter Structural
case 5:
- return TexturesGtBlock.Casing_Machine_Metal_Panel_A.getIcon();
+ return TexturesGtBlock._PlaceHolder.getIcon();
//Sifter Sieve
case 6:
- return TexturesGtBlock.Casing_Machine_Metal_Grate_A.getIcon();
-
+ return TexturesGtBlock._PlaceHolder.getIcon();
//Vanadium Radox Battery
case 7:
- return TexturesGtBlock.Overlay_Machine_Cyber_B.getIcon();
+ return TexturesGtBlock._PlaceHolder.getIcon();
//Power Sub-Station Casing
case 8:
- return TexturesGtBlock.Casing_Machine_Metal_Sheet_A.getIcon();
+ return TexturesGtBlock._PlaceHolder.getIcon();
//Cyclotron Coil
case 9:
- return TexturesGtBlock.Overlay_Machine_Cyber_A.getIcon();
+ return TexturesGtBlock._PlaceHolder.getIcon();
//Cyclotron External Casing
case 10:
- return Textures.BlockIcons.MACHINE_CASING_RADIATIONPROOF.getIcon();
+ return TexturesGtBlock._PlaceHolder.getIcon();
//Multitank Exterior Casing
case 11:
- return TexturesGtBlock.Casing_Material_Tantalloy61.getIcon();
+ return TexturesGtBlock._PlaceHolder.getIcon();
//Reactor Casing I
case 12:
- return TexturesGtBlock.Casing_Machine_Simple_Top.getIcon();
+ return TexturesGtBlock._PlaceHolder.getIcon();
//Reactor Casing II
case 13:
if (aSide <2) {
- return TexturesGtBlock.TEXTURE_TECH_A.getIcon();
+ return TexturesGtBlock._PlaceHolder.getIcon();
}
else {
- return TexturesGtBlock.TEXTURE_TECH_B.getIcon();
+ return TexturesGtBlock._PlaceHolder.getIcon();
}
case 14:
- return TexturesGtBlock.Casing_Material_RedSteel.getIcon();
+ return TexturesGtBlock._PlaceHolder.getIcon();
case 15:
- return TexturesGtBlock.Casing_Machine_Farm_Manager.getIcon(); //Tree Farmer Textures
+ return TexturesGtBlock._PlaceHolder.getIcon(); //Tree Farmer Textures
default:
- return TexturesGtBlock.Overlay_UU_Matter.getIcon();
+ return TexturesGtBlock._PlaceHolder.getIcon();
}
}