Tweaked a few textures

This commit is contained in:
Matt Caughey 2014-04-01 08:05:08 -04:00
parent e96a1fc698
commit d6e50e9ad9
15 changed files with 167 additions and 25 deletions

View file

@ -1,6 +1,7 @@
package biomesoplenty.common.blocks;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Random;
@ -19,6 +20,7 @@ import net.minecraft.world.World;
import net.minecraftforge.common.IShearable;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.configuration.BOPConfigurationMisc;
import cpw.mods.fml.common.Loader;
public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearable
@ -63,6 +65,13 @@ 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()
@ -74,17 +83,51 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab
{
for (int i = 0; i < leaves.length; ++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]);
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]);
}
}
}
else
{
for (int i = 0; i < leaves.length; ++i)
{
textures[0][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_fancy");
textures[1][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_fast");
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");
}
}
}
}

View file

@ -4,6 +4,7 @@ import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.client.render.RenderUtils;
import biomesoplenty.common.configuration.BOPConfigurationMisc;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
@ -31,6 +32,7 @@ import net.minecraftforge.common.IShearable;
import net.minecraftforge.common.util.FakePlayer;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Random;
@ -59,6 +61,13 @@ 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()
@ -66,8 +75,30 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable
{
textures = new IIcon[foliageTypes.length];
for (int i = 0; i < textures.length; ++i) {
textures[i] = iconRegister.registerIcon("biomesoplenty:"+foliageTypes[i]);
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]);
}
}
hedgeTrunk = iconRegister.registerIcon("biomesoplenty:" + "hedge_trunk");

View file

@ -3,6 +3,7 @@ package biomesoplenty.common.blocks;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.common.configuration.BOPConfigurationMisc;
import cpw.mods.fml.common.Loader;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLeavesBase;
@ -19,6 +20,7 @@ import net.minecraftforge.common.IShearable;
import net.minecraftforge.common.util.ForgeDirection;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Random;
@ -80,6 +82,13 @@ 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()
@ -89,15 +98,49 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable
if(Loader.isModLoaded("BetterGrassAndLeavesMod"))
for (int i = 0; i < leaves.length; ++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]);
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]);
}
}
else
for (int i = 0; i < leaves.length; ++i)
{
textures[0][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_fancy");
textures[1][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_fast");
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");
}
}
}

View file

@ -1,5 +1,6 @@
package biomesoplenty.common.blocks;
import java.util.Calendar;
import java.util.List;
import net.minecraft.block.Block;
@ -14,6 +15,8 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.common.configuration.BOPConfigurationMisc;
import biomesoplenty.common.world.WorldTypeBOPA;
public class BlockBOPLog extends Block
{
@ -71,6 +74,13 @@ 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()
@ -78,13 +88,36 @@ 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)
{
textures[i] = iconRegister.registerIcon("biomesoplenty:log_"+types[i]+"_side");
logHearts[i] = iconRegister.registerIcon("biomesoplenty:log_"+types[i]+"_heart");
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");
}
}
}

View file

@ -41,12 +41,4 @@ public class WorldTypeBOP extends WorldType
{
return new WorldChunkManagerBOP(world);
}
@Override
@SideOnly(Side.CLIENT)
public boolean getCanBeCreated()
{
if (!BOPConfigurationMisc.behaveNormally) return !WorldTypeBOPA.isTime();
else return true;
}
}

View file

@ -54,6 +54,6 @@ public class WorldTypeBOPA extends WorldType
{
Calendar calendar = Calendar.getInstance();
return (calendar.get(2) + 1 == 4 && calendar.get(5) == 1);
return (calendar.get(2) + 1 == 4 && calendar.get(5) == 20);
}
}

View file

@ -477,4 +477,4 @@ achievement.bop.achAllBOP.desc=You got all of the Biomes O' Plenty achievements!
itemGroup.tabBiomesOPlenty=Biomes O' Plenty
generator.BIOMESOP=Biomes O' Plenty
generator.CANDYOP=Biomes O' Plenty
generator.CANDYOP=Candyland

Binary file not shown.

Before

Width:  |  Height:  |  Size: 582 B

After

Width:  |  Height:  |  Size: 420 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 641 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1,021 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 742 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 823 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 686 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 931 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 833 B