diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedLeaves.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedLeaves.java index e20f6035f..c214f11b0 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedLeaves.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedLeaves.java @@ -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"); } } } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPFoliage.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPFoliage.java index 00e984be7..e6693ba76 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPFoliage.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPFoliage.java @@ -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"); diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPLeaves.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPLeaves.java index d28099e31..36ff9756e 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPLeaves.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPLeaves.java @@ -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"); } } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPLog.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPLog.java index 83af7fa3b..8066e0dd3 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPLog.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPLog.java @@ -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"); } } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPMushroom.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPMushroom.java index 361754194..4f6c702c1 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPMushroom.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPMushroom.java @@ -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]); + } } } diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/foolgrass.png b/src/main/resources/assets/biomesoplenty/textures/blocks/foolgrass.png deleted file mode 100644 index ca60838d9..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/foolgrass.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/foolleaves_better.png b/src/main/resources/assets/biomesoplenty/textures/blocks/foolleaves_better.png deleted file mode 100644 index 1a544c9b4..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/foolleaves_better.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/foolleaves_fancy.png b/src/main/resources/assets/biomesoplenty/textures/blocks/foolleaves_fancy.png deleted file mode 100644 index 790d89e09..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/foolleaves_fancy.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/foolleaves_fast.png b/src/main/resources/assets/biomesoplenty/textures/blocks/foolleaves_fast.png deleted file mode 100644 index 64f56a15a..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/foolleaves_fast.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/foolleaves_round.png b/src/main/resources/assets/biomesoplenty/textures/blocks/foolleaves_round.png deleted file mode 100644 index f83143fc6..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/foolleaves_round.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/foollog_heart.png b/src/main/resources/assets/biomesoplenty/textures/blocks/foollog_heart.png deleted file mode 100644 index fc56e7329..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/foollog_heart.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/foollog_side.png b/src/main/resources/assets/biomesoplenty/textures/blocks/foollog_side.png deleted file mode 100644 index 61a773638..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/foollog_side.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/frankershroom.png b/src/main/resources/assets/biomesoplenty/textures/blocks/frankershroom.png new file mode 100644 index 000000000..c57e7ed32 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/blocks/frankershroom.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/kappabello.png b/src/main/resources/assets/biomesoplenty/textures/blocks/kappabello.png new file mode 100644 index 000000000..1e1defada Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/blocks/kappabello.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/toadhard.png b/src/main/resources/assets/biomesoplenty/textures/blocks/toadhard.png new file mode 100644 index 000000000..3fd66383c Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/blocks/toadhard.png differ