aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/block/base
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-12-27 17:12:35 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-12-27 17:12:35 +1000
commit3cc9e9a347b320374858ee7cf4df89138d7d0941 (patch)
tree6f4b7ec67683b64d82eec37c3d1921e4f9c4b3e4 /src/Java/gtPlusPlus/core/block/base
parent2ab81b73b0904665bebb77c323cb486e047d8ab0 (diff)
downloadGT5-Unofficial-3cc9e9a347b320374858ee7cf4df89138d7d0941.tar.gz
GT5-Unofficial-3cc9e9a347b320374858ee7cf4df89138d7d0941.tar.bz2
GT5-Unofficial-3cc9e9a347b320374858ee7cf4df89138d7d0941.zip
+ Made Fluorite Ore drop from Sandstone mining and Limestone mining.
+ Added Ore Blocks. + Gave Ore Blocks an overlay texture. - Removed the old ZrF4 dust.
Diffstat (limited to 'src/Java/gtPlusPlus/core/block/base')
-rw-r--r--src/Java/gtPlusPlus/core/block/base/BasicBlock.java11
-rw-r--r--src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java20
-rw-r--r--src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java76
3 files changed, 102 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java
index 364a849ebc..0083380bcb 100644
--- a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java
+++ b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java
@@ -11,6 +11,10 @@ import net.minecraft.world.World;
public class BasicBlock extends BlockContainer {
public BasicBlock(final String unlocalizedName, final Material material) {
+ this(unlocalizedName, material, 2);
+ }
+
+ public BasicBlock(final String unlocalizedName, final Material material, int harvestLevel) {
super(material);
this.setBlockName(Utils.sanitizeString(unlocalizedName));
this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName);
@@ -18,14 +22,15 @@ public class BasicBlock extends BlockContainer {
this.setHardness(2.0F);
this.setResistance(6.0F);
this.setLightLevel(0.0F);
- this.setHarvestLevel("pickaxe", 2);
+ this.setHarvestLevel("pickaxe", harvestLevel);
this.setStepSound(soundTypeMetal);
}
public static enum BlockTypes {
- STANDARD("blockBlock", "pickaxe", soundTypeStone),
- FRAME("blockFrameGt", "wrench", soundTypeMetal);
+ STANDARD("blockBlock", "pickaxe", soundTypeMetal),
+ FRAME("blockFrameGt", "wrench", soundTypeMetal),
+ ORE("blockOre", "pickaxe", soundTypeStone);
private String TEXTURE_NAME;
private String HARVEST_TOOL;
diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
index a2d2589f5e..325d83f67d 100644
--- a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
+++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
@@ -20,9 +20,14 @@ public class BlockBaseModular extends BasicBlock{
protected String thisBlockMaterial;
protected final String thisBlockType;
+
public BlockBaseModular(String unlocalizedName, String blockMaterial, BlockTypes blockType, int colour) {
- super(blockType.getTexture()+unlocalizedName, Material.iron);
- this.setHarvestLevel(blockType.getHarvestTool(), 2);
+ this(unlocalizedName, blockMaterial, Material.iron, blockType, colour, 2);
+ }
+
+ public BlockBaseModular(String unlocalizedName, String blockMaterial, Material vanillaMaterial, BlockTypes blockType, int colour, int miningLevel) {
+ super(blockType.getTexture()+unlocalizedName, vanillaMaterial);
+ this.setHarvestLevel(blockType.getHarvestTool(), miningLevel);
this.setBlockTextureName(CORE.MODID+":"+blockType.getTexture());
this.blockColour = colour;
this.thisBlock = blockType;
@@ -48,6 +53,10 @@ public class BlockBaseModular extends BasicBlock{
LanguageRegistry.addName(this, blockMaterial+ " Frame Box");
//Utils.LOG_INFO("Registered Block in Language Registry as: "+blockMaterial+ " Frame Box");
}
+ else if (thisBlockType == BlockTypes.ORE.name().toUpperCase()){
+ LanguageRegistry.addName(this, blockMaterial+ " Ore");
+ //Utils.LOG_INFO("Registered Block in Language Registry as: "+blockMaterial+ " Frame Box");
+ }
else {
LanguageRegistry.addName(this, blockMaterial);
//Utils.LOG_INFO("Registered Block in Language Registry as: "+blockMaterial);
@@ -62,6 +71,10 @@ public class BlockBaseModular extends BasicBlock{
GameRegistry.registerBlock(this, ItemBlockGtFrameBox.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName));
//Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial+" Frame Box");
}
+ else if (thisBlockType == BlockTypes.ORE.name().toUpperCase()){
+ GameRegistry.registerBlock(this, ItemBlockGtBlock.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName));
+ //Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial+" Frame Box");
+ }
else {
GameRegistry.registerBlock(this, ItemBlockGtBlock.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName));
//Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial);
@@ -107,6 +120,9 @@ public class BlockBaseModular extends BasicBlock{
else if (thisBlock == BlockTypes.FRAME){
tempIngot = thisBlockMaterial + " Frame Box";
}
+ else if (thisBlock == BlockTypes.ORE){
+ tempIngot = thisBlockMaterial + " Ore";
+ }
else {
tempIngot = getUnlocalizedName().replace("tile.blockGt", "ingot");
diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java
new file mode 100644
index 0000000000..dca12e0272
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java
@@ -0,0 +1,76 @@
+package gtPlusPlus.core.block.base;
+
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.math.MathUtils;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class BlockBaseOre extends BlockBaseModular{
+
+ @SuppressWarnings("unused")
+ private IIcon base;
+ @SuppressWarnings("unused")
+ private IIcon overlay;
+
+ @Override
+ public boolean renderAsNormalBlock() {
+ return false;
+ }
+
+ public BlockBaseOre(String unlocalizedName, String blockMaterial, BlockTypes blockType, int colour) {
+ this(unlocalizedName, blockMaterial, Material.iron, blockType, colour, 2);
+ }
+
+ public BlockBaseOre(String unlocalizedName, String blockMaterial, Material vanillaMaterial, BlockTypes blockType, int colour, int miningLevel) {
+ super(blockType.getTexture()+unlocalizedName, blockMaterial, vanillaMaterial, blockType, colour, miningLevel);
+ }
+
+ /**
+ * Returns which pass should this block be rendered on. 0 for solids and 1 for alpha
+ */
+ @Override
+ @SideOnly(Side.CLIENT)
+ public int getRenderBlockPass()
+ {
+ return 1;
+ }
+
+ @Override
+ public boolean isOpaqueCube()
+ {
+ return false;
+ }
+
+ @Override
+ @SideOnly(Side.CLIENT)
+ public void registerBlockIcons(IIconRegister iIcon)
+ {
+ //this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + thisBlock.getTexture());
+ this.base = iIcon.registerIcon(CORE.MODID + ":" + "blockStone");
+ this.overlay = iIcon.registerIcon(CORE.MODID + ":" + "blockOre_Overlay");
+ }
+
+ @Override
+ public int colorMultiplier(IBlockAccess par1IBlockAccess, int par2, int par3, int par4){
+ if (this.blockColour == 0){
+ return MathUtils.generateSingularRandomHexValue();
+ }
+ return this.blockColour;
+ }
+
+ @Override
+ public int getRenderColor(int aMeta) {
+ if (this.blockColour == 0){
+ return MathUtils.generateSingularRandomHexValue();
+ }
+ return this.blockColour;
+ }
+
+
+
+
+}