etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made the April Fools joke a liiiiiiiiiiitle less invasive

This commit is contained in:
Matt Caughey 2014-04-01 10:31:54 -04:00
parent d6e50e9ad9
commit e5c3636f0b
15 changed files with 48 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedLeaves.java
View File

@ -65,13 +65,6 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab
//TODO: this.setCreativeTab()
this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
}
public static boolean isTime()
{
Calendar calendar = Calendar.getInstance();
return (calendar.get(2) + 1 == 4 && calendar.get(5) == 1);
}
@Override
//TODO: registerIcons()
@ -83,51 +76,17 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab
{
for (int i = 0; i < leaves.length; ++i)
{
if (!BOPConfigurationMisc.behaveNormally)
{
if (isTime())
{
textures[0][i] = iconRegister.registerIcon("biomesoplenty:foolleaves_round");
textures[1][i] = iconRegister.registerIcon("biomesoplenty:foolleaves_fast");
textures[2][i] = iconRegister.registerIcon("biomesoplenty:foolleaves_better");
}
else
{
textures[0][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_round");
textures[1][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_fast");
textures[2][i] = iconRegister.registerIcon("biomesoplenty:better_leaves_" + leaves[i]);
}
}
else
{
textures[0][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_round");
textures[1][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_fast");
textures[2][i] = iconRegister.registerIcon("biomesoplenty:better_leaves_" + leaves[i]);
}
textures[0][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_round");
textures[1][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_fast");
textures[2][i] = iconRegister.registerIcon("biomesoplenty:better_leaves_" + leaves[i]);
}
}
else
{
for (int i = 0; i < leaves.length; ++i)
{
if (!BOPConfigurationMisc.behaveNormally)
{
if (isTime())
{
textures[0][i] = iconRegister.registerIcon("biomesoplenty:foolleaves_fancy");
textures[1][i] = iconRegister.registerIcon("biomesoplenty:foolleaves_fast");
}
else
{
textures[0][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_fancy");
textures[1][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_fast");
}
}
else
{
textures[0][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_fancy");
textures[1][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_fast");
}
textures[0][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_fancy");
textures[1][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_fast");
}
}
}

30
src/main/java/biomesoplenty/common/blocks/BlockBOPFoliage.java
View File

@ -61,13 +61,6 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable
this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
}
public static boolean isTime()
{
Calendar calendar = Calendar.getInstance();
return (calendar.get(2) + 1 == 4 && calendar.get(5) == 1);
}
@Override
//TODO: registerIcons()
@ -77,28 +70,7 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable
for (int i = 0; i < textures.length; ++i)
{
if (!BOPConfigurationMisc.behaveNormally)
{
if (isTime())
{
if (i != 1 && i != 2 && i != 10 && i != 11)
{
textures[i] = iconRegister.registerIcon("biomesoplenty:"+foliageTypes[i]);
}
else
{
textures[i] = iconRegister.registerIcon("biomesoplenty:foolgrass");
}
}
else
{
textures[i] = iconRegister.registerIcon("biomesoplenty:"+foliageTypes[i]);
}
}
else
{
textures[i] = iconRegister.registerIcon("biomesoplenty:"+foliageTypes[i]);
}
textures[i] = iconRegister.registerIcon("biomesoplenty:"+foliageTypes[i]);
}
hedgeTrunk = iconRegister.registerIcon("biomesoplenty:" + "hedge_trunk");

51
src/main/java/biomesoplenty/common/blocks/BlockBOPLeaves.java
View File

@ -82,13 +82,6 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable
//TODO: this.setCreativeTab()
this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
}
public static boolean isTime()
{
Calendar calendar = Calendar.getInstance();
return (calendar.get(2) + 1 == 4 && calendar.get(5) == 1);
}
@Override
//TODO: registerIcons()
@ -98,49 +91,15 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable
if(Loader.isModLoaded("BetterGrassAndLeavesMod"))
for (int i = 0; i < leaves.length; ++i)
{
if (!BOPConfigurationMisc.behaveNormally)
{
if (isTime())
{
textures[0][i] = iconRegister.registerIcon("biomesoplenty:foolleaves_round");
textures[1][i] = iconRegister.registerIcon("biomesoplenty:foolleaves_fast");
textures[2][i] = iconRegister.registerIcon("biomesoplenty:foolleaves_better");
}
else
{
textures[0][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_round");
textures[1][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_fast");
textures[2][i] = iconRegister.registerIcon("biomesoplenty:better_leaves_" + leaves[i]);
}
}
else
{
textures[0][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_round");
textures[1][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_fast");
textures[2][i] = iconRegister.registerIcon("biomesoplenty:better_leaves_" + leaves[i]);
}
textures[0][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_round");
textures[1][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_fast");
textures[2][i] = iconRegister.registerIcon("biomesoplenty:better_leaves_" + leaves[i]);
}
else
for (int i = 0; i < leaves.length; ++i)
{
if (!BOPConfigurationMisc.behaveNormally)
{
if (isTime())
{
textures[0][i] = iconRegister.registerIcon("biomesoplenty:foolleaves_fancy");
textures[1][i] = iconRegister.registerIcon("biomesoplenty:foolleaves_fast");
}
else
{
textures[0][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_fancy");
textures[1][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_fast");
}
}
else
{
textures[0][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_fancy");
textures[1][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_fast");
}
textures[0][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_fancy");
textures[1][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_fast");
}
}

34
src/main/java/biomesoplenty/common/blocks/BlockBOPLog.java
View File

@ -74,13 +74,6 @@ public class BlockBOPLog extends Block
//TODO: this.setCreativeTab()
this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
}
public static boolean isTime()
{
Calendar calendar = Calendar.getInstance();
return (calendar.get(2) + 1 == 4 && calendar.get(5) == 1);
}
@Override
//TODO: registerIcons()
@ -89,35 +82,12 @@ public class BlockBOPLog extends Block
textures = new IIcon[types.length];
logHearts = new IIcon[types.length];
if (!BOPConfigurationMisc.behaveNormally)
{
if (isTime())
{
}
}
for (int i = 0; i < types.length; ++i)
{
if (i != 11)
{
if (!BOPConfigurationMisc.behaveNormally)
{
if (isTime())
{
textures[i] = iconRegister.registerIcon("biomesoplenty:foollog_side");
logHearts[i] = iconRegister.registerIcon("biomesoplenty:foollog_heart");
}
else
{
textures[i] = iconRegister.registerIcon("biomesoplenty:log_"+types[i]+"_side");
logHearts[i] = iconRegister.registerIcon("biomesoplenty:log_"+types[i]+"_heart");
}
}
else
{
textures[i] = iconRegister.registerIcon("biomesoplenty:log_"+types[i]+"_side");
logHearts[i] = iconRegister.registerIcon("biomesoplenty:log_"+types[i]+"_heart");
}
textures[i] = iconRegister.registerIcon("biomesoplenty:log_"+types[i]+"_side");
logHearts[i] = iconRegister.registerIcon("biomesoplenty:log_"+types[i]+"_heart");
}
}

37
src/main/java/biomesoplenty/common/blocks/BlockBOPMushroom.java
View File

@ -1,5 +1,6 @@
package biomesoplenty.common.blocks;
import java.util.Calendar;
import java.util.List;
import net.minecraft.block.Block;
@ -15,6 +16,7 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.configuration.BOPConfigurationMisc;
public class BlockBOPMushroom extends BlockBush
{
@ -43,6 +45,13 @@ public class BlockBOPMushroom extends BlockBush
//TODO: this.setCreativeTab()
this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
}
public static boolean isTime()
{
Calendar calendar = Calendar.getInstance();
return (calendar.get(2) + 1 == 4 && calendar.get(5) == 1);
}
@Override
//TODO: registerIcons()
@ -50,8 +59,32 @@ public class BlockBOPMushroom extends BlockBush
{
textures = new IIcon[plants.length];
for (int i = 0; i < plants.length; ++i) {
textures[i] = iconRegister.registerIcon("biomesoplenty:" + plants[i]);
for (int i = 0; i < plants.length; ++i)
{
if (!BOPConfigurationMisc.behaveNormally)
{
if (isTime())
{
if (i != 0 && i != 1 && i != 4)
{
textures[i] = iconRegister.registerIcon("biomesoplenty:" + plants[i]);
}
else
{
textures[0] = iconRegister.registerIcon("biomesoplenty:toadhard");
textures[1] = iconRegister.registerIcon("biomesoplenty:kappabello");
textures[4] = iconRegister.registerIcon("biomesoplenty:frankershroom");
}
}
else
{
textures[i] = iconRegister.registerIcon("biomesoplenty:" + plants[i]);
}
}
else
{
textures[i] = iconRegister.registerIcon("biomesoplenty:" + plants[i]);
}
}
}

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/foolgrass.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 641 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/foolleaves_better.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1021 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/foolleaves_fancy.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 742 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/foolleaves_fast.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 823 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/foolleaves_round.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 686 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/foollog_heart.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 931 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/foollog_side.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 833 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/frankershroom.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 721 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/kappabello.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 716 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/toadhard.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 794 B