even more cleaning

This commit is contained in:
Vincent Lee committed 2019-03-09 00:23:33 -06:00
1 parent d0118056f1
commit d55bc624fc
27 files changed
+43 -102

No files matched your search

@@ -25,22 +25,12 @@ import vazkii.botania.api.mana.ManaProficiencyEvent;
* armor set, where only one piece implements it.
*/
public interface IManaProficiencyArmor {
@Deprecated
default boolean shouldGiveProficiency(ItemStack armorStack, EntityEquipmentSlot slot, EntityPlayer player) {
return false;
}
default boolean shouldGiveProficiency(ItemStack armorStack, EntityEquipmentSlot slot, EntityPlayer player, ItemStack rod) {
return shouldGiveProficiency(armorStack, slot, player);
return false;
}
public final static class Helper {
@Deprecated
public static boolean hasProficiency(EntityPlayer player) {
return hasProficiency(player, ItemStack.EMPTY);
}
public static boolean hasProficiency(EntityPlayer player, ItemStack rod) {
boolean proficient = false;
@@ -22,11 +22,6 @@ import javax.annotation.Nullable;
*/
public interface IManaDiscountArmor {
@Deprecated
default float getDiscount(ItemStack stack, int slot, EntityPlayer player) {
return 0;
}
/**
* Gets the mana discount that this piece of armor provides for the specified
* tool. This is added together to create the full discount.
@@ -34,6 +29,6 @@ public interface IManaDiscountArmor {
* You can also return negative values to make tools cost more.
*/
default float getDiscount(ItemStack stack, int slot, EntityPlayer player, @Nullable ItemStack tool) {
return getDiscount(stack, slot, player);
return 0;
}
}
@@ -26,12 +26,6 @@ public class ManaDiscountEvent extends Event {
this.tool = tool;
}
@Deprecated
public ManaDiscountEvent(EntityPlayer entityPlayer, float discount) {
this(entityPlayer, discount, ItemStack.EMPTY);
}
public ItemStack getTool() {
return tool;
}
@@ -316,11 +316,6 @@ public final class ManaItemHandler {
int cost = (int) (manaToGet * multiplier);
return requestManaExact(stack, player, cost, remove);
}
@Deprecated
public static float getFullDiscountForTools(EntityPlayer player) {
return getFullDiscountForTools(player, null);
}
/**
* Gets the sum of all the discounts on IManaDiscountArmor items equipped
@@ -13,10 +13,8 @@ package vazkii.botania.api.recipe;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient;
import net.minecraftforge.oredict.OreDictionary;
import javax.annotation.Nullable;
import java.util.List;
public class RecipeManaInfusion {
@@ -57,37 +55,5 @@ public class RecipeManaInfusion {
public int getManaToConsume() {
return mana;
}
/**
* @deprecated Use {@link RecipeManaInfusion#setCatalyst(IBlockState)} instead
*/
@Deprecated
public void setAlchemy(boolean alchemy) {
catalystState = alchemy ? alchemyState : null;
}
/**
* @deprecated Use {@link RecipeManaInfusion#getCatalyst()} instead
*/
@Deprecated
public boolean isAlchemy() {
return catalystState == alchemyState;
}
/**
* @deprecated Use {@link RecipeManaInfusion#setCatalyst(IBlockState)} instead
*/
@Deprecated
public void setConjuration(boolean conjuration) {
catalystState = conjuration ? conjurationState : null;
}
/**
* @deprecated Use {@link RecipeManaInfusion#getCatalyst()} instead
*/
@Deprecated
public boolean isConjuration() {
return catalystState == conjurationState;
}
}
@@ -11,13 +11,14 @@
package vazkii.botania.api.recipe;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.ResourceLocation;
import vazkii.botania.api.BotaniaAPI;
public class RecipeMiniFlower extends RecipeManaInfusion {
public RecipeMiniFlower(ResourceLocation flower, ResourceLocation mini, int mana) {
super(BotaniaAPI.internalHandler.getSubTileAsStack(flower), BotaniaAPI.internalHandler.getSubTileAsStack(mini), mana);
super(BotaniaAPI.internalHandler.getSubTileAsStack(flower), Ingredient.fromStacks(BotaniaAPI.internalHandler.getSubTileAsStack(mini)), mana);
setCatalyst(RecipeManaInfusion.alchemyState);
}
@@ -32,7 +32,6 @@ import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
@@ -41,7 +40,7 @@ import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID)
public class BlockGhostRail extends BlockRailBase implements ILexiconable, IModelRegister {
public class BlockGhostRail extends BlockRailBase implements ILexiconable {
private static final String TAG_FLOAT_TICKS = "Botania_FloatTicks";
@@ -20,7 +20,6 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.lib.LibMisc;
@@ -44,7 +44,6 @@ import net.minecraftforge.common.IShearable;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.Botania;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.core.handler.ConfigHandler;
@@ -108,7 +107,7 @@ public class BlockModDoubleFlower extends BlockTallFlower implements ILexiconabl
@Override
@OnlyIn(Dist.CLIENT)
public void animateTick(IBlockState state, World world, BlockPos pos, Random rand) {
int hex = color.getColorValue();
int hex = color.colorValue;
int r = (hex & 0xFF0000) >> 16;
int g = (hex & 0xFF00) >> 8;
int b = hex & 0xFF;
@@ -33,7 +33,6 @@ import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.Botania;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.core.handler.ConfigHandler;
@@ -84,12 +83,9 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IGrowab
@Override
public void grow(@Nonnull World world, @Nonnull Random rand, @Nonnull BlockPos pos, @Nonnull IBlockState state) {
placeDoubleFlower(world, pos, color, 1 | 2);
}
public static void placeDoubleFlower(World world, BlockPos pos, EnumDyeColor color, int flags) {
Block flower = color.getMetadata() >= 8 ? ModBlocks.doubleFlower2 : ModBlocks.doubleFlower1;
world.setBlockState(pos, flower.getDefaultState().with(color.getMetadata() >= 8 ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, color).with(BlockDoublePlant.HALF, BlockDoublePlant.EnumBlockHalf.LOWER), flags);
world.setBlockState(pos.up(), flower.getDefaultState().with(color.getMetadata() >= 8 ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, color).with(BlockDoublePlant.HALF, BlockDoublePlant.EnumBlockHalf.UPPER), flags);
Block block = ModBlocks.getDoubleFlower(color);
if(block instanceof BlockDoublePlant) {
((BlockDoublePlant) block).placeAt(world, pos, 3);
}
}
}
@@ -49,7 +49,6 @@ import vazkii.botania.api.subtile.SubTileEntity;
import vazkii.botania.api.wand.IWandHUD;
import vazkii.botania.api.wand.IWandable;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.block.tile.TileSpecialFlower;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.item.ModItems;
@@ -324,7 +324,7 @@ public final class ModBlocks {
@ObjectHolder("lime" + LibBlockNames.DOUBLE_FLOWER_SUFFIX) public static Block doubleFlowerLime;
@ObjectHolder("pink" + LibBlockNames.DOUBLE_FLOWER_SUFFIX) public static Block doubleFlowerPink;
@ObjectHolder("gray" + LibBlockNames.DOUBLE_FLOWER_SUFFIX) public static Block doubleFlowerGray;
@ObjectHolder("light_gray" + LibBlockNames.DOUBLE_FLOWER_SUFFIX) public static Block doubleFlowerSilver;
@ObjectHolder("light_gray" + LibBlockNames.DOUBLE_FLOWER_SUFFIX) public static Block doubleFlowerLightGray;
@ObjectHolder("cyan" + LibBlockNames.DOUBLE_FLOWER_SUFFIX) public static Block doubleFlowerCyan;
@ObjectHolder("purple" + LibBlockNames.DOUBLE_FLOWER_SUFFIX) public static Block doubleFlowerPurple;
@ObjectHolder("blue" + LibBlockNames.DOUBLE_FLOWER_SUFFIX) public static Block doubleFlowerBlue;
@@ -755,7 +755,7 @@ public final class ModBlocks {
r.register(new ItemBlockMod(doubleFlowerLime, props).setRegistryName(doubleFlowerLime.getRegistryName()));
r.register(new ItemBlockMod(doubleFlowerPink, props).setRegistryName(doubleFlowerPink.getRegistryName()));
r.register(new ItemBlockMod(doubleFlowerGray, props).setRegistryName(doubleFlowerGray.getRegistryName()));
r.register(new ItemBlockMod(doubleFlowerSilver, props).setRegistryName(doubleFlowerSilver.getRegistryName()));
r.register(new ItemBlockMod(doubleFlowerLightGray, props).setRegistryName(doubleFlowerLightGray.getRegistryName()));
r.register(new ItemBlockMod(doubleFlowerCyan, props).setRegistryName(doubleFlowerCyan.getRegistryName()));
r.register(new ItemBlockMod(doubleFlowerPurple, props).setRegistryName(doubleFlowerPurple.getRegistryName()));
r.register(new ItemBlockMod(doubleFlowerBlue, props).setRegistryName(doubleFlowerBlue.getRegistryName()));
@@ -1027,4 +1027,26 @@ public final class ModBlocks {
}
}
public static Block getDoubleFlower(EnumDyeColor color) {
switch (color) {
default:
case WHITE: return doubleFlowerWhite;
case ORANGE: return doubleFlowerOrange;
case MAGENTA: return doubleFlowerMagenta;
case LIGHT_BLUE: return doubleFlowerLightBlue;
case YELLOW: return doubleFlowerYellow;
case LIME: return doubleFlowerLime;
case PINK: return doubleFlowerPink;
case GRAY: return doubleFlowerGray;
case LIGHT_GRAY: return doubleFlowerLightGray;
case CYAN: return doubleFlowerCyan;
case PURPLE: return doubleFlowerPurple;
case BLUE: return doubleFlowerBlue;
case BROWN: return doubleFlowerBrown;
case GREEN: return doubleFlowerGreen;
case RED: return doubleFlowerRed;
case BLACK: return doubleFlowerBlack;
}
}
}
@@ -28,7 +28,6 @@ import vazkii.botania.api.item.IHornHarvestable;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.recipe.ICustomApothecaryColor;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.Botania;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.lexicon.LexiconData;
@@ -11,24 +11,16 @@
package vazkii.botania.common.block.decor;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.statemap.StateMap;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.fml.common.Optional;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.api.item.IHornHarvestable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.common.block.BlockModFlower;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
import javax.annotation.Nonnull;
@@ -22,7 +22,6 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockReader;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.lib.LibMisc;
@@ -17,7 +17,6 @@ import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.lexicon.LexiconData;
@@ -14,7 +14,6 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
@@ -25,7 +25,6 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.lexicon.LexiconData;
@@ -10,6 +10,8 @@
*/
package vazkii.botania.common.core.handler;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDoublePlant;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.event.terraingen.DecorateBiomeEvent;
@@ -57,8 +59,12 @@ public final class BiomeDecorationHandler {
BlockPos pos2 = new BlockPos(x1, y1, z1);
if(event.getWorld().isAirBlock(pos2) && (!event.getWorld().provider.isNether() || y1 < 127) && ModBlocks.flower.canPlaceBlockAt(event.getWorld(), pos2)) {
event.getWorld().setBlockState(pos2, ModBlocks.flower.getDefaultState().with(BotaniaStateProps.COLOR, color), 2);
if(event.getRand().nextDouble() < ConfigHandler.flowerTallChance && ((BlockModFlower) ModBlocks.flower).canGrow(event.getWorld(), pos2, event.getWorld().getBlockState(pos2), false))
BlockModFlower.placeDoubleFlower(event.getWorld(), pos2, color, 0);
if(event.getRand().nextDouble() < ConfigHandler.flowerTallChance && ((BlockModFlower) ModBlocks.flower).canGrow(event.getWorld(), pos2, event.getWorld().getBlockState(pos2), false)) {
Block block = ModBlocks.getDoubleFlower(color);
if(block instanceof BlockDoublePlant) {
((BlockDoublePlant) block).placeAt(event.getWorld(), pos2, 3);
}
}
}
}
}
@@ -19,7 +19,6 @@ import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.lib.LibItemNames;
import vazkii.botania.common.lib.LibMisc;
@@ -41,7 +41,6 @@ import vazkii.botania.api.mana.IManaUsingItem;
import vazkii.botania.api.mana.ManaItemHandler;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.client.model.armor.ModelArmorManasteel;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.core.helper.ItemNBTHelper;
@@ -39,7 +39,7 @@ public class ItemManaweaveHelm extends ItemManaweaveArmor implements IManaDiscou
}
@Override
public boolean shouldGiveProficiency(ItemStack stack, EntityEquipmentSlot slot, EntityPlayer player) {
public boolean shouldGiveProficiency(ItemStack stack, EntityEquipmentSlot slot, EntityPlayer player, ItemStack rod) {
return hasArmorSet(player);
}
@@ -35,7 +35,6 @@ import net.minecraftforge.event.ForgeEventFactory;
import vazkii.botania.api.mana.IManaUsingItem;
import vazkii.botania.api.mana.ManaItemHandler;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.core.helper.PlayerHelper;
import vazkii.botania.common.item.ModItems;
@@ -34,7 +34,6 @@ import vazkii.botania.api.mana.IManaUsingItem;
import vazkii.botania.api.mana.ManaItemHandler;
import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.equipment.tool.ToolCommons;
@@ -32,7 +32,6 @@ import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.api.mana.IManaUsingItem;
import vazkii.botania.api.mana.ManaItemHandler;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.equipment.tool.ToolCommons;
@@ -38,7 +38,6 @@ import vazkii.botania.api.item.ISortableTool;
import vazkii.botania.api.mana.IManaUsingItem;
import vazkii.botania.api.mana.ManaItemHandler;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.equipment.tool.ToolCommons;
@@ -27,7 +27,6 @@ import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.mana.IManaUsingItem;
import vazkii.botania.api.mana.ManaItemHandler;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.equipment.tool.ToolCommons;