diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index cee6ca7af..5e9c9180b 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -95,7 +95,6 @@ public final class BotaniaAPI { public static final Map oreWeights = new HashMap<>(); public static final Map oreWeightsNether = new HashMap<>(); - public static final Map seeds = new HashMap<>(); public static final Set looniumBlacklist = new LinkedHashSet<>(); public static final Map> paintableBlocks = new LinkedHashMap<>(); @@ -216,13 +215,6 @@ public final class BotaniaAPI { addOreWeightNether("oreOnyx", 500); // SimpleOres 2 addOreWeightNether("oreHaditeCoal", 500); // Hadite - addSeed(Items.WHEAT_SEEDS, Blocks.WHEAT); - addSeed(Items.POTATO, Blocks.POTATOES); - addSeed(Items.CARROT, Blocks.CARROTS); - addSeed(Items.NETHER_WART, Blocks.NETHER_WART); - addSeed(Items.PUMPKIN_SEEDS, Blocks.PUMPKIN_STEM); - addSeed(Items.MELON_SEEDS, Blocks.MELON_STEM); - registerModWiki("Minecraft", new SimpleWikiProvider("Minecraft Wiki", "http://minecraft.gamepedia.com/%s")); IWikiProvider technicWiki = new SimpleWikiProvider("Technic Wiki", "http://wiki.technicpack.net/%s"); @@ -650,14 +642,6 @@ public final class BotaniaAPI { return oreWeightsNether.get(ore); } - /** - * Allows an item to be counted as a seed. Any item in this list can be - * dispensed by a dispenser, the block is the block to be placed. - */ - public static void addSeed(Item item, Block block) { - seeds.put(item, block); - } - /** * Blacklists an item from the Loonium drop table. */ diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index 8e9ef9a77..d5170c248 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "79", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "80", provides = "BotaniaAPI") package vazkii.botania.api; import net.minecraftforge.fml.common.API; diff --git a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java index 4b662e619..118327497 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -1,5 +1,8 @@ package vazkii.botania.client.core.handler; +import java.awt.Color; +import java.util.Map; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -28,16 +31,12 @@ import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.item.ItemManaGun; import vazkii.botania.common.item.ItemManaMirror; import vazkii.botania.common.item.ItemManaTablet; -import vazkii.botania.common.item.ItemSignalFlare; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemBloodPendant; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; import vazkii.botania.common.item.lens.ItemLens; -import java.awt.*; -import java.util.Map; - public final class ColorHandler { public static void init() { @@ -47,11 +46,6 @@ public final class ColorHandler { // Steal vine colorer blocks.registerBlockColorHandler(map.get(Blocks.VINE.delegate), ModBlocks.solidVines); - // 16 colors - blocks.registerBlockColorHandler( - (state, world, pos, tintIndex) -> state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue, - ModBlocks.specialFlower, ModBlocks.manaBeacon, ModBlocks.petalBlock, ModBlocks.unstableBlock); - // Pool blocks.registerBlockColorHandler( (state, world, pos, tintIndex) -> { @@ -106,16 +100,13 @@ public final class ColorHandler { ModItems.twigWand); items.registerItemColorHandler((s, t) -> EnumDyeColor.byMetadata(s.getItemDamage()).getMapColor().colorValue, ModItems.dye, ModItems.petal); - items.registerItemColorHandler((s, t) -> Minecraft.getMinecraft().getBlockColors().colorMultiplier(((ItemBlock)s.getItem()).block.getStateFromMeta(s.getMetadata()), null, null, t), - ModBlocks.manaBeacon, ModBlocks.petalBlock, ModBlocks.unstableBlock, ModBlocks.pool, ModBlocks.spreader); + ModBlocks.petalBlock, ModBlocks.pool, ModBlocks.spreader); items.registerItemColorHandler((s, t) -> t == 1 ? Color.HSBtoRGB(0.528F, ((ItemManaMirror) ModItems.manaMirror).getMana(s) / TilePool.MAX_MANA, 1F) : -1, ModItems.manaMirror); items.registerItemColorHandler((s, t) -> t == 1 ? Color.HSBtoRGB(0.528F, ((ItemManaTablet) ModItems.manaTablet).getMana(s) / ItemManaTablet.MAX_MANA, 1F) : -1, ModItems.manaTablet); - items.registerItemColorHandler((s, t) -> t == 1 ? EnumDyeColor.byMetadata(ItemSignalFlare.getColor(s)).getMapColor().colorValue : -1, ModItems.signalFlare); - items.registerItemColorHandler((s, t) -> Color.HSBtoRGB(0.55F, ((float) s.getMaxDamage() - (float) s.getItemDamage()) / s.getMaxDamage() * 0.5F, 1F), ModItems.spellCloth); items.registerItemColorHandler((s, t) -> { diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java index 8394b13ed..eb0e7851c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java @@ -18,14 +18,11 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemKeepIvy; -import vazkii.botania.common.item.ItemRegenIvy; public final class TooltipHandler { @SubscribeEvent(priority = EventPriority.HIGHEST) public static void onTooltipEvent(ItemTooltipEvent event) { - if(ItemNBTHelper.detectNBT(event.getItemStack()) && ItemNBTHelper.getBoolean(event.getItemStack(), ItemRegenIvy.TAG_REGEN, false)) - event.getToolTip().add(I18n.format("botaniamisc.hasIvy")); if(ItemNBTHelper.detectNBT(event.getItemStack()) && ItemNBTHelper.getBoolean(event.getItemStack(), ItemKeepIvy.TAG_KEEP, false)) event.getToolTip().add(I18n.format("botaniamisc.hasKeepIvy")); } diff --git a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java index 3e6268126..730cd5b7f 100644 --- a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java +++ b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java @@ -70,7 +70,6 @@ public final class ModAchievements { public static Achievement manaBombIgnite; public static Achievement dandelifeonPickup; - public static Achievement signalFlareStun; public static Achievement l20ShardUse; public static Achievement gaiaGuardianNoArmor; public static Achievement rankSSPick; @@ -130,7 +129,6 @@ public final class ModAchievements { manaBombIgnite = new AchievementMod(LibAchievementNames.MANA_BOMB_IGNITE, 0, 11, ModBlocks.manaBomb, gaiaGuardianKill); dandelifeonPickup = new AchievementMod(LibAchievementNames.DANDELIFEON_PICKUP, 0, 7, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DANDELIFEON), gaiaGuardianKill); - signalFlareStun = new AchievementMod(LibAchievementNames.SIGNAL_FLARE_STUN, -3, 1, ModItems.signalFlare, null).setSpecial(); l20ShardUse = new AchievementMod(LibAchievementNames.L20_SHARD_USE, -5, 3, ModItems.laputaShard, null).setSpecial(); gaiaGuardianNoArmor = new AchievementMod(LibAchievementNames.GAIA_GUARDIAN_NO_ARMOR, -5, 1, new ItemStack(Items.SKULL, 1, 3), null).setSpecial(); rankSSPick = new AchievementMod(LibAchievementNames.RANK_SS_PICK, -3, 3, ModItems.terraPick, null).setSpecial(); diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index eac1fe811..103972d9e 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -32,10 +32,8 @@ import vazkii.botania.common.block.corporea.BlockCorporeaRetainer; import vazkii.botania.common.block.decor.BlockBlaze; import vazkii.botania.common.block.decor.BlockBuriedPetals; import vazkii.botania.common.block.decor.BlockCustomBrick; -import vazkii.botania.common.block.decor.BlockDirtPath; import vazkii.botania.common.block.decor.BlockElfGlass; import vazkii.botania.common.block.decor.BlockFloatingFlower; -import vazkii.botania.common.block.decor.BlockManaBeacon; import vazkii.botania.common.block.decor.BlockManaFlame; import vazkii.botania.common.block.decor.BlockManaGlass; import vazkii.botania.common.block.decor.BlockModMushroom; @@ -45,10 +43,8 @@ import vazkii.botania.common.block.decor.BlockShimmerwoodPlanks; import vazkii.botania.common.block.decor.BlockShinyFlower; import vazkii.botania.common.block.decor.BlockStarfield; import vazkii.botania.common.block.decor.BlockTinyPotato; -import vazkii.botania.common.block.decor.BlockUnstable; import vazkii.botania.common.block.dispenser.BehaviourFelPumpkin; import vazkii.botania.common.block.dispenser.BehaviourPoolMinecart; -import vazkii.botania.common.block.dispenser.BehaviourSeeds; import vazkii.botania.common.block.dispenser.BehaviourWand; import vazkii.botania.common.block.mana.BlockAlchemyCatalyst; import vazkii.botania.common.block.mana.BlockBellows; @@ -133,7 +129,6 @@ import vazkii.botania.common.block.tile.TileGaiaHead; import vazkii.botania.common.block.tile.TileHourglass; import vazkii.botania.common.block.tile.TileIncensePlate; import vazkii.botania.common.block.tile.TileLightRelay; -import vazkii.botania.common.block.tile.TileManaBeacon; import vazkii.botania.common.block.tile.TileManaFlame; import vazkii.botania.common.block.tile.TileOpenCrate; import vazkii.botania.common.block.tile.TilePlatform; @@ -182,11 +177,9 @@ public final class ModBlocks { public static Block spreader; public static Block pool; public static Block runeAltar; - public static Block unstableBlock; public static Block pylon; public static Block pistonRelay; public static Block distributor; - public static Block manaBeacon; public static Block manaVoid; public static Block manaDetector; public static Block enchanter; @@ -224,7 +217,6 @@ public final class ModBlocks { public static Block floatingSpecialFlower; public static Block manaFlame; public static Block prism; - public static Block dirtPath; public static Block enchantedSoil; public static Block petalBlock; public static Block corporeaIndex; @@ -269,11 +261,9 @@ public final class ModBlocks { spreader = new BlockSpreader(); pool = new BlockPool(); runeAltar = new BlockRuneAltar(); - unstableBlock = new BlockUnstable(); pylon = new BlockPylon(); pistonRelay = new BlockPistonRelay(); distributor = new BlockDistributor(); - manaBeacon = new BlockManaBeacon(); manaVoid = new BlockManaVoid(); manaDetector = new BlockManaDetector(); enchanter = new BlockEnchanter(); @@ -311,7 +301,6 @@ public final class ModBlocks { floatingSpecialFlower = new BlockFloatingSpecialFlower(); manaFlame = new BlockManaFlame(); prism = new BlockPrism(); - dirtPath = new BlockDirtPath(); enchantedSoil = new BlockEnchantedSoil(); petalBlock = new BlockPetalBlock(); corporeaIndex = new BlockCorporeaIndex(); @@ -372,9 +361,6 @@ public final class ModBlocks { OreDictionary.registerOre("ice", Blocks.ICE); OreDictionary.registerOre("slabCobblestone", new ItemStack(Blocks.STONE_SLAB, 1, 3)); - BotaniaAPI.registerPaintableBlock(unstableBlock, BotaniaStateProps.COLOR); - BotaniaAPI.registerPaintableBlock(manaBeacon, BotaniaStateProps.COLOR); - RecipeManaInfusion.alchemyState = alchemyCatalyst.getDefaultState(); RecipeManaInfusion.conjurationState = conjurationCatalyst.getDefaultState(); @@ -382,8 +368,6 @@ public final class ModBlocks { } public static void addDispenserBehaviours() { - for(Item seed : BotaniaAPI.seeds.keySet()) - BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(seed, new BehaviourSeeds(BotaniaAPI.seeds.get(seed))); BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(ModItems.twigWand, new BehaviourWand()); BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(ModItems.poolMinecart, new BehaviourPoolMinecart()); BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(Item.getItemFromBlock(ModBlocks.felPumpkin), new BehaviourFelPumpkin()); @@ -397,7 +381,6 @@ public final class ModBlocks { registerTile(TileRuneAltar.class, LibBlockNames.RUNE_ALTAR); registerTile(TilePylon.class, LibBlockNames.PYLON); registerTile(TileDistributor.class, LibBlockNames.DISTRIBUTOR); - registerTile(TileManaBeacon.class, LibBlockNames.MANA_BEACON); registerTile(TileManaVoid.class, LibBlockNames.MANA_VOID); registerTile(TileManaDetector.class, LibBlockNames.MANA_DETECTOR); registerTile(TileEnchanter.class, LibBlockNames.ENCHANTER); diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 01143a6f3..9ab1221f7 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -10,7 +10,10 @@ */ package vazkii.botania.common.block; +import java.util.Locale; + import com.google.common.collect.ImmutableList; + import net.minecraft.block.Block; import net.minecraft.item.EnumDyeColor; import vazkii.botania.api.state.BotaniaStateProps; @@ -26,8 +29,6 @@ import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartz; import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartzSlab; import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartzStairs; import vazkii.botania.common.block.decor.slabs.BlockBiomeStoneSlab; -import vazkii.botania.common.block.decor.slabs.BlockDirtPathSlab; -import vazkii.botania.common.block.decor.slabs.BlockModSlab; import vazkii.botania.common.block.decor.slabs.BlockPavementSlab; import vazkii.botania.common.block.decor.slabs.bricks.BlockCustomBrickSlab; import vazkii.botania.common.block.decor.slabs.bricks.BlockSnowBrickSlab; @@ -62,8 +63,6 @@ import vazkii.botania.common.block.decor.walls.living.BlockLivingwoodWall; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibBlockNames; -import java.util.Locale; - public final class ModFluffBlocks { public static Block livingwoodStairs; @@ -130,9 +129,6 @@ public final class ModFluffBlocks { public static Block sunnyQuartzSlabFull; public static Block sunnyQuartzStairs; - public static Block dirtPathSlab; - public static Block dirtPathSlabFull; - public static Block biomeStoneA; public static Block biomeStoneB; public static Block pavement; @@ -229,9 +225,6 @@ public final class ModFluffBlocks { sunnyQuartzSlabFull = new BlockSpecialQuartzSlab(sunnyQuartz, true); sunnyQuartzStairs = new BlockSpecialQuartzStairs(sunnyQuartz); - dirtPathSlab = new BlockDirtPathSlab(false); - dirtPathSlabFull = new BlockDirtPathSlab(true); - int count = 0; for (BiomeStoneVariant variant : BiomeStoneVariant.values()) { biomeStoneStairs[count] = new BlockBiomeStoneStairs(biomeStoneA.getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, variant)); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java index e9e91b48b..bd67cbae9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -84,7 +84,7 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { - for(int i = 0; i < CustomBrickVariant.values().length; i++) + for(int i = 4; i < CustomBrickVariant.values().length; i++) stacks.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java deleted file mode 100644 index 0a9d79e2c..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ /dev/null @@ -1,127 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jan 18, 2015, 1:47:03 AM (GMT)] - */ -package vazkii.botania.common.block.decor; - -import net.minecraft.block.Block; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.ai.attributes.IAttributeInstance; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.EnumPlantType; -import net.minecraftforge.common.IPlantable; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibBlockNames; - -import javax.annotation.Nonnull; -import java.util.UUID; - -public class BlockDirtPath extends BlockMod implements ILexiconable { - - private static final UUID speedBoostUuid = UUID.fromString("c5f17cca-c89f-4f12-81da-8f04b1f27679"); - private static final AttributeModifier speedBoost = new AttributeModifier(speedBoostUuid, "Trodden dirt speed boost", 0.55, 2).setSaved(false); - private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 15F/16F, 1); - - public BlockDirtPath() { - super(Material.GROUND, LibBlockNames.DIRT_PATH); - setLightOpacity(255); - setHardness(0.6F); - setSoundType(SoundType.GROUND); - useNeighborBrightness = true; - MinecraftForge.EVENT_BUS.register(BlockDirtPath.class); - } - - @Override - public boolean isToolEffective(String type, @Nonnull IBlockState state) { - return type.equals("shovel"); - } - - @Override - public void onEntityWalk(World world, BlockPos pos, Entity entity) { - if(!world.isRemote && entity instanceof EntityPlayerMP) { - EntityLivingBase living = ((EntityLivingBase) entity); - IAttributeInstance attr = living.getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED); - if(!attr.hasModifier(speedBoost)) { - attr.applyModifier(speedBoost); - } - } - } - - @Nonnull - @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { - IBlockState stateAbove = world.getBlockState(pos.up()); - Block blockAbove = stateAbove.getBlock(); - if(!blockAbove.isAir(stateAbove, world, pos.up())) - return FULL_BLOCK_AABB; - else return AABB; - } - - @Override - public boolean isSideSolid(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side) { - return side == EnumFacing.DOWN; - } - - @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos) { - return FULL_BLOCK_AABB; - } - - @Override - public boolean isOpaqueCube(IBlockState state) { - return false; - } - - @Override - public boolean isFullCube(IBlockState state) { - return false; - } - - @Override - public boolean canSustainPlant(@Nonnull IBlockState state, @Nonnull IBlockAccess world, BlockPos pos, @Nonnull EnumFacing direction, IPlantable plantable) { - return plantable.getPlantType(world, pos.down()) == EnumPlantType.Plains; - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.dirtPath; - } - - @SubscribeEvent - public static void onTickEnd(TickEvent.WorldTickEvent event) { - if(event.world.isRemote || event.phase != TickEvent.Phase.END) - return; - for(EntityPlayerMP player : event.world.getPlayers(EntityPlayerMP.class, p -> p.getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).hasModifier(speedBoost))) { - if (event.world.getBlockState(new BlockPos(player).down()).getBlock() != ModBlocks.dirtPath) { - player.getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).removeModifier(speedBoost); - } - } // todo 1.8 there's probably a better way to do this. - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java deleted file mode 100644 index 9091ea44c..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ /dev/null @@ -1,136 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Mar 3, 2014, 4:53:59 PM (GMT)] - */ -package vazkii.botania.common.block.decor; - -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.statemap.StateMap; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -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.common.block.BlockMod; -import vazkii.botania.common.block.tile.TileManaBeacon; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibBlockNames; - -import javax.annotation.Nonnull; -import java.util.List; - -public class BlockManaBeacon extends BlockMod implements ILexiconable { - - private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 3.0/16, 3.0/16, 13.0/16, 13.0/16, 13.0/16); - - public BlockManaBeacon() { - super(Material.IRON, LibBlockNames.MANA_BEACON); - setHardness(5.0F); - setResistance(10.0F); - setSoundType(SoundType.METAL); - } - - @Nonnull - @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, BotaniaStateProps.COLOR); - } - - @Override - protected IBlockState pickDefaultState() { - return blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE); - } - - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.COLOR).getMetadata(); - } - - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta >= EnumDyeColor.values().length) { - meta = 0; - } - return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); - } - - @Nonnull - @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { - return AABB; - } - - @SideOnly(Side.CLIENT) - @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { - for(int i = 0; i < 16; i++) - stacks.add(new ItemStack(item, 1, i)); - } - - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - - @Override - public boolean isFullCube(IBlockState state) { - return false; - } - - @Override - public boolean isOpaqueCube(IBlockState state) { - return false; - } - - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.unstableBlocks; - } - - @Override - public boolean hasTileEntity(IBlockState state) { - return true; - } - - @Nonnull - @Override - public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { - return new TileManaBeacon(); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); - ModelHandler.registerBlockToState(this, EnumDyeColor.values().length); - } -} diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java deleted file mode 100644 index f2b1fc068..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ /dev/null @@ -1,141 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Feb 4, 2014, 6:00:44 PM (GMT)] - */ -package vazkii.botania.common.block.decor; - -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.statemap.StateMap; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -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.common.Botania; -import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.core.helper.Vector3; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibBlockNames; - -import javax.annotation.Nonnull; -import java.awt.*; -import java.util.List; -import java.util.Random; - -public class BlockUnstable extends BlockMod implements ILexiconable { - - private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0.25, 0.25, 0.75, 0.75, 0.75); - - public BlockUnstable() { - super(Material.IRON, LibBlockNames.UNSTABLE_BLOCK); - setHardness(5.0F); - setResistance(10.0F); - setSoundType(SoundType.METAL); - } - - @Nonnull - @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, BotaniaStateProps.COLOR); - } - - @Override - protected IBlockState pickDefaultState() { - return blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE); - } - - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.COLOR).getMetadata(); - } - - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta >= EnumDyeColor.values().length) { - meta = 0; - } - return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); - } - - @Nonnull - @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { - return AABB; - } - - @SideOnly(Side.CLIENT) - @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { - for(int i = 0; i < 16; i++) - stacks.add(new ItemStack(item, 1, i)); - } - - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - - @Override - public boolean isFullCube(IBlockState state) { - return false; - } - - @Override - public boolean isOpaqueCube(IBlockState state) { - return false; - } - - @Override - @SideOnly(Side.CLIENT) - public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { - int color = Minecraft.getMinecraft().getBlockColors().colorMultiplier(state, world, pos, 0); - int colorBright = new Color(color).brighter().getRGB(); - int colorDark = new Color(color).darker().getRGB(); - - Vector3 origVector = new Vector3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - Vector3 endVector = origVector.add(world.rand.nextDouble() * 2 - 1, world.rand.nextDouble() * 2 - 1, world.rand.nextDouble() * 2 - 1); - Botania.proxy.lightningFX(origVector, endVector, 5F, colorDark, colorBright); - } - - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.unstableBlocks; - } - - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); - ModelHandler.registerBlockToState(this, EnumDyeColor.values().length); - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockDirtPathSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockDirtPathSlab.java deleted file mode 100644 index f22f0bd5c..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockDirtPathSlab.java +++ /dev/null @@ -1,45 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jan 26, 2015, 10:15:05 PM (GMT)] - */ -package vazkii.botania.common.block.decor.slabs; - -import net.minecraft.block.BlockSlab; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.lexicon.LexiconData; - -public class BlockDirtPathSlab extends BlockLivingSlab { - - public BlockDirtPathSlab(boolean full) { - super(full, ModBlocks.dirtPath.getDefaultState()); - setHardness(0.6F); - } - - @Override - public BlockSlab getFullBlock() { - return (BlockSlab) ModFluffBlocks.dirtPathSlabFull; - } - - @Override - public BlockSlab getSingleBlock() { - return (BlockSlab) ModFluffBlocks.dirtPathSlab; - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.dirtPath; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java deleted file mode 100644 index 23c700885..000000000 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [May 16, 2014, 10:36:05 PM (GMT)] - */ -package vazkii.botania.common.block.dispenser; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockDispenser; -import net.minecraft.dispenser.BehaviorDefaultDispenseItem; -import net.minecraft.dispenser.IBlockSource; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import javax.annotation.Nonnull; - -public class BehaviourSeeds extends BehaviorDefaultDispenseItem { - - private final Block block; - - public BehaviourSeeds(Block block) { - this.block = block; - } - - @Nonnull - @Override - public ItemStack dispenseStack(IBlockSource source, ItemStack par2ItemStack) { - World world = source.getWorld(); - EnumFacing facing = world.getBlockState(source.getBlockPos()).getValue(BlockDispenser.FACING); - BlockPos pos = source.getBlockPos().offset(facing); - - if(world.getBlockState(pos).getBlock().isAir(world.getBlockState(pos), world, pos) && block.canPlaceBlockAt(world, pos)) { - world.setBlockState(pos, block.getDefaultState()); - par2ItemStack.stackSize--; - return par2ItemStack; - } - - return super.dispenseStack(source, par2ItemStack); - } - -} diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java deleted file mode 100644 index 1bf725ad3..000000000 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Mar 3, 2014, 5:09:30 PM (GMT)] - */ -package vazkii.botania.common.block.tile; - -import net.minecraft.util.EnumFacing; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.common.Botania; - -public class TileManaBeacon extends TileMod { - - @Override - public void update() { - boolean redstone = false; - for(EnumFacing dir : EnumFacing.VALUES) { - int redstoneSide = worldObj.getRedstonePower(pos.offset(dir), dir); - if(redstoneSide > 0) - redstone = true; - } - - if(!redstone) { - int hex = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; - int r = (hex & 0xFF0000) >> 16; - int g = (hex & 0xFF00) >> 8; - int b = (hex & 0xFF); - - Botania.proxy.setWispFXDistanceLimit(false); - Botania.proxy.wispFX(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random() * 5 + 1F, (float) (Math.random() - 0.5F), 10F * (float) Math.sqrt(256F / (256F - pos.getY())), (float) (Math.random() - 0.5F)); - - for(int i = 0; i < 2; i++) - Botania.proxy.wispFX(pos.getX() + 0.5, Math.min(256, pos.getY() + Botania.proxy.getClientRenderDistance() * 16), pos.getZ() + 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random() * 15 + 8F, (float) (Math.random() - 0.5F) * 8F, 0F, (float) (Math.random() - 0.5F) * 8F); - Botania.proxy.setWispFXDistanceLimit(true); - } - } -} diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 3007a4da1..5232da36d 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -98,7 +98,6 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.virus); addItem(ModItems.slingshot); addItem(ModItems.vineBall); - addItem(ModItems.regenIvy); addItem(ModItems.keepIvy); addItem(ModItems.worldSeed); addItem(ModItems.overgrowthSeed); @@ -297,12 +296,6 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.floatingSpecialFlower); addBlock(ModBlocks.petalBlock); addBlock(ModBlocks.mushroom); - addBlock(ModBlocks.unstableBlock); - addBlock(ModBlocks.manaBeacon); - addItem(ModItems.signalFlare); - - addBlock(ModBlocks.dirtPath); - addBlock(ModFluffBlocks.dirtPathSlab); addBlock(ModBlocks.blazeBlock); diff --git a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java index c62c3c78b..f083392fd 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -80,14 +80,14 @@ public final class SheddingHandler { } public static void loadFromConfig(Configuration config) { - defaultPatterns.add(new ShedPattern(EntityChicken.class, new ItemStack(Items.FEATHER), 26000, 20)); - defaultPatterns.add(new ShedPattern(EntitySquid.class, new ItemStack(Items.DYE), 18000, 20)); - defaultPatterns.add(new ShedPattern(EntityVillager.class, new ItemStack(Items.EMERALD), 226000, 40)); - defaultPatterns.add(new ShedPattern(EntitySpider.class, new ItemStack(Items.STRING), 12000, 40)); - defaultPatterns.add(new ShedPattern(EntityBlaze.class, new ItemStack(Items.BLAZE_POWDER), 8000, 40)); - defaultPatterns.add(new ShedPattern(EntityGhast.class, new ItemStack(Items.GHAST_TEAR), 9001, 30)); - defaultPatterns.add(new ShedPattern(EntitySkeleton.class, new ItemStack(Items.BONE), 36000, 40)); - defaultPatterns.add(new ShedPattern(EntitySlime.class, new ItemStack(Items.SLIME_BALL), 21000, 40)); +// defaultPatterns.add(new ShedPattern(EntityChicken.class, new ItemStack(Items.FEATHER), 26000, 20)); +// defaultPatterns.add(new ShedPattern(EntitySquid.class, new ItemStack(Items.DYE), 18000, 20)); +// defaultPatterns.add(new ShedPattern(EntityVillager.class, new ItemStack(Items.EMERALD), 226000, 40)); +// defaultPatterns.add(new ShedPattern(EntitySpider.class, new ItemStack(Items.STRING), 12000, 40)); +// defaultPatterns.add(new ShedPattern(EntityBlaze.class, new ItemStack(Items.BLAZE_POWDER), 8000, 40)); +// defaultPatterns.add(new ShedPattern(EntityGhast.class, new ItemStack(Items.GHAST_TEAR), 9001, 30)); +// defaultPatterns.add(new ShedPattern(EntitySkeleton.class, new ItemStack(Items.BONE), 36000, 40)); +// defaultPatterns.add(new ShedPattern(EntitySlime.class, new ItemStack(Items.SLIME_BALL), 21000, 40)); ArrayList defaultNames = new ArrayList<>(); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 2ee582194..96ae2bf9e 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -10,6 +10,10 @@ */ package vazkii.botania.common.crafting; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; @@ -35,15 +39,10 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.crafting.recipe.ArmorUpgradeRecipe; import vazkii.botania.common.crafting.recipe.ManaUpgradeRecipe; import vazkii.botania.common.crafting.recipe.ShapelessManaUpgradeRecipe; -import vazkii.botania.common.item.ItemSignalFlare; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibOreDict; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - public final class ModCraftingRecipes { public static IRecipe recipeLexicon; @@ -72,7 +71,6 @@ public final class ModCraftingRecipes { public static IRecipe recipeLensPhantom; public static IRecipe recipeLensMagnet; public static IRecipe recipeLensExplosive; - public static List recipesUnstableBlocks; public static IRecipe recipePylon; public static IRecipe recipeDistributor; public static IRecipe recipeLivingrockDecor1; @@ -84,8 +82,6 @@ public final class ModCraftingRecipes { public static IRecipe recipeLivingwoodDecor3; public static IRecipe recipeLivingwoodDecor4; public static IRecipe recipeLivingwoodDecor5; - public static List recipesManaBeacons; - public static List recipesSignalFlares; public static IRecipe recipeManaVoid; public static List recipesManaTablet; public static IRecipe recipeManaDetector; @@ -188,10 +184,6 @@ public final class ModCraftingRecipes { public static IRecipe recipeSpawnerClaw; public static IRecipe recipeCraftCrate; public static IRecipe recipePlaceholder; - public static IRecipe recipeNetherBrick; - public static IRecipe recipeSoulBrick; - public static IRecipe recipeSnowBrick; - public static IRecipe recipeRoofTile; public static IRecipe recipeAzulejo; public static List recipesAzulejoCycling; public static IRecipe recipeEnderEyeBlock; @@ -207,7 +199,6 @@ public final class ModCraftingRecipes { public static List recipesWings; public static IRecipe recipeRFGenerator; public static IRecipe recipeGravityRod; - public static IRecipe recipeRegenIvy; public static IRecipe recipeUltraSpreader; public static IRecipe recipeHelmetOfRevealing; public static IRecipe recipeVial; @@ -228,7 +219,6 @@ public final class ModCraftingRecipes { public static IRecipe recipeCraftingHalo; public static List recipesLensFlash; public static IRecipe recipePrism; - public static IRecipe recipeDirtPath; public static IRecipe recipeDreamwoodTwig; public static IRecipe recipeMonocle; public static IRecipe recipeClip; @@ -473,15 +463,6 @@ public final class ModCraftingRecipes { addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 1, 11), new ItemStack(ModItems.lens), LibOreDict.RUNE[14]); recipeLensExplosive = BotaniaAPI.getLatestAddedRecipe(); - // Unstable Block Recipes - for(int i = 0; i < 16; i++) - addOreDictRecipe(new ItemStack(ModBlocks.unstableBlock, 2, i), - "OPO", "PMP", "OPO", - 'O', new ItemStack(Blocks.OBSIDIAN), - 'P', LibOreDict.PETAL[i], - 'M', new ItemStack(Items.ENDER_PEARL)); - recipesUnstableBlocks = BotaniaAPI.getLatestAddedRecipes(16); - // Mana Pylon Recipe addOreDictRecipe(new ItemStack(ModBlocks.pylon), " G ", "MDM", " G ", @@ -538,23 +519,6 @@ public final class ModCraftingRecipes { 'W', new ItemStack(ModBlocks.dreamwood, 1, 1)); addShapelessOreDictRecipe(new ItemStack(ModBlocks.dreamwood, 1, 5), LibOreDict.DREAM_WOOD, "dustGlowstone"); - // Mana Beacon Recipe - for(int i = 0; i < 16; i++) - addOreDictRecipe(new ItemStack(ModBlocks.manaBeacon, 1, i), - " B ", "BPB", " B ", - 'B', new ItemStack(ModBlocks.unstableBlock, 1, i), - 'P', LibOreDict.MANA_PEARL); - recipesManaBeacons = BotaniaAPI.getLatestAddedRecipes(16); - - // Signal Flare Recipe - for(int i = 0; i < 16; i++) - addOreDictRecipe(ItemSignalFlare.forColor(i), - "I ", " B", "W ", - 'B', new ItemStack(ModBlocks.manaBeacon, 1, i), - 'I', "ingotIron", - 'W', LibOreDict.LIVING_WOOD); - recipesSignalFlares = BotaniaAPI.getLatestAddedRecipes(16); - // Mana Void Recipe addOreDictRecipe(new ItemStack(ModBlocks.manaVoid), "SSS", "O O", "SSS", @@ -1246,33 +1210,6 @@ public final class ModCraftingRecipes { addShapelessOreDictRecipe(new ItemStack(ModItems.manaResource, 32, 11), "workbench", LibOreDict.LIVING_ROCK); recipePlaceholder = BotaniaAPI.getLatestAddedRecipe(); - // Nether Brick Recipe - GameRegistry.addRecipe(new ItemStack(ModBlocks.customBrick, 4, 0), - " B ", "BSB", " B ", - 'B', new ItemStack(Blocks.NETHERRACK), - 'S', new ItemStack(Blocks.STONEBRICK)); - recipeNetherBrick = BotaniaAPI.getLatestAddedRecipe(); - - // Soul Brick Recipe - GameRegistry.addRecipe(new ItemStack(ModBlocks.customBrick, 4, 1), - " B ", "BSB", " B ", - 'B', new ItemStack(Blocks.SOUL_SAND), - 'S', new ItemStack(Blocks.STONEBRICK)); - recipeSoulBrick = BotaniaAPI.getLatestAddedRecipe(); - - // Snow Brick Recipe - GameRegistry.addRecipe(new ItemStack(ModBlocks.customBrick, 4, 2), - " B ", "BSB", " B ", - 'B', new ItemStack(Blocks.SNOW), - 'S', new ItemStack(Blocks.STONEBRICK)); - recipeSnowBrick = BotaniaAPI.getLatestAddedRecipe(); - - // Roof Tile Recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.customBrick, 4, 3), - "BB", "BB", "BB", - 'B', "ingotBrick")); - recipeRoofTile = BotaniaAPI.getLatestAddedRecipe(); - // Azulejo Recipe GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.customBrick, 1, 4), "gemLapis", "blockQuartz")); recipeAzulejo = BotaniaAPI.getLatestAddedRecipe(); @@ -1366,10 +1303,6 @@ public final class ModCraftingRecipes { 'D', LibOreDict.DRAGONSTONE); recipeGravityRod = BotaniaAPI.getLatestAddedRecipe(); - // Timeless Ivy Recipe - addShapelessOreDictRecipe(new ItemStack(ModItems.regenIvy), new ItemStack(Blocks.VINE), LibOreDict.LIFE_ESSENCE, LibOreDict.ELEMENTIUM); - recipeRegenIvy = BotaniaAPI.getLatestAddedRecipe(); - // Gaia Mana Spreader Recipe addOreDictRecipe(new ItemStack(ModBlocks.spreader, 1, 3), "ESD", @@ -1542,10 +1475,6 @@ public final class ModCraftingRecipes { 'S', new ItemStack(ModBlocks.platform, 1, 1)); recipePrism = BotaniaAPI.getLatestAddedRecipe(); - // Trodden Dirt Recipe - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.dirtPath, 4), new ItemStack(Blocks.DIRT, 1, 1), new ItemStack(Blocks.DIRT, 1, 1), new ItemStack(Blocks.DIRT, 1, 1), "sand")); - recipeDirtPath = BotaniaAPI.getLatestAddedRecipe(); - // Dreamwood Twig Recipe addOreDictRecipe(new ItemStack(ModItems.manaResource, 1, 13), "W", "W", @@ -1605,12 +1534,6 @@ public final class ModCraftingRecipes { 'T', LibOreDict.TERRA_STEEL); recipeThornChakram = BotaniaAPI.getLatestAddedRecipe(); - // Trodden Dirt Slab - GameRegistry.addRecipe(new ItemStack(ModFluffBlocks.dirtPathSlab, 6), - "DDD", - 'D', new ItemStack(ModBlocks.dirtPath)); - recipeDirtPathSlab = BotaniaAPI.getLatestAddedRecipe(); - // Pattern Recipes { int count = TileCraftCrate.PATTERNS.length; diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/RegenIvyRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/RegenIvyRecipe.java deleted file mode 100644 index 518d85b58..000000000 --- a/src/main/java/vazkii/botania/common/crafting/recipe/RegenIvyRecipe.java +++ /dev/null @@ -1,93 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Sep 3, 2014, 6:54:18 PM (GMT)] - */ -package vazkii.botania.common.crafting.recipe; - -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; -import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.item.ItemRegenIvy; -import vazkii.botania.common.item.ModItems; - -import javax.annotation.Nonnull; - -public class RegenIvyRecipe implements IRecipe { - - @Override - public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { - ItemStack tool = null; - boolean foundIvy = false; - int materialsFound = 0; - for(int i = 0; i < var1.getSizeInventory(); i++) { - ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { - Item item = stack.getItem(); - if(item.isRepairable() && !(ItemNBTHelper.detectNBT(stack) && ItemNBTHelper.getBoolean(stack, ItemRegenIvy.TAG_REGEN, false))) - tool = stack; - - else if(item == ModItems.regenIvy) - foundIvy = true; - - } - } - for(int i = 0; i < var1.getSizeInventory(); i++) { - ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { - Item item = stack.getItem(); - - if(tool != null && tool.getItem().getIsRepairable(tool, stack)) - materialsFound++; - - else if(stack != tool && item != ModItems.regenIvy) - return false; - } - } - - return tool != null && foundIvy && materialsFound == 3; - } - - @Override - public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { - ItemStack tool = null; - - for(int i = 0; i < var1.getSizeInventory(); i++) { - ItemStack stack = var1.getStackInSlot(i); - if(stack != null && stack.getItem().isDamageable()) - tool = stack; - } - - if(tool == null) - return null; - - ItemStack toolCopy = tool.copy(); - ItemNBTHelper.setBoolean(toolCopy, ItemRegenIvy.TAG_REGEN, true); - return toolCopy; - } - - @Override - public int getRecipeSize() { - return 10; - } - - @Override - public ItemStack getRecipeOutput() { - return null; - } - - @Nonnull - @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { - return ForgeHooks.defaultRecipeGetRemainingItems(inv); - } -} diff --git a/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java b/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java deleted file mode 100644 index a3de78fe2..000000000 --- a/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Sep 3, 2014, 6:31:10 PM (GMT)] - */ -package vazkii.botania.common.item; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.EventPriority; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; -import net.minecraftforge.fml.common.gameevent.TickEvent.PlayerTickEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.RecipeSorter; -import net.minecraftforge.oredict.RecipeSorter.Category; -import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.crafting.recipe.RegenIvyRecipe; -import vazkii.botania.common.lib.LibItemNames; - -public class ItemRegenIvy extends ItemMod { - - public static final String TAG_REGEN = "Botania_regenIvy"; - private static final int MANA_PER_DAMAGE = 200; - - public ItemRegenIvy() { - super(LibItemNames.REGEN_IVY); - GameRegistry.addRecipe(new RegenIvyRecipe()); - RecipeSorter.register("botania:regenIvy", RegenIvyRecipe.class, Category.SHAPELESS, ""); - MinecraftForge.EVENT_BUS.register(ItemRegenIvy.class); - } - - @SubscribeEvent(priority = EventPriority.LOWEST) - public static void onTick(PlayerTickEvent event) { - if(event.phase == Phase.END && !event.player.worldObj.isRemote) - for(int i = 0; i < event.player.inventory.getSizeInventory(); i++) { - ItemStack stack = event.player.inventory.getStackInSlot(i); - if(stack != null && ItemNBTHelper.detectNBT(stack) && ItemNBTHelper.getBoolean(stack, TAG_REGEN, false) && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExact(stack, event.player, MANA_PER_DAMAGE, true)) - stack.setItemDamage(stack.getItemDamage() - 1); - } - } -} diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java deleted file mode 100644 index ac95ae870..000000000 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ /dev/null @@ -1,123 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Mar 3, 2014, 6:49:15 PM (GMT)] - */ -package vazkii.botania.common.item; - -import net.minecraft.client.resources.I18n; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.init.SoundEvents; -import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumHand; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.client.core.handler.ModelHandler; -import vazkii.botania.common.achievement.ModAchievements; -import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.entity.EntitySignalFlare; -import vazkii.botania.common.lib.LibItemNames; - -import javax.annotation.Nonnull; -import java.util.List; - -public class ItemSignalFlare extends ItemMod { - - private static final String TAG_COLOR = "color"; - - public ItemSignalFlare() { - super(LibItemNames.SIGNAL_FLARE); - setMaxStackSize(1); - setNoRepair(); - setMaxDamage(200); - } - - @Nonnull - @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { - if(par1ItemStack.getItemDamage() == 0) { - if(world.isRemote) - player.swingArm(hand); - else { - EntitySignalFlare flare = new EntitySignalFlare(world); - flare.setPosition(player.posX, player.posY, player.posZ); - flare.setColor(getColor(par1ItemStack)); - flare.setFiredAt((int) player.posY); - world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_GENERIC_EXPLODE, SoundCategory.PLAYERS, 40F, (1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); - - world.spawnEntityInWorld(flare); - - int stunned = 0; - int range = 5; - List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); - for(EntityLivingBase entity : entities) - if(entity != player && (!(entity instanceof EntityPlayer) || FMLCommonHandler.instance().getMinecraftServerInstance() == null || FMLCommonHandler.instance().getMinecraftServerInstance().isPVPEnabled())) { - entity.addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, 50, 5)); - stunned++; - } - - if(stunned >= 100) - player.addStat(ModAchievements.signalFlareStun, 1); - } - par1ItemStack.damageItem(200, player); - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); - } - - return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); - } - - @Override - public void onUpdate(ItemStack par1ItemStack, World world, Entity par3Entity, int par4, boolean par5) { - if(par1ItemStack.isItemDamaged()) - par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { - for(int i = 0; i < 16; i++) - stacks.add(forColor(i)); - } - - @SideOnly(Side.CLIENT) - @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer player, List stacks, boolean par4) { - int storedColor = getColor(par1ItemStack); - stacks.add(I18n.format("botaniamisc.flareColor", I18n.format("botania.color" + storedColor))); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerItemAllMeta(this, EnumDyeColor.values().length); - } - - public static ItemStack forColor(int color) { - ItemStack stack = new ItemStack(ModItems.signalFlare); - ItemNBTHelper.setInt(stack, TAG_COLOR, color); - - return stack; - } - - public static int getColor(ItemStack stack) { - return ItemNBTHelper.getInt(stack, TAG_COLOR, 0xFFFFFF); - } -} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 9567534fc..3be18df6e 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -128,7 +128,6 @@ public final class ModItems { public static Item manaResource; public static Item lens; public static Item rune; - public static Item signalFlare; public static Item manaTablet; public static Item manaGun; public static Item manaCookie; @@ -205,7 +204,6 @@ public final class ModItems { public static Item sparkUpgrade; public static Item diviningRod; public static Item gravityRod; - public static Item regenIvy; public static Item manaInkwell; public static Item vial; public static Item brewVial; @@ -277,7 +275,6 @@ public final class ModItems { manaResource = new ItemManaResource(); lens = new ItemLens(); rune = new ItemRune(); - signalFlare = new ItemSignalFlare(); manaTablet = new ItemManaTablet(); manaGun = new ItemManaGun(); manaCookie = new ItemManaCookie(); @@ -354,7 +351,6 @@ public final class ModItems { sparkUpgrade = new ItemSparkUpgrade(); diviningRod = new ItemDiviningRod(); gravityRod = new ItemGravityRod(); - regenIvy = new ItemRegenIvy(); manaInkwell = new ItemManaInkwell(); vial = new ItemVial(); brewVial = new ItemBrewVial(); diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 7acecaf40..ed5e999a2 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -10,6 +10,9 @@ */ package vazkii.botania.common.lexicon; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -51,9 +54,6 @@ import vazkii.botania.common.lexicon.page.PageText; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibLexicon; -import java.util.ArrayList; -import java.util.List; - public final class LexiconData { public static LexiconEntry welcome; @@ -182,7 +182,6 @@ public final class LexiconData { public static LexiconEntry glassPick; public static LexiconEntry diviningRod; public static LexiconEntry gravityRod; - public static LexiconEntry regenIvy; public static LexiconEntry missileRod; public static LexiconEntry craftingHalo; public static LexiconEntry clip; @@ -276,7 +275,6 @@ public final class LexiconData { public static LexiconEntry headCreating; public static LexiconEntry azulejo; public static LexiconEntry starfield; - public static LexiconEntry dirtPath; public static LexiconEntry mushrooms; public static LexiconEntry phantomInk; public static LexiconEntry stoneAlchemy; @@ -944,10 +942,6 @@ public final class LexiconData { gravityRod.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeGravityRod)); - regenIvy = new AlfheimLexiconEntry(LibLexicon.TOOL_REGEN_IVY, categoryTools); - regenIvy.setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeRegenIvy)); - missileRod = new AlfheimLexiconEntry(LibLexicon.TOOL_MISSILE_ROD, categoryTools); missileRod.setLexiconPages(new PageText("0"), new PageText("2"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeMissileRod)); @@ -1296,14 +1290,6 @@ public final class LexiconData { odinRing.setLexiconPages(new PageText("0")); } - // MISCLENAEOUS ENTRIES - unstableBlocks = new BasicLexiconEntry(LibLexicon.MISC_UNSTABLE_BLOCKS, categoryMisc); - unstableBlocks.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_UNSTABLE_BLOCK), - new PageCraftingRecipe("2", ModCraftingRecipes.recipesUnstableBlocks), new PageText("3"), - new PageImage("4", LibResources.ENTRY_UNSTABLE_BEACON), - new PageCraftingRecipe("5", ModCraftingRecipes.recipesManaBeacons), new PageText("6"), - new PageCraftingRecipe("7", ModCraftingRecipes.recipesSignalFlares)); - decorativeBlocks = new BasicLexiconEntry(LibLexicon.MISC_DECORATIVE_BLOCKS, categoryMisc); if (ConfigHandler.darkQuartzEnabled) decorativeBlocks.setLexiconPages(new PageText("0"), @@ -1321,11 +1307,7 @@ public final class LexiconData { new PageCraftingRecipe("13", ModCraftingRecipes.recipeBlazeQuartz), new PageCraftingRecipe("14", ModCraftingRecipes.recipesLavenderQuartz), new PageCraftingRecipe("15", ModCraftingRecipes.recipeRedQuartz), - new PageCraftingRecipe("23", ModCraftingRecipes.recipeSunnyQuartz), new PageText("16"), - new PageCraftingRecipe("19", ModCraftingRecipes.recipeRoofTile), - new PageCraftingRecipe("20", ModCraftingRecipes.recipeNetherBrick), - new PageCraftingRecipe("21", ModCraftingRecipes.recipeSoulBrick), - new PageCraftingRecipe("22", ModCraftingRecipes.recipeSnowBrick)); + new PageCraftingRecipe("23", ModCraftingRecipes.recipeSunnyQuartz), new PageText("16")); else decorativeBlocks.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeLivingrockDecor1), @@ -1341,11 +1323,7 @@ public final class LexiconData { new PageCraftingRecipe("13", ModCraftingRecipes.recipeBlazeQuartz), new PageCraftingRecipe("14", ModCraftingRecipes.recipesLavenderQuartz), new PageCraftingRecipe("15", ModCraftingRecipes.recipeRedQuartz), - new PageCraftingRecipe("23", ModCraftingRecipes.recipeSunnyQuartz), new PageText("16"), - new PageCraftingRecipe("19", ModCraftingRecipes.recipeRoofTile), - new PageCraftingRecipe("20", ModCraftingRecipes.recipeNetherBrick), - new PageCraftingRecipe("21", ModCraftingRecipes.recipeSoulBrick), - new PageCraftingRecipe("22", ModCraftingRecipes.recipeSnowBrick)); + new PageCraftingRecipe("23", ModCraftingRecipes.recipeSunnyQuartz), new PageText("16")); dispenserTweaks = new BasicLexiconEntry(LibLexicon.MISC_DISPENSER_TWEAKS, categoryMisc); dispenserTweaks.setLexiconPages(new PageText("0")).setPriority().setIcon(new ItemStack(Blocks.DISPENSER)); @@ -1371,10 +1349,6 @@ public final class LexiconData { starfield = new AlfheimLexiconEntry(LibLexicon.MISC_STARFIELD, categoryMisc); starfield.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeStarfield)); - dirtPath = new BasicLexiconEntry(LibLexicon.MISC_DIRT_PATH, categoryMisc); - dirtPath.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeDirtPath), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeDirtPathSlab)); - mushrooms = new BasicLexiconEntry(LibLexicon.MISC_MUSHROOMS, categoryMisc); mushrooms.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipesMushrooms)); diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index 19448a388..66c5f6e12 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -20,11 +20,9 @@ public final class LibBlockNames { public static final String SPREADER = "spreader"; public static final String POOL = "pool"; public static final String RUNE_ALTAR = "runeAltar"; - public static final String UNSTABLE_BLOCK = "unstableBlock"; public static final String PYLON = "pylon"; public static final String PISTON_RELAY = "pistonRelay"; public static final String DISTRIBUTOR = "distributor"; - public static final String MANA_BEACON = "manaBeacon"; public static final String MANA_VOID = "manaVoid"; public static final String MANA_DETECTOR = "manaDetector"; public static final String ENCHANTER = "enchanter"; @@ -68,7 +66,6 @@ public final class LibBlockNames { public static final String FLOATING_SPECIAL_FLOWER = "floatingSpecialFlower"; public static final String MANA_FLAME = "manaFlame"; public static final String PRISM = "prism"; - public static final String DIRT_PATH = "dirtPath"; public static final String ENCHANTED_SOIL = "enchantedSoil"; public static final String BIOME_STONE_A = "biomeStoneA"; public static final String BIOME_STONE_B = "biomeStoneB"; diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 5d6927462..ab48d4792 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -21,7 +21,6 @@ public final class LibItemNames { public static final String LENS = "lens"; public static final String MANA_PETAL = "manaPetal"; public static final String RUNE = "rune"; - public static final String SIGNAL_FLARE = "signalFlare"; public static final String MANA_TABLET = "manaTablet"; public static final String MANA_GUN = "manaGun"; public static final String MANA_COOKIE = "manaCookie"; @@ -98,7 +97,6 @@ public final class LibItemNames { public static final String SPARK_UPGRADE = "sparkUpgrade"; public static final String DIVINING_ROD = "diviningRod"; public static final String GRAVITY_ROD = "gravityRod"; - public static final String REGEN_IVY = "regenIvy"; public static final String MANA_INKWELL = "manaInkwell"; public static final String VIAL = "vial"; public static final String FLASK = "flask"; diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index 593d6cc63..d9be7e0bf 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -157,7 +157,6 @@ public final class LibLexicon { public static final String TOOL_GLASS_PICK = "glassPick"; public static final String TOOL_DIVINING_ROD = "diviningRod"; public static final String TOOL_GRAVITY_ROD = "gravityRod"; - public static final String TOOL_REGEN_IVY = "regenIvy"; public static final String TOOL_MISSILE_ROD = "missileRod"; public static final String TOOL_CRAFTING_HALO = "craftingHalo"; public static final String TOOL_CLIP = "clip"; diff --git a/src/main/resources/assets/botania/textures/gui/entries/unstableBeacon.png b/src/main/resources/assets/botania/textures/gui/entries/unstableBeacon.png deleted file mode 100644 index b98b60255..000000000 Binary files a/src/main/resources/assets/botania/textures/gui/entries/unstableBeacon.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/gui/entries/unstableBlock.png b/src/main/resources/assets/botania/textures/gui/entries/unstableBlock.png deleted file mode 100644 index 6547a1ad3..000000000 Binary files a/src/main/resources/assets/botania/textures/gui/entries/unstableBlock.png and /dev/null differ