From 056f46b1f8a451313219c9dcbf2e167de7aa2a19 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 18 May 2016 15:22:35 -0500 Subject: [PATCH] Update to 1.9.4 - untested waiting on baubles --- build.gradle | 8 +- build.properties | 4 +- .../java/vazkii/botania/api/BotaniaAPI.java | 30 +- .../api/internal/DummyMethodHandler.java | 4 +- .../api/internal/VanillaPacketDispatcher.java | 8 +- .../botania/api/item/IFlowerlessBiome.java | 2 +- .../vazkii/botania/api/recipe/RecipeBrew.java | 2 +- .../botania/api/sound/BotaniaSoundEvents.java | 2 +- .../api/subtile/SubTileGenerating.java | 4 +- .../vazkii/botania/api/wiki/WikiHooks.java | 2 +- .../client/challenge/ModChallenges.java | 18 +- .../core/handler/BaubleRenderHandler.java | 4 +- .../client/core/handler/ColorHandler.java | 2 +- .../handler/ContributorFancinessHandler.java | 8 +- .../handler/CorporeaAutoCompleteHandler.java | 2 +- .../client/core/handler/DebugHandler.java | 2 +- .../core/handler/MiscellaneousIcons.java | 2 +- .../client/core/handler/ModelHandler.java | 23 +- .../core/handler/MultiblockBlockAccess.java | 6 +- .../core/handler/MultiblockRenderHandler.java | 2 +- .../TooltipAdditionDisplayHandler.java | 2 +- .../client/core/handler/TooltipHandler.java | 4 +- .../client/core/proxy/ClientProxy.java | 4 +- .../vazkii/botania/client/fx/FXSparkle.java | 52 +-- .../java/vazkii/botania/client/fx/FXWisp.java | 30 +- .../client/gui/GuiAchievementsHacky.java | 4 +- .../client/gui/lexicon/GuiLexiconIndex.java | 2 +- .../gui/lexicon/button/GuiButtonDoot.java | 4 +- .../elventrade/ElvenTradeRecipeCategory.java | 2 +- .../botania/client/model/PlatformModel.java | 6 +- .../render/entity/RenderBabylonWeapon.java | 2 +- .../render/entity/RenderCorporeaSpark.java | 2 +- .../render/entity/RenderPoolMinecart.java | 2 +- .../render/entity/RenderSnowballStack.java | 2 +- .../client/render/entity/RenderSparkBase.java | 2 +- .../render/entity/RenderThornChakram.java | 2 +- .../render/tile/RenderTileAlfPortal.java | 2 +- .../client/render/tile/RenderTileAltar.java | 4 +- .../client/render/tile/RenderTileAvatar.java | 2 +- .../client/render/tile/RenderTileBrewery.java | 2 +- .../client/render/tile/RenderTileCocoon.java | 2 +- .../tile/RenderTileCorporeaCrystalCube.java | 4 +- .../render/tile/RenderTileEnchanter.java | 2 +- .../render/tile/RenderTileFloatingFlower.java | 2 +- .../render/tile/RenderTileIncensePlate.java | 2 +- .../render/tile/RenderTileLightRelay.java | 2 +- .../client/render/tile/RenderTilePool.java | 2 +- .../client/render/tile/RenderTilePrism.java | 2 +- .../client/render/tile/RenderTilePylon.java | 2 +- .../render/tile/RenderTileRuneAltar.java | 2 +- .../render/tile/RenderTileSparkChanger.java | 2 +- .../render/tile/RenderTileSpreader.java | 6 +- .../render/tile/RenderTileTerraPlate.java | 2 +- .../render/tile/RenderTileTinyPotato.java | 38 +-- .../common/achievement/ModAchievements.java | 2 +- .../botania/common/block/BlockAlfPortal.java | 2 +- .../botania/common/block/BlockAltGrass.java | 6 +- .../botania/common/block/BlockAltar.java | 14 +- .../botania/common/block/BlockAvatar.java | 4 +- .../botania/common/block/BlockBifrost.java | 2 +- .../common/block/BlockBifrostPerm.java | 2 +- .../common/block/BlockCacophonium.java | 6 +- .../botania/common/block/BlockCamo.java | 2 +- .../botania/common/block/BlockCell.java | 2 +- .../botania/common/block/BlockCocoon.java | 6 +- .../common/block/BlockEnchantedSoil.java | 4 +- .../botania/common/block/BlockEnderEye.java | 2 +- .../botania/common/block/BlockFakeAir.java | 6 +- .../botania/common/block/BlockFelPumpkin.java | 22 +- .../block/BlockFloatingSpecialFlower.java | 4 +- .../botania/common/block/BlockForestEye.java | 2 +- .../botania/common/block/BlockGhostRail.java | 4 +- .../botania/common/block/BlockHourglass.java | 4 +- .../common/block/BlockIncensePlate.java | 6 +- .../common/block/BlockLightLauncher.java | 4 +- .../botania/common/block/BlockLightRelay.java | 2 +- .../botania/common/block/BlockLivingrock.java | 2 +- .../botania/common/block/BlockLivingwood.java | 2 +- .../botania/common/block/BlockManaBomb.java | 4 +- .../common/block/BlockModDoubleFlower.java | 4 +- .../botania/common/block/BlockOpenCrate.java | 2 +- .../common/block/BlockPistonRelay.java | 15 +- .../botania/common/block/BlockPlatform.java | 2 +- .../botania/common/block/BlockPylon.java | 2 +- .../botania/common/block/BlockRoot.java | 2 +- .../botania/common/block/BlockSolidVines.java | 2 +- .../common/block/BlockSparkChanger.java | 6 +- .../common/block/BlockSpecialFlower.java | 18 +- .../botania/common/block/BlockStorage.java | 2 +- .../common/block/BlockTeruTeruBozu.java | 6 +- .../botania/common/block/BlockTinyPlanet.java | 2 +- .../botania/common/block/ModBanners.java | 12 +- .../botania/common/block/ModBlocks.java | 46 +-- .../corporea/BlockCorporeaCrystalCube.java | 2 +- .../block/corporea/BlockCorporeaFunnel.java | 4 +- .../block/corporea/BlockCorporeaIndex.java | 8 +- .../corporea/BlockCorporeaInterceptor.java | 2 +- .../block/corporea/BlockCorporeaRetainer.java | 4 +- .../common/block/decor/Block18Stone.java | 2 +- .../common/block/decor/BlockBlaze.java | 4 +- .../common/block/decor/BlockCustomBrick.java | 2 +- .../common/block/decor/BlockDirtPath.java | 4 +- .../block/decor/BlockEndStoneBrick.java | 2 +- .../block/decor/BlockFloatingFlower.java | 16 +- .../common/block/decor/BlockManaBeacon.java | 2 +- .../common/block/decor/BlockManaFlame.java | 6 +- .../common/block/decor/BlockManaGlass.java | 2 +- .../common/block/decor/BlockModMushroom.java | 2 +- .../common/block/decor/BlockPavement.java | 2 +- .../common/block/decor/BlockPetalBlock.java | 2 +- .../common/block/decor/BlockPrismarine.java | 2 +- .../common/block/decor/BlockReeds.java | 2 +- .../common/block/decor/BlockSeaLamp.java | 2 +- .../common/block/decor/BlockShimmerrock.java | 2 +- .../block/decor/BlockShimmerwoodPlanks.java | 2 +- .../common/block/decor/BlockStarfield.java | 2 +- .../common/block/decor/BlockThatch.java | 2 +- .../common/block/decor/BlockTinyPotato.java | 2 +- .../common/block/decor/BlockUnstable.java | 2 +- .../decor/biomestone/BlockBiomeStone.java | 2 +- .../block/decor/panes/BlockModPane.java | 2 +- .../decor/quartz/BlockSpecialQuartz.java | 2 +- .../decor/quartz/BlockSpecialQuartzSlab.java | 2 +- .../block/dispenser/BehaviourFelPumpkin.java | 8 +- .../dispenser/BehaviourPoolMinecart.java | 4 +- .../block/mana/BlockAlchemyCatalyst.java | 2 +- .../common/block/mana/BlockBellows.java | 2 +- .../common/block/mana/BlockBrewery.java | 4 +- .../common/block/mana/BlockDistributor.java | 2 +- .../common/block/mana/BlockEnchanter.java | 6 +- .../common/block/mana/BlockForestDrum.java | 8 +- .../common/block/mana/BlockManaDetector.java | 2 +- .../common/block/mana/BlockManaVoid.java | 2 +- .../botania/common/block/mana/BlockPool.java | 2 +- .../botania/common/block/mana/BlockPrism.java | 6 +- .../botania/common/block/mana/BlockPump.java | 2 +- .../common/block/mana/BlockRFGenerator.java | 2 +- .../common/block/mana/BlockRuneAltar.java | 4 +- .../common/block/mana/BlockSpawnerClaw.java | 4 +- .../common/block/mana/BlockSpreader.java | 12 +- .../common/block/mana/BlockTerraPlate.java | 2 +- .../common/block/mana/BlockTurntable.java | 2 +- .../common/block/string/BlockRedString.java | 2 +- .../block/string/BlockRedStringDispenser.java | 2 +- .../block/subtile/SubTilePureDaisy.java | 2 +- .../functional/SubTileAgricarnation.java | 6 +- .../subtile/functional/SubTileBubbell.java | 2 +- .../subtile/functional/SubTileClayconia.java | 6 +- .../subtile/functional/SubTileExoflame.java | 2 +- .../functional/SubTileFallenKanade.java | 4 +- .../subtile/functional/SubTileHyacidus.java | 4 +- .../functional/SubTileJadedAmaranthus.java | 4 +- .../functional/SubTileMarimorphosis.java | 4 +- .../subtile/functional/SubTileMedumone.java | 2 +- .../subtile/functional/SubTileOrechid.java | 4 +- .../functional/SubTileOrechidIgnem.java | 2 +- .../functional/SubTileRannuncarpus.java | 4 +- .../generating/SubTileEntropinnyum.java | 2 +- .../generating/SubTileGourmaryllis.java | 2 +- .../generating/SubTileHydroangeas.java | 6 +- .../subtile/generating/SubTileKekimurus.java | 4 +- .../subtile/generating/SubTileMunchdew.java | 4 +- .../subtile/generating/SubTileNarslimmus.java | 2 +- .../subtile/generating/SubTileRafflowsia.java | 2 +- .../subtile/generating/SubTileSpectrolus.java | 4 +- .../subtile/generating/SubTileThermalily.java | 2 +- .../common/block/tile/TileAlfPortal.java | 10 +- .../botania/common/block/tile/TileAltar.java | 18 +- .../common/block/tile/TileBifrost.java | 7 +- .../botania/common/block/tile/TileCamo.java | 2 +- .../botania/common/block/tile/TileCocoon.java | 2 +- .../common/block/tile/TileEnchanter.java | 20 +- .../common/block/tile/TileEnderEye.java | 2 +- .../common/block/tile/TileFakeAir.java | 11 +- .../common/block/tile/TileHourglass.java | 10 +- .../common/block/tile/TileIncensePlate.java | 4 +- .../botania/common/block/tile/TileMod.java | 10 +- .../common/block/tile/TileSpawnerClaw.java | 6 +- .../common/block/tile/TileSpecialFlower.java | 4 +- .../common/block/tile/TileTerraPlate.java | 4 +- .../common/block/tile/mana/TileBellows.java | 2 +- .../common/block/tile/mana/TilePool.java | 2 +- .../common/block/tile/mana/TileSpreader.java | 2 +- .../block/tile/string/TileRedString.java | 2 +- .../tile/string/TileRedStringInterceptor.java | 2 +- .../vazkii/botania/common/brew/ModBrews.java | 30 +- .../common/brew/potion/PotionAllure.java | 2 +- .../common/brew/potion/PotionBloodthirst.java | 2 +- .../common/brew/potion/PotionClear.java | 2 +- .../common/brew/potion/PotionEmptiness.java | 2 +- .../common/brew/potion/PotionFeatherfeet.java | 2 +- .../common/brew/potion/PotionSoulCross.java | 2 +- .../common/core/BotaniaCreativeTab.java | 2 +- .../common/core/handler/PixieHandler.java | 8 +- .../common/core/handler/SheddingHandler.java | 28 +- .../common/crafting/ModBrewRecipes.java | 48 +-- .../common/crafting/ModCraftingRecipes.java | 316 +++++++++--------- .../common/crafting/ModElvenTradeRecipes.java | 12 +- .../crafting/ModManaAlchemyRecipes.java | 118 +++---- .../crafting/ModManaConjurationRecipes.java | 20 +- .../crafting/ModManaInfusionRecipes.java | 40 +-- .../common/crafting/ModMigrationRecipes.java | 34 +- .../common/crafting/ModPetalRecipes.java | 2 +- .../common/crafting/ModPureDaisyRecipes.java | 10 +- .../common/crafting/ModRuneRecipes.java | 20 +- .../crafting/recipe/CompositeLensRecipe.java | 2 +- .../common/crafting/recipe/HeadRecipe.java | 4 +- .../crafting/recipe/HelmRevealingRecipe.java | 2 +- .../common/entity/EntityDoppleganger.java | 36 +- .../common/entity/EntityEnderAirBottle.java | 8 +- .../common/entity/EntityFallingStar.java | 2 +- .../common/entity/EntityFlameRing.java | 2 +- .../common/entity/EntityFlyingCreature.java | 6 +- .../common/entity/EntityMagicLandmine.java | 4 +- .../common/entity/EntityManaBurst.java | 6 +- .../common/entity/EntityPinkWither.java | 2 +- .../common/entity/EntitySignalFlare.java | 2 +- .../common/entity/EntityThornChakram.java | 2 +- .../common/entity/EntityThrowableCopy.java | 4 +- .../common/entity/EntityThrownItem.java | 2 +- .../botania/common/entity/EntityVineBall.java | 2 +- .../common/item/ItemBlackHoleTalisman.java | 12 +- .../botania/common/item/ItemBottledMana.java | 24 +- .../botania/common/item/ItemCacophonium.java | 6 +- .../botania/common/item/ItemCraftingHalo.java | 6 +- .../botania/common/item/ItemEnderHand.java | 4 +- .../botania/common/item/ItemGaiaHead.java | 4 +- .../botania/common/item/ItemGrassHorn.java | 6 +- .../botania/common/item/ItemGrassSeeds.java | 12 +- .../botania/common/item/ItemLaputaShard.java | 10 +- .../botania/common/item/ItemManaCookie.java | 2 +- .../botania/common/item/ItemManaGun.java | 6 +- .../botania/common/item/ItemOpenBucket.java | 4 +- .../common/item/ItemOvergrowthSeed.java | 2 +- .../botania/common/item/ItemPinkinator.java | 2 +- .../botania/common/item/ItemSextant.java | 2 +- .../botania/common/item/ItemSignalFlare.java | 4 +- .../botania/common/item/ItemSpawnerMover.java | 10 +- .../common/item/ItemTemperanceStone.java | 2 +- .../botania/common/item/ItemThornChakram.java | 2 +- .../botania/common/item/ItemTwigWand.java | 2 +- .../botania/common/item/ItemVineBall.java | 2 +- .../vazkii/botania/common/item/ItemVirus.java | 11 +- .../botania/common/item/ItemWorldSeed.java | 2 +- .../vazkii/botania/common/item/ModItems.java | 10 +- .../common/item/brew/ItemBrewBase.java | 2 +- .../armor/terrasteel/ItemTerrasteelHelm.java | 10 +- .../equipment/bauble/ItemBaubleCosmetic.java | 10 +- .../equipment/bauble/ItemBloodPendant.java | 4 +- .../item/equipment/bauble/ItemDivaCharm.java | 2 +- .../equipment/bauble/ItemFlightTiara.java | 6 +- .../equipment/bauble/ItemGoldenLaurel.java | 4 +- .../item/equipment/bauble/ItemIcePendant.java | 2 +- .../item/equipment/bauble/ItemItemFinder.java | 2 +- .../equipment/bauble/ItemLavaPendant.java | 2 +- .../item/equipment/bauble/ItemMagnetRing.java | 3 +- .../item/equipment/bauble/ItemMiningRing.java | 10 +- .../item/equipment/bauble/ItemMonocle.java | 14 +- .../bauble/ItemSuperLavaPendant.java | 2 +- .../item/equipment/bauble/ItemTinyPlanet.java | 2 +- .../item/equipment/bauble/ItemTravelBelt.java | 4 +- .../item/equipment/bauble/ItemWaterRing.java | 10 +- .../item/equipment/tool/ItemGlassPick.java | 4 +- .../item/equipment/tool/ItemStarSword.java | 2 +- .../item/equipment/tool/ToolCommons.java | 10 +- .../equipment/tool/bow/ItemCrystalBow.java | 6 +- .../equipment/tool/bow/ItemLivingwoodBow.java | 18 +- .../tool/elementium/ItemElementiumAxe.java | 10 +- .../tool/elementium/ItemElementiumShears.java | 2 +- .../tool/elementium/ItemElementiumShovel.java | 6 +- .../tool/manasteel/ItemManasteelAxe.java | 2 +- .../tool/manasteel/ItemManasteelPick.java | 2 +- .../tool/manasteel/ItemManasteelShears.java | 4 +- .../tool/manasteel/ItemManasteelShovel.java | 4 +- .../tool/terrasteel/ItemTerraAxe.java | 4 +- .../tool/terrasteel/ItemTerraPick.java | 6 +- .../tool/terrasteel/ItemTerraSword.java | 2 +- .../botania/common/item/lens/LensFire.java | 6 +- .../common/item/lens/LensFirework.java | 2 +- .../botania/common/item/lens/LensLight.java | 2 +- .../botania/common/item/lens/LensMine.java | 4 +- .../botania/common/item/lens/LensPiston.java | 2 +- .../botania/common/item/material/ItemDye.java | 6 +- .../item/material/ItemManaResource.java | 10 +- .../botania/common/item/relic/ItemDice.java | 2 +- .../common/item/relic/ItemFlugelEye.java | 6 +- .../common/item/relic/ItemLokiRing.java | 4 +- .../common/item/rod/ItemCobbleRod.java | 6 +- .../botania/common/item/rod/ItemDirtRod.java | 6 +- .../common/item/rod/ItemExchangeRod.java | 8 +- .../botania/common/item/rod/ItemFireRod.java | 2 +- .../common/item/rod/ItemGravityRod.java | 6 +- .../common/item/rod/ItemSkyDirtRod.java | 2 +- .../botania/common/item/rod/ItemSmeltRod.java | 6 +- .../common/item/rod/ItemTerraformRod.java | 16 +- .../botania/common/item/rod/ItemWaterRod.java | 4 +- .../botania/common/lexicon/LexiconData.java | 18 +- .../botania/common/lexicon/TLexiconEntry.java | 2 +- .../common/lexicon/page/PageElvenRecipe.java | 2 +- .../common/lexicon/page/PageEntity.java | 2 +- .../common/lexicon/page/PageMultiblock.java | 2 +- .../common/lexicon/page/PageTerrasteel.java | 2 +- .../vazkii/botania/common/lib/LibMisc.java | 4 +- .../botania/common/lib/LibObfuscation.java | 2 +- .../botania/common/network/PacketHandler.java | 5 +- .../common/world/SkyblockWorldEvents.java | 24 +- 306 files changed, 1105 insertions(+), 1102 deletions(-) diff --git a/build.gradle b/build.gradle index 55cd2fb12..a3a3678e9 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ minecraft { version = "${config.mc_version}-${config.forge_version}" runDir = "eclipse/assets" - mappings = "snapshot_20160402" + mappings = "snapshot_20160518" //This, does the token replacement. //Though, I reccomend this to be replaced with a token such as @VERSION@ replace 'GRADLE:BUILD', config.build_number @@ -64,11 +64,7 @@ dependencies { compile files( 'Baubles-deobf.jar' ) - //compile "codechicken:CodeChickenLib:1.8-1.1.2.139:dev" - //compile "codechicken:CodeChickenCore:1.8-1.0.5.36:dev" - //compile "codechicken:NotEnoughItems:1.8-1.0.5.104:dev" - //compile "codechicken:ForgeMultipart:1.7.10-1.1.1.320:dev" - deobfCompile "mezz.jei:jei_1.9:3.3.3.197" + deobfCompile "mezz.jei:jei_1.9.4:3.4.0.202" //and a bit more for SCP sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29" diff --git a/build.properties b/build.properties index 441286610..a9aaa8e3c 100644 --- a/build.properties +++ b/build.properties @@ -3,7 +3,7 @@ version=r1.8 dir_output=../Build Output/Botania/ dir_repo=./ -mc_version=1.9 -forge_version=12.16.1.1901 +mc_version=1.9.4 +forge_version=12.16.1.1909-1.9.4 build_number=306 mod_name=Botania diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 37e221b2c..778d91b5a 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -102,16 +102,16 @@ public final class BotaniaAPI { public static final Set> gravityRodBlacklist = new LinkedHashSet<>(); - public static final ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", "manasteel", 16, new int[] { 2, 6, 5, 2 }, 18, SoundEvents.item_armor_equip_iron); + public static final ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", "manasteel", 16, new int[] { 2, 6, 5, 2 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_IRON); public static final ToolMaterial manasteelToolMaterial = EnumHelper.addToolMaterial("MANASTEEL", 3, 300, 6.2F, 2F, 20); - public static final ArmorMaterial elementiumArmorMaterial = EnumHelper.addArmorMaterial("B_ELEMENTIUM", "b_elementium", 18, new int[] { 2, 6, 5, 2 }, 18, SoundEvents.item_armor_equip_iron); + public static final ArmorMaterial elementiumArmorMaterial = EnumHelper.addArmorMaterial("B_ELEMENTIUM", "b_elementium", 18, new int[] { 2, 6, 5, 2 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_IRON); public static final ToolMaterial elementiumToolMaterial = EnumHelper.addToolMaterial("B_ELEMENTIUM", 3, 720, 6.2F, 2F, 20); - public static final ArmorMaterial terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", "terrasteel", 34, new int[] {3, 8, 6, 3}, 26, SoundEvents.item_armor_equip_diamond); + public static final ArmorMaterial terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", "terrasteel", 34, new int[] {3, 8, 6, 3}, 26, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND); public static final ToolMaterial terrasteelToolMaterial = EnumHelper.addToolMaterial("TERRASTEEL", 4, 2300, 9F, 3F, 26); - public static final ArmorMaterial manaweaveArmorMaterial = EnumHelper.addArmorMaterial("MANAWEAVE", "manaweave", 5, new int[] { 1, 2, 2, 1 }, 18, SoundEvents.item_armor_equip_leather); + public static final ArmorMaterial manaweaveArmorMaterial = EnumHelper.addArmorMaterial("MANAWEAVE", "manaweave", 5, new int[] { 1, 2, 2, 1 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_LEATHER); public static final EnumRarity rarityRelic = EnumHelper.addRarity("RELIC", TextFormatting.GOLD, "Relic"); @@ -211,12 +211,12 @@ 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); + 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")); @@ -246,11 +246,11 @@ public final class BotaniaAPI { registerModWiki("GanysNether", new SimpleWikiProvider("Gany's Nether Wiki", "http://ganys-nether.wikia.com/wiki/%s")); registerModWiki("GanysEnd", new SimpleWikiProvider("Gany's End Wiki", "http://ganys-end.wikia.com/wiki/%s")); - registerPaintableBlock(Blocks.stained_glass, BlockStainedGlass.COLOR); - registerPaintableBlock(Blocks.stained_glass_pane, BlockStainedGlassPane.COLOR); - registerPaintableBlock(Blocks.stained_hardened_clay, BlockColored.COLOR); - registerPaintableBlock(Blocks.wool, BlockColored.COLOR); - registerPaintableBlock(Blocks.carpet, BlockCarpet.COLOR); + registerPaintableBlock(Blocks.STAINED_GLASS, BlockStainedGlass.COLOR); + registerPaintableBlock(Blocks.STAINED_GLASS_PANE, BlockStainedGlassPane.COLOR); + registerPaintableBlock(Blocks.STAINED_HARDENED_CLAY, BlockColored.COLOR); + registerPaintableBlock(Blocks.WOOL, BlockColored.COLOR); + registerPaintableBlock(Blocks.CARPET, BlockCarpet.COLOR); registerDisposableBlock("dirt"); // Vanilla registerDisposableBlock("sand"); // Vanilla diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index 74b0ef857..79dd25db3 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -122,7 +122,7 @@ public class DummyMethodHandler implements IInternalMethodHandler { @Override public ItemStack getSubTileAsStack(String subTile) { - return new ItemStack(Blocks.stone, 0, 0); + return new ItemStack(Blocks.STONE, 0, 0); } @Override @@ -162,7 +162,7 @@ public class DummyMethodHandler implements IInternalMethodHandler { @Override public ItemStack getBindDisplayForFlowerType(SubTileEntity e) { - return new ItemStack(Blocks.stone, 0, 0); + return new ItemStack(Blocks.STONE, 0, 0); } @Override diff --git a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java index cca21a014..37cf9083b 100644 --- a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java +++ b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java @@ -13,20 +13,18 @@ package vazkii.botania.api.internal; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.play.server.SPacketUpdateTileEntity; -import net.minecraft.server.management.PlayerManager; +import net.minecraft.server.management.PlayerChunkMapEntry; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.WorldServer; -import java.util.List; - public final class VanillaPacketDispatcher { public static void dispatchTEToNearbyPlayers(TileEntity tile) { if(tile.getWorld() instanceof WorldServer) { WorldServer ws = ((WorldServer) tile.getWorld()); - PlayerManager.PlayerInstance chunk = ws.getPlayerChunkMap().getEntry(tile.getPos().getX() >> 4, tile.getPos().getZ() >> 4); + PlayerChunkMapEntry chunk = ws.getPlayerChunkMap().getEntry(tile.getPos().getX() >> 4, tile.getPos().getZ() >> 4); if(chunk == null) return; @@ -36,7 +34,7 @@ public final class VanillaPacketDispatcher { if (playerMP.getDistanceSq(tile.getPos()) < 64 * 64 && chunk.containsPlayer(playerMP)) { - playerMP.playerNetServerHandler.sendPacket(tile.getDescriptionPacket()); + playerMP.connection.sendPacket(tile.getUpdatePacket()); } } diff --git a/src/main/java/vazkii/botania/api/item/IFlowerlessBiome.java b/src/main/java/vazkii/botania/api/item/IFlowerlessBiome.java index 16543e4c9..bff791bb5 100644 --- a/src/main/java/vazkii/botania/api/item/IFlowerlessBiome.java +++ b/src/main/java/vazkii/botania/api/item/IFlowerlessBiome.java @@ -11,7 +11,7 @@ package vazkii.botania.api.item; import net.minecraft.world.World; /** - * A BiomeGenBase that implements this will not have Botania flowers generated. + * A Biome that implements this will not have Botania flowers generated. */ public interface IFlowerlessBiome { /** diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java index d07da21b4..ebb05cae3 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java @@ -106,7 +106,7 @@ public class RecipeBrew { public ItemStack getOutput(ItemStack stack) { if(stack == null || !(stack.getItem() instanceof IBrewContainer)) - return new ItemStack(Items.glass_bottle); // Fallback... + return new ItemStack(Items.GLASS_BOTTLE); // Fallback... IBrewContainer container = (IBrewContainer) stack.getItem(); return container.getItemForBrew(brew, stack); diff --git a/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java b/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java index 655d492fe..a5bcb6eb3 100644 --- a/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java +++ b/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java @@ -55,7 +55,7 @@ public final class BotaniaSoundEvents { public static final SoundEvent gaiaMusic2 = getRegisteredSoundEvent("botania:music.gaia2"); private static SoundEvent getRegisteredSoundEvent(String name) { - return SoundEvent.soundEventRegistry.getObject(new ResourceLocation(name)); + return SoundEvent.REGISTRY.getObject(new ResourceLocation(name)); } private BotaniaSoundEvents() {} diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index e7b377d04..b01ce3fdd 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -102,9 +102,9 @@ public class SubTileGenerating extends SubTileEntity { if(passive && muhBalance > 0 && passiveDecayTicks > muhBalance) { IBlockState state = supertile.getWorld().getBlockState(supertile.getPos()); - supertile.getWorld().playAuxSFX(2001, supertile.getPos(), Block.getStateId(state)); + supertile.getWorld().playEvent(2001, supertile.getPos(), Block.getStateId(state)); if(supertile.getWorld().getBlockState(supertile.getPos().down()).isSideSolid(supertile.getWorld(), supertile.getPos().down(), EnumFacing.UP)) - supertile.getWorld().setBlockState(supertile.getPos(), Blocks.deadbush.getDefaultState()); + supertile.getWorld().setBlockState(supertile.getPos(), Blocks.DEADBUSH.getDefaultState()); else supertile.getWorld().setBlockToAir(supertile.getPos()); } } diff --git a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java index 241459fb2..2c28a1208 100644 --- a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java +++ b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java @@ -23,7 +23,7 @@ public class WikiHooks { private static final Map modWikis = new HashMap<>(); public static IWikiProvider getWikiFor(Block block) { - ResourceLocation mod = Block.blockRegistry.getNameForObject(block); + ResourceLocation mod = Block.REGISTRY.getNameForObject(block); return getWikiFor(mod == null ? "" : mod.getResourceDomain().toLowerCase()); } diff --git a/src/main/java/vazkii/botania/client/challenge/ModChallenges.java b/src/main/java/vazkii/botania/client/challenge/ModChallenges.java index 92c14f44a..f3839130f 100644 --- a/src/main/java/vazkii/botania/client/challenge/ModChallenges.java +++ b/src/main/java/vazkii/botania/client/challenge/ModChallenges.java @@ -34,26 +34,26 @@ public final class ModChallenges { challenges.put(level, new ArrayList<>()); addChallenge(EnumChallengeLevel.EASY, "flowerFarm", new ItemStack(ModBlocks.flower, 1, 6)); - addChallenge(EnumChallengeLevel.EASY, "recordFarm", new ItemStack(Items.record_13)); - addChallenge(EnumChallengeLevel.EASY, "reedFarm", new ItemStack(Items.reeds)); - addChallenge(EnumChallengeLevel.EASY, "cobbleGen", new ItemStack(Blocks.cobblestone)); + addChallenge(EnumChallengeLevel.EASY, "recordFarm", new ItemStack(Items.RECORD_13)); + addChallenge(EnumChallengeLevel.EASY, "reedFarm", new ItemStack(Items.REEDS)); + addChallenge(EnumChallengeLevel.EASY, "cobbleGen", new ItemStack(Blocks.COBBLESTONE)); addChallenge(EnumChallengeLevel.EASY, "pureDaisy", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY)); addChallenge(EnumChallengeLevel.EASY, "battery", new ItemStack(ModBlocks.pool)); addChallenge(EnumChallengeLevel.NORMAL, "apothecaryRefill", new ItemStack(ModBlocks.altar)); - addChallenge(EnumChallengeLevel.NORMAL, "treeFarm", new ItemStack(Blocks.sapling)); - addChallenge(EnumChallengeLevel.NORMAL, "fullCropFarm", new ItemStack(Items.wheat_seeds)); - addChallenge(EnumChallengeLevel.NORMAL, "animalFarm", new ItemStack(Items.leather)); - addChallenge(EnumChallengeLevel.NORMAL, "boneMealFarm", new ItemStack(Items.dye, 1, 15)); + addChallenge(EnumChallengeLevel.NORMAL, "treeFarm", new ItemStack(Blocks.SAPLING)); + addChallenge(EnumChallengeLevel.NORMAL, "fullCropFarm", new ItemStack(Items.WHEAT_SEEDS)); + addChallenge(EnumChallengeLevel.NORMAL, "animalFarm", new ItemStack(Items.LEATHER)); + addChallenge(EnumChallengeLevel.NORMAL, "boneMealFarm", new ItemStack(Items.DYE, 1, 15)); addChallenge(EnumChallengeLevel.NORMAL, "orechid", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ORECHID)); - addChallenge(EnumChallengeLevel.HARD, "mobTower", new ItemStack(Items.bone)); + addChallenge(EnumChallengeLevel.HARD, "mobTower", new ItemStack(Items.BONE)); addChallenge(EnumChallengeLevel.HARD, "entropinnyumSetup", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ENTROPINNYUM)); addChallenge(EnumChallengeLevel.HARD, "spectrolusSetup", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SPECTROLUS)); addChallenge(EnumChallengeLevel.HARD, "potionBrewer", new ItemStack(ModBlocks.brewery)); addChallenge(EnumChallengeLevel.LUNATIC, "kekimurusSetup", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_KEKIMURUS)); - addChallenge(EnumChallengeLevel.LUNATIC, "autoQuarry", new ItemStack(Items.diamond_pickaxe)); + addChallenge(EnumChallengeLevel.LUNATIC, "autoQuarry", new ItemStack(Items.DIAMOND_PICKAXE)); addChallenge(EnumChallengeLevel.LUNATIC, "runeCrafter", new ItemStack(ModItems.rune)); } diff --git a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java index 0146ccd63..712c12b92 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -37,7 +37,7 @@ public final class BaubleRenderHandler implements LayerRenderer { @Override public void doRenderLayer(EntityPlayer player, float p_177141_2_, float p_177141_3_, float partialTicks, float p_177141_5_, float p_177141_6_, float p_177141_7_, float scale) { - if(!ConfigHandler.renderBaubles || player.getActivePotionEffect(MobEffects.invisibility) != null) + if(!ConfigHandler.renderBaubles || player.getActivePotionEffect(MobEffects.INVISIBILITY) != null) return; InventoryBaubles inv = PlayerHandler.getPlayerBaubles(player); @@ -106,7 +106,7 @@ public final class BaubleRenderHandler implements LayerRenderer { ItemStack stack = player.inventory.getStackInSlot(i); if(stack != null && stack.getItem() == ModItems.manaTablet) { GlStateManager.pushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); Helper.rotateIfSneaking(player); boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.LEGS) != null; GlStateManager.rotate(90, 0, 1, 0); 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 5637d267c..d720dc2a0 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -34,7 +34,7 @@ public final class ColorHandler { Map, IBlockColor> map = ReflectionHelper.getPrivateValue(BlockColors.class, blocks, "blockColorMap"); // Steal vine colorer - blocks.registerBlockColorHandler(map.get(Blocks.vine.delegate), ModBlocks.solidVines); + blocks.registerBlockColorHandler(map.get(Blocks.VINE.delegate), ModBlocks.solidVines); // 16 colors blocks.registerBlockColorHandler( diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index d44d66275..7cb25f4bf 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -111,7 +111,7 @@ public final class ContributorFancinessHandler implements LayerRenderer iterator = Item.itemRegistry.iterator(); + Iterator iterator = Item.REGISTRY.iterator(); ArrayList curList = new ArrayList<>(); while(iterator.hasNext()) { diff --git a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java index d7eea4652..ab62a71ce 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -68,7 +68,7 @@ public final class DebugHandler { event.getLeft().add(" GL_ARB_multitexture: " + caps.GL_ARB_multitexture); event.getLeft().add(" GL_ARB_texture_non_power_of_two: " + caps.GL_ARB_texture_non_power_of_two); event.getLeft().add(" OpenGL13: " + caps.OpenGL13); - } else if(Minecraft.isRunningOnMac) + } else if(Minecraft.IS_RUNNING_ON_MAC) event.getLeft().add(PREFIX + "SHIFT+CMD for context"); else event.getLeft().add(PREFIX + "SHIFT+CTRL for context"); } diff --git a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java index 30d474905..78660b1e4 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -156,7 +156,7 @@ public class MiscellaneousIcons { if (!evt.getEntityPlayer().worldObj.isRemote || !((Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment")) || !evt.getEntityPlayer().isSneaking()) return; - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); int width = GL11.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, 0, GL11.GL_TEXTURE_WIDTH); int height = GL11.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, 0, GL11.GL_TEXTURE_HEIGHT); diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index f9b166011..789434151 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -30,6 +30,7 @@ import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.obj.OBJLoader; +import net.minecraftforge.fml.common.registry.ForgeRegistries; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.state.BotaniaStateProps; @@ -690,7 +691,7 @@ public final class ModelHandler { private static void registerMushrooms() { Item item = Item.getItemFromBlock(ModBlocks.mushroom); for (EnumDyeColor color : EnumDyeColor.values()) { - String name = Block.blockRegistry.getNameForObject(ModBlocks.mushroom).toString(); + String name = ForgeRegistries.BLOCKS.getKey(ModBlocks.mushroom).toString(); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName())); } } @@ -698,26 +699,26 @@ public final class ModelHandler { private static void registerFlowers() { Item item = Item.getItemFromBlock(ModBlocks.flower); for (EnumDyeColor color : EnumDyeColor.values()) { - String name = Block.blockRegistry.getNameForObject(ModBlocks.flower).toString(); + String name = ForgeRegistries.BLOCKS.getKey(ModBlocks.flower).toString(); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName())); } item = Item.getItemFromBlock(ModBlocks.shinyFlower); for (EnumDyeColor color : EnumDyeColor.values()) { - String name = Block.blockRegistry.getNameForObject(ModBlocks.shinyFlower).toString(); + String name = ForgeRegistries.BLOCKS.getKey(ModBlocks.shinyFlower).toString(); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName())); } item = Item.getItemFromBlock(ModBlocks.doubleFlower1); for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1.getAllowedValues()) { - String name = Block.blockRegistry.getNameForObject(ModBlocks.doubleFlower1).toString(); + String name = ForgeRegistries.BLOCKS.getKey(ModBlocks.doubleFlower1).toString(); String variant = "inventory_" + color.getName(); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, variant)); } item = Item.getItemFromBlock(ModBlocks.doubleFlower2); for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_2.getAllowedValues()) { - String name = Block.blockRegistry.getNameForObject(ModBlocks.doubleFlower2).toString(); + String name = ForgeRegistries.BLOCKS.getKey(ModBlocks.doubleFlower2).toString(); String variant = "inventory_" + color.getName(); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata() - 8, new ModelResourceLocation(name, variant)); } @@ -725,7 +726,7 @@ public final class ModelHandler { private static void registerPavement() { Item item = Item.getItemFromBlock(ModFluffBlocks.pavement); - String name = Block.blockRegistry.getNameForObject(ModFluffBlocks.pavement).toString(); + String name = ForgeRegistries.BLOCKS.getKey(ModFluffBlocks.pavement).toString(); for (EnumDyeColor e : BotaniaStateProps.PAVEMENT_COLOR.getAllowedValues()) { String variant = "color=" + e.getName(); @@ -875,7 +876,7 @@ public final class ModelHandler { private static void registerAltars() { Item item = Item.getItemFromBlock(ModBlocks.altar); - String name = Block.blockRegistry.getNameForObject(ModBlocks.altar).toString(); + String name = ForgeRegistries.BLOCKS.getKey(ModBlocks.altar).toString(); for (int i = 0; i < AltarVariant.values().length - 1; i++) { // Off by one on purpose to exclude MOSSY String variantName = "variant=" + AltarVariant.values()[i].getName(); ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, variantName)); @@ -887,7 +888,7 @@ public final class ModelHandler { if (b == null) // Dark quartz disabled continue; Item item = Item.getItemFromBlock(b); - String name = Block.blockRegistry.getNameForObject(b).toString(); + String name = ForgeRegistries.BLOCKS.getKey(b).toString(); ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(name, "variant=normal")); ModelLoader.setCustomModelResourceLocation(item, 1, new ModelResourceLocation(name, "variant=chiseled")); ModelLoader.setCustomModelResourceLocation(item, 2, new ModelResourceLocation(name, "variant=pillar_y")); @@ -896,7 +897,7 @@ public final class ModelHandler { private static void registerLuminizers() { Item item = Item.getItemFromBlock(ModBlocks.lightRelay); - String name = Block.blockRegistry.getNameForObject(ModBlocks.lightRelay).toString(); + String name = ForgeRegistries.BLOCKS.getKey(ModBlocks.lightRelay).toString(); for (LuminizerVariant v : LuminizerVariant.values()) { ModelLoader.setCustomModelResourceLocation(item, v.ordinal(), new ModelResourceLocation(name, "powered=false,variant=" + v.getName())); } @@ -905,7 +906,7 @@ public final class ModelHandler { private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String variantHeader) { Item item = Item.getItemFromBlock(b); for (T e : enumclazz.getEnumConstants()) { - String baseName = Block.blockRegistry.getNameForObject(b).toString(); + String baseName = ForgeRegistries.BLOCKS.getKey(b).toString(); String variantName = variantHeader + "=" + e.getName(); ModelLoader.setCustomModelResourceLocation(item, e.ordinal(), new ModelResourceLocation(baseName, variantName)); } @@ -915,7 +916,7 @@ public final class ModelHandler { * Registers all metas of the given item to models/item/registryname.json */ private static void registerItemModelAllMeta(Item item, int range) { - String loc = Item.itemRegistry.getNameForObject(item).toString(); + String loc = ForgeRegistries.ITEMS.getKey(item).toString(); for(int i = 0; i < range; i++) { ModelLoader.registerItemVariants(item, new ModelResourceLocation(loc, "inventory")); ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(loc, "inventory")); diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java index 1f15f88c2..998586cdf 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java @@ -17,7 +17,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.WorldType; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; @@ -39,7 +39,7 @@ public class MultiblockBlockAccess implements IBlockAccess { return comp.getBlockState(); if(hasBlockAccess) return originalBlockAccess.getBlockState(pos); - return Blocks.air.getDefaultState(); + return Blocks.AIR.getDefaultState(); } @Override @@ -80,7 +80,7 @@ public class MultiblockBlockAccess implements IBlockAccess { } @Override - public BiomeGenBase getBiomeGenForCoords(BlockPos pos) { + public Biome getBiomeGenForCoords(BlockPos pos) { if(hasBlockAccess) return originalBlockAccess.getBiomeGenForCoords(pos); return null; diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java index e26a53584..3fc22e535 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -171,7 +171,7 @@ public final class MultiblockRenderHandler { GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); IBlockState state = comp.getBlockState(); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); if(state == null) return; if(IMultiblockRenderHook.renderHooks.containsKey(state.getBlock())) { diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java index b81e59652..2404b7590 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -155,7 +155,7 @@ public final class TooltipAdditionDisplayHandler { font.drawStringWithShadow("?", x + 10, y + 8, 0xFFFFFFFF); GlStateManager.scale(0.5F, 0.5F, 1F); - boolean mac = Minecraft.isRunningOnMac; + boolean mac = Minecraft.IS_RUNNING_ON_MAC; mc.fontRendererObj.drawStringWithShadow(TextFormatting.BOLD + (ConfigHandler.useShiftForQuickLookup ? "Shift" : mac ? "Cmd" : "Ctrl"), (x + 10) * 2 - 16, (y + 8) * 2 + 20, 0xFFFFFFFF); GlStateManager.scale(2F, 2F, 1F); 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 c92e01265..5026af18d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java @@ -24,10 +24,10 @@ public final class TooltipHandler { @SubscribeEvent(priority = EventPriority.HIGHEST) public void onTooltipEvent(ItemTooltipEvent event) { - if(event.getItemStack().getItem() == Item.getItemFromBlock(Blocks.dirt) && event.getItemStack().getItemDamage() == 1) { + if(event.getItemStack().getItem() == Item.getItemFromBlock(Blocks.DIRT) && event.getItemStack().getItemDamage() == 1) { event.getToolTip().add(I18n.translateToLocal("botaniamisc.coarseDirt0")); event.getToolTip().add(I18n.translateToLocal("botaniamisc.coarseDirt1")); - } else if(event.getItemStack().getItem() == Item.getItemFromBlock(Blocks.mob_spawner) && event.getEntityPlayer().capabilities.isCreativeMode) + } else if(event.getItemStack().getItem() == Item.getItemFromBlock(Blocks.MOB_SPAWNER) && event.getEntityPlayer().capabilities.isCreativeMode) event.getToolTip().add(I18n.translateToLocal("botaniamisc.spawnerTip")); if(ItemNBTHelper.detectNBT(event.getItemStack()) && ItemNBTHelper.getBoolean(event.getItemStack(), ItemRegenIvy.TAG_REGEN, false)) diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 796dc20ca..6f2fb86cf 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -370,9 +370,9 @@ public class ClientProxy extends CommonProxy { public void playRecordClientSided(World world, BlockPos pos, ItemRecord record) { Minecraft mc = Minecraft.getMinecraft(); if(record == null) - world.playAuxSFXAtEntity(null, 1010, pos, 0); + world.playEvent(null, 1010, pos, 0); else { - world.playAuxSFXAtEntity(null, 1010, pos, Item.getIdFromItem(record)); + world.playEvent(null, 1010, pos, Item.getIdFromItem(record)); mc.ingameGUI.setRecordPlayingMessage(record.getRecordNameLocal()); } } diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index dfb97066b..d5feac72b 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -11,8 +11,8 @@ package vazkii.botania.client.fx; import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EffectRenderer; -import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.particle.ParticleManager; +import net.minecraft.client.particle.Particle; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.VertexBuffer; @@ -32,7 +32,7 @@ import vazkii.botania.common.lib.LibObfuscation; import java.util.ArrayDeque; import java.util.Queue; -public class FXSparkle extends EntityFX { +public class FXSparkle extends Particle { public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_PARTICLES); @@ -57,7 +57,7 @@ public class FXSparkle extends EntityFX { particleBlue = blue; particleAlpha = 0.5F; // So MC renders us on the alpha layer, value not actually used particleGravity = 0; - xSpeed = ySpeed = zSpeed = 0; + motionX = motionY = motionZ = 0; particleScale *= size; particleMaxAge = 3 * m; multiplier = m; @@ -73,7 +73,7 @@ public class FXSparkle extends EntityFX { ParticleRenderDispatcher.fakeSparkleFxCount = 0; GlStateManager.color(1.0F, 1.0F, 1.0F, 0.75F); - Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ReflectionHelper.getPrivateValue(EffectRenderer.class, null, LibObfuscation.PARTICLE_TEXTURES) : particles); + Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ReflectionHelper.getPrivateValue(ParticleManager.class, null, LibObfuscation.PARTICLE_TEXTURES) : particles); tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); for(FXSparkle sparkle : queuedRenders) @@ -139,23 +139,23 @@ public class FXSparkle extends EntityFX { if (particleAge++ >= particleMaxAge) setExpired(); - ySpeed -= 0.04D * particleGravity; + motionY -= 0.04D * particleGravity; if (!noClip && !fake) pushOutOfBlocks(posX, (getEntityBoundingBox().minY + getEntityBoundingBox().maxY) / 2.0D, posZ); - posX += xSpeed; - posY += ySpeed; - posZ += zSpeed; + posX += motionX; + posY += motionY; + posZ += motionZ; if (slowdown) { - xSpeed *= 0.908000001907348633D; - ySpeed *= 0.908000001907348633D; - zSpeed *= 0.908000001907348633D; + motionX *= 0.908000001907348633D; + motionY *= 0.908000001907348633D; + motionZ *= 0.908000001907348633D; if (isCollided) { - xSpeed *= 0.69999998807907104D; - zSpeed *= 0.69999998807907104D; + motionX *= 0.69999998807907104D; + motionZ *= 0.69999998807907104D; } } @@ -220,33 +220,33 @@ public class FXSparkle extends EntityFX { float var26 = (rand.nextFloat() - rand.nextFloat()) * 0.1F; if (var22 == 0) { - xSpeed = -var25; - ySpeed=zSpeed=var26; + motionX = -var25; + motionY=motionZ=var26; } if (var22 == 1) { - xSpeed = var25; - ySpeed=zSpeed=var26; + motionX = var25; + motionY=motionZ=var26; } if (var22 == 2) { - ySpeed = -var25; - xSpeed=zSpeed=var26; + motionY = -var25; + motionX=motionZ=var26; } if (var22 == 3) { - ySpeed = var25; - xSpeed=zSpeed=var26; + motionY = var25; + motionX=motionZ=var26; } if (var22 == 4) { - zSpeed = -var25; - ySpeed=xSpeed=var26; + motionZ = -var25; + motionY=motionX=var26; } if (var22 == 5) { - zSpeed = var25; - ySpeed=xSpeed=var26; + motionZ = var25; + motionY=motionX=var26; } return true; diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index 0f5588fe9..b92693866 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -11,8 +11,8 @@ package vazkii.botania.client.fx; import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EffectRenderer; -import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.particle.ParticleManager; +import net.minecraft.client.particle.Particle; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.VertexBuffer; @@ -30,7 +30,7 @@ import vazkii.botania.common.lib.LibObfuscation; import java.util.ArrayDeque; import java.util.Queue; -public class FXWisp extends EntityFX { +public class FXWisp extends Particle { public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_WISP_LARGE); @@ -52,7 +52,7 @@ public class FXWisp extends EntityFX { particleBlue = blue; particleAlpha = 0.5F; // So MC renders us on the alpha layer, value not actually used particleGravity = 0; - xSpeed = ySpeed = zSpeed = 0; + motionX = motionY = motionZ = 0; particleScale *= size; moteParticleScale = particleScale; particleMaxAge = (int)(28D / (Math.random() * 0.3D + 0.7D) * maxAgeMul); @@ -81,7 +81,7 @@ public class FXWisp extends EntityFX { ParticleRenderDispatcher.depthIgnoringWispFxCount = 0; GlStateManager.color(1.0F, 1.0F, 1.0F, 0.75F); - Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ReflectionHelper.getPrivateValue(EffectRenderer.class, null, LibObfuscation.PARTICLE_TEXTURES) : particles); + Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ReflectionHelper.getPrivateValue(ParticleManager.class, null, LibObfuscation.PARTICLE_TEXTURES) : particles); if(!queuedRenders.isEmpty()) { tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); @@ -150,13 +150,13 @@ public class FXWisp extends EntityFX { if (particleAge++ >= particleMaxAge) setExpired(); - ySpeed -= 0.04D * particleGravity; - posX += xSpeed; - posY += ySpeed; - posZ += zSpeed; - xSpeed *= 0.98000001907348633D; - ySpeed *= 0.98000001907348633D; - zSpeed *= 0.98000001907348633D; + motionY -= 0.04D * particleGravity; + posX += motionX; + posY += motionY; + posZ += motionZ; + motionX *= 0.98000001907348633D; + motionY *= 0.98000001907348633D; + motionZ *= 0.98000001907348633D; } public void setGravity(float value) { @@ -164,9 +164,9 @@ public class FXWisp extends EntityFX { } public void setSpeed(float mx, float my, float mz) { - xSpeed = mx; - ySpeed = my; - zSpeed = mz; + motionX = mx; + motionY = my; + motionZ = mz; } private boolean depthTest = true; diff --git a/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java b/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java index 571e3ffb2..196ba2609 100644 --- a/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java +++ b/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java @@ -12,13 +12,13 @@ package vazkii.botania.client.gui; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.achievement.GuiAchievements; -import net.minecraft.stats.StatFileWriter; +import net.minecraft.stats.StatisticsManager; import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.common.achievement.ModAchievements; public class GuiAchievementsHacky extends GuiAchievements { - public GuiAchievementsHacky(GuiScreen p_i45026_1_, StatFileWriter p_i45026_2_) { + public GuiAchievementsHacky(GuiScreen p_i45026_1_, StatisticsManager p_i45026_2_) { super(p_i45026_1_, p_i45026_2_); ReflectionHelper.setPrivateValue(GuiAchievements.class, this, ModAchievements.pageIndex, "currentPage"); } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java index a478190ce..19954086c 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -240,7 +240,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); GlStateManager.enableRescaleNormal(); - ItemStack paper = new ItemStack(Items.paper, currentEntry.pages.size()); + ItemStack paper = new ItemStack(Items.PAPER, currentEntry.pages.size()); mc.getRenderItem().renderItemAndEffectIntoGUI(paper, 14, -28); mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, paper, 14, -28, ""); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java index 0cb3b4abf..338b1d122 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java @@ -35,10 +35,10 @@ public class GuiButtonDoot extends GuiButtonLexicon { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); - par1Minecraft.renderEngine.bindTexture(TextureMap.locationBlocksTexture); + par1Minecraft.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); GlStateManager.color(1F, 1F, 1F, 1F); par1Minecraft.getRenderItem().renderItemIntoGUI(new ItemStack(ModItems.cacophonium), xPosition, yPosition); - par1Minecraft.getRenderItem().renderItemIntoGUI(new ItemStack(Items.fireworks), xPosition + 8, yPosition + 2); + par1Minecraft.getRenderItem().renderItemIntoGUI(new ItemStack(Items.FIREWORKS), xPosition + 8, yPosition + 2); GlStateManager.disableLighting(); diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java index 0c1638788..a501d0508 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java @@ -71,7 +71,7 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { @Override public void drawAnimations(@Nonnull Minecraft minecraft) { - minecraft.renderEngine.bindTexture(TextureMap.locationBlocksTexture); + minecraft.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); TextureAtlasSprite sprite = MiscellaneousIcons.INSTANCE.alfPortalTex; Tessellator tess = Tessellator.getInstance(); VertexBuffer wr = tess.getBuffer(); diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index 00aa3478c..63e4e259a 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -24,7 +24,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.WorldType; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.property.IExtendedBlockState; import vazkii.botania.api.state.BotaniaStateProps; @@ -143,7 +143,7 @@ public class PlatformModel implements IBakedModel { if(state.getBlock() instanceof BlockCamo) { state = ((TileCamo) compose.getTileEntity(pos)).camoState; } - return state == null ? Blocks.air.getDefaultState() : state; + return state == null ? Blocks.AIR.getDefaultState() : state; } @Override @@ -152,7 +152,7 @@ public class PlatformModel implements IBakedModel { } @Override - public BiomeGenBase getBiomeGenForCoords(BlockPos pos) { + public Biome getBiomeGenForCoords(BlockPos pos) { return compose.getBiomeGenForCoords(pos); } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java index b2d173441..cb3f1eae5 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -51,7 +51,7 @@ public class RenderBabylonWeapon extends Render { GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); GlStateManager.pushMatrix(); float s = 1.5F; GlStateManager.scale(s, s, s); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java index 6df87330e..f4115cb79 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -70,7 +70,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { Item item = stack.getItem(); boolean block = item instanceof ItemBlock; - Minecraft.getMinecraft().renderEngine.bindTexture(block ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(block ? TextureMap.LOCATION_BLOCKS_TEXTURE : TextureMap.locationItemsTexture); IIcon icon = block ? Block.getBlockFromItem(item).getBlockTextureFromSide(ForgeDirection.UP.ordinal()) : item.getIcon(stack, 0); if(icon != null) { diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java index 330bbfbef..2873545e7 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java @@ -27,7 +27,7 @@ public class RenderPoolMinecart extends RenderMinecart { } @Override - protected void func_188319_a(EntityPoolMinecart poolCart, float p_147910_2_, IBlockState state) { + protected void renderCartContents(EntityPoolMinecart poolCart, float p_147910_2_, IBlockState state) { RenderTilePool.forceVariant = PoolVariant.DEFAULT; RenderTilePool.forceManaNumber = poolCart.getMana(); TileEntityRendererDispatcher.instance.getSpecialRendererByClass(TilePool.class).renderTileEntityAt(null, poolCart.posX, poolCart.posY, poolCart.posZ, ClientTickHandler.partialTicks, -1); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java b/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java index b5f62d79d..cf9bfcb04 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java @@ -27,7 +27,7 @@ public class RenderSnowballStack extends RenderSnowball { } @Override - public ItemStack getPotion(T entity) { + public ItemStack getStackToRender(T entity) { return stackGetter.apply(entity); } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java index 0334c9d8a..952b4f850 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -97,7 +97,7 @@ public abstract class RenderSparkBase extends Render { @Override protected ResourceLocation getEntityTexture(Entity p_110775_1_) { - return TextureMap.locationBlocksTexture; + return TextureMap.LOCATION_BLOCKS_TEXTURE; } private void func_77026_a(Tessellator p_77026_1_, TextureAtlasSprite p_77026_2_) { diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java index 795d2c8ff..5f1f97ba9 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java @@ -49,7 +49,7 @@ public class RenderThornChakram extends Render { @Override protected ResourceLocation getEntityTexture(EntityThornChakram p_110775_1_) { - return TextureMap.locationBlocksTexture; + return TextureMap.LOCATION_BLOCKS_TEXTURE; } private void func_77026_a(Tessellator p_77026_1_, TextureAtlasSprite p_77026_2_, int light) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java index 5e3a5c8de..0b39da56a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -50,7 +50,7 @@ public class RenderTileAlfPortal extends TileEntitySpecialRenderer { GlStateManager.color(1F, 1F, 1F, 1F); ItemStack stack = altar.getItemHandler().getStackInSlot(i); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.GROUND); GlStateManager.popMatrix(); } @@ -104,7 +104,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { } - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); Fluid fluid = lava ? FluidRegistry.LAVA : FluidRegistry.WATER; int brightness = lava ? 240 : -1; float alpha = lava ? 1F : 0.7F; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java index 3f8042106..ba6bd18d0 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -70,7 +70,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { ItemStack stack = avatar.getItemHandler().getStackInSlot(0); if(stack != null) { GlStateManager.pushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); float s = 0.6F; GlStateManager.scale(s, s, s); GlStateManager.translate(-0.5F, 2F, -0.25F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java index 9209c4a70..29d34c824 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -51,7 +51,7 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { if(stack != null) { Minecraft mc = Minecraft.getMinecraft(); GlStateManager.pushMatrix(); - mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); + mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); float s = 0.25F; GlStateManager.scale(s, s, s); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java index 5f67be847..d00fa07f2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java @@ -37,7 +37,7 @@ public class RenderTileCocoon extends TileEntitySpecialRenderer { GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GlStateManager.color(1F, 1F, 1F, 1F); GlStateManager.translate(d0, d1, d2 + 1); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); GlStateManager.translate(0.5F, 0, 0F); GlStateManager.rotate(rot, 1F, 0F, 0F); GlStateManager.translate(-0.5F, 0, 0F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java index 5eaae7487..b49b5dc9b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -53,7 +53,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { boolean fab = pool == null ? forceVariant == PoolVariant.FABULOUS : pool.getWorld().getBlockState(pool.getPos()).getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS; - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); int color = 0xFFFFFF; if (fab) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java index 8a9932b9b..a83817bac 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -33,7 +33,7 @@ public class RenderTilePrism extends TileEntitySpecialRenderer { ItemStack stack = prism.getItemHandler().getStackInSlot(0); if(stack != null) { - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); if(stack.getItem() instanceof ILens) { GlStateManager.pushMatrix(); GlStateManager.rotate(90F, 1F, 0F, 0F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java index 5f49f06a7..67b20389b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -71,7 +71,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { if(ConfigHandler.oldPylonModel) Minecraft.getMinecraft().renderEngine.bindTexture(pink ? texturePinkOld : green ? textureGreenOld : textureOld); - else Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + else Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); double worldTime = pylon.getWorld() == null ? 0 : (double) (ClientTickHandler.ticksInGame + pticks); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java index ea4340052..748d1ca26 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -56,7 +56,7 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer ItemStack stack = spreader.getItemHandler().getStackInSlot(0); if(stack != null) { - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); ILens lens = (ILens) stack.getItem(); GlStateManager.pushMatrix(); GlStateManager.translate(-0.0F, -1F, -0.4375F); @@ -97,9 +97,9 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer } if(spreader.paddingColor != -1) { - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); - IBlockState carpet = Blocks.carpet.getDefaultState().withProperty(BlockCarpet.COLOR, EnumDyeColor.byMetadata(spreader.paddingColor)); + IBlockState carpet = Blocks.CARPET.getDefaultState().withProperty(BlockCarpet.COLOR, EnumDyeColor.byMetadata(spreader.paddingColor)); GlStateManager.translate(-0.5F, -0.5F, 0.5F); float f = 1 / 16F; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java index 55e2c352b..a2880fe7d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java @@ -51,7 +51,7 @@ public class RenderTileTerraPlate extends TileEntitySpecialRenderer= 4 && world.getBlockLightOpacity(pos1.up()) <= 2) + if(world.getBlockState(pos1).getBlock() == Blocks.DIRT && world.getBlockState(pos1).getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT && world.getLight(pos1.up()) >= 4 && world.getBlockLightOpacity(pos1.up()) <= 2) world.setBlockState(pos1, this.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, variant), 1 | 2); } } @@ -99,7 +99,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { @Override public Item getItemDropped(IBlockState state, Random p_149650_2_, int p_149650_3_) { - return Blocks.dirt.getItemDropped(state, p_149650_2_, p_149650_3_); + return Blocks.DIRT.getItemDropped(state, p_149650_2_, p_149650_3_); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 9b966adac..125009bba 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -60,7 +60,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { private final Random random = new Random(); protected BlockAltar() { - super(Material.rock, LibBlockNames.ALTAR); + super(Material.ROCK, LibBlockNames.ALTAR); setHardness(3.5F); setSoundType(SoundType.STONE); setDefaultState(blockState.getBaseState() @@ -146,7 +146,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { if(stackAt != null) { ItemStack copy = stackAt.copy(); if(!par5EntityPlayer.inventory.addItemStackToInventory(copy)) - par5EntityPlayer.dropPlayerItemWithRandomChoice(copy, false); + par5EntityPlayer.dropItem(copy, false); tile.getItemHandler().setStackInSlot(i, null); par1World.updateComparatorOutputLevel(pos, this); break; @@ -168,7 +168,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { } return true; - } else if(stack != null && stack.getItem() == Items.lava_bucket) { + } else if(stack != null && stack.getItem() == Items.LAVA_BUCKET) { if(!par5EntityPlayer.capabilities.isCreativeMode) par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, getContainer(stack)); @@ -178,13 +178,13 @@ public class BlockAltar extends BlockMod implements ILexiconable { par1World.checkLight(pos); return true; - } else if(stack != null && stack.getItem() == Items.bucket && (tile.hasWater || tile.hasLava) && !Botania.gardenOfGlassLoaded) { - ItemStack bucket = tile.hasLava ? new ItemStack(Items.lava_bucket) : new ItemStack(Items.water_bucket); + } else if(stack != null && stack.getItem() == Items.BUCKET && (tile.hasWater || tile.hasLava) && !Botania.gardenOfGlassLoaded) { + ItemStack bucket = tile.hasLava ? new ItemStack(Items.LAVA_BUCKET) : new ItemStack(Items.WATER_BUCKET); if(stack.stackSize == 1) par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, bucket); else { if(!par5EntityPlayer.inventory.addItemStackToInventory(bucket)) - par5EntityPlayer.dropPlayerItemWithRandomChoice(bucket, false); + par5EntityPlayer.dropItem(bucket, false); stack.stackSize--; } @@ -234,7 +234,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { private ItemStack getContainer(ItemStack stack) { if(stack.getItem() == ModItems.waterBowl) - return new ItemStack(Items.bowl); + return new ItemStack(Items.BOWL); if (stack.getItem().hasContainerItem(stack)) return stack.getItem().getContainerItem(stack); diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 8aa9b4ade..84ce2d9d9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -46,7 +46,7 @@ public class BlockAvatar extends BlockMod implements ILexiconable { private final Random random = new Random(); protected BlockAvatar() { - super(Material.wood, LibBlockNames.AVATAR); + super(Material.WOOD, LibBlockNames.AVATAR); setHardness(2.0F); setSoundType(SoundType.WOOD); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.NORTH)); @@ -85,7 +85,7 @@ public class BlockAvatar extends BlockMod implements ILexiconable { ItemStack copyStack = stackOnAvatar.copy(); avatar.getItemHandler().setStackInSlot(0, null); if(!player.inventory.addItemStackToInventory(copyStack)) - player.dropPlayerItemWithRandomChoice(copyStack, true); + player.dropItem(copyStack, true); return true; } else if(stackOnPlayer != null && stackOnPlayer.getItem() instanceof IAvatarWieldable) { ItemStack copyStack = stackOnPlayer.copy(); diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index fc8a7347a..7d2258124 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -36,7 +36,7 @@ import java.util.Random; public class BlockBifrost extends BlockMod implements ILexiconable { public BlockBifrost() { - super(Material.glass, LibBlockNames.BIFROST); + super(Material.GLASS, LibBlockNames.BIFROST); setLightOpacity(0); setLightLevel(1F); setBlockUnbreakable(); diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index 175797327..a4f28eb2d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -31,7 +31,7 @@ import java.util.Random; public class BlockBifrostPerm extends BlockMod implements ILexiconable { public BlockBifrostPerm() { - super(Material.glass, LibBlockNames.BIFROST_PERM); + super(Material.GLASS, LibBlockNames.BIFROST_PERM); setLightOpacity(0); setHardness(0.3F); setLightLevel(1F); diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index 4d83eab05..d86838667 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -31,7 +31,7 @@ import java.util.List; public class BlockCacophonium extends BlockMod { protected BlockCacophonium() { - super(Material.wood, LibBlockNames.CACOPHONIUM); + super(Material.WOOD, LibBlockNames.CACOPHONIUM); setHardness(0.8F); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @@ -62,7 +62,7 @@ public class BlockCacophonium extends BlockMod { } @Override - public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { + public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) { boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; boolean powered = state.getValue(BotaniaStateProps.POWERED); @@ -100,7 +100,7 @@ public class BlockCacophonium extends BlockMod { TileEntity tile = world.getTileEntity(pos); if(tile != null && tile instanceof TileCacophonium) { - stacks.add(new ItemStack(Blocks.noteblock)); + stacks.add(new ItemStack(Blocks.NOTEBLOCK)); ItemStack thingy = ((TileCacophonium) tile).stack; if(thingy != null) stacks.add(thingy.copy()); diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index 3d3b0b3f3..6eb8c0ec2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -53,7 +53,7 @@ public abstract class BlockCamo extends BlockMod { TileCamo camo = (TileCamo) tile; IBlockState changeState = Block.getBlockFromItem(currentStack.getItem()).onBlockPlaced(par1World, pos, side, hitX, hitY, hitZ, currentStack.getItemDamage(), par5EntityPlayer); - if(isValidBlock(changeState) && !(changeState.getBlock() instanceof BlockCamo) && changeState.getMaterial() != Material.air) { + if(isValidBlock(changeState) && !(changeState.getBlock() instanceof BlockCamo) && changeState.getMaterial() != Material.AIR) { camo.camoState = changeState; par1World.notifyBlockUpdate(pos, state, state, 8); diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index 876608650..96023f2fa 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -31,7 +31,7 @@ import java.util.List; public class BlockCell extends BlockMod implements ILexiconable { public BlockCell() { - super(Material.gourd, LibBlockNames.CELL_BLOCK); + super(Material.GOURD, LibBlockNames.CELL_BLOCK); setSoundType(SoundType.CLOTH); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index 45d9c465c..cb310056f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -38,7 +38,7 @@ public class BlockCocoon extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 0, 3.0/16, 0.125, 0.875, 0.125); protected BlockCocoon() { - super(Material.cloth, LibBlockNames.COCOON); + super(Material.CLOTH, LibBlockNames.COCOON); setHardness(3.0F); setResistance(50.0F); setSoundType(SoundType.CLOTH); @@ -67,11 +67,11 @@ public class BlockCocoon extends BlockMod implements ILexiconable { @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack item, EnumFacing s, float xs, float ys, float zs) { TileCocoon cocoon = (TileCocoon) world.getTileEntity(pos); - if(cocoon.emeraldsGiven < TileCocoon.MAX_EMERALDS && item != null && item.getItem() == Items.emerald) { + if(cocoon.emeraldsGiven < TileCocoon.MAX_EMERALDS && item != null && item.getItem() == Items.EMERALD) { if(!player.capabilities.isCreativeMode) item.stackSize--; cocoon.emeraldsGiven++; - world.playAuxSFX(2005, pos, 6 + world.rand.nextInt(4)); + world.playEvent(2005, pos, 6 + world.rand.nextInt(4)); } return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index ab0739669..0fd921571 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -33,7 +33,7 @@ import java.util.Random; public class BlockEnchantedSoil extends BlockMod implements ILexiconable { public BlockEnchantedSoil() { - super(Material.grass, LibBlockNames.ENCHANTED_SOIL); + super(Material.GRASS, LibBlockNames.ENCHANTED_SOIL); setHardness(0.6F); setSoundType(SoundType.PLANT); } @@ -45,7 +45,7 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable { @Override public Item getItemDropped(IBlockState state, Random p_149650_2_, int p_149650_3_) { - return Blocks.dirt.getItemDropped(state, p_149650_2_, p_149650_3_); + return Blocks.DIRT.getItemDropped(state, p_149650_2_, p_149650_3_); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index 7dced8a07..755760ddf 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -31,7 +31,7 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockEnderEye extends BlockMod implements ILexiconable { protected BlockEnderEye() { - super(Material.iron, LibBlockNames.ENDER_EYE_BLOCK); + super(Material.IRON, LibBlockNames.ENDER_EYE_BLOCK); setHardness(3F); setResistance(10F); setSoundType(SoundType.METAL); diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index 0554263b8..0b7ccfcb1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -35,7 +35,7 @@ public class BlockFakeAir extends BlockMod { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 0, 0, 0); public BlockFakeAir() { - super(Material.air, LibBlockNames.FAKE_AIR); + super(Material.AIR, LibBlockNames.FAKE_AIR); setTickRandomly(true); } @@ -53,7 +53,7 @@ public class BlockFakeAir extends BlockMod { public void registerItemForm() {} @Override - public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { + public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) { if(shouldRemove(world, pos)) world.scheduleUpdate(pos, this, tickRate(world)); } @@ -65,7 +65,7 @@ public class BlockFakeAir extends BlockMod { @Override public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { if(shouldRemove(world, pos)) - world.setBlockState(pos, Blocks.water.getDefaultState()); + world.setBlockState(pos, Blocks.WATER.getDefaultState()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index b2898c3c7..6c2c9c1f1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -38,7 +38,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { private static final String TAG_FEL_SPAWNED = "Botania-FelSpawned"; public BlockFelPumpkin() { - super(Material.gourd, LibBlockNames.FEL_PUMPKIN); + super(Material.GOURD, LibBlockNames.FEL_PUMPKIN); setHardness(1F); setSoundType(SoundType.WOOD); MinecraftForge.EVENT_BUS.register(this); @@ -64,17 +64,17 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { public void onBlockAdded(World p_149726_1_, BlockPos pos, IBlockState state) { super.onBlockAdded(p_149726_1_, pos, state); - if(!p_149726_1_.isRemote && p_149726_1_.getBlockState(pos.down()).getBlock() == Blocks.iron_bars && p_149726_1_.getBlockState(pos.down(2)).getBlock() == Blocks.iron_bars) { - p_149726_1_.setBlockState(pos, Blocks.air.getDefaultState(), 2); - p_149726_1_.setBlockState(pos.down(), Blocks.air.getDefaultState(), 2); - p_149726_1_.setBlockState(pos.down(2), Blocks.air.getDefaultState(), 2); + if(!p_149726_1_.isRemote && p_149726_1_.getBlockState(pos.down()).getBlock() == Blocks.IRON_BARS && p_149726_1_.getBlockState(pos.down(2)).getBlock() == Blocks.IRON_BARS) { + p_149726_1_.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); + p_149726_1_.setBlockState(pos.down(), Blocks.AIR.getDefaultState(), 2); + p_149726_1_.setBlockState(pos.down(2), Blocks.AIR.getDefaultState(), 2); EntityBlaze blaze = new EntityBlaze(p_149726_1_); blaze.setLocationAndAngles(pos.getX() + 0.5D, pos.getY() - 1.95D, pos.getZ() + 0.5D, 0.0F, 0.0F); blaze.getEntityData().setBoolean(TAG_FEL_SPAWNED, true); p_149726_1_.spawnEntityInWorld(blaze); - p_149726_1_.notifyNeighborsOfStateChange(pos, Blocks.air); - p_149726_1_.notifyNeighborsOfStateChange(pos.down(), Blocks.air); - p_149726_1_.notifyNeighborsOfStateChange(pos.down(2), Blocks.air); + p_149726_1_.notifyNeighborsOfStateChange(pos, Blocks.AIR); + p_149726_1_.notifyNeighborsOfStateChange(pos.down(), Blocks.AIR); + p_149726_1_.notifyNeighborsOfStateChange(pos.down(2), Blocks.AIR); } } @@ -87,11 +87,11 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { public void onDrops(LivingDropsEvent event) { if(event.getEntityLiving() instanceof EntityBlaze && event.getEntityLiving().getEntityData().getBoolean(TAG_FEL_SPAWNED)) if(event.getDrops().isEmpty()) - event.getDrops().add(new EntityItem(event.getEntityLiving().worldObj, event.getEntityLiving().posX, event.getEntityLiving().posY, event.getEntityLiving().posZ, new ItemStack(Items.blaze_powder, 6))); + event.getDrops().add(new EntityItem(event.getEntityLiving().worldObj, event.getEntityLiving().posX, event.getEntityLiving().posY, event.getEntityLiving().posZ, new ItemStack(Items.BLAZE_POWDER, 6))); else for(EntityItem item : event.getDrops()) { ItemStack stack = item.getEntityItem(); - if(stack.getItem() == Items.blaze_rod) - item.setEntityItemStack(new ItemStack(Items.blaze_powder, stack.stackSize * 10)); + if(stack.getItem() == Items.BLAZE_ROD) + item.setEntityItemStack(new ItemStack(Items.BLAZE_POWDER, stack.stackSize * 10)); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 5709ef7a1..d557571af 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -179,8 +179,8 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public boolean onBlockEventReceived(World par1World, BlockPos pos, IBlockState state, int eventID, int value) { - super.onBlockEventReceived(par1World, pos, state, eventID, value); + public boolean eventReceived(IBlockState state, World par1World, BlockPos pos, int eventID, int value) { + super.eventReceived(state, par1World, pos, eventID, value); TileEntity tileentity = par1World.getTileEntity(pos); return tileentity != null ? tileentity.receiveClientEvent(eventID, value) : false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index 42130f47b..7a943fdcf 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -31,7 +31,7 @@ public class BlockForestEye extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0.25, 0.25, 0.75, 0.75, 0.75); public BlockForestEye() { - super(Material.iron, LibBlockNames.FOREST_EYE); + super(Material.IRON, LibBlockNames.FOREST_EYE); setHardness(5.0F); setResistance(10.0F); setSoundType(SoundType.METAL); diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index d70e13fc5..8dc6e386b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -76,7 +76,7 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { else if(block instanceof BlockRailBase || block == ModBlocks.dreamwood) { event.getEntity().getEntityData().setInteger(TAG_FLOAT_TICKS, 0); if(floatTicks > 0) - event.getEntity().worldObj.playAuxSFX(2003, entPos, 0); + event.getEntity().worldObj.playEvent(2003, entPos, 0); } floatTicks = event.getEntity().getEntityData().getInteger(TAG_FLOAT_TICKS); @@ -90,7 +90,7 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { event.getEntity().motionX *= 1.4; event.getEntity().motionZ *= 1.4; event.getEntity().getEntityData().setInteger(TAG_FLOAT_TICKS, floatTicks - 1); - event.getEntity().worldObj.playAuxSFX(2000, entPos, 0); + event.getEntity().worldObj.playEvent(2000, entPos, 0); } else event.getEntity().noClip = false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index e68d4b9b6..daf14fc4e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -52,7 +52,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, private final Random random = new Random(); protected BlockHourglass() { - super(Material.iron, LibBlockNames.HOURGLASS); + super(Material.IRON, LibBlockNames.HOURGLASS); setHardness(2.0F); setSoundType(SoundType.METAL); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); @@ -99,7 +99,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, } else if(hgStack != null) { ItemStack copy = hgStack.copy(); if(!player.inventory.addItemStackToInventory(copy)) - player.dropPlayerItemWithRandomChoice(copy, false); + player.dropItem(copy, false); hourglass.getItemHandler().setStackInSlot(0, null); hourglass.markDirty(); return true; diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index d7d6951fe..3834f4d81 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -39,7 +39,7 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { private static final AxisAlignedBB Z_AABB = new AxisAlignedBB(0.125, 0, 0.375, 0.875, 1/16.0, 0.625); protected BlockIncensePlate() { - super(Material.wood, LibBlockNames.INCENSE_PLATE); + super(Material.WOOD, LibBlockNames.INCENSE_PLATE); setHardness(2.0F); setSoundType(SoundType.WOOD); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); @@ -77,14 +77,14 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { stack.stackSize--; did = true; } else if(plateStack != null && !plate.burning) { - if(stack != null && stack.getItem() == Items.flint_and_steel) { + if(stack != null && stack.getItem() == Items.FLINT_AND_STEEL) { plate.ignite(); stack.damageItem(1, player); did = true; } else { ItemStack addStack = plateStack.copy(); if(!player.inventory.addItemStackToInventory(addStack)) - player.dropPlayerItemWithRandomChoice(addStack, false); + player.dropItem(addStack, false); plate.getItemHandler().setStackInSlot(0, null); did = true; diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index aa8f11037..efeb374ab 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -41,7 +41,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.25, 1); public BlockLightLauncher() { - super(Material.wood, LibBlockNames.LIGHT_LAUNCHER); + super(Material.WOOD, LibBlockNames.LIGHT_LAUNCHER); setHardness(2.0F); setSoundType(SoundType.WOOD); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); @@ -83,7 +83,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { } @Override - public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { + public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) { boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0|| world.isBlockIndirectlyGettingPowered(pos.up()) > 0; boolean powered = state.getValue(BotaniaStateProps.POWERED); diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index a11022792..b21bee92a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -44,7 +44,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable private static final AxisAlignedBB AABB = new AxisAlignedBB(5.0/16, 5.0/16, 5.0/16, 11.0/16, 11.0/16, 11.0/16); protected BlockLightRelay() { - super(Material.glass, LibBlockNames.LIGHT_RELAY); + super(Material.GLASS, LibBlockNames.LIGHT_RELAY); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LUMINIZER_VARIANT, LuminizerVariant.DEFAULT).withProperty(BotaniaStateProps.POWERED, false)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index 50d310335..4c96cc7c6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -35,7 +35,7 @@ import java.util.List; public class BlockLivingrock extends BlockMod implements ILexiconable { public BlockLivingrock() { - super(Material.rock, LibBlockNames.LIVING_ROCK); + super(Material.ROCK, LibBlockNames.LIVING_ROCK); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index 53777abf1..b1621987c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -40,7 +40,7 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { } public BlockLivingwood(String name) { - super(Material.wood, name); + super(Material.WOOD, name); setHardness(2.0F); setSoundType(SoundType.WOOD); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.DEFAULT)); diff --git a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java index b79373b76..d0e0bdebe 100644 --- a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java +++ b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java @@ -32,7 +32,7 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockManaBomb extends BlockMod implements IManaTrigger, ILexiconable, ICraftAchievement { public BlockManaBomb() { - super(Material.wood, LibBlockNames.MANA_BOMB); + super(Material.WOOD, LibBlockNames.MANA_BOMB); setHardness(12.0F); setSoundType(SoundType.WOOD); } @@ -40,7 +40,7 @@ public class BlockManaBomb extends BlockMod implements IManaTrigger, ILexiconabl @Override public void onBurstCollision(IManaBurst burst, World world, BlockPos pos) { if(!burst.isFake() && !world.isRemote) { - world.playAuxSFX(2001, pos, Block.getStateId(this.getDefaultState())); + world.playEvent(2001, pos, Block.getStateId(this.getDefaultState())); world.setBlockToAir(pos); EntityManaStorm storm = new EntityManaStorm(world); storm.setPosition(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index f0769c3a3..0987ae281 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -111,7 +111,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I //if (blockdoubleplant$enumplanttype != BlockDoublePlant.EnumPlantType.FERN && blockdoubleplant$enumplanttype != BlockDoublePlant.EnumPlantType.GRASS) { // worldIn.destroyBlock(pos.down(), true); //} else if (!world.isRemote) { - // if (player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == Items.shears) { + // if (player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == Items.SHEARS) { // this.onHarvest(worldIn, pos, iblockstate, player); // world.setBlockToAir(pos.down()); // } else { @@ -125,7 +125,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I } } } else if(player.capabilities.isCreativeMode && world.getBlockState(pos.up()).getBlock() == this) - world.setBlockState(pos.up(), Blocks.air.getDefaultState(), 2); + world.setBlockState(pos.up(), Blocks.AIR.getDefaultState(), 2); player.addStat(StatList.getBlockStats(this)); //super.onBlockHarvested(p_149681_1_, p_149681_2_, p_149681_3_, p_149681_4_, p_149681_5_, p_149681_6_); } diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index a9dce4157..b33192476 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -52,7 +52,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, Random random; public BlockOpenCrate() { - super(Material.wood, LibBlockNames.OPEN_CRATE); + super(Material.WOOD, LibBlockNames.OPEN_CRATE); setHardness(2.0F); setSoundType(SoundType.WOOD); setDefaultState(blockState.getBaseState() diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 993f2692b..470080636 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -67,7 +67,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl private final TObjectIntHashMap coordsToCheck = new TObjectIntHashMap<>(10, 0.5F, -1); public BlockPistonRelay() { - super(Material.gourd, LibBlockNames.PISTON_RELAY); + super(Material.GOURD, LibBlockNames.PISTON_RELAY); setHardness(2F); setResistance(10F); setSoundType(SoundType.METAL); @@ -114,7 +114,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl private IBlockState getStateAt(DimWithPos key) { MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); if(server == null) - return Blocks.air.getDefaultState(); + return Blocks.AIR.getDefaultState(); return server.worldServerForDimension(key.dim).getBlockState(key.blockPos); } @@ -129,7 +129,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } else { spawnAsEntity(world, pos, new ItemStack(this)); world.setBlockToAir(pos); - world.playAuxSFX(2001, pos, Block.getStateId(getDefaultState())); + world.playEvent(2001, pos, Block.getStateId(getDefaultState())); } return true; @@ -171,16 +171,17 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { for(DimWithPos s : ((BlockPistonRelay) (ModBlocks.pistonRelay)).mappedPositions.keySet()) nbttagcompound.setString(s.toString(), ((BlockPistonRelay) (ModBlocks.pistonRelay)).mappedPositions.get(s).toString()); + return nbttagcompound; } public static WorldData get(World world) { if(world.getMapStorage() == null) return null; - WorldData data = (WorldData) world.getMapStorage().loadData(WorldData.class, ID); + WorldData data = (WorldData) world.getMapStorage().getOrLoadData(WorldData.class, ID); if (data == null) { data = new WorldData(ID); @@ -200,7 +201,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl continue; Block block = getBlockAt(s); - if(block == Blocks.piston_extension) { + if(block == Blocks.PISTON_EXTENSION) { IBlockState state = getStateAt(s); boolean sticky = BlockPistonExtension.EnumPistonType.STICKY == state.getValue(BlockPistonMoving.TYPE); EnumFacing dir = state.getValue(BlockPistonMoving.FACING); @@ -237,7 +238,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl if(!sticky && tile == null && mat.getMobilityFlag() == EnumPushReaction.NORMAL && srcState.getBlockHardness(world, pos2) != -1 && !srcState.getBlock().isAir(srcState, world, pos2)) { Material destMat = world.getBlockState(pos2.offset(dir)).getMaterial(); if(world.isAirBlock(pos2.offset(dir)) || destMat.isReplaceable()) { - world.setBlockState(pos2, Blocks.air.getDefaultState()); + world.setBlockState(pos2, Blocks.AIR.getDefaultState()); world.setBlockState(pos2.offset(dir), srcState, 1 | 2); mappedPositions.put(s, new DimWithPos(world.provider.getDimension(), pos2.offset(dir))); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index b010855b3..e50d821ed 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -47,7 +47,7 @@ import java.util.List; public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable { public BlockPlatform() { - super(Material.wood, LibBlockNames.PLATFORM); + super(Material.WOOD, LibBlockNames.PLATFORM); setHardness(2.0F); setResistance(5.0F); setSoundType(SoundType.WOOD); diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 43a2e15a1..82cfa82e5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -45,7 +45,7 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi private static final AxisAlignedBB AABB = new AxisAlignedBB(0.125, 0, 0.125, 0.875, 21.0/16, 0.875); public BlockPylon() { - super(Material.iron, LibBlockNames.PYLON); + super(Material.IRON, LibBlockNames.PYLON); setHardness(5.5F); setSoundType(SoundType.METAL); setLightLevel(0.5F); diff --git a/src/main/java/vazkii/botania/common/block/BlockRoot.java b/src/main/java/vazkii/botania/common/block/BlockRoot.java index 6c1f92cbf..49a976814 100644 --- a/src/main/java/vazkii/botania/common/block/BlockRoot.java +++ b/src/main/java/vazkii/botania/common/block/BlockRoot.java @@ -30,7 +30,7 @@ import java.util.Random; public class BlockRoot extends BlockMod implements ILexiconable { public BlockRoot() { - super(Material.plants, LibBlockNames.ROOT); + super(Material.PLANTS, LibBlockNames.ROOT); setHardness(1.2F); setSoundType(SoundType.WOOD); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index 00713f5c6..536eb44e9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -58,7 +58,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(Blocks.vine); + return new ItemStack(Blocks.VINE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 48866e0a3..beafa1cec 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -44,7 +44,7 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { private final Random random = new Random(); public BlockSparkChanger() { - super(Material.rock, LibBlockNames.SPARK_CHANGER); + super(Material.ROCK, LibBlockNames.SPARK_CHANGER); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); @@ -87,7 +87,7 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { } @Override - public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { + public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) { boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; boolean powered = state.getValue(BotaniaStateProps.POWERED); @@ -107,7 +107,7 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { world.updateComparatorOutputLevel(pos, this); changer.markDirty(); if(!player.inventory.addItemStackToInventory(cstack)) - player.dropPlayerItemWithRandomChoice(cstack, false); + player.dropItem(cstack, false); return true; } else if(pstack != null && pstack.getItem() == ModItems.sparkUpgrade) { changer.getItemHandler().setStackInSlot(0, pstack.copy().splitStack(1)); diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index ba27cc36c..d64e8a2e9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -18,8 +18,8 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.particle.EffectRenderer; -import net.minecraft.client.particle.EntityDiggingFX; +import net.minecraft.client.particle.ParticleManager; +import net.minecraft.client.particle.ParticleDigging; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -232,7 +232,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I @Override public boolean canPlaceBlockAt(World world, BlockPos pos) { - return super.canPlaceBlockAt(world, pos) || world.getBlockState(pos.down()).getBlock() == ModBlocks.redStringRelay || world.getBlockState(pos.down()).getBlock() == Blocks.mycelium; + return super.canPlaceBlockAt(world, pos) || world.getBlockState(pos.down()).getBlock() == ModBlocks.redStringRelay || world.getBlockState(pos.down()).getBlock() == Blocks.MYCELIUM; } @Override @@ -274,8 +274,8 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } @Override - public boolean onBlockEventReceived(World par1World, BlockPos pos, IBlockState state, int par5, int par6) { - super.onBlockEventReceived(par1World, pos, state, par5, par6); + public boolean eventReceived(IBlockState state, World par1World, BlockPos pos, int par5, int par6) { + super.eventReceived(state, par1World, pos, par5, par6); TileEntity tileentity = par1World.getTileEntity(pos); return tileentity != null ? tileentity.receiveClientEvent(par5, par6) : false; } @@ -336,23 +336,23 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I d0 = 2.5D; } int i = (int)(150.0D * d0); - worldObj.spawnParticle(EnumParticleTypes.BLOCK_DUST, entity.posX, entity.posY, entity.posZ, i, 0.0D, 0.0D, 0.0D, 0.15000000596046448D, Block.getStateId(Blocks.waterlily.getDefaultState())); + worldObj.spawnParticle(EnumParticleTypes.BLOCK_DUST, entity.posX, entity.posY, entity.posZ, i, 0.0D, 0.0D, 0.0D, 0.15000000596046448D, Block.getStateId(Blocks.WATERLILY.getDefaultState())); return true; } @Override @SideOnly(Side.CLIENT) - public boolean addDestroyEffects(World world, BlockPos pos, EffectRenderer effectRenderer) { + public boolean addDestroyEffects(World world, BlockPos pos, ParticleManager effectRenderer) { if (world.getBlockState(pos).getBlock() == this) { int i = 4; - EntityDiggingFX.Factory factory = new EntityDiggingFX.Factory(); + ParticleDigging.Factory factory = new ParticleDigging.Factory(); for (int j = 0; j < i; ++j) { for (int k = 0; k < i; ++k) { for (int l = 0; l < i; ++l) { double d0 = (double)pos.getX() + ((double)j + 0.5D) / (double)i; double d1 = (double)pos.getY() + ((double)k + 0.5D) / (double)i; double d2 = (double)pos.getZ() + ((double)l + 0.5D) / (double)i; - effectRenderer.addEffect(factory.getEntityFX(-1, world, d0, d1, d2, d0 - (double)pos.getX() - 0.5D, d1 - (double)pos.getY() - 0.5D, d2 - (double)pos.getZ() - 0.5D, Block.getStateId(Blocks.waterlily.getDefaultState()))); + effectRenderer.addEffect(factory.getEntityFX(-1, world, d0, d1, d2, d0 - (double)pos.getX() - 0.5D, d1 - (double)pos.getY() - 0.5D, d2 - (double)pos.getZ() - 0.5D, Block.getStateId(Blocks.WATERLILY.getDefaultState()))); } } } diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 78626cf61..91cf39c3f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -35,7 +35,7 @@ import java.util.List; public class BlockStorage extends BlockMod implements ILexiconable { public BlockStorage() { - super(Material.iron, LibBlockNames.STORAGE); + super(Material.IRON, LibBlockNames.STORAGE); setHardness(3F); setResistance(10F); setSoundType(SoundType.METAL); diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 966e2e790..9d44f711e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -37,7 +37,7 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0.01, 0.25, 0.75, 0.99, 0.75); public BlockTeruTeruBozu() { - super(Material.cloth, LibBlockNames.TERU_TERU_BOZU); + super(Material.CLOTH, LibBlockNames.TERU_TERU_BOZU); } @Override @@ -69,11 +69,11 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { } private boolean isSunflower(ItemStack stack) { - return stack.getItem() == Item.getItemFromBlock(Blocks.double_plant) && stack.getItemDamage() == 0; + return stack.getItem() == Item.getItemFromBlock(Blocks.DOUBLE_PLANT) && stack.getItemDamage() == 0; } private boolean isBlueOrchid(ItemStack stack) { - return stack.getItem() == Item.getItemFromBlock(Blocks.red_flower) && stack.getItemDamage() == 1; + return stack.getItem() == Item.getItemFromBlock(Blocks.RED_FLOWER) && stack.getItemDamage() == 1; } private boolean removeRain(World world) { diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index da2af91e9..4e7fbd348 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -31,7 +31,7 @@ public class BlockTinyPlanet 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); protected BlockTinyPlanet() { - super(Material.rock, LibBlockNames.TINY_PLANET); + super(Material.ROCK, LibBlockNames.TINY_PLANET); setHardness(20F); setResistance(100F); setSoundType(SoundType.STONE); diff --git a/src/main/java/vazkii/botania/common/block/ModBanners.java b/src/main/java/vazkii/botania/common/block/ModBanners.java index be48a7a24..0e5a137c1 100644 --- a/src/main/java/vazkii/botania/common/block/ModBanners.java +++ b/src/main/java/vazkii/botania/common/block/ModBanners.java @@ -31,12 +31,12 @@ public final class ModBanners { addPattern(clazz, "spark_recessive", "src", new ItemStack(ModItems.sparkUpgrade, 1, 2)); addPattern(clazz, "spark_isolated", "sis", new ItemStack(ModItems.sparkUpgrade, 1, 3)); - addPattern(clazz, "fish", "fis", new ItemStack(Items.fish)); - addPattern(clazz, "axe", "axe", new ItemStack(Items.iron_axe)); - addPattern(clazz, "hoe", "hoe", new ItemStack(Items.iron_hoe)); - addPattern(clazz, "pickaxe", "pik", new ItemStack(Items.iron_pickaxe)); - addPattern(clazz, "shovel", "shv", new ItemStack(Items.iron_shovel)); - addPattern(clazz, "sword", "srd", new ItemStack(Items.iron_sword)); + addPattern(clazz, "fish", "fis", new ItemStack(Items.FISH)); + addPattern(clazz, "axe", "axe", new ItemStack(Items.IRON_AXE)); + addPattern(clazz, "hoe", "hoe", new ItemStack(Items.IRON_HOE)); + addPattern(clazz, "pickaxe", "pik", new ItemStack(Items.IRON_PICKAXE)); + addPattern(clazz, "shovel", "shv", new ItemStack(Items.IRON_SHOVEL)); + addPattern(clazz, "sword", "srd", new ItemStack(Items.IRON_SWORD)); } public static void addPattern(Class> clazz, String name, String id, ItemStack craftingItem) { diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 26f9174d4..61de7cb57 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -381,27 +381,27 @@ public final class ModBlocks { OreDictionary.registerOre(LibOreDict.BLAZE_BLOCK, blazeBlock); // Vanilla OreDict entries - OreDictionary.registerOre("dirt", Blocks.dirt); - OreDictionary.registerOre("grass", Blocks.grass); + OreDictionary.registerOre("dirt", Blocks.DIRT); + OreDictionary.registerOre("grass", Blocks.GRASS); OreDictionary.registerOre("sand", Block.getBlockFromName("sand")); OreDictionary.registerOre("gravel", Block.getBlockFromName("gravel")); - OreDictionary.registerOre("hardenedClay", new ItemStack(Blocks.hardened_clay, 1, OreDictionary.WILDCARD_VALUE)); - OreDictionary.registerOre("snowLayer", Blocks.snow_layer); - OreDictionary.registerOre("mycelium", Blocks.mycelium); - OreDictionary.registerOre("podzol", new ItemStack(Blocks.dirt, 1, 2)); - OreDictionary.registerOre("netherrack", Blocks.netherrack); - OreDictionary.registerOre("soulSand", Blocks.soul_sand); - OreDictionary.registerOre("ice", Blocks.ice); - OreDictionary.registerOre("slabCobblestone", new ItemStack(Blocks.stone_slab, 1, 3)); - OreDictionary.registerOre("chestWood", Blocks.chest); - OreDictionary.registerOre("craftingTableWood", Blocks.crafting_table); - OreDictionary.registerOre(LibOreDict.PRISMARINE_BLOCK, new ItemStack(Blocks.prismarine, 1, OreDictionary.WILDCARD_VALUE)); - OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[3], new ItemStack(Blocks.stone, 1, 1)); - OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[2], new ItemStack(Blocks.stone, 1, 3)); - OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[0], new ItemStack(Blocks.stone, 1, 5)); - OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[7], new ItemStack(Blocks.stone, 1, 2)); - OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[6], new ItemStack(Blocks.stone, 1, 4)); - OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[4], new ItemStack(Blocks.stone, 1, 6)); + OreDictionary.registerOre("hardenedClay", new ItemStack(Blocks.HARDENED_CLAY, 1, OreDictionary.WILDCARD_VALUE)); + OreDictionary.registerOre("snowLayer", Blocks.SNOW_LAYER); + OreDictionary.registerOre("mycelium", Blocks.MYCELIUM); + OreDictionary.registerOre("podzol", new ItemStack(Blocks.DIRT, 1, 2)); + OreDictionary.registerOre("netherrack", Blocks.NETHERRACK); + OreDictionary.registerOre("soulSand", Blocks.SOUL_SAND); + OreDictionary.registerOre("ice", Blocks.ICE); + OreDictionary.registerOre("slabCobblestone", new ItemStack(Blocks.STONE_SLAB, 1, 3)); + OreDictionary.registerOre("chestWood", Blocks.CHEST); + OreDictionary.registerOre("craftingTableWood", Blocks.CRAFTING_TABLE); + OreDictionary.registerOre(LibOreDict.PRISMARINE_BLOCK, new ItemStack(Blocks.PRISMARINE, 1, OreDictionary.WILDCARD_VALUE)); + OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[3], new ItemStack(Blocks.STONE, 1, 1)); + OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[2], new ItemStack(Blocks.STONE, 1, 3)); + OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[0], new ItemStack(Blocks.STONE, 1, 5)); + OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[7], new ItemStack(Blocks.STONE, 1, 2)); + OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[6], new ItemStack(Blocks.STONE, 1, 4)); + OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[4], new ItemStack(Blocks.STONE, 1, 6)); BotaniaAPI.registerPaintableBlock(unstableBlock, BotaniaStateProps.COLOR); BotaniaAPI.registerPaintableBlock(manaBeacon, BotaniaStateProps.COLOR); @@ -414,10 +414,10 @@ public final class ModBlocks { public static void addDispenserBehaviours() { for(Item seed : BotaniaAPI.seeds.keySet()) - BlockDispenser.dispenseBehaviorRegistry.putObject(seed, new BehaviourSeeds(BotaniaAPI.seeds.get(seed))); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.twigWand, new BehaviourWand()); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.poolMinecart, new BehaviourPoolMinecart()); - BlockDispenser.dispenseBehaviorRegistry.putObject(Item.getItemFromBlock(ModBlocks.felPumpkin), new BehaviourFelPumpkin()); + 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()); } private static void initTileEntities() { diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java index b22db5845..ac7700116 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -39,7 +39,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 0, 3.0/16, 13.0/16, 1, 13.0/16); public BlockCorporeaCrystalCube() { - super(Material.iron, LibBlockNames.CORPOREA_CRYSTAL_CUBE); + super(Material.IRON, LibBlockNames.CORPOREA_CRYSTAL_CUBE); setHardness(5.5F); setSoundType(SoundType.METAL); setDefaultState(((IExtendedBlockState) blockState.getBaseState()).withProperty(Properties.AnimationProperty, null).withProperty(Properties.StaticProperty, true)); diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java index fe0507be0..015df8ed6 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -30,7 +30,7 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconable { public BlockCorporeaFunnel() { - super(Material.iron, LibBlockNames.CORPOREA_FUNNEL); + super(Material.IRON, LibBlockNames.CORPOREA_FUNNEL); setHardness(5.5F); setSoundType(SoundType.METAL); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); @@ -52,7 +52,7 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab } @Override - public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { + public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) { boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; boolean powered = state.getValue(BotaniaStateProps.POWERED); diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java index 6161d407e..72ed009ea 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -14,7 +14,7 @@ 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.client.particle.EntityDiggingFX; +import net.minecraft.client.particle.ParticleDigging; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -38,7 +38,7 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconable { public BlockCorporeaIndex() { - super(Material.iron, LibBlockNames.CORPOREA_INDEX); + super(Material.IRON, LibBlockNames.CORPOREA_INDEX); setHardness(5.5F); setSoundType(SoundType.METAL); } @@ -83,11 +83,11 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl @Override @SideOnly(Side.CLIENT) - public boolean addDestroyEffects(World world, BlockPos pos, net.minecraft.client.particle.EffectRenderer effectRenderer) + public boolean addDestroyEffects(World world, BlockPos pos, net.minecraft.client.particle.ParticleManager effectRenderer) { if (world.getBlockState(pos).getBlock() == this) { int i = 4; - EntityDiggingFX.Factory factory = new EntityDiggingFX.Factory(); + ParticleDigging.Factory factory = new ParticleDigging.Factory(); for (int j = 0; j < i; ++j) { for (int k = 0; k < i; ++k) { for (int l = 0; l < i; ++l) { diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java index c8d4ec155..36ce6f65b 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -33,7 +33,7 @@ import java.util.Random; public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexiconable { public BlockCorporeaInterceptor() { - super(Material.iron, LibBlockNames.CORPOREA_INTERCEPTOR); + super(Material.IRON, LibBlockNames.CORPOREA_INTERCEPTOR); setHardness(5.5F); setSoundType(SoundType.METAL); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java index 26dfe65bd..c9856e8f3 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -35,7 +35,7 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockCorporeaRetainer extends BlockMod implements ILexiconable, ICraftAchievement { public BlockCorporeaRetainer() { - super(Material.iron, LibBlockNames.CORPOREA_RETAINER); + super(Material.IRON, LibBlockNames.CORPOREA_RETAINER); setHardness(5.5F); setSoundType(SoundType.METAL); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); @@ -57,7 +57,7 @@ public class BlockCorporeaRetainer extends BlockMod implements ILexiconable, ICr } @Override - public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { + public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) { boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; boolean powered = state.getValue(BotaniaStateProps.POWERED); diff --git a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java index 241b86a8b..fce6084bc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java @@ -36,7 +36,7 @@ import java.util.List; public class Block18Stone extends BlockMod implements ILexiconable { public Block18Stone() { - super(Material.rock, LibBlockNames.STONE); + super(Material.ROCK, LibBlockNames.STONE); setHardness(1.5F); setResistance(10F); setSoundType(SoundType.STONE); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java b/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java index f94c797f0..ec455d41e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java @@ -31,7 +31,7 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockBlaze extends BlockMod implements ILexiconable, IFuelHandler { public BlockBlaze() { - super(Material.iron, LibBlockNames.BLAZE_BLOCK); + super(Material.IRON, LibBlockNames.BLAZE_BLOCK); setHardness(3F); setResistance(10F); setSoundType(SoundType.METAL); @@ -46,7 +46,7 @@ public class BlockBlaze extends BlockMod implements ILexiconable, IFuelHandler { @Override public int getBurnTime(ItemStack fuel) { - return fuel.getItem() == Item.getItemFromBlock(this) ? TileEntityFurnace.getItemBurnTime(new ItemStack(Items.blaze_rod)) * (Botania.gardenOfGlassLoaded ? 5 : 10) : 0; + return fuel.getItem() == Item.getItemFromBlock(this) ? TileEntityFurnace.getItemBurnTime(new ItemStack(Items.BLAZE_ROD)) * (Botania.gardenOfGlassLoaded ? 5 : 10) : 0; } } 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 67cbe11f9..5ecab220a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -36,7 +36,7 @@ import java.util.List; public class BlockCustomBrick extends BlockMod implements ILexiconable { public BlockCustomBrick() { - super(Material.rock, LibBlockNames.CUSTOM_BRICK); + super(Material.ROCK, LibBlockNames.CUSTOM_BRICK); setHardness(2.0F); setResistance(5.0F); setSoundType(SoundType.STONE); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java index 2ea992d16..1a01b2b50 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -47,7 +47,7 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 15F/16F, 1); public BlockDirtPath() { - super(Material.ground, LibBlockNames.DIRT_PATH); + super(Material.GROUND, LibBlockNames.DIRT_PATH); setLightOpacity(255); setHardness(0.6F); setSoundType(SoundType.GROUND); @@ -61,7 +61,7 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { } @Override - public void onEntityCollidedWithBlock(World world, BlockPos pos, Entity entity) { + 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); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java index 6f4e6c4ee..4692f3612 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -36,7 +36,7 @@ import java.util.List; public class BlockEndStoneBrick extends BlockMod implements ILexiconable { public BlockEndStoneBrick() { - super(Material.rock, LibBlockNames.END_STONE_BRICK); + super(Material.ROCK, LibBlockNames.END_STONE_BRICK); setHardness(1.5F); setResistance(10F); setSoundType(SoundType.STONE); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index b155cc2bc..cb0082dce 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -16,8 +16,8 @@ import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.particle.EffectRenderer; -import net.minecraft.client.particle.EntityDiggingFX; +import net.minecraft.client.particle.ParticleManager; +import net.minecraft.client.particle.ParticleDigging; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -74,7 +74,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu } public BlockFloatingFlower(String name) { - super(Material.ground, name); + super(Material.GROUND, name); setHardness(0.5F); setSoundType(SoundType.GROUND); setLightLevel(1F); @@ -132,23 +132,23 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu d0 = 2.5D; } int i = (int)(150.0D * d0); - worldObj.spawnParticle(EnumParticleTypes.BLOCK_DUST, entity.posX, entity.posY, entity.posZ, i, 0.0D, 0.0D, 0.0D, 0.15000000596046448D, Block.getStateId(Blocks.dirt.getDefaultState())); + worldObj.spawnParticle(EnumParticleTypes.BLOCK_DUST, entity.posX, entity.posY, entity.posZ, i, 0.0D, 0.0D, 0.0D, 0.15000000596046448D, Block.getStateId(Blocks.DIRT.getDefaultState())); return true; } @Override @SideOnly(Side.CLIENT) - public boolean addDestroyEffects(World world, BlockPos pos, EffectRenderer effectRenderer) { + public boolean addDestroyEffects(World world, BlockPos pos, ParticleManager effectRenderer) { if (world.getBlockState(pos).getBlock() == this) { int i = 4; - EntityDiggingFX.Factory factory = new EntityDiggingFX.Factory(); + ParticleDigging.Factory factory = new ParticleDigging.Factory(); for (int j = 0; j < i; ++j) { for (int k = 0; k < i; ++k) { for (int l = 0; l < i; ++l) { double d0 = (double)pos.getX() + ((double)j + 0.5D) / (double)i; double d1 = (double)pos.getY() + ((double)k + 0.5D) / (double)i; double d2 = (double)pos.getZ() + ((double)l + 0.5D) / (double)i; - effectRenderer.addEffect(factory.getEntityFX(-1, world, d0, d1, d2, d0 - (double)pos.getX() - 0.5D, d1 - (double)pos.getY() - 0.5D, d2 - (double)pos.getZ() - 0.5D, Block.getStateId(Blocks.dirt.getDefaultState()))); + effectRenderer.addEffect(factory.getEntityFX(-1, world, d0, d1, d2, d0 - (double)pos.getX() - 0.5D, d1 - (double)pos.getY() - 0.5D, d2 - (double)pos.getZ() - 0.5D, Block.getStateId(Blocks.DIRT.getDefaultState()))); } } } @@ -208,7 +208,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu if(stack != null) { IFloatingFlower flower = (IFloatingFlower) world.getTileEntity(pos); IslandType type = null; - if(stack.getItem() == Items.snowball) + if(stack.getItem() == Items.SNOWBALL) type = IslandType.SNOW; else if(stack.getItem() instanceof IFloatingFlowerVariant) { IslandType newType = ((IFloatingFlowerVariant) stack.getItem()).getIslandType(stack); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java index 6cedd0eba..c6766a540 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -41,7 +41,7 @@ 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); + super(Material.IRON, LibBlockNames.MANA_BEACON); setHardness(5.0F); setResistance(10.0F); setSoundType(SoundType.METAL); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java index 31501d333..8240ada6a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -43,7 +43,7 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0.25, 0.25, 0.75, 0.75, 0.75); public BlockManaFlame() { - super(Material.cloth, LibBlockNames.MANA_FLAME); + super(Material.CLOTH, LibBlockNames.MANA_FLAME); setSoundType(SoundType.CLOTH); setLightLevel(1F); } @@ -94,11 +94,11 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing s, float xs, float ys, float zs) { if(WorldTypeSkyblock.isWorldSkyblock(world)) { - if(stack != null && stack.getItem() == Item.getItemFromBlock(Blocks.sapling) && !player.inventory.hasItemStack(new ItemStack(ModItems.lexicon))) { + if(stack != null && stack.getItem() == Item.getItemFromBlock(Blocks.SAPLING) && !player.inventory.hasItemStack(new ItemStack(ModItems.lexicon))) { if(!world.isRemote) stack.stackSize--; if(!player.inventory.addItemStackToInventory(new ItemStack(ModItems.lexicon))) - player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.lexicon), false); + player.dropItem(new ItemStack(ModItems.lexicon), false); return true; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java index 88df54d21..4622ba2d6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -34,7 +34,7 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { } public BlockManaGlass(String name) { - super(Material.glass, name); + super(Material.GLASS, name); setHardness(0.3F); setSoundType(SoundType.GLASS); setLightLevel(1.0F); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index 5318d0c78..9f574d2ef 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -98,7 +98,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis if(pos.getY() >= 0 && pos.getY() < 256) { IBlockState state = world.getBlockState(pos.down()); Block block = state.getBlock(); - return block == Blocks.mycelium || block == Blocks.dirt && state.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.PODZOL || block.canSustainPlant(state, world, pos.down(), EnumFacing.UP, this); + return block == Blocks.MYCELIUM || block == Blocks.DIRT && state.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.PODZOL || block.canSustainPlant(state, world, pos.down(), EnumFacing.UP, this); } return false; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java index ee5b95dc6..86c6883af 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -35,7 +35,7 @@ public class BlockPavement extends BlockMod { public static final int TYPES = 6; public BlockPavement() { - super(Material.rock, LibBlockNames.PAVEMENT); + super(Material.ROCK, LibBlockNames.PAVEMENT); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java index 60c7f09a3..ca018c830 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -35,7 +35,7 @@ import java.util.List; public class BlockPetalBlock extends BlockMod implements ILexiconable { public BlockPetalBlock() { - super(Material.plants, LibBlockNames.PETAL_BLOCK); + super(Material.PLANTS, LibBlockNames.PETAL_BLOCK); setHardness(0.4F); setSoundType(SoundType.PLANT); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java index 0bf75b7c9..62d61c465 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -38,7 +38,7 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { private static final int TYPES = 3; public BlockPrismarine() { - super(Material.rock, LibBlockNames.PRISMARINE); + super(Material.ROCK, LibBlockNames.PRISMARINE); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java index 313a6231b..7832d8cc3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java @@ -35,7 +35,7 @@ import vazkii.botania.common.lib.LibMisc; public class BlockReeds extends BlockRotatedPillar implements ILexiconable { public BlockReeds() { - super(Material.wood); + super(Material.WOOD); setHardness(1.0F); setSoundType(SoundType.WOOD); GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.REED_BLOCK)); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java index 022e4a7ff..6a445f2a7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java @@ -31,7 +31,7 @@ public class BlockSeaLamp extends BlockMod implements ILexiconable { private int coloredLight = -1; public BlockSeaLamp() { - super(Material.glass, LibBlockNames.SEA_LAMP); + super(Material.GLASS, LibBlockNames.SEA_LAMP); setHardness(0.3F); setSoundType(SoundType.GLASS); setLightLevel(1.0F); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java index 00f029673..04b990213 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java @@ -25,7 +25,7 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockShimmerrock extends BlockMod implements ILexiconable { public BlockShimmerrock() { - super(Material.rock, LibBlockNames.SHIMMERROCK); + super(Material.ROCK, LibBlockNames.SHIMMERROCK); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java index 5a4580e90..3d6372d7a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java @@ -25,7 +25,7 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockShimmerwoodPlanks extends BlockMod implements ILexiconable { public BlockShimmerwoodPlanks() { - super(Material.wood, LibBlockNames.SHIMMERWOOD_PLANKS); + super(Material.WOOD, LibBlockNames.SHIMMERWOOD_PLANKS); setHardness(2.0F); setSoundType(SoundType.WOOD); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java index 0d1567078..2c4f1d038 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -35,7 +35,7 @@ public class BlockStarfield extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.25, 1); public BlockStarfield() { - super(Material.iron, LibBlockNames.STARFIELD); + super(Material.IRON, LibBlockNames.STARFIELD); setHardness(5F); setResistance(2000F); setSoundType(SoundType.METAL); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java b/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java index 113f9c092..c63642f0c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java @@ -25,7 +25,7 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockThatch extends BlockMod implements ILexiconable { public BlockThatch() { - super(Material.grass, LibBlockNames.THATCH); + super(Material.GRASS, LibBlockNames.THATCH); setHardness(1.0F); setSoundType(SoundType.PLANT); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index 832e318b1..29b4b2136 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -44,7 +44,7 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.375, 0, 0.375, 0.625, 0.375, 0.625); public BlockTinyPotato() { - super(Material.cloth, LibBlockNames.TINY_POTATO); + super(Material.CLOTH, LibBlockNames.TINY_POTATO); setHardness(0.25F); setDefaultState(blockState.getBaseState() .withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH) diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java index 9e2aa8f59..4b494d6c6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -46,7 +46,7 @@ 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); + super(Material.IRON, LibBlockNames.UNSTABLE_BLOCK); setHardness(5.0F); setResistance(10.0F); setSoundType(SoundType.METAL); diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java index ddd890811..9dfc3fb1a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java @@ -32,7 +32,7 @@ import java.util.List; public class BlockBiomeStone extends BlockMod implements ILexiconable { public BlockBiomeStone(String name) { - super(Material.rock, name); + super(Material.ROCK, name); setHardness(1.5F); setResistance(10F); setSoundType(SoundType.STONE); diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java index 88720489e..0aaa5f4a9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java @@ -27,7 +27,7 @@ import vazkii.botania.common.lib.LibMisc; public class BlockModPane extends BlockPane { public BlockModPane(Block source) { - super(Material.glass, false); + super(Material.GLASS, false); // Backward compat don't kill me String name = source.getUnlocalizedName().replaceAll("tile.", "") + "Pane"; GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java index c7a4ef0c2..27e7ac958 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java @@ -40,7 +40,7 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { public final String type; public BlockSpecialQuartz(String type) { - super(Material.rock, "quartzType" + type); + super(Material.ROCK, "quartzType" + type); this.type = type; setHardness(0.8F); setResistance(10F); diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java index bf469ada8..04e882d07 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java @@ -32,7 +32,7 @@ public class BlockSpecialQuartzSlab extends BlockModSlab { Block source; public BlockSpecialQuartzSlab(Block source, boolean par2) { - super(par2, Material.rock, "quartzSlab" + ((BlockSpecialQuartz) source).type + (par2 ? "Full" : "Half")); + super(par2, Material.ROCK, "quartzSlab" + ((BlockSpecialQuartz) source).type + (par2 ? "Full" : "Half")); setHardness(0.8F); setResistance(10F); this.source = source; diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java index cba64a4fd..0036a9b7d 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java @@ -21,8 +21,8 @@ public class BehaviourFelPumpkin extends BehaviorDefaultDispenseItem { BlockPos blockpos = source.getBlockPos().offset(BlockDispenser.getFacing(source.getBlockMetadata())); Block blockpumpkin = ModBlocks.felPumpkin; - if (world.isAirBlock(blockpos) && world.getBlockState(blockpos.down()).getBlock() == Blocks.iron_bars - && world.getBlockState(blockpos.down(2)).getBlock() == Blocks.iron_bars) // Botania - Check for iron bars + if (world.isAirBlock(blockpos) && world.getBlockState(blockpos.down()).getBlock() == Blocks.IRON_BARS + && world.getBlockState(blockpos.down(2)).getBlock() == Blocks.IRON_BARS) // Botania - Check for iron bars { if (!world.isRemote) { @@ -44,11 +44,11 @@ public class BehaviourFelPumpkin extends BehaviorDefaultDispenseItem { { if (this.field_179241_b) { - source.getWorld().playAuxSFX(1000, source.getBlockPos(), 0); + source.getWorld().playEvent(1000, source.getBlockPos(), 0); } else { - source.getWorld().playAuxSFX(1001, source.getBlockPos(), 0); + source.getWorld().playEvent(1001, source.getBlockPos(), 0); } } } diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java index f272cfdbd..ea51194f6 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java @@ -39,7 +39,7 @@ public class BehaviourPoolMinecart extends BehaviorDefaultDispenseItem { if(BlockRailBase.isRailBlock(state)) d3 = 0.0D; else { - if(state.getMaterial() != Material.air || !BlockRailBase.isRailBlock(world.getBlockState(pos.down()))) + if(state.getMaterial() != Material.AIR || !BlockRailBase.isRailBlock(world.getBlockState(pos.down()))) return super.dispenseStack(p_82487_1_, p_82487_2_); d3 = -1.0D; @@ -57,7 +57,7 @@ public class BehaviourPoolMinecart extends BehaviorDefaultDispenseItem { @Override protected void playDispenseSound(IBlockSource p_82485_1_) { - p_82485_1_.getWorld().playAuxSFX(1000, p_82485_1_.getBlockPos(), 0); + p_82485_1_.getWorld().playEvent(1000, p_82485_1_.getBlockPos(), 0); } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java index 4a269f1f2..a23d16a86 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java @@ -34,7 +34,7 @@ public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoo } public BlockAlchemyCatalyst(String name) { - super(Material.rock, name); + super(Material.ROCK, name); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java index 5a1043cab..397d77158 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -39,7 +39,7 @@ public class BlockBellows extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.1875, 0, 0.1875, 1-0.1875, 10.0 / 16, 1-0.1875); public BlockBellows() { - super(Material.wood, LibBlockNames.BELLOWS); + super(Material.WOOD, LibBlockNames.BELLOWS); setHardness(2.0F); setSoundType(SoundType.WOOD); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java index c15fcf258..8b0660b5f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -47,7 +47,7 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { private final Random random = new Random(); public BlockBrewery() { - super(Material.rock, LibBlockNames.BREWERY); + super(Material.ROCK, LibBlockNames.BREWERY); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); @@ -85,7 +85,7 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { if(stackAt != null) { ItemStack copy = stackAt.copy(); if(!par5EntityPlayer.inventory.addItemStackToInventory(copy)) - par5EntityPlayer.dropPlayerItemWithRandomChoice(copy, false); + par5EntityPlayer.dropItem(copy, false); brew.getItemHandler().setStackInSlot(i, null); par1World.updateComparatorOutputLevel(pos, this); break; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java index 7e967a0ff..61bb50f13 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -28,7 +28,7 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockDistributor extends BlockMod implements ILexiconable { public BlockDistributor() { - super(Material.rock, LibBlockNames.DISTRIBUTOR); + super(Material.ROCK, LibBlockNames.DISTRIBUTOR); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index 77f7ea6a2..4fe8cea7e 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -47,7 +47,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, private final Random random = new Random(); public BlockEnchanter() { - super(Material.rock, LibBlockNames.ENCHANTER); + super(Material.ROCK, LibBlockNames.ENCHANTER); setHardness(3.0F); setResistance(5.0F); setLightLevel(1.0F); @@ -91,7 +91,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, @Override public Item getItemDropped(IBlockState state, Random p_149650_2_, int p_149650_3_) { - return Item.getItemFromBlock(Blocks.lapis_block); + return Item.getItemFromBlock(Blocks.LAPIS_BLOCK); } @Override @@ -105,7 +105,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, if(stack != null && stack.getItem() == ModItems.twigWand) return false; - boolean stackEnchantable = stack != null && stack.getItem() != Items.book && stack.isItemEnchantable() && stack.stackSize == 1 && stack.getItem().getItemEnchantability(stack) > 0; + boolean stackEnchantable = stack != null && stack.getItem() != Items.BOOK && stack.isItemEnchantable() && stack.stackSize == 1 && stack.getItem().getItemEnchantability(stack) > 0; if(enchanter.itemToEnchant == null) { if(stackEnchantable) { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index 658fe2b09..8a5042494 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -52,7 +52,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona private static final AxisAlignedBB AABB = new AxisAlignedBB(3/16.0, 0, 3/16.0, 13/16.0, 14/16.0, 13/16.0); public BlockForestDrum() { - super(Material.wood, LibBlockNames.FOREST_DRUM); + super(Material.WOOD, LibBlockNames.FOREST_DRUM); setHardness(2.0F); setSoundType(SoundType.WOOD); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.DRUM_VARIANT, DrumVariant.WILD)); @@ -129,9 +129,9 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona List items = world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(entity.posX, entity.posY, entity.posZ, entity.posX + entity.width, entity.posY + entity.height, entity.posZ + entity.width)); for(EntityItem item : items) { ItemStack itemstack = item.getEntityItem(); - if(itemstack != null && itemstack.getItem() == Items.bucket && !world.isRemote) { + if(itemstack != null && itemstack.getItem() == Items.BUCKET && !world.isRemote) { while(itemstack.stackSize > 0) { - EntityItem ent = entity.entityDropItem(new ItemStack(Items.milk_bucket), 1.0F); + EntityItem ent = entity.entityDropItem(new ItemStack(Items.MILK_BUCKET), 1.0F); ent.motionY += world.rand.nextFloat() * 0.05F; ent.motionX += (world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F; ent.motionZ += (world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F; @@ -164,7 +164,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona if(!world.isRemote) for(int i = 0; i < 10; i++) - world.playSound(null, pos, SoundEvents.block_note_basedrum, SoundCategory.BLOCKS, 1F, 1F); + world.playSound(null, pos, SoundEvents.BLOCK_NOTE_BASEDRUM, SoundCategory.BLOCKS, 1F, 1F); else world.spawnParticle(EnumParticleTypes.NOTE, pos.getX() + 0.5, pos.getY() + 1.2, pos.getZ() + 0.5D, 1.0 / 24.0, 0, 0); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java index bba4b6587..71910ee48 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -37,7 +37,7 @@ import java.util.List; public class BlockManaDetector extends BlockMod implements ILexiconable { public BlockManaDetector() { - super(Material.rock, LibBlockNames.MANA_DETECTOR); + super(Material.ROCK, LibBlockNames.MANA_DETECTOR); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java index b9c92fa0b..a7b6b1ff0 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -33,7 +33,7 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockManaVoid extends BlockMod implements ILexiconable, IPoolOverlayProvider { public BlockManaVoid() { - super(Material.rock, LibBlockNames.MANA_VOID); + super(Material.ROCK, LibBlockNames.MANA_VOID); setHardness(2.0F); setResistance(2000F); setSoundType(SoundType.STONE); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index 342b68566..59c11948a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -59,7 +59,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon private boolean lastFragile = false; public BlockPool() { - super(Material.rock, LibBlockNames.POOL); + super(Material.ROCK, LibBlockNames.POOL); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index 2340855d4..57b3ace2e 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -50,7 +50,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable { private final Random random = new Random(); public BlockPrism() { - super(Material.glass, LibBlockNames.PRISM); + super(Material.GLASS, LibBlockNames.PRISM); setHardness(0.3F); setSoundType(SoundType.GLASS); setLightLevel(1.0F); @@ -123,7 +123,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable { } else if(lens != null) { ItemStack add = lens.copy(); if(!par5EntityPlayer.inventory.addItemStackToInventory(add)) - par5EntityPlayer.dropPlayerItemWithRandomChoice(add, false); + par5EntityPlayer.dropItem(add, false); prism.getItemHandler().setStackInSlot(0, null); prism.markDirty(); par1World.setBlockState(pos, state.withProperty(BotaniaStateProps.HAS_LENS, false), 1 | 2); @@ -133,7 +133,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable { } @Override - public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { + public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) { boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; boolean powered = state.getValue(BotaniaStateProps.POWERED); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java index b15793ecf..8ce2624f5 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -41,7 +41,7 @@ public class BlockPump extends BlockMod implements ILexiconable { private static final AxisAlignedBB Z_AABB = new AxisAlignedBB(0.25, 0, 0, 0.75, 0.5, 1); public BlockPump() { - super(Material.rock, LibBlockNames.PUMP); + super(Material.ROCK, LibBlockNames.PUMP); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java index 018474663..74953c77e 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java @@ -30,7 +30,7 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockRFGenerator extends BlockMod implements ILexiconable { public BlockRFGenerator() { - super(Material.rock, LibBlockNames.RF_GENERATOR); + super(Material.ROCK, LibBlockNames.RF_GENERATOR); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index 476aa88bb..e479b5023 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -43,7 +43,7 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable private final Random random = new Random(); public BlockRuneAltar() { - super(Material.rock, LibBlockNames.RUNE_ALTAR); + super(Material.ROCK, LibBlockNames.RUNE_ALTAR); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); @@ -76,7 +76,7 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable if(stackAt != null) { ItemStack copy = stackAt.copy(); if(!par5EntityPlayer.inventory.addItemStackToInventory(copy)) - par5EntityPlayer.dropPlayerItemWithRandomChoice(copy, false); + par5EntityPlayer.dropItem(copy, false); altar.getItemHandler().setStackInSlot(i, null); par1World.updateComparatorOutputLevel(pos, this); break; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java index a9734e0d8..e864d025f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -36,7 +36,7 @@ public class BlockSpawnerClaw extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.125, 0, 0.125, 0.875, 1/16.0, 0.875); public BlockSpawnerClaw() { - super(Material.iron, LibBlockNames.SPAWNER_CLAW); + super(Material.IRON, LibBlockNames.SPAWNER_CLAW); setHardness(3.0F); } @@ -48,7 +48,7 @@ public class BlockSpawnerClaw extends BlockMod implements ILexiconable { @Override public void getSubBlocks(Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item)); - list.add(new ItemStack(Blocks.mob_spawner)); + list.add(new ItemStack(Blocks.MOB_SPAWNER)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index 4262449e0..52a632172 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -56,7 +56,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex private final Random random = new Random(); public BlockSpreader() { - super(Material.wood, LibBlockNames.SPREADER); + super(Material.WOOD, LibBlockNames.SPREADER); setHardness(2.0F); setSoundType(SoundType.WOOD); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.SPREADER_VARIANT, SpreaderVariant.MANA)); @@ -147,7 +147,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex TileSpreader spreader = (TileSpreader) tile; ItemStack lens = spreader.getItemHandler().getStackInSlot(0); boolean isHeldItemLens = heldItem != null && heldItem.getItem() instanceof ILens; - boolean wool = heldItem != null && heldItem.getItem() == Item.getItemFromBlock(Blocks.wool); + boolean wool = heldItem != null && heldItem.getItem() == Item.getItemFromBlock(Blocks.WOOL); if(heldItem != null) if(heldItem.getItem() == ModItems.twigWand) @@ -162,7 +162,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex } else if(lens != null && !wool) { ItemStack add = lens.copy(); if(!par5EntityPlayer.inventory.addItemStackToInventory(add)) - par5EntityPlayer.dropPlayerItemWithRandomChoice(add, false); + par5EntityPlayer.dropItem(add, false); spreader.getItemHandler().setStackInSlot(0, null); spreader.markDirty(); } @@ -173,9 +173,9 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex if(heldItem.stackSize == 0) par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, null); } else if(heldItem == null && spreader.paddingColor != -1 && lens == null) { - ItemStack pad = new ItemStack(Blocks.wool, 1, spreader.paddingColor); + ItemStack pad = new ItemStack(Blocks.WOOL, 1, spreader.paddingColor); if(!par5EntityPlayer.inventory.addItemStackToInventory(pad)) - par5EntityPlayer.dropPlayerItemWithRandomChoice(pad, false); + par5EntityPlayer.dropItem(pad, false); spreader.paddingColor = -1; spreader.markDirty(); } @@ -193,7 +193,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory() + 1; ++j1) { - ItemStack itemstack = j1 >= inv.getSizeInventory() ? inv.paddingColor == -1 ? null : new ItemStack(Blocks.wool, 1, inv.paddingColor) : inv.getItemHandler().getStackInSlot(j1); + ItemStack itemstack = j1 >= inv.getSizeInventory() ? inv.paddingColor == -1 ? null : new ItemStack(Blocks.WOOL, 1, inv.paddingColor) : inv.getItemHandler().getStackInSlot(j1); if(itemstack != null) { float f = random.nextFloat() * 0.8F + 0.1F; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java index 1440c90c4..c9f73ff63 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -37,7 +37,7 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 3.0/16, 1); public BlockTerraPlate() { - super(Material.iron, LibBlockNames.TERRA_PLATE); + super(Material.IRON, LibBlockNames.TERRA_PLATE); setHardness(3F); setResistance(10F); setSoundType(SoundType.METAL); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java index 6c4a71175..57f220fa1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -33,7 +33,7 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockTurntable extends BlockMod implements IWandable, IWandHUD, ILexiconable { public BlockTurntable() { - super(Material.wood, LibBlockNames.TURNTABLE); + super(Material.WOOD, LibBlockNames.TURNTABLE); setHardness(2.0F); setSoundType(SoundType.WOOD); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java index db5ee5d08..c8a795a06 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -30,7 +30,7 @@ import vazkii.botania.common.lexicon.LexiconData; public abstract class BlockRedString extends BlockMod implements ILexiconable { public BlockRedString(String name) { - super(Material.rock, name); + super(Material.ROCK, name); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java index e3909d0f5..a8b4d673f 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java @@ -53,7 +53,7 @@ public class BlockRedStringDispenser extends BlockRedString { } @Override - public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { + public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) { boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; boolean powered = state.getValue(BotaniaStateProps.POWERED); diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java index 0aceca2cd..83eda0309 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java @@ -83,7 +83,7 @@ public class SubTilePureDaisy extends SubTileEntity { Botania.proxy.wispFX(supertile.getWorld(), x, y, z, 1F, 1F, 1F, (float) Math.random() / 2F); } if(ConfigHandler.blockBreakParticles) - supertile.getWorld().playAuxSFX(2001, coords, Block.getStateId(recipe.getOutputState())); + supertile.getWorld().playEvent(2001, coords, Block.getStateId(recipe.getOutputState())); } } } else ticksRemaining[positionAt] = -1; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java index 7493a2719..bb6b8acc8 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java @@ -58,7 +58,7 @@ public class SubTileAgricarnation extends SubTileFunctional { mana -= 5; supertile.getWorld().scheduleUpdate(pos, block, 1); if(ConfigHandler.blockBreakParticles) - supertile.getWorld().playAuxSFX(2005, pos, 6 + supertile.getWorld().rand.nextInt(4)); + supertile.getWorld().playEvent(2005, pos, 6 + supertile.getWorld().rand.nextInt(4)); supertile.getWorld().playSound(null, x, y, z, BotaniaSoundEvents.agricarnation, SoundCategory.BLOCKS, 0.01F, 0.5F + (float) Math.random() * 0.5F); break; @@ -75,11 +75,11 @@ public class SubTileAgricarnation extends SubTileFunctional { private boolean isPlant(BlockPos pos) { IBlockState state = supertile.getWorld().getBlockState(pos); Block block = state.getBlock(); - if(block == Blocks.grass || block == Blocks.leaves || block == Blocks.leaves2 || block instanceof BlockBush && !(block instanceof BlockCrops) && !(block instanceof BlockSapling)) + if(block == Blocks.GRASS || block == Blocks.LEAVES || block == Blocks.LEAVES2 || block instanceof BlockBush && !(block instanceof BlockCrops) && !(block instanceof BlockSapling)) return false; Material mat = state.getMaterial(); - return mat != null && (mat == Material.plants || mat == Material.cactus || mat == Material.grass || mat == Material.leaves || mat == Material.gourd) && block instanceof IGrowable && ((IGrowable) block).canGrow(supertile.getWorld(), pos, supertile.getWorld().getBlockState(pos), supertile.getWorld().isRemote); + return mat != null && (mat == Material.PLANTS || mat == Material.CACTUS || mat == Material.GRASS || mat == Material.LEAVES || mat == Material.GOURD) && block instanceof IGrowable && ((IGrowable) block).canGrow(supertile.getWorld(), pos, supertile.getWorld().getBlockState(pos), supertile.getWorld().isRemote); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java index a3ff05d15..173aefa6c 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java @@ -56,7 +56,7 @@ public class SubTileBubbell extends SubTileFunctional { BlockPos pos = supertile.getPos().add(i, j, k); if(MathHelper.pointDistanceSpace(i, j, k, 0, 0, 0) < range) { IBlockState state = supertile.getWorld().getBlockState(pos); - if(state.getMaterial() == Material.water) { + if(state.getMaterial() == Material.WATER) { supertile.getWorld().setBlockState(pos, ModBlocks.fakeAir.getDefaultState(), 2); TileFakeAir air = (TileFakeAir) supertile.getWorld().getTileEntity(pos); air.setFlower(supertile); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java index 062cc46f7..8d77a9568 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java @@ -44,8 +44,8 @@ public class SubTileClayconia extends SubTileFunctional { if(coords != null) { supertile.getWorld().setBlockToAir(coords); if(ConfigHandler.blockBreakParticles) - supertile.getWorld().playAuxSFX(2001, coords, Block.getStateId(Blocks.sand.getDefaultState())); - EntityItem item = new EntityItem(supertile.getWorld(), coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5, new ItemStack(Items.clay_ball)); + supertile.getWorld().playEvent(2001, coords, Block.getStateId(Blocks.SAND.getDefaultState())); + EntityItem item = new EntityItem(supertile.getWorld(), coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5, new ItemStack(Items.CLAY_BALL)); supertile.getWorld().spawnEntityInWorld(item); mana -= COST; } @@ -64,7 +64,7 @@ public class SubTileClayconia extends SubTileFunctional { for(int k = -range; k < range + 1; k++) { BlockPos pos = supertile.getPos().add(i, j, k); Block block = supertile.getWorld().getBlockState(pos).getBlock(); - if(block == Blocks.sand) + if(block == Blocks.SAND) possibleCoords.add(pos); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java index 874682c08..322dc877e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java @@ -48,7 +48,7 @@ public class SubTileExoflame extends SubTileFunctional { TileEntity tile = supertile.getWorld().getTileEntity(pos); Block block = supertile.getWorld().getBlockState(pos).getBlock(); if(tile != null) { - if(tile instanceof TileEntityFurnace && (block == Blocks.furnace || block == Blocks.lit_furnace)) { + if(tile instanceof TileEntityFurnace && (block == Blocks.FURNACE || block == Blocks.LIT_FURNACE)) { TileEntityFurnace furnace = (TileEntityFurnace) tile; boolean canSmelt = canFurnaceSmelt(furnace); if(canSmelt && mana > 2) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java index 56fde506b..9d60f87ab 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java @@ -34,8 +34,8 @@ public class SubTileFallenKanade extends SubTileFunctional { boolean did = false; List players = supertile.getWorld().getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityPlayer player : players) { - if(player.getActivePotionEffect(MobEffects.regeneration) == null && mana >= COST) { - player.addPotionEffect(new PotionEffect(MobEffects.regeneration, 60, 2, true, true)); + if(player.getActivePotionEffect(MobEffects.REGENERATION) == null && mana >= COST) { + player.addPotionEffect(new PotionEffect(MobEffects.REGENERATION, 60, 2, true, true)); mana -= COST; did = true; } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java index 06efc09e4..85801c327 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java @@ -38,8 +38,8 @@ public class SubTileHyacidus extends SubTileFunctional { List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityLivingBase entity : entities) { - if(!(entity instanceof EntityPlayer) && entity.getActivePotionEffect(MobEffects.poison) == null && mana >= cost && !entity.worldObj.isRemote && entity.getCreatureAttribute() != EnumCreatureAttribute.UNDEAD) { - entity.addPotionEffect(new PotionEffect(MobEffects.poison, 60, 0)); + if(!(entity instanceof EntityPlayer) && entity.getActivePotionEffect(MobEffects.POISON) == null && mana >= cost && !entity.worldObj.isRemote && entity.getCreatureAttribute() != EnumCreatureAttribute.UNDEAD) { + entity.addPotionEffect(new PotionEffect(MobEffects.POISON, 60, 0)); mana -= cost; } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java index 741a644fe..87d48de6f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java @@ -47,11 +47,11 @@ public class SubTileJadedAmaranthus extends SubTileFunctional { for(int i = 0; i < RANGE * 2; i++) { IBlockState stateAbove = supertile.getWorld().getBlockState(up); Block blockAbove = stateAbove.getBlock(); - if((supertile.getWorld().isAirBlock(up) || blockAbove.isReplaceable(supertile.getWorld(), up)) && stateAbove.getMaterial() != Material.water && ModBlocks.flower.canPlaceBlockAt(supertile.getWorld(), up)) { + if((supertile.getWorld().isAirBlock(up) || blockAbove.isReplaceable(supertile.getWorld(), up)) && stateAbove.getMaterial() != Material.WATER && ModBlocks.flower.canPlaceBlockAt(supertile.getWorld(), up)) { EnumDyeColor color = EnumDyeColor.byMetadata(supertile.getWorld().rand.nextInt(16)); IBlockState state = ModBlocks.flower.getDefaultState().withProperty(BotaniaStateProps.COLOR, color); if(ConfigHandler.blockBreakParticles) - supertile.getWorld().playAuxSFX(2001, up, Block.getStateId(state)); + supertile.getWorld().playEvent(2001, up, Block.getStateId(state)); supertile.getWorld().setBlockState(up, state, 1 | 2); mana -= COST; sync(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java index fe9470c01..baa411ee5 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java @@ -65,7 +65,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { int meta = stack.getItemDamage(); supertile.getWorld().setBlockState(coords, block.getStateFromMeta(meta), 1 | 2); if(ConfigHandler.blockBreakParticles) - supertile.getWorld().playAuxSFX(2001, coords, Block.getIdFromBlock(block) + (meta << 12)); + supertile.getWorld().playEvent(2001, coords, Block.getIdFromBlock(block) + (meta << 12)); mana -= COST; sync(); @@ -101,7 +101,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { for(int k = -range; k < range + 1; k++) { BlockPos pos = supertile.getPos().add(i, j, k); IBlockState state = supertile.getWorld().getBlockState(pos); - if(state.getBlock().isReplaceableOreGen(state, supertile.getWorld(), pos, BlockStateMatcher.forBlock(Blocks.stone))) + if(state.getBlock().isReplaceableOreGen(state, supertile.getWorld(), pos, BlockStateMatcher.forBlock(Blocks.STONE))) possibleCoords.add(pos); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java index c57ec54b8..876e64ffb 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java @@ -35,7 +35,7 @@ public class SubTileMedumone extends SubTileFunctional { for(EntityLivingBase entity : entities) if(!(entity instanceof EntityPlayer)) { - entity.addPotionEffect(new PotionEffect(MobEffects.moveSlowdown, 2, 100)); + entity.addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, 2, 100)); mana--; if(mana == 0) return; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java index 64e2680fa..1bb9c9d45 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java @@ -59,7 +59,7 @@ public class SubTileOrechid extends SubTileFunctional { int meta = stack.getItemDamage(); supertile.getWorld().setBlockState(coords, block.getStateFromMeta(meta), 1 | 2); if(ConfigHandler.blockBreakParticles) - supertile.getWorld().playAuxSFX(2001, coords, Block.getIdFromBlock(block) + (meta << 12)); + supertile.getWorld().playEvent(2001, coords, Block.getIdFromBlock(block) + (meta << 12)); supertile.getWorld().playSound(null, supertile.getPos(), BotaniaSoundEvents.orechid, SoundCategory.BLOCKS, 2F, 1F); mana -= cost; @@ -126,7 +126,7 @@ public class SubTileOrechid extends SubTileFunctional { } public Block getSourceBlock() { - return Blocks.stone; + return Blocks.STONE; } public int getCost() { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java index f9b18e2ac..018e4f5f0 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java @@ -34,7 +34,7 @@ public class SubTileOrechidIgnem extends SubTileOrechid { @Override public Block getSourceBlock() { - return Blocks.netherrack; + return Blocks.NETHERRACK; } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java index c757c7775..ef1846576 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java @@ -119,13 +119,13 @@ public class SubTileRannuncarpus extends SubTileFunctional { else if(stackItem instanceof ItemBlockSpecial) stateToPlace = ((Block) ReflectionHelper.getPrivateValue(ItemBlockSpecial.class, (ItemBlockSpecial) stackItem, LibObfuscation.REED_ITEM)).getDefaultState(); else if(stackItem instanceof ItemRedstone) - stateToPlace = Blocks.redstone_wire.getDefaultState(); + stateToPlace = Blocks.REDSTONE_WIRE.getDefaultState(); if(stateToPlace != null) { if(stateToPlace.getBlock().canPlaceBlockAt(supertile.getWorld(), coords)) { supertile.getWorld().setBlockState(coords, stateToPlace, 1 | 2); if(ConfigHandler.blockBreakParticles) - supertile.getWorld().playAuxSFX(2001, coords, Block.getStateId(stateToPlace)); + supertile.getWorld().playEvent(2001, coords, Block.getStateId(stateToPlace)); validPositions.remove(coords); TileEntity tile = supertile.getWorld().getTileEntity(coords); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java index 28351511c..78189cac9 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java @@ -36,7 +36,7 @@ public class SubTileEntropinnyum extends SubTileGenerating { for(EntityTNTPrimed tnt : tnts) { if(tnt.getFuse() == 1 && !tnt.isDead && !supertile.getWorld().getBlockState(new BlockPos(tnt)).getMaterial().isLiquid()) { if(!supertile.getWorld().isRemote) { - tnt.playSound(SoundEvents.entity_generic_explode, 0.2F, (1F + (supertile.getWorld().rand.nextFloat() - supertile.getWorld().rand.nextFloat()) * 0.2F) * 0.7F); + tnt.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 0.2F, (1F + (supertile.getWorld().rand.nextFloat() - supertile.getWorld().rand.nextFloat()) * 0.2F) * 0.7F); tnt.setDead(); mana += getMaxMana(); sync(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java index 86e883a36..2f9287b1d 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java @@ -69,7 +69,7 @@ public class SubTileGourmaryllis extends SubTileGenerating { int val = ((ItemFood) stack.getItem()).getHealAmount(stack); storedMana = val * val * 64; cooldown = val * 10; - item.playSound(SoundEvents.entity_generic_eat, 0.2F, 0.5F + (float) Math.random() * 0.5F); + item.playSound(SoundEvents.ENTITY_GENERIC_EAT, 0.2F, 0.5F + (float) Math.random() * 0.5F); sync(); ((WorldServer) supertile.getWorld()).spawnParticle(EnumParticleTypes.ITEM_CRACK, false, item.posX, item.posY, item.posZ, 20, 0.1D, 0.1D, 0.1D, 0.05D, Item.getIdFromItem(stack.getItem()), stack.getItemDamage()); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java index c424e5474..f2ab181bd 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java @@ -67,7 +67,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { Material search = getMaterialToSearchFor(); PropertyInteger prop = supertile.getWorld().getBlockState(pos).getBlock() instanceof BlockLiquid ? BlockLiquid.LEVEL : supertile.getWorld().getBlockState(pos).getBlock() instanceof BlockFluidBase ? BlockFluidBase.LEVEL : null; if(supertile.getWorld().getBlockState(pos).getMaterial() == search && (getBlockToSearchBelow() == null || supertile.getWorld().getBlockState(pos.down()).getBlock() == getBlockToSearchBelow()) && (prop == null || supertile.getWorld().getBlockState(pos).getValue(prop) == 0)) { - if(search != Material.water) + if(search != Material.WATER) supertile.getWorld().setBlockToAir(pos); else { int waterAround = 0; @@ -105,7 +105,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { } public Material getMaterialToSearchFor() { - return Material.water; + return Material.WATER; } public Block getBlockToSearchBelow() { @@ -113,7 +113,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { } public void playSound() { - supertile.getWorld().playSound(null, supertile.getPos(), SoundEvents.entity_generic_drink, SoundCategory.BLOCKS, 0.01F, 0.5F + (float) Math.random() * 0.5F); + supertile.getWorld().playSound(null, supertile.getPos(), SoundEvents.ENTITY_GENERIC_DRINK, SoundCategory.BLOCKS, 0.01F, 0.5F + (float) Math.random() * 0.5F); } public int getBurnTime() { diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java index d3fe88954..c0e8014a1 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java @@ -47,8 +47,8 @@ public class SubTileKekimurus extends SubTileGenerating { supertile.getWorld().setBlockToAir(pos); else supertile.getWorld().setBlockState(pos, state.withProperty(BlockCake.BITES, nextSlicesEaten), 1 | 2); - supertile.getWorld().playAuxSFX(2001, pos, Block.getStateId(state)); - supertile.getWorld().playSound(null, supertile.getPos(), SoundEvents.entity_generic_eat, SoundCategory.BLOCKS, 1F, 0.5F + (float) Math.random() * 0.5F); + supertile.getWorld().playEvent(2001, pos, Block.getStateId(state)); + supertile.getWorld().playSound(null, supertile.getPos(), SoundEvents.ENTITY_GENERIC_EAT, SoundCategory.BLOCKS, 1F, 0.5F + (float) Math.random() * 0.5F); this.mana += mana; sync(); return; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java index 1508131eb..6e6f476b1 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java @@ -62,7 +62,7 @@ public class SubTileMunchdew extends SubTileGenerating { for(int j = 0; j < RANGE_Y; j++) for(int k = -RANGE; k < RANGE + 1; k++) { BlockPos pos_ = pos.add(i, j, k); - if(supertile.getWorld().getBlockState(pos_).getMaterial() == Material.leaves) { + if(supertile.getWorld().getBlockState(pos_).getMaterial() == Material.LEAVES) { boolean exposed = false; for(EnumFacing dir : EnumFacing.VALUES) { IBlockState offState = supertile.getWorld().getBlockState(pos_.offset(dir)); @@ -88,7 +88,7 @@ public class SubTileMunchdew extends SubTileGenerating { ticksWithoutEating = 0; ateOnce = true; if(ConfigHandler.blockBreakParticles) - supertile.getWorld().playAuxSFX(2001, breakCoords, Block.getStateId(state)); + supertile.getWorld().playEvent(2001, breakCoords, Block.getStateId(state)); mana += manaPerLeaf; } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java index 0147072e6..4c0a6a77c 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java @@ -47,7 +47,7 @@ public class SubTileNarslimmus extends SubTileGenerating { int mana = 820 * mul; if(!slime.worldObj.isRemote) { slime.setDead(); - slime.playSound(size > 1 ? SoundEvents.entity_slime_squish : SoundEvents.entity_small_slime_squish, 1, 0.02F); + slime.playSound(size > 1 ? SoundEvents.ENTITY_SLIME_SQUISH : SoundEvents.ENTITY_SMALL_SLIME_SQUISH, 1, 0.02F); this.mana = Math.min(getMaxMana(), this.mana + mana); sync(); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java index c4f9d5a18..1907afb2f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java @@ -69,7 +69,7 @@ public class SubTileRafflowsia extends SubTileGenerating { IBlockState state = supertile.getWorld().getBlockState(pos); supertile.getWorld().setBlockToAir(pos); - supertile.getWorld().playAuxSFX(2001, pos, Block.getStateId(state)); + supertile.getWorld().playEvent(2001, pos, Block.getStateId(state)); this.mana += mana * mod; sync(); return; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java index cd266719b..31595a5b7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java @@ -44,7 +44,7 @@ public class SubTileSpectrolus extends SubTileGenerating { super.onUpdate(); boolean remote = supertile.getWorld().isRemote; - Item wool = Item.getItemFromBlock(Blocks.wool); + Item wool = Item.getItemFromBlock(Blocks.WOOL); List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); int slowdown = getSlowdownFactor(); @@ -107,7 +107,7 @@ public class SubTileSpectrolus extends SubTileGenerating { public void renderHUD(Minecraft mc, ScaledResolution res) { super.renderHUD(mc, res); - ItemStack stack = new ItemStack(Blocks.wool, 1, nextColor); + ItemStack stack = new ItemStack(Blocks.WOOL, 1, nextColor); int color = getColor(); GlStateManager.enableBlend(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java index 672470373..463f74ef0 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java @@ -41,7 +41,7 @@ public class SubTileThermalily extends SubTileHydroangeas { @Override public Material getMaterialToSearchFor() { - return Material.lava; + return Material.LAVA; } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index e20b6edd0..9f3dda915 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -235,8 +235,8 @@ public class TileAlfPortal extends TileMod { } @Override - public void writeToNBT(NBTTagCompound cmp) { - super.writeToNBT(cmp); + public NBTTagCompound writeToNBT(NBTTagCompound cmp) { + NBTTagCompound ret = super.writeToNBT(cmp); cmp.setInteger(TAG_STACK_COUNT, stacksIn.size()); int i = 0; @@ -246,6 +246,8 @@ public class TileAlfPortal extends TileMod { cmp.setTag(TAG_STACK + i, stackcmp); i++; } + + return ret; } @Override @@ -289,7 +291,7 @@ public class TileAlfPortal extends TileMod { @SafeVarargs private final boolean checkMultipleConverters(Function... converters) { - if(!check2DArray(AIR_POSITIONS, Blocks.air.getDefaultState(), true, converters)) + if(!check2DArray(AIR_POSITIONS, Blocks.AIR.getDefaultState(), true, converters)) return false; if(!check2DArray(LIVINGWOOD_POSITIONS, ModBlocks.livingwood.getDefaultState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.DEFAULT), false, converters)) return false; @@ -357,7 +359,7 @@ public class TileAlfPortal extends TileMod { IBlockState stateat = worldObj.getBlockState(pos_); Block blockat = stateat.getBlock(); - if(state.getBlock() == Blocks.air ? blockat.isAir(stateat, worldObj, pos_) : blockat == state.getBlock()) { + if(state.getBlock() == Blocks.AIR ? blockat.isAir(stateat, worldObj, pos_) : blockat == state.getBlock()) { return onlyCheckBlock || stateat == state; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index 96be41a6f..ff3b21fd6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -66,7 +66,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { return false; if(!isMossy && worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.ALTAR_VARIANT) == AltarVariant.DEFAULT) { - if(stack.getItem() == Item.getItemFromBlock(Blocks.vine)) { + if(stack.getItem() == Item.getItemFromBlock(Blocks.VINE)) { isMossy = true; if (worldObj.isRemote) { worldObj.markBlockRangeForRenderUpdate(getPos(), getPos()); @@ -81,14 +81,14 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { } if(!hasWater() && !hasLava()) { - if(stack.getItem() == Items.water_bucket && !worldObj.isRemote) { + if(stack.getItem() == Items.WATER_BUCKET && !worldObj.isRemote) { setWater(true); worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); - stack.setItem(Items.bucket); - } else if(stack.getItem() == Items.lava_bucket && !worldObj.isRemote) { + stack.setItem(Items.BUCKET); + } else if(stack.getItem() == Items.LAVA_BUCKET && !worldObj.isRemote) { setLava(true); worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); - stack.setItem(Items.bucket); + stack.setItem(Items.BUCKET); } else return false; } @@ -114,7 +114,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { stackToPut.stackSize = 1; itemHandler.setStackInSlot(i, stackToPut); didChange = true; - worldObj.playSound(null, pos, SoundEvents.entity_generic_splash, SoundCategory.BLOCKS, 0.1F, 10F); + worldObj.playSound(null, pos, SoundEvents.ENTITY_GENERIC_SPLASH, SoundCategory.BLOCKS, 0.1F, 10F); break; } } @@ -196,7 +196,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { if(didAny) { if(inv instanceof TileAltar) - player.worldObj.playSound(null, ((TileAltar) inv).getPos(), SoundEvents.entity_generic_splash, SoundCategory.BLOCKS, 0.1F, 10F); + player.worldObj.playSound(null, ((TileAltar) inv).getPos(), SoundEvents.ENTITY_GENERIC_SPLASH, SoundCategory.BLOCKS, 0.1F, 10F); if(player instanceof EntityPlayerMP) { EntityPlayerMP mp = (EntityPlayerMP) player; mp.inventoryContainer.detectAndSendChanges(); @@ -244,7 +244,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { float green = color.getGreen() / 255F; float blue = color.getBlue() / 255F; if(Math.random() >= 0.75F) - worldObj.playSound(null, pos, SoundEvents.entity_generic_splash, SoundCategory.BLOCKS, 0.1F, 10F); + worldObj.playSound(null, pos, SoundEvents.ENTITY_GENERIC_SPLASH, SoundCategory.BLOCKS, 0.1F, 10F); Botania.proxy.sparkleFX(worldObj, pos.getX() + 0.5 + Math.random() * 0.4 - 0.2, pos.getY() + 1, pos.getZ() + 0.5 + Math.random() * 0.4 - 0.2, red, green, blue, (float) Math.random(), 10); } } @@ -340,7 +340,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); mc.getRenderItem().renderItemIntoGUI(stack, xc + radius + 32, yc - 8); - mc.getRenderItem().renderItemIntoGUI(new ItemStack(Items.wheat_seeds), xc + radius + 16, yc + 6); + mc.getRenderItem().renderItemIntoGUI(new ItemStack(Items.WHEAT_SEEDS), xc + radius + 16, yc + 6); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); mc.fontRendererObj.drawStringWithShadow("+", xc + radius + 14, yc + 10, 0xFFFFFF); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java index a6889e5bb..aef64dd5f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java @@ -30,9 +30,10 @@ public class TileBifrost extends TileMod { } @Override - public void writeToNBT(NBTTagCompound par1nbtTagCompound) { - super.writeToNBT(par1nbtTagCompound); - par1nbtTagCompound.setInteger(TAG_TICKS, ticks); + public NBTTagCompound writeToNBT(NBTTagCompound par1nbtTagCompound) { + NBTTagCompound ret = super.writeToNBT(par1nbtTagCompound); + ret.setInteger(TAG_TICKS, ticks); + return ret; } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCamo.java b/src/main/java/vazkii/botania/common/block/tile/TileCamo.java index 563118992..c41fc91e0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCamo.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCamo.java @@ -27,7 +27,7 @@ public class TileCamo extends TileMod { @Override public void writeCustomNBT(NBTTagCompound cmp) { if(camoState != null) { - cmp.setString(TAG_CAMO, Block.blockRegistry.getNameForObject(camoState.getBlock()).toString()); + cmp.setString(TAG_CAMO, Block.REGISTRY.getNameForObject(camoState.getBlock()).toString()); cmp.setInteger(TAG_CAMO_META, camoState.getBlock().getMetaFromState(camoState)); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java index c9d18f52d..a5a8933a2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -45,7 +45,7 @@ public class TileCocoon extends TileMod { public void hatch() { if(!worldObj.isRemote) { - worldObj.playAuxSFX(2001, pos, Block.getIdFromBlock(getBlockType())); + worldObj.playEvent(2001, pos, Block.getIdFromBlock(getBlockType())); worldObj.setBlockToAir(pos); EntityAgeable entity = null; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index 4aa7ea7ad..53e262fb0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -97,7 +97,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { Multiblock mb = new Multiblock(); for(BlockPos o : OBSIDIAN_LOCATIONS) - mb.addComponent(o.up(), Blocks.obsidian.getDefaultState()); + mb.addComponent(o.up(), Blocks.OBSIDIAN.getDefaultState()); for(BlockPos p : PYLON_LOCATIONS.get(EnumFacing.Axis.X)) { mb.addComponent(p.up(), ModBlocks.pylon.getDefaultState()); mb.addComponent(new FlowerComponent(p, ModBlocks.flower)); @@ -105,7 +105,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { for(BlockPos f : FLOWER_LOCATIONS) mb.addComponent(new FlowerComponent(f.up(), ModBlocks.flower)); - mb.addComponent(BlockPos.ORIGIN.up(), Blocks.lapis_block.getDefaultState()); + mb.addComponent(BlockPos.ORIGIN.up(), Blocks.LAPIS_BLOCK.getDefaultState()); return mb.makeSet(); } @@ -120,8 +120,8 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { if(count > 0 && !worldObj.isRemote) { for(EntityItem entity : items) { ItemStack item = entity.getEntityItem(); - if(item.getItem() == Items.enchanted_book) { - NBTTagList enchants = Items.enchanted_book.getEnchantments(item); + if(item.getItem() == Items.ENCHANTED_BOOK) { + NBTTagList enchants = Items.ENCHANTED_BOOK.getEnchantments(item); if(enchants != null && enchants.tagCount() > 0) { NBTTagCompound enchant = enchants.getCompoundTagAt(0); short id = enchant.getShort("id"); @@ -148,7 +148,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { if(!canEnchanterExist(worldObj, pos, axis)) { - worldObj.setBlockState(pos, Blocks.lapis_block.getDefaultState(), 1 | 2); + worldObj.setBlockState(pos, Blocks.LAPIS_BLOCK.getDefaultState(), 1 | 2); for(int i = 0; i < 50; i++) { float red = (float) Math.random(); float green = (float) Math.random(); @@ -168,8 +168,8 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { if(count > 0 && !worldObj.isRemote) { for(EntityItem entity : items) { ItemStack item = entity.getEntityItem(); - if(item.getItem() == Items.enchanted_book) { - NBTTagList enchants = Items.enchanted_book.getEnchantments(item); + if(item.getItem() == Items.ENCHANTED_BOOK) { + NBTTagList enchants = Items.ENCHANTED_BOOK.getEnchantments(item); if(enchants != null && enchants.tagCount() > 0) { NBTTagCompound enchant = enchants.getCompoundTagAt(0); short enchantId = enchant.getShort("id"); @@ -206,7 +206,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { if(manaRequired == -1) { manaRequired = 0; for(EnchantmentData data : enchants) { - manaRequired += (int) (5000F * ((15 - Math.min(15, data.enchantmentobj.getWeight().getWeight())) * 1.05F) * ((3F + data.enchantmentLevel * data.enchantmentLevel) * 0.25F) * (0.9F + enchants.size() * 0.05F)); + manaRequired += (int) (5000F * ((15 - Math.min(15, data.enchantmentobj.getRarity().getWeight())) * 1.05F) * ((3F + data.enchantmentLevel * data.enchantmentLevel) * 0.25F) * (0.9F + enchants.size() * 0.05F)); } } else if(mana >= manaRequired) { manaRequired = 0; @@ -324,7 +324,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { cmp.setTag(TAG_ITEM, itemCmp); String enchStr = enchants.stream() - .map(e -> Enchantment.enchantmentRegistry.getNameForObject(e.enchantmentobj) + ":" + e.enchantmentLevel) + .map(e -> Enchantment.REGISTRY.getNameForObject(e.enchantmentobj) + ":" + e.enchantmentLevel) .collect(Collectors.joining(",")); cmp.setString(TAG_ENCHANTS, enchStr.isEmpty() ? enchStr : enchStr.substring(0, enchStr.length() - 1)); } @@ -378,7 +378,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { public static boolean canEnchanterExist(World world, BlockPos pos, EnumFacing.Axis axis) { for(BlockPos obsidian : OBSIDIAN_LOCATIONS) - if(world.getBlockState(pos.add(obsidian)).getBlock() != Blocks.obsidian) + if(world.getBlockState(pos.add(obsidian)).getBlock() != Blocks.OBSIDIAN) return false; for(BlockPos pylon : PYLON_LOCATIONS.get(axis)) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java index c1801e4ae..7825f795e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -38,7 +38,7 @@ public class TileEnderEye extends TileMod { boolean looking = false; for(EntityPlayer player : players) { ItemStack helm = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD); - if(helm != null && helm.getItem() == Item.getItemFromBlock(Blocks.pumpkin)) + if(helm != null && helm.getItem() == Item.getItemFromBlock(Blocks.PUMPKIN)) continue; RayTraceResult pos = ToolCommons.raytraceFromEntity(worldObj, player, true, 64); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java index 88dfbd9b9..04d9f71af 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java @@ -32,11 +32,12 @@ public class TileFakeAir extends TileMod { } @Override - public void writeToNBT(NBTTagCompound par1nbtTagCompound) { - super.writeToNBT(par1nbtTagCompound); - par1nbtTagCompound.setInteger(TAG_FLOWER_X, flowerPos.getX()); - par1nbtTagCompound.setInteger(TAG_FLOWER_Y, flowerPos.getY()); - par1nbtTagCompound.setInteger(TAG_FLOWER_Z, flowerPos.getZ()); + public NBTTagCompound writeToNBT(NBTTagCompound par1nbtTagCompound) { + NBTTagCompound ret = super.writeToNBT(par1nbtTagCompound); + ret.setInteger(TAG_FLOWER_X, flowerPos.getX()); + ret.setInteger(TAG_FLOWER_Y, flowerPos.getY()); + ret.setInteger(TAG_FLOWER_Z, flowerPos.getZ()); + return ret; } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java index 285e3ed1b..4f9ae7c87 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -76,9 +76,9 @@ public class TileHourglass extends TileSimpleInventory { public static int getStackItemTime(ItemStack stack) { if(stack == null) return 0; - if(stack.getItem() == Item.getItemFromBlock(Blocks.sand)) + if(stack.getItem() == Item.getItemFromBlock(Blocks.SAND)) return stack.getItemDamage() == 1 ? 200 : 20; - if(stack.getItem() == Item.getItemFromBlock(Blocks.soul_sand)) + if(stack.getItem() == Item.getItemFromBlock(Blocks.SOUL_SAND)) return 1200; return 0; } @@ -87,9 +87,9 @@ public class TileHourglass extends TileSimpleInventory { ItemStack stack = itemHandler.getStackInSlot(0); if(stack == null) return 0; - if(stack.getItem() == Item.getItemFromBlock(Blocks.sand)) + if(stack.getItem() == Item.getItemFromBlock(Blocks.SAND)) return stack.getItemDamage() == 1 ? 0xE95800 : 0xFFEC49; - if(stack.getItem() == Item.getItemFromBlock(Blocks.soul_sand)) + if(stack.getItem() == Item.getItemFromBlock(Blocks.SOUL_SAND)) return 0x5A412f; return 0; } @@ -99,7 +99,7 @@ public class TileHourglass extends TileSimpleInventory { return new SimpleItemStackHandler(this, true) { @Override public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { - if(stack != null && (stack.getItem() == Item.getItemFromBlock(Blocks.sand) || stack.getItem() == Item.getItemFromBlock(Blocks.soul_sand))) + if(stack != null && (stack.getItem() == Item.getItemFromBlock(Blocks.SAND) || stack.getItem() == Item.getItemFromBlock(Blocks.SOUL_SAND))) return super.insertItem(slot, stack, simulate); else return stack; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java index f2ddc23cf..1dca546f9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -51,7 +51,7 @@ public class TileIncensePlate extends TileSimpleInventory { List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(pos.getX() + 0.5 - RANGE, pos.getY() + 0.5 - RANGE, pos.getZ() + 0.5 - RANGE, pos.getX() + 0.5 + RANGE, pos.getY() + 0.5 + RANGE, pos.getZ() + 0.5 + RANGE)); for(EntityPlayer player : players) { PotionEffect currentEffect = player.getActivePotionEffect(effect.getPotion()); - boolean nightVision = effect.getPotion() == MobEffects.nightVision; + boolean nightVision = effect.getPotion() == MobEffects.NIGHT_VISION; if(currentEffect == null || currentEffect.getDuration() < (nightVision ? 205 : 3)) { PotionEffect applyEffect = new PotionEffect(effect.getPotion(), nightVision ? 285 : 80, effect.getAmplifier(), true, true); player.addPotionEffect(applyEffect); @@ -59,7 +59,7 @@ public class TileIncensePlate extends TileSimpleInventory { } if(worldObj.rand.nextInt(20) == 0) - worldObj.playSound(null, pos, SoundEvents.block_fire_ambient, SoundCategory.BLOCKS, 0.1F, 1); + worldObj.playSound(null, pos, SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.BLOCKS, 0.1F, 1); } else { double x = pos.getX() + 0.5; double y = pos.getY() + 0.5; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileMod.java b/src/main/java/vazkii/botania/common/block/tile/TileMod.java index 560d19e70..c204e3d88 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -28,10 +28,10 @@ public class TileMod extends TileEntity implements ITickable { } @Override - public void writeToNBT(NBTTagCompound par1nbtTagCompound) { - super.writeToNBT(par1nbtTagCompound); - - writeCustomNBT(par1nbtTagCompound); + public NBTTagCompound writeToNBT(NBTTagCompound par1nbtTagCompound) { + NBTTagCompound ret = super.writeToNBT(par1nbtTagCompound); + writeCustomNBT(ret); + return ret; } @Override @@ -50,7 +50,7 @@ public class TileMod extends TileEntity implements ITickable { } @Override - public Packet getDescriptionPacket() { + public SPacketUpdateTileEntity getUpdatePacket() { NBTTagCompound nbttagcompound = new NBTTagCompound(); writeCustomNBT(nbttagcompound); return new SPacketUpdateTileEntity(pos, -999, nbttagcompound); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java index 3cf62345f..6b1e0b6b3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -112,7 +112,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { } AnvilChunkLoader.spawnEntity(entity, world); - world.playAuxSFX(2004, blockpos, 0); + world.playEvent(2004, blockpos, 0); if (entityliving != null) { @@ -149,9 +149,9 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { } if(potentialEntitySpawns != null && potentialEntitySpawns.size() > 0) - logic.func_184993_a((WeightedSpawnerEntity)WeightedRandom.getRandomItem(logic.getSpawnerWorld().rand, potentialEntitySpawns)); + logic.setNextSpawnData((WeightedSpawnerEntity)WeightedRandom.getRandomItem(logic.getSpawnerWorld().rand, potentialEntitySpawns)); - logic.func_98267_a(1); + logic.broadcastEvent(1); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java index 3e8271409..fcb8429bc 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -212,10 +212,10 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil @Override public int getSlowdownFactor() { Block below = worldObj.getBlockState(getPos().down()).getBlock(); - if(below == Blocks.mycelium) + if(below == Blocks.MYCELIUM) return SLOWDOWN_FACTOR_MYCEL; - if(below == Blocks.dirt) { + if(below == Blocks.DIRT) { BlockDirt.DirtType type = worldObj.getBlockState(getPos().down()).getValue(BlockDirt.VARIANT); if(type == BlockDirt.DirtType.PODZOL) return SLOWDOWN_FACTOR_PODZOL; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java index 2830010ed..47fc10d9c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -58,7 +58,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { Multiblock mb = new Multiblock(); for(BlockPos relativePos : LAPIS_BLOCKS) - mb.addComponent(relativePos, Blocks.lapis_block.getDefaultState()); + mb.addComponent(relativePos, Blocks.LAPIS_BLOCK.getDefaultState()); for(BlockPos relativePos : LIVINGROCK_BLOCKS) mb.addComponent(relativePos, ModBlocks.livingrock.getDefaultState()); @@ -170,7 +170,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { } boolean hasValidPlatform() { - return checkAll(LAPIS_BLOCKS, Blocks.lapis_block) && checkAll(LIVINGROCK_BLOCKS, ModBlocks.livingrock); + return checkAll(LAPIS_BLOCKS, Blocks.LAPIS_BLOCK) && checkAll(LIVINGROCK_BLOCKS, ModBlocks.livingrock); } boolean checkAll(BlockPos[] relPositions, Block block) { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java index 7cddaf175..4d0732e27 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java @@ -67,7 +67,7 @@ public class TileBellows extends TileMod { furnace.setField(0, Math.max(0, furnace.getField(0) - 10)); // burnTime } - if(furnace.hasWorldObj() && furnace.getBlockType() == Blocks.lit_furnace) { + if(furnace.hasWorldObj() && furnace.getBlockType() == Blocks.LIT_FURNACE) { // Copypasta from BlockFurnace EnumFacing enumfacing = worldObj.getBlockState(furnace.getPos()).getValue(BlockFurnace.FACING); double d0 = (double)pos.getX() + 0.5D; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index 41c4cde84..daef39ca4 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -336,7 +336,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt writeCustomNBT(nbttagcompound); nbttagcompound.setInteger(TAG_KNOWN_MANA, getCurrentMana()); if(player instanceof EntityPlayerMP) - ((EntityPlayerMP) player).playerNetServerHandler.sendPacket(new SPacketUpdateTileEntity(pos, -999, nbttagcompound)); + ((EntityPlayerMP) player).connection.sendPacket(new SPacketUpdateTileEntity(pos, -999, nbttagcompound)); } worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.11F, 1F); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index e7a865d3b..99337c5e6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -384,7 +384,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, writeCustomNBT(nbttagcompound); nbttagcompound.setInteger(TAG_KNOWN_MANA, mana); if(player instanceof EntityPlayerMP) - ((EntityPlayerMP) player).playerNetServerHandler.sendPacket(new SPacketUpdateTileEntity(pos, -999, nbttagcompound)); + ((EntityPlayerMP) player).connection.sendPacket(new SPacketUpdateTileEntity(pos, -999, nbttagcompound)); } worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.1F, 1); } else { diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java index ac391d660..2127f0a26 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java @@ -86,7 +86,7 @@ public abstract class TileRedString extends TileMod implements ITileBound { public IBlockState getStateAtBinding() { BlockPos binding = getBinding(); - return binding == null ? Blocks.air.getDefaultState() : worldObj.getBlockState(binding); + return binding == null ? Blocks.AIR.getDefaultState() : worldObj.getBlockState(binding); } public Block getBlockAtBinding() { diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java index 837995ac8..1bc39f10f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java @@ -72,7 +72,7 @@ public class TileRedStringInterceptor extends TileRedString { if(did) { if(world.isRemote) player.swingArm(hand); - else world.playSound(null, pos, SoundEvents.block_dispenser_dispense, SoundCategory.BLOCKS, 0.3F, 0.6F); + else world.playSound(null, pos, SoundEvents.BLOCK_DISPENSER_DISPENSE, SoundCategory.BLOCKS, 0.3F, 0.6F); } } diff --git a/src/main/java/vazkii/botania/common/brew/ModBrews.java b/src/main/java/vazkii/botania/common/brew/ModBrews.java index f90080c94..fc383a299 100644 --- a/src/main/java/vazkii/botania/common/brew/ModBrews.java +++ b/src/main/java/vazkii/botania/common/brew/ModBrews.java @@ -44,21 +44,21 @@ public class ModBrews { public static Brew warpWard; public static void init() { - speed = new BrewMod(LibBrewNames.SPEED, 0x59B7FF, 4000, new PotionEffect(MobEffects.moveSpeed, 1800, 1)); - strength = new BrewMod(LibBrewNames.STRENGTH, 0xEE3F3F, 4000, new PotionEffect(MobEffects.damageBoost, 1800, 1)); - haste = new BrewMod(LibBrewNames.HASTE, 0xF4A432, 4000, new PotionEffect(MobEffects.digSpeed, 1800, 1)); - healing = new BrewMod(LibBrewNames.HEALING, 0xFF5ECC, 6000, new PotionEffect(MobEffects.heal, 1, 1)); - jumpBoost = new BrewMod(LibBrewNames.JUMP_BOOST, 0x32F46D, 4000, new PotionEffect(MobEffects.jump, 1800, 1)); - regen = new BrewMod(LibBrewNames.REGEN, 0xFD6488, 7000, new PotionEffect(MobEffects.regeneration, 500, 1)); - regenWeak = new BrewMod(LibBrewNames.REGEN_WEAK, 0xFD6488, 9000, new PotionEffect(MobEffects.regeneration, 2400, 0)); - resistance = new BrewMod(LibBrewNames.RESISTANCE, 0xB44E17, 4000, new PotionEffect(MobEffects.resistance, 1800, 1)); - fireResistance = new BrewMod(LibBrewNames.FIRE_RESISTANCE, 0xF86900, 4000, new PotionEffect(MobEffects.fireResistance, 9600, 0)); - waterBreathing = new BrewMod(LibBrewNames.WATER_BREATHING, 0x84A7CF, 4000, new PotionEffect(MobEffects.waterBreathing, 9600, 0)); - invisibility = new BrewMod(LibBrewNames.INVISIBILITY, 0xAEAEAE, 8000, new PotionEffect(MobEffects.invisibility, 9600, 0)); - nightVision = new BrewMod(LibBrewNames.NIGHT_VISION, 0x7C4BEB, 4000, new PotionEffect(MobEffects.nightVision, 9600, 0)); - absorption = new BrewMod(LibBrewNames.ABSORPTION, 0xF2EB23, 7000, new PotionEffect(MobEffects.absorption, 1800, 3)).setNotBloodPendantInfusable().setNotIncenseInfusable(); + speed = new BrewMod(LibBrewNames.SPEED, 0x59B7FF, 4000, new PotionEffect(MobEffects.SPEED, 1800, 1)); + strength = new BrewMod(LibBrewNames.STRENGTH, 0xEE3F3F, 4000, new PotionEffect(MobEffects.STRENGTH, 1800, 1)); + haste = new BrewMod(LibBrewNames.HASTE, 0xF4A432, 4000, new PotionEffect(MobEffects.HASTE, 1800, 1)); + healing = new BrewMod(LibBrewNames.HEALING, 0xFF5ECC, 6000, new PotionEffect(MobEffects.INSTANT_HEALTH, 1, 1)); + jumpBoost = new BrewMod(LibBrewNames.JUMP_BOOST, 0x32F46D, 4000, new PotionEffect(MobEffects.JUMP_BOOST, 1800, 1)); + regen = new BrewMod(LibBrewNames.REGEN, 0xFD6488, 7000, new PotionEffect(MobEffects.REGENERATION, 500, 1)); + regenWeak = new BrewMod(LibBrewNames.REGEN_WEAK, 0xFD6488, 9000, new PotionEffect(MobEffects.REGENERATION, 2400, 0)); + resistance = new BrewMod(LibBrewNames.RESISTANCE, 0xB44E17, 4000, new PotionEffect(MobEffects.RESISTANCE, 1800, 1)); + fireResistance = new BrewMod(LibBrewNames.FIRE_RESISTANCE, 0xF86900, 4000, new PotionEffect(MobEffects.FIRE_RESISTANCE, 9600, 0)); + waterBreathing = new BrewMod(LibBrewNames.WATER_BREATHING, 0x84A7CF, 4000, new PotionEffect(MobEffects.WATER_BREATHING, 9600, 0)); + invisibility = new BrewMod(LibBrewNames.INVISIBILITY, 0xAEAEAE, 8000, new PotionEffect(MobEffects.INVISIBILITY, 9600, 0)); + nightVision = new BrewMod(LibBrewNames.NIGHT_VISION, 0x7C4BEB, 4000, new PotionEffect(MobEffects.NIGHT_VISION, 9600, 0)); + absorption = new BrewMod(LibBrewNames.ABSORPTION, 0xF2EB23, 7000, new PotionEffect(MobEffects.ABSORPTION, 1800, 3)).setNotBloodPendantInfusable().setNotIncenseInfusable(); - overload = new BrewMod(LibBrewNames.OVERLOAD, 0x232323, 12000, new PotionEffect(MobEffects.damageBoost, 1800, 3), new PotionEffect(MobEffects.moveSpeed, 1800, 2), new PotionEffect(MobEffects.weakness, 3600, 2), new PotionEffect(MobEffects.hunger, 200, 2)); + overload = new BrewMod(LibBrewNames.OVERLOAD, 0x232323, 12000, new PotionEffect(MobEffects.STRENGTH, 1800, 3), new PotionEffect(MobEffects.SPEED, 1800, 2), new PotionEffect(MobEffects.WEAKNESS, 3600, 2), new PotionEffect(MobEffects.HUNGER, 200, 2)); soulCross = new BrewModPotion(LibBrewNames.SOUL_CROSS, 10000, new PotionEffect(ModPotions.soulCross, 1800, 0)); featherfeet = new BrewModPotion(LibBrewNames.FEATHER_FEET, 7000, new PotionEffect(ModPotions.featherfeet, 1800, 0)); emptiness = new BrewModPotion(LibBrewNames.EMPTINESS, 30000, new PotionEffect(ModPotions.emptiness, 7200, 0)); @@ -68,7 +68,7 @@ public class ModBrews { } public static void initTC() { - Potion warpWardPotion = Potion.potionRegistry.getObject(new ResourceLocation("minecraft:warp_ward")); + Potion warpWardPotion = Potion.REGISTRY.getObject(new ResourceLocation("minecraft:warp_ward")); // thaumcraft 5 is registering its potions under the Minecraft namespace if(warpWardPotion != null) diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java b/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java index f0da28fd7..fa5112c9c 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java @@ -23,7 +23,7 @@ public class PotionAllure extends PotionMod { public PotionAllure() { super(LibPotionNames.ALLURE, false, 0x0034E4, 5); MinecraftForge.EVENT_BUS.register(this); - setShowOnFirstRow(); + setBeneficial(); } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java index c8729d169..0be6a938b 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java @@ -27,7 +27,7 @@ public class PotionBloodthirst extends PotionMod { public PotionBloodthirst() { super(LibPotionNames.BLOODTHIRST, false, 0xC30000, 3); MinecraftForge.EVENT_BUS.register(this); - setShowOnFirstRow(); + setBeneficial(); } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java b/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java index efbe3a091..f72d6e826 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java @@ -29,7 +29,7 @@ public class PotionClear extends PotionMod { @Override public void affectEntity(Entity e, Entity e1, EntityLivingBase e2, int t, double d) { - e2.curePotionEffects(new ItemStack(Items.milk_bucket)); + e2.curePotionEffects(new ItemStack(Items.MILK_BUCKET)); } } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java index 8756d10b0..5c781c845 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java @@ -26,7 +26,7 @@ public class PotionEmptiness extends PotionMod { public PotionEmptiness() { super(LibPotionNames.EMPTINESS, false, 0xFACFFF, 2); MinecraftForge.EVENT_BUS.register(this); - setShowOnFirstRow(); + setBeneficial(); } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java index be80b2f60..6cf76b1c3 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java @@ -21,7 +21,7 @@ public class PotionFeatherfeet extends PotionMod { public PotionFeatherfeet() { super(LibPotionNames.FEATHER_FEET, false, 0x26ADFF, 1); MinecraftForge.EVENT_BUS.register(this); - setShowOnFirstRow(); + setBeneficial(); } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java index 7f16cd878..304490783 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java @@ -22,7 +22,7 @@ public class PotionSoulCross extends PotionMod { public PotionSoulCross() { super(LibPotionNames.SOUL_CROSS, false, 0x47453d, 0); MinecraftForge.EVENT_BUS.register(this); - setShowOnFirstRow(); + setBeneficial(); } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 4d207fa4e..2b6d1b98f 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -299,7 +299,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.manaBeacon); addItem(ModItems.signalFlare); - addStack(new ItemStack(Blocks.dirt, 1, 1)); + addStack(new ItemStack(Blocks.DIRT, 1, 1)); addBlock(ModBlocks.dirtPath); addBlock(ModFluffBlocks.dirtPathSlab); diff --git a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java index 4a4b8dcbf..a4b91cc80 100644 --- a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java @@ -19,10 +19,10 @@ import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumHelm; public class PixieHandler { private static final Potion[] potions = { - MobEffects.blindness, - MobEffects.wither, - MobEffects.moveSlowdown, - MobEffects.weakness + MobEffects.BLINDNESS, + MobEffects.WITHER, + MobEffects.SLOWNESS, + MobEffects.WEAKNESS }; @SubscribeEvent 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 47b75694e..017f45a73 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -72,20 +72,20 @@ public final class SheddingHandler { int i = 1; for(ShedPattern pattern : patterns) { - PageShedding page = new PageShedding(String.valueOf(i), EntityList.classToStringMapping.get(pattern.EntityClass), pattern.lexiconSize, pattern.getItemStack()); + PageShedding page = new PageShedding(String.valueOf(i), EntityList.CLASS_TO_NAME.get(pattern.EntityClass), pattern.lexiconSize, pattern.getItemStack()); LexiconData.shedding.addPage(page); } } 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<>(); @@ -94,7 +94,7 @@ public final class SheddingHandler { defaultNames.add(pattern.getEntityString()); } - for(Entry> entry : EntityList.stringToClassMapping.entrySet()) { + for(Entry> entry : EntityList.NAME_TO_CLASS.entrySet()) { if(EntityLiving.class.isAssignableFrom(entry.getValue())) { String name = entry.getKey(); if(!defaultNames.contains(name)) @@ -110,7 +110,7 @@ public final class SheddingHandler { int lexiconSize = 40; if(defaultPattern != null) { - itemName = Item.itemRegistry.getNameForObject(defaultPattern.getItemStack().getItem()).toString(); + itemName = Item.REGISTRY.getNameForObject(defaultPattern.getItemStack().getItem()).toString(); metadata = defaultPattern.getItemStack().getItemDamage(); rate = defaultPattern.rate; lexiconSize = defaultPattern.lexiconSize; @@ -123,8 +123,8 @@ public final class SheddingHandler { metadata = config.get("Shedding", key + ".metadata", metadata).getInt(); lexiconSize = config.get("Shedding", key + ".lexiconDisplaySize", lexiconSize).getInt(); - if(itemName != null && Item.itemRegistry.getObject(new ResourceLocation(itemName)) != null && rate != -1) - patterns.add(new ShedPattern(EntityList.stringToClassMapping.get(key), new ItemStack(Item.itemRegistry.getObject(new ResourceLocation(itemName)), 1, metadata), rate, lexiconSize)); + if(itemName != null && Item.REGISTRY.getObject(new ResourceLocation(itemName)) != null && rate != -1) + patterns.add(new ShedPattern(EntityList.NAME_TO_CLASS.get(key), new ItemStack(Item.REGISTRY.getObject(new ResourceLocation(itemName)), 1, metadata), rate, lexiconSize)); } private static class ShedPattern { @@ -149,7 +149,7 @@ public final class SheddingHandler { } public String getEntityString() { - return EntityList.classToStringMapping.get(EntityClass); + return EntityList.CLASS_TO_NAME.get(EntityClass); } } diff --git a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java index 4f96ece4e..138f05d6f 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java @@ -48,35 +48,35 @@ public class ModBrewRecipes { public static RecipeBrew warpWardBrew; public static void init() { - speedBrew = BotaniaAPI.registerBrewRecipe(ModBrews.speed, new ItemStack(Items.nether_wart), new ItemStack(Items.sugar), new ItemStack(Items.redstone)); - strengthBrew = BotaniaAPI.registerBrewRecipe(ModBrews.strength, new ItemStack(Items.nether_wart), new ItemStack(Items.blaze_powder), new ItemStack(Items.glowstone_dust)); - hasteBrew = BotaniaAPI.registerBrewRecipe(ModBrews.haste, new ItemStack(Items.nether_wart), new ItemStack(Items.sugar), new ItemStack(Items.gold_nugget)); - healingBrew = BotaniaAPI.registerBrewRecipe(ModBrews.healing, new ItemStack(Items.nether_wart), new ItemStack(Items.speckled_melon), new ItemStack(Items.potato)); - jumpBoostBrew = BotaniaAPI.registerBrewRecipe(ModBrews.jumpBoost, new ItemStack(Items.nether_wart), new ItemStack(Items.feather), new ItemStack(Items.carrot)); - regenerationBrew = BotaniaAPI.registerBrewRecipe(ModBrews.regen, new ItemStack(Items.nether_wart), new ItemStack(Items.ghast_tear), new ItemStack(Items.glowstone_dust)); - weakRegenerationBrew = BotaniaAPI.registerBrewRecipe(ModBrews.regenWeak, new ItemStack(Items.nether_wart), new ItemStack(Items.ghast_tear), new ItemStack(Items.redstone)); - resistanceBrew = BotaniaAPI.registerBrewRecipe(ModBrews.resistance, new ItemStack(Items.nether_wart), new ItemStack(Items.iron_ingot), new ItemStack(Items.leather)); - fireResistanceBrew = BotaniaAPI.registerBrewRecipe(ModBrews.fireResistance, new ItemStack(Items.nether_wart), new ItemStack(Items.magma_cream), new ItemStack(Blocks.netherrack)); - waterBreathingBrew = BotaniaAPI.registerBrewRecipe(ModBrews.waterBreathing, new ItemStack(Items.nether_wart), LibOreDict.PRISMARINE_SHARD, new ItemStack(Items.glowstone_dust)); - invisibilityBrew = BotaniaAPI.registerBrewRecipe(ModBrews.invisibility, new ItemStack(Items.nether_wart), new ItemStack(Items.snowball), new ItemStack(Items.glowstone_dust)); - nightVisionBrew = BotaniaAPI.registerBrewRecipe(ModBrews.nightVision, new ItemStack(Items.nether_wart), new ItemStack(Items.spider_eye), new ItemStack(Items.golden_carrot)); - absorptionBrew = BotaniaAPI.registerBrewRecipe(ModBrews.absorption, new ItemStack(Items.nether_wart), new ItemStack(Items.golden_apple), new ItemStack(Items.potato)); + speedBrew = BotaniaAPI.registerBrewRecipe(ModBrews.speed, new ItemStack(Items.NETHER_WART), new ItemStack(Items.SUGAR), new ItemStack(Items.REDSTONE)); + strengthBrew = BotaniaAPI.registerBrewRecipe(ModBrews.strength, new ItemStack(Items.NETHER_WART), new ItemStack(Items.BLAZE_POWDER), new ItemStack(Items.GLOWSTONE_DUST)); + hasteBrew = BotaniaAPI.registerBrewRecipe(ModBrews.haste, new ItemStack(Items.NETHER_WART), new ItemStack(Items.SUGAR), new ItemStack(Items.GOLD_NUGGET)); + healingBrew = BotaniaAPI.registerBrewRecipe(ModBrews.healing, new ItemStack(Items.NETHER_WART), new ItemStack(Items.SPECKLED_MELON), new ItemStack(Items.POTATO)); + jumpBoostBrew = BotaniaAPI.registerBrewRecipe(ModBrews.jumpBoost, new ItemStack(Items.NETHER_WART), new ItemStack(Items.FEATHER), new ItemStack(Items.CARROT)); + regenerationBrew = BotaniaAPI.registerBrewRecipe(ModBrews.regen, new ItemStack(Items.NETHER_WART), new ItemStack(Items.GHAST_TEAR), new ItemStack(Items.GLOWSTONE_DUST)); + weakRegenerationBrew = BotaniaAPI.registerBrewRecipe(ModBrews.regenWeak, new ItemStack(Items.NETHER_WART), new ItemStack(Items.GHAST_TEAR), new ItemStack(Items.REDSTONE)); + resistanceBrew = BotaniaAPI.registerBrewRecipe(ModBrews.resistance, new ItemStack(Items.NETHER_WART), new ItemStack(Items.IRON_INGOT), new ItemStack(Items.LEATHER)); + fireResistanceBrew = BotaniaAPI.registerBrewRecipe(ModBrews.fireResistance, new ItemStack(Items.NETHER_WART), new ItemStack(Items.MAGMA_CREAM), new ItemStack(Blocks.NETHERRACK)); + waterBreathingBrew = BotaniaAPI.registerBrewRecipe(ModBrews.waterBreathing, new ItemStack(Items.NETHER_WART), LibOreDict.PRISMARINE_SHARD, new ItemStack(Items.GLOWSTONE_DUST)); + invisibilityBrew = BotaniaAPI.registerBrewRecipe(ModBrews.invisibility, new ItemStack(Items.NETHER_WART), new ItemStack(Items.SNOWBALL), new ItemStack(Items.GLOWSTONE_DUST)); + nightVisionBrew = BotaniaAPI.registerBrewRecipe(ModBrews.nightVision, new ItemStack(Items.NETHER_WART), new ItemStack(Items.SPIDER_EYE), new ItemStack(Items.GOLDEN_CARROT)); + absorptionBrew = BotaniaAPI.registerBrewRecipe(ModBrews.absorption, new ItemStack(Items.NETHER_WART), new ItemStack(Items.GOLDEN_APPLE), new ItemStack(Items.POTATO)); - overloadBrew = BotaniaAPI.registerBrewRecipe(ModBrews.overload, new ItemStack(Items.nether_wart), new ItemStack(Items.blaze_powder), new ItemStack(Items.sugar), new ItemStack(Items.glowstone_dust), new ItemStack(ModItems.manaResource), new ItemStack(Items.spider_eye)); - soulCrossBrew = BotaniaAPI.registerBrewRecipe(ModBrews.soulCross, new ItemStack(Items.nether_wart), new ItemStack(Blocks.soul_sand), new ItemStack(Items.paper), new ItemStack(Items.apple), new ItemStack(Items.bone)); - featherFeetBrew = BotaniaAPI.registerBrewRecipe(ModBrews.featherfeet, new ItemStack(Items.nether_wart), new ItemStack(Items.feather), new ItemStack(Items.leather), new ItemStack(Blocks.wool, 1, -1)); - emptinessBrew = BotaniaAPI.registerBrewRecipe(ModBrews.emptiness, new ItemStack(Items.nether_wart), new ItemStack(Items.gunpowder), new ItemStack(Items.rotten_flesh), new ItemStack(Items.bone), new ItemStack(Items.string), new ItemStack(Items.ender_pearl)); - bloodthirstBrew = BotaniaAPI.registerBrewRecipe(ModBrews.bloodthirst, new ItemStack(Items.nether_wart), new ItemStack(Items.fermented_spider_eye), new ItemStack(Items.dye, 1, 4), new ItemStack(Items.fire_charge), new ItemStack(Items.iron_ingot)); - allureBrew = BotaniaAPI.registerBrewRecipe(ModBrews.allure, new ItemStack(Items.nether_wart), new ItemStack(Items.fish), new ItemStack(Items.quartz), new ItemStack(Items.golden_carrot)); - clearBrew = BotaniaAPI.registerBrewRecipe(ModBrews.clear, new ItemStack(Items.nether_wart), new ItemStack(Items.quartz), new ItemStack(Items.emerald), new ItemStack(Items.melon)); + overloadBrew = BotaniaAPI.registerBrewRecipe(ModBrews.overload, new ItemStack(Items.NETHER_WART), new ItemStack(Items.BLAZE_POWDER), new ItemStack(Items.SUGAR), new ItemStack(Items.GLOWSTONE_DUST), new ItemStack(ModItems.manaResource), new ItemStack(Items.SPIDER_EYE)); + soulCrossBrew = BotaniaAPI.registerBrewRecipe(ModBrews.soulCross, new ItemStack(Items.NETHER_WART), new ItemStack(Blocks.SOUL_SAND), new ItemStack(Items.PAPER), new ItemStack(Items.APPLE), new ItemStack(Items.BONE)); + featherFeetBrew = BotaniaAPI.registerBrewRecipe(ModBrews.featherfeet, new ItemStack(Items.NETHER_WART), new ItemStack(Items.FEATHER), new ItemStack(Items.LEATHER), new ItemStack(Blocks.WOOL, 1, -1)); + emptinessBrew = BotaniaAPI.registerBrewRecipe(ModBrews.emptiness, new ItemStack(Items.NETHER_WART), new ItemStack(Items.GUNPOWDER), new ItemStack(Items.ROTTEN_FLESH), new ItemStack(Items.BONE), new ItemStack(Items.STRING), new ItemStack(Items.ENDER_PEARL)); + bloodthirstBrew = BotaniaAPI.registerBrewRecipe(ModBrews.bloodthirst, new ItemStack(Items.NETHER_WART), new ItemStack(Items.FERMENTED_SPIDER_EYE), new ItemStack(Items.DYE, 1, 4), new ItemStack(Items.FIRE_CHARGE), new ItemStack(Items.IRON_INGOT)); + allureBrew = BotaniaAPI.registerBrewRecipe(ModBrews.allure, new ItemStack(Items.NETHER_WART), new ItemStack(Items.FISH), new ItemStack(Items.QUARTZ), new ItemStack(Items.GOLDEN_CARROT)); + clearBrew = BotaniaAPI.registerBrewRecipe(ModBrews.clear, new ItemStack(Items.NETHER_WART), new ItemStack(Items.QUARTZ), new ItemStack(Items.EMERALD), new ItemStack(Items.MELON)); } public static void initTC() { - Item salisMundus = Item.itemRegistry.getObject(new ResourceLocation("thaumcraft", "salis_mundus")); - Item bathSalts = Item.itemRegistry.getObject(new ResourceLocation("thaumcraft", "bath_salts")); - Item amber = Item.itemRegistry.getObject(new ResourceLocation("thaumcraft", "amber")); + Item salisMundus = Item.REGISTRY.getObject(new ResourceLocation("thaumcraft", "salis_mundus")); + Item bathSalts = Item.REGISTRY.getObject(new ResourceLocation("thaumcraft", "bath_salts")); + Item amber = Item.REGISTRY.getObject(new ResourceLocation("thaumcraft", "amber")); - warpWardBrew = BotaniaAPI.registerBrewRecipe(ModBrews.warpWard, new ItemStack(Items.nether_wart), new ItemStack(salisMundus), new ItemStack(bathSalts), new ItemStack(amber)); + warpWardBrew = BotaniaAPI.registerBrewRecipe(ModBrews.warpWard, new ItemStack(Items.NETHER_WART), new ItemStack(salisMundus), new ItemStack(bathSalts), new ItemStack(amber)); } diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index d73ec0eee..c72ea6eb5 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -318,7 +318,7 @@ public final class ModCraftingRecipes { int recipeListSize = CraftingManager.getInstance().getRecipeList().size(); // Lexicon Recipe - addShapelessOreDictRecipe(new ItemStack(ModItems.lexicon), "treeSapling", Items.book); + addShapelessOreDictRecipe(new ItemStack(ModItems.lexicon), "treeSapling", Items.BOOK); recipeLexicon = BotaniaAPI.getLatestAddedRecipe(); // Petal/Dye Recipes @@ -331,20 +331,20 @@ public final class ModCraftingRecipes { recipesDyes = BotaniaAPI.getLatestAddedRecipes(16); // Vanilla flowers + mortar and pestle to dye - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 1, EnumDyeColor.YELLOW.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.yellow_flower, 1, BlockFlower.EnumFlowerType.DANDELION.getMeta())); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 1, EnumDyeColor.RED.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.red_flower, 1, BlockFlower.EnumFlowerType.POPPY.getMeta())); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 1, EnumDyeColor.LIGHT_BLUE.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.red_flower, 1, BlockFlower.EnumFlowerType.BLUE_ORCHID.getMeta())); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 1, EnumDyeColor.MAGENTA.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.red_flower, 1, BlockFlower.EnumFlowerType.ALLIUM.getMeta())); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 1, EnumDyeColor.SILVER.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.red_flower, 1, BlockFlower.EnumFlowerType.HOUSTONIA.getMeta())); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 1, EnumDyeColor.RED.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.red_flower, 1, BlockFlower.EnumFlowerType.RED_TULIP.getMeta())); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 1, EnumDyeColor.ORANGE.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.red_flower, 1, BlockFlower.EnumFlowerType.ORANGE_TULIP.getMeta())); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 1, EnumDyeColor.SILVER.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.red_flower, 1, BlockFlower.EnumFlowerType.WHITE_TULIP.getMeta())); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 1, EnumDyeColor.PINK.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.red_flower, 1, BlockFlower.EnumFlowerType.PINK_TULIP.getMeta())); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 1, EnumDyeColor.SILVER.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.red_flower, 1, BlockFlower.EnumFlowerType.OXEYE_DAISY.getMeta())); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 2, EnumDyeColor.YELLOW.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.double_plant, 1, BlockDoublePlant.EnumPlantType.SUNFLOWER.getMeta())); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 2, EnumDyeColor.MAGENTA.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.double_plant, 1, BlockDoublePlant.EnumPlantType.SYRINGA.getMeta())); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 2, EnumDyeColor.RED.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.double_plant, 1, BlockDoublePlant.EnumPlantType.ROSE.getMeta())); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 2, EnumDyeColor.PINK.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.double_plant, 1, BlockDoublePlant.EnumPlantType.PAEONIA.getMeta())); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 1, EnumDyeColor.YELLOW.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.YELLOW_FLOWER, 1, BlockFlower.EnumFlowerType.DANDELION.getMeta())); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 1, EnumDyeColor.RED.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.RED_FLOWER, 1, BlockFlower.EnumFlowerType.POPPY.getMeta())); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 1, EnumDyeColor.LIGHT_BLUE.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.RED_FLOWER, 1, BlockFlower.EnumFlowerType.BLUE_ORCHID.getMeta())); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 1, EnumDyeColor.MAGENTA.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.RED_FLOWER, 1, BlockFlower.EnumFlowerType.ALLIUM.getMeta())); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 1, EnumDyeColor.SILVER.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.RED_FLOWER, 1, BlockFlower.EnumFlowerType.HOUSTONIA.getMeta())); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 1, EnumDyeColor.RED.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.RED_FLOWER, 1, BlockFlower.EnumFlowerType.RED_TULIP.getMeta())); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 1, EnumDyeColor.ORANGE.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.RED_FLOWER, 1, BlockFlower.EnumFlowerType.ORANGE_TULIP.getMeta())); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 1, EnumDyeColor.SILVER.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.RED_FLOWER, 1, BlockFlower.EnumFlowerType.WHITE_TULIP.getMeta())); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 1, EnumDyeColor.PINK.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.RED_FLOWER, 1, BlockFlower.EnumFlowerType.PINK_TULIP.getMeta())); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 1, EnumDyeColor.SILVER.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.RED_FLOWER, 1, BlockFlower.EnumFlowerType.OXEYE_DAISY.getMeta())); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 2, EnumDyeColor.YELLOW.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.DOUBLE_PLANT, 1, BlockDoublePlant.EnumPlantType.SUNFLOWER.getMeta())); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 2, EnumDyeColor.MAGENTA.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.DOUBLE_PLANT, 1, BlockDoublePlant.EnumPlantType.SYRINGA.getMeta())); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 2, EnumDyeColor.RED.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.DOUBLE_PLANT, 1, BlockDoublePlant.EnumPlantType.ROSE.getMeta())); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.dye, 2, EnumDyeColor.PINK.getMetadata()), new ItemStack(ModItems.pestleAndMortar), new ItemStack(Blocks.DOUBLE_PLANT, 1, BlockDoublePlant.EnumPlantType.PAEONIA.getMeta())); recipesDyesVanilla = BotaniaAPI.getLatestAddedRecipes(14); // Petal Block Recipes @@ -364,7 +364,7 @@ public final class ModCraftingRecipes { " S", "W ", "B ", 'S', "stickWood", 'W', "plankWood", - 'B', Items.bowl); + 'B', Items.BOWL); recipePestleAndMortar = BotaniaAPI.getLatestAddedRecipe(); // Wand of the Forest Recipes @@ -457,7 +457,7 @@ public final class ModCraftingRecipes { addOreDictRecipe(new ItemStack(ModItems.lens, 1, 7), " P ", "ALA", " R ", - 'P', new ItemStack(Blocks.piston), + 'P', new ItemStack(Blocks.PISTON), 'R', "dustRedstone", 'A', "gemLapis", 'L', new ItemStack(ModItems.lens)); @@ -479,9 +479,9 @@ public final class ModCraftingRecipes { for(int i = 0; i < 16; i++) addOreDictRecipe(new ItemStack(ModBlocks.unstableBlock, 2, i), "OPO", "PMP", "OPO", - 'O', new ItemStack(Blocks.obsidian), + 'O', new ItemStack(Blocks.OBSIDIAN), 'P', LibOreDict.PETAL[i], - 'M', new ItemStack(Items.ender_pearl)); + 'M', new ItemStack(Items.ENDER_PEARL)); recipesUnstableBlocks = BotaniaAPI.getLatestAddedRecipes(16); // Mana Pylon Recipe @@ -504,7 +504,7 @@ public final class ModCraftingRecipes { "RR", "RR", 'R', LibOreDict.LIVING_ROCK); recipeLivingrockDecor1 = BotaniaAPI.getLatestAddedRecipe(); - addShapelessOreDictRecipe(new ItemStack(ModBlocks.livingrock, 1, 2), new ItemStack(ModBlocks.livingrock, 1, 1), new ItemStack(Items.wheat_seeds)); + addShapelessOreDictRecipe(new ItemStack(ModBlocks.livingrock, 1, 2), new ItemStack(ModBlocks.livingrock, 1, 1), new ItemStack(Items.WHEAT_SEEDS)); recipeLivingrockDecor2 = BotaniaAPI.getLatestAddedRecipe(); addShapelessOreDictRecipe(new ItemStack(ModBlocks.livingrock, 2, 3), new ItemStack(ModBlocks.livingrock, 1, 1), "cobblestone"); recipeLivingrockDecor3 = BotaniaAPI.getLatestAddedRecipe(); @@ -516,7 +516,7 @@ public final class ModCraftingRecipes { // Livingwood Decorative Blocks addShapelessOreDictRecipe(new ItemStack(ModBlocks.livingwood, 4, 1), LibOreDict.LIVING_WOOD); recipeLivingwoodDecor1 = BotaniaAPI.getLatestAddedRecipe(); - addShapelessOreDictRecipe(new ItemStack(ModBlocks.livingwood, 1, 2), new ItemStack(ModBlocks.livingwood, 1, 1), new ItemStack(Items.wheat_seeds)); + addShapelessOreDictRecipe(new ItemStack(ModBlocks.livingwood, 1, 2), new ItemStack(ModBlocks.livingwood, 1, 1), new ItemStack(Items.WHEAT_SEEDS)); recipeLivingwoodDecor2 = BotaniaAPI.getLatestAddedRecipe(); addOreDictRecipe(new ItemStack(ModBlocks.livingwood, 4, 3), "WW", "WW", @@ -531,7 +531,7 @@ public final class ModCraftingRecipes { // Dreamwood Decorative Blocks addShapelessOreDictRecipe(new ItemStack(ModBlocks.dreamwood, 4, 1), LibOreDict.DREAM_WOOD); - addShapelessOreDictRecipe(new ItemStack(ModBlocks.dreamwood, 1, 2), new ItemStack(ModBlocks.dreamwood, 1, 1), new ItemStack(Items.wheat_seeds)); + addShapelessOreDictRecipe(new ItemStack(ModBlocks.dreamwood, 1, 2), new ItemStack(ModBlocks.dreamwood, 1, 1), new ItemStack(Items.WHEAT_SEEDS)); addOreDictRecipe(new ItemStack(ModBlocks.dreamwood, 4, 3), "WW", "WW", 'W', new ItemStack(ModBlocks.dreamwood, 1, 1)); @@ -561,7 +561,7 @@ public final class ModCraftingRecipes { addOreDictRecipe(new ItemStack(ModBlocks.manaVoid), "SSS", "O O", "SSS", 'S', LibOreDict.LIVING_ROCK, - 'O', new ItemStack(Blocks.obsidian)); + 'O', new ItemStack(Blocks.OBSIDIAN)); recipeManaVoid = BotaniaAPI.getLatestAddedRecipe(); // Mana Tablet Recipe @@ -579,7 +579,7 @@ public final class ModCraftingRecipes { addOreDictRecipe(new ItemStack(ModBlocks.manaDetector), "RSR", "SCS", "RSR", 'R', "dustRedstone", - 'C', new ItemStack(Items.comparator), + 'C', new ItemStack(Items.COMPARATOR), 'S', LibOreDict.LIVING_ROCK); recipeManaDetector = BotaniaAPI.getLatestAddedRecipe(); @@ -589,7 +589,7 @@ public final class ModCraftingRecipes { 'S', new ItemStack(ModBlocks.spreader, 1, 1), 'M', LibOreDict.RUNE[8], 'D', LibOreDict.MANA_DIAMOND, - 'T', new ItemStack(Blocks.tnt), + 'T', new ItemStack(Blocks.TNT), 'W', LibOreDict.LIVING_WOOD); recipeManaBlaster = BotaniaAPI.getLatestAddedRecipe(); @@ -597,13 +597,13 @@ public final class ModCraftingRecipes { addOreDictRecipe(new ItemStack(ModBlocks.turntable), "WWW", "WPW", "WWW", 'W', LibOreDict.LIVING_WOOD, - 'P', Blocks.sticky_piston); + 'P', Blocks.STICKY_PISTON); recipeTurntable = BotaniaAPI.getLatestAddedRecipe(); // Fertilizer Recipes - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.fertilizer, Botania.gardenOfGlassLoaded ? 3 : 1), new ItemStack(Items.dye, 1, 15), new ItemStack(ModItems.dye, 1, Short.MAX_VALUE), new ItemStack(ModItems.dye, 1, Short.MAX_VALUE), new ItemStack(ModItems.dye, 1, Short.MAX_VALUE), new ItemStack(ModItems.dye, 1, Short.MAX_VALUE)); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.fertilizer, Botania.gardenOfGlassLoaded ? 3 : 1), new ItemStack(Items.DYE, 1, 15), new ItemStack(ModItems.dye, 1, Short.MAX_VALUE), new ItemStack(ModItems.dye, 1, Short.MAX_VALUE), new ItemStack(ModItems.dye, 1, Short.MAX_VALUE), new ItemStack(ModItems.dye, 1, Short.MAX_VALUE)); recipeFertilizerPowder = BotaniaAPI.getLatestAddedRecipe(); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.fertilizer), new ItemStack(Items.dye, 1, 15), new ItemStack(Items.dye, 1, 11), new ItemStack(Items.dye, 1, 11), new ItemStack(Items.dye, 1, 1), new ItemStack(Items.dye, 1, 1)); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.fertilizer), new ItemStack(Items.DYE, 1, 15), new ItemStack(Items.DYE, 1, 11), new ItemStack(Items.DYE, 1, 11), new ItemStack(Items.DYE, 1, 1), new ItemStack(Items.DYE, 1, 1)); recipeFerilizerDye = BotaniaAPI.getLatestAddedRecipe(); // Livingwood Twig Recipe @@ -615,7 +615,7 @@ public final class ModCraftingRecipes { // Rod of the Lands Recipe addOreDictRecipe(new ItemStack(ModItems.dirtRod), " D", " T ", "E ", - 'D', new ItemStack(Blocks.dirt), + 'D', new ItemStack(Blocks.DIRT), 'T', LibOreDict.LIVINGWOOD_TWIG, 'E', LibOreDict.RUNE[2]); recipeDirtRod = BotaniaAPI.getLatestAddedRecipe(); @@ -775,7 +775,7 @@ public final class ModCraftingRecipes { 'E', LibOreDict.RUNE[2], 'A', LibOreDict.RUNE[3], 'S', LibOreDict.MANA_STEEL, - 'L', new ItemStack(Items.leather)); + 'L', new ItemStack(Items.LEATHER)); recipeTravelBelt = BotaniaAPI.getLatestAddedRecipe(); // Tectonic Girdle Recipe @@ -784,13 +784,13 @@ public final class ModCraftingRecipes { 'E', LibOreDict.RUNE[2], 'A', LibOreDict.RUNE[1], 'S', LibOreDict.MANA_STEEL, - 'L', new ItemStack(Items.leather)); + 'L', new ItemStack(Items.LEATHER)); recipeKnocbackBelt = BotaniaAPI.getLatestAddedRecipe(); // Snowflake Pendant Recipe addOreDictRecipe(new ItemStack(ModItems.icePendant), "WS ", "S S", "MSR", - 'S', new ItemStack(Items.string), + 'S', new ItemStack(Items.STRING), 'M', LibOreDict.MANA_STEEL, 'R', LibOreDict.RUNE[0], 'W', LibOreDict.RUNE[7]); @@ -799,7 +799,7 @@ public final class ModCraftingRecipes { // Pyroclast Pendant Recipe addOreDictRecipe(new ItemStack(ModItems.lavaPendant), "MS ", "S S", "DSF", - 'S', new ItemStack(Items.string), + 'S', new ItemStack(Items.STRING), 'D', LibOreDict.MANA_STEEL, 'M', LibOreDict.RUNE[5], 'F', LibOreDict.RUNE[1]); @@ -825,7 +825,7 @@ public final class ModCraftingRecipes { "SGS", "BPB", "SGS", 'S', LibOreDict.LIVING_ROCK, 'G', "ingotGold", - 'B', new ItemStack(Items.brewing_stand), + 'B', new ItemStack(Items.BREWING_STAND), 'P', LibOreDict.MANA_PEARL); recipeAlchemyCatalyst = BotaniaAPI.getLatestAddedRecipe(); @@ -840,18 +840,18 @@ public final class ModCraftingRecipes { "MSM", "SES", "MSM", 'M', LibOreDict.MANA_STEEL, 'S', LibOreDict.LIVING_ROCK, - 'E', new ItemStack(Items.ender_eye)); + 'E', new ItemStack(Items.ENDER_EYE)); recipeForestEye = BotaniaAPI.getLatestAddedRecipe(); // Redstone Root Recipe - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.manaResource, 1, 6), "dustRedstone", new ItemStack(Blocks.tallgrass, 1, 1))); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.manaResource, 1, 6), "dustRedstone", new ItemStack(Blocks.TALLGRASS, 1, 1))); recipeRedstoneRoot = BotaniaAPI.getLatestAddedRecipe(); // Drum of the Wild Recipe addOreDictRecipe(new ItemStack(ModBlocks.forestDrum), "WLW", "WHW", "WLW", 'W', LibOreDict.LIVING_WOOD, - 'L', new ItemStack(Items.leather), + 'L', new ItemStack(Items.LEATHER), 'H', new ItemStack(ModItems.grassHorn)); recipeForestDrum = BotaniaAPI.getLatestAddedRecipe(); @@ -860,8 +860,8 @@ public final class ModCraftingRecipes { "WMP", "M M", "SM ", 'W', LibOreDict.RUNE[0], 'M', LibOreDict.MANA_STEEL, - 'P', new ItemStack(Items.fish, 1, 3), - 'S', new ItemStack(Items.fish, 1, 1)); + 'P', new ItemStack(Items.FISH, 1, 3), + 'S', new ItemStack(Items.FISH, 1, 1)); recipeWaterRing = BotaniaAPI.getLatestAddedRecipe(); // Ring of the Mantle Recipe @@ -869,7 +869,7 @@ public final class ModCraftingRecipes { "EMP", "M M", " M ", 'E', LibOreDict.RUNE[2], 'M', LibOreDict.MANA_STEEL, - 'P', new ItemStack(Items.golden_pickaxe)); + 'P', new ItemStack(Items.GOLDEN_PICKAXE)); recipeMiningRing = BotaniaAPI.getLatestAddedRecipe(); // Ring of Magnetization Recipe @@ -901,7 +901,7 @@ public final class ModCraftingRecipes { "LLL", "ILI", "FEF", 'L', LibOreDict.LIFE_ESSENCE, 'I', LibOreDict.ELEMENTIUM, - 'F', new ItemStack(Items.feather), + 'F', new ItemStack(Items.FEATHER), 'E', LibOreDict.ENDER_AIR_BOTTLE); recipeFlightTiara = BotaniaAPI.getLatestAddedRecipe(); @@ -929,33 +929,33 @@ public final class ModCraftingRecipes { // Quartz Recipes if(ConfigHandler.darkQuartzEnabled) - recipeDarkQuartz = addQuartzRecipes(0, Items.coal, ModFluffBlocks.darkQuartz, ModFluffBlocks.darkQuartzStairs, ModFluffBlocks.darkQuartzSlab); + recipeDarkQuartz = addQuartzRecipes(0, Items.COAL, ModFluffBlocks.darkQuartz, ModFluffBlocks.darkQuartzStairs, ModFluffBlocks.darkQuartzSlab); addQuartzRecipes(1, null, ModFluffBlocks.manaQuartz, ModFluffBlocks.manaQuartzStairs, ModFluffBlocks.manaQuartzSlab); - recipeBlazeQuartz = addQuartzRecipes(2, Items.blaze_powder, ModFluffBlocks.blazeQuartz, ModFluffBlocks.blazeQuartzStairs, ModFluffBlocks.blazeQuartzSlab); + recipeBlazeQuartz = addQuartzRecipes(2, Items.BLAZE_POWDER, ModFluffBlocks.blazeQuartz, ModFluffBlocks.blazeQuartzStairs, ModFluffBlocks.blazeQuartzSlab); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.quartz, 8, 3), "QQQ", "QCQ", "QQQ", 'Q', "gemQuartz", - 'C', new ItemStack(Blocks.red_flower, 1, 2))); + 'C', new ItemStack(Blocks.RED_FLOWER, 1, 2))); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.quartz, 8, 3), "QQQ", "QCQ", "QQQ", 'Q', "gemQuartz", - 'C', new ItemStack(Blocks.red_flower, 1, 7))); + 'C', new ItemStack(Blocks.RED_FLOWER, 1, 7))); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.quartz, 8, 3), "QQQ", "QCQ", "QQQ", 'Q', "gemQuartz", - 'C', new ItemStack(Blocks.double_plant, 1, 1))); + 'C', new ItemStack(Blocks.DOUBLE_PLANT, 1, 1))); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.quartz, 8, 3), "QQQ", "QCQ", "QQQ", 'Q', "gemQuartz", - 'C', new ItemStack(Blocks.double_plant, 1, 5))); + 'C', new ItemStack(Blocks.DOUBLE_PLANT, 1, 5))); recipesLavenderQuartz = BotaniaAPI.getLatestAddedRecipes(4); addQuartzRecipes(3, null, ModFluffBlocks.lavenderQuartz, ModFluffBlocks.lavenderQuartzStairs, ModFluffBlocks.lavenderQuartzSlab); - recipeRedQuartz = addQuartzRecipes(4, Items.redstone, ModFluffBlocks.redQuartz, ModFluffBlocks.redQuartzStairs, ModFluffBlocks.redQuartzSlab); + recipeRedQuartz = addQuartzRecipes(4, Items.REDSTONE, ModFluffBlocks.redQuartz, ModFluffBlocks.redQuartzStairs, ModFluffBlocks.redQuartzSlab); addQuartzRecipes(5, null, ModFluffBlocks.elfQuartz, ModFluffBlocks.elfQuartzStairs, ModFluffBlocks.elfQuartzSlab); - recipeSunnyQuartz = addQuartzRecipes(6, Item.getItemFromBlock(Blocks.double_plant), ModFluffBlocks.sunnyQuartz, ModFluffBlocks.sunnyQuartzStairs, ModFluffBlocks.sunnyQuartzSlab); + recipeSunnyQuartz = addQuartzRecipes(6, Item.getItemFromBlock(Blocks.DOUBLE_PLANT), ModFluffBlocks.sunnyQuartz, ModFluffBlocks.sunnyQuartzStairs, ModFluffBlocks.sunnyQuartzSlab); // Alfheim Portal Recipe addOreDictRecipe(new ItemStack(ModBlocks.alfPortal), @@ -969,13 +969,13 @@ public final class ModCraftingRecipes { " T ", "TPT", " E ", 'T', LibOreDict.TERRASTEEL_NUGGET, 'P', new ItemStack(ModBlocks.pylon), - 'E', new ItemStack(Items.ender_eye)); + 'E', new ItemStack(Items.ENDER_EYE)); recipeNaturaPylon = BotaniaAPI.getLatestAddedRecipe(); // Rod of the Seas Recipe addOreDictRecipe(new ItemStack(ModItems.waterRod), " B", " T ", "R ", - 'B', new ItemStack(Items.potionitem), + 'B', new ItemStack(Items.POTIONITEM), 'T', LibOreDict.LIVINGWOOD_TWIG, 'R', LibOreDict.RUNE[0]); recipeWaterRod = BotaniaAPI.getLatestAddedRecipe(); @@ -1090,7 +1090,7 @@ public final class ModCraftingRecipes { // Rod of the Skies Recipe addOreDictRecipe(new ItemStack(ModItems.tornadoRod), " F", " T ", "R ", - 'F', new ItemStack(Items.feather), + 'F', new ItemStack(Items.FEATHER), 'T', LibOreDict.LIVINGWOOD_TWIG, 'R', LibOreDict.RUNE[3]); recipeTornadoRod = BotaniaAPI.getLatestAddedRecipe(); @@ -1098,7 +1098,7 @@ public final class ModCraftingRecipes { // Rod of the Hells Recipe addOreDictRecipe(new ItemStack(ModItems.fireRod), " F", " T ", "R ", - 'F', new ItemStack(Items.blaze_powder), + 'F', new ItemStack(Items.BLAZE_POWDER), 'T', LibOreDict.LIVINGWOOD_TWIG, 'R', LibOreDict.RUNE[1]); recipeFireRod = BotaniaAPI.getLatestAddedRecipe(); @@ -1106,7 +1106,7 @@ public final class ModCraftingRecipes { // Vine Ball Recipe addOreDictRecipe(new ItemStack(ModItems.vineBall), "VVV", "VVV", "VVV", - 'V', new ItemStack(Blocks.vine)); + 'V', new ItemStack(Blocks.VINE)); recipeVineBall = BotaniaAPI.getLatestAddedRecipe(); // Livingwood Slingshot Recipe @@ -1117,7 +1117,7 @@ public final class ModCraftingRecipes { recipeSlingshot = BotaniaAPI.getLatestAddedRecipe(); // Moss Stone Recipe - addShapelessOreDictRecipe(new ItemStack(Blocks.mossy_cobblestone), "cobblestone", new ItemStack(ModItems.vineBall)); + addShapelessOreDictRecipe(new ItemStack(Blocks.MOSSY_COBBLESTONE), "cobblestone", new ItemStack(ModItems.vineBall)); recipeMossStone = BotaniaAPI.getLatestAddedRecipe(); // Influence Lens Recipe @@ -1140,7 +1140,7 @@ public final class ModCraftingRecipes { addOreDictRecipe(new ItemStack(ModItems.lens, 1, 14), " E ", "WLW", " E ", 'E', LibOreDict.ELEMENTIUM, - 'W', new ItemStack(Blocks.wool, 1, Short.MAX_VALUE), + 'W', new ItemStack(Blocks.WOOL, 1, Short.MAX_VALUE), 'L', new ItemStack(ModItems.lens)); recipeLensPaint = BotaniaAPI.getLatestAddedRecipe(); @@ -1153,7 +1153,7 @@ public final class ModCraftingRecipes { recipeLensRedirect = BotaniaAPI.getLatestAddedRecipe(); // Celebratory Lens Recipe - addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 1, 20), new ItemStack(ModItems.lens), new ItemStack(Items.fireworks), LibOreDict.ELEMENTIUM); + addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 1, 20), new ItemStack(ModItems.lens), new ItemStack(Items.FIREWORKS), LibOreDict.ELEMENTIUM); recipeLensFirework = BotaniaAPI.getLatestAddedRecipe(); // Flare Lens Recipe @@ -1166,7 +1166,7 @@ public final class ModCraftingRecipes { "F", "S", "D", 'F', new ItemStack(ModBlocks.shinyFlower, 1, i), 'S', new ItemStack(ModItems.grassSeeds), - 'D', new ItemStack(Blocks.dirt)); + 'D', new ItemStack(Blocks.DIRT)); recipesMiniIsland = BotaniaAPI.getLatestAddedRecipes(16); // Gaia Pylon Recipe @@ -1181,12 +1181,12 @@ public final class ModCraftingRecipes { addOreDictRecipe(new ItemStack(ModBlocks.forestDrum, 1, 1), "WLW", "WEW", "WLW", 'W', LibOreDict.DREAM_WOOD, - 'L', new ItemStack(Items.leather), + 'L', new ItemStack(Items.LEATHER), 'E', LibOreDict.ELEMENTIUM); recipeGatherDrum = BotaniaAPI.getLatestAddedRecipe(); // Mana Lens: Kindle Recipe - addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 1, 15), new ItemStack(ModItems.lens), new ItemStack(Items.fire_charge)); + addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 1, 15), new ItemStack(ModItems.lens), new ItemStack(Items.FIRE_CHARGE)); recipeLensFire = BotaniaAPI.getLatestAddedRecipe(); // Mana Lens: Piston Recipe @@ -1210,11 +1210,11 @@ public final class ModCraftingRecipes { recipesLaputaShardUpgrade = BotaniaAPI.getLatestAddedRecipes(19); // Necrodermal Virus Recipe - addShapelessOreDictRecipe(new ItemStack(ModItems.virus), LibOreDict.PIXIE_DUST, new ItemStack(ModItems.vineBall), new ItemStack(Items.magma_cream), new ItemStack(Items.fermented_spider_eye), new ItemStack(Items.ender_eye), new ItemStack(Items.skull, 1, 2)); + addShapelessOreDictRecipe(new ItemStack(ModItems.virus), LibOreDict.PIXIE_DUST, new ItemStack(ModItems.vineBall), new ItemStack(Items.MAGMA_CREAM), new ItemStack(Items.FERMENTED_SPIDER_EYE), new ItemStack(Items.ENDER_EYE), new ItemStack(Items.SKULL, 1, 2)); recipeVirusZombie = BotaniaAPI.getLatestAddedRecipe(); // Nullodermal Virus Recipe - addShapelessOreDictRecipe(new ItemStack(ModItems.virus, 1, 1), LibOreDict.PIXIE_DUST, new ItemStack(ModItems.vineBall), new ItemStack(Items.magma_cream), new ItemStack(Items.fermented_spider_eye), new ItemStack(Items.ender_eye), new ItemStack(Items.skull)); + addShapelessOreDictRecipe(new ItemStack(ModItems.virus, 1, 1), LibOreDict.PIXIE_DUST, new ItemStack(ModItems.vineBall), new ItemStack(Items.MAGMA_CREAM), new ItemStack(Items.FERMENTED_SPIDER_EYE), new ItemStack(Items.ENDER_EYE), new ItemStack(Items.SKULL)); recipeVirusSkeleton = BotaniaAPI.getLatestAddedRecipe(); // Ring of Far Reach Recipe @@ -1231,9 +1231,9 @@ public final class ModCraftingRecipes { // Life Imbuer Recipe addOreDictRecipe(new ItemStack(ModBlocks.spawnerClaw), "BSB", "PMP", "PEP", - 'B', new ItemStack(Items.blaze_rod), + 'B', new ItemStack(Items.BLAZE_ROD), 'S', LibOreDict.ELEMENTIUM, - 'P', new ItemStack(Blocks.prismarine, 1, 2), + 'P', new ItemStack(Blocks.PRISMARINE, 1, 2), 'M', new ItemStack(ModBlocks.storage), 'E', LibOreDict.ENDER_AIR_BOTTLE); recipeSpawnerClaw = BotaniaAPI.getLatestAddedRecipe(); @@ -1252,22 +1252,22 @@ public final class ModCraftingRecipes { // Nether Brick Recipe GameRegistry.addRecipe(new ItemStack(ModBlocks.customBrick, 4, 0), " B ", "BSB", " B ", - 'B', new ItemStack(Blocks.netherrack), - 'S', new ItemStack(Blocks.stonebrick)); + '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)); + '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)); + 'B', new ItemStack(Blocks.SNOW), + 'S', new ItemStack(Blocks.STONEBRICK)); recipeSnowBrick = BotaniaAPI.getLatestAddedRecipe(); // Roof Tile Recipe @@ -1289,24 +1289,24 @@ public final class ModCraftingRecipes { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.enderEye), "RER", "EOE", "RER", 'R', "dustRedstone", - 'E', new ItemStack(Items.ender_eye), - 'O', new ItemStack(Blocks.obsidian))); + 'E', new ItemStack(Items.ENDER_EYE), + 'O', new ItemStack(Blocks.OBSIDIAN))); recipeEnderEyeBlock = BotaniaAPI.getLatestAddedRecipe(); // The Spectator Recipe addOreDictRecipe(new ItemStack(ModItems.itemFinder), " I ", "IYI", "IEI", 'I', "ingotIron", - 'Y', new ItemStack(Items.ender_eye), + 'Y', new ItemStack(Items.ENDER_EYE), 'E', "gemEmerald"); recipeItemFinder = BotaniaAPI.getLatestAddedRecipe(); // Crimson Pendant Recipe addOreDictRecipe(new ItemStack(ModItems.superLavaPendant), "BBB", "BPB", "NGN", - 'B', new ItemStack(Items.blaze_rod), + 'B', new ItemStack(Items.BLAZE_ROD), 'P', new ItemStack(ModItems.lavaPendant), - 'N', new ItemStack(Blocks.nether_brick), + 'N', new ItemStack(Blocks.NETHER_BRICK), 'G', LibOreDict.LIFE_ESSENCE); recipeSuperLavaPendant = BotaniaAPI.getLatestAddedRecipe(); @@ -1314,9 +1314,9 @@ public final class ModCraftingRecipes { addOreDictRecipe(new ItemStack(ModItems.enderHand), "PLO", "LEL", "OL ", 'P', LibOreDict.MANA_PEARL, - 'L', new ItemStack(Items.leather), - 'E', new ItemStack(Blocks.ender_chest), - 'O', new ItemStack(Blocks.obsidian)); + 'L', new ItemStack(Items.LEATHER), + 'E', new ItemStack(Blocks.ENDER_CHEST), + 'O', new ItemStack(Blocks.OBSIDIAN)); recipeEnderHand = BotaniaAPI.getLatestAddedRecipe(); // Vitreous Pickaxe Recipe @@ -1332,14 +1332,14 @@ public final class ModCraftingRecipes { "EPE", "EOE", 'E', LibOreDict.ELEMENTIUM, 'P', LibOreDict.PIXIE_DUST, - 'O', new ItemStack(Blocks.obsidian)); + 'O', new ItemStack(Blocks.OBSIDIAN)); recipeStarfield = BotaniaAPI.getLatestAddedRecipe(); // Spark Recipe for(int i = 0; i < 16; i++) addOreDictRecipe(new ItemStack(ModItems.spark), " P ", "BNB", " P ", - 'B', new ItemStack(Items.blaze_powder), + 'B', new ItemStack(Items.BLAZE_POWDER), 'P', LibOreDict.PETAL[i], 'N', "nuggetGold"); recipesSpark = BotaniaAPI.getLatestAddedRecipes(16); @@ -1370,7 +1370,7 @@ public final class ModCraftingRecipes { recipeGravityRod = BotaniaAPI.getLatestAddedRecipe(); // Timeless Ivy Recipe - addShapelessOreDictRecipe(new ItemStack(ModItems.regenIvy), new ItemStack(Blocks.vine), LibOreDict.LIFE_ESSENCE, LibOreDict.ELEMENTIUM); + addShapelessOreDictRecipe(new ItemStack(ModItems.regenIvy), new ItemStack(Blocks.VINE), LibOreDict.LIFE_ESSENCE, LibOreDict.ELEMENTIUM); recipeRegenIvy = BotaniaAPI.getLatestAddedRecipe(); // Gaia Mana Spreader Recipe @@ -1413,7 +1413,7 @@ public final class ModCraftingRecipes { addOreDictRecipe(new ItemStack(ModBlocks.brewery), "RSR", "RAR", "RMR", 'R', LibOreDict.LIVING_ROCK, - 'S', new ItemStack(Items.brewing_stand), + 'S', new ItemStack(Items.BREWING_STAND), 'A', LibOreDict.RUNE[8], 'M', new ItemStack(ModBlocks.storage)); recipeBrewery = BotaniaAPI.getLatestAddedRecipe(); @@ -1422,7 +1422,7 @@ public final class ModCraftingRecipes { addOreDictRecipe(new ItemStack(ModItems.bloodPendant), " P ", "PGP", "DP ", 'P', LibOreDict.PRISMARINE_SHARD, - 'G', new ItemStack(Items.ghast_tear), + 'G', new ItemStack(Items.GHAST_TEAR), 'D', LibOreDict.MANA_DIAMOND); recipeBloodPendant = BotaniaAPI.getLatestAddedRecipe(); @@ -1439,10 +1439,10 @@ public final class ModCraftingRecipes { recipeTerraPlate = BotaniaAPI.getLatestAddedRecipe(); // Red String Recipe - addShapelessOreDictRecipe(new ItemStack(ModItems.manaResource, 1, 12), new ItemStack(Items.string), "blockRedstone", LibOreDict.PIXIE_DUST, LibOreDict.ENDER_AIR_BOTTLE); + addShapelessOreDictRecipe(new ItemStack(ModItems.manaResource, 1, 12), new ItemStack(Items.STRING), "blockRedstone", LibOreDict.PIXIE_DUST, LibOreDict.ENDER_AIR_BOTTLE); recipeRedString = BotaniaAPI.getLatestAddedRecipe(); // Are you in a pinch? - addShapelessOreDictRecipe(new ItemStack(ModItems.manaResource, 1, 12), new ItemStack(Items.string), "blockRedstone", LibOreDict.PIXIE_DUST, LibOreDict.ENDER_AIR_BOTTLE, new ItemStack(Blocks.pumpkin)); + addShapelessOreDictRecipe(new ItemStack(ModItems.manaResource, 1, 12), new ItemStack(Items.STRING), "blockRedstone", LibOreDict.PIXIE_DUST, LibOreDict.ENDER_AIR_BOTTLE, new ItemStack(Blocks.PUMPKIN)); // Red String Container Recipe addOreDictRecipe(new ItemStack(ModBlocks.redStringContainer), @@ -1457,7 +1457,7 @@ public final class ModCraftingRecipes { "RRR", "RDS", "RRR", 'R', LibOreDict.LIVING_ROCK, 'S', LibOreDict.RED_STRING, - 'D', new ItemStack(Blocks.dispenser)); + 'D', new ItemStack(Blocks.DISPENSER)); recipeRedStringDispenser = BotaniaAPI.getLatestAddedRecipe(); // Red String Fertilizer Recipe @@ -1473,7 +1473,7 @@ public final class ModCraftingRecipes { "RRR", "RCS", "RRR", 'R', LibOreDict.LIVING_ROCK, 'S', LibOreDict.RED_STRING, - 'C', new ItemStack(Items.comparator)); + 'C', new ItemStack(Items.COMPARATOR)); recipeRedStringComparator = BotaniaAPI.getLatestAddedRecipe(); // Red String Spoofer Recipe @@ -1489,7 +1489,7 @@ public final class ModCraftingRecipes { "RRR", "RMS", "RRR", 'R', LibOreDict.LIVING_ROCK, 'S', LibOreDict.RED_STRING, - 'M', new ItemStack(Blocks.stone_button)); + 'M', new ItemStack(Blocks.STONE_BUTTON)); recipeRedStringInterceptor = BotaniaAPI.getLatestAddedRecipe(); // Rod of the Arcane Barrage Recipe @@ -1503,7 +1503,7 @@ public final class ModCraftingRecipes { // Cloak of Virtue Recipe addOreDictRecipe(new ItemStack(ModItems.holyCloak), "WWW", "GWG", "GSG", - 'W', new ItemStack(Blocks.wool), + 'W', new ItemStack(Blocks.WOOL), 'G', "dustGlowstone", 'S', LibOreDict.LIFE_ESSENCE); recipeHolyCloak = BotaniaAPI.getLatestAddedRecipe(); @@ -1511,7 +1511,7 @@ public final class ModCraftingRecipes { // Cloak of Sin Recipe addOreDictRecipe(new ItemStack(ModItems.unholyCloak), "WWW", "RWR", "RSR", - 'W', new ItemStack(Blocks.wool, 1, 15), + 'W', new ItemStack(Blocks.WOOL, 1, 15), 'R', "dustRedstone", 'S', LibOreDict.LIFE_ESSENCE); recipeUnholyCloak = BotaniaAPI.getLatestAddedRecipe(); @@ -1528,12 +1528,12 @@ public final class ModCraftingRecipes { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.lens, 1, 17), "GFG", "FLF", "GFG", 'G', "glowstone", - 'F', new ItemStack(Items.fire_charge), + 'F', new ItemStack(Items.FIRE_CHARGE), 'L', new ItemStack(ModItems.lens))); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.lens, 1, 17), "FGF", "GLG", "FGF", 'G', "glowstone", - 'F', new ItemStack(Items.fire_charge), + 'F', new ItemStack(Items.FIRE_CHARGE), 'L', new ItemStack(ModItems.lens))); recipesLensFlash = BotaniaAPI.getLatestAddedRecipes(2); @@ -1546,7 +1546,7 @@ public final class ModCraftingRecipes { 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")); + 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 @@ -1560,7 +1560,7 @@ public final class ModCraftingRecipes { "GN", "IN", " N", 'G', new ItemStack(ModBlocks.manaGlass), 'I', LibOreDict.MANA_STEEL, - 'N', new ItemStack(Items.gold_nugget)); + 'N', new ItemStack(Items.GOLD_NUGGET)); recipeMonocle = BotaniaAPI.getLatestAddedRecipe(); // Lens Clip Recipe @@ -1581,7 +1581,7 @@ public final class ModCraftingRecipes { // Rod of the Molten Core Recipe addOreDictRecipe(new ItemStack(ModItems.smeltRod), " BF", " TB", "T ", - 'B', new ItemStack(Items.blaze_rod), + 'B', new ItemStack(Items.BLAZE_ROD), 'F', LibOreDict.RUNE[1], 'T', LibOreDict.LIVINGWOOD_TWIG); recipeSmeltRod = BotaniaAPI.getLatestAddedRecipe(); @@ -1589,8 +1589,8 @@ public final class ModCraftingRecipes { // World Seed Recipe addOreDictRecipe(new ItemStack(ModItems.worldSeed, 4), "G", "S", "D", - 'G', new ItemStack(Blocks.grass), - 'S', new ItemStack(Items.wheat_seeds), + 'G', new ItemStack(Blocks.GRASS), + 'S', new ItemStack(Items.WHEAT_SEEDS), 'D', LibOreDict.DRAGONSTONE); recipeWorldSeed = BotaniaAPI.getLatestAddedRecipe(); @@ -1604,7 +1604,7 @@ public final class ModCraftingRecipes { // Thorn Chakram Recipe addOreDictRecipe(new ItemStack(ModItems.thornChakram, 2), "VVV", "VTV", "VVV", - 'V', new ItemStack(Blocks.vine), + 'V', new ItemStack(Blocks.VINE), 'T', LibOreDict.TERRA_STEEL); recipeThornChakram = BotaniaAPI.getLatestAddedRecipe(); @@ -1657,13 +1657,13 @@ public final class ModCraftingRecipes { addOreDictRecipe(new ItemStack(ModBlocks.corporeaIndex), "AOA", "OSO", "DOD", 'A', LibOreDict.ENDER_AIR_BOTTLE, - 'O', new ItemStack(Blocks.obsidian), + 'O', new ItemStack(Blocks.OBSIDIAN), 'S', new ItemStack(ModItems.corporeaSpark), 'D', LibOreDict.DRAGONSTONE); recipeCorporeaIndex = BotaniaAPI.getLatestAddedRecipe(); // Corporea Funnel Recipe - addShapelessOreDictRecipe(new ItemStack(ModBlocks.corporeaFunnel), new ItemStack(Blocks.dropper), new ItemStack(ModItems.corporeaSpark)); + addShapelessOreDictRecipe(new ItemStack(ModBlocks.corporeaFunnel), new ItemStack(Blocks.DROPPER), new ItemStack(ModItems.corporeaSpark)); recipeCorporeaFunnel = BotaniaAPI.getLatestAddedRecipe(); // Corporea Interceptor Recipe @@ -1695,36 +1695,36 @@ public final class ModCraftingRecipes { // Shimmering Mushroom Recipes for(int i = 0; i < 16; i++) { - GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.mushroom, 1, i), new ItemStack(Blocks.red_mushroom), new ItemStack(ModItems.dye, 1, i)); - GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.mushroom, 1, i), new ItemStack(Blocks.brown_mushroom), new ItemStack(ModItems.dye, 1, i)); + GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.mushroom, 1, i), new ItemStack(Blocks.RED_MUSHROOM), new ItemStack(ModItems.dye, 1, i)); + GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.mushroom, 1, i), new ItemStack(Blocks.BROWN_MUSHROOM), new ItemStack(ModItems.dye, 1, i)); } recipesMushrooms = BotaniaAPI.getLatestAddedRecipes(32); - GameRegistry.addShapelessRecipe(new ItemStack(Items.mushroom_stew), new ItemStack(ModBlocks.mushroom, 1, Short.MAX_VALUE), new ItemStack(ModBlocks.mushroom, 1, Short.MAX_VALUE), new ItemStack(Items.bowl)); + GameRegistry.addShapelessRecipe(new ItemStack(Items.MUSHROOM_STEW), new ItemStack(ModBlocks.mushroom, 1, Short.MAX_VALUE), new ItemStack(ModBlocks.mushroom, 1, Short.MAX_VALUE), new ItemStack(Items.BOWL)); // Ring of Correction Recipe addOreDictRecipe(new ItemStack(ModItems.swapRing), "CM ", "M M", " M ", - 'C', new ItemStack(Blocks.clay), + 'C', new ItemStack(Blocks.CLAY), 'M', LibOreDict.MANA_STEEL); recipeSwapRing = BotaniaAPI.getLatestAddedRecipe(); // Horn of the Covering Recipe - addShapelessOreDictRecipe(new ItemStack(ModItems.grassHorn, 1, 2), new ItemStack(ModItems.grassHorn), new ItemStack(Items.snowball)); + addShapelessOreDictRecipe(new ItemStack(ModItems.grassHorn, 1, 2), new ItemStack(ModItems.grassHorn), new ItemStack(Items.SNOWBALL)); recipeSnowHorn = BotaniaAPI.getLatestAddedRecipe(); // Flower Pouch Recipe GameRegistry.addShapedRecipe(new ItemStack(ModItems.flowerBag), "WPW", "W W", " W ", 'P', new ItemStack(ModItems.petal, 1, Short.MAX_VALUE), - 'W', new ItemStack(Blocks.wool, 1, Short.MAX_VALUE)); + 'W', new ItemStack(Blocks.WOOL, 1, Short.MAX_VALUE)); recipeFlowerBag = BotaniaAPI.getLatestAddedRecipe(); // Phantom Ink Recipe - addShapelessOreDictRecipe(new ItemStack(ModItems.phantomInk, 4), LibOreDict.MANA_PEARL, "dye", "blockGlass", new ItemStack(Items.glass_bottle), new ItemStack(Items.glass_bottle), new ItemStack(Items.glass_bottle), new ItemStack(Items.glass_bottle)); + addShapelessOreDictRecipe(new ItemStack(ModItems.phantomInk, 4), LibOreDict.MANA_PEARL, "dye", "blockGlass", new ItemStack(Items.GLASS_BOTTLE), new ItemStack(Items.GLASS_BOTTLE), new ItemStack(Items.GLASS_BOTTLE), new ItemStack(Items.GLASS_BOTTLE)); recipePhantomInk = BotaniaAPI.getLatestAddedRecipe(); // Minecart with Mana Pool Recipe - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.poolMinecart), new ItemStack(Items.minecart), new ItemStack(ModBlocks.pool)); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.poolMinecart), new ItemStack(Items.MINECART), new ItemStack(ModBlocks.pool)); recipePoolCart = BotaniaAPI.getLatestAddedRecipe(); // Mana Pump Recipe @@ -1732,7 +1732,7 @@ public final class ModCraftingRecipes { "SSS", "IBI", "SSS", 'S', LibOreDict.LIVING_ROCK, 'I', LibOreDict.MANA_STEEL, - 'B', new ItemStack(Items.bucket)); + 'B', new ItemStack(Items.BUCKET)); recipePump = BotaniaAPI.getLatestAddedRecipe(); // Double Petal Recipes @@ -1741,7 +1741,7 @@ public final class ModCraftingRecipes { recipesPetalsDouble = BotaniaAPI.getLatestAddedRecipes(16); // Resolute Ivy Recipe - addShapelessOreDictRecipe(new ItemStack(ModItems.keepIvy), LibOreDict.PIXIE_DUST, new ItemStack(Blocks.vine), LibOreDict.ENDER_AIR_BOTTLE); + addShapelessOreDictRecipe(new ItemStack(ModItems.keepIvy), LibOreDict.PIXIE_DUST, new ItemStack(Blocks.VINE), LibOreDict.ENDER_AIR_BOTTLE); recipeKeepIvy = BotaniaAPI.getLatestAddedRecipe(); // Black Hole Talisman Recipe @@ -1756,10 +1756,10 @@ public final class ModCraftingRecipes { if (Botania.quarkLoaded) { recipe18StoneChisel = new ArrayList<>(); ItemStack[] quarkBlocks = { - new ItemStack(Block.blockRegistry.getObject(new ResourceLocation("Quark", "world_stone_bricks")), 1, 2), - new ItemStack(Block.blockRegistry.getObject(new ResourceLocation("Quark", "world_stone_bricks")), 1, 3), - new ItemStack(Block.blockRegistry.getObject(new ResourceLocation("Quark", "world_stone_bricks")), 1, 1), - new ItemStack(Block.blockRegistry.getObject(new ResourceLocation("Quark", "world_stone_bricks")), 1, 0), + new ItemStack(Block.REGISTRY.getObject(new ResourceLocation("Quark", "world_stone_bricks")), 1, 2), + new ItemStack(Block.REGISTRY.getObject(new ResourceLocation("Quark", "world_stone_bricks")), 1, 3), + new ItemStack(Block.REGISTRY.getObject(new ResourceLocation("Quark", "world_stone_bricks")), 1, 1), + new ItemStack(Block.REGISTRY.getObject(new ResourceLocation("Quark", "world_stone_bricks")), 1, 0), }; for(int i = 0; i < 4; i++) { @@ -1775,7 +1775,7 @@ public final class ModCraftingRecipes { "BBB", "BBB", "BBB", 'B', Botania.gardenOfGlassLoaded ? "powderBlaze" : "rodBlaze"); recipeBlazeBlock = BotaniaAPI.getLatestAddedRecipe(); - addShapelessOreDictRecipe(new ItemStack(Botania.gardenOfGlassLoaded ? Items.blaze_powder : Items.blaze_rod, 9), LibOreDict.BLAZE_BLOCK); + addShapelessOreDictRecipe(new ItemStack(Botania.gardenOfGlassLoaded ? Items.BLAZE_POWDER : Items.BLAZE_ROD, 9), LibOreDict.BLAZE_BLOCK); // Metamorphic Petal Apothecary Recipes for(int i = 0; i < 8; i++) @@ -1803,8 +1803,8 @@ public final class ModCraftingRecipes { // Incense Stick Recipe addOreDictRecipe(new ItemStack(ModItems.incenseStick), " G", " B ", "T ", - 'G', new ItemStack(Items.ghast_tear), - 'B', new ItemStack(Items.blaze_powder), + 'G', new ItemStack(Items.GHAST_TEAR), + 'B', new ItemStack(Items.BLAZE_POWDER), 'T', LibOreDict.LIVINGWOOD_TWIG); recipeIncenseStick = BotaniaAPI.getLatestAddedRecipe(); @@ -1833,14 +1833,14 @@ public final class ModCraftingRecipes { recipeHourglass = BotaniaAPI.getLatestAddedRecipe(); // Spectral Rail Recipe - GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.ghostRail), new ItemStack(Blocks.rail), new ItemStack(ModBlocks.platform, 1, 1)); + GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.ghostRail), new ItemStack(Blocks.RAIL), new ItemStack(ModBlocks.platform, 1, 1)); recipeGhostRail = BotaniaAPI.getLatestAddedRecipe(); // Drum of the Canopy Recipe addOreDictRecipe(new ItemStack(ModBlocks.forestDrum, 1, 2), "WLW", "WHW", "WLW", 'W', LibOreDict.LIVING_WOOD, - 'L', new ItemStack(Items.leather), + 'L', new ItemStack(Items.LEATHER), 'H', new ItemStack(ModItems.grassHorn, 1, 1)); recipeCanopyDrum = BotaniaAPI.getLatestAddedRecipe(); @@ -1856,12 +1856,12 @@ public final class ModCraftingRecipes { if(Botania.gardenOfGlassLoaded) addOreDictRecipe(new ItemStack(ModBlocks.cocoon), "SSS", "SFS", "SIS", - 'S', new ItemStack(Items.string), + 'S', new ItemStack(Items.STRING), 'F', new ItemStack(ModBlocks.felPumpkin), 'I', LibOreDict.MANA_STEEL); else addOreDictRecipe(new ItemStack(ModBlocks.cocoon), "SSS", "SPS", "SDS", - 'S', new ItemStack(Items.string), + 'S', new ItemStack(Items.STRING), 'P', LibOreDict.PIXIE_DUST, 'D', LibOreDict.DRAGONSTONE); recipeCocoon = BotaniaAPI.getLatestAddedRecipe(); @@ -1869,11 +1869,11 @@ public final class ModCraftingRecipes { // Fel Pumpkin GameRegistry.addRecipe(new ItemStack(ModBlocks.felPumpkin), " S ", "BPF", " G ", - 'S', new ItemStack(Items.string), - 'B', new ItemStack(Items.bone), - 'P', new ItemStack(Blocks.pumpkin), - 'F', new ItemStack(Items.rotten_flesh), - 'G', new ItemStack(Items.gunpowder)); + 'S', new ItemStack(Items.STRING), + 'B', new ItemStack(Items.BONE), + 'P', new ItemStack(Blocks.PUMPKIN), + 'F', new ItemStack(Items.ROTTEN_FLESH), + 'G', new ItemStack(Items.GUNPOWDER)); recipeFelPumpkin = BotaniaAPI.getLatestAddedRecipe(); // Luminizer Recipe @@ -1903,25 +1903,25 @@ public final class ModCraftingRecipes { addOreDictRecipe(new ItemStack(ModItems.cacophonium), " G ", "GNG", "GG ", 'G', "ingotGold", - 'N', new ItemStack(Blocks.noteblock)); + 'N', new ItemStack(Blocks.NOTEBLOCK)); else addOreDictRecipe(new ItemStack(ModItems.cacophonium), " G ", "GNG", "GG ", 'G', "ingotBrass", - 'N', new ItemStack(Blocks.noteblock)); + 'N', new ItemStack(Blocks.NOTEBLOCK)); recipeCacophonium = BotaniaAPI.getLatestAddedRecipe(); // Manastorm Charge Recipe addOreDictRecipe(new ItemStack(ModBlocks.manaBomb), "LTL", "TGT", "LTL", 'L', LibOreDict.LIVING_WOOD, - 'T', new ItemStack(Blocks.tnt), + 'T', new ItemStack(Blocks.TNT), 'G', LibOreDict.LIFE_ESSENCE); recipeManaBomb = BotaniaAPI.getLatestAddedRecipe(); // Cobweb Recipe - addOreDictRecipe(new ItemStack(Blocks.web), + addOreDictRecipe(new ItemStack(Blocks.WEB), "S S", " M ", "S S", - 'S', new ItemStack(Items.string), + 'S', new ItemStack(Items.STRING), 'M', LibOreDict.MANA_STRING); recipeCobweb = BotaniaAPI.getLatestAddedRecipe(); @@ -1957,7 +1957,7 @@ public final class ModCraftingRecipes { // Flare Chakram Recipe addOreDictRecipe(new ItemStack(ModItems.thornChakram, 2, 1), "BBB", "CPC", "BBB", - 'B', new ItemStack(Items.blaze_powder), + 'B', new ItemStack(Items.BLAZE_POWDER), 'P', LibOreDict.PIXIE_DUST, 'C', new ItemStack(ModItems.thornChakram)); recipeFireChakram = BotaniaAPI.getLatestAddedRecipe(); @@ -1976,7 +1976,7 @@ public final class ModCraftingRecipes { "SSS", "RL ", "SSS", 'S', new ItemStack(ModFluffBlocks.livingwoodSlab), 'R', LibOreDict.RUNE[3], - 'L', new ItemStack(Items.leather)); + 'L', new ItemStack(Items.LEATHER)); recipeBellows = BotaniaAPI.getLatestAddedRecipe(); // Manaweave Cloth Recipe @@ -2017,26 +2017,26 @@ public final class ModCraftingRecipes { // Pavement Recipes addShapelessOreDictRecipe(new ItemStack(ModFluffBlocks.pavement, 3, 0), LibOreDict.LIVING_ROCK, "cobblestone", "gravel"); - addShapelessOreDictRecipe(new ItemStack(ModFluffBlocks.pavement, 3, 1), LibOreDict.LIVING_ROCK, "cobblestone", "gravel", new ItemStack(Items.coal)); - addShapelessOreDictRecipe(new ItemStack(ModFluffBlocks.pavement, 3, 2), LibOreDict.LIVING_ROCK, "cobblestone", "gravel", new ItemStack(Items.dye, 1, 4)); - addShapelessOreDictRecipe(new ItemStack(ModFluffBlocks.pavement, 3, 3), LibOreDict.LIVING_ROCK, "cobblestone", "gravel", new ItemStack(Items.redstone)); - addShapelessOreDictRecipe(new ItemStack(ModFluffBlocks.pavement, 3, 4), LibOreDict.LIVING_ROCK, "cobblestone", "gravel", new ItemStack(Items.wheat)); - addShapelessOreDictRecipe(new ItemStack(ModFluffBlocks.pavement, 3, 5), LibOreDict.LIVING_ROCK, "cobblestone", "gravel", new ItemStack(Items.slime_ball)); + addShapelessOreDictRecipe(new ItemStack(ModFluffBlocks.pavement, 3, 1), LibOreDict.LIVING_ROCK, "cobblestone", "gravel", new ItemStack(Items.COAL)); + addShapelessOreDictRecipe(new ItemStack(ModFluffBlocks.pavement, 3, 2), LibOreDict.LIVING_ROCK, "cobblestone", "gravel", new ItemStack(Items.DYE, 1, 4)); + addShapelessOreDictRecipe(new ItemStack(ModFluffBlocks.pavement, 3, 3), LibOreDict.LIVING_ROCK, "cobblestone", "gravel", new ItemStack(Items.REDSTONE)); + addShapelessOreDictRecipe(new ItemStack(ModFluffBlocks.pavement, 3, 4), LibOreDict.LIVING_ROCK, "cobblestone", "gravel", new ItemStack(Items.WHEAT)); + addShapelessOreDictRecipe(new ItemStack(ModFluffBlocks.pavement, 3, 5), LibOreDict.LIVING_ROCK, "cobblestone", "gravel", new ItemStack(Items.SLIME_BALL)); recipesPavement = BotaniaAPI.getLatestAddedRecipes(6); // Cellular Block Recipe - GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.cellBlock, 3), new ItemStack(Blocks.cactus), new ItemStack(Blocks.cactus), new ItemStack(Blocks.cactus), new ItemStack(Blocks.cactus), new ItemStack(Items.carrot), new ItemStack(Items.potato)); + GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.cellBlock, 3), new ItemStack(Blocks.CACTUS), new ItemStack(Blocks.CACTUS), new ItemStack(Blocks.CACTUS), new ItemStack(Blocks.CACTUS), new ItemStack(Items.CARROT), new ItemStack(Items.POTATO)); recipeCellBlock = BotaniaAPI.getLatestAddedRecipe(); // Corporea Retainer Recipe - addShapelessOreDictRecipe(new ItemStack(ModBlocks.corporeaRetainer), new ItemStack(Blocks.chest), new ItemStack(ModItems.corporeaSpark)); + addShapelessOreDictRecipe(new ItemStack(ModBlocks.corporeaRetainer), new ItemStack(Blocks.CHEST), new ItemStack(ModItems.corporeaSpark)); recipeCorporeaRetainer = BotaniaAPI.getLatestAddedRecipe(); // Teru Teru Bozu Recipe addOreDictRecipe(new ItemStack(ModBlocks.teruTeruBozu), "C", "C", "S", 'C', LibOreDict.MANAWEAVE_CLOTH, - 'S', new ItemStack(Blocks.double_plant)); + 'S', new ItemStack(Blocks.DOUBLE_PLANT)); recipeTeruTeruBozu = BotaniaAPI.getLatestAddedRecipe(); // Livingwood Avatar Recipe @@ -2054,28 +2054,28 @@ public final class ModCraftingRecipes { recipeSextant = BotaniaAPI.getLatestAddedRecipe(); // Alternate Pasture Seed Recipes - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 3), new ItemStack(ModItems.grassSeeds), new ItemStack(Blocks.deadbush)); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 4), new ItemStack(ModItems.grassSeeds), new ItemStack(Items.wheat)); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 5), new ItemStack(ModItems.grassSeeds), new ItemStack(Items.dye, 1, 2)); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 6), new ItemStack(ModItems.grassSeeds), new ItemStack(Items.blaze_powder)); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 7), new ItemStack(ModItems.grassSeeds), new ItemStack(Items.prismarine_shard)); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 8), new ItemStack(ModItems.grassSeeds), new ItemStack(Items.spider_eye)); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 3), new ItemStack(ModItems.grassSeeds), new ItemStack(Blocks.DEADBUSH)); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 4), new ItemStack(ModItems.grassSeeds), new ItemStack(Items.WHEAT)); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 5), new ItemStack(ModItems.grassSeeds), new ItemStack(Items.DYE, 1, 2)); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 6), new ItemStack(ModItems.grassSeeds), new ItemStack(Items.BLAZE_POWDER)); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 7), new ItemStack(ModItems.grassSeeds), new ItemStack(Items.PRISMARINE_SHARD)); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 8), new ItemStack(ModItems.grassSeeds), new ItemStack(Items.SPIDER_EYE)); recipesAltGrassSeeds = BotaniaAPI.getLatestAddedRecipes(6); // Planestrider's Sash Recipe GameRegistry.addRecipe(new ItemStack(ModItems.speedUpBelt), " M ", "PBP", " S ", - 'M', new ItemStack(Items.filled_map, 1, Short.MAX_VALUE), + 'M', new ItemStack(Items.FILLED_MAP, 1, Short.MAX_VALUE), 'P', new ItemStack(ModItems.grassSeeds), 'B', new ItemStack(ModItems.travelBelt), - 'S', new ItemStack(Items.sugar)); + 'S', new ItemStack(Items.SUGAR)); recipeSpeedUpBelt = BotaniaAPI.getLatestAddedRecipe(); // Bauble Case Recipe addOreDictRecipe(new ItemStack(ModItems.baubleBox), " M ", "MCG", " M ", 'M', LibOreDict.MANA_STEEL, - 'C', new ItemStack(Blocks.chest), + 'C', new ItemStack(Blocks.CHEST), 'G', "ingotGold"); recipeBaubleCase = BotaniaAPI.getLatestAddedRecipe(); @@ -2118,7 +2118,7 @@ public final class ModCraftingRecipes { // Revealing Helmet Recipes if(Botania.thaumcraftLoaded) { - Item goggles = Item.itemRegistry.getObject(new ResourceLocation("thaumcraft", "goggles")); + Item goggles = Item.REGISTRY.getObject(new ResourceLocation("thaumcraft", "goggles")); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.manasteelHelmRevealing), new ItemStack(ModItems.manasteelHelm), goggles); recipeHelmetOfRevealing = BotaniaAPI.getLatestAddedRecipe(); //We want manasteel to show in the Lexicon GameRegistry.addShapelessRecipe(new ItemStack(ModItems.terrasteelHelmRevealing), new ItemStack(ModItems.terrasteelHelm), goggles); @@ -2166,7 +2166,7 @@ public final class ModCraftingRecipes { addStairsAndSlabs(ModFluffBlocks.pavement, i, ModFluffBlocks.pavementStairs[i], ModFluffBlocks.pavementSlabs[i]); // Misc Recipes - GameRegistry.addShapelessRecipe(new ItemStack(Items.wheat, 4, 0), new ItemStack(ModBlocks.thatch)); + GameRegistry.addShapelessRecipe(new ItemStack(Items.WHEAT, 4, 0), new ItemStack(ModBlocks.thatch)); if(Botania.gardenOfGlassLoaded) initGardenOfGlass(); @@ -2177,7 +2177,7 @@ public final class ModCraftingRecipes { private static void initGardenOfGlass() { // Root to Sapling - addShapelessOreDictRecipe(new ItemStack(Blocks.sapling), LibOreDict.ROOT, LibOreDict.ROOT, LibOreDict.ROOT, LibOreDict.ROOT); + addShapelessOreDictRecipe(new ItemStack(Blocks.SAPLING), LibOreDict.ROOT, LibOreDict.ROOT, LibOreDict.ROOT, LibOreDict.ROOT); recipeRootToSapling = BotaniaAPI.getLatestAddedRecipe(); // Root to Fertilizer @@ -2185,17 +2185,17 @@ public final class ModCraftingRecipes { recipeRootToFertilizer = BotaniaAPI.getLatestAddedRecipe(); // Pebble to Cobble - addShapelessOreDictRecipe(new ItemStack(Blocks.cobblestone), LibOreDict.PEBBLE, LibOreDict.PEBBLE, LibOreDict.PEBBLE, LibOreDict.PEBBLE); + addShapelessOreDictRecipe(new ItemStack(Blocks.COBBLESTONE), LibOreDict.PEBBLE, LibOreDict.PEBBLE, LibOreDict.PEBBLE, LibOreDict.PEBBLE); recipePebbleCobblestone = BotaniaAPI.getLatestAddedRecipe(); // Magma Pearl to Slimeball - addShapelessOreDictRecipe(new ItemStack(Items.slime_ball), new ItemStack(Items.magma_cream), new ItemStack(Items.water_bucket)); + addShapelessOreDictRecipe(new ItemStack(Items.SLIME_BALL), new ItemStack(Items.MAGMA_CREAM), new ItemStack(Items.WATER_BUCKET)); recipeMagmaToSlimeball = BotaniaAPI.getLatestAddedRecipe(); // Ender Portal - addOreDictRecipe(new ItemStack(Blocks.end_portal_frame), + addOreDictRecipe(new ItemStack(Blocks.END_PORTAL_FRAME), "OGO", - 'O', new ItemStack(Blocks.obsidian), + 'O', new ItemStack(Blocks.OBSIDIAN), 'G', LibOreDict.LIFE_ESSENCE); recipeEndPortal = BotaniaAPI.getLatestAddedRecipe(); } @@ -2262,7 +2262,7 @@ public final class ModCraftingRecipes { addStairsAndSlabs(block, 0, stairs, slab); if(req != null) { - if(req == Items.coal) + if(req == Items.COAL) GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.quartz, 8, meta), "QQQ", "QCQ", "QQQ", 'Q', "gemQuartz", diff --git a/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java index 149bab7f7..88cde7916 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java @@ -33,14 +33,14 @@ public class ModElvenTradeRecipes { dragonstoneRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.manaResource, 1, 9), LibOreDict.MANA_DIAMOND)); dragonstoneRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModBlocks.storage, 1, 4), new ItemStack(ModBlocks.storage, 1, 3))); - elvenQuartzRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.quartz, 1, 5), new ItemStack(Items.quartz)); + elvenQuartzRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.quartz, 1, 5), new ItemStack(Items.QUARTZ)); alfglassRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModBlocks.elfGlass), new ItemStack(ModBlocks.manaGlass)); - BotaniaAPI.registerElvenTradeRecipe(new ItemStack(Items.iron_ingot), new ItemStack(Items.iron_ingot)); - BotaniaAPI.registerElvenTradeRecipe(new ItemStack(Blocks.iron_block), new ItemStack(Blocks.iron_block)); - BotaniaAPI.registerElvenTradeRecipe(new ItemStack(Items.ender_pearl), new ItemStack(Items.ender_pearl)); - BotaniaAPI.registerElvenTradeRecipe(new ItemStack(Items.diamond), new ItemStack(Items.diamond)); - BotaniaAPI.registerElvenTradeRecipe(new ItemStack(Blocks.diamond_block), new ItemStack(Blocks.diamond_block)); + BotaniaAPI.registerElvenTradeRecipe(new ItemStack(Items.IRON_INGOT), new ItemStack(Items.IRON_INGOT)); + BotaniaAPI.registerElvenTradeRecipe(new ItemStack(Blocks.IRON_BLOCK), new ItemStack(Blocks.IRON_BLOCK)); + BotaniaAPI.registerElvenTradeRecipe(new ItemStack(Items.ENDER_PEARL), new ItemStack(Items.ENDER_PEARL)); + BotaniaAPI.registerElvenTradeRecipe(new ItemStack(Items.DIAMOND), new ItemStack(Items.DIAMOND)); + BotaniaAPI.registerElvenTradeRecipe(new ItemStack(Blocks.DIAMOND_BLOCK), new ItemStack(Blocks.DIAMOND_BLOCK)); } } diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java index 19c28020f..7f06855dd 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -53,23 +53,23 @@ public final class ModManaAlchemyRecipes { public static List flowersRecipes; public static void init() { - leatherRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.leather), new ItemStack(Items.rotten_flesh), 600); + leatherRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.LEATHER), new ItemStack(Items.ROTTEN_FLESH), 600); woodRecipes = new ArrayList<>(); - woodRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.log, 1, 0), new ItemStack(Blocks.log2, 1, 1), 40)); - woodRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.log, 1, 1), new ItemStack(Blocks.log, 1, 0), 40)); - woodRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.log, 1, 2), new ItemStack(Blocks.log, 1, 1), 40)); - woodRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.log, 1, 3), new ItemStack(Blocks.log, 1, 2), 40)); - woodRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.log2, 1, 0), new ItemStack(Blocks.log, 1, 3), 40)); - woodRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.log2, 1, 1), new ItemStack(Blocks.log2, 1, 0), 40)); + woodRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.LOG, 1, 0), new ItemStack(Blocks.LOG2, 1, 1), 40)); + woodRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.LOG, 1, 1), new ItemStack(Blocks.LOG, 1, 0), 40)); + woodRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.LOG, 1, 2), new ItemStack(Blocks.LOG, 1, 1), 40)); + woodRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.LOG, 1, 3), new ItemStack(Blocks.LOG, 1, 2), 40)); + woodRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.LOG2, 1, 0), new ItemStack(Blocks.LOG, 1, 3), 40)); + woodRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.LOG2, 1, 1), new ItemStack(Blocks.LOG2, 1, 0), 40)); saplingRecipes = new ArrayList<>(); for(int i = 0; i < 6; i++) - saplingRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.sapling, 1, i == 5 ? 0 : i + 1), new ItemStack(Blocks.sapling, 1, i), 120)); + saplingRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.SAPLING, 1, i == 5 ? 0 : i + 1), new ItemStack(Blocks.SAPLING, 1, i), 120)); - glowstoneDustRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.glowstone_dust, 4), new ItemStack(Blocks.glowstone), 25); + glowstoneDustRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.GLOWSTONE_DUST, 4), new ItemStack(Blocks.GLOWSTONE), 25); quartzRecipes = new ArrayList<>(); - quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.quartz, 4), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE), 25)); + quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.QUARTZ, 4), new ItemStack(Blocks.QUARTZ_BLOCK, 1, Short.MAX_VALUE), 25)); if(ConfigHandler.darkQuartzEnabled) quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 0), new ItemStack(ModFluffBlocks.darkQuartz, 1, Short.MAX_VALUE), 25)); quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 1), new ItemStack(ModFluffBlocks.manaQuartz, 1, Short.MAX_VALUE), 25)); @@ -78,86 +78,86 @@ public final class ModManaAlchemyRecipes { quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 4), new ItemStack(ModFluffBlocks.redQuartz, 1, Short.MAX_VALUE), 25)); quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 5), new ItemStack(ModFluffBlocks.elfQuartz, 1, Short.MAX_VALUE), 25)); - chiseledBrickRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.stonebrick, 1, 3), new ItemStack(Blocks.stonebrick), 150); - iceRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.ice), new ItemStack(Blocks.snow), 2250); + chiseledBrickRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.STONEBRICK, 1, 3), new ItemStack(Blocks.STONEBRICK), 150); + iceRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.ICE), new ItemStack(Blocks.SNOW), 2250); swampFolliageRecipes = new ArrayList<>(); - swampFolliageRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.waterlily), new ItemStack(Blocks.vine), 320)); - swampFolliageRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.vine), new ItemStack(Blocks.waterlily), 320)); + swampFolliageRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.WATERLILY), new ItemStack(Blocks.VINE), 320)); + swampFolliageRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.VINE), new ItemStack(Blocks.WATERLILY), 320)); fishRecipes = new ArrayList<>(); for(int i = 0; i < 4; i++) - fishRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.fish, 1, i == 3 ? 0 : i + 1), new ItemStack(Items.fish, 1, i), 200)); + fishRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.FISH, 1, i == 3 ? 0 : i + 1), new ItemStack(Items.FISH, 1, i), 200)); cropRecipes = new ArrayList<>(); - cropRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.wheat_seeds), new ItemStack(Items.dye, 1, 3), 6000)); - cropRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.potato), new ItemStack(Items.wheat), 6000)); - cropRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.carrot), new ItemStack(Items.potato), 6000)); - cropRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.melon_seeds), new ItemStack(Items.carrot), 6000)); - cropRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.pumpkin_seeds), new ItemStack(Items.melon_seeds), 6000)); - cropRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.dye, 1, 3), new ItemStack(Items.pumpkin_seeds), 6000)); + cropRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.WHEAT_SEEDS), new ItemStack(Items.DYE, 1, 3), 6000)); + cropRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.POTATO), new ItemStack(Items.WHEAT), 6000)); + cropRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.CARROT), new ItemStack(Items.POTATO), 6000)); + cropRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.MELON_SEEDS), new ItemStack(Items.CARROT), 6000)); + cropRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.PUMPKIN_SEEDS), new ItemStack(Items.MELON_SEEDS), 6000)); + cropRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.DYE, 1, 3), new ItemStack(Items.PUMPKIN_SEEDS), 6000)); - potatoRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.potato), new ItemStack(Items.poisonous_potato), 1200); - netherWartRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.nether_wart), new ItemStack(Items.blaze_rod), 4000); + potatoRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.POTATO), new ItemStack(Items.POISONOUS_POTATO), 1200); + netherWartRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.NETHER_WART), new ItemStack(Items.BLAZE_ROD), 4000); gunpowderAndFlintRecipes = new ArrayList<>(); - gunpowderAndFlintRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.flint), new ItemStack(Items.gunpowder), 200)); - gunpowderAndFlintRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.gunpowder), new ItemStack(Items.flint), 4000)); + gunpowderAndFlintRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.FLINT), new ItemStack(Items.GUNPOWDER), 200)); + gunpowderAndFlintRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.GUNPOWDER), new ItemStack(Items.FLINT), 4000)); - nameTagRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.name_tag), new ItemStack(Items.writable_book), 16000); + nameTagRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.NAME_TAG), new ItemStack(Items.WRITABLE_BOOK), 16000); stringRecipes = new ArrayList<>(); for(int i = 0; i < 16; i++) - stringRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.string, 3), new ItemStack(Blocks.wool, 1, i), 100)); + stringRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.STRING, 3), new ItemStack(Blocks.WOOL, 1, i), 100)); slimeballCactusRecipes = new ArrayList<>(); - slimeballCactusRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.slime_ball), new ItemStack(Blocks.cactus), 1200)); - slimeballCactusRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.cactus), new ItemStack(Items.slime_ball), 1200)); + slimeballCactusRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.SLIME_BALL), new ItemStack(Blocks.CACTUS), 1200)); + slimeballCactusRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.CACTUS), new ItemStack(Items.SLIME_BALL), 1200)); - enderPearlRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.ender_pearl), new ItemStack(Items.ghast_tear), 28000); + enderPearlRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.ENDER_PEARL), new ItemStack(Items.GHAST_TEAR), 28000); redstoneToGlowstoneRecipes = new ArrayList<>(); - redstoneToGlowstoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.redstone), new ItemStack(Items.glowstone_dust), 300)); - redstoneToGlowstoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.glowstone_dust), new ItemStack(Items.redstone), 300)); + redstoneToGlowstoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.REDSTONE), new ItemStack(Items.GLOWSTONE_DUST), 300)); + redstoneToGlowstoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.GLOWSTONE_DUST), new ItemStack(Items.REDSTONE), 300)); - sandRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Block.getBlockFromName("sand")), new ItemStack(Blocks.cobblestone), 50); - redSandRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Block.getBlockFromName("sand"), 1, 1), new ItemStack(Blocks.hardened_clay), 50); + sandRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Block.getBlockFromName("sand")), new ItemStack(Blocks.COBBLESTONE), 50); + redSandRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Block.getBlockFromName("sand"), 1, 1), new ItemStack(Blocks.HARDENED_CLAY), 50); clayBreakdownRecipes = new ArrayList<>(); - clayBreakdownRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.clay_ball, 4), new ItemStack(Blocks.clay), 25)); - clayBreakdownRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.brick, 4), new ItemStack(Blocks.brick_block), 25)); + clayBreakdownRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.CLAY_BALL, 4), new ItemStack(Blocks.CLAY), 25)); + clayBreakdownRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.BRICK, 4), new ItemStack(Blocks.BRICK_BLOCK), 25)); - coarseDirtRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.dirt, 1, 1), new ItemStack(Blocks.dirt), 120); + coarseDirtRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.DIRT, 1, 1), new ItemStack(Blocks.DIRT), 120); - prismarineRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.prismarine_shard), new ItemStack(Items.quartz), 200); + prismarineRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.PRISMARINE_SHARD), new ItemStack(Items.QUARTZ), 200); if(ConfigHandler.stones18Enabled) { stoneRecipes = new ArrayList<>(); - stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.stone, 1, 5), "stone", 200)); // Stone->Andesite - stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.stone, 1, 3), new ItemStack(Blocks.stone, 1, 5), 200)); // Andesite->Diorite - stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.stone, 1, 1), new ItemStack(Blocks.stone, 1, 3), 200)); // Diorite->Granite - stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.stone, 1, 5), new ItemStack(Blocks.stone, 1, 1), 200)); // Granite->Andesite + stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.STONE, 1, 5), "stone", 200)); // Stone->Andesite + stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.STONE, 1, 3), new ItemStack(Blocks.STONE, 1, 5), 200)); // Andesite->Diorite + stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.STONE, 1, 1), new ItemStack(Blocks.STONE, 1, 3), 200)); // Diorite->Granite + stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.STONE, 1, 5), new ItemStack(Blocks.STONE, 1, 1), 200)); // Granite->Andesite } tallgrassRecipes = new ArrayList<>(); - tallgrassRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.deadbush), new ItemStack(Blocks.tallgrass, 1, 2), 500)); - tallgrassRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.tallgrass, 1, 1), new ItemStack(Blocks.deadbush), 500)); - tallgrassRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.tallgrass, 1, 2), new ItemStack(Blocks.tallgrass, 1, 1), 500)); + tallgrassRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.DEADBUSH), new ItemStack(Blocks.TALLGRASS, 1, 2), 500)); + tallgrassRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.TALLGRASS, 1, 1), new ItemStack(Blocks.DEADBUSH), 500)); + tallgrassRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.TALLGRASS, 1, 2), new ItemStack(Blocks.TALLGRASS, 1, 1), 500)); flowersRecipes = new ArrayList<>(); - flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.red_flower), new ItemStack(Blocks.yellow_flower), 400)); - flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.red_flower, 1, 1), new ItemStack(Blocks.red_flower), 400)); - flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.red_flower, 1, 2), new ItemStack(Blocks.red_flower, 1, 1), 400)); - flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.red_flower, 1, 3), new ItemStack(Blocks.red_flower, 1, 2), 400)); - flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.red_flower, 1, 4), new ItemStack(Blocks.red_flower, 1, 3), 400)); - flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.red_flower, 1, 5), new ItemStack(Blocks.red_flower, 1, 4), 400)); - flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.red_flower, 1, 6), new ItemStack(Blocks.red_flower, 1, 5), 400)); - flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.red_flower, 1, 7), new ItemStack(Blocks.red_flower, 1, 6), 400)); - flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.red_flower, 1, 8), new ItemStack(Blocks.red_flower, 1, 7), 400)); - flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.double_plant), new ItemStack(Blocks.red_flower, 1, 8), 400)); - flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.double_plant, 1, 1), new ItemStack(Blocks.double_plant), 400)); - flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.double_plant, 1, 4), new ItemStack(Blocks.double_plant, 1, 1), 400)); - flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.double_plant, 1, 5), new ItemStack(Blocks.double_plant, 1, 4), 400)); - flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.yellow_flower), new ItemStack(Blocks.double_plant, 1, 5), 400)); + flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.RED_FLOWER), new ItemStack(Blocks.YELLOW_FLOWER), 400)); + flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.RED_FLOWER, 1, 1), new ItemStack(Blocks.RED_FLOWER), 400)); + flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.RED_FLOWER, 1, 2), new ItemStack(Blocks.RED_FLOWER, 1, 1), 400)); + flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.RED_FLOWER, 1, 3), new ItemStack(Blocks.RED_FLOWER, 1, 2), 400)); + flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.RED_FLOWER, 1, 4), new ItemStack(Blocks.RED_FLOWER, 1, 3), 400)); + flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.RED_FLOWER, 1, 5), new ItemStack(Blocks.RED_FLOWER, 1, 4), 400)); + flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.RED_FLOWER, 1, 6), new ItemStack(Blocks.RED_FLOWER, 1, 5), 400)); + flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.RED_FLOWER, 1, 7), new ItemStack(Blocks.RED_FLOWER, 1, 6), 400)); + flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.RED_FLOWER, 1, 8), new ItemStack(Blocks.RED_FLOWER, 1, 7), 400)); + flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.DOUBLE_PLANT), new ItemStack(Blocks.RED_FLOWER, 1, 8), 400)); + flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.DOUBLE_PLANT, 1, 1), new ItemStack(Blocks.DOUBLE_PLANT), 400)); + flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.DOUBLE_PLANT, 1, 4), new ItemStack(Blocks.DOUBLE_PLANT, 1, 1), 400)); + flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.DOUBLE_PLANT, 1, 5), new ItemStack(Blocks.DOUBLE_PLANT, 1, 4), 400)); + flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.YELLOW_FLOWER), new ItemStack(Blocks.DOUBLE_PLANT, 1, 5), 400)); } } diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java index a27c46d44..fcbce4a27 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java @@ -34,22 +34,22 @@ public class ModManaConjurationRecipes { public static RecipeManaInfusion grassRecipe; public static void init() { - redstoneRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.redstone, 2), new ItemStack(Items.redstone), 5000); - glowstoneRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.glowstone_dust, 2), new ItemStack(Items.glowstone_dust), 5000); - quartzRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.quartz, 2), new ItemStack(Items.quartz), 2500); - coalRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.coal, 2), new ItemStack(Items.coal), 2100); - snowballRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.snowball, 2), new ItemStack(Items.snowball), 200); - netherrackRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.netherrack, 2), new ItemStack(Blocks.netherrack), 200); - soulSandRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.soul_sand, 2), new ItemStack(Blocks.soul_sand), 1500); + redstoneRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.REDSTONE, 2), new ItemStack(Items.REDSTONE), 5000); + glowstoneRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.GLOWSTONE_DUST, 2), new ItemStack(Items.GLOWSTONE_DUST), 5000); + quartzRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.QUARTZ, 2), new ItemStack(Items.QUARTZ), 2500); + coalRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.COAL, 2), new ItemStack(Items.COAL), 2100); + snowballRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.SNOWBALL, 2), new ItemStack(Items.SNOWBALL), 200); + netherrackRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.NETHERRACK, 2), new ItemStack(Blocks.NETHERRACK), 200); + soulSandRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.SOUL_SAND, 2), new ItemStack(Blocks.SOUL_SAND), 1500); gravelRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Block.getBlockFromName("gravel"), 2), new ItemStack(Block.getBlockFromName("gravel")), 720); leavesRecipes = new ArrayList<>(); for(int i = 0; i < 4; i++) - leavesRecipes.add(BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.leaves, 2, i), new ItemStack(Blocks.leaves, 1, i), 2000)); + leavesRecipes.add(BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.LEAVES, 2, i), new ItemStack(Blocks.LEAVES, 1, i), 2000)); for(int i = 0; i < 2; i++) - leavesRecipes.add(BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.leaves2, 2, i), new ItemStack(Blocks.leaves2, 1, i), 2000)); + leavesRecipes.add(BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.LEAVES2, 2, i), new ItemStack(Blocks.LEAVES2, 1, i), 2000)); - grassRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.tallgrass, 2, 1), new ItemStack(Blocks.tallgrass, 1, 1), 800); + grassRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.TALLGRASS, 2, 1), new ItemStack(Blocks.TALLGRASS, 1, 1), 800); } } diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index 192f0ec40..1e1d95c22 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -46,46 +46,46 @@ public final class ModManaInfusionRecipes { public static void init() { manasteelRecipes = new ArrayList<>(); manasteelRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 0), "ingotIron", 3000)); - manasteelRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.storage, 1, 0), new ItemStack(Blocks.iron_block), 27000)); + manasteelRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.storage, 1, 0), new ItemStack(Blocks.IRON_BLOCK), 27000)); - manaPearlRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 1), new ItemStack(Items.ender_pearl), 6000); + manaPearlRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 1), new ItemStack(Items.ENDER_PEARL), 6000); manaDiamondRecipes = new ArrayList<>(); manaDiamondRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 2), "gemDiamond", 10000)); - manaDiamondRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.storage, 1, 3), new ItemStack(Blocks.diamond_block), 90000)); + manaDiamondRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.storage, 1, 3), new ItemStack(Blocks.DIAMOND_BLOCK), 90000)); manaPowderRecipes = new ArrayList<>(); - manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 23), new ItemStack(Items.gunpowder), 500)); - manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 23), new ItemStack(Items.redstone), 500)); - manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 23), new ItemStack(Items.glowstone_dust), 500)); - manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 23), new ItemStack(Items.sugar), 500)); + manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 23), new ItemStack(Items.GUNPOWDER), 500)); + manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 23), new ItemStack(Items.REDSTONE), 500)); + manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 23), new ItemStack(Items.GLOWSTONE_DUST), 500)); + manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 23), new ItemStack(Items.SUGAR), 500)); for(int i = 0; i < 16; i++) manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 23), new ItemStack(ModItems.dye, 1, i), 400)); - pistonRelayRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.pistonRelay), new ItemStack(Blocks.piston), 15000); - manaCookieRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaCookie), new ItemStack(Items.cookie), 20000); - grassSeedsRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.grassSeeds), new ItemStack(Blocks.tallgrass, 1, 1), 2500); - podzolSeedsRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.grassSeeds, 1, 1), new ItemStack(Blocks.deadbush), 2500); + pistonRelayRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.pistonRelay), new ItemStack(Blocks.PISTON), 15000); + manaCookieRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaCookie), new ItemStack(Items.COOKIE), 20000); + grassSeedsRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.grassSeeds), new ItemStack(Blocks.TALLGRASS, 1, 1), 2500); + podzolSeedsRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.grassSeeds, 1, 1), new ItemStack(Blocks.DEADBUSH), 2500); mycelSeedsRecipes = new ArrayList<>(); - mycelSeedsRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.grassSeeds, 1, 2), new ItemStack(Blocks.red_mushroom), 6500)); - mycelSeedsRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.grassSeeds, 1, 2), new ItemStack(Blocks.brown_mushroom), 6500)); + mycelSeedsRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.grassSeeds, 1, 2), new ItemStack(Blocks.RED_MUSHROOM), 6500)); + mycelSeedsRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.grassSeeds, 1, 2), new ItemStack(Blocks.BROWN_MUSHROOM), 6500)); - manaQuartzRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.quartz, 1, 1), new ItemStack(Items.quartz), 250); - tinyPotatoRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.tinyPotato), new ItemStack(Items.potato), 1337); + manaQuartzRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.quartz, 1, 1), new ItemStack(Items.QUARTZ), 250); + tinyPotatoRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.tinyPotato), new ItemStack(Items.POTATO), 1337); if(Botania.thaumcraftLoaded) { - Item inkwell = Item.itemRegistry.getObject(new ResourceLocation("thaumcraft", "scribing_tools")); + Item inkwell = Item.REGISTRY.getObject(new ResourceLocation("thaumcraft", "scribing_tools")); manaInkwellRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaInkwell, 1, ModItems.manaInkwell.getMaxDamage()), new ItemStack(inkwell), 35000); } - managlassRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.manaGlass), new ItemStack(Blocks.glass), 150); - manaStringRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 16), new ItemStack(Items.string), 5000); + managlassRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.manaGlass), new ItemStack(Blocks.GLASS), 150); + manaStringRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 16), new ItemStack(Items.STRING), 5000); if(Botania.gardenOfGlassLoaded) - sugarCaneRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(Items.reeds), new ItemStack(Blocks.hay_block), 2000); + sugarCaneRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(Items.REEDS), new ItemStack(Blocks.HAY_BLOCK), 2000); - BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaBottle), new ItemStack(Items.glass_bottle), 5000); + BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaBottle), new ItemStack(Items.GLASS_BOTTLE), 5000); } } diff --git a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java index 4429ddc7d..0a2d1c031 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java @@ -21,11 +21,11 @@ public final class ModMigrationRecipes { boolean quark = Botania.quarkLoaded; // Prismarine -> vanilla - GameRegistry.addShapelessRecipe(new ItemStack(Items.prismarine_shard), new ItemStack(ModItems.manaResource, 1, 10)); - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.prismarine, 1, 0), new ItemStack(ModBlocks.prismarine, 1, 0)); - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.prismarine, 1, 1), new ItemStack(ModBlocks.prismarine, 1, 1)); - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.prismarine, 1, 2), new ItemStack(ModBlocks.prismarine, 1, 2)); - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.sea_lantern), new ItemStack(ModBlocks.seaLamp)); + GameRegistry.addShapelessRecipe(new ItemStack(Items.PRISMARINE_SHARD), new ItemStack(ModItems.manaResource, 1, 10)); + GameRegistry.addShapelessRecipe(new ItemStack(Blocks.PRISMARINE, 1, 0), new ItemStack(ModBlocks.prismarine, 1, 0)); + GameRegistry.addShapelessRecipe(new ItemStack(Blocks.PRISMARINE, 1, 1), new ItemStack(ModBlocks.prismarine, 1, 1)); + GameRegistry.addShapelessRecipe(new ItemStack(Blocks.PRISMARINE, 1, 2), new ItemStack(ModBlocks.prismarine, 1, 2)); + GameRegistry.addShapelessRecipe(new ItemStack(Blocks.SEA_LANTERN), new ItemStack(ModBlocks.seaLamp)); // Prismarine -> quark if (quark) { @@ -39,11 +39,11 @@ public final class ModMigrationRecipes { } // End stuff -> vanilla - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.end_bricks), new ItemStack(ModBlocks.endStoneBrick)); - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.purpur_block), new ItemStack(ModBlocks.endStoneBrick, 1, 2)); - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.purpur_pillar), new ItemStack(ModBlocks.endStoneBrick, 1, 3)); - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.purpur_slab), new ItemStack(ModFluffBlocks.enderBrickSlab)); - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.purpur_stairs), new ItemStack(ModFluffBlocks.enderBrickStairs)); + GameRegistry.addShapelessRecipe(new ItemStack(Blocks.END_BRICKS), new ItemStack(ModBlocks.endStoneBrick)); + GameRegistry.addShapelessRecipe(new ItemStack(Blocks.PURPUR_BLOCK), new ItemStack(ModBlocks.endStoneBrick, 1, 2)); + GameRegistry.addShapelessRecipe(new ItemStack(Blocks.PURPUR_PILLAR), new ItemStack(ModBlocks.endStoneBrick, 1, 3)); + GameRegistry.addShapelessRecipe(new ItemStack(Blocks.PURPUR_SLAB), new ItemStack(ModFluffBlocks.enderBrickSlab)); + GameRegistry.addShapelessRecipe(new ItemStack(Blocks.PURPUR_STAIRS), new ItemStack(ModFluffBlocks.enderBrickStairs)); // End stuff -> quark if (quark) { @@ -53,8 +53,8 @@ public final class ModMigrationRecipes { } // Andesite normal + polished -> vanilla - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.stone, 1, 5), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.ANDESITE.ordinal())); - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.stone, 1, 6), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_ANDESITE.ordinal())); + GameRegistry.addShapelessRecipe(new ItemStack(Blocks.STONE, 1, 5), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.ANDESITE.ordinal())); + GameRegistry.addShapelessRecipe(new ItemStack(Blocks.STONE, 1, 6), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_ANDESITE.ordinal())); if (quark) { // Andesite rough stairs and slab @@ -86,8 +86,8 @@ public final class ModMigrationRecipes { } // Diorite normal + polished -> vanilla - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.stone, 1, 3), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.DIORITE.ordinal())); - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.stone, 1, 4), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_DIORITE.ordinal())); + GameRegistry.addShapelessRecipe(new ItemStack(Blocks.STONE, 1, 3), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.DIORITE.ordinal())); + GameRegistry.addShapelessRecipe(new ItemStack(Blocks.STONE, 1, 4), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_DIORITE.ordinal())); if (quark) { // Diorite rough stairs and slab @@ -103,8 +103,8 @@ public final class ModMigrationRecipes { } // Granite normal + polished -> vanilla - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.stone, 1, 1), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.GRANITE.ordinal())); - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.stone, 1, 2), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_GRANITE.ordinal())); + GameRegistry.addShapelessRecipe(new ItemStack(Blocks.STONE, 1, 1), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.GRANITE.ordinal())); + GameRegistry.addShapelessRecipe(new ItemStack(Blocks.STONE, 1, 2), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_GRANITE.ordinal())); if (quark) { // Granite rough stairs and slab @@ -136,7 +136,7 @@ public final class ModMigrationRecipes { } private static Block findQuarkBlock(String name) { - return Block.blockRegistry.getObject(new ResourceLocation("Quark", name)); + return Block.REGISTRY.getObject(new ResourceLocation("Quark", name)); } private ModMigrationRecipes() {} diff --git a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java index 452ca0506..2a1c6b947 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -126,7 +126,7 @@ public final class ModPetalRecipes { bubbellRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BUBBELL), cyan, cyan, lightBlue, lightBlue, blue, blue, runeWater, runeSummer, pixieDust); solegnoliaRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SOLEGNOLIA), brown, brown, red, blue, redstoneRoot); - ItemStack stack = new ItemStack(Items.skull, 1, 3); + ItemStack stack = new ItemStack(Items.SKULL, 1, 3); ItemNBTHelper.setString(stack, "SkullOwner", "Vazkii"); Object[] inputs = new Object[16]; Arrays.fill(inputs, pink); diff --git a/src/main/java/vazkii/botania/common/crafting/ModPureDaisyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModPureDaisyRecipes.java index bcf6a78c5..0c2f02505 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModPureDaisyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModPureDaisyRecipes.java @@ -21,11 +21,11 @@ public final class ModPureDaisyRecipes { BotaniaAPI.registerPureDaisyRecipe("stone", ModBlocks.livingrock.getDefaultState()); BotaniaAPI.registerPureDaisyRecipe("logWood", ModBlocks.livingwood.getDefaultState()); - BotaniaAPI.registerPureDaisyRecipe("netherrack", Blocks.cobblestone.getDefaultState()); - BotaniaAPI.registerPureDaisyRecipe("soulSand", Blocks.sand.getDefaultState()); - BotaniaAPI.registerPureDaisyRecipe("ice", Blocks.packed_ice.getDefaultState()); - BotaniaAPI.registerPureDaisyRecipe(LibOreDict.BLAZE_BLOCK, Blocks.obsidian.getDefaultState()); - BotaniaAPI.registerPureDaisyRecipe(Blocks.water, Blocks.snow.getDefaultState()); + BotaniaAPI.registerPureDaisyRecipe("netherrack", Blocks.COBBLESTONE.getDefaultState()); + BotaniaAPI.registerPureDaisyRecipe("soulSand", Blocks.SAND.getDefaultState()); + BotaniaAPI.registerPureDaisyRecipe("ice", Blocks.PACKED_ICE.getDefaultState()); + BotaniaAPI.registerPureDaisyRecipe(LibOreDict.BLAZE_BLOCK, Blocks.OBSIDIAN.getDefaultState()); + BotaniaAPI.registerPureDaisyRecipe(Blocks.WATER, Blocks.SNOW.getDefaultState()); } } diff --git a/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java index 7f8717dc4..276cc75bb 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java @@ -49,24 +49,24 @@ public final class ModRuneRecipes { final int costTier2 = 8000; final int costTier3 = 12000; - recipeWaterRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 0), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, new ItemStack(Items.dye, 1, 15), new ItemStack(Items.reeds), new ItemStack(Items.fishing_rod)); - recipeFireRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 1), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, new ItemStack(Items.netherbrick), new ItemStack(Items.gunpowder), new ItemStack(Items.nether_wart)); + recipeWaterRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 0), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, new ItemStack(Items.DYE, 1, 15), new ItemStack(Items.REEDS), new ItemStack(Items.FISHING_ROD)); + recipeFireRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 1), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, new ItemStack(Items.NETHERBRICK), new ItemStack(Items.GUNPOWDER), new ItemStack(Items.NETHER_WART)); recipesEarthRune = new ArrayList<>(); - recipesEarthRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, "stone", new ItemStack(Blocks.coal_block), new ItemStack(Blocks.brown_mushroom))); - recipesEarthRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, "stone", new ItemStack(Blocks.coal_block), new ItemStack(Blocks.red_mushroom))); + recipesEarthRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, "stone", new ItemStack(Blocks.COAL_BLOCK), new ItemStack(Blocks.BROWN_MUSHROOM))); + recipesEarthRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, "stone", new ItemStack(Blocks.COAL_BLOCK), new ItemStack(Blocks.RED_MUSHROOM))); recipesAirRune = new ArrayList<>(); for(int i = 0; i < 16; i++) - recipesAirRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 3), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, new ItemStack(Blocks.carpet, 1, i), new ItemStack(Items.feather), new ItemStack(Items.string))); + recipesAirRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 3), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, new ItemStack(Blocks.CARPET, 1, i), new ItemStack(Items.FEATHER), new ItemStack(Items.STRING))); - recipeSpringRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 4), costTier2, LibOreDict.RUNE[0], LibOreDict.RUNE[1], "treeSapling", "treeSapling", "treeSapling", new ItemStack(Items.wheat)); - recipeSummerRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 5), costTier2, LibOreDict.RUNE[2], LibOreDict.RUNE[3], new ItemStack(Block.getBlockFromName("sand")), new ItemStack(Block.getBlockFromName("sand")), new ItemStack(Items.slime_ball), new ItemStack(Items.melon)); - recipeAutumnRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 6), costTier2, LibOreDict.RUNE[1], LibOreDict.RUNE[3], "treeLeaves", "treeLeaves", "treeLeaves", new ItemStack(Items.spider_eye)); + recipeSpringRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 4), costTier2, LibOreDict.RUNE[0], LibOreDict.RUNE[1], "treeSapling", "treeSapling", "treeSapling", new ItemStack(Items.WHEAT)); + recipeSummerRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 5), costTier2, LibOreDict.RUNE[2], LibOreDict.RUNE[3], new ItemStack(Block.getBlockFromName("sand")), new ItemStack(Block.getBlockFromName("sand")), new ItemStack(Items.SLIME_BALL), new ItemStack(Items.MELON)); + recipeAutumnRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 6), costTier2, LibOreDict.RUNE[1], LibOreDict.RUNE[3], "treeLeaves", "treeLeaves", "treeLeaves", new ItemStack(Items.SPIDER_EYE)); recipesWinterRune = new ArrayList<>(); for(int i = 0; i < 16; i++) - recipesWinterRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 7), costTier2, LibOreDict.RUNE[0], LibOreDict.RUNE[2], new ItemStack(Blocks.snow), new ItemStack(Blocks.snow), new ItemStack(Blocks.wool, 1, i), new ItemStack(Items.cake))); + recipesWinterRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 7), costTier2, LibOreDict.RUNE[0], LibOreDict.RUNE[2], new ItemStack(Blocks.SNOW), new ItemStack(Blocks.SNOW), new ItemStack(Blocks.WOOL, 1, i), new ItemStack(Items.CAKE))); recipeManaRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 8), costTier2, LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL, LibOreDict.MANA_PEARL); @@ -78,7 +78,7 @@ public final class ModRuneRecipes { recipeEnvyRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 14), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[7], LibOreDict.RUNE[0]); recipePrideRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 15), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[5], LibOreDict.RUNE[1]); - recipeHead = new HeadRecipe(new ItemStack(Items.skull, 1, 3), 22500, new ItemStack(Items.skull), LibOreDict.PIXIE_DUST, LibOreDict.PRISMARINE_SHARD, new ItemStack(Items.name_tag), new ItemStack(Items.golden_apple)); + recipeHead = new HeadRecipe(new ItemStack(Items.SKULL, 1, 3), 22500, new ItemStack(Items.SKULL), LibOreDict.PIXIE_DUST, LibOreDict.PRISMARINE_SHARD, new ItemStack(Items.NAME_TAG), new ItemStack(Items.GOLDEN_APPLE)); BotaniaAPI.runeAltarRecipes.add(recipeHead); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java index 5b9018593..061fecdd5 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java @@ -35,7 +35,7 @@ public class CompositeLensRecipe implements IRecipe { if(foundLens) foundSecondLens = true; else foundLens = true; - } else if(stack.getItem() == Items.slime_ball) + } else if(stack.getItem() == Items.SLIME_BALL) foundSlimeball = true; else return false; // Found an invalid item, breaking the recipe } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java index ffff5355a..75318f07f 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java @@ -35,7 +35,7 @@ public class HeadRecipe extends RecipeRuneAltar { if(stack == null) break; - if(stack.getItem() == Items.name_tag) { + if(stack.getItem() == Items.NAME_TAG) { name = stack.getDisplayName(); if(name.equals(I18n.translateToLocal("item.nameTag.name"))) return false; @@ -48,7 +48,7 @@ public class HeadRecipe extends RecipeRuneAltar { @Override public ItemStack getOutput() { - ItemStack stack = new ItemStack(Items.skull, 1, 3); + ItemStack stack = new ItemStack(Items.SKULL, 1, 3); if(!name.isEmpty()) ItemNBTHelper.setString(stack, "SkullOwner", name); return stack; diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java index 3cd25b65a..76c2b4571 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java @@ -25,7 +25,7 @@ public class HelmRevealingRecipe implements IRecipe { @Override public boolean matches(InventoryCrafting var1, World var2) { - Item goggles = Item.itemRegistry.getObject(new ResourceLocation("thaumcraft", "goggles")); + Item goggles = Item.REGISTRY.getObject(new ResourceLocation("thaumcraft", "goggles")); if(goggles == null) return false; // NO TC loaded diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 7fa1a3ead..3532e50d1 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -214,7 +214,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { e.setPlayerCount(playerCount); e.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(MAX_HP * playerCount); - e.playSound(SoundEvents.entity_enderdragon_growl, 10F, 0.1F); + e.playSound(SoundEvents.ENTITY_ENDERDRAGON_GROWL, 10F, 0.1F); world.spawnEntityInWorld(e); return true; } @@ -370,7 +370,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { boolean crit = false; if(e instanceof EntityPlayer) { EntityPlayer p = (EntityPlayer) e; - crit = p.fallDistance > 0.0F && !p.onGround && !p.isOnLadder() && !p.isInWater() && !p.isPotionActive(MobEffects.blindness) && !p.isRiding(); + crit = p.fallDistance > 0.0F && !p.onGround && !p.isOnLadder() && !p.isInWater() && !p.isPotionActive(MobEffects.BLINDNESS) && !p.isRiding(); } int cap = crit ? 60 : 40; @@ -422,7 +422,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { ((EntityPlayer) entitylivingbase).addStat(ModAchievements.gaiaGuardianNoArmor, 1); } - this.playSound(SoundEvents.entity_generic_explode, 20F, (1F + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2F) * 0.7F); + this.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 20F, (1F + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2F) * 0.7F); worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, posX, posY, posZ, 1D, 0D, 0D); } @@ -574,7 +574,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { List items = block.getDrops(worldObj, posp, worldObj.getBlockState(posp), 0); for(ItemStack stack : items) { if(ConfigHandler.blockBreakParticles) - worldObj.playAuxSFX(2001, posp, Block.getStateId(worldObj.getBlockState(posp))); + worldObj.playEvent(2001, posp, Block.getStateId(worldObj.getBlockState(posp))); worldObj.spawnEntityInWorld(new EntityItem(worldObj, xp + 0.5, yp + 0.5, zp + 0.5, stack)); } worldObj.setBlockToAir(posp); @@ -660,10 +660,10 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { } case 1 : { entity = new EntitySkeleton(worldObj); - entity.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, new ItemStack(Items.bow)); + entity.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, new ItemStack(Items.BOW)); if(worldObj.rand.nextInt(8) == 0) { ((EntitySkeleton) entity).setSkeletonType(1); - entity.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, new ItemStack(hard ? ModItems.elementiumSword : Items.stone_sword)); + entity.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, new ItemStack(hard ? ModItems.elementiumSword : Items.STONE_SWORD)); } break; } @@ -680,7 +680,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { if(entity != null) { if(!entity.isImmuneToFire()) - entity.addPotionEffect(new PotionEffect(MobEffects.fireResistance, 30, 0)); + entity.addPotionEffect(new PotionEffect(MobEffects.FIRE_RESISTANCE, 30, 0)); range = 6F; entity.setPosition(posX + 0.5 + Math.random() * range - range / 2, posY - 1, posZ + 0.5 + Math.random() * range - range / 2); worldObj.spawnEntityInWorld(entity); @@ -756,16 +756,16 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { } @Override - public void setBossVisibleTo(EntityPlayerMP player) + public void addTrackingPlayer(EntityPlayerMP player) { - super.setBossVisibleTo(player); + super.addTrackingPlayer(player); this.bossInfo.addPlayer(player); } @Override - public void setBossNonVisibleTo(EntityPlayerMP player) + public void removeTrackingPlayer(EntityPlayerMP player) { - super.setBossNonVisibleTo(player); + super.removeTrackingPlayer(player); this.bossInfo.removePlayer(player); } @@ -780,7 +780,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { private static boolean isCheatyBlock(World world, BlockPos pos) { Block block = world.getBlockState(pos).getBlock(); - String name = Block.blockRegistry.getNameForObject(block).toString(); + String name = Block.REGISTRY.getNameForObject(block).toString(); return CHEATY_BLOCKS.contains(name); } @@ -821,7 +821,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { if(flag1) { setPosition(posX, posY, posZ); - if(worldObj.getCollisionBoxes(this, getEntityBoundingBox()).isEmpty() && !worldObj.isAnyLiquid(getEntityBoundingBox())) + if(worldObj.getCollisionBoxes(this, getEntityBoundingBox()).isEmpty() && !worldObj.containsAnyLiquid(getEntityBoundingBox())) flag = true; // Prevent out of bounds teleporting @@ -848,7 +848,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { worldObj.spawnParticle(EnumParticleTypes.PORTAL, d7, d8, d9, f, f1, f2); } - playSound(SoundEvents.entity_endermen_teleport, 1.0F, 1.0F); + playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); return true; } } @@ -888,8 +888,8 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { int py = y + 12; Minecraft mc = Minecraft.getMinecraft(); - ItemStack stack = new ItemStack(Items.skull, 1, 3); - mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); + ItemStack stack = new ItemStack(Items.SKULL, 1, 3); + mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); GlStateManager.enableRescaleNormal(); mc.getRenderItem().renderItemIntoGUI(stack, px, py); @@ -939,7 +939,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { private static class BeaconComponent extends MultiblockComponent { public BeaconComponent(BlockPos relPos) { - super(relPos, Blocks.iron_block.getDefaultState()); + super(relPos, Blocks.IRON_BLOCK.getDefaultState()); } @Override @@ -952,7 +952,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { private static class BeaconBeamComponent extends MultiblockComponent { public BeaconBeamComponent(BlockPos relPos) { - super(relPos, Blocks.beacon.getDefaultState()); + super(relPos, Blocks.BEACON.getDefaultState()); } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java index ec2c697ce..54759b95a 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java +++ b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java @@ -37,12 +37,12 @@ public class EntityEnderAirBottle extends EntityThrowable { protected void onImpact(RayTraceResult pos) { if(pos.entityHit == null && !worldObj.isRemote) { List coordsList = getCoordsToPut(pos.getBlockPos()); - worldObj.playAuxSFX(2002, new BlockPos((int)Math.round(posX), (int)Math.round(posY), (int)Math.round(posZ)), 8); + worldObj.playEvent(2002, new BlockPos((int)Math.round(posX), (int)Math.round(posY), (int)Math.round(posZ)), 8); for(BlockPos coords : coordsList) { - worldObj.setBlockState(coords, Blocks.end_stone.getDefaultState()); + worldObj.setBlockState(coords, Blocks.END_STONE.getDefaultState()); if(Math.random() < 0.1) - worldObj.playAuxSFX(2001, coords, Block.getIdFromBlock(Blocks.end_stone)); + worldObj.playEvent(2001, coords, Block.getIdFromBlock(Blocks.END_STONE)); } setDead(); } @@ -57,7 +57,7 @@ public class EntityEnderAirBottle extends EntityThrowable { for (BlockPos bPos : BlockPos.getAllInBox(pos.add(-range, -rangeY, -range), pos.add(range, rangeY, range))) { IBlockState state = worldObj.getBlockState(pos); Block block = state.getBlock(); - if(block != null && block.isReplaceableOreGen(state, worldObj, pos, BlockStateMatcher.forBlock(Blocks.stone))) + if(block != null && block.isReplaceableOreGen(state, worldObj, pos, BlockStateMatcher.forBlock(Blocks.STONE))) possibleCoords.add(pos); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java index d21fe7ee5..b91cb6db0 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java @@ -81,7 +81,7 @@ public class EntityFallingStar extends EntityThrowableCopy { if (pos.getBlockPos() != null) { IBlockState state = worldObj.getBlockState(pos.getBlockPos()); if(ConfigHandler.blockBreakParticles && !state.getBlock().isAir(state, worldObj, pos.getBlockPos())) - worldObj.playAuxSFX(2001, pos.getBlockPos(), Block.getStateId(state)); + worldObj.playEvent(2001, pos.getBlockPos(), Block.getStateId(state)); } setDead(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java index 08fc0fb3e..6e6fce8ee 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java @@ -64,7 +64,7 @@ public class EntityFlameRing extends Entity { } if(worldObj.rand.nextInt(20) == 0) - worldObj.playSound(null, posX, posY, posZ, SoundEvents.block_fire_ambient, SoundCategory.BLOCKS, 1F, 1F); + worldObj.playSound(null, posX, posY, posZ, SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.BLOCKS, 1F, 1F); if(worldObj.isRemote) return; diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java index fdced8825..fb274dd32 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java @@ -36,13 +36,13 @@ public class EntityFlyingCreature extends EntityAmbientCreature { @Override public void moveEntityWithHeading(float par1, float par2) { if(isInWater()) { - moveFlying(par1, par2, 0.02F); + moveRelative(par1, par2, 0.02F); moveEntity(motionX, motionY, motionZ); motionX *= 0.800000011920929D; motionY *= 0.800000011920929D; motionZ *= 0.800000011920929D; } else if(isNotColliding()) { - moveFlying(par1, par2, 0.02F); + moveRelative(par1, par2, 0.02F); moveEntity(motionX, motionY, motionZ); motionX *= 0.5D; motionY *= 0.5D; @@ -57,7 +57,7 @@ public class EntityFlyingCreature extends EntityAmbientCreature { } float f3 = 0.16277136F / (f2 * f2 * f2); - moveFlying(par1, par2, onGround ? 0.1F * f3 : 0.02F); + moveRelative(par1, par2, onGround ? 0.1F * f3 : 0.02F); f2 = 0.91F; if (onGround) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java index e4cec2e49..00a6c4a4f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java @@ -62,8 +62,8 @@ public class EntityMagicLandmine extends Entity { List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range)); for(EntityPlayer player : players) { player.attackEntityFrom(summoner == null ? DamageSource.generic : DamageSource.causeMobDamage(summoner), 10); - player.addPotionEffect(new PotionEffect(MobEffects.blindness, 25, 0)); - PotionEffect wither = new PotionEffect(MobEffects.wither, 70, 3); + player.addPotionEffect(new PotionEffect(MobEffects.BLINDNESS, 25, 0)); + PotionEffect wither = new PotionEffect(MobEffects.WITHER, 70, 3); wither.getCurativeItems().clear(); player.addPotionEffect(wither); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index a91676203..61a25f7b3 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -195,7 +195,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { @Override @SideOnly(Side.CLIENT) - public void setPositionAndRotation2(double p_70056_1_, double p_70056_3_, double p_70056_5_, float p_70056_7_, float p_70056_8_, int p_70056_9_, boolean p_70056_10) { + public void setPositionAndRotationDirect(double p_70056_1_, double p_70056_3_, double p_70056_5_, float p_70056_7_, float p_70056_8_, int p_70056_9_, boolean p_70056_10) { setPosition(p_70056_1_, p_70056_3_, p_70056_5_); setRotation(p_70056_7_, p_70056_8_); } @@ -270,7 +270,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { ItemStack stack = ItemStack.loadItemStackFromNBT(lensCmp); if(stack != null) setSourceLens(stack); - else setSourceLens(new ItemStack(Blocks.stone, 0, 0)); + else setSourceLens(new ItemStack(Blocks.STONE, 0, 0)); int x = par1nbtTagCompound.getInteger(TAG_SPREADER_X); int y = par1nbtTagCompound.getInteger(TAG_SPREADER_Y); @@ -558,7 +558,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { public ItemStack getSourceLens() { Optional stack = dataManager.get(SOURCE_LENS); if(!stack.isPresent()) - return new ItemStack(Blocks.stone, 0, 0); // todo 1.9 refact later + return new ItemStack(Blocks.STONE, 0, 0); // todo 1.9 refact later else return stack.get(); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index 2b55f3f43..9fe9a093f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -82,7 +82,7 @@ public class EntityPinkWither extends EntityWither { } @Override - public void setBossVisibleTo(EntityPlayerMP player) + public void addTrackingPlayer(EntityPlayerMP player) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java index 7d21973b8..033dc6087 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java @@ -43,7 +43,7 @@ public class EntitySignalFlare extends Entity { if(!isDead) { if(ticksExisted % 10 == 0) - playSound(SoundEvents.entity_creeper_primed, 1F, 1F); + playSound(SoundEvents.ENTITY_CREEPER_PRIMED, 1F, 1F); int color = getColor(); if(color < 16 && color >= 0) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index b702eb1b9..1d690b4b3 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -131,7 +131,7 @@ public class EntityThornChakram extends EntityThrowable { if(fire) pos.entityHit.setFire(5); else if(worldObj.rand.nextInt(3) == 0) - ((EntityLivingBase) pos.entityHit).addPotionEffect(new PotionEffect(MobEffects.poison, 60, 0)); + ((EntityLivingBase) pos.entityHit).addPotionEffect(new PotionEffect(MobEffects.POISON, 60, 0)); } else if (pos.getBlockPos() != null) { int bounces = getTimesBounced(); if(bounces < MAX_BOUNCES) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index 5db46e24f..962094663 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -262,7 +262,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile if (raytraceresult != null) { - if (raytraceresult.typeOfHit == RayTraceResult.Type.BLOCK && this.worldObj.getBlockState(raytraceresult.getBlockPos()).getBlock() == Blocks.portal) + if (raytraceresult.typeOfHit == RayTraceResult.Type.BLOCK && this.worldObj.getBlockState(raytraceresult.getBlockPos()).getBlock() == Blocks.PORTAL) { this.setPortal(raytraceresult.getBlockPos()); } @@ -342,7 +342,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile compound.setInteger("xTile", this.xTile); compound.setInteger("yTile", this.yTile); compound.setInteger("zTile", this.zTile); - ResourceLocation resourcelocation = (ResourceLocation)Block.blockRegistry.getNameForObject(this.inTile); + ResourceLocation resourcelocation = (ResourceLocation)Block.REGISTRY.getNameForObject(this.inTile); compound.setString("inTile", resourcelocation == null ? "" : resourcelocation.toString()); compound.setByte("shake", (byte)this.throwableShake); compound.setByte("inGround", (byte)(this.inGround ? 1 : 0)); diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index 900d78a09..7561ec312 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -101,7 +101,7 @@ public class EntityThrownItem extends EntityItem { if (RayTraceResult != null) { - if (RayTraceResult.typeOfHit == net.minecraft.util.math.RayTraceResult.Type.BLOCK && worldObj.getBlockState(RayTraceResult.getBlockPos()).getBlock() == Blocks.portal) + if (RayTraceResult.typeOfHit == net.minecraft.util.math.RayTraceResult.Type.BLOCK && worldObj.getBlockState(RayTraceResult.getBlockPos()).getBlock() == Blocks.PORTAL) { setPortal(RayTraceResult.getBlockPos()); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java index 9333f5059..9390d7a2a 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java +++ b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java @@ -71,7 +71,7 @@ public class EntityVineBall extends EntityThrowable { if(block.isAir(state, worldObj, pos)) { IBlockState stateSet = ModBlocks.solidVines.getDefaultState().withProperty(propMap.get(dir.getOpposite()), true); worldObj.setBlockState(pos, stateSet, 1 | 2); - worldObj.playAuxSFX(2001, pos, Block.getStateId(stateSet)); + worldObj.playEvent(2001, pos, Block.getStateId(stateSet)); pos = pos.down(); } else break; } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 97acc13b1..510581dc9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -64,10 +64,10 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { @Override public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { - if(getBlock(par1ItemStack) != Blocks.air && par3EntityPlayer.isSneaking()) { + if(getBlock(par1ItemStack) != Blocks.AIR && par3EntityPlayer.isSneaking()) { int dmg = par1ItemStack.getItemDamage(); par1ItemStack.setItemDamage(~dmg & 1); - par3EntityPlayer.playSound(SoundEvents.entity_experience_orb_pickup, 0.3F, 0.1F); + par3EntityPlayer.playSound(SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, 0.3F, 0.1F); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } @@ -133,7 +133,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { @Override public void onUpdate(ItemStack itemstack, World p_77663_2_, Entity entity, int p_77663_4_, boolean p_77663_5_) { Block block = getBlock(itemstack); - if(!entity.worldObj.isRemote && itemstack.getItemDamage() == 1 && block != Blocks.air && entity instanceof EntityPlayer) { + if(!entity.worldObj.isRemote && itemstack.getItemDamage() == 1 && block != Blocks.AIR && entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) entity; int meta = getBlockMeta(itemstack); @@ -219,8 +219,8 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { } private boolean setBlock(ItemStack stack, Block block, int meta) { - if(getBlock(stack) == Blocks.air || getBlockCount(stack) == 0) { - ItemNBTHelper.setString(stack, TAG_BLOCK_NAME, Block.blockRegistry.getNameForObject(block).toString()); + if(getBlock(stack) == Blocks.AIR || getBlockCount(stack) == 0) { + ItemNBTHelper.setString(stack, TAG_BLOCK_NAME, Block.REGISTRY.getNameForObject(block).toString()); ItemNBTHelper.setInt(stack, TAG_BLOCK_META, meta); return true; } @@ -236,7 +236,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { @SideOnly(Side.CLIENT) public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { Block block = getBlock(par1ItemStack); - if(block != null && block != Blocks.air) { + if(block != null && block != Blocks.AIR) { int count = getBlockCount(par1ItemStack); par3List.add(count + " " + I18n.translateToLocal(new ItemStack(block, 1, getBlockMeta(par1ItemStack)).getUnlocalizedName() + ".name")); } diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 4def829c4..61d7627cb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -59,7 +59,7 @@ public class ItemBottledMana extends ItemMod { } case 1 : { // Water if(!living.worldObj.isRemote && !living.worldObj.provider.doesWaterVaporize()) - living.worldObj.setBlockState(new BlockPos(living), Blocks.flowing_water.getDefaultState()); + living.worldObj.setBlockState(new BlockPos(living), Blocks.FLOWING_WATER.getDefaultState()); break; } case 2 : { // Set on Fire @@ -75,7 +75,7 @@ public class ItemBottledMana extends ItemMod { case 4 : { // Mega Jump if(!living.worldObj.provider.doesWaterVaporize()) { if(!living.worldObj.isRemote) - living.addPotionEffect(new PotionEffect(MobEffects.resistance, 300, 5)); + living.addPotionEffect(new PotionEffect(MobEffects.RESISTANCE, 300, 5)); living.motionY = 6; } @@ -88,7 +88,7 @@ public class ItemBottledMana extends ItemMod { } case 6 : { // Lots O' Hearts if(!living.worldObj.isRemote) - living.addPotionEffect(new PotionEffect(MobEffects.absorption, 20 * 60 * 2, 9)); + living.addPotionEffect(new PotionEffect(MobEffects.ABSORPTION, 20 * 60 * 2, 9)); break; } case 7 : { // All your inventory is belong to us @@ -120,7 +120,7 @@ public class ItemBottledMana extends ItemMod { if(!block.isAir(living.worldObj.getBlockState(new BlockPos(x, i, z)), living.worldObj, new BlockPos(x, i, z))) { if(living instanceof EntityPlayerMP) { EntityPlayerMP mp = (EntityPlayerMP) living; - mp.playerNetServerHandler.setPlayerLocation(living.posX, i + 1.6, living.posZ, living.rotationYaw, living.rotationPitch); + mp.connection.setPlayerLocation(living.posX, i + 1.6, living.posZ, living.rotationYaw, living.rotationPitch); } break; } @@ -130,12 +130,12 @@ public class ItemBottledMana extends ItemMod { } case 10 : { // HYPERSPEEEEEED if(!living.worldObj.isRemote) - living.addPotionEffect(new PotionEffect(MobEffects.moveSpeed, 60, 200)); + living.addPotionEffect(new PotionEffect(MobEffects.SPEED, 60, 200)); break; } case 11 : { // Night Vision if(!living.worldObj.isRemote) - living.addPotionEffect(new PotionEffect(MobEffects.nightVision, 6000, 0)); + living.addPotionEffect(new PotionEffect(MobEffects.NIGHT_VISION, 6000, 0)); break; } case 12 : { // Flare @@ -143,7 +143,7 @@ public class ItemBottledMana extends ItemMod { EntitySignalFlare flare = new EntitySignalFlare(living.worldObj); flare.setPosition(living.posX, living.posY, living.posZ); flare.setColor(living.worldObj.rand.nextInt(16)); - flare.playSound(SoundEvents.entity_generic_explode, 40F, (1.0F + (living.worldObj.rand.nextFloat() - living.worldObj.rand.nextFloat()) * 0.2F) * 0.7F); + flare.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 40F, (1.0F + (living.worldObj.rand.nextFloat() - living.worldObj.rand.nextFloat()) * 0.2F) * 0.7F); living.worldObj.spawnEntityInWorld(flare); @@ -151,7 +151,7 @@ public class ItemBottledMana extends ItemMod { List entities = living.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(living.posX - range, living.posY - range, living.posZ - range, living.posX + range, living.posY + range, living.posZ + range)); for(EntityLivingBase entity : entities) if(entity != living && (!(entity instanceof EntityPlayer) || FMLCommonHandler.instance().getMinecraftServerInstance() == null || FMLCommonHandler.instance().getMinecraftServerInstance().isPVPEnabled())) - entity.addPotionEffect(new PotionEffect(MobEffects.moveSlowdown, 50, 5)); + entity.addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, 50, 5)); } break; @@ -166,8 +166,8 @@ public class ItemBottledMana extends ItemMod { } case 14 : { // Nausea + Blindness :3 if(!living.worldObj.isRemote) { - living.addPotionEffect(new PotionEffect(MobEffects.confusion, 160, 3)); - living.addPotionEffect(new PotionEffect(MobEffects.blindness, 160, 0)); + living.addPotionEffect(new PotionEffect(MobEffects.NAUSEA, 160, 3)); + living.addPotionEffect(new PotionEffect(MobEffects.BLINDNESS, 160, 0)); } break; @@ -175,7 +175,7 @@ public class ItemBottledMana extends ItemMod { case 15 : { // Drop own Head if(!living.worldObj.isRemote && living instanceof EntityPlayer) { living.attackEntityFrom(DamageSource.magic, living.getHealth() - 1); - ItemStack stack = new ItemStack(Items.skull, 1, 3); + ItemStack stack = new ItemStack(Items.SKULL, 1, 3); ItemNBTHelper.setString(stack, "SkullOwner", living.getName()); living.entityDropItem(stack, 0); } @@ -224,7 +224,7 @@ public class ItemBottledMana extends ItemMod { randomSeed(par1ItemStack); if(par1ItemStack.getItemDamage() == 6) - return new ItemStack(Items.glass_bottle); + return new ItemStack(Items.GLASS_BOTTLE); return par1ItemStack; } diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index 5200188a9..fb2806006 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -101,7 +101,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { if(can) { Block block = world.getBlockState(pos).getBlock(); - if(block == Blocks.noteblock) { + if(block == Blocks.NOTEBLOCK) { world.setBlockState(pos, ModBlocks.cacophonium.getDefaultState()); ((TileCacophonium) world.getTileEntity(pos)).stack = stack.copy(); stack.stackSize--; @@ -152,8 +152,8 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { if(doit) sound = "botania:doit"; - if(sound != null && !sound.isEmpty() && SoundEvent.soundEventRegistry.containsKey(new ResourceLocation(sound))) - world.playSound(null, x, y, z, SoundEvent.soundEventRegistry.getObject(new ResourceLocation(sound)), SoundCategory.NEUTRAL, volume, doit ? 1F : (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F + 1.0F); + if(sound != null && !sound.isEmpty() && SoundEvent.REGISTRY.containsKey(new ResourceLocation(sound))) + world.playSound(null, x, y, z, SoundEvent.REGISTRY.getObject(new ResourceLocation(sound)), SoundCategory.NEUTRAL, volume, doit ? 1F : (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F + 1.0F); } private static boolean isDOIT(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 6c095dba4..1df8331ce 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -67,7 +67,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { private static final ResourceLocation glowTexture = new ResourceLocation(LibResources.MISC_GLOW_GREEN); - private static final ItemStack craftingTable = new ItemStack(Blocks.crafting_table); + private static final ItemStack craftingTable = new ItemStack(Blocks.CRAFTING_TABLE); public static final int SEGMENTS = 12; @@ -176,7 +176,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { private static void doCraft(EntityPlayer player, ItemStack[] recipe, boolean particles) { consumeRecipeIngredients(recipe, player.inventory, player); if(!player.inventory.addItemStackToInventory(recipe[9])) - player.dropPlayerItemWithRandomChoice(recipe[9], false); + player.dropItem(recipe[9], false); if(!particles) return; @@ -456,7 +456,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { ItemStack slotStack = getItemForSlot(stack, seg); if(slotStack != null) { - mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); + mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); float scale = seg == 0 ? 0.75F : 0.6F; GlStateManager.scale(scale, scale, scale); GlStateManager.rotate(180F, 0F, 1F, 0F); diff --git a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java index 0c4a4a433..8988b31f3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java +++ b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java @@ -43,7 +43,7 @@ public class ItemEnderHand extends ItemMod implements IManaUsingItem, IBlockProv if(ManaItemHandler.requestManaExact(stack, player, COST_SELF, false)) { player.displayGUIChest(player.getInventoryEnderChest()); ManaItemHandler.requestManaExact(stack, player, COST_SELF, true); - world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.entity_endermen_teleport, SoundCategory.PLAYERS, 1F, 1F); + world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.PLAYERS, 1F, 1F); return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } return ActionResult.newResult(EnumActionResult.PASS, stack); @@ -54,7 +54,7 @@ public class ItemEnderHand extends ItemMod implements IManaUsingItem, IBlockProv if(ConfigHandler.enderPickpocketEnabled && entity instanceof EntityPlayer && ManaItemHandler.requestManaExact(stack, iplayer, COST_OTHER, false)) { iplayer.displayGUIChest(((EntityPlayer) entity).getInventoryEnderChest()); ManaItemHandler.requestManaExact(stack, iplayer, COST_OTHER, true); - entity.playSound(SoundEvents.entity_endermen_teleport, 1F, 1F); + entity.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1F, 1F); return true; } diff --git a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java index d177da91b..9375eba63 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java +++ b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java @@ -55,7 +55,7 @@ public class ItemGaiaHead extends ItemMod { pos = pos.offset(facing); } - if (playerIn.canPlayerEdit(pos, facing, stack) && Blocks.skull.canPlaceBlockAt(worldIn, pos)) { + if (playerIn.canPlayerEdit(pos, facing, stack) && Blocks.SKULL.canPlaceBlockAt(worldIn, pos)) { if (worldIn.isRemote) { return EnumActionResult.SUCCESS; } else { @@ -95,7 +95,7 @@ public class ItemGaiaHead extends ItemMod { } tileentityskull.setSkullRotation(i); - Blocks.skull.checkWitherSpawn(worldIn, pos, tileentityskull); + Blocks.SKULL.checkWitherSpawn(worldIn, pos, tileentityskull); } --stack.stackSize; diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 761a9da94..040c4af56 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -86,7 +86,7 @@ public class ItemGrassHorn extends ItemMod { breakGrass(player.worldObj, stack, stack.getItemDamage(), new BlockPos(player)); if(!player.worldObj.isRemote) - player.worldObj.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.block_note_bass, SoundCategory.BLOCKS, 1F, 0.001F); + player.worldObj.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.BLOCK_NOTE_BASS, SoundCategory.BLOCKS, 1F, 0.001F); } public static void breakGrass(World world, ItemStack stack, int stackDmg, BlockPos srcPos) { @@ -101,7 +101,7 @@ public class ItemGrassHorn extends ItemMod { for(int k = -rangeY; k < rangeY + 1; k++) { BlockPos pos = srcPos.add(i, k, j); Block block = world.getBlockState(pos).getBlock(); - if(block instanceof IHornHarvestable ? ((IHornHarvestable) block).canHornHarvest(world, pos, stack, type) : stackDmg == 0 && block instanceof BlockBush && !(block instanceof ISpecialFlower) || stackDmg == 1 && block.isLeaves(world.getBlockState(pos), world, pos) || stackDmg == 2 && block == Blocks.snow_layer) + if(block instanceof IHornHarvestable ? ((IHornHarvestable) block).canHornHarvest(world, pos, stack, type) : stackDmg == 0 && block instanceof BlockBush && !(block instanceof ISpecialFlower) || stackDmg == 1 && block.isLeaves(world.getBlockState(pos), world, pos) || stackDmg == 2 && block == Blocks.SNOW_LAYER) coords.add(pos); } @@ -120,7 +120,7 @@ public class ItemGrassHorn extends ItemMod { else if(!world.isRemote) { world.setBlockToAir(currCoords); if(ConfigHandler.blockBreakParticles) - world.playAuxSFX(2001, currCoords, Block.getStateId(state)); + world.playEvent(2001, currCoords, Block.getStateId(state)); for(ItemStack stack_ : items) world.spawnEntityInWorld(new EntityItem(world, currCoords.getX() + 0.5, currCoords.getY() + 0.5, currCoords.getZ() + 0.5, stack_)); diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index a13f54f24..791af53b6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -81,7 +81,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { IBlockState state = par3World.getBlockState(pos); - if((state.getBlock() == Blocks.dirt && state.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT) || (state.getBlock() == Blocks.grass && par1ItemStack.getItemDamage() != 0)) { + if((state.getBlock() == Blocks.DIRT && state.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT) || (state.getBlock() == Blocks.GRASS && par1ItemStack.getItemDamage() != 0)) { int meta = par1ItemStack.getItemDamage(); BlockSwapper swapper = addBlockSwapper(par3World, pos, meta); @@ -212,15 +212,15 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { private static BlockSwapper swapperFromMeta(World world, BlockPos pos, int meta) { switch(meta) { - case 1 : return new BlockSwapper(world, pos, Blocks.dirt.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.PODZOL)); - case 2 : return new BlockSwapper(world, pos, Blocks.mycelium.getDefaultState()); + case 1 : return new BlockSwapper(world, pos, Blocks.DIRT.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.PODZOL)); + case 2 : return new BlockSwapper(world, pos, Blocks.MYCELIUM.getDefaultState()); case 3 : return new BlockSwapper(world, pos, ModBlocks.altGrass.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.DRY)); case 4 : return new BlockSwapper(world, pos, ModBlocks.altGrass.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.GOLDEN)); case 5 : return new BlockSwapper(world, pos, ModBlocks.altGrass.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.VIVID)); case 6 : return new BlockSwapper(world, pos, ModBlocks.altGrass.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.SCORCHED)); case 7 : return new BlockSwapper(world, pos, ModBlocks.altGrass.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.INFUSED)); case 8 : return new BlockSwapper(world, pos, ModBlocks.altGrass.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.MUTATED)); - default : return new BlockSwapper(world, pos, Blocks.grass.getDefaultState()); + default : return new BlockSwapper(world, pos, Blocks.GRASS.getDefaultState()); } } @@ -337,8 +337,8 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { // The major rule is that a block which reduces light // levels by 2 or more blocks grass growth. - return (block == Blocks.dirt || block == Blocks.grass) - && (block != Blocks.dirt || state.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT) + return (block == Blocks.DIRT || block == Blocks.GRASS) + && (block != Blocks.DIRT || state.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT) && (world.getBlockState(pos.up()).getLightOpacity(world, pos.up()) <= 1); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index 0eddd8e47..1b89c1c1e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -137,10 +137,10 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet world.setTileEntity(pos_, newTile); } world.setBlockToAir(pos_); - world.playAuxSFX(2001, pos_, Block.getStateId(state)); + world.playEvent(2001, pos_, Block.getStateId(state)); ItemStack copyLens = new ItemStack(this, 1, lens.getItemDamage()); - ItemNBTHelper.setString(copyLens, TAG_BLOCK_NAME, Block.blockRegistry.getNameForObject(block).toString()); + ItemNBTHelper.setString(copyLens, TAG_BLOCK_NAME, Block.REGISTRY.getNameForObject(block).toString()); ItemNBTHelper.setInt(copyLens, TAG_META, block.getMetaFromState(state)); NBTTagCompound cmp = new NBTTagCompound(); if(tile != null) @@ -234,7 +234,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet BlockPos pos = new BlockPos(x, y, z); if(entity.worldObj.isAirBlock(pos)) { - Block block = Blocks.air; + Block block = Blocks.AIR; if (lens.hasTagCompound()) { if (lens.getTagCompound().hasKey(TAG_BLOCK_NAME)) { block = Block.getBlockFromName(ItemNBTHelper.getString(lens, TAG_BLOCK_NAME, "")); @@ -248,10 +248,10 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet TileEntity tile = null; NBTTagCompound tilecmp = ItemNBTHelper.getCompound(lens, TAG_TILE, false); if(tilecmp.hasKey("id")) - tile = TileEntity.createTileEntity(null, tilecmp); + tile = TileEntity.create(tilecmp); entity.worldObj.setBlockState(pos, block.getStateFromMeta(meta), 1 | 2); - entity.worldObj.playAuxSFX(2001, pos, Block.getStateId(block.getStateFromMeta(meta))); + entity.worldObj.playEvent(2001, pos, Block.getStateId(block.getStateFromMeta(meta))); if(tile != null) { tile.setPos(pos); entity.worldObj.setTileEntity(pos, tile); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index f9d6ed665..10a5c341b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -28,7 +28,7 @@ public class ItemManaCookie extends ItemFood { public ItemManaCookie() { super(0, 0.1F, false); - setPotionEffect(new PotionEffect(MobEffects.saturation, 1, 0), 1F); + setPotionEffect(new PotionEffect(MobEffects.SATURATION, 1, 0), 1F); setCreativeTab(BotaniaCreativeTab.INSTANCE); GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibItemNames.MANA_COOKIE)); setUnlocalizedName(LibItemNames.MANA_COOKIE); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 65d8a32ef..6dca1910f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -90,13 +90,13 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { @Override public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { int effCd = COOLDOWN; - PotionEffect effect = par3EntityPlayer.getActivePotionEffect(MobEffects.digSpeed); + PotionEffect effect = par3EntityPlayer.getActivePotionEffect(MobEffects.HASTE); if(effect != null) effCd -= (effect.getAmplifier() + 1) * 8; if(par3EntityPlayer.isSneaking() && hasClip(par1ItemStack)) { rotatePos(par1ItemStack); - par2World.playSound(null, par3EntityPlayer.posX, par3EntityPlayer.posY, par3EntityPlayer.posZ, SoundEvents.block_stone_button_click_on, SoundCategory.PLAYERS, 0.6F, (1.0F + (par2World.rand.nextFloat() - par2World.rand.nextFloat()) * 0.2F) * 0.7F); + par2World.playSound(null, par3EntityPlayer.posX, par3EntityPlayer.posY, par3EntityPlayer.posZ, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.PLAYERS, 0.6F, (1.0F + (par2World.rand.nextFloat() - par2World.rand.nextFloat()) * 0.2F) * 0.7F); if(par2World.isRemote) par3EntityPlayer.swingArm(hand); ItemStack lens = getLens(par1ItemStack); @@ -120,7 +120,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { } par1ItemStack.setItemDamage(effCd); } else if(!par2World.isRemote) - par2World.playSound(null, par3EntityPlayer.posX, par3EntityPlayer.posY, par3EntityPlayer.posZ, SoundEvents.block_lever_click, SoundCategory.PLAYERS, 0.6F, (1.0F + (par2World.rand.nextFloat() - par2World.rand.nextFloat()) * 0.2F) * 0.7F); + par2World.playSound(null, par3EntityPlayer.posX, par3EntityPlayer.posY, par3EntityPlayer.posZ, SoundEvents.BLOCK_LEVER_CLICK, SoundCategory.PLAYERS, 0.6F, (1.0F + (par2World.rand.nextFloat() - par2World.rand.nextFloat()) * 0.2F) * 0.7F); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index fce42cb6d..d92d8bb1c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -31,7 +31,7 @@ public class ItemOpenBucket extends ItemMod { @Override public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { - RayTraceResult RayTraceResult = getMovingObjectPositionFromPlayer(par2World, par3EntityPlayer, true); + RayTraceResult RayTraceResult = rayTrace(par2World, par3EntityPlayer, true); if(RayTraceResult == null) return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); @@ -48,7 +48,7 @@ public class ItemOpenBucket extends ItemMod { Material material = par2World.getBlockState(pos).getMaterial(); int l = par2World.getBlockState(pos).getBlock().getMetaFromState(par2World.getBlockState(pos)); // hack to get meta so we don't have to know the level prop - if((material == Material.lava || material == Material.water) && l == 0) { + if((material == Material.LAVA || material == Material.WATER) && l == 0) { par2World.setBlockToAir(pos); for(int x = 0; x < 5; x++) diff --git a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java index 3f916c4bb..9d38af0dc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java @@ -37,7 +37,7 @@ public class ItemOvergrowthSeed extends ItemMod { for(int i : ids) { String name = OreDictionary.getOreName(i); if(name.equals("grass")) { - world.playAuxSFX(2001, pos, Block.getStateId(state)); + world.playEvent(2001, pos, Block.getStateId(state)); world.setBlockState(pos, ModBlocks.enchantedSoil.getDefaultState()); stack.stackSize--; diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index 0fac54030..98266c541 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -46,7 +46,7 @@ public class ItemPinkinator extends ItemMod { EntityPinkWither pink = new EntityPinkWither(world); pink.setLocationAndAngles(wither.posX, wither.posY, wither.posZ, wither.rotationYaw, wither.rotationPitch); world.spawnEntityInWorld(pink); - pink.playSound(SoundEvents.entity_generic_explode, 4F, (1F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); + pink.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 4F, (1F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); } player.addStat(ModAchievements.pinkinator, 1); diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index 25676a7e3..131823f6b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -95,7 +95,7 @@ public class ItemSextant extends ItemMod { int y = ItemNBTHelper.getInt(stack, TAG_SOURCE_Y, -1); int z = ItemNBTHelper.getInt(stack, TAG_SOURCE_Z, 0); if(y != -1) - Botania.proxy.setMultiblock(world, x, y, z, radius, Blocks.cobblestone); + Botania.proxy.setMultiblock(world, x, y, z, radius, Blocks.COBBLESTONE); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index 96b76e6ba..8899568af 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -55,7 +55,7 @@ public class ItemSignalFlare extends ItemMod implements IColorable { EntitySignalFlare flare = new EntitySignalFlare(par2World); flare.setPosition(par3EntityPlayer.posX, par3EntityPlayer.posY, par3EntityPlayer.posZ); flare.setColor(getColor(par1ItemStack)); - par2World.playSound(null, par3EntityPlayer.posX, par3EntityPlayer.posY, par3EntityPlayer.posZ, SoundEvents.entity_generic_explode, SoundCategory.PLAYERS, 40F, (1.0F + (par2World.rand.nextFloat() - par2World.rand.nextFloat()) * 0.2F) * 0.7F); + par2World.playSound(null, par3EntityPlayer.posX, par3EntityPlayer.posY, par3EntityPlayer.posZ, SoundEvents.ENTITY_GENERIC_EXPLODE, SoundCategory.PLAYERS, 40F, (1.0F + (par2World.rand.nextFloat() - par2World.rand.nextFloat()) * 0.2F) * 0.7F); par2World.spawnEntityInWorld(flare); @@ -64,7 +64,7 @@ public class ItemSignalFlare extends ItemMod implements IColorable { List entities = par2World.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(par3EntityPlayer.posX - range, par3EntityPlayer.posY - range, par3EntityPlayer.posZ - range, par3EntityPlayer.posX + range, par3EntityPlayer.posY + range, par3EntityPlayer.posZ + range)); for(EntityLivingBase entity : entities) if(entity != par3EntityPlayer && (!(entity instanceof EntityPlayer) || FMLCommonHandler.instance().getMinecraftServerInstance() == null || FMLCommonHandler.instance().getMinecraftServerInstance().isPVPEnabled())) { - entity.addPotionEffect(new PotionEffect(MobEffects.moveSlowdown, 50, 5)); + entity.addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, 50, 5)); stunned++; } diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 33e9e5a63..b36d3ce83 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -100,7 +100,7 @@ public class ItemSpawnerMover extends ItemMod { @Override public EnumActionResult onItemUse(ItemStack itemstack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xOffset, float yOffset, float zOffset) { if(getEntityId(itemstack) == null) { - if(world.getBlockState(pos).getBlock().equals(Blocks.mob_spawner)) { + if(world.getBlockState(pos).getBlock().equals(Blocks.MOB_SPAWNER)) { TileEntity te = world.getTileEntity(pos); NBTTagCompound tag = new NBTTagCompound(); tag.setTag(TAG_SPAWNER, new NBTTagCompound()); @@ -135,12 +135,12 @@ public class ItemSpawnerMover extends ItemMod { return false; } else if(!player.canPlayerEdit(pos, side, itemstack)) { return false; - } else if(world.canBlockBePlaced(Blocks.mob_spawner, pos, false, side, null, itemstack)) { + } else if(world.canBlockBePlaced(Blocks.MOB_SPAWNER, pos, false, side, null, itemstack)) { int meta = this.getMetadata(itemstack.getMetadata()); - IBlockState iblockstate1 = Blocks.mob_spawner.onBlockPlaced(world, pos, side, xOffset, yOffset, zOffset, meta, player); + IBlockState iblockstate1 = Blocks.MOB_SPAWNER.onBlockPlaced(world, pos, side, xOffset, yOffset, zOffset, meta, player); if (placeBlockAt(itemstack, player, world, pos, side, xOffset, yOffset, zOffset, iblockstate1)) { - world.playSound(null, pos, Blocks.mob_spawner.getSoundType().getPlaceSound(), SoundCategory.BLOCKS, (Blocks.mob_spawner.getSoundType().getVolume() + 1.0F) / 2.0F, Blocks.mob_spawner.getSoundType().getPitch() * 0.8F); + world.playSound(null, pos, Blocks.MOB_SPAWNER.getSoundType().getPlaceSound(), SoundCategory.BLOCKS, (Blocks.MOB_SPAWNER.getSoundType().getVolume() + 1.0F) / 2.0F, Blocks.MOB_SPAWNER.getSoundType().getPitch() * 0.8F); --itemstack.stackSize; player.renderBrokenItemStack(itemstack); player.addStat(ModAchievements.spawnerMoverUse, 1); @@ -160,7 +160,7 @@ public class ItemSpawnerMover extends ItemMod { return false; Block block = world.getBlockState(pos).getBlock(); - if(block.equals(Blocks.mob_spawner)) { + if(block.equals(Blocks.MOB_SPAWNER)) { TileEntity te = world.getTileEntity(pos); NBTTagCompound tag = stack.getTagCompound(); if (tag.hasKey(TAG_SPAWNER)) diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index f42723dc9..afc345428 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -38,7 +38,7 @@ public class ItemTemperanceStone extends ItemMod { public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { int dmg = stack.getItemDamage(); stack.setItemDamage(~dmg & 1); - world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.entity_experience_orb_pickup, SoundCategory.NEUTRAL, 0.3F, 0.1F); + world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, SoundCategory.NEUTRAL, 0.3F, 0.1F); return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index 99c098581..e56ebc42b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -52,7 +52,7 @@ public class ItemThornChakram extends ItemMod implements ICraftAchievement { public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { --stack.stackSize; - world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.entity_arrow_shoot, SoundCategory.NEUTRAL, 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); + world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.NEUTRAL, 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); if(!world.isRemote) { ItemStack copy = stack.copy(); diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 5f836e7dd..4766a3582 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -99,7 +99,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { par2EntityPlayer.swingArm(hand); } - if(block == Blocks.lapis_block && ConfigHandler.enchanterEnabled) { + if(block == Blocks.LAPIS_BLOCK && ConfigHandler.enchanterEnabled) { EnumFacing.Axis axis = null; if(TileEnchanter.canEnchanterExist(par3World, pos, EnumFacing.Axis.X)) axis = EnumFacing.Axis.X; diff --git a/src/main/java/vazkii/botania/common/item/ItemVineBall.java b/src/main/java/vazkii/botania/common/item/ItemVineBall.java index 4bc5aff5e..ceafe81c6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVineBall.java +++ b/src/main/java/vazkii/botania/common/item/ItemVineBall.java @@ -32,7 +32,7 @@ public class ItemVineBall extends ItemMod { if(!par3EntityPlayer.capabilities.isCreativeMode) --par1ItemStack.stackSize; - par2World.playSound(null, par3EntityPlayer.posX, par3EntityPlayer.posY, par3EntityPlayer.posZ, SoundEvents.entity_arrow_shoot, SoundCategory.NEUTRAL, 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); + par2World.playSound(null, par3EntityPlayer.posX, par3EntityPlayer.posY, par3EntityPlayer.posZ, SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.NEUTRAL, 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); if(!par2World.isRemote) { EntityVineBall ball = new EntityVineBall(par3EntityPlayer, true); diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 7024d0469..77c6f8924 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -18,6 +18,7 @@ import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.ai.attributes.IAttributeInstance; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.entity.passive.HorseArmorType; +import net.minecraft.entity.passive.HorseType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.SoundEvents; @@ -56,7 +57,7 @@ public class ItemVirus extends ItemMod { if(par2EntityPlayer.worldObj.isRemote) return true; EntityHorse horse = (EntityHorse) par3EntityLivingBase; - if(horse.getType() != HorseArmorType.ZOMBIE && horse.getType() != HorseArmorType.SKELETON && horse.isTame()) { + if(horse.getType() != HorseType.ZOMBIE && horse.getType() != HorseType.SKELETON && horse.isTame()) { IItemHandler inv = horse.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); ItemStack saddle = inv.getStackInSlot(0); @@ -64,9 +65,9 @@ public class ItemVirus extends ItemMod { if(inv.getStackInSlot(i) != null) horse.entityDropItem(inv.getStackInSlot(i), 0); if (horse.isChested()) - horse.entityDropItem(new ItemStack(Blocks.chest), 0); + horse.entityDropItem(new ItemStack(Blocks.CHEST), 0); - horse.setType(par1ItemStack.getItemDamage() == 0 ? HorseArmorType.ZOMBIE : HorseArmorType.SKELETON); + horse.setType(par1ItemStack.getItemDamage() == 0 ? HorseType.ZOMBIE : HorseType.SKELETON); // Reinit the horse chest to the right new size Method m = ReflectionHelper.findMethod(EntityHorse.class, horse, LibObfuscation.INIT_HORSE_CHEST); @@ -84,7 +85,7 @@ public class ItemVirus extends ItemMod { movementSpeed.applyModifier(new AttributeModifier("Ermergerd Virus D:", movementSpeed.getBaseValue(), 0)); IAttributeInstance jumpHeight = attributes.getAttributeInstance(ReflectionHelper.getPrivateValue(EntityHorse.class, null, LibObfuscation.HORSE_JUMP_STRENGTH)); jumpHeight.applyModifier(new AttributeModifier("Ermergerd Virus D:", jumpHeight.getBaseValue() * 0.5, 0)); - horse.playSound(SoundEvents.entity_zombie_villager_cure, 1.0F + par3EntityLivingBase.worldObj.rand.nextFloat(), par3EntityLivingBase.worldObj.rand.nextFloat() * 0.7F + 1.3F); + horse.playSound(SoundEvents.ENTITY_ZOMBIE_VILLAGER_CURE, 1.0F + par3EntityLivingBase.worldObj.rand.nextFloat(), par3EntityLivingBase.worldObj.rand.nextFloat() * 0.7F + 1.3F); horse.spawnExplosionParticle(); par1ItemStack.stackSize--; @@ -102,7 +103,7 @@ public class ItemVirus extends ItemMod { if(entity instanceof EntityHorse && event.getSource() == DamageSource.fall) { EntityHorse horse = (EntityHorse) entity; - if((horse.getType() == HorseArmorType.ZOMBIE || horse.getType() == HorseArmorType.SKELETON) && horse.isTame()) + if((horse.getType() == HorseType.ZOMBIE || horse.getType() == HorseType.SKELETON) && horse.isTame()) event.setCanceled(true); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java index fef032232..085df70fa 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java @@ -41,7 +41,7 @@ public class ItemWorldSeed extends ItemMod { while(!world.getCollisionBoxes(player, player.getEntityBoundingBox()).isEmpty()) player.setPositionAndUpdate(player.posX, player.posY + 1, player.posZ); - world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.entity_endermen_teleport, SoundCategory.PLAYERS, 1F, 1F); + world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.PLAYERS, 1F, 1F); for(int i = 0; i < 50; i++) Botania.proxy.sparkleFX(world, player.posX + Math.random() * player.width, player.posY - 1.6 + Math.random() * player.height, player.posZ + Math.random() * player.width, 0.25F, 1F, 0.25F, 1F, 10); diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 57e3a7cfd..bdba3e54c 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -458,13 +458,13 @@ public final class ModItems { BotaniaAPI.blackListItemFromLoonium(lexicon); BotaniaAPI.blackListItemFromLoonium(overgrowthSeed); BotaniaAPI.blackListItemFromLoonium(blackLotus); - int min = Item.getIdFromItem(Items.record_13); - int max = Item.getIdFromItem(Items.record_wait); + int min = Item.getIdFromItem(Items.RECORD_13); + int max = Item.getIdFromItem(Items.RECORD_WAIT); for(int i = min; i <= max; i++) BotaniaAPI.blackListItemFromLoonium(Item.getItemById(i)); - OreDictionary.registerOre("rodBlaze", Items.blaze_rod); - OreDictionary.registerOre("powderBlaze", Items.blaze_powder); - OreDictionary.registerOre(LibOreDict.PRISMARINE_SHARD, new ItemStack(Items.prismarine_shard)); + OreDictionary.registerOre("rodBlaze", Items.BLAZE_ROD); + OreDictionary.registerOre("powderBlaze", Items.BLAZE_POWDER); + OreDictionary.registerOre(LibOreDict.PRISMARINE_SHARD, new ItemStack(Items.PRISMARINE_SHARD)); } } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java index 231bc226b..7696b710a 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -91,7 +91,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup } if(world.rand.nextBoolean()) - world.playSound(null, living.posX, living.posY, living.posZ, SoundEvents.entity_player_burp, SoundCategory.PLAYERS, 1F, 1F); + world.playSound(null, living.posX, living.posY, living.posZ, SoundEvents.ENTITY_PLAYER_BURP, SoundCategory.PLAYERS, 1F, 1F); int swigs = getSwigsLeft(stack); if(living instanceof EntityPlayer && !((EntityPlayer) living).capabilities.isCreativeMode) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index cbbcaa862..ae95c84c8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java @@ -106,7 +106,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc float f2 = MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getMinV(); float f3 = MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getMaxV(); IBaubleRender.Helper.translateToHeadLevel(player); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.26F, -1.45F, -0.39F); @@ -122,7 +122,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc if(attacker instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) attacker; if(hasArmorSet(player)) { - boolean crit = player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(MobEffects.blindness) && !player.isRiding(); + boolean crit = player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(MobEffects.BLINDNESS) && !player.isRiding(); ItemStack stack = player.inventory.armorItemInSlot(3); if(crit && stack != null && stack.getItem() instanceof ItemTerrasteelHelm) { boolean ahrim = hasAncientWill(stack, 0); @@ -133,17 +133,17 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc boolean karil = hasAncientWill(stack, 5); if(ahrim) - event.getEntityLiving().addPotionEffect(new PotionEffect(MobEffects.weakness, 20, 1)); + event.getEntityLiving().addPotionEffect(new PotionEffect(MobEffects.WEAKNESS, 20, 1)); if(dharok) event.setAmount(event.getAmount() * (1F + (1F - player.getHealth() / player.getMaxHealth()) * 0.5F)); if(guthan) player.heal(event.getAmount() * 0.25F); if(torag) - event.getEntityLiving().addPotionEffect(new PotionEffect(MobEffects.moveSlowdown, 60, 1)); + event.getEntityLiving().addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, 60, 1)); if(verac) event.getSource().setDamageBypassesArmor(); if(karil) - event.getEntityLiving().addPotionEffect(new PotionEffect(MobEffects.wither, 60, 1)); + event.getEntityLiving().addPotionEffect(new PotionEffect(MobEffects.WITHER, 60, 1)); } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java index d1774fd2f..339b1a00b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java @@ -79,7 +79,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { @Override public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); if(type == RenderType.HEAD) { Helper.translateToHeadLevel(player); switch(stack.getItemDamage()) { @@ -319,8 +319,8 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { renderStack.setItemDamage(14); // Modified copy of RenderItem.renderItem(stack, transformtype) - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - Minecraft.getMinecraft().renderEngine.getTexture(TextureMap.locationBlocksTexture).setBlurMipmap(false, false); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + Minecraft.getMinecraft().renderEngine.getTexture(TextureMap.LOCATION_BLOCKS_TEXTURE).setBlurMipmap(false, false); IBakedModel model = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(renderStack); @@ -338,8 +338,8 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { GlStateManager.popMatrix(); GlStateManager.disableRescaleNormal(); GlStateManager.disableBlend(); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - Minecraft.getMinecraft().renderEngine.getTexture(TextureMap.locationBlocksTexture).restoreLastBlurMipmap(); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + Minecraft.getMinecraft().renderEngine.getTexture(TextureMap.LOCATION_BLOCKS_TEXTURE).restoreLastBlurMipmap(); // } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java index 31b4c6923..930a604ed 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java @@ -115,7 +115,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre boolean doRand = cost < 1; if(ManaItemHandler.requestManaExact(stack, eplayer, (int) Math.ceil(cost), false)) { PotionEffect currentEffect = player.getActivePotionEffect(effect.getPotion()); - boolean nightVision = effect.getPotion() == MobEffects.nightVision; + boolean nightVision = effect.getPotion() == MobEffects.NIGHT_VISION; if(currentEffect == null || currentEffect.getDuration() < (nightVision ? 205 : 3)) { PotionEffect applyEffect = new PotionEffect(effect.getPotion(), nightVision ? 285 : 80, effect.getAmplifier(), true, true); player.addPotionEffect(applyEffect); @@ -164,7 +164,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre @Override public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); Helper.rotateIfSneaking(player); boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; GlStateManager.rotate(180F, 1F, 0F, 0F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index b9a164120..4b7c87ef8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -101,7 +101,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble if(type == RenderType.HEAD) { boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD) != null; Helper.translateToHeadLevel(player); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); GlStateManager.scale(0.8F, 0.8F, 0.8F); GlStateManager.rotate(90, 0, 0, 1); GlStateManager.translate(1.475F, armor ? -0.57F : -0.5F, 0.53F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 5ff023514..006af4f3e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -178,7 +178,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub ItemNBTHelper.setInt(stack, TAG_DASH_COOLDOWN, maxCd); } else if(cooldown > 0) { if(maxCd - cooldown < 2) - player.moveFlying(0F, 1F, 5F); + player.moveRelative(0F, 1F, 5F); else if(maxCd - cooldown < 10) player.setSprinting(false); ItemNBTHelper.setInt(stack, TAG_DASH_COOLDOWN, cooldown - 2); @@ -333,7 +333,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub if(type == RenderType.BODY) { if(meta > 0 && meta <= MiscellaneousIcons.INSTANCE.tiaraWingIcons.length) { TextureAtlasSprite icon = MiscellaneousIcons.INSTANCE.tiaraWingIcons[meta - 1]; - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); boolean flying = player.capabilities.isFlying; @@ -529,7 +529,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub GlStateManager.enableAlpha(); GlStateManager.color(1F, 1F, 1F, 1F); - mc.renderEngine.bindTexture(Gui.icons); + mc.renderEngine.bindTexture(Gui.ICONS); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java index ddc3acfd7..87b5ca131 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java @@ -49,7 +49,7 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { if(amulet != null && amulet.getItem() == this) { event.setCanceled(true); player.setHealth(player.getMaxHealth()); - player.addPotionEffect(new PotionEffect(MobEffects.resistance, 300, 6)); + player.addPotionEffect(new PotionEffect(MobEffects.RESISTANCE, 300, 6)); player.addChatMessage(new TextComponentTranslation("botaniamisc.savedByLaurel")); player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.goldenLaurel, SoundCategory.PLAYERS, 1F, 0.3F); PlayerHandler.getPlayerBaubles(player).setInventorySlotContents(0, null); @@ -68,7 +68,7 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { if(type == RenderType.HEAD) { boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD) != null; Helper.translateToHeadLevel(player); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); GlStateManager.rotate(-90F, 0F, 1F, 0F); GlStateManager.scale(2.2F, 2.2F, 2.2F); // TODO 1.8 could use further refinement GlStateManager.translate(0, 0.425F, 0.425); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java index 24f6ba4df..cafbe379b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java @@ -52,7 +52,7 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { @Override public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); Helper.rotateIfSneaking(player); boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; GlStateManager.rotate(180F, 1F, 0F, 0F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index 17c37f4d4..177c7312d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -245,7 +245,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { float f3 = gemIcon.getMaxV(); boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD) != null; Helper.translateToHeadLevel(player); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.4F, -1.4F, armor ? -0.3F : -0.25F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java index 61e60a0b4..3c6929175 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java @@ -45,7 +45,7 @@ public class ItemLavaPendant extends ItemBauble implements IBaubleRender { @Override public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); Helper.rotateIfSneaking(player); boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; GlStateManager.rotate(180F, 1F, 0F, 0F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java index 1a1151869..0c1207d7b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java @@ -16,6 +16,7 @@ import baubles.common.lib.PlayerHandler; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.IItemPropertyGetter; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; @@ -115,7 +116,7 @@ public class ItemMagnetRing extends ItemBauble { return false; ItemStack stack = item.getEntityItem(); - if(stack == null || stack.getItem() instanceof IManaItem || stack.getItem() instanceof IRelic || BLACKLIST.contains(itemRegistry.getNameForObject(stack.getItem())) || BotaniaAPI.isItemBlacklistedFromMagnet(stack)) + if(stack == null || stack.getItem() instanceof IManaItem || stack.getItem() instanceof IRelic || BLACKLIST.contains(Item.REGISTRY.getNameForObject(stack.getItem())) || BotaniaAPI.isItemBlacklistedFromMagnet(stack)) return false; BlockPos pos = new BlockPos(item); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMiningRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMiningRing.java index 9a4de094f..09d2d95bd 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMiningRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMiningRing.java @@ -36,10 +36,10 @@ public class ItemMiningRing extends ItemBauble implements IManaUsingItem { if(!hasMana) onUnequipped(stack, player); else { - if(player.getActivePotionEffect(MobEffects.digSpeed) != null) - player.removePotionEffect(MobEffects.digSpeed); + if(player.getActivePotionEffect(MobEffects.HASTE) != null) + player.removePotionEffect(MobEffects.HASTE); - player.addPotionEffect(new PotionEffect(MobEffects.digSpeed, Integer.MAX_VALUE, 1, true, true)); + player.addPotionEffect(new PotionEffect(MobEffects.HASTE, Integer.MAX_VALUE, 1, true, true)); } if(player.swingProgress == 0.25F) @@ -49,9 +49,9 @@ public class ItemMiningRing extends ItemBauble implements IManaUsingItem { @Override public void onUnequipped(ItemStack stack, EntityLivingBase player) { - PotionEffect effect = player.getActivePotionEffect(MobEffects.digSpeed); + PotionEffect effect = player.getActivePotionEffect(MobEffects.HASTE); if(effect != null && effect.getAmplifier() == 1) - player.removePotionEffect(MobEffects.digSpeed); + player.removePotionEffect(MobEffects.HASTE); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java index ba686ff42..65220e839 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java @@ -53,7 +53,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm if(type == RenderType.HEAD) { boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD) != null; Helper.translateToHeadLevel(player); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); GlStateManager.scale(0.5F, 0.5F, 0.5F); GlStateManager.rotate(90, 0, 0, 1); // todo 1.8 could use some further refinement GlStateManager.translate(2.88F, armor ? -0.75F : -0.63F, 0.62F); @@ -74,14 +74,14 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm ItemStack dispStack = null; String text = ""; - if(block == Blocks.redstone_wire) { - dispStack = new ItemStack(Items.redstone); + if(block == Blocks.REDSTONE_WIRE) { + dispStack = new ItemStack(Items.REDSTONE); text = TextFormatting.RED + "" + state.getValue(BlockRedstoneWire.POWER); - } else if(block == Blocks.unpowered_repeater || block == Blocks.powered_repeater) { - dispStack = new ItemStack(Items.repeater); + } else if(block == Blocks.UNPOWERED_REPEATER || block == Blocks.POWERED_REPEATER) { + dispStack = new ItemStack(Items.REPEATER); text = "" + state.getValue(BlockRedstoneRepeater.DELAY); - } else if(block == Blocks.unpowered_comparator || block == Blocks.powered_comparator) { - dispStack = new ItemStack(Items.comparator); + } else if(block == Blocks.UNPOWERED_COMPARATOR || block == Blocks.POWERED_COMPARATOR) { + dispStack = new ItemStack(Items.COMPARATOR); text = state.getValue(BlockRedstoneComparator.MODE) == BlockRedstoneComparator.Mode.SUBTRACT ? "-" : "+"; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java index 94cd2826b..4ef467f66 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java @@ -56,7 +56,7 @@ public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { @Override public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); Helper.rotateIfSneaking(player); boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; GlStateManager.rotate(180F, 1F, 0F, 0F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java index 99badc042..d84d6994b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java @@ -103,7 +103,7 @@ public class ItemTinyPlanet extends ItemBauble implements IBaubleRender { @Override public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); GlStateManager.scale(0.5F, 0.5F, 0.5F); GlStateManager.translate(0, -1.5F, 0.5F); Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(ModBlocks.tinyPlanet.getDefaultState(), 1.0F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java index a91a00b2d..a871f2229 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java @@ -79,9 +79,9 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs ItemTravelBelt beltItem = (ItemTravelBelt) belt.getItem(); if(player.worldObj.isRemote) { - if((player.onGround || player.capabilities.isFlying) && player.moveForward > 0F && !player.isInsideOfMaterial(Material.water)) { + if((player.onGround || player.capabilities.isFlying) && player.moveForward > 0F && !player.isInsideOfMaterial(Material.WATER)) { float speed = beltItem.getSpeed(belt); - player.moveFlying(0F, 1F, player.capabilities.isFlying ? speed : speed); + player.moveRelative(0F, 1F, player.capabilities.isFlying ? speed : speed); beltItem.onMovedTick(belt, player); if(player.ticksExisted % COST_INTERVAL == 0) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemWaterRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemWaterRing.java index ec3e16ec9..72dfda554 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemWaterRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemWaterRing.java @@ -31,7 +31,7 @@ public class ItemWaterRing extends ItemBauble implements IManaUsingItem { public void onWornTick(ItemStack stack, EntityLivingBase player) { super.onWornTick(stack, player); - if(player.isInsideOfMaterial(Material.water)) { + if(player.isInsideOfMaterial(Material.WATER)) { double motionX = player.motionX * 1.2; double motionY = player.motionY * 1.2; double motionZ = player.motionZ * 1.2; @@ -50,9 +50,9 @@ public class ItemWaterRing extends ItemBauble implements IManaUsingItem { if(changeZ) player.motionZ = motionZ; - PotionEffect effect = player.getActivePotionEffect(MobEffects.nightVision); + PotionEffect effect = player.getActivePotionEffect(MobEffects.NIGHT_VISION); if(effect == null) { - PotionEffect neweffect = new PotionEffect(MobEffects.nightVision, Integer.MAX_VALUE, -42, true, true); + PotionEffect neweffect = new PotionEffect(MobEffects.NIGHT_VISION, Integer.MAX_VALUE, -42, true, true); player.addPotionEffect(neweffect); } @@ -66,9 +66,9 @@ public class ItemWaterRing extends ItemBauble implements IManaUsingItem { @Override public void onUnequipped(ItemStack stack, EntityLivingBase player) { - PotionEffect effect = player.getActivePotionEffect(MobEffects.nightVision); + PotionEffect effect = player.getActivePotionEffect(MobEffects.NIGHT_VISION); if(effect != null && effect.getAmplifier() == -42) - player.removePotionEffect(MobEffects.nightVision); + player.removePotionEffect(MobEffects.NIGHT_VISION); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java index b067fd1a6..71c347441 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java @@ -34,7 +34,7 @@ public class ItemGlassPick extends ItemManasteelPick { @SubscribeEvent public void onBlockDrops(HarvestDropsEvent event) { - if(event.getHarvester() != null && event.getState() != null && event.getDrops().isEmpty() && event.getHarvester().getHeldItemMainhand() != null && event.getHarvester().getHeldItemMainhand().getItem() == this && event.getState().getMaterial() == Material.glass && event.getState().getBlock().canSilkHarvest(event.getWorld(), event.getPos(), event.getState(), event.getHarvester())) + if(event.getHarvester() != null && event.getState() != null && event.getDrops().isEmpty() && event.getHarvester().getHeldItemMainhand() != null && event.getHarvester().getHeldItemMainhand().getItem() == this && event.getState().getMaterial() == Material.GLASS && event.getState().getBlock().canSilkHarvest(event.getWorld(), event.getPos(), event.getState(), event.getHarvester())) event.getDrops().add(new ItemStack(event.getState().getBlock(), 1, event.getState().getBlock().getMetaFromState(event.getState()))); } @@ -45,7 +45,7 @@ public class ItemGlassPick extends ItemManasteelPick { @Override public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { - return par2ItemStack.getItem() == Item.getItemFromBlock(Blocks.glass) ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); + return par2ItemStack.getItem() == Item.getItemFromBlock(Blocks.GLASS) ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java index 68ec6ba62..996804d6b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java @@ -43,7 +43,7 @@ public class ItemStarSword extends ItemManasteelSword implements ICraftAchieveme super.onUpdate(par1ItemStack, par2World, par3Entity, par4, par5); if(par3Entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) par3Entity; - PotionEffect haste = player.getActivePotionEffect(MobEffects.digSpeed); + PotionEffect haste = player.getActivePotionEffect(MobEffects.HASTE); float check = haste == null ? 0.16666667F : haste.getAmplifier() == 1 ? 0.5F : 0.4F; if(player.getHeldItemMainhand() == par1ItemStack && player.swingProgress == check && !par2World.isRemote) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java index 1d347de73..b123734e0 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java @@ -36,9 +36,9 @@ import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; public final class ToolCommons { - public static Material[] materialsPick = new Material[]{ Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.anvil }; - public static Material[] materialsShovel = new Material[]{ Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, Material.clay }; - public static Material[] materialsAxe = new Material[]{ Material.coral, Material.leaves, Material.plants, Material.wood, Material.gourd }; + public static Material[] materialsPick = new Material[]{ Material.ROCK, Material.IRON, Material.ICE, Material.GLASS, Material.PISTON, Material.ANVIL }; + public static Material[] materialsShovel = new Material[]{ Material.GRASS, Material.GROUND, Material.SAND, Material.SNOW, Material.CRAFTED_SNOW, Material.CLAY }; + public static Material[] materialsAxe = new Material[]{ Material.CORAL, Material.LEAVES, Material.PLANTS, Material.WOOD, Material.GOURD }; public static void damageItem(ItemStack stack, int dmg, EntityLivingBase entity, int manaPerDamage) { int manaToRequest = dmg * manaPerDamage; @@ -104,7 +104,7 @@ public final class ToolCommons { } else world.setBlockToAir(pos); if(particles && !world.isRemote && ConfigHandler.blockBreakParticles && ConfigHandler.blockBreakParticlesTool) - world.playAuxSFX(2001, pos, Block.getStateId(state)); + world.playEvent(2001, pos, Block.getStateId(state)); } } @@ -130,7 +130,7 @@ public final class ToolCommons { if(item == ModItems.terraPick) modifier = ItemTerraPick.getLevel(stack); - int efficiency = EnchantmentHelper.getEnchantmentLevel(Enchantments.efficiency, stack); + int efficiency = EnchantmentHelper.getEnchantmentLevel(Enchantments.EFFICIENCY, stack); return materialLevel * 100 + modifier * 10 + efficiency; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java index 1f9a88ca6..1dc305dec 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java @@ -40,20 +40,20 @@ public class ItemCrystalBow extends ItemLivingwoodBow { @Override boolean canFire(ItemStack stack, EntityPlayer player) { - int infinity = EnchantmentHelper.getEnchantmentLevel(Enchantments.infinity, stack); + int infinity = EnchantmentHelper.getEnchantmentLevel(Enchantments.INFINITY, stack); return ManaItemHandler.requestManaExactForTool(stack, player, ARROW_COST / (infinity + 1), false); } @Override void onFire(ItemStack stack, EntityLivingBase living, boolean infinity, EntityArrow arrow) { - arrow.canBePickedUp = EntityArrow.PickupStatus.CREATIVE_ONLY; + arrow.pickupStatus = EntityArrow.PickupStatus.CREATIVE_ONLY; if(living instanceof EntityPlayer) ManaItemHandler.requestManaExactForTool(stack, ((EntityPlayer) living), ARROW_COST / (infinity ? 2 : 1), false); } @Override protected ItemStack getAmmo(EntityPlayer player) { - return new ItemStack(Items.arrow); + return new ItemStack(Items.ARROW); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java index b7fc02440..796755b8d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java @@ -110,7 +110,7 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { } boolean flag = !(shooter instanceof EntityPlayer) || canFire(stack, ((EntityPlayer) shooter)); - boolean infinity = EnchantmentHelper.getEnchantmentLevel(Enchantments.infinity, stack) > 0; + boolean infinity = EnchantmentHelper.getEnchantmentLevel(Enchantments.INFINITY, stack) > 0; if(flag) { float f = j / 20.0F; @@ -124,28 +124,28 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { ItemStack ammo = shooter instanceof EntityPlayer ? getAmmo(((EntityPlayer) shooter)) : null; if(ammo == null || !(ammo.getItem() instanceof ItemArrow)) - ammo = new ItemStack(Items.arrow); + ammo = new ItemStack(Items.ARROW); EntityArrow entityarrow = ((ItemArrow) ammo.getItem()).createArrow(world, ammo, shooter); - entityarrow.func_184547_a(shooter, shooter.rotationPitch, shooter.rotationYaw, 0.0F, f * 3.0F, 1.0F); + entityarrow.setAim(shooter, shooter.rotationPitch, shooter.rotationYaw, 0.0F, f * 3.0F, 1.0F); if(f == 1.0F) entityarrow.setIsCritical(true); - int k = EnchantmentHelper.getEnchantmentLevel(Enchantments.power, stack); + int k = EnchantmentHelper.getEnchantmentLevel(Enchantments.POWER, stack); if(k > 0) entityarrow.setDamage(entityarrow.getDamage() + k * 0.5D + 0.5D); - int l = EnchantmentHelper.getEnchantmentLevel(Enchantments.punch, stack); + int l = EnchantmentHelper.getEnchantmentLevel(Enchantments.PUNCH, stack); if(l > 0) entityarrow.setKnockbackStrength(l); - if(EnchantmentHelper.getEnchantmentLevel(Enchantments.flame, stack) > 0) + if(EnchantmentHelper.getEnchantmentLevel(Enchantments.FLAME, stack) > 0) entityarrow.setFire(100); ToolCommons.damageItem(stack, 1, shooter, MANA_PER_DAMAGE); - world.playSound(null, shooter.posX, shooter.posY, shooter.posZ, SoundEvents.entity_arrow_shoot, SoundCategory.PLAYERS, 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.5F); + world.playSound(null, shooter.posX, shooter.posY, shooter.posZ, SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.PLAYERS, 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.5F); onFire(stack, shooter, infinity, entityarrow); @@ -163,12 +163,12 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { } boolean canFire(ItemStack stack, EntityPlayer player) { - return player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantments.infinity, stack) > 0 || PlayerHelper.hasAmmo(player, AMMO_FUNC); + return player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantments.INFINITY, stack) > 0 || PlayerHelper.hasAmmo(player, AMMO_FUNC); } void onFire(ItemStack bow, EntityLivingBase living, boolean infinity, EntityArrow arrow) { if(infinity) - arrow.canBePickedUp = EntityArrow.PickupStatus.CREATIVE_ONLY; + arrow.pickupStatus = EntityArrow.PickupStatus.CREATIVE_ONLY; else if(living instanceof EntityPlayerMP) if(((EntityPlayerMP) living).interactionManager.getGameType().isSurvivalOrAdventure()) PlayerHelper.consumeAmmo(((EntityPlayerMP) living), AMMO_FUNC); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java index 785f61dd2..1b2a77765 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java @@ -38,16 +38,16 @@ public class ItemElementiumAxe extends ItemManasteelAxe { ItemStack weapon = ((EntityPlayer) event.getSource().getEntity()).getHeldItemMainhand(); if(weapon != null && weapon.getItem() == this) { Random rand = event.getEntityLiving().worldObj.rand; - int looting = EnchantmentHelper.getEnchantmentLevel(Enchantments.fortune, weapon); + int looting = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, weapon); if(event.getEntityLiving() instanceof EntitySkeleton && rand.nextInt(26) <= 3 + looting) - addDrop(event, new ItemStack(Items.skull, 1, ((EntitySkeleton)event.getEntityLiving()).getSkeletonType())); + addDrop(event, new ItemStack(Items.SKULL, 1, ((EntitySkeleton)event.getEntityLiving()).getSkeletonType())); else if(event.getEntityLiving() instanceof EntityZombie && !(event.getEntityLiving() instanceof EntityPigZombie) && rand.nextInt(26) <= 2 + 2 * looting) - addDrop(event, new ItemStack(Items.skull, 1, 2)); + addDrop(event, new ItemStack(Items.SKULL, 1, 2)); else if(event.getEntityLiving() instanceof EntityCreeper && rand.nextInt(26) <= 2 + 2 * looting) - addDrop(event, new ItemStack(Items.skull, 1, 4)); + addDrop(event, new ItemStack(Items.SKULL, 1, 4)); else if(event.getEntityLiving() instanceof EntityPlayer && rand.nextInt(11) <= 1 + looting) { - ItemStack stack = new ItemStack(Items.skull, 1, 3); + ItemStack stack = new ItemStack(Items.SKULL, 1, 3); ItemNBTHelper.setString(stack, "SkullOwner", event.getEntityLiving().getName()); addDrop(event, stack); } else if(event.getEntityLiving() instanceof EntityDoppleganger && rand.nextInt(13) < 1 + looting) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java index 183d640a5..42efe0bce 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java @@ -57,7 +57,7 @@ public class ItemElementiumShears extends ItemManasteelShears { for(IShearable target : ((List) sheep)) { Entity entity = (Entity) target; if(target.isShearable(stack, entity.worldObj, new BlockPos(entity))) { - List drops = target.onSheared(stack, entity.worldObj, new BlockPos(entity), EnchantmentHelper.getEnchantmentLevel(Enchantments.fortune, stack)); + List drops = target.onSheared(stack, entity.worldObj, new BlockPos(entity), EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack)); Random rand = new Random(); for(ItemStack drop : drops) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java index cbf06d74b..3180e6ef8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java @@ -17,7 +17,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemElementiumShovel extends ItemManasteelShovel { - public static Material[] materialsShovel = new Material[]{ Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, Material.clay }; + public static Material[] materialsShovel = new Material[]{ Material.GRASS, Material.GROUND, Material.SAND, Material.SNOW, Material.CRAFTED_SNOW, Material.CLAY }; public ItemElementiumShovel() { super(BotaniaAPI.elementiumToolMaterial, LibItemNames.ELEMENTIUM_SHOVEL); @@ -34,8 +34,8 @@ public class ItemElementiumShovel extends ItemManasteelShovel { if (block == null) return false; - int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.fortune, player.getHeldItemMainhand()); - boolean silk = EnchantmentHelper.getEnchantmentLevel(Enchantments.silkTouch, player.getHeldItemMainhand()) > 0; + int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, player.getHeldItemMainhand()); + boolean silk = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, player.getHeldItemMainhand()) > 0; Block blk = world.getBlockState(pos).getBlock(); if(blk instanceof BlockFalling) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java index 5635aa691..afffaf9be 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java @@ -96,7 +96,7 @@ public class ItemManasteelAxe extends ItemTool implements IManaUsingItem, ISorta if(stackAt.stackSize == 0) player.inventory.setInventorySlotContents(i, null); - ItemsRemainingRenderHandler.set(player, new ItemStack(Blocks.sapling), SAPLING_PATTERN); + ItemsRemainingRenderHandler.set(player, new ItemStack(Blocks.SAPLING), SAPLING_PATTERN); return did; } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java index ad883277a..21a13443e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java @@ -83,7 +83,7 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS if(stackAt.stackSize == 0) player.inventory.setInventorySlotContents(i, null); - ItemsRemainingRenderHandler.set(player, new ItemStack(Blocks.torch), TORCH_PATTERN); + ItemsRemainingRenderHandler.set(player, new ItemStack(Blocks.TORCH), TORCH_PATTERN); return did; } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java index d048c10b3..82f11bd87 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java @@ -65,7 +65,7 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem { if(entity instanceof IShearable) { IShearable target = (IShearable)entity; if(target.isShearable(itemstack, entity.worldObj, new BlockPos(entity))) { - List drops = target.onSheared(itemstack, entity.worldObj, new BlockPos(entity), EnchantmentHelper.getEnchantmentLevel(Enchantments.fortune, itemstack)); + List drops = target.onSheared(itemstack, entity.worldObj, new BlockPos(entity), EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, itemstack)); Random rand = new Random(); for(ItemStack stack : drops) { @@ -93,7 +93,7 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem { if(block instanceof IShearable) { IShearable target = (IShearable)block; if(target.isShearable(itemstack, player.worldObj, pos)) { - List drops = target.onSheared(itemstack, player.worldObj, pos, EnchantmentHelper.getEnchantmentLevel(Enchantments.fortune, itemstack)); + List drops = target.onSheared(itemstack, player.worldObj, pos, EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, itemstack)); Random rand = new Random(); for(ItemStack stack : drops) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java index 8f0ea96de..c8bfb4a9d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java @@ -90,8 +90,8 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS Block block = p_77648_3_.getBlockState(pos).getBlock(); - if(side != EnumFacing.DOWN && p_77648_3_.getBlockState(pos.up()).getBlock().isAir(p_77648_3_.getBlockState(pos.up()), p_77648_3_, pos.up()) && (block == Blocks.grass || block == Blocks.dirt)) { - Block block1 = Blocks.farmland; + if(side != EnumFacing.DOWN && p_77648_3_.getBlockState(pos.up()).getBlock().isAir(p_77648_3_.getBlockState(pos.up()), p_77648_3_, pos.up()) && (block == Blocks.GRASS || block == Blocks.DIRT)) { + Block block1 = Blocks.FARMLAND; p_77648_3_.playSound(null, pos, block1.getSoundType().getStepSound(), SoundCategory.BLOCKS, (block1.getSoundType().getVolume() + 1.0F) / 2.0F, block1.getSoundType().getPitch() * 0.8F); if (p_77648_3_.isRemote) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java index d5a9e638e..7d75ec785 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java @@ -303,8 +303,8 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker cand.coordinates, origin, null, ToolCommons.materialsAxe, - EnchantmentHelper.getEnchantmentLevel(Enchantments.silkTouch, truncator) > 0, - EnchantmentHelper.getEnchantmentLevel(Enchantments.fortune, truncator), + EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, truncator) > 0, + EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, truncator), 0F, false, treatLeavesSpecial); remainingSwaps--; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java index 001ed0312..95d08c88a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java @@ -66,7 +66,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ private static final int MAX_MANA = Integer.MAX_VALUE; private static final int MANA_PER_DAMAGE = 100; - private static final Material[] MATERIALS = new Material[] { Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.anvil, Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, Material.clay }; + private static final Material[] MATERIALS = new Material[] { Material.ROCK, Material.IRON, Material.ICE, Material.GLASS, Material.PISTON, Material.ANVIL, Material.GRASS, Material.GROUND, Material.SAND, Material.SNOW, Material.CRAFTED_SNOW, Material.CLAY }; public static final int[] LEVELS = new int[] { 0, 10000, 1000000, 10000000, 100000000, 1000000000 @@ -175,8 +175,8 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ if(world.isAirBlock(pos)) return; - int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.fortune, player.getHeldItemMainhand()); - boolean silk = EnchantmentHelper.getEnchantmentLevel(Enchantments.silkTouch, player.getHeldItemMainhand()) > 0; + int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, player.getHeldItemMainhand()); + boolean silk = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, player.getHeldItemMainhand()) > 0; boolean thor = ItemThorRing.getThorRing(player) != null; boolean doX = thor || side.getFrontOffsetX() == 0; boolean doY = thor || side.getFrontOffsetY() == 0; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java index faf213db0..26605c313 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java @@ -56,7 +56,7 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, I super.onUpdate(par1ItemStack, par2World, par3Entity, par4, par5); if(par3Entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) par3Entity; - PotionEffect haste = player.getActivePotionEffect(MobEffects.digSpeed); + PotionEffect haste = player.getActivePotionEffect(MobEffects.HASTE); float check = haste == null ? 0.16666667F : haste.getAmplifier() == 1 ? 0.5F : 0.4F; if(player.getHeldItemMainhand() == par1ItemStack && player.swingProgress == check && !par2World.isRemote && par2World.rand.nextInt(2) == 0) { diff --git a/src/main/java/vazkii/botania/common/item/lens/LensFire.java b/src/main/java/vazkii/botania/common/item/lens/LensFire.java index 88684a616..188793b48 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFire.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFire.java @@ -35,14 +35,14 @@ public class LensFire extends Lens { Block blockAt = entity.worldObj.getBlockState(pos.getBlockPos()).getBlock(); Block blockAt_ = entity.worldObj.getBlockState(pos_).getBlock(); - if(blockAt == Blocks.portal) - entity.worldObj.setBlockState(pos.getBlockPos(), Blocks.air.getDefaultState()); + if(blockAt == Blocks.PORTAL) + entity.worldObj.setBlockState(pos.getBlockPos(), Blocks.AIR.getDefaultState()); else if(blockAt == ModBlocks.incensePlate) { TileIncensePlate plate = (TileIncensePlate) entity.worldObj.getTileEntity(pos.getBlockPos()); plate.ignite(); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(plate); } else if(blockAt_.isAir(entity.worldObj.getBlockState(pos_), entity.worldObj, pos_)) - entity.worldObj.setBlockState(pos_, Blocks.fire.getDefaultState()); + entity.worldObj.setBlockState(pos_, Blocks.FIRE.getDefaultState()); } return dead; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensFirework.java b/src/main/java/vazkii/botania/common/item/lens/LensFirework.java index 9c9721f08..186dd47e5 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFirework.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFirework.java @@ -39,7 +39,7 @@ public class LensFirework extends Lens { } public ItemStack generateFirework(int color) { - ItemStack stack = new ItemStack(Items.fireworks); + ItemStack stack = new ItemStack(Items.FIREWORKS); NBTTagCompound explosion = new NBTTagCompound(); explosion.setIntArray("Colors", new int[] { color }); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensLight.java b/src/main/java/vazkii/botania/common/item/lens/LensLight.java index 70ed490bf..08fb8eb77 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensLight.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensLight.java @@ -33,7 +33,7 @@ public class LensLight extends Lens { Block blockAt_ = entity.worldObj.getBlockState(pos_).getBlock(); if(blockAt == ModBlocks.manaFlame) - entity.worldObj.setBlockState(pos.getBlockPos(), Blocks.air.getDefaultState()); + entity.worldObj.setBlockState(pos.getBlockPos(), Blocks.AIR.getDefaultState()); else if(blockAt_.isAir(entity.worldObj.getBlockState(pos_), entity.worldObj, pos_) || blockAt_.isReplaceable(entity.worldObj, pos_)) { entity.worldObj.setBlockState(pos_, ModBlocks.manaFlame.getDefaultState()); TileEntity tile = entity.worldObj.getTileEntity(pos_); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMine.java b/src/main/java/vazkii/botania/common/item/lens/LensMine.java index 6a509c81b..52872d4ab 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMine.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMine.java @@ -44,7 +44,7 @@ public class LensMine extends Lens { ItemStack composite = ((ItemLens) ModItems.lens).getCompositeLens(stack); boolean warp = composite != null && composite.getItem() == ModItems.lens && composite.getItemDamage() == ItemLens.WARP; - if(warp && (block == ModBlocks.pistonRelay || block == Blocks.piston || block == Blocks.piston_extension || block == Blocks.piston_head)) + if(warp && (block == ModBlocks.pistonRelay || block == Blocks.PISTON || block == Blocks.PISTON_EXTENSION || block == Blocks.PISTON_HEAD)) return false; int harvestLevel = ConfigHandler.harvestLevelBore; @@ -66,7 +66,7 @@ public class LensMine extends Lens { if(!burst.isFake() && !entity.worldObj.isRemote) { world.setBlockToAir(pos_); if(ConfigHandler.blockBreakParticles) - entity.worldObj.playAuxSFX(2001, pos_, Block.getStateId(state)); + entity.worldObj.playEvent(2001, pos_, Block.getStateId(state)); boolean offBounds = coords.getY() < 0; boolean doWarp = warp && !offBounds; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPiston.java b/src/main/java/vazkii/botania/common/item/lens/LensPiston.java index 3c53a44c2..50bf0829f 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPiston.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPiston.java @@ -32,7 +32,7 @@ public class LensPiston extends Lens { IBlockState state = entity.worldObj.getBlockState(pos.getBlockPos()); TileEntity tile = entity.worldObj.getTileEntity(pos.getBlockPos()); - if(state.getMobilityFlag() == EnumPushReaction.NORMAL && state.getBlock() != Blocks.obsidian && state.getBlockHardness(entity.worldObj, pos_) >= 0 && tile == null) { + if(state.getMobilityFlag() == EnumPushReaction.NORMAL && state.getBlock() != Blocks.OBSIDIAN && state.getBlockHardness(entity.worldObj, pos_) >= 0 && tile == null) { entity.worldObj.destroyBlock(pos.getBlockPos(), false); entity.worldObj.setBlockState(pos_, state, 1 | 2); } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemDye.java b/src/main/java/vazkii/botania/common/item/material/ItemDye.java index 0f78c5b40..54df837fe 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -39,9 +39,9 @@ public class ItemDye extends Item16Colors { public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { Block block = par3World.getBlockState(pos).getBlock(); EnumDyeColor color = EnumDyeColor.byMetadata(par1ItemStack.getItemDamage()); - if(block == Blocks.wool && color != par3World.getBlockState(pos).getValue(BlockColored.COLOR) - || block == Blocks.carpet && color != par3World.getBlockState(pos).getValue(BlockCarpet.COLOR)) { - par3World.setBlockState(pos, par3World.getBlockState(pos).withProperty(block == Blocks.wool ? BlockColored.COLOR : BlockCarpet.COLOR, color), 1 | 2); + if(block == Blocks.WOOL && color != par3World.getBlockState(pos).getValue(BlockColored.COLOR) + || block == Blocks.CARPET && color != par3World.getBlockState(pos).getValue(BlockCarpet.COLOR)) { + par3World.setBlockState(pos, par3World.getBlockState(pos).withProperty(block == Blocks.WOOL ? BlockColored.COLOR : BlockCarpet.COLOR, color), 1 | 2); par1ItemStack.stackSize--; return EnumActionResult.SUCCESS; } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index 2912e2b89..cfefaec3e 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -58,7 +58,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @SubscribeEvent public void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { ItemStack stack = event.getItemStack(); - boolean correctStack = stack != null && stack.getItem() == Items.glass_bottle; + boolean correctStack = stack != null && stack.getItem() == Items.GLASS_BOTTLE; boolean ender = event.getWorld().provider.getDimension() == 1; if(correctStack && ender) { @@ -69,7 +69,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve event.getEntityPlayer().addStat(ModAchievements.enderAirMake, 1); if(!event.getEntityPlayer().inventory.addItemStackToInventory(stack1)) { - event.getEntityPlayer().dropPlayerItemWithRandomChoice(stack1, true); + event.getEntityPlayer().dropItem(stack1, true); } else { event.getEntityPlayer().openContainer.detectAndSendChanges(); } @@ -78,7 +78,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve if(stack.stackSize == 0) event.getEntityPlayer().inventory.setInventorySlotContents(event.getEntityPlayer().inventory.currentItem, null); - event.getWorld().playSound(null, event.getPos(), SoundEvents.entity_item_pickup, SoundCategory.PLAYERS, 0.5F, 1F); + event.getWorld().playSound(null, event.getPos(), SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.PLAYERS, 0.5F, 1F); event.setCanceled(true); } } @@ -90,7 +90,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve return par3World.isRemote || EntityDoppleganger.spawn(par2EntityPlayer, par1ItemStack, par3World, pos, par1ItemStack.getItemDamage() == 14) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; else if(par1ItemStack.getItemDamage() == 20 && net.minecraft.item.ItemDye.applyBonemeal(par1ItemStack, par3World, pos, par2EntityPlayer)) { if(!par3World.isRemote) - par3World.playAuxSFX(2005, pos, 0); + par3World.playEvent(2005, pos, 0); return EnumActionResult.SUCCESS; } @@ -104,7 +104,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve if(!par2EntityPlayer.capabilities.isCreativeMode) --par1ItemStack.stackSize; - par3World.playSound(null, par2EntityPlayer.posX, par2EntityPlayer.posY, par2EntityPlayer.posZ, SoundEvents.entity_arrow_shoot, SoundCategory.PLAYERS, 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); + par3World.playSound(null, par2EntityPlayer.posX, par2EntityPlayer.posY, par2EntityPlayer.posZ, SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.PLAYERS, 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); if(!par3World.isRemote) { EntityEnderAirBottle b = new EntityEnderAirBottle(par3World, par2EntityPlayer); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java index 618bf56dc..a02ba7bb5 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -69,7 +69,7 @@ public class ItemDice extends ItemRelic { relic = possible.get(world.rand.nextInt(possible.size())); } - world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.entity_arrow_shoot, SoundCategory.PLAYERS, 0.5F, 0.4F / (world.rand.nextFloat() * 0.4F + 0.8F)); + world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.PLAYERS, 0.5F, 0.4F / (world.rand.nextFloat() * 0.4F + 0.8F)); if(hasRelicAlready(player, relic)) { player.addChatMessage(new TextComponentTranslation("botaniamisc.dudDiceRoll", relic + 1).setStyle(new Style().setColor(TextFormatting.DARK_GREEN))); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java index 8adc3c990..4d4445c35 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -59,7 +59,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs ItemNBTHelper.setInt(stack, TAG_Y, pos.getY()); ItemNBTHelper.setInt(stack, TAG_Z, pos.getZ()); ItemNBTHelper.setInt(stack, TAG_DIMENSION, world.provider.getDimension()); - world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.entity_endermen_teleport, SoundCategory.PLAYERS, 1F, 5F); + world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.PLAYERS, 1F, 5F); } } @@ -96,7 +96,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs if(y > -1 && dim == world.provider.getDimension() && ManaItemHandler.requestManaExact(stack, player, cost, true)) { moveParticlesAndSound(player); if(player instanceof EntityPlayerMP && !world.isRemote) - ((EntityPlayerMP) player).playerNetServerHandler.setPlayerLocation(x + 0.5, y + 1.6, z + 0.5, player.rotationYaw, player.rotationPitch); + ((EntityPlayerMP) player).connection.setPlayerLocation(x + 0.5, y + 1.6, z + 0.5, player.rotationYaw, player.rotationPitch); moveParticlesAndSound(player); } @@ -111,7 +111,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs Botania.proxy.wispFX(entity.worldObj, x, y, z, (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), -0.3F + (float) Math.random() * 0.2F); } if(!entity.worldObj.isRemote) - entity.worldObj.playSound(null, entity.posX, entity.posY, entity.posZ, SoundEvents.entity_endermen_teleport, SoundCategory.PLAYERS, 1F, 1F); + entity.worldObj.playSound(null, entity.posX, entity.posY, entity.posZ, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.PLAYERS, 1F, 1F); } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index b51a0b508..9a70fceaa 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -143,8 +143,8 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat List cursors = getCursorList(lokiRing); ISequentialBreaker breaker = (ISequentialBreaker) item; World world = player.worldObj; - boolean silk = EnchantmentHelper.getEnchantmentLevel(Enchantments.silkTouch, stack) > 0; - int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.fortune, stack); + boolean silk = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0; + int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack); boolean dispose = breaker.disposeOfTrashBlocks(stack); for(int i = 0; i < cursors.size(); i++) { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java index 38ee836df..472f47149 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java @@ -36,7 +36,7 @@ public class ItemCobbleRod extends ItemMod implements IManaUsingItem, IBlockProv @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { - return ItemDirtRod.place(par1ItemStack, par2EntityPlayer, par3World, pos, hand, side, par8, par9, par10, Blocks.cobblestone, COST, 0.3F, 0.3F, 0.3F); + return ItemDirtRod.place(par1ItemStack, par2EntityPlayer, par3World, pos, hand, side, par8, par9, par10, Blocks.COBBLESTONE, COST, 0.3F, 0.3F, 0.3F); } @Override @@ -46,14 +46,14 @@ public class ItemCobbleRod extends ItemMod implements IManaUsingItem, IBlockProv @Override public boolean provideBlock(EntityPlayer player, ItemStack requestor, ItemStack stack, Block block, int meta, boolean doit) { - if(block == Blocks.cobblestone && meta == 0) + if(block == Blocks.COBBLESTONE && meta == 0) return !doit || ManaItemHandler.requestManaExactForTool(requestor, player, COST, true); return false; } @Override public int getBlockCount(EntityPlayer player, ItemStack requestor, ItemStack stack, Block block, int meta) { - if(block == Blocks.cobblestone && meta == 0) + if(block == Blocks.COBBLESTONE && meta == 0) return -1; return 0; } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java index 7d04460ae..17e637dd8 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java @@ -47,7 +47,7 @@ public class ItemDirtRod extends ItemMod implements IManaUsingItem, ICraftAchiev @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { - return place(par1ItemStack, par2EntityPlayer, par3World, pos, hand, side, par8, par9, par10, Blocks.dirt, COST, 0.35F, 0.2F, 0.05F); + return place(par1ItemStack, par2EntityPlayer, par3World, pos, hand, side, par8, par9, par10, Blocks.DIRT, COST, 0.35F, 0.2F, 0.05F); } public static EnumActionResult place(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10, Block block, int cost, float r, float g, float b) { @@ -84,14 +84,14 @@ public class ItemDirtRod extends ItemMod implements IManaUsingItem, ICraftAchiev @Override public boolean provideBlock(EntityPlayer player, ItemStack requestor, ItemStack stack, Block block, int meta, boolean doit) { - if(block == Blocks.dirt && meta == 0) + if(block == Blocks.DIRT && meta == 0) return !doit || ManaItemHandler.requestManaExactForTool(requestor, player, COST, true); return false; } @Override public int getBlockCount(EntityPlayer player, ItemStack requestor, ItemStack stack, Block block, int meta) { - if(block == Blocks.dirt && meta == 0) + if(block == Blocks.DIRT && meta == 0) return -1; return 0; } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index c53eaf977..714ffe102 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -225,7 +225,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra world.spawnEntityInWorld(new EntityItem(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, drop)); removeFromInventory(player, stack, state.getBlock(), state.getBlock().getMetaFromState(state), true); } - world.playAuxSFX(2001, pos, Block.getStateId(state)); + world.playEvent(2001, pos, Block.getStateId(state)); world.setBlockState(pos, state, 1 | 2); state.getBlock().onBlockPlacedBy(world, pos, state, player, placeStack); } @@ -239,7 +239,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra public boolean canExchange(ItemStack stack) { Block block = getBlock(stack); - return block != null && block != Blocks.air; + return block != null && block != Blocks.AIR; } public static ItemStack removeFromInventory(EntityPlayer player, IInventory inv, ItemStack stack, Block block, int meta, boolean doit) { @@ -336,7 +336,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra } private boolean setBlock(ItemStack stack, Block block, int meta) { - ItemNBTHelper.setString(stack, TAG_BLOCK_NAME, Block.blockRegistry.getNameForObject(block).toString()); + ItemNBTHelper.setString(stack, TAG_BLOCK_NAME, Block.REGISTRY.getNameForObject(block).toString()); ItemNBTHelper.setInt(stack, TAG_BLOCK_META, meta); return true; } @@ -362,7 +362,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra } private boolean setTargetBlock(ItemStack stack, Block block, int meta) { - ItemNBTHelper.setString(stack, TAG_TARGET_BLOCK_NAME, Block.blockRegistry.getNameForObject(block).toString()); + ItemNBTHelper.setString(stack, TAG_TARGET_BLOCK_NAME, Block.REGISTRY.getNameForObject(block).toString()); ItemNBTHelper.setInt(stack, TAG_TARGET_BLOCK_META, meta); return true; } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java index e6e431822..22a6d859a 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java @@ -54,7 +54,7 @@ public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWield player.getCooldownTracker().setCooldown(this, IManaProficiencyArmor.Helper.hasProficiency(player) ? COOLDOWN / 2 : COOLDOWN); ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, true); - par3World.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.entity_blaze_ambient, SoundCategory.PLAYERS, 1F, 1F); + par3World.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_BLAZE_AMBIENT, SoundCategory.PLAYERS, 1F, 1F); } return EnumActionResult.SUCCESS; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java index 376070993..5dcfc0b6b 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -79,7 +79,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { ItemNBTHelper.setInt(stack, TAG_TICKS_COOLDOWN, ticksCooldown); EntityPlayer player = (EntityPlayer) par3Entity; - PotionEffect haste = player.getActivePotionEffect(MobEffects.digSpeed); + PotionEffect haste = player.getActivePotionEffect(MobEffects.HASTE); float check = haste == null ? 0.16666667F : haste.getAmplifier() == 1 ? 0.5F : 0.4F; if(player.getHeldItemMainhand() == stack && player.swingProgress == check && !world.isRemote) leftClick(player); @@ -145,8 +145,8 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { if(item instanceof EntityLivingBase) { EntityLivingBase targetEntity = (EntityLivingBase)item; targetEntity.fallDistance = 0.0F; - if(targetEntity.getActivePotionEffect(MobEffects.moveSlowdown) == null) - targetEntity.addPotionEffect(new PotionEffect(MobEffects.moveSlowdown, 2, 3, true, true)); + if(targetEntity.getActivePotionEffect(MobEffects.SLOWNESS) == null) + targetEntity.addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, 2, 3, true, true)); } Vector3 target3 = Vector3.fromEntityCenter(player); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java index 6d3362880..6b2cf168a 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java @@ -47,7 +47,7 @@ public class ItemSkyDirtRod extends ItemDirtRod { int entities = world.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(x, y, z, x + 1, y + 1, z + 1)).size(); if(entities == 0) { - ItemStack stackToPlace = new ItemStack(Blocks.dirt); + ItemStack stackToPlace = new ItemStack(Blocks.DIRT); stackToPlace.onItemUse(player, world, new BlockPos(x, y, z), hand, EnumFacing.DOWN, 0F, 0F, 0F); if(stackToPlace.stackSize == 0) { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java index 363f7f3c6..a7dc692a1 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -93,8 +93,8 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { if(data.progress <= 0) { if(!p.worldObj.isRemote) { p.worldObj.setBlockState(pos.getBlockPos(), Block.getBlockFromItem(result.getItem()).getStateFromMeta(result.getItemDamage()), 1 | 2); - p.worldObj.playSound(null, p.posX, p.posY, p.posZ, SoundEvents.item_flintandsteel_use, SoundCategory.PLAYERS, 0.6F, 1F); - p.worldObj.playSound(null, p.posX, p.posY, p.posZ, SoundEvents.block_fire_ambient, SoundCategory.PLAYERS, 1F, 1F); + p.worldObj.playSound(null, p.posX, p.posY, p.posZ, SoundEvents.ITEM_FLINTANDSTEEL_USE, SoundCategory.PLAYERS, 0.6F, 1F); + p.worldObj.playSound(null, p.posX, p.posY, p.posZ, SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.PLAYERS, 1F, 1F); ManaItemHandler.requestManaExactForTool(stack, p, COST_PER_TICK, true); playerData.remove(p); @@ -122,7 +122,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { Botania.proxy.wispFX(p.worldObj, x, y, z, 1F, 0.2F, 0.2F, 0.5F, (float) -Math.random() / 10F); } if(time % 10 == 0) - p.worldObj.playSound(null, p.posX, p.posY, p.posZ, SoundEvents.block_fire_ambient, SoundCategory.PLAYERS, (float) Math.random() / 2F + 0.5F, 1F); + p.worldObj.playSound(null, p.posX, p.posY, p.posZ, SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.PLAYERS, (float) Math.random() / 2F + 0.5F, 1F); } } } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java index 122f2abcc..c4c2ddb18 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -113,7 +113,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP for(BlockPos pos : BlockPos.getAllInBoxMutable(startCenter.add(-range, -range, -range), startCenter.add(range, range, range))) { IBlockState state = par2World.getBlockState(pos); - if(state.getBlock() == Blocks.air) + if(state.getBlock() == Blocks.AIR) continue; else if(Item.getItemFromBlock(state.getBlock()) == null) continue; @@ -125,17 +125,17 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP for(EnumFacing dir : EnumFacing.HORIZONTALS) { BlockPos pos_ = pos.offset(dir); Block block_ = par2World.getBlockState(pos_).getBlock(); - if(block_.isAir(par2World.getBlockState(pos_), par2World, pos_) || block_.isReplaceable(par2World, pos_) || block_ instanceof BlockFlower && !(block_ instanceof ISpecialFlower) || block_ == Blocks.double_plant) { + if(block_.isAir(par2World.getBlockState(pos_), par2World, pos_) || block_.isReplaceable(par2World, pos_) || block_ instanceof BlockFlower && !(block_ instanceof ISpecialFlower) || block_ == Blocks.DOUBLE_PLANT) { airBlocks.add(pos_); } } if(!airBlocks.isEmpty()) { if(pos.getY() > startCenter.getY()) - blocks.add(new CoordsWithBlock(pos, Blocks.air)); + blocks.add(new CoordsWithBlock(pos, Blocks.AIR)); else for(BlockPos coords : airBlocks) { - if(par2World.getBlockState(coords.down()).getBlock() != Blocks.air) - blocks.add(new CoordsWithBlock(coords, Blocks.dirt)); + if(par2World.getBlockState(coords.down()).getBlock() != Blocks.AIR) + blocks.add(new CoordsWithBlock(coords, Blocks.DIRT)); } } break; @@ -151,7 +151,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP if(!blocks.isEmpty()) { for(int i = 0; i < 10; i++) - par2World.playSound(par3EntityPlayer, par3EntityPlayer.posX, par3EntityPlayer.posY, par3EntityPlayer.posZ, SoundEvents.block_sand_step, SoundCategory.BLOCKS, 1F, 0.4F); + par2World.playSound(par3EntityPlayer, par3EntityPlayer.posX, par3EntityPlayer.posY, par3EntityPlayer.posZ, SoundEvents.BLOCK_SAND_STEP, SoundCategory.BLOCKS, 1F, 0.4F); for(int i = 0; i < 120; i++) Botania.proxy.sparkleFX(par2World, startCenter.getX() - range + range * 2 * Math.random(), startCenter.getY() + 2 + (Math.random() - 0.5) * 2, startCenter.getZ() - range + range * 2 * Math.random(), 0.35F, 0.2F, 0.05F, 2F, 5); } @@ -176,14 +176,14 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP @Override public boolean provideBlock(EntityPlayer player, ItemStack requestor, ItemStack stack, Block block, int meta, boolean doit) { - if(block == Blocks.dirt && meta == 0) + if(block == Blocks.DIRT && meta == 0) return !doit || ManaItemHandler.requestManaExactForTool(requestor, player, ItemDirtRod.COST, true); return false; } @Override public int getBlockCount(EntityPlayer player, ItemStack requestor, ItemStack stack, Block block, int meta) { - if(block == Blocks.dirt && meta == 0) + if(block == Blocks.DIRT && meta == 0) return -1; return 0; } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java index 5f53d0211..b999b8ee9 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java @@ -29,7 +29,7 @@ public class ItemWaterRod extends ItemMod implements IManaUsingItem { public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { if(ManaItemHandler.requestManaExactForTool(par1ItemStack, par2EntityPlayer, COST, false) && !par3World.provider.doesWaterVaporize()) { // Adapted from bucket code - RayTraceResult mop = getMovingObjectPositionFromPlayer(par3World, par2EntityPlayer, false); + RayTraceResult mop = rayTrace(par3World, par2EntityPlayer, false); if (mop != null && mop.typeOfHit == RayTraceResult.Type.BLOCK) { BlockPos hitPos = mop.getBlockPos(); @@ -38,7 +38,7 @@ public class ItemWaterRod extends ItemMod implements IManaUsingItem { BlockPos placePos = hitPos.offset(mop.sideHit); if(par2EntityPlayer.canPlayerEdit(placePos, mop.sideHit, par1ItemStack)) { if (ManaItemHandler.requestManaExactForTool(par1ItemStack, par2EntityPlayer, COST, true) - && ((ItemBucket) Items.water_bucket).tryPlaceContainedLiquid(par2EntityPlayer, par3World, placePos)) { + && ((ItemBucket) Items.WATER_BUCKET).tryPlaceContainedLiquid(par2EntityPlayer, par3World, placePos)) { for(int i = 0; i < 6; i++) Botania.proxy.sparkleFX(par3World, pos.getX() + side.getFrontOffsetX() + Math.random(), pos.getY() + side.getFrontOffsetY() + Math.random(), pos.getZ() + side.getFrontOffsetZ() + Math.random(), 0.2F, 0.2F, 1F, 1F, 5); return EnumActionResult.SUCCESS; diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 321c6db5c..fce0f44d2 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -541,7 +541,7 @@ public final class LexiconData { flowerSpeed = new BLexiconEntry(LibLexicon.FFLOWER_SPEED, categoryFunctionalFlowers); flowerSpeed.setPriority().setLexiconPages(new PageText("0"), new PageText("1")); - flowerSpeed.setIcon(new ItemStack(Blocks.dirt, 1, 2)); + flowerSpeed.setIcon(new ItemStack(Blocks.DIRT, 1, 2)); jadedAmaranthus = new BLexiconEntry(LibLexicon.FFLOWER_JADED_AMARANTHUS, categoryFunctionalFlowers); jadedAmaranthus.setLexiconPages(new PageText("0"), @@ -638,7 +638,7 @@ public final class LexiconData { passiveGen = new BLexiconEntry(LibLexicon.GFLOWER_PASSIVE_GENERATION, categoryGenerationFlowers); passiveGen.setPriority().setLexiconPages(new PageText("0"), new PageText("1")) - .setIcon(new ItemStack(Blocks.deadbush)); + .setIcon(new ItemStack(Blocks.DEADBUSH)); primusLoci = new BLexiconEntry(LibLexicon.GFLOWER_PRIMUS_LOCI, categoryGenerationFlowers); primusLoci.setPriority().setLexiconPages(new PageText("0"), new PageText("1")); @@ -1261,7 +1261,7 @@ public final class LexiconData { .setLexiconPages(new PageImage("0", LibResources.ENTRY_ELVEN_GARDE), new PageLoreText("1"), new PageLoreText("2"), new PageLoreText("3"), new PageLoreText("4"), new PageLoreText("5"), new PageLoreText("6")) - .setIcon(new ItemStack(Items.writable_book)); + .setIcon(new ItemStack(Items.WRITABLE_BOOK)); elvenResources = new ALexiconEntry(LibLexicon.ALF_RESOURCES, categoryAlfhomancy); elvenResources.setPriority() @@ -1290,7 +1290,7 @@ public final class LexiconData { elvenLore .setLexiconPages(new PageText("0"), new PageLoreText("1"), new PageLoreText("2"), new PageLoreText("3"), new PageLoreText("4"), new PageLoreText("5"), new PageLoreText("6"), new PageLoreText("7")) - .setIcon(new ItemStack(Items.writable_book)); + .setIcon(new ItemStack(Items.WRITABLE_BOOK)); if (ConfigHandler.relicsEnabled) { relics = new ALexiconEntry(LibLexicon.ALF_RELICS, categoryAlfhomancy); @@ -1372,7 +1372,7 @@ public final class LexiconData { new PageCraftingRecipe("22", ModCraftingRecipes.recipeSnowBrick)); dispenserTweaks = new BLexiconEntry(LibLexicon.MISC_DISPENSER_TWEAKS, categoryMisc); - dispenserTweaks.setLexiconPages(new PageText("0")).setPriority().setIcon(new ItemStack(Blocks.dispenser)); + dispenserTweaks.setLexiconPages(new PageText("0")).setPriority().setIcon(new ItemStack(Blocks.DISPENSER)); shinyFlowers = new BLexiconEntry(LibLexicon.MISC_SHINY_FLOWERS, categoryMisc); shinyFlowers.setLexiconPages(new PageText("0"), new PageText("3"), @@ -1421,7 +1421,7 @@ public final class LexiconData { blazeBlock = new BLexiconEntry(LibLexicon.MISC_BLAZE_BLOCK, categoryMisc); blazeBlock.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeBlazeBlock)); - LexiconRecipeMappings.map(new ItemStack(Blocks.obsidian), blazeBlock, 0); + LexiconRecipeMappings.map(new ItemStack(Blocks.OBSIDIAN), blazeBlock, 0); challenges = new BLexiconEntry(LibLexicon.MISC_CHALLENGES, categoryMisc); challenges.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2")).setPriority() @@ -1435,18 +1435,18 @@ public final class LexiconData { pavement.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipesPavement)); preventingDecay = new DLexiconEntry(LibLexicon.MISC_PRENTING_DECAY, categoryMisc); - preventingDecay.setLexiconPages(new PageText("0")).setIcon(new ItemStack(Blocks.deadbush)); + preventingDecay.setLexiconPages(new PageText("0")).setIcon(new ItemStack(Blocks.DEADBUSH)); if (Botania.bcTriggersLoaded) { bcIntegration = new CLexiconEntry(LibLexicon.MISC_BC_INTEGRATION, categoryMisc, "BuildCraft"); - bcIntegration.setLexiconPages(new PageText("0")).setIcon(new ItemStack(Items.redstone)); + bcIntegration.setLexiconPages(new PageText("0")).setIcon(new ItemStack(Items.REDSTONE)); } } public static void postInit() { if (SheddingHandler.hasShedding()) { shedding = new BLexiconEntry(LibLexicon.MISC_SHEDDING, BotaniaAPI.categoryMisc); - shedding.setLexiconPages(new PageText("0")).setPriority().setIcon(new ItemStack(Items.feather)); + shedding.setLexiconPages(new PageText("0")).setPriority().setIcon(new ItemStack(Items.FEATHER)); SheddingHandler.addToLexicon(); } diff --git a/src/main/java/vazkii/botania/common/lexicon/TLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/TLexiconEntry.java index d03e649f5..81ccee150 100644 --- a/src/main/java/vazkii/botania/common/lexicon/TLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/TLexiconEntry.java @@ -21,7 +21,7 @@ public class TLexiconEntry extends BLexiconEntry { public TLexiconEntry() { super(LibLexicon.BASICS_TUTORIAL, BotaniaAPI.categoryBasics); setPriority(); - setIcon(new ItemStack(Items.book)); + setIcon(new ItemStack(Items.BOOK)); setLexiconPages(new PageTutorial("0")); } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java index 6f6a22df7..26850d841 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -72,7 +72,7 @@ public class PageElvenRecipe extends PageRecipe { } TextureAtlasSprite portalIcon = MiscellaneousIcons.INSTANCE.alfPortalTex; - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); ((GuiScreen) gui).drawTexturedModalRect(gui.getLeft() + 22, gui.getTop() + 36, portalIcon, 48, 48); } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java index 8d57ee8ec..16b274f9c 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -35,7 +35,7 @@ public class PageEntity extends LexiconPage{ public PageEntity(String unlocalizedName, String entity, int size) { super(unlocalizedName); - Class EntityClass = (Class) EntityList.stringToClassMapping.get(entity); + Class EntityClass = (Class) EntityList.NAME_TO_CLASS.get(entity); this.size = size; try { entityConstructor = EntityClass.getConstructor(World.class); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java index 5359f4c19..6746678de 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java @@ -94,7 +94,7 @@ public class PageMultiblock extends LexiconPage { RenderHelper.enableGUIStandardItemLighting(); int x = gui.getLeft() + 15; int y = gui.getTop() + 25; - Minecraft.getMinecraft().getRenderItem().renderItemIntoGUI(new ItemStack(Blocks.stonebrick), x, y); + Minecraft.getMinecraft().getRenderItem().renderItemIntoGUI(new ItemStack(Blocks.STONEBRICK), x, y); RenderHelper.disableStandardItemLighting(); GlStateManager.disableRescaleNormal(); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java b/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java index 51bf6a699..b7fad0753 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java @@ -42,7 +42,7 @@ public class PageTerrasteel extends PageRecipe { @SideOnly(Side.CLIENT) public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) { Block block1 = ModBlocks.livingrock; - Block block2 = Blocks.lapis_block; + Block block2 = Blocks.LAPIS_BLOCK; Block block3 = ModBlocks.terraPlate; GlStateManager.translate(0F, 0F, -10F); diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 8fbfd3f29..5f372cb07 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -17,8 +17,8 @@ public final class LibMisc { public static final String MOD_NAME = MOD_ID; public static final String BUILD = "GRADLE:BUILD"; public static final String VERSION = "GRADLE:VERSION-" + BUILD; - public static final String DEPENDENCIES = "required-after:Forge@[12.16.1.1898,];required-after:Baubles;after:Thaumcraft"; - public static final String MC_VERSIONS = "[1.9]"; + public static final String DEPENDENCIES = "required-after:Forge@[12.16.1.1909,];required-after:Baubles;after:Thaumcraft"; + public static final String MC_VERSIONS = "[1.9.4]"; // Network Contants public static final String NETWORK_CHANNEL = MOD_ID; diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index 4bbc37e2c..cb154c568 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -24,7 +24,7 @@ public final class LibObfuscation { public static final String[] AGE = { "age", "field_70292_b", "d" }; public static final String[] PICKUP_DELAY = { "delayBeforeCanPickup", "field_145804_b", "e" }; - // EffectRenderer + // ParticleManager public static final String[] PARTICLE_TEXTURES = new String[] { "particleTextures", "field_110737_b", "b" }; // EntityAINearestAttackableTarget diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index 1601a3c79..a44d8a86b 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -2,7 +2,8 @@ package vazkii.botania.common.network; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.server.management.PlayerManager; +import net.minecraft.server.management.PlayerChunkMap; +import net.minecraft.server.management.PlayerChunkMapEntry; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.WorldServer; @@ -25,7 +26,7 @@ public final class PacketHandler { public static void sendToNearby(World world, BlockPos pos, IMessage toSend) { if(world instanceof WorldServer) { WorldServer ws = ((WorldServer) world); - PlayerManager.PlayerInstance chunk = ws.getPlayerChunkMap().getEntry(pos.getX() >> 4, pos.getZ() >> 4); + PlayerChunkMapEntry chunk = ws.getPlayerChunkMap().getEntry(pos.getX() >> 4, pos.getZ() >> 4); if(chunk == null) return; diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index a24ff8656..66c433eff 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -56,7 +56,7 @@ public final class SkyblockWorldEvents { World world = player.worldObj; if(WorldTypeSkyblock.isWorldSkyblock(world)) { BlockPos coords = world.getSpawnPoint(); - if(world.getBlockState(coords.down(4)).getBlock() != Blocks.bedrock && world.provider.getDimension() == 0) + if(world.getBlockState(coords.down(4)).getBlock() != Blocks.BEDROCK && world.provider.getDimension() == 0) spawnPlayer(player, coords, false); } @@ -72,7 +72,7 @@ public final class SkyblockWorldEvents { ItemStack equipped = event.getItemStack(); if(equipped == null && event.getEntityPlayer().isSneaking()) { Block block = event.getWorld().getBlockState(event.getPos()).getBlock(); - if(block == Blocks.grass || block == Blocks.dirt) { + if(block == Blocks.GRASS || block == Blocks.DIRT) { if(event.getWorld().isRemote) event.getEntityPlayer().swingArm(event.getHand()); else { @@ -82,19 +82,19 @@ public final class SkyblockWorldEvents { } catch (Throwable ignore) {} if(Math.random() < 0.8) - event.getEntityPlayer().dropPlayerItemWithRandomChoice(new ItemStack(ModItems.manaResource, 1, 21), false); + event.getEntityPlayer().dropItem(new ItemStack(ModItems.manaResource, 1, 21), false); } } - } else if(equipped != null && equipped.getItem() == Items.bowl && !event.getWorld().isRemote) { + } else if(equipped != null && equipped.getItem() == Items.BOWL && !event.getWorld().isRemote) { RayTraceResult RayTraceResult = ToolCommons.raytraceFromEntity(event.getWorld(), event.getEntityPlayer(), true, 4.5F); if(RayTraceResult != null) { if (RayTraceResult.typeOfHit == net.minecraft.util.math.RayTraceResult.Type.BLOCK) { - if(event.getWorld().getBlockState(RayTraceResult.getBlockPos()).getMaterial() == Material.water) { + if(event.getWorld().getBlockState(RayTraceResult.getBlockPos()).getMaterial() == Material.WATER) { --equipped.stackSize; if(equipped.stackSize <= 0) event.getEntityPlayer().inventory.setInventorySlotContents(event.getEntityPlayer().inventory.currentItem, new ItemStack(ModItems.waterBowl)); - else event.getEntityPlayer().dropPlayerItemWithRandomChoice(new ItemStack(ModItems.waterBowl), false); + else event.getEntityPlayer().dropItem(new ItemStack(ModItems.waterBowl), false); } } } @@ -104,17 +104,17 @@ public final class SkyblockWorldEvents { @SubscribeEvent public void onDrops(BlockEvent.HarvestDropsEvent event) { - if(WorldTypeSkyblock.isWorldSkyblock(event.getWorld()) && event.getState().getBlock() == Blocks.tallgrass) { + if(WorldTypeSkyblock.isWorldSkyblock(event.getWorld()) && event.getState().getBlock() == Blocks.TALLGRASS) { ItemStack stackToRemove = null; for(ItemStack stack : event.getDrops()) - if(stack.getItem() == Items.wheat_seeds && event.getWorld().rand.nextInt(4) == 0) { + if(stack.getItem() == Items.WHEAT_SEEDS && event.getWorld().rand.nextInt(4) == 0) { stackToRemove = stack; break; } if(stackToRemove != null) { event.getDrops().remove(stackToRemove); - event.getDrops().add(new ItemStack(event.getWorld().rand.nextBoolean() ? Items.pumpkin_seeds : Items.melon_seeds)); + event.getDrops().add(new ItemStack(event.getWorld().rand.nextBoolean() ? Items.PUMPKIN_SEEDS : Items.MELON_SEEDS)); } } } @@ -159,8 +159,8 @@ public final class SkyblockWorldEvents { for(int i = 0; i < 3; i++) for(int j = 0; j < 4; j++) for(int k = 0; k < 3; k++) - world.setBlockState(pos.add(-1 + i, -1 - j, -1 + k), j == 0 ? Blocks.grass.getDefaultState() : Blocks.dirt.getDefaultState()); - world.setBlockState(pos.add(-1, -2, 0), Blocks.flowing_water.getDefaultState()); + world.setBlockState(pos.add(-1 + i, -1 - j, -1 + k), j == 0 ? Blocks.GRASS.getDefaultState() : Blocks.DIRT.getDefaultState()); + world.setBlockState(pos.add(-1, -2, 0), Blocks.FLOWING_WATER.getDefaultState()); world.setBlockState(pos.add(1, 2, 1), ModBlocks.manaFlame.getDefaultState()); ((TileManaFlame) world.getTileEntity(pos.add(1, 2, 1))).setColor(new Color(70 + world.rand.nextInt(185), 70 + world.rand.nextInt(185), 70 + world.rand.nextInt(185)).getRGB()); @@ -180,7 +180,7 @@ public final class SkyblockWorldEvents { for(int[] root : rootPositions) world.setBlockState(pos.add(root[0], root[1], root[2]), ModBlocks.root.getDefaultState()); - world.setBlockState(pos.down(4), Blocks.bedrock.getDefaultState()); + world.setBlockState(pos.down(4), Blocks.BEDROCK.getDefaultState()); } }