From 1edbc41b12d37144cdfa914a8cbcb6bf0aa5e729 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 11 Sep 2016 19:12:53 +0100 Subject: [PATCH] Removed fluff. Closes #1883 --- .../java/vazkii/botania/api/BotaniaAPI.java | 16 -- .../java/vazkii/botania/api/package-info.java | 2 +- .../client/core/handler/ColorHandler.java | 17 +-- .../client/core/handler/TooltipHandler.java | 3 - .../common/achievement/ModAchievements.java | 2 - .../botania/common/block/ModBlocks.java | 17 --- .../botania/common/block/ModFluffBlocks.java | 13 +- .../common/block/decor/BlockCustomBrick.java | 2 +- .../common/block/decor/BlockDirtPath.java | 127 ---------------- .../common/block/decor/BlockManaBeacon.java | 136 ----------------- .../common/block/decor/BlockUnstable.java | 141 ------------------ .../block/decor/slabs/BlockDirtPathSlab.java | 45 ------ .../block/dispenser/BehaviourSeeds.java | 48 ------ .../common/block/tile/TileManaBeacon.java | 42 ------ .../common/core/BotaniaCreativeTab.java | 7 - .../common/core/handler/SheddingHandler.java | 16 +- .../common/crafting/ModCraftingRecipes.java | 85 +---------- .../crafting/recipe/RegenIvyRecipe.java | 93 ------------ .../botania/common/item/ItemRegenIvy.java | 48 ------ .../botania/common/item/ItemSignalFlare.java | 123 --------------- .../vazkii/botania/common/item/ModItems.java | 4 - .../botania/common/lexicon/LexiconData.java | 36 +---- .../botania/common/lib/LibBlockNames.java | 3 - .../botania/common/lib/LibItemNames.java | 2 - .../vazkii/botania/common/lib/LibLexicon.java | 1 - .../textures/gui/entries/unstableBeacon.png | Bin 13255 -> 0 bytes .../textures/gui/entries/unstableBlock.png | Bin 17280 -> 0 bytes 27 files changed, 26 insertions(+), 1003 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/slabs/BlockDirtPathSlab.java delete mode 100644 src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java delete mode 100644 src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java delete mode 100644 src/main/java/vazkii/botania/common/crafting/recipe/RegenIvyRecipe.java delete mode 100644 src/main/java/vazkii/botania/common/item/ItemRegenIvy.java delete mode 100644 src/main/java/vazkii/botania/common/item/ItemSignalFlare.java delete mode 100644 src/main/resources/assets/botania/textures/gui/entries/unstableBeacon.png delete mode 100644 src/main/resources/assets/botania/textures/gui/entries/unstableBlock.png 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 b98b6025591901ea20d95125e419722a68c7342e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13255 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

g_s1t7%BS{N}l7Vs}Y&?f$(7J7DqG z0INA(?x$Lg!O%J~|Nl4J3rBp?+Gh6noq4lx=HAJ`Jul`{8=vb`0yk;t2f56n!qzNm zZu7!t)(M6Q`rZR0+}8vz@1G(ojeSkgI0)&+u!ho3$>z